- Devel - libvirt List Archives

[libvirt] [PATCH v2] test_driver: implement virNetworkGetDHCPLeases
by Ilias Stamatis 24 Jun '19

24 Jun '19

Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com> --- src/test/test_driver.c | 141 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 141 insertions(+) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 4b1f2724a0..180940f859 100755 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -4072,6 +4072,146 @@ testNetworkSetAutostart(virNetworkPtr net, } +static int +testNetworkGetDHCPLeases(virNetworkPtr net, + const char *mac, + virNetworkDHCPLeasePtr **leases, + unsigned int flags) +{ + int ret = -1; + int ndomains = 0; + size_t i, j; + size_t nleases = 0; + size_t addr_offset; + bool need_results = !!leases; + char *hostname = NULL; + VIR_AUTOFREE(char *) bridge_name = NULL; + char mac_str[VIR_MAC_STRING_BUFLEN]; + virMacAddr mac_addr; + virDomainObjPtr vm = NULL; + virDomainPtr *domains = NULL; + virDomainNetDefPtr inf = NULL; + virNetworkObjPtr obj = NULL; + virNetworkDefPtr obj_def = NULL; + virNetworkDHCPLeasePtr lease = NULL; + virNetworkDHCPLeasePtr *leases_ret = NULL; + virDomainInterfacePtr iface = NULL; + testDriverPtr privconn = net->conn->privateData; + + virCheckFlags(0, -1); + + if (mac && virMacAddrParse(mac, &mac_addr) < 0) { + virReportError(VIR_ERR_INVALID_MAC, "%s", mac); + return -1; + } + + if (!(obj = testNetworkObjFindByName(privconn, net->name))) + return -1; + + obj_def = virNetworkObjGetDef(obj); + + if (VIR_STRDUP(bridge_name, obj_def->bridge) < 0) + goto cleanup; + + virNetworkObjEndAPI(&obj); + + if ((ndomains = virDomainObjListExport(privconn->domains, net->conn, &domains, + NULL, VIR_CONNECT_LIST_DOMAINS_ACTIVE)) < 0) + goto cleanup; + + for (i = 0; i < ndomains; i++) { + /* the following must be called before testDomObjFromDomain */ + hostname = testDomainGetHostname(domains[i], 0); + + if (!(vm = testDomObjFromDomain(domains[i]))) + continue; + + for (j = 0; j < vm->def->nnets; j++) { + inf = vm->def->nets[j]; + + if (STRNEQ(inf->data.network.name, net->name)) + continue; + + virMacAddrFormat(&inf->mac, mac_str); + if (mac && virMacAddrCompare(mac, mac_str)) + continue; + + if (!need_results) { + nleases++; + continue; + } + + if (VIR_ALLOC(lease) < 0 || VIR_ALLOC(iface) < 0 || VIR_ALLOC(iface->addrs) < 0) + goto error; + iface->naddrs = 1; + + /* should be the same value as in testDomainInterfaceAddresses */ + addr_offset = 20 * (vm->def->id - 1) + j + 1; + if (testDomainInterfaceAddressFromNet(privconn, inf, addr_offset, iface) < 0) + goto error; + + if (VIR_STRDUP(lease->mac, mac_str) < 0 || + VIR_STRDUP(lease->iface, bridge_name) < 0 || + VIR_STRDUP(lease->hostname, hostname) < 0 || + VIR_STRDUP(lease->ipaddr, iface->addrs->addr) < 0) + goto error; + + lease->prefix = iface->addrs->prefix; + lease->type = iface->addrs->type; + + virDomainInterfaceFree(iface); + iface = NULL; + + lease->expirytime = 0; + + lease->iaid = NULL; + if (lease->type == VIR_IP_ADDR_TYPE_IPV6) { + if (VIR_STRDUP(lease->clientid, + "00:01:00:01:16:C1:BA:6E:08:00:27:30:C3:B8") < 0) + goto error; + } else { + lease->clientid = NULL; + } + + if (VIR_INSERT_ELEMENT(leases_ret, nleases, nleases, lease) < 0) + goto error; + } + + VIR_FREE(hostname); + virDomainObjEndAPI(&vm); + } + + if (leases_ret) { + /* NULL terminated array */ + ignore_value(VIR_REALLOC_N(leases_ret, nleases + 1)); + VIR_STEAL_PTR(*leases, leases_ret); + } + + ret = nleases; + + cleanup: + for (i = 0; i < ndomains; i++) + virDomainFree(domains[i]); + + VIR_FREE(domains); + VIR_FREE(lease); + VIR_FREE(hostname); + + virNetworkObjEndAPI(&obj); + virDomainInterfaceFree(iface); + virDomainObjEndAPI(&vm); + return ret; + + error: + if (leases_ret) { + for (i = 0; i < nleases; i++) + virNetworkDHCPLeaseFree(leases_ret[i]); + VIR_FREE(leases_ret); + } + goto cleanup; +} + + /* * Physical host interface routines */ @@ -7359,6 +7499,7 @@ static virNetworkDriver testNetworkDriver = { .networkGetBridgeName = testNetworkGetBridgeName, /* 0.3.2 */ .networkGetAutostart = testNetworkGetAutostart, /* 0.3.2 */ .networkSetAutostart = testNetworkSetAutostart, /* 0.3.2 */ + .networkGetDHCPLeases = testNetworkGetDHCPLeases, /* 5.5.0 */ .networkIsActive = testNetworkIsActive, /* 0.7.3 */ .networkIsPersistent = testNetworkIsPersistent, /* 0.7.3 */ }; -- 2.22.0

1 1

[libvirt] [PATCH 1/1] virpci: report dev->name in virPCIGetHeaderType error message
by Daniel Henrique Barboza 24 Jun '19

24 Jun '19

Trivial change. Adding the name of the device that has an unknown PCI header type in that function helps when debugging PCI code. Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com> --- src/util/virpci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/util/virpci.c b/src/util/virpci.c index 8f2936c23a..75e8daadd5 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -3239,7 +3239,8 @@ int virPCIGetHeaderType(virPCIDevicePtr dev, int *hdrType) type &= PCI_HEADER_TYPE_MASK; if (type >= VIR_PCI_HEADER_LAST) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown PCI header type '%d'"), type); + _("Unknown PCI header type '%d' for device '%s'"), + type, dev->name); return -1; } -- 2.20.1

2 1

[libvirt] [PATCH] RFC: maint: Sort public symbols within a release
by Eric Blake 24 Jun '19

24 Jun '19

In libvirt_private.syms, we have a policy of keeping blocks of symbols sorted by name - in fact, we enforce it during 'make check' with our check-symsorting rule calling out to a perl script. But libvirt_public.syms has been more cavalier over the years. 21 releases have been trivially sorted due to adding only one symbol; while the following 27 releases listed multiple symbols in alphabetical order, even if the symbols were not chronologically added in that order [1]: 0.0.3 0.9.5 1.1.0 0.3.0 0.9.7 1.1.1 0.3.3 0.9.8 1.2.5 0.4.2 0.9.9 1.2.8 0.6.3 0.9.10 1.2.11 0.7.5 0.9.13 1.2.15 0.9.0 1.0.1 1.3.3 0.9.2 1.0.2 3.1.0 0.9.3 1.0.3 3.4.0 [1] Case study: git log -p v0.9.9..v0.9.10 src/libvirt_public.syms shows 9 commits adding 9 APIs among 7 authors: 0b7ddf9e - trivially in order adb99a05 - appending happened to also be sorted order 1f7aa0ac - irrelevant (removing TABs, not adding symbol) 6714fd04 - added in sorted order 8f8b0802 - appended, out of order e1eea747 - re-sorted previous addition, and added in sorted order 02af3e13 - added in sorted order c471e55e - added in sorted order 99fd69c3 - added in sorted order The following patch changes the remaining 37 releases to do likewise, and documents the practice. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- I'm not sure if we want this patch - it got much bigger than I was expecting. 37 releases is less than half of the total versions in the file, but larger than the number of releases that were sorted (where it is not even obvious if that was always intentional or by luck). We could also decide to adopt a policy of listing symbols in the same order as remote_protocol.x (although not all symbols go over RPC), but that seems like it would be even more churn and harder to enforce. Ideally, if we DO want this patch, we should also teach 'make check' via src/check-symsorting.pl how to enforce it on the public file; as I did not do that, this is marked RFC. The diffstat shows a delta because I deleted 5 blank lines and added 2 comment lines. --- src/libvirt_public.syms | 313 ++++++++++++++++++++-------------------- 1 file changed, 155 insertions(+), 158 deletions(-) diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms index 75f7fdfb0c..f9e0072352 100644 --- a/src/libvirt_public.syms +++ b/src/libvirt_public.syms @@ -10,6 +10,8 @@ # soname version info can't enforce this since we never # change the soname # +# Keep this file sorted by version, then by symbols within each version. +# LIBVIRT_0.0.3 { global: virConnectClose; @@ -43,44 +45,43 @@ LIBVIRT_0.0.3 { LIBVIRT_0.0.5 { global: - virDomainLookupByUUID; virDomainGetUUID; + virDomainLookupByUUID; } LIBVIRT_0.0.3; LIBVIRT_0.1.0 { global: + virConnCopyLastError; + virConnGetLastError; + virConnResetLastError; + virConnSetErrorFunc; + virCopyLastError; + virDefaultErrorFunc; + virDomainReboot; + virGetLastError; virInitialize; virNodeGetInfo; - virDomainReboot; - - virCopyLastError; - virConnSetErrorFunc; - virResetLastError; virResetError; - virConnGetLastError; - virGetLastError; + virResetLastError; virSetErrorFunc; - virConnCopyLastError; - virConnResetLastError; - virDefaultErrorFunc; } LIBVIRT_0.0.5; LIBVIRT_0.1.1 { global: - virDomainLookupByUUIDString; + virConnectListDefinedDomains; + virDomainCreate; + virDomainDefineXML; virDomainGetUUIDString; + virDomainLookupByUUIDString; virDomainSetMemory; - virDomainDefineXML; - virDomainCreate; virDomainUndefine; - virConnectListDefinedDomains; } LIBVIRT_0.1.0; LIBVIRT_0.1.4 { global: - virDomainSetVcpus; - virDomainPinVcpu; virDomainGetVcpus; + virDomainPinVcpu; + virDomainSetVcpus; } LIBVIRT_0.1.1; LIBVIRT_0.1.5 { @@ -90,39 +91,39 @@ LIBVIRT_0.1.5 { LIBVIRT_0.1.9 { global: - virDomainCoreDump; virDomainAttachDevice; + virDomainCoreDump; virDomainDetachDevice; } LIBVIRT_0.1.5; LIBVIRT_0.2.0 { global: - virConnectNumOfNetworks; + virConnectListDefinedNetworks; virConnectListNetworks; virConnectNumOfDefinedNetworks; - virConnectListDefinedNetworks; - virNetworkLookupByName; - virNetworkLookupByUUID; - virNetworkLookupByUUIDString; + virConnectNumOfNetworks; + virNetworkCreate; virNetworkCreateXML; virNetworkDefineXML; - virNetworkUndefine; - virNetworkCreate; virNetworkDestroy; virNetworkFree; + virNetworkGetBridgeName; virNetworkGetName; virNetworkGetUUID; virNetworkGetUUIDString; virNetworkGetXMLDesc; - virNetworkGetBridgeName; + virNetworkLookupByName; + virNetworkLookupByUUID; + virNetworkLookupByUUIDString; + virNetworkUndefine; } LIBVIRT_0.1.9; LIBVIRT_0.2.1 { global: virConnectGetCapabilities; virConnectGetMaxVcpus; - virDomainGetMaxVcpus; virDomainGetAutostart; + virDomainGetMaxVcpus; virDomainSetAutostart; virNetworkGetAutostart; virNetworkSetAutostart; @@ -130,8 +131,8 @@ LIBVIRT_0.2.1 { LIBVIRT_0.2.3 { global: - virDomainGetSchedulerType; virDomainGetSchedulerParameters; + virDomainGetSchedulerType; virDomainSetSchedulerParameters; } LIBVIRT_0.2.1; @@ -145,9 +146,9 @@ LIBVIRT_0.3.0 { LIBVIRT_0.3.2 { global: - virDomainMigrate; virDomainBlockStats; virDomainInterfaceStats; + virDomainMigrate; } LIBVIRT_0.3.0; LIBVIRT_0.3.3 { @@ -158,52 +159,51 @@ LIBVIRT_0.3.3 { LIBVIRT_0.4.0 { global: - virConnectOpenAuth; virConnectAuthPtrDefault; + virConnectOpenAuth; } LIBVIRT_0.3.3; LIBVIRT_0.4.1 { global: - virStoragePoolGetConnect; - virConnectNumOfStoragePools; - virConnectNumOfDefinedStoragePools; - virConnectListStoragePools; virConnectListDefinedStoragePools; - virStoragePoolLookupByName; - virStoragePoolLookupByUUID; - virStoragePoolLookupByUUIDString; - virStoragePoolLookupByVolume; + virConnectListStoragePools; + virConnectNumOfDefinedStoragePools; + virConnectNumOfStoragePools; + virStoragePoolBuild; + virStoragePoolCreate; virStoragePoolCreateXML; virStoragePoolDefineXML; - virStoragePoolUndefine; - virStoragePoolCreate; - virStoragePoolBuild; - virStoragePoolDestroy; virStoragePoolDelete; - virStoragePoolRefresh; + virStoragePoolDestroy; virStoragePoolFree; + virStoragePoolGetAutostart; + virStoragePoolGetConnect; + virStoragePoolGetInfo; virStoragePoolGetName; virStoragePoolGetUUID; virStoragePoolGetUUIDString; - virStoragePoolGetInfo; virStoragePoolGetXMLDesc; - virStoragePoolSetAutostart; - virStoragePoolGetAutostart; - virStoragePoolNumOfVolumes; virStoragePoolListVolumes; - - virStorageVolGetConnect; - virStorageVolLookupByName; - virStorageVolLookupByKey; - virStorageVolLookupByPath; + virStoragePoolLookupByName; + virStoragePoolLookupByUUID; + virStoragePoolLookupByUUIDString; + virStoragePoolLookupByVolume; + virStoragePoolNumOfVolumes; + virStoragePoolRefresh; + virStoragePoolSetAutostart; + virStoragePoolUndefine; virStorageVolCreateXML; virStorageVolDelete; virStorageVolFree; - virStorageVolGetName; - virStorageVolGetKey; + virStorageVolGetConnect; virStorageVolGetInfo; - virStorageVolGetXMLDesc; + virStorageVolGetKey; + virStorageVolGetName; virStorageVolGetPath; + virStorageVolGetXMLDesc; + virStorageVolLookupByKey; + virStorageVolLookupByName; + virStorageVolLookupByPath; } LIBVIRT_0.4.0; LIBVIRT_0.4.2 { @@ -219,21 +219,19 @@ LIBVIRT_0.4.5 { LIBVIRT_0.5.0 { global: + virConnectDomainEventDeregister; + virConnectDomainEventRegister; virDomainCreateXML; virEventRegisterImpl; - virConnectDomainEventRegister; - virConnectDomainEventDeregister; - - virNodeNumOfDevices; - virNodeListDevices; - virNodeDeviceLookupByName; virNodeDeviceFree; - virNodeDeviceGetXMLDesc; virNodeDeviceGetName; virNodeDeviceGetParent; - virNodeDeviceNumOfCaps; + virNodeDeviceGetXMLDesc; virNodeDeviceListCaps; - + virNodeDeviceLookupByName; + virNodeDeviceNumOfCaps; + virNodeListDevices; + virNodeNumOfDevices; } LIBVIRT_0.4.5; LIBVIRT_0.6.0 { @@ -241,21 +239,20 @@ LIBVIRT_0.6.0 { virConnectRef; virDomainRef; virNetworkRef; + virNodeDeviceRef; virStoragePoolRef; virStorageVolRef; - virNodeDeviceRef; - } LIBVIRT_0.5.0; LIBVIRT_0.6.1 { global: + virDomainGetSecurityLabel; virFreeError; - virSaveLastError; virNodeDeviceDettach; virNodeDeviceReAttach; virNodeDeviceReset; - virDomainGetSecurityLabel; virNodeGetSecurityModel; + virSaveLastError; } LIBVIRT_0.6.0; LIBVIRT_0.6.3 { @@ -266,67 +263,67 @@ LIBVIRT_0.6.3 { LIBVIRT_0.6.4 { global: - virInterfaceGetConnect; - virConnectNumOfInterfaces; + virConnectDomainXMLFromNative; + virConnectDomainXMLToNative; virConnectListInterfaces; - virInterfaceLookupByName; - virInterfaceLookupByMACString; - virInterfaceGetName; + virConnectNumOfInterfaces; + virInterfaceCreate; + virInterfaceDefineXML; + virInterfaceDestroy; + virInterfaceFree; + virInterfaceGetConnect; virInterfaceGetMACString; + virInterfaceGetName; virInterfaceGetXMLDesc; + virInterfaceLookupByMACString; + virInterfaceLookupByName; virInterfaceRef; - virInterfaceFree; - virInterfaceDefineXML; virInterfaceUndefine; - virInterfaceCreate; - virInterfaceDestroy; virStorageVolCreateXMLFrom; - virConnectDomainXMLFromNative; - virConnectDomainXMLToNative; } LIBVIRT_0.6.3; LIBVIRT_0.7.0 { global: - virConnectNumOfDefinedInterfaces; virConnectListDefinedInterfaces; + virConnectNumOfDefinedInterfaces; } LIBVIRT_0.6.4; LIBVIRT_0.7.1 { global: - virSecretGetConnect; - virConnectNumOfSecrets; virConnectListSecrets; - virSecretLookupByUUID; - virSecretLookupByUUIDString; - virSecretLookupByUsage; + virConnectNumOfSecrets; virSecretDefineXML; + virSecretFree; + virSecretGetConnect; virSecretGetUUID; virSecretGetUUIDString; - virSecretGetUsageType; virSecretGetUsageID; + virSecretGetUsageType; + virSecretGetValue; virSecretGetXMLDesc; + virSecretLookupByUUID; + virSecretLookupByUUIDString; + virSecretLookupByUsage; + virSecretRef; virSecretSetValue; - virSecretGetValue; virSecretUndefine; - virSecretRef; - virSecretFree; } LIBVIRT_0.7.0; LIBVIRT_0.7.2 { global: - virStreamNew; - virStreamRef; - virStreamSend; - virStreamRecv; - virStreamSendAll; - virStreamRecvAll; + virDomainMigrateToURI; + virStreamAbort; virStreamEventAddCallback; - virStreamEventUpdateCallback; virStreamEventRemoveCallback; + virStreamEventUpdateCallback; virStreamFinish; - virStreamAbort; virStreamFree; - virDomainMigrateToURI; + virStreamNew; + virStreamRecv; + virStreamRecvAll; + virStreamRef; + virStreamSend; + virStreamSendAll; } LIBVIRT_0.7.1; LIBVIRT_0.7.3 { @@ -336,11 +333,11 @@ LIBVIRT_0.7.3 { virConnectIsSecure; virDomainIsActive; virDomainIsPersistent; + virInterfaceIsActive; virNetworkIsActive; virNetworkIsPersistent; virStoragePoolIsActive; virStoragePoolIsPersistent; - virInterfaceIsActive; } LIBVIRT_0.7.2; LIBVIRT_0.7.5 { @@ -351,46 +348,46 @@ LIBVIRT_0.7.5 { LIBVIRT_0.7.7 { global: + virConnectBaselineCPU; + virDomainAbortJob; virDomainAttachDeviceFlags; virDomainDetachDeviceFlags; - virConnectBaselineCPU; virDomainGetJobInfo; - virDomainAbortJob; } LIBVIRT_0.7.5; LIBVIRT_0.8.0 { global: - virStorageVolWipe; - virDomainMigrateSetMaxDowntime; - virConnectDomainEventRegisterAny; virConnectDomainEventDeregisterAny; - virDomainUpdateDeviceFlags; + virConnectDomainEventRegisterAny; virConnectListNWFilters; virConnectNumOfNWFilters; - virNWFilterLookupByName; - virNWFilterLookupByUUID; - virNWFilterLookupByUUIDString; + virDomainHasCurrentSnapshot; + virDomainHasManagedSaveImage; + virDomainManagedSave; + virDomainManagedSaveRemove; + virDomainMigrateSetMaxDowntime; + virDomainRevertToSnapshot; + virDomainSnapshotCreateXML; + virDomainSnapshotCurrent; + virDomainSnapshotDelete; + virDomainSnapshotFree; + virDomainSnapshotGetXMLDesc; + virDomainSnapshotListNames; + virDomainSnapshotLookupByName; + virDomainSnapshotNum; + virDomainUpdateDeviceFlags; + virNWFilterDefineXML; virNWFilterFree; virNWFilterGetName; virNWFilterGetUUID; virNWFilterGetUUIDString; virNWFilterGetXMLDesc; + virNWFilterLookupByName; + virNWFilterLookupByUUID; + virNWFilterLookupByUUIDString; virNWFilterRef; - virNWFilterDefineXML; virNWFilterUndefine; - virDomainManagedSave; - virDomainHasManagedSaveImage; - virDomainManagedSaveRemove; - virDomainSnapshotCreateXML; - virDomainSnapshotGetXMLDesc; - virDomainSnapshotNum; - virDomainSnapshotListNames; - virDomainSnapshotLookupByName; - virDomainHasCurrentSnapshot; - virDomainSnapshotCurrent; - virDomainRevertToSnapshot; - virDomainSnapshotDelete; - virDomainSnapshotFree; + virStorageVolWipe; } LIBVIRT_0.7.7; @@ -407,16 +404,16 @@ LIBVIRT_0.8.2 { LIBVIRT_0.8.5 { global: - virDomainSetMemoryParameters; virDomainGetMemoryParameters; virDomainGetVcpusFlags; + virDomainSetMemoryParameters; virDomainSetVcpusFlags; } LIBVIRT_0.8.2; LIBVIRT_0.8.6 { global: - virDomainOpenConsole; virDomainIsUpdated; + virDomainOpenConsole; } LIBVIRT_0.8.5; LIBVIRT_0.8.8 { @@ -468,16 +465,16 @@ LIBVIRT_0.9.3 { LIBVIRT_0.9.4 { global: + virDomainBlockJobAbort; + virDomainBlockJobSetSpeed; + virDomainBlockPull; + virDomainDestroyFlags; + virDomainGetBlockJobInfo; virDomainRestoreFlags; virDomainSaveFlags; virDomainSaveImageDefineXML; virDomainSaveImageGetXMLDesc; virDomainUndefineFlags; - virDomainDestroyFlags; - virDomainBlockJobAbort; - virDomainGetBlockJobInfo; - virDomainBlockJobSetSpeed; - virDomainBlockPull; } LIBVIRT_0.9.3; LIBVIRT_0.9.5 { @@ -546,20 +543,20 @@ LIBVIRT_0.9.13 { LIBVIRT_0.10.0 { global: - virDomainGetHostname; virConnectRegisterCloseCallback; virConnectUnregisterCloseCallback; + virDomainGetEmulatorPinInfo; + virDomainGetHostname; virDomainGetSecurityLabelList; virDomainPinEmulator; - virDomainGetEmulatorPinInfo; } LIBVIRT_0.9.13; LIBVIRT_0.10.2 { global: virConnectListAllInterfaces; + virConnectListAllNWFilters; virConnectListAllNetworks; virConnectListAllNodeDevices; - virConnectListAllNWFilters; virConnectListAllSecrets; virConnectListAllStoragePools; virDomainBlockCommit; @@ -641,8 +638,8 @@ LIBVIRT_1.1.3 { LIBVIRT_1.2.1 { global: - virConnectNetworkEventRegisterAny; virConnectNetworkEventDeregisterAny; + virConnectNetworkEventRegisterAny; } LIBVIRT_1.1.3; LIBVIRT_1.2.3 { @@ -660,9 +657,9 @@ LIBVIRT_1.2.5 { LIBVIRT_1.2.6 { global: - virNodeGetFreePages; virNetworkDHCPLeaseFree; virNetworkGetDHCPLeases; + virNodeGetFreePages; } LIBVIRT_1.2.5; LIBVIRT_1.2.7 { @@ -697,11 +694,11 @@ LIBVIRT_1.2.12 { LIBVIRT_1.2.14 { global: - virDomainIOThreadInfoFree; virDomainGetIOThreadInfo; - virDomainPinIOThread; + virDomainIOThreadInfoFree; virDomainInterfaceAddresses; virDomainInterfaceFree; + virDomainPinIOThread; } LIBVIRT_1.2.12; LIBVIRT_1.2.15 { @@ -727,30 +724,30 @@ LIBVIRT_1.2.19 { LIBVIRT_1.3.3 { global: - virDomainMigrateStartPostCopy; virDomainGetPerfEvents; + virDomainMigrateStartPostCopy; virDomainSetPerfEvents; } LIBVIRT_1.2.19; LIBVIRT_2.0.0 { global: - virConnectStoragePoolEventRegisterAny; virConnectStoragePoolEventDeregisterAny; + virConnectStoragePoolEventRegisterAny; virDomainGetGuestVcpus; virDomainSetGuestVcpus; } LIBVIRT_1.3.3; LIBVIRT_2.2.0 { global: - virConnectNodeDeviceEventRegisterAny; virConnectNodeDeviceEventDeregisterAny; + virConnectNodeDeviceEventRegisterAny; } LIBVIRT_2.0.0; LIBVIRT_3.0.0 { global: - virStorageVolGetInfoFlags; - virConnectSecretEventRegisterAny; virConnectSecretEventDeregisterAny; + virConnectSecretEventRegisterAny; + virStorageVolGetInfoFlags; } LIBVIRT_2.2.0; LIBVIRT_3.1.0 { @@ -770,9 +767,9 @@ LIBVIRT_3.4.0 { LIBVIRT_3.7.0 { global: - virDomainMigrateGetMaxDowntime; - virDomainManagedSaveGetXMLDesc; virDomainManagedSaveDefineXML; + virDomainManagedSaveGetXMLDesc; + virDomainMigrateGetMaxDowntime; } LIBVIRT_3.4.0; LIBVIRT_3.9.0 { @@ -787,26 +784,26 @@ LIBVIRT_4.1.0 { LIBVIRT_4.4.0 { global: - virDomainDetachDeviceAlias; - virConnectCompareHypervisorCPU; virConnectBaselineHypervisorCPU; + virConnectCompareHypervisorCPU; + virDomainDetachDeviceAlias; } LIBVIRT_4.1.0; LIBVIRT_4.5.0 { global: + virConnectListAllNWFilterBindings; + virDomainGetLaunchSecurityInfo; virGetLastErrorCode; virGetLastErrorDomain; - virNodeGetSEVInfo; - virDomainGetLaunchSecurityInfo; - virNWFilterBindingLookupByPortDev; - virConnectListAllNWFilterBindings; virNWFilterBindingCreateXML; - virNWFilterBindingGetXMLDesc; virNWFilterBindingDelete; - virNWFilterBindingRef; virNWFilterBindingFree; - virNWFilterBindingGetPortDev; virNWFilterBindingGetFilterName; + virNWFilterBindingGetPortDev; + virNWFilterBindingGetXMLDesc; + virNWFilterBindingLookupByPortDev; + virNWFilterBindingRef; + virNodeGetSEVInfo; } LIBVIRT_4.4.0; LIBVIRT_4.10.0 { @@ -821,18 +818,18 @@ LIBVIRT_5.2.0 { LIBVIRT_5.5.0 { virNetworkListAllPorts; - virNetworkPortLookupByUUID; - virNetworkPortLookupByUUIDString; virNetworkPortCreateXML; + virNetworkPortDelete; + virNetworkPortFree; virNetworkPortGetNetwork; virNetworkPortGetParameters; - virNetworkPortGetXMLDesc; virNetworkPortGetUUID; virNetworkPortGetUUIDString; - virNetworkPortDelete; - virNetworkPortFree; + virNetworkPortGetXMLDesc; + virNetworkPortLookupByUUID; + virNetworkPortLookupByUUIDString; virNetworkPortRef; virNetworkPortSetParameters; } LIBVIRT_5.2.0; -# .... define new API here using predicted next version number .... +# .... define new API in sorted order using predicted next version number .... -- 2.20.1

2 2

[libvirt] [PATCH 0/2] A couple coverity patches
by John Ferlan 22 Jun '19

22 Jun '19

Coverity has been tripped up a few more times recently... The memory leak patch probably I what I noted from Jiri's recent CPU series. The return value check is older. It wasn't clear though if the intention of the module was to ignore errors so I just chose to error out like other similar callers. If there's a better way - then other patches can be posted. John Ferlan (2): cpu_x86: Fix memory leak - virCPUx86GetHost cpu_x86: Handle error in x86DataToCPU when calling x86DataAdd src/cpu/cpu_x86.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- 2.20.1

2 3

[libvirt] [PATCH] qemu: Adjust ATTRIBUTE_NONNULL
by John Ferlan 21 Jun '19

21 Jun '19

Commit 7bf679ae removed the @json argument from the qemuMonitorOpen prototype; however, it did not update the ATTRIBUTE_NONNULL value which causes a build failure for when checking is enabled such as when lv_cv_static_analysis is enabled. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Pushing under build breaker rule. src/qemu/qemu_monitor.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 35e3d28c22..c41428b048 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -343,7 +343,7 @@ qemuMonitorPtr qemuMonitorOpen(virDomainObjPtr vm, unsigned long long timeout, qemuMonitorCallbacksPtr cb, void *opaque) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(6); + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(5); qemuMonitorPtr qemuMonitorOpenFD(virDomainObjPtr vm, int sockfd, qemuMonitorCallbacksPtr cb, -- 2.20.1

1 0

[libvirt] [PATCH] maint: Add missing 'global:' tag in libvirt_public.syms
by Eric Blake 21 Jun '19

21 Jun '19

Fixes: c08fc8d1 Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing as trivial src/libvirt_public.syms | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms index 75f7fdfb0c..18500ec8b2 100644 --- a/src/libvirt_public.syms +++ b/src/libvirt_public.syms @@ -820,6 +820,7 @@ LIBVIRT_5.2.0 { } LIBVIRT_4.10.0; LIBVIRT_5.5.0 { + global: virNetworkListAllPorts; virNetworkPortLookupByUUID; virNetworkPortLookupByUUIDString; -- 2.20.1

1 0

[libvirt] [PATCH v8.5 00/13] Checkpoint APIs (incremental backup saga)
by Eric Blake 21 Jun '19

21 Jun '19

This is a subset of v8 of incremental backup, focusing more on just the checkpoint manipulation code (as this had fewer review comments that still needed addressing). I think there is enough here that even if this lands in 5.5 while the backup APIs slide into 5.6 that we'd still have a reasonably usable set of APIs. I probably still need to double-check that creating checkpoints while an external snapshot exists gives a sane error, and that creating an external snapshot while checkoints exist give a sane error (in both cases, with plans to relax that error later once we finish our design); that can be done as a patch on top of these or if I have to respin this part of the series once more before 5.5. I do plan on tagging a v9 label of the full backup series, but that will be in a separate thread built on top of this one (hence naming this one v8.5). Since v8: - Completely drop the virDomainHasCurrentCheckpoint API (you get the same effect by calling virDomainCheckpointCurrent) - Defer the virDomainCheckpointHasMetadata API for a later day (if we ever want it); for now, all checkpoints require libvirt metadta - Expand the code to implement Checkpoint APIs for the test driver - rebase to master - Defer the Backup API work to a later series - Split out the handling of VIR_DOMAIN_CHECKPOINT_XML_SIZE into its own patch (that one is probably the most likely to need a respin, or even deferring it post-5.5 as adding flag support is different than adding new API) 001/13:[----] [--] 'backup: Document new XML for checkpoints' 002/13:[0121] [FC] 'backup: Introduce virDomainCheckpoint APIs' 003/13:[0004] [FC] 'backup: Document nuances between different state capture APIs' 004/13:[0127] [FC] 'backup: Parse and output checkpoint XML' 005/13:[0111] [FC] 'backup: Allow for lists of checkpoint objects' 006/13:[----] [--] 'backup: Add new domain:checkpoint access control' 007/13:[down] 'backup: Implement checkpoint APIs for remote driver' 008/13:[0065] [FC] 'backup: Implement virsh support for checkpoints' 009/13:[down] 'snapshot: Refactor test to utilize virDomainMoment more' 010/13:[down] 'backup: test: Implement metadata tracking for checkpoint APIs' 011/13:[0184] [FC] 'backup: qemu: Implement metadata tracking for checkpoint APIs' 012/13:[0016] [FC] 'backup: Wire up qemu checkpoint commands over QMP' 013/13:[down] 'backup: qemu: Implement VIR_DOMAIN_CHECKPOINT_XML_SIZE flag' Eric Blake (13): backup: Document new XML for checkpoints backup: Introduce virDomainCheckpoint APIs backup: Document nuances between different state capture APIs backup: Parse and output checkpoint XML backup: Allow for lists of checkpoint objects backup: Add new domain:checkpoint access control backup: Implement checkpoint APIs for remote driver backup: Implement virsh support for checkpoints snapshot: Refactor test to utilize virDomainMoment more backup: test: Implement metadata tracking for checkpoint APIs backup: qemu: Implement metadata tracking for checkpoint APIs backup: Wire up qemu checkpoint commands over QMP backup: qemu: Implement VIR_DOMAIN_CHECKPOINT_XML_SIZE flag include/libvirt/libvirt-domain-checkpoint.h | 149 ++ include/libvirt/libvirt-domain.h | 6 + include/libvirt/libvirt.h | 5 +- src/access/viraccessperm.h | 6 + src/conf/checkpoint_conf.h | 101 ++ src/conf/domain_conf.h | 2 + src/conf/virconftypes.h | 9 + src/conf/virdomaincheckpointobjlist.h | 66 + src/conf/virdomainmomentobjlist.h | 5 +- src/conf/virdomainobjlist.h | 7 +- src/driver-hypervisor.h | 48 + src/qemu/qemu_block.h | 3 + src/qemu/qemu_conf.h | 2 + src/qemu/qemu_domain.h | 15 + src/qemu/qemu_monitor.h | 4 + src/qemu/qemu_monitor_json.h | 3 + tools/virsh-checkpoint.h | 26 + tools/virsh-completer.h | 4 + tools/virsh-util.h | 3 + tools/virsh.h | 1 + docs/Makefile.am | 3 + docs/apibuild.py | 2 + docs/docs.html.in | 9 +- docs/domainstatecapture.html.in | 315 ++++ docs/format.html.in | 1 + docs/formatcheckpoint.html.in | 204 +++ docs/formatsnapshot.html.in | 2 + docs/index.html.in | 3 +- docs/schemas/domaincheckpoint.rng | 87 ++ libvirt.spec.in | 2 + mingw-libvirt.spec.in | 4 + po/POTFILES | 3 + src/Makefile.am | 2 + src/access/viraccessperm.c | 3 +- src/conf/Makefile.inc.am | 4 + src/conf/checkpoint_conf.c | 662 ++++++++ src/conf/domain_conf.c | 6 + src/conf/virdomaincheckpointobjlist.c | 219 +++ src/conf/virdomainmomentobjlist.c | 2 +- src/conf/virdomainobjlist.c | 11 + src/libvirt-domain-checkpoint.c | 670 ++++++++ src/libvirt-domain.c | 18 +- src/libvirt_private.syms | 26 + src/libvirt_public.syms | 25 +- src/qemu/qemu_block.c | 12 + src/qemu/qemu_conf.c | 5 + src/qemu/qemu_domain.c | 183 +++ src/qemu/qemu_driver.c | 868 +++++++++++ src/qemu/qemu_monitor.c | 11 + src/qemu/qemu_monitor_json.c | 76 + src/remote/remote_daemon_dispatch.c | 20 + src/remote/remote_driver.c | 26 +- src/remote/remote_protocol.x | 155 +- src/remote_protocol-structs | 85 ++ src/rpc/gendispatch.pl | 32 +- src/test/test_driver.c | 461 +++++- tests/Makefile.am | 11 +- tests/domaincheckpointxml2xmlin/empty.xml | 1 + tests/domaincheckpointxml2xmlin/sample.xml | 7 + tests/domaincheckpointxml2xmlin/size.xml | 4 + tests/domaincheckpointxml2xmlout/empty.xml | 7 + .../internal-active-invalid.xml | 53 + .../internal-inactive-invalid.xml | 53 + tests/domaincheckpointxml2xmlout/redefine.xml | 63 + tests/domaincheckpointxml2xmlout/sample.xml | 12 + tests/domaincheckpointxml2xmlout/size.xml | 11 + tests/domaincheckpointxml2xmltest.c | 223 +++ tests/virschematest.c | 2 + tools/Makefile.am | 1 + tools/virsh-checkpoint.c | 1342 +++++++++++++++++ tools/virsh-completer.c | 51 + tools/virsh-domain-monitor.c | 23 + tools/virsh-domain.c | 9 + tools/virsh-util.c | 11 + tools/virsh.c | 2 + tools/virsh.pod | 238 ++- 76 files changed, 6745 insertions(+), 61 deletions(-) create mode 100644 include/libvirt/libvirt-domain-checkpoint.h create mode 100644 src/conf/checkpoint_conf.h create mode 100644 src/conf/virdomaincheckpointobjlist.h create mode 100644 tools/virsh-checkpoint.h create mode 100644 docs/domainstatecapture.html.in create mode 100644 docs/formatcheckpoint.html.in create mode 100644 docs/schemas/domaincheckpoint.rng create mode 100644 src/conf/checkpoint_conf.c create mode 100644 src/conf/virdomaincheckpointobjlist.c create mode 100644 src/libvirt-domain-checkpoint.c create mode 100644 tests/domaincheckpointxml2xmlin/empty.xml create mode 100644 tests/domaincheckpointxml2xmlin/sample.xml create mode 100644 tests/domaincheckpointxml2xmlin/size.xml create mode 100644 tests/domaincheckpointxml2xmlout/empty.xml create mode 100644 tests/domaincheckpointxml2xmlout/internal-active-invalid.xml create mode 100644 tests/domaincheckpointxml2xmlout/internal-inactive-invalid.xml create mode 100644 tests/domaincheckpointxml2xmlout/redefine.xml create mode 100644 tests/domaincheckpointxml2xmlout/sample.xml create mode 100644 tests/domaincheckpointxml2xmlout/size.xml create mode 100644 tests/domaincheckpointxml2xmltest.c create mode 100644 tools/virsh-checkpoint.c -- 2.20.1

2 24

[libvirt] [PATCH] Don't parse/format vram attribute for cirrus video
by Jonathon Jongsma 21 Jun '19

21 Jun '19

Since the cirrus vga memory size isn't configurable, we can ignore any 'vram' attribute when parsing a domain definition. However, when no value is specified, it ends up getting set to a default value of 16MB. This 16MB value is not used anywhere (for example, it is not passed as an argument to qemu), but is displayed in the XML definition. So by changing this default value to 0, it will also be omitted from the XML definition of the domain. Fixes: rhbz#1447831 Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- This is an attempt to apply the fix suggested by Gerd at https://bugzilla.redhat.com/show_bug.cgi?id=1447831#c2. I'm not totally confident that this is the right approach, since I'm relatively new to the code. Another approach might be to simply close the bug as NOTABUG since it doesn't seem that having this unused attribute in the domain definition has any significant drawbacks. src/conf/domain_conf.c | 2 +- src/qemu/qemu_domain.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index c69d382d70..d06e094b11 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -15154,7 +15154,6 @@ virDomainVideoDefaultRAM(const virDomainDef *def, { switch (type) { case VIR_DOMAIN_VIDEO_TYPE_VGA: - case VIR_DOMAIN_VIDEO_TYPE_CIRRUS: case VIR_DOMAIN_VIDEO_TYPE_VMVGA: if (def->virtType == VIR_DOMAIN_VIRT_VBOX) return 8 * 1024; @@ -15172,6 +15171,7 @@ virDomainVideoDefaultRAM(const virDomainDef *def, /* QEMU use 64M as the minimal video memory for qxl device */ return 64 * 1024; + case VIR_DOMAIN_VIDEO_TYPE_CIRRUS: case VIR_DOMAIN_VIDEO_TYPE_DEFAULT: case VIR_DOMAIN_VIDEO_TYPE_VBOX: case VIR_DOMAIN_VIDEO_TYPE_PARALLELS: diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index e5c6ef3fda..7f0baf57ac 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6835,6 +6835,9 @@ qemuDomainDeviceVideoDefPostParse(virDomainVideoDefPtr video, if (video->type == VIR_DOMAIN_VIDEO_TYPE_QXL && !video->vgamem) { video->vgamem = QEMU_QXL_VGAMEM_DEFAULT; + } else if (video->type == VIR_DOMAIN_VIDEO_TYPE_CIRRUS) { + /* cirrus vram is not configurable. Ignore it */ + video->vram = 0; } return 0; -- 2.20.1

2 4

[libvirt] [PATCH] virStorageSourceChainHasManagedPR: Check propely
by Michal Privoznik 21 Jun '19

21 Jun '19

In the virStorageSourceChainHasManagedPR() function we iterate over whole backing chain trying to determine if one of the layers has managed PR configured. But due to a typo we in fact check the top layer only. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial rule. src/util/virstoragefile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 2b1c0a5b8e..f7495ab6da 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -2083,7 +2083,7 @@ virStorageSourceChainHasManagedPR(virStorageSourcePtr src) virStorageSourcePtr n; for (n = src; virStorageSourceIsBacking(n); n = n->backingStore) { - if (virStoragePRDefIsManaged(src->pr)) + if (virStoragePRDefIsManaged(n->pr)) return true; } -- 2.21.0

2 1

[libvirt] [PATCH v2 0/7] Finish support for IA32_ARCH_CAPABILITIES MSR features
by Jiri Denemark 21 Jun '19

21 Jun '19

As promised in v1 this series contains a few additional patches which limit usage of MSR features to QEMU that supports "unavailable-features" CPU property. This series intentionally enables MSR features for all QEMU versions before restricting the usage to make this restriction more visible in the test results. Version 2: - all but 2 patches from version 1 were pushed - 5 new patches Jiri Denemark (7): conf: Introduce virCPUDefCheckFeatures cpu_x86: Turn virCPUx86DataIteratorInit into a function cpu_x86: Introduce virCPUx86FeatureIsMSR cpu_x86: Read CPU features from IA32_ARCH_CAPABILITIES MSR cpu_map: Introduce IA32_ARCH_CAPABILITIES MSR features qemu: Forbid MSR features with old QEMU qemu: Drop MSR features from host-model with old QEMU src/conf/cpu_conf.c | 33 +++++++ src/conf/cpu_conf.h | 6 ++ src/cpu/cpu_x86.c | 96 +++++++++++++++++-- src/cpu/cpu_x86.h | 3 + src/cpu_map/x86_features.xml | 20 ++++ src/libvirt_private.syms | 2 + src/qemu/qemu_capabilities.c | 16 ++++ src/qemu/qemu_process.c | 29 +++++- .../x86_64-cpuid-Core-i7-7600U-enabled.xml | 1 + .../x86_64-cpuid-Core-i7-7600U-json.xml | 1 + ...86_64-cpuid-Xeon-Platinum-8268-enabled.xml | 1 + .../x86_64-cpuid-Xeon-Platinum-8268-guest.xml | 4 + .../x86_64-cpuid-Xeon-Platinum-8268-host.xml | 4 + .../x86_64-cpuid-Xeon-Platinum-8268-json.xml | 3 + .../qemu_4.1.0.x86_64.xml | 1 + 15 files changed, 207 insertions(+), 13 deletions(-) -- 2.22.0

3 17