- Devel - libvirt List Archives

[libvirt] [PATCH] test_driver: implement virDomainSetLifecycleAction
by Ilias Stamatis 13 Aug '19

13 Aug '19

Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com> --- src/test/test_driver.c | 58 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index aae9875194..71d6baa3da 100755 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -7404,6 +7404,63 @@ testDomainMemoryPeek(virDomainPtr dom, } +static void +testDomainModifyLifecycleAction(virDomainDefPtr def, + virDomainLifecycle type, + virDomainLifecycleAction action) +{ + switch (type) { + case VIR_DOMAIN_LIFECYCLE_POWEROFF: + def->onPoweroff = action; + break; + case VIR_DOMAIN_LIFECYCLE_REBOOT: + def->onReboot = action; + break; + case VIR_DOMAIN_LIFECYCLE_CRASH: + def->onCrash = action; + break; + case VIR_DOMAIN_LIFECYCLE_LAST: + break; + } +} + + +static int +testDomainSetLifecycleAction(virDomainPtr dom, + unsigned int type, + unsigned int action, + unsigned int flags) +{ + virDomainObjPtr vm = NULL; + virDomainDefPtr def = NULL; + virDomainDefPtr persistentDef = NULL; + int ret = -1; + + virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | + VIR_DOMAIN_AFFECT_CONFIG, -1); + + if (!virDomainDefLifecycleActionAllowed(type, action)) + return -1; + + if (!(vm = testDomObjFromDomain(dom))) + return -1; + + if (virDomainObjGetDefs(vm, flags, &def, &persistentDef) < 0) + goto cleanup; + + if (def) + testDomainModifyLifecycleAction(def, type, action); + + if (persistentDef) + testDomainModifyLifecycleAction(persistentDef, type, action); + + ret = 0; + cleanup: + virDomainObjEndAPI(&vm); + return ret; +} + + /* * Snapshot APIs */ @@ -8698,6 +8755,7 @@ static virHypervisorDriver testHypervisorDriver = { .domainHasManagedSaveImage = testDomainHasManagedSaveImage, /* 1.1.4 */ .domainManagedSaveRemove = testDomainManagedSaveRemove, /* 1.1.4 */ .domainMemoryPeek = testDomainMemoryPeek, /* 5.4.0 */ + .domainSetLifecycleAction = testDomainSetLifecycleAction, /* 5.7.0 */ .domainSnapshotNum = testDomainSnapshotNum, /* 1.1.4 */ .domainSnapshotListNames = testDomainSnapshotListNames, /* 1.1.4 */ -- 2.22.0

2 3

[libvirt] [PATCH 0/2] test_driver: implement Get/Set Blkio parameters APIs
by Ilias Stamatis 13 Aug '19

13 Aug '19

This series depends on another series that haven't been merged yet: https://www.redhat.com/archives/libvir-list/2019-July/msg00520.html Ilias Stamatis (2): test_driver: implement virDomainGetBlkioParameters test_driver: implement virDomainSetBlkioParameters src/test/test_driver.c | 123 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 123 insertions(+) -- 2.22.0

1 2

[libvirt] [PATCH v2]daemon: Fix a crash during virNetlinkEventServiceStopAll
by Liu Haitao 13 Aug '19

13 Aug '19

When reboot the host, a core dump file would be generated. The call traces are: Note.In this case, the main thread is thread 5. (gdb) thread 5 [Switching to thread 5 (LWP 4142)] (gdb) bt 0 0x00007f00a6838273 in futex_wait_cancelable (private=<optimized out>, expected=0, futex_word=0x7f004c0125c0) at /usr/src/debug/glibc/2.24-r0/git/sysdeps/unix/sysv/linux/futex-internal.h:88 1 __pthread_cond_wait_common (abstime=0x0, mutex=0x7f004c012540, cond=0x7f004c012598) at /usr/src/debug/glibc/2.24-r0/git/nptl/pthread_cond_wait.c:502 2 __pthread_cond_wait (cond=0x7f004c012598, mutex=0x7f004c012540) at /usr/src/debug/glibc/2.24-r0/git/nptl/pthread_cond_wait.c:655 3 0x00007f00aa467246 in virCondWait (c=<optimized out>, m=<optimized out>) at /usr/src/debug/libvirt/5.3.0-r0/libvirt-5.3.0/src/util/virthread.c:154 4 0x00007f00aa467eb0 in virThreadPoolFree (pool=<optimized out>) at /usr/src/debug/libvirt/5.3.0-r0/libvirt-5.3.0/src/util/virthreadpool.c:286 5 0x00007f0074349f9d in qemuStateCleanup () at /usr/src/debug/libvirt/5.3.0-r0/libvirt-5.3.0/src/qemu/qemu_driver.c:1036 6 0x00007f00aa5e9486 in virStateCleanup () at /usr/src/debug/libvirt/5.3.0-r0/libvirt-5.3.0/src/libvirt.c:682 7 0x000055a687ab86a4 in main (argc=<optimized out>, argv=<optimized out>) at /usr/src/debug/libvirt/5.3.0-r0/libvirt-5.3.0/src/remote/remote_daemon.c:1473 (gdb) thread 1 [Switching to thread 1 (LWP 4403)] (gdb) bt 0 __GI___pthread_mutex_lock (mutex=mutex@entry=0x0) at /usr/src/debug/glibc/2.24-r0/git/nptl/pthread_mutex_lock.c:67 1 0x00007f00aa467165 in virMutexLock (m=m@entry=0x0) at /usr/src/debug/libvirt/5.3.0-r0/libvirt-5.3.0/src/util/virthread.c:89 2 0x00007f00aa43c0f9 in virNetlinkEventServerLock (driver=<optimized out>) at /usr/src/debug/libvirt/5.3.0-r0/libvirt-5.3.0/src/util/virnetlink.c:799 3 virNetlinkEventRemoveClient (watch=watch@entry=0, macaddr=macaddr@entry=0x7f0088014944, protocol=protocol@entry=0) at /usr/src/debug/libvirt/5.3.0-r0/libvirt-5.3.0/src/util/virnetlink.c:1197 4 0x00007f00aa4341df in virNetDevMacVLanDeleteWithVPortProfile ( ifname=<optimized out>, macaddr=macaddr@entry=0x7f0088014944, linkdev=0x7f0088014920 "eth1", mode=mode@entry=1, virtPortProfile=virtPortProfile@entry=0x0, stateDir=stateDir@entry=0x7f004c12fa90 "/var/run/libvirt/qemu") at /usr/src/debug/libvirt/5.3.0-r0/libvirt-5.3.0/src/util/virnetdevmacvlan.c:1112 5 0x00007f0074312251 in qemuProcessStop (driver=driver@entry=0x7f004c0ecef0, vm=vm@entry=0x7f0088000b00, reason=reason@entry=VIR_DOMAIN_SHUTOFF_SHUTDOWN, asyncJob=asyncJob@entry=QEMU_ASYNC_JOB_NONE, flags=<optimized out>) at /usr/src/debug/libvirt/5.3.0-r0/libvirt-5.3.0/src/qemu/qemu_process.c:7291 6 0x00007f007437a5ea in processMonitorEOFEvent (vm=0x7f0088000b00, driver=0x7f004c0ecef0) at /usr/src/debug/libvirt/5.3.0-r0/libvirt-5.3.0/src/qemu/qemu_driver.c:4756 7 qemuProcessEventHandler (data=0x55a687d6df10, opaque=0x7f004c0ecef0) at /usr/src/debug/libvirt/5.3.0-r0/libvirt-5.3.0/src/qemu/qemu_driver.c:4859 8 0x00007f00aa467c5b in virThreadPoolWorker ( opaque=opaque@entry=0x55a687d6c110) at /usr/src/debug/libvirt/5.3.0-r0/libvirt-5.3.0/src/util/virthreadpool.c:163 9 0x00007f00aa466fe8 in virThreadHelper (data=<optimized out>) at /usr/src/debug/libvirt/5.3.0-r0/libvirt-5.3.0/src/util/virthread.c:206 10 0x00007f00a68323f4 in start_thread (arg=0x7f00699df700) at /usr/src/debug/glibc/2.24-r0/git/nptl/pthread_create.c:456 11 0x00007f00a616e10f in clone () at ../sysdeps/unix/sysv/linux/x86_64/clone.S:105 1. The execution flow of main thread (Thread 5 LWP 4142): main() -->virNetDaemonRun() -->virNetDaemonClose(dmn) //cleanup -->virNetlinkEventServiceStopAll() -->virStateCleanup() -->qemuStateCleanup() -->virThreadPoolFree() -->__pthread_cond_wait() virNetDaemonRun() -->virEventRunDefaultImpl -->virEventPollRunOnce -->virEventPollDispatchHandles -->qemuMonitorIO -->qemuProcessHandleMonitorEOF -->processEvent->eventType = QEMU_PROCESS_EVENT_MONITOR_EOF -->virThreadPoolSendJob() After typing reboot command on the host, the main thread would send an event message to another thread. Here it would let thread 1 to handle the shutdown of qemu process. But it could not be executed immediately. virNetlinkEventServiceStopAll() --> virNetlinkEventServiceStop() --> server[protocol] = NULL; // set server to null IN virNetlinkEventServiceStopAll(), some variables related to network are freed, like (static virNetlinkEventSrvPrivatePtr server). virStateCleanup() -->qemuStateCleanup() -->virThreadPoolFree() -->__pthread_cond_wait() In virThreadPoolFree() it will wait other thread to end up. 2. The execution flow of thread 5 (LWP 4403): qemuProcessStop() -->virNetDevMacVLanDeleteWithVPortProfile() -->virNetlinkEventRemoveClient() --> srv = server[protocol] Although the main thread had sent the message to thread 1(4403), it could not be run instantly. It means that the virNetlinkEventServiceStopAll() might be executed earlier than virNetlinkEventRemoveClient(). We could get it from the log file. "" 2019-06-12 00:10:09.230+0000: 4142: info : virNetlinkEventServiceStopAll:941 : stopping all netlink event services 2019-06-12 00:10:09.230+0000: 4142: info : virNetlinkEventServiceStop:904 : stopping netlink event service 2019-06-12 00:10:21.165+0000: 4403: debug : virNetlinkEventRemoveClient:1190 : removing client watch=0, mac=0x7f0088014944. " In virNetlinkEventRemoveClient() the variable server is used again, but now it is null that is freed by virNetlinkEventServiceStopAll().So it would case a crash . The virNetlinkEventServiceStopAll() should be executed behind virStateCleanup(), Signed-off-by: Liu Haitao <haitao.liu(a)windriver.com> --- src/remote/remote_daemon.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c index c3782971f1..7da20a6644 100644 --- a/src/remote/remote_daemon.c +++ b/src/remote/remote_daemon.c @@ -1464,8 +1464,6 @@ int main(int argc, char **argv) { /* Keep cleanup order in inverse order of startup */ virNetDaemonClose(dmn); - virNetlinkEventServiceStopAll(); - if (driversInitialized) { /* NB: Possible issue with timing window between driversInitialized * setting if virNetlinkEventServerStart fails */ @@ -1473,6 +1471,8 @@ int main(int argc, char **argv) { virStateCleanup(); } + virNetlinkEventServiceStopAll(); + virObjectUnref(adminProgram); virObjectUnref(srvAdm); virObjectUnref(qemuProgram); -- 2.21.0

2 3

[libvirt] [PATCH] Revert "tpm: Check TPM XML device configuration changes after edit"
by Ján Tomko 12 Aug '19

12 Aug '19

Redefining a domain via virDomainDefineXML should not give different results based on an already existing definition. Also, there's a crasher somewhere in the code: https://bugzilla.redhat.com/show_bug.cgi?id=1739338 This reverts commit 94b3aa55f83ada33a9fdda66068d58ef1a56c0a5 --- src/conf/domain_conf.c | 56 --------------------------------------- src/conf/domain_conf.h | 3 --- src/libvirt_private.syms | 1 - src/qemu/qemu_driver.c | 28 -------------------- src/qemu/qemu_extdevice.c | 2 +- src/qemu/qemu_extdevice.h | 3 --- 6 files changed, 1 insertion(+), 92 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0456369d55..f54acd0c2a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -31461,59 +31461,3 @@ virDomainGraphicsNeedsAutoRenderNode(const virDomainGraphicsDef *graphics) return true; } - - -static int -virDomainCheckTPMChanges(virDomainDefPtr def, - virDomainDefPtr newDef) -{ - bool oldEnc, newEnc; - - if (!def->tpm) - return 0; - - switch (def->tpm->type) { - case VIR_DOMAIN_TPM_TYPE_EMULATOR: - if (virFileExists(def->tpm->data.emulator.storagepath)) { - /* VM has been started */ - /* Once a VM was started with an encrypted state we allow - * less configuration changes. - */ - oldEnc = def->tpm->data.emulator.hassecretuuid; - if (oldEnc && def->tpm->type != newDef->tpm->type) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Changing the type of TPM is not allowed")); - return -1; - } - if (oldEnc && !newDef->tpm) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Removing an encrypted TPM is not allowed")); - return -1; - } - newEnc = newDef->tpm->data.emulator.hassecretuuid; - if (oldEnc != newEnc) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("TPM state encryption cannot be changed " - "once VM was started")); - return -1; - } - } - break; - case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH: - case VIR_DOMAIN_TPM_TYPE_LAST: - break; - } - - return 0; -} - - -int -virDomainCheckDeviceChanges(virDomainDefPtr def, - virDomainDefPtr newDef) -{ - if (!def || !newDef) - return 0; - - return virDomainCheckTPMChanges(def, newDef); -} diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 57ca2a8ad1..2d7350e675 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3641,6 +3641,3 @@ virDomainGraphicsGetRenderNode(const virDomainGraphicsDef *graphics); bool virDomainGraphicsNeedsAutoRenderNode(const virDomainGraphicsDef *graphics); - -int -virDomainCheckDeviceChanges(virDomainDefPtr def, virDomainDefPtr newDef); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index cae8febf8d..7a3feb8efa 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -217,7 +217,6 @@ virDomainBootTypeFromString; virDomainBootTypeToString; virDomainCapabilitiesPolicyTypeToString; virDomainCapsFeatureTypeToString; -virDomainCheckDeviceChanges; virDomainChrConsoleTargetTypeFromString; virDomainChrConsoleTargetTypeToString; virDomainChrDefForeach; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ff83d1c024..0fccf3dc37 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -53,7 +53,6 @@ #include "qemu_migration_params.h" #include "qemu_blockjob.h" #include "qemu_security.h" -#include "qemu_extdevice.h" #include "virerror.h" #include "virlog.h" @@ -7760,30 +7759,6 @@ qemuDomainCreate(virDomainPtr dom) return qemuDomainCreateWithFlags(dom, 0); } -static int -qemuDomainCheckDeviceChanges(virQEMUDriverPtr driver, - virDomainDefPtr def) -{ - virDomainObjPtr vm; - int ret; - - vm = virDomainObjListFindByUUID(driver->domains, def->uuid); - if (!vm) - return 0; - - if (qemuExtDevicesInitPaths(driver, vm->def) < 0) { - ret = -1; - goto cleanup; - } - - ret = virDomainCheckDeviceChanges(vm->def, def); - - cleanup: - virDomainObjEndAPI(&vm); - - return ret; -} - static virDomainPtr qemuDomainDefineXMLFlags(virConnectPtr conn, const char *xml, @@ -7820,9 +7795,6 @@ qemuDomainDefineXMLFlags(virConnectPtr conn, if (virDomainDefineXMLFlagsEnsureACL(conn, def) < 0) goto cleanup; - if (qemuDomainCheckDeviceChanges(driver, def) < 0) - goto cleanup; - if (!(vm = virDomainObjListAdd(driver->domains, def, driver->xmlopt, 0, &oldDef))) diff --git a/src/qemu/qemu_extdevice.c b/src/qemu/qemu_extdevice.c index af52466421..dc032aa60c 100644 --- a/src/qemu/qemu_extdevice.c +++ b/src/qemu/qemu_extdevice.c @@ -79,7 +79,7 @@ qemuExtDeviceLogCommand(qemuDomainLogContextPtr logCtxt, * stored and we can remove directories and files in case of domain XML * changes. */ -int +static int qemuExtDevicesInitPaths(virQEMUDriverPtr driver, virDomainDefPtr def) { diff --git a/src/qemu/qemu_extdevice.h b/src/qemu/qemu_extdevice.h index 5a53c79f38..039b3e60dd 100644 --- a/src/qemu/qemu_extdevice.h +++ b/src/qemu/qemu_extdevice.h @@ -54,6 +54,3 @@ bool qemuExtDevicesHasDevice(virDomainDefPtr def); int qemuExtDevicesSetupCgroup(virQEMUDriverPtr driver, virDomainDefPtr def, virCgroupPtr cgroup); - -int qemuExtDevicesInitPaths(virQEMUDriverPtr driver, - virDomainDefPtr def); -- 2.19.2

5 6

[libvirt] [PATCH v2 0/5] test_driver: implement IOThread related APIs
by Ilias Stamatis 12 Aug '19

12 Aug '19

Changes since v1: - Use vm-private data for storing iothread parameters and implement virDomainSetIOThreadParams Ilias Stamatis (5): test_driver: implement virDomainAddIOThread test_driver: implement virDomainDelIOThread test_driver: implement virDomainPinIOThread test_driver: implement virDomainGetIOThreadInfo test_driver: implement virDomainSetIOThreadParams src/test/test_driver.c | 362 +++++++++++++++++++++++++++++++++++++++++ src/test/test_driver.h | 11 ++ 2 files changed, 373 insertions(+) -- 2.22.0

1 5

[libvirt] [PATCH v2 0/2] add support for kvm-hint-dedicated performance hint
by Menno Lageman 12 Aug '19

12 Aug '19

v2 of: https://www.redhat.com/archives/libvir-list/2019-August/msg00363.html diff to v1: - reword description in documentation - move check for valid domain config to qemuDomainDefValidate Wim ten Have (2): qemu: support for kvm-hint-dedicated performance hint tests: add tests for kvm-hint-dedicated feature docs/formatdomain.html.in | 7 +++++++ docs/schemas/domaincommon.rng | 5 +++++ src/conf/domain_conf.c | 4 ++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_command.c | 5 +++++ src/qemu/qemu_domain.c | 11 ++++++++++- tests/qemuxml2argvdata/kvm-features-off.xml | 1 + tests/qemuxml2argvdata/kvm-features.args | 4 ++-- tests/qemuxml2argvdata/kvm-features.xml | 4 +++- tests/qemuxml2xmloutdata/kvm-features-off.xml | 1 + tests/qemuxml2xmloutdata/kvm-features.xml | 4 +++- 11 files changed, 42 insertions(+), 5 deletions(-) -- 2.21.0

2 3

[libvirt] [PATCH 0/2] add support for kvm-hint-dedicated performance hint
by Menno Lageman 12 Aug '19

12 Aug '19

QEMU version 2.12.1 introduced a performance feature under commit be7773268d98 ("target-i386: add KVM_HINTS_DEDICATED performance hint") This patch adds a new KVM feature 'hint-dedicated' to set this performance hint for KVM guests. Wim ten Have (2): qemu: support for kvm-hint-dedicated performance hint tests: add tests for kvm-hint-dedicated feature docs/formatdomain.html.in | 7 +++++++ docs/schemas/domaincommon.rng | 5 +++++ src/conf/domain_conf.c | 4 ++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_command.c | 13 +++++++++++++ tests/qemuxml2argvdata/kvm-features-off.xml | 1 + tests/qemuxml2argvdata/kvm-features.args | 4 ++-- tests/qemuxml2argvdata/kvm-features.xml | 4 +++- tests/qemuxml2xmloutdata/kvm-features-off.xml | 1 + tests/qemuxml2xmloutdata/kvm-features.xml | 4 +++- 10 files changed, 40 insertions(+), 4 deletions(-) -- 2.21.0

2 7

[libvirt] [PATCH v2 0/2] test_driver: implement get/set BlockIoTune APIs
by Ilias Stamatis 12 Aug '19

12 Aug '19

Ilias Stamatis (2): test_driver: implement testDomainGetBlockIoTune test_driver: implement virDomainSetBlockIoTune src/test/test_driver.c | 361 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 361 insertions(+) -- 2.22.0

2 5

[libvirt] [PATCH] util: allow tap-based guest interfaces to have MAC address prefix 0xFE
by Laine Stump 12 Aug '19

12 Aug '19

Back in July 2010, commit 6ea90b84 (meant to resolve https://bugzilla.redhat.com/571991 ) added code to set the MAC address of any tap device to the associated guest interface's MAC, but with the first byte replaced with 0xFE. This was done in order to assure that 1) the tap MAC and guest interface MAC were different (otherwise L2 forwarding through the tap would not work, and the kernel would repeatedly issue a warning stating as much). 2) any bridge device that had one of these taps attached would *not* take on the MAC of the tap (leading to network instability as guests started and stopped) A couple years later, https://bugzilla.redhat.com/798467 was filed, complaining that a user could configure a tap-based guest interface to have a MAC address that itself had a first byte of 0xFE, silently (other than the kernel warning messages) resulting in a non-working configuration. This was fixed by commit 5d571045, which logged an error and failed the guest start / interface attach if the MAC's first byte was 0xFE. Although this restriction only reduces the potential pool of MAC addresses from 2^46 (last two bits of byte 1 must be set to 10) by 2^32 (still 4 orders of magnitude larger than the entire IPv4 address space), it also means that management software that autogenerates MAC addresses must have special code to avoid an 0xFE prefix. Now after 7 years, someone has noticed this restriction and requested that we remove it. So instead of failing when 0xFE is found as the first byte, this patch removes the restriction by just replacing the first byte in the tap device MAC with 0xFA if the first byte in the guest interface is 0xFE. 0xFA is the next-highest value that still has 10 as the lowest two bits, and still 2) meets the requirement of "tap MAC must be different from guest interface MAC", and 3) is high enough that there should never be an issue of the attached bridge device taking on the MAC of the tap. The result is that *any* MAC can be chosen by management software (although it would still not work correctly if a multicast MAC (lowest bit of first byte set to 1) was chosen), but that's a different issue). Signed-off-by: Laine Stump <laine(a)redhat.com> --- Yes, I find it slightly problematic that the same setting is in two different places in the code, but 1) that is pre-existing, and 2) if I moved the MAC address setting down one level into virNetDevTapCreate(), the code would *still* need to be duplicated, since there are two different implementations of virNetDevTapCreate(). If anyone is bothered by this, then I can resubmit with an extra patch to add a new virNetDevTapCreate() that just calls a platform-specific virNetDevTapCreateInternal(), then sets the tap mac address. Only by request though :-). src/qemu/qemu_interface.c | 11 ++++++++++- src/util/virnetdevtap.c | 26 ++++++++++++-------------- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c index c8effa68f4..72ed51cb1f 100644 --- a/src/qemu/qemu_interface.c +++ b/src/qemu/qemu_interface.c @@ -444,8 +444,17 @@ qemuInterfaceEthernetConnect(virDomainDefPtr def, } virDomainAuditNetDevice(def, net, tunpath, true); + + /* The tap device's MAC address cannot match the MAC address + * used by the guest. This results in "received packet on + * vnetX with own address as source address" error logs from + * the kernel. + */ virMacAddrSet(&tapmac, &net->mac); - tapmac.addr[0] = 0xFE; + if (tapmac.addr[0] == 0xFE) + tapmac.addr[0] = 0xFA; + else + tapmac.addr[0] = 0xFE; if (virNetDevSetMAC(net->ifname, &tapmac) < 0) goto cleanup; diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c index b65c26bee1..4548b51b5b 100644 --- a/src/util/virnetdevtap.c +++ b/src/util/virnetdevtap.c @@ -668,7 +668,6 @@ int virNetDevTapCreateInBridgePort(const char *brname, unsigned int flags) { virMacAddr tapmac; - char macaddrstr[VIR_MAC_STRING_BUFLEN]; size_t i; if (virNetDevTapCreate(ifname, tunpath, tapfd, tapfdSize, flags) < 0) @@ -682,19 +681,18 @@ int virNetDevTapCreateInBridgePort(const char *brname, */ virMacAddrSet(&tapmac, macaddr); if (!(flags & VIR_NETDEV_TAP_CREATE_USE_MAC_FOR_BRIDGE)) { - if (macaddr->addr[0] == 0xFE) { - /* For normal use, the tap device's MAC address cannot - * match the MAC address used by the guest. This results - * in "received packet on vnetX with own address as source - * address" error logs from the kernel. - */ - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unable to use MAC address starting with " - "reserved value 0xFE - '%s' - "), - virMacAddrFormat(macaddr, macaddrstr)); - goto error; - } - tapmac.addr[0] = 0xFE; /* Discourage bridge from using TAP dev MAC */ + /* The tap device's MAC address cannot match the MAC address + * used by the guest. This results in "received packet on + * vnetX with own address as source address" error logs from + * the kernel. Making the tap address as high as possible + * discourages the bridge from using this tap's MAC as its own + * (a Linux host bridge will take on the lowest numbered MAC + * of all devices attached to it). + */ + if (tapmac.addr[0] == 0xFE) + tapmac.addr[0] = 0xFA; + else + tapmac.addr[0] = 0xFE; } if (virNetDevSetMAC(*ifname, &tapmac) < 0) -- 2.21.0

2 1

[libvirt] [PATCH] nwfilter: move standard XML configs out of examples dir
by Daniel P. Berrangé 12 Aug '19

12 Aug '19

The nwfilter XML configs are not merely examples, they are data that is actively shipped and used in production by users. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- examples/Makefile.am | 10 ---------- src/nwfilter/Makefile.inc.am | 8 ++++++++ .../xml/nwfilter => src/nwfilter/xml}/allow-arp.xml | 0 .../nwfilter/xml}/allow-dhcp-server.xml | 0 .../xml/nwfilter => src/nwfilter/xml}/allow-dhcp.xml | 0 .../nwfilter/xml}/allow-incoming-ipv4.xml | 0 .../xml/nwfilter => src/nwfilter/xml}/allow-ipv4.xml | 0 .../nwfilter/xml}/clean-traffic-gateway.xml | 0 .../nwfilter => src/nwfilter/xml}/clean-traffic.xml | 0 .../nwfilter/xml}/no-arp-ip-spoofing.xml | 0 .../nwfilter/xml}/no-arp-mac-spoofing.xml | 0 .../nwfilter => src/nwfilter/xml}/no-arp-spoofing.xml | 0 .../nwfilter => src/nwfilter/xml}/no-ip-multicast.xml | 0 .../nwfilter => src/nwfilter/xml}/no-ip-spoofing.xml | 0 .../nwfilter => src/nwfilter/xml}/no-mac-broadcast.xml | 0 .../nwfilter => src/nwfilter/xml}/no-mac-spoofing.xml | 0 .../nwfilter/xml}/no-other-l2-traffic.xml | 0 .../nwfilter/xml}/no-other-rarp-traffic.xml | 0 .../nwfilter/xml}/qemu-announce-self-rarp.xml | 0 .../nwfilter/xml}/qemu-announce-self.xml | 0 20 files changed, 8 insertions(+), 10 deletions(-) rename {examples/xml/nwfilter => src/nwfilter/xml}/allow-arp.xml (100%) rename {examples/xml/nwfilter => src/nwfilter/xml}/allow-dhcp-server.xml (100%) rename {examples/xml/nwfilter => src/nwfilter/xml}/allow-dhcp.xml (100%) rename {examples/xml/nwfilter => src/nwfilter/xml}/allow-incoming-ipv4.xml (100%) rename {examples/xml/nwfilter => src/nwfilter/xml}/allow-ipv4.xml (100%) rename {examples/xml/nwfilter => src/nwfilter/xml}/clean-traffic-gateway.xml (100%) rename {examples/xml/nwfilter => src/nwfilter/xml}/clean-traffic.xml (100%) rename {examples/xml/nwfilter => src/nwfilter/xml}/no-arp-ip-spoofing.xml (100%) rename {examples/xml/nwfilter => src/nwfilter/xml}/no-arp-mac-spoofing.xml (100%) rename {examples/xml/nwfilter => src/nwfilter/xml}/no-arp-spoofing.xml (100%) rename {examples/xml/nwfilter => src/nwfilter/xml}/no-ip-multicast.xml (100%) rename {examples/xml/nwfilter => src/nwfilter/xml}/no-ip-spoofing.xml (100%) rename {examples/xml/nwfilter => src/nwfilter/xml}/no-mac-broadcast.xml (100%) rename {examples/xml/nwfilter => src/nwfilter/xml}/no-mac-spoofing.xml (100%) rename {examples/xml/nwfilter => src/nwfilter/xml}/no-other-l2-traffic.xml (100%) rename {examples/xml/nwfilter => src/nwfilter/xml}/no-other-rarp-traffic.xml (100%) rename {examples/xml/nwfilter => src/nwfilter/xml}/qemu-announce-self-rarp.xml (100%) rename {examples/xml/nwfilter => src/nwfilter/xml}/qemu-announce-self.xml (100%) diff --git a/examples/Makefile.am b/examples/Makefile.am index 0adb4b42e2..ad635bdcc0 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -16,8 +16,6 @@ ## License along with this library. If not, see ## <http://www.gnu.org/licenses/>. -FILTERS = $(wildcard $(srcdir)/xml/nwfilter/*.xml) - ADMIN_EXAMPLES = \ $(wildcard $(srcdir)/c/admin/*.c) \ $(NULL) @@ -56,7 +54,6 @@ EXTRA_DIST = \ $(STORAGE_XML_EXAMPLES) \ $(SYSTEMTAP_EXAMPLES) \ $(TEST_XML_EXAMPLES) \ - $(FILTERS) \ $(NULL) AM_CPPFLAGS = \ @@ -111,13 +108,6 @@ c_misc_event_test_SOURCES = c/misc/event-test.c c_misc_hellolibvirt_SOURCES = c/misc/hellolibvirt.c c_misc_openauth_SOURCES = c/misc/openauth.c -if WITH_NWFILTER - -nwfilterdir = $(sysconfdir)/libvirt/nwfilter -nwfilter_DATA = $(FILTERS) - -endif WITH_NWFILTER - examplesdir = $(docdir)/examples adminexamplesdir = $(examplesdir)/c/admin diff --git a/src/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am index 277f75a9bd..7693634e29 100644 --- a/src/nwfilter/Makefile.inc.am +++ b/src/nwfilter/Makefile.inc.am @@ -1,5 +1,9 @@ # vim: filetype=automake +NWFILTER_XML_FILES = $(wildcard $(srcdir)/nwfilter/xml/*.xml) + +EXTRA_DIST += $(NWFILTER_XML_FILES) + NWFILTER_DRIVER_SOURCES = \ nwfilter/nwfilter_driver.h \ nwfilter/nwfilter_driver.c \ @@ -19,6 +23,10 @@ STATEFUL_DRIVER_SOURCE_FILES += $(NWFILTER_DRIVER_SOURCES) EXTRA_DIST += $(NWFILTER_DRIVER_SOURCES) if WITH_NWFILTER + +nwfilterxmldir = $(sysconfdir)/libvirt/nwfilter +nwfilterxml_DATA = $(NWFILTER_XML_FILES) + noinst_LTLIBRARIES += libvirt_driver_nwfilter_impl.la libvirt_driver_nwfilter_la_SOURCES = libvirt_driver_nwfilter_la_LIBADD = libvirt_driver_nwfilter_impl.la diff --git a/examples/xml/nwfilter/allow-arp.xml b/src/nwfilter/xml/allow-arp.xml similarity index 100% rename from examples/xml/nwfilter/allow-arp.xml rename to src/nwfilter/xml/allow-arp.xml diff --git a/examples/xml/nwfilter/allow-dhcp-server.xml b/src/nwfilter/xml/allow-dhcp-server.xml similarity index 100% rename from examples/xml/nwfilter/allow-dhcp-server.xml rename to src/nwfilter/xml/allow-dhcp-server.xml diff --git a/examples/xml/nwfilter/allow-dhcp.xml b/src/nwfilter/xml/allow-dhcp.xml similarity index 100% rename from examples/xml/nwfilter/allow-dhcp.xml rename to src/nwfilter/xml/allow-dhcp.xml diff --git a/examples/xml/nwfilter/allow-incoming-ipv4.xml b/src/nwfilter/xml/allow-incoming-ipv4.xml similarity index 100% rename from examples/xml/nwfilter/allow-incoming-ipv4.xml rename to src/nwfilter/xml/allow-incoming-ipv4.xml diff --git a/examples/xml/nwfilter/allow-ipv4.xml b/src/nwfilter/xml/allow-ipv4.xml similarity index 100% rename from examples/xml/nwfilter/allow-ipv4.xml rename to src/nwfilter/xml/allow-ipv4.xml diff --git a/examples/xml/nwfilter/clean-traffic-gateway.xml b/src/nwfilter/xml/clean-traffic-gateway.xml similarity index 100% rename from examples/xml/nwfilter/clean-traffic-gateway.xml rename to src/nwfilter/xml/clean-traffic-gateway.xml diff --git a/examples/xml/nwfilter/clean-traffic.xml b/src/nwfilter/xml/clean-traffic.xml similarity index 100% rename from examples/xml/nwfilter/clean-traffic.xml rename to src/nwfilter/xml/clean-traffic.xml diff --git a/examples/xml/nwfilter/no-arp-ip-spoofing.xml b/src/nwfilter/xml/no-arp-ip-spoofing.xml similarity index 100% rename from examples/xml/nwfilter/no-arp-ip-spoofing.xml rename to src/nwfilter/xml/no-arp-ip-spoofing.xml diff --git a/examples/xml/nwfilter/no-arp-mac-spoofing.xml b/src/nwfilter/xml/no-arp-mac-spoofing.xml similarity index 100% rename from examples/xml/nwfilter/no-arp-mac-spoofing.xml rename to src/nwfilter/xml/no-arp-mac-spoofing.xml diff --git a/examples/xml/nwfilter/no-arp-spoofing.xml b/src/nwfilter/xml/no-arp-spoofing.xml similarity index 100% rename from examples/xml/nwfilter/no-arp-spoofing.xml rename to src/nwfilter/xml/no-arp-spoofing.xml diff --git a/examples/xml/nwfilter/no-ip-multicast.xml b/src/nwfilter/xml/no-ip-multicast.xml similarity index 100% rename from examples/xml/nwfilter/no-ip-multicast.xml rename to src/nwfilter/xml/no-ip-multicast.xml diff --git a/examples/xml/nwfilter/no-ip-spoofing.xml b/src/nwfilter/xml/no-ip-spoofing.xml similarity index 100% rename from examples/xml/nwfilter/no-ip-spoofing.xml rename to src/nwfilter/xml/no-ip-spoofing.xml diff --git a/examples/xml/nwfilter/no-mac-broadcast.xml b/src/nwfilter/xml/no-mac-broadcast.xml similarity index 100% rename from examples/xml/nwfilter/no-mac-broadcast.xml rename to src/nwfilter/xml/no-mac-broadcast.xml diff --git a/examples/xml/nwfilter/no-mac-spoofing.xml b/src/nwfilter/xml/no-mac-spoofing.xml similarity index 100% rename from examples/xml/nwfilter/no-mac-spoofing.xml rename to src/nwfilter/xml/no-mac-spoofing.xml diff --git a/examples/xml/nwfilter/no-other-l2-traffic.xml b/src/nwfilter/xml/no-other-l2-traffic.xml similarity index 100% rename from examples/xml/nwfilter/no-other-l2-traffic.xml rename to src/nwfilter/xml/no-other-l2-traffic.xml diff --git a/examples/xml/nwfilter/no-other-rarp-traffic.xml b/src/nwfilter/xml/no-other-rarp-traffic.xml similarity index 100% rename from examples/xml/nwfilter/no-other-rarp-traffic.xml rename to src/nwfilter/xml/no-other-rarp-traffic.xml diff --git a/examples/xml/nwfilter/qemu-announce-self-rarp.xml b/src/nwfilter/xml/qemu-announce-self-rarp.xml similarity index 100% rename from examples/xml/nwfilter/qemu-announce-self-rarp.xml rename to src/nwfilter/xml/qemu-announce-self-rarp.xml diff --git a/examples/xml/nwfilter/qemu-announce-self.xml b/src/nwfilter/xml/qemu-announce-self.xml similarity index 100% rename from examples/xml/nwfilter/qemu-announce-self.xml rename to src/nwfilter/xml/qemu-announce-self.xml -- 2.21.0

2 1

[libvirt] [PATCH] m4: Drop libxml2 version number from configure help
by Andrea Bolognani 12 Aug '19

12 Aug '19

We don't include this information for any other library, and having it there means there are two places we need to change every time the required version is bumped. configure will provide the user with a nice error message, which includes the required version, if libxml2 found on the system is too old. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. m4/virt-libxml.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4/virt-libxml.m4 b/m4/virt-libxml.m4 index 9aefbdc3f1..cce54d88fb 100644 --- a/m4/virt-libxml.m4 +++ b/m4/virt-libxml.m4 @@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>. dnl AC_DEFUN([LIBVIRT_ARG_LIBXML], [ - LIBVIRT_ARG_WITH([LIBXML], [libxml-2.0 (>= 2.9.1) location], [check]) + LIBVIRT_ARG_WITH([LIBXML], [libxml-2.0 location], [check]) ]) AC_DEFUN([LIBVIRT_CHECK_LIBXML], [ -- 2.21.0

1 0

[libvirt] [PATCH v2 0/3] test_driver: implement the remaining ManagedSave APIs
by Ilias Stamatis 09 Aug '19

09 Aug '19

Ilias Stamatis (3): test_driver: use domain-private data to store managed image test_driver: implement virDomainManagedSaveGetXMLDesc test_driver: implement virDomainManagedSaveDefineXML src/test/test_driver.c | 93 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 92 insertions(+), 1 deletion(-) -- 2.22.0

1 3

[libvirt] [PATCH v2] snapshot: Store both config and live XML in the snapshot domain
by Maxiwell S. Garcia 09 Aug '19

09 Aug '19

The snapshot-create operation of running guests saves the live XML and uses it to replace the active and inactive domain in case of revert. So, the config XML is ignored by the snapshot process. This commit changes it and adds the config XML in the snapshot XML as the <inactiveDomain> entry. In case of offline guest, the behavior remains the same and the config XML is saved in the snapshot XML as <domain> entry. The behavior of older snapshots of running guests, that don't have the new <inactiveDomain>, remains the same too. The revert, in this case, overrides both active and inactive domain with the <domain> entry. So, the <inactiveDomain> in the snapshot XML is not required to snapshot work, but it's useful to preserve the config XML of running guests. Signed-off-by: Maxiwell S. Garcia <maxiwell(a)linux.ibm.com> --- src/conf/moment_conf.c | 1 + src/conf/moment_conf.h | 11 +++++++++ src/conf/snapshot_conf.c | 48 +++++++++++++++++++++++++++++++++++----- src/qemu/qemu_driver.c | 27 +++++++++++++++++----- src/util/virxml.c | 45 +++++++++++++++++++++++++++++++++++++ src/util/virxml.h | 8 +++++++ 6 files changed, 130 insertions(+), 10 deletions(-) diff --git a/src/conf/moment_conf.c b/src/conf/moment_conf.c index fea13f0f97..f54a44b33e 100644 --- a/src/conf/moment_conf.c +++ b/src/conf/moment_conf.c @@ -66,6 +66,7 @@ virDomainMomentDefDispose(void *obj) VIR_FREE(def->description); VIR_FREE(def->parent_name); virDomainDefFree(def->dom); + virDomainDefFree(def->inactiveDom); } /* Provide defaults for creation time and moment name after parsing XML */ diff --git a/src/conf/moment_conf.h b/src/conf/moment_conf.h index 9fdbef2172..70cc47bd70 100644 --- a/src/conf/moment_conf.h +++ b/src/conf/moment_conf.h @@ -36,7 +36,18 @@ struct _virDomainMomentDef { char *parent_name; long long creationTime; /* in seconds */ + /* + * Store the active domain definition in case of online + * guest and the inactive domain definition in case of + * offline guest + */ virDomainDefPtr dom; + + /* + * Store the inactive domain definition in case of online + * guest and leave NULL in case of offline guest + */ + virDomainDefPtr inactiveDom; }; virClassPtr virClassForDomainMomentDef(void); diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index 324901a560..8aeac9ab20 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -243,6 +243,8 @@ virDomainSnapshotDefParse(xmlXPathContextPtr ctxt, char *memoryFile = NULL; bool offline = !!(flags & VIR_DOMAIN_SNAPSHOT_PARSE_OFFLINE); virSaveCookieCallbacksPtr saveCookie = virDomainXMLOptionGetSaveCookie(xmlopt); + int domainflags = VIR_DOMAIN_DEF_PARSE_INACTIVE | + VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE; if (!(def = virDomainSnapshotDefNew())) return NULL; @@ -292,8 +294,6 @@ virDomainSnapshotDefParse(xmlXPathContextPtr ctxt, * clients will have to decide between best effort * initialization or outright failure. */ if ((tmp = virXPathString("string(./domain/@type)", ctxt))) { - int domainflags = VIR_DOMAIN_DEF_PARSE_INACTIVE | - VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE; xmlNodePtr domainNode = virXPathNode("./domain", ctxt); VIR_FREE(tmp); @@ -309,6 +309,20 @@ virDomainSnapshotDefParse(xmlXPathContextPtr ctxt, } else { VIR_WARN("parsing older snapshot that lacks domain"); } + + /* /inactiveDomain entry saves the config XML present in a running + * VM. In case of absent, leave parent.inactiveDom NULL and use + * parent.dom for config and live XML. */ + if (virXPathString("string(./inactiveDomain/@type)", ctxt)) { + xmlNodePtr domainNode = virXPathNode("./inactiveDomain", ctxt); + + if (domainNode) { + def->parent.inactiveDom = virDomainDefParseNode(ctxt->node->doc, domainNode, + caps, xmlopt, NULL, domainflags); + if (!def->parent.inactiveDom) + goto cleanup; + } + } } else if (virDomainXMLOptionRunMomentPostParse(xmlopt, &def->parent) < 0) { goto cleanup; } @@ -845,6 +859,10 @@ virDomainSnapshotDefFormatInternal(virBufferPtr buf, { size_t i; int domainflags = VIR_DOMAIN_DEF_FORMAT_INACTIVE; + virBuffer inactivedom_buf = VIR_BUFFER_INITIALIZER; + xmlXPathContextPtr inactivedom_ctxt = NULL; + char *inactivedom_str = NULL; + int ret = -1; if (flags & VIR_DOMAIN_SNAPSHOT_FORMAT_SECURE) domainflags |= VIR_DOMAIN_DEF_FORMAT_SECURE; @@ -903,6 +921,20 @@ virDomainSnapshotDefFormatInternal(virBufferPtr buf, virBufferAddLit(buf, "</domain>\n"); } + if (def->parent.inactiveDom) { + if (virDomainDefFormatInternal(def->parent.inactiveDom, caps, + domainflags, &inactivedom_buf, xmlopt) < 0) + goto error; + + inactivedom_ctxt = virXPathBuildContext(&inactivedom_buf); + if (!(inactivedom_str = virXPathRenameNode("/domain", "inactiveDomain", + inactivedom_ctxt))) + goto error; + + virBufferAddStr(buf, inactivedom_str); + virBufferAddLit(buf, "\n"); + } + if (virSaveCookieFormatBuf(buf, def->cookie, virDomainXMLOptionGetSaveCookie(xmlopt)) < 0) goto error; @@ -917,11 +949,17 @@ virDomainSnapshotDefFormatInternal(virBufferPtr buf, if (virBufferCheckError(buf) < 0) goto error; - return 0; + ret = 0; error: - virBufferFreeAndReset(buf); - return -1; + VIR_FREE(inactivedom_str); + xmlXPathFreeContext(inactivedom_ctxt); + virBufferFreeAndReset(&inactivedom_buf); + + if (ret < 0) + virBufferFreeAndReset(buf); + + return ret; } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 482f915b67..9b95e9b766 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15697,6 +15697,13 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE))) goto endjob; + if (vm->newDef) { + def->parent.inactiveDom = virDomainDefCopy(vm->newDef, caps, + driver->xmlopt, NULL, true); + if (!def->parent.inactiveDom) + goto endjob; + } + if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_DISK_ONLY) { align_location = VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL; align_match = false; @@ -16231,6 +16238,7 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, qemuDomainObjPrivatePtr priv; int rc; virDomainDefPtr config = NULL; + virDomainDefPtr inactiveConfig = NULL; virQEMUDriverConfigPtr cfg = NULL; virCapsPtr caps = NULL; bool was_stopped = false; @@ -16331,17 +16339,22 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, * in the failure cases where we know there was no change? */ } - /* Prepare to copy the snapshot inactive xml as the config of this - * domain. - * - * XXX Should domain snapshots track live xml rather - * than inactive xml? */ + /* Prepare to copy the snapshot inactive domain as the config XML + * and the snapshot domain as the live XML. In case of inactive domain + * NULL, both config and live XML will be copied from snapshot domain. + */ if (snap->def->dom) { config = virDomainDefCopy(snap->def->dom, caps, driver->xmlopt, NULL, true); if (!config) goto endjob; } + if (snap->def->inactiveDom) { + inactiveConfig = virDomainDefCopy(snap->def->inactiveDom, caps, + driver->xmlopt, NULL, true); + if (!inactiveConfig) + goto endjob; + } cookie = (qemuDomainSaveCookiePtr) snapdef->cookie; @@ -16592,6 +16605,10 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, goto endjob; } + if (inactiveConfig) { + virDomainDefFree(vm->newDef); + VIR_STEAL_PTR(vm->newDef, inactiveConfig); + } ret = 0; endjob: diff --git a/src/util/virxml.c b/src/util/virxml.c index f55b9a362c..756c0eedbc 100644 --- a/src/util/virxml.c +++ b/src/util/virxml.c @@ -1408,3 +1408,48 @@ virXPathContextNodeRestore(virXPathContextNodeSavePtr save) save->ctxt->node = save->node; } + + +/** + * virXPathBuildContext: convert an parent buffer to an + * XPath context ptr. The caller has to free the ptr. + */ +xmlXPathContextPtr +virXPathBuildContext(virBufferPtr root) +{ + xmlDocPtr doc; + + if (!root) + return NULL; + + doc = virXMLParseString(virBufferCurrentContent(root), NULL); + if (!doc) + return NULL; + + return xmlXPathNewContext(doc); +} + + +/** + * virXPathRenameNode: get the XML node using the 'xpath' and + * rename it with the 'newname' string. + * + * Returns the XML string of the node found by 'xpath' or NULL + * on error. The caller has to free the string. + */ +char * +virXPathRenameNode(const char *xpath, + const char *newname, + xmlXPathContextPtr ctxt) +{ + xmlNodePtr node; + + if (!xpath || !newname || !ctxt) + return NULL; + + if (!(node = virXPathNode(xpath, ctxt))) + return NULL; + + xmlNodeSetName(node, (xmlChar *) newname); + return virXMLNodeToString(node->doc, node); +} diff --git a/src/util/virxml.h b/src/util/virxml.h index 6208977dd1..48a507c3c1 100644 --- a/src/util/virxml.h +++ b/src/util/virxml.h @@ -220,6 +220,14 @@ virXMLFormatElement(virBufferPtr buf, virBufferPtr childBuf) ATTRIBUTE_RETURN_CHECK; +xmlXPathContextPtr +virXPathBuildContext(virBufferPtr root); + +char * +virXPathRenameNode(const char *xpath, + const char *newname, + xmlXPathContextPtr ctxt); + struct _virXPathContextNodeSave { xmlXPathContextPtr ctxt; xmlNodePtr node; -- 2.20.1

4 7

[libvirt] [dockerfiles PATCH 0/4] refresh: Some minor cleanups
by Andrea Bolognani 09 Aug '19

09 Aug '19

Andrea Bolognani (4): refresh: Get rid of self.project_name refresh: Improve project handling refresh: Look for project with startswith() refresh: Update comments refresh | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) -- 2.21.0

2 5

[libvirt] [PATCH v2] qemu: check if numa cell's cpu range match with cpu topology count
by Maxiwell S. Garcia 09 Aug '19

09 Aug '19

QEMU shows a warning message if partial NUMA mapping is set. This patch adds a warning message in libvirt when editing the XML. It must be an error in future, when QEMU remove this ability. Signed-off-by: Maxiwell S. Garcia <maxiwell(a)linux.ibm.com> --- src/qemu/qemu_domain.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 0555caa6ab..62dd428fca 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4621,15 +4621,24 @@ qemuDomainDefValidate(const virDomainDef *def, if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS)) { unsigned int topologycpus; unsigned int granularity; + unsigned int numacpus; /* Starting from QEMU 2.5, max vCPU count and overall vCPU topology * must agree. We only actually enforce this with QEMU 2.7+, due * to the capability check above */ - if (virDomainDefGetVcpusTopology(def, &topologycpus) == 0 && - topologycpus != virDomainDefGetVcpusMax(def)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("CPU topology doesn't match maximum vcpu count")); - goto cleanup; + if (virDomainDefGetVcpusTopology(def, &topologycpus) == 0) { + if (topologycpus != virDomainDefGetVcpusMax(def)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("CPU topology doesn't match maximum vcpu count")); + goto cleanup; + } + + numacpus = virDomainNumaGetCPUCountTotal(def->numa); + if ((numacpus != 0) && (topologycpus != numacpus)) { + VIR_WARN("CPU topology doesn't match numa CPU count; " + "partial NUMA mapping is obsoleted and will " + "be removed in future"); + } } /* vCPU hotplug granularity must be respected */ -- 2.20.1

2 1

[libvirt] [PATCH v3 0/5] Add support for Direct Mode for Hyper-V Synthetic timers
by Vitaly Kuznetsov 09 Aug '19

09 Aug '19

Changes since v2: - Post 5.6.0 rebase, patches 1-3 are dropped as they were already merged. Original description: QEMU-4.1 will bring us Direct Mode for Hyper-V Synthetic timers support, we need to support it in libvirt too. As this is not a new enlightenment but rather an enhancement of an existing one ('stimer'), support it in <stimer state='on'> <direct state='on'/> </stimer> form. Backwards compatibility is (hopefully) preserved. Vitaly Kuznetsov (5): cpu_x86: add Edx to KVM_FEATURE_DEF() conf: change the way how Hyper-V features are printed out conf: add support for Direct Mode for Hyper-V Synthetic timers qemu: add support for Direct Mode for Hyper-V Synthetic timers news: mention Direct Mode for Hyper-V Synthetic timers support docs/formatdomain.html.in | 10 ++-- docs/news.xml | 9 ++++ docs/schemas/domaincommon.rng | 16 +++++- src/conf/domain_conf.c | 77 ++++++++++++++++++++++++++--- src/conf/domain_conf.h | 1 + src/cpu/cpu_x86.c | 33 +++++++------ src/cpu/cpu_x86_data.h | 2 + src/qemu/qemu_command.c | 12 +++-- src/qemu/qemu_process.c | 20 +++++++- tests/qemuxml2argvdata/hyperv.args | 4 +- tests/qemuxml2argvdata/hyperv.xml | 4 +- tests/qemuxml2xmloutdata/hyperv.xml | 4 +- 12 files changed, 155 insertions(+), 37 deletions(-) -- 2.20.1

2 15

[libvirt] [PATCH] admin: Fix missing filters of debug msg for virAdmConnectSetLoggingFilters
by Han Han 09 Aug '19

09 Aug '19

Signed-off-by: Han Han <hhan(a)redhat.com> --- src/libvirt-admin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libvirt-admin.c b/src/libvirt-admin.c index 4ae50b188f..cf40ea122e 100644 --- a/src/libvirt-admin.c +++ b/src/libvirt-admin.c @@ -1236,7 +1236,7 @@ virAdmConnectSetLoggingFilters(virAdmConnectPtr conn, { int ret = -1; - VIR_DEBUG("conn=%p, flags=0x%x", conn, flags); + VIR_DEBUG("conn=%p, filters=%s, flags=0x%x", conn, filters, flags); virResetLastError(); virCheckAdmConnectReturn(conn, -1); -- 2.20.1

2 1

[libvirt] [PATCH] conf: code comment fix for TPM version
by marcandre.lureau＠redhat.com 09 Aug '19

09 Aug '19

From: Marc-André Lureau <marcandre.lureau(a)redhat.com> Since its introduction in commit 8737578d115b8328f59f3342377b0c7ac06f658a, the TPM version format is "2.0" and not "2". Signed-off-by: Marc-André Lureau <marcandre.lureau(a)redhat.com> --- src/conf/domain_conf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0456369d55..e4c280e0d5 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13053,13 +13053,13 @@ virDomainSmartcardDefParseXML(virDomainXMLOptionPtr xmlopt, * or like this: * * <tpm model='tpm-tis'> - * <backend type='emulator' version='2'/> + * <backend type='emulator' version='2.0'/> * </tpm> * * Emulator state encryption is supported with the following: * * <tpm model='tpm-tis'> - * <backend type='emulator' version='2'> + * <backend type='emulator' version='2.0'> * <encryption uuid='32ee7e76-2178-47a1-ab7b-269e6e348015'/> * </backend> * </tpm> -- 2.23.0.rc1

3 2

[libvirt] [PATCH] Revert "configure: Remove --enable-test-coverage"
by Jiri Denemark 09 Aug '19

09 Aug '19

This reverts commit f38d553e2d6ec2f041cb7947b5eafcdd3b26ae65. Gnulib's make coverage (or init-coverage, build-coverage, gen-coverage) is not a 1-1 replacement for the original configure option. Our old --enable-test-coverage seems to be close to gnulib's make build-coverage except gnulib runs lcov in that phase and the build actually fails for me even before lcov is run. And since we want to be able to just build libvirt without running lcov, I suggest reverting to our own implementation. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- Notes: I admit the best solution would be to somehow make gnulib support what we need (and fix the actual build), but I don't feel brave enough to do that. Eric? :-) Also if we ever switch to glib and drop gnulib completely, we would need to reintroduce our own implementation anyway. Makefile.am | 20 +++++++++++++++++--- configure.ac | 18 ++++++++++++++++++ src/Makefile.am | 3 ++- src/remote/Makefile.inc.am | 2 ++ tests/Makefile.am | 2 ++ tools/Makefile.am | 6 ++++++ 6 files changed, 47 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index dedd8d2ff8..27c49280c4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,15 +16,15 @@ ## License along with this library. If not, see ## <http://www.gnu.org/licenses/>. +LCOV = lcov +GENHTML = genhtml + SUBDIRS = . gnulib/lib include/libvirt src tools docs gnulib/tests \ tests po examples XZ_OPT ?= -v -T0 export XZ_OPT -# have gnulib 'make coverage' output to 'cov' dir -COVERAGE_OUT = "cov" - ACLOCAL_AMFLAGS = -I m4 EXTRA_DIST = \ @@ -87,6 +87,20 @@ check-local: all tests check-access: all @($(MAKE) $(AM_MAKEFLAGS) -C tests check-access) +cov: clean-cov + $(MKDIR_P) $(top_builddir)/coverage + $(LCOV) -c -o $(top_builddir)/coverage/libvirt.info.tmp \ + -d $(top_builddir)/src \ + -d $(top_builddir)/tests + $(LCOV) -r $(top_builddir)/coverage/libvirt.info.tmp \ + -o $(top_builddir)/coverage/libvirt.info + rm $(top_builddir)/coverage/libvirt.info.tmp + $(GENHTML) --show-details -t "libvirt" -o $(top_builddir)/coverage \ + --legend $(top_builddir)/coverage/libvirt.info + +clean-cov: + rm -rf $(top_builddir)/coverage + MAINTAINERCLEANFILES = .git-module-status dist-hook: gen-AUTHORS diff --git a/configure.ac b/configure.ac index ebb2e24e21..f41c6d5d86 100644 --- a/configure.ac +++ b/configure.ac @@ -726,6 +726,23 @@ fi AC_SUBST([VIR_TEST_EXPENSIVE_DEFAULT]) AM_CONDITIONAL([WITH_EXPENSIVE_TESTS], [test $VIR_TEST_EXPENSIVE_DEFAULT = 1]) +LIBVIRT_ARG_ENABLE([TEST_COVERAGE], [turn on code coverage instrumentation], [no]) +case "$enable_test_coverage" in + yes|no) ;; + *) AC_MSG_ERROR([bad value ${enable_test_coverga} for test-coverage option]) ;; +esac + +if test "$enable_test_coverage" = yes; then + save_WARN_CFLAGS=$WARN_CFLAGS + WARN_CFLAGS= + gl_WARN_ADD([-fprofile-arcs]) + gl_WARN_ADD([-ftest-coverage]) + COVERAGE_FLAGS=$WARN_CFLAGS + AC_SUBST([COVERAGE_CFLAGS], [$COVERAGE_FLAGS]) + AC_SUBST([COVERAGE_LDFLAGS], [$COVERAGE_FLAGS]) + WARN_CFLAGS=$save_WARN_CFLAGS +fi + LIBVIRT_ARG_ENABLE([TEST_OOM], [memory allocation failure checking], [no]) case "$enable_test_oom" in yes|no) ;; @@ -1011,6 +1028,7 @@ LIBVIRT_WIN_RESULT_WINDRES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Test suite]) AC_MSG_NOTICE([]) +AC_MSG_NOTICE([ Coverage: $enable_test_coverage]) AC_MSG_NOTICE([ Alloc OOM: $enable_test_oom]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([Miscellaneous]) diff --git a/src/Makefile.am b/src/Makefile.am index f111b2a1b4..5ddc06f629 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -37,8 +37,9 @@ AM_CFLAGS = $(LIBXML_CFLAGS) \ $(WARN_CFLAGS) \ $(LOCK_CHECKING_CFLAGS) \ $(WIN32_EXTRA_CFLAGS) \ - $(NULL) + $(COVERAGE_CFLAGS) AM_LDFLAGS = $(DRIVER_MODULES_LDFLAGS) \ + $(COVERAGE_LDFLAGS) \ $(RELRO_LDFLAGS) \ $(NO_INDIRECT_LDFLAGS) \ $(CYGWIN_EXTRA_LDFLAGS) \ diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 0cf00cb902..4d3a450461 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -145,6 +145,7 @@ libvirtd_CFLAGS = \ $(LIBNL_CFLAGS) \ $(WARN_CFLAGS) \ $(PIE_CFLAGS) \ + $(COVERAGE_CFLAGS) \ -I$(srcdir)/access \ -I$(srcdir)/conf \ -I$(srcdir)/rpc \ @@ -153,6 +154,7 @@ libvirtd_CFLAGS = \ libvirtd_LDFLAGS = \ $(RELRO_LDFLAGS) \ $(PIE_LDFLAGS) \ + $(COVERAGE_LDFLAGS) \ $(NO_INDIRECT_LDFLAGS) \ $(NO_UNDEFINED_LDFLAGS) \ $(NULL) diff --git a/tests/Makefile.am b/tests/Makefile.am index 1c92e3ca6f..23e7c422ea 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -41,6 +41,7 @@ AM_CFLAGS = \ $(SELINUX_CFLAGS) \ $(APPARMOR_CFLAGS) \ $(YAJL_CFLAGS) \ + $(COVERAGE_CFLAGS) \ $(XDR_CFLAGS) \ $(WARN_CFLAGS) @@ -267,6 +268,7 @@ endif WITH_SECDRIVER_SELINUX # This is a fake SSH we use from virnetsockettest ssh_SOURCES = ssh.c +ssh_LDADD = $(COVERAGE_LDFLAGS) if WITH_LIBXL test_programs += xlconfigtest \ diff --git a/tools/Makefile.am b/tools/Makefile.am index df3d628bab..9cf6baf35b 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -33,6 +33,7 @@ WARN_CFLAGS += $(STRICT_FRAME_LIMIT_CFLAGS) AM_CFLAGS = \ $(WARN_CFLAGS) \ + $(COVERAGE_CFLAGS) \ $(PIE_CFLAGS) \ $(LIBXML_CFLAGS) \ $(NULL) @@ -143,6 +144,7 @@ libvirt_shell_la_CFLAGS = \ libvirt_shell_la_LDFLAGS = \ $(AM_LDFLAGS) \ $(PIE_LDFLAGS) \ + $(COVERAGE_LDFLAGS) \ $(NULL) libvirt_shell_la_LIBADD = \ ../src/libvirt.la \ @@ -188,6 +190,7 @@ endif ! WITH_BHYVE virt_host_validate_LDFLAGS = \ $(AM_LDFLAGS) \ $(PIE_LDFLAGS) \ + $(COVERAGE_LDFLAGS) \ $(NULL) virt_host_validate_LDADD = \ @@ -213,6 +216,7 @@ virt_login_shell_helper_SOURCES = \ virt_login_shell_helper_LDFLAGS = \ $(AM_LDFLAGS) \ $(PIE_LDFLAGS) \ + $(COVERAGE_LDFLAGS) \ $(NULL) virt_login_shell_helper_LDADD = \ ../src/libvirt.la \ @@ -245,6 +249,7 @@ virsh_SOURCES = \ virsh_LDFLAGS = \ $(AM_LDFLAGS) \ $(PIE_LDFLAGS) \ + $(COVERAGE_LDFLAGS) \ $(NULL) virsh_LDADD = \ $(STATIC_BINARIES) \ @@ -262,6 +267,7 @@ virt_admin_SOURCES = \ virt_admin_LDFLAGS = \ $(AM_LDFLAGS) \ + $(COVERAGE_LDFLAGS) \ $(STATIC_BINARIES) \ $(PIE_LDFLAGS) \ $(NULL) -- 2.22.0

2 1

[libvirt] [PATCH 00/10] Pass correct qemuCaps to qemuDomainDefPostParse
by Jiri Denemark 09 Aug '19

09 Aug '19

Since qemuDomain{Device,}DefPostParse callbacks require qemuCaps, we need to make sure they get the capabilities stored in the domain's private data if the domain is running. Passing NULL may cause QEMU capabilities probing to be triggered in case the cached capabilities are not valid anymore. When this happens while a running domain object is locked, QMP event delivered to the domain before QEMU capabilities probing finishes will deadlock the event loop. The funny part is that qemuDomainDeviceDefPostParse and qemuDomainDefPostParse are a callbacks for virDomainDeviceDefPostParse and virDomainDefPostParse respectively and we need to make sure to properly set the parseOpaque pointer in all paths which could eventually go through these general APIs. If you are interested, you can look at the called-by graph for virDomainDeviceDefPostParse at http://people.redhat.com/jdenemar/virDomainDeviceDefPostParse.svg Only a few of those paths were correct. Jiri Denemark (10): qemu: Pass qemuCaps to qemuDomainDefCopy qemu: Pass qemuCaps to qemuDomainDefFormatBufInternal qemu: Pass qemuCaps to qemuDomainSaveImageOpen qemu: Pass qemuCaps to qemuMigrationAnyPrepareDef qemu: Pass correct qemuCaps to virDomainDefParseString qemu: Pass qemuCaps to qemuMigrationCookieXMLParse qemu: Pass correct qemuCaps to virDomainDefCopy qemu: Pass correct qemuCaps to virDomainDefPostParse qemu: Pass correct qemuCaps to virDomainDefParseNode qemu: Pass correct qemuCaps to virDomainDeviceDefPostParse src/conf/checkpoint_conf.c | 9 +- src/conf/checkpoint_conf.h | 1 + src/conf/domain_conf.c | 41 ++++--- src/conf/domain_conf.h | 13 ++- src/conf/snapshot_conf.c | 11 +- src/conf/snapshot_conf.h | 2 + src/esx/esx_driver.c | 2 +- src/libxl/libxl_domain.c | 2 +- src/libxl/libxl_driver.c | 22 ++-- src/libxl/libxl_migration.c | 2 +- src/lxc/lxc_driver.c | 18 +-- src/lxc/lxc_process.c | 2 +- src/openvz/openvz_driver.c | 2 +- src/phyp/phyp_driver.c | 2 +- src/qemu/qemu_domain.c | 53 +++++---- src/qemu/qemu_domain.h | 5 + src/qemu/qemu_driver.c | 149 +++++++++++++++--------- src/qemu/qemu_migration.c | 22 ++-- src/qemu/qemu_migration.h | 1 + src/qemu/qemu_migration_cookie.c | 16 ++- src/qemu/qemu_process.c | 13 ++- src/test/test_driver.c | 7 +- src/vbox/vbox_common.c | 8 +- tests/qemudomaincheckpointxml2xmltest.c | 2 +- tests/qemudomainsnapshotxml2xmltest.c | 2 +- tests/qemuhotplugtest.c | 4 +- 26 files changed, 256 insertions(+), 155 deletions(-) -- 2.22.0

2 11

[libvirt] [PATCH 0/3] Fix NSS issue
by Michal Privoznik 09 Aug '19

09 Aug '19

Haven't spotted it during review of Dan's patches. Long story short, if there's an unexpected key in JSON parsing stops. But in general a key is hot harmful and shouldn't cause parser to stop. See 1/3 for more explanation. Michal Prívozník (3): nss: Don't stop parsing on unexpected key nss: Include stdio.h and define NULLSTR when debugging is enabled nss: Don't leak memory on parse error tests/nssdata/virbr1.status | 1 + tools/nss/libvirt_nss.h | 2 ++ tools/nss/libvirt_nss_leases.c | 9 +++++---- 3 files changed, 8 insertions(+), 4 deletions(-) -- 2.21.0

2 7

[libvirt] [PATCH] docs: formatdomain: explain host-model/host-passthrough requirements
by Paolo Bonzini 09 Aug '19

09 Aug '19

host-passthrough documentation menions that the source and destination hosts are not identical in both hardware and configuration. Configuration actually includes microcode version and QEMU version, but this is not clear so make it explicit Signed-off-by: Paolo Bonzini <pbonzini(a)redhat.com> --- docs/formatdomain.html.in | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index f5c882141a..6d084d7c04 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1590,8 +1590,8 @@ hand, the ABI provided to the guest is reproducible. During migration, complete CPU model definition is transferred to the destination host so the migrated guest will see exactly the same CPU - model even if the destination host contains more capable CPUs for - the running instance of the guest; but shutting down and restarting + model for the running instance of the guest, even if the destination + host contains more capable CPUs or newer kernel; but shutting down and restarting the guest may present different hardware to the guest according to the capabilities of the new host. Prior to libvirt 3.2.0 and QEMU 2.9.0 detection of the host CPU model via QEMU is not supported. @@ -1625,10 +1625,10 @@ environment cannot be reproduced on different hardware. Thus, if you hit any bugs, you are on your own. Further details of that CPU can be changed using <code>feature</code> elements. Migration of a guest - using host-passthrough is dangerous if the source and destination - hosts are not identical in both hardware and configuration. If such - a migration is attempted then the guest may hang or crash upon - resuming execution on the destination host.</dd> + using host-passthrough is dangerous if the source and destination hosts + are not identical in both hardware, QEMU version, microcode version + and configuration. If such a migration is attempted then the guest may + hang or crash upon resuming execution on the destination host.</dd> </dl> Both <code>host-model</code> and <code>host-passthrough</code> modes -- 2.21.0

4 5

[libvirt] [PATCH 0/2] test_driver: implement the remaining ManagedSave APIs
by Ilias Stamatis 09 Aug '19

09 Aug '19

Ilias Stamatis (2): test_driver: implement virDomainManagedSaveGetXMLDesc test_driver: implement virDomainManagedSaveDefineXML src/test/test_driver.c | 66 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) -- 2.22.0

2 3

[libvirt] [PATCH] test_driver: implement virDomainGetBlockInfo
by Ilias Stamatis 09 Aug '19

09 Aug '19

Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com> --- src/test/test_driver.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 6f18baa265..106e8f027e 100755 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -7729,6 +7729,45 @@ testDomainMemoryPeek(virDomainPtr dom, } +static int +testDomainGetBlockInfo(virDomainPtr dom, + const char *path, + virDomainBlockInfoPtr info, + unsigned int flags) +{ + virDomainObjPtr vm = NULL; + virDomainDiskDefPtr disk; + int ret = -1; + + virCheckFlags(0, -1); + + if (!(vm = testDomObjFromDomain(dom))) + return -1; + + if (!(disk = virDomainDiskByName(vm->def, path, false))) { + virReportError(VIR_ERR_INVALID_ARG, + _("invalid path %s not assigned to domain"), path); + goto cleanup; + } + + if (virStorageSourceIsEmpty(disk->src)) { + virReportError(VIR_ERR_INVALID_ARG, + _("disk '%s' does not currently have a source assigned"), + path); + goto cleanup; + } + + info->capacity = 1099506450432; + info->allocation = 1099511627776; + info->physical = 1099511627776; + + ret = 0; + cleanup: + virDomainObjEndAPI(&vm); + return ret; +} + + /* * Snapshot APIs */ @@ -9031,6 +9070,7 @@ static virHypervisorDriver testHypervisorDriver = { .domainManagedSaveRemove = testDomainManagedSaveRemove, /* 1.1.4 */ .domainMemoryStats = testDomainMemoryStats, /* 5.7.0 */ .domainMemoryPeek = testDomainMemoryPeek, /* 5.4.0 */ + .domainGetBlockInfo = testDomainGetBlockInfo, /* 5.7.0 */ .domainSnapshotNum = testDomainSnapshotNum, /* 1.1.4 */ .domainSnapshotListNames = testDomainSnapshotListNames, /* 1.1.4 */ -- 2.22.0

2 1

[libvirt] [PATCH v2 00/15] Split and enhancement of virsh completer
by Michal Privoznik 09 Aug '19

09 Aug '19

v2 of: https://www.redhat.com/archives/libvir-list/2019-July/msg01225.html diff to v1: - Rebase and adapt to new checkpoint completer Michal Prívozník (15): tools: s/Nodedev/NodeDevice/ tools: Expose virshCommaStringListComplete() tools: Separate domain related completers into a file tools: Separate storage pool related completers into a file tools: Separate storage volume related completers into a file tools: Separate interface related completers into a file tools: Separate network related completers into a file tools: Separate nodedev related completers into a file tools: Separate nwfilter related completers into a file tools: Separate secret related completers into a file tools: Separate snapshot related completers into a file tools: Separate host related completers into a file tools: Separate checkpoint related completers into a file virsh-completer: Drop needless #include virsh: Introduce virshPoolTypeCompleter tools/Makefile.am | 11 + tools/virsh-completer-checkpoint.c | 78 +++ tools/virsh-completer-checkpoint.h | 27 + tools/virsh-completer-domain.c | 314 +++++++++ tools/virsh-completer-domain.h | 55 ++ tools/virsh-completer-host.c | 148 ++++ tools/virsh-completer-host.h | 31 + tools/virsh-completer-interface.c | 67 ++ tools/virsh-completer-interface.h | 27 + tools/virsh-completer-network.c | 145 ++++ tools/virsh-completer-network.h | 35 + tools/virsh-completer-nodedev.c | 117 ++++ tools/virsh-completer-nodedev.h | 35 + tools/virsh-completer-nwfilter.c | 105 +++ tools/virsh-completer-nwfilter.h | 31 + tools/virsh-completer-pool.c | 120 ++++ tools/virsh-completer-pool.h | 35 + tools/virsh-completer-secret.c | 91 +++ tools/virsh-completer-secret.h | 31 + tools/virsh-completer-snapshot.c | 73 ++ tools/virsh-completer-snapshot.h | 27 + tools/virsh-completer-volume.c | 73 ++ tools/virsh-completer-volume.h | 28 + tools/virsh-completer.c | 1028 +--------------------------- tools/virsh-completer.h | 114 +-- tools/virsh-nodedev.c | 16 +- tools/virsh-nodedev.h | 6 +- tools/virsh-pool.c | 1 + 28 files changed, 1730 insertions(+), 1139 deletions(-) create mode 100644 tools/virsh-completer-checkpoint.c create mode 100644 tools/virsh-completer-checkpoint.h create mode 100644 tools/virsh-completer-domain.c create mode 100644 tools/virsh-completer-domain.h create mode 100644 tools/virsh-completer-host.c create mode 100644 tools/virsh-completer-host.h create mode 100644 tools/virsh-completer-interface.c create mode 100644 tools/virsh-completer-interface.h create mode 100644 tools/virsh-completer-network.c create mode 100644 tools/virsh-completer-network.h create mode 100644 tools/virsh-completer-nodedev.c create mode 100644 tools/virsh-completer-nodedev.h create mode 100644 tools/virsh-completer-nwfilter.c create mode 100644 tools/virsh-completer-nwfilter.h create mode 100644 tools/virsh-completer-pool.c create mode 100644 tools/virsh-completer-pool.h create mode 100644 tools/virsh-completer-secret.c create mode 100644 tools/virsh-completer-secret.h create mode 100644 tools/virsh-completer-snapshot.c create mode 100644 tools/virsh-completer-snapshot.h create mode 100644 tools/virsh-completer-volume.c create mode 100644 tools/virsh-completer-volume.h -- 2.21.0

2 17