- Devel - libvirt List Archives

Re: [libvirt] [Qemu-devel] PCI(e): Documentation "io-reserve" and related properties?
by Andrea Bolognani 11 Jun '19

11 Jun '19

On Thu, 2019-06-06 at 14:20 -0400, Michael S. Tsirkin wrote: > On Thu, Jun 06, 2019 at 06:19:43PM +0200, Kashyap Chamarthy wrote: > > Hi folks, > > > > Today I learnt about some obscure PCIe-related properties, in context of > > the adding PCIe root ports to a guest, namely: > > > > io-reserve > > mem-reserve > > bus-reserve > > pref32-reserve > > pref64-reserve > > > > Unfortunately, the commit[*] that added them provided no documentation > > whatsover. > > > > In my scenario, I was specifically wondering about what does > > "io-reserve" mean, in what context to use it, etc. (But documentation > > about other properties is also welcome.) > > > > Anyone more well-versed in this area care to shed some light? > > > > > > [*] 6755e618d0 (hw/pci: add PCI resource reserve capability to legacy > > PCI bridge, 2018-08-21) > > So normally bios would reserve just enough io space to satisfy all > devices behind a bridge. What if you intend to hotplug more devices? > These properties allow you to ask bios to reserve extra space. Is it fair to say that setting io-reserve=0 for a pcie-root-port would be a way to implement the requirements set forth in https://bugzilla.redhat.com/show_bug.cgi?id=1408810 ? I tested this on aarch64 and it seems to work as expected, but then again without documentation it's hard to tell. More specifically, I created an aarch64/virt guest with several pcie-root-ports and it couldn't boot much further than GRUB when the number of ports exceeded 24, but as soon as I added the io-reserve=0 option I could get the same guest to boot fine with 32 or even 64 pcie-root-ports. I'm attaching the boot log for reference: there are a bunch of messages about the topic but they would appear to be benign. Hotplug seemed to work too: I tried with a single virtio-net-pci and I could access the network. My understanding is that PCIe devices are required to work without IO space, so this behavior matches my expectations. I wonder, though, what would happen if I had something like -device pcie-root-port,io-reserve=0,id=pci.1 -device pcie-pci-bridge,bus=pci.1 Would I be able to hotplug conventional PCI devices into the pcie-pci-bridge, or would the lack of IO space reservation for the pcie-root-port cause issues with that? -- Andrea Bolognani / Red Hat / Virtualization

2 1

[libvirt] Question about Windows builds
by Christopher Loyd Nugent 11 Jun '19

11 Jun '19

My name is Christopher Nugent. This is my first time posting to the mailing list, and I am still adjusting to the community norms. If I do anything out of line, please let me know. Anyway, on to the question: I am attempting to use libvirt in a Windows application I am developing, and came upon the following in the documentation: Libvirt is known to work as a client (not server) on Windows XP (32-bit), and Windows 7 (64-bit). I am a bit confused as to what this means. Does it mean that I won't be able to use libvirt in a host configuration, Hyper-V acting as the underlying hypervisor? I am posting to the development list because, if I am right, I would like to donate my time to amend the situation. My application will be cross-platform and will support multiple hypervisors, so using libvirt will help me not have to duplicate functionality. Thank you for your time. --Chris Nugent.

2 1

[libvirt] [PATCH]daemon: Fix a crash during virNetlinkEventServiceStopAll
by Liu Haitao 11 Jun '19

11 Jun '19

The virNetlinkEventServiceStopAll() should be executed behind virStateCleanup(), for some important resources like(static virNetlinkEventSrvPrivatePtr server) are freed unexpected. However virStateCleanup() need to use this variable(server). The call trace of virNetlinkEventServiceStopAll: virNetlinkEventServiceStopAll() --> virNetlinkEventServiceStop() --> server[protocol] = NULL; // set server to null The call trace of virStateCleanup(): virStateCleanup() -->qemuStateCleanup() -->qemuProcessStop() -->virNetDevMacVLanDeleteWithVPortProfile() -->virNetlinkEventRemoveClient() --> srv = server[protocol] 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 call trace of crash: (gdb) bt 0 __GI___pthread_mutex_lock (mutex=0x0) at /usr/src/debug/glibc/2.24-r0/git/nptl/pthread_mutex_lock.c:67 1 0x00007fb0d555d0f9 in virNetlinkEventRemoveClient () from /usr/lib64/libvirt.so.0 2 0x00007fb0d55551df in virNetDevMacVLanDeleteWithVPortProfile () from /usr/lib64/libvirt.so.0 3 0x00007fb0c1131251 in qemuProcessStop () from /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so 4 0x00007fb0c11995ea in ?? () from /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so 5 0x00007fb0d5588c5b in ?? () from /usr/lib64/libvirt.so.0 6 0x00007fb0d5587fe8 in ?? () from /usr/lib64/libvirt.so.0 7 0x00007fb0d19533f4 in start_thread (arg=0x7fb0be17b700) at /usr/src/debug/glibc/2.24-r0/git/nptl/pthread_create.c:456 8 0x00007fb0d128f10f in clone () at ../sysdeps/unix/sysv/linux/x86_64/clone.S:105 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

3 2

[libvirt] [PATCH 0/4] incremental backup: QMP interactions
by Eric Blake 11 Jun '19

11 Jun '19

I'm trying to break my incremental backup work into smaller pieces so I can make progress and actually get some code committed, while I continue to hammer away at preparing a v9 series that addresses even more review comments and things learned during testing. These few patches represent the bulk of 14-15/21 from v8, except that the operation to update Checkpoint size must come later in the series when checkpoint_conf.h is ready. Another reason to commit this now, even without the incremental backup clients of the new capabilities, is that capability additions tend to be a conflict magnet, so I'd rather stabilize this and reduce the amount of rebase work I have been doing. Changes from v8: - improve testing of nbd-server-start - split up QMP changes into more manageable pieces - address formatting review comments Eric Blake (4): backup: Prepare for Unix sockets in QMP nbd-server-start backup: Add two new qemu capabilities backup: Add new qemu monitor bitmap backup: Add new parameters to qemu monitor nbd-server-add src/qemu/qemu_capabilities.h | 4 + src/qemu/qemu_monitor.h | 29 +++- src/qemu/qemu_monitor_json.h | 24 ++- src/qemu/qemu_capabilities.c | 6 + src/qemu/qemu_migration.c | 9 +- src/qemu/qemu_monitor.c | 74 ++++++++- src/qemu/qemu_monitor_json.c | 149 +++++++++++++++++- .../caps_4.0.0.aarch64.xml | 2 + .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 2 + .../caps_4.0.0.riscv32.xml | 2 + .../caps_4.0.0.riscv64.xml | 2 + .../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 2 + .../caps_4.0.0.x86_64.xml | 2 + tests/qemumonitorjsontest.c | 60 ++++++- 14 files changed, 341 insertions(+), 26 deletions(-) -- 2.20.1

2 19

[libvirt] [RFC PATCH] qemumonitorjsontest: Use VIR_AUTOPTR for test cleanup
by Eric Blake 11 Jun '19

11 Jun '19

Everywhere else is switching, we might as well use it here, too. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Partial patch - is it worth me continuing the cleanups on the rest of the file? --- tests/qemumonitortestutils.h | 3 +++ tests/qemumonitorjsontest.c | 35 +++++++++++++++-------------------- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/tests/qemumonitortestutils.h b/tests/qemumonitortestutils.h index 8461c80caa..a2d2d30820 100644 --- a/tests/qemumonitortestutils.h +++ b/tests/qemumonitortestutils.h @@ -24,6 +24,7 @@ # include "qemu/qemu_conf.h" # include "qemu/qemu_monitor.h" # include "qemu/qemu_agent.h" +# include "virautoclean.h" typedef struct _qemuMonitorTest qemuMonitorTest; typedef qemuMonitorTest *qemuMonitorTestPtr; @@ -102,4 +103,6 @@ qemuMonitorPtr qemuMonitorTestGetMonitor(qemuMonitorTestPtr test); qemuAgentPtr qemuMonitorTestGetAgent(qemuMonitorTestPtr test); virDomainObjPtr qemuMonitorTestGetDomainObj(qemuMonitorTestPtr test); +VIR_DEFINE_AUTOPTR_FUNC(qemuMonitorTest, qemuMonitorTestFree); + #endif /* LIBVIRT_QEMUMONITORTESTUTILS_H */ diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index a7f64058d4..10bffce2a3 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -152,12 +152,11 @@ testQemuMonitorJSONGetStatus(const void *opaque) { const testGenericData *data = opaque; virDomainXMLOptionPtr xmlopt = data->xmlopt; - qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); - int ret = -1; + VIR_AUTOPTR(qemuMonitorTest) test = NULL; bool running = false; virDomainPausedReason reason = 0; - if (!test) + if (!(test = qemuMonitorTestNewSchema(xmlopt, data->schema))) return -1; if (qemuMonitorTestAddItem(test, "query-status", @@ -168,7 +167,7 @@ testQemuMonitorJSONGetStatus(const void *opaque) " \"running\": true " " } " "}") < 0) - goto cleanup; + return -1; if (qemuMonitorTestAddItem(test, "query-status", "{ " " \"return\": { " @@ -176,7 +175,7 @@ testQemuMonitorJSONGetStatus(const void *opaque) " \"running\": false " " } " "}") < 0) - goto cleanup; + return -1; if (qemuMonitorTestAddItem(test, "query-status", "{ " " \"return\": { " @@ -185,61 +184,57 @@ testQemuMonitorJSONGetStatus(const void *opaque) " \"running\": false " " } " "}") < 0) - goto cleanup; + return -1; if (qemuMonitorGetStatus(qemuMonitorTestGetMonitor(test), &running, &reason) < 0) - goto cleanup; + return -1; if (!running) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", "Running was not true"); - goto cleanup; + return -1; } if (reason != VIR_DOMAIN_PAUSED_UNKNOWN) { virReportError(VIR_ERR_INTERNAL_ERROR, "Reason was unexpectedly set to %d", reason); - goto cleanup; + return -1; } if (qemuMonitorGetStatus(qemuMonitorTestGetMonitor(test), &running, &reason) < 0) - goto cleanup; + return -1; if (running) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", "Running was not false"); - goto cleanup; + return -1; } if (reason != VIR_DOMAIN_PAUSED_UNKNOWN) { virReportError(VIR_ERR_INTERNAL_ERROR, "Reason was unexpectedly set to %d", reason); - goto cleanup; + return -1; } if (qemuMonitorGetStatus(qemuMonitorTestGetMonitor(test), &running, &reason) < 0) - goto cleanup; + return -1; if (running) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", "Running was not false"); - goto cleanup; + return -1; } if (reason != VIR_DOMAIN_PAUSED_MIGRATION) { virReportError(VIR_ERR_INTERNAL_ERROR, "Reason was unexpectedly set to %d", reason); - goto cleanup; + return -1; } - ret = 0; - - cleanup: - qemuMonitorTestFree(test); - return ret; + return 0; } static int -- 2.20.1

2 1

[libvirt] [PATCH] qemumonitorjsontest: Validate more commands against schema
by Eric Blake 11 Jun '19

11 Jun '19

The DO_TEST() macro in qemumonitorjsontest.c was not passing the schema through, which meant that we were not validating any of those tests for correct usage according to the schema. Tested by using this hack, where the test mistakenly passed pre-patch, but correctly diagnosed the garbage post-patch: | diff --git i/src/qemu/qemu_monitor_json.c w/src/qemu/qemu_monitor_json.c | index 53a7de8b77..86d8450814 100644 | --- i/src/qemu/qemu_monitor_json.c | +++ w/src/qemu/qemu_monitor_json.c | @@ -1532,7 +1532,8 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon, | if (reason) | *reason = VIR_DOMAIN_PAUSED_UNKNOWN; | | - if (!(cmd = qemuMonitorJSONMakeCommand("query-status", NULL))) | + if (!(cmd = qemuMonitorJSONMakeCommand("query-status", | + "s:garbage", "foo", NULL))) | return -1; | | if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) Suggested-by: Peter Krempa <pkrempa(a)redhat.com> Signed-off-by: Eric Blake <eblake(a)redhat.com> --- tests/qemumonitorjsontest.c | 251 +++++++++++++++++++++--------------- 1 file changed, 149 insertions(+), 102 deletions(-) diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index 0894e748ae..a7f64058d4 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -48,6 +48,12 @@ struct _testQemuMonitorJSONSimpleFuncData { virHashTablePtr schema; }; +typedef struct _testGenericData testGenericData; +struct _testGenericData { + virDomainXMLOptionPtr xmlopt; + virHashTablePtr schema; +}; + const char *queryBlockReply = "{" " \"return\": [" @@ -142,10 +148,11 @@ const char *queryBlockReply = "}"; static int -testQemuMonitorJSONGetStatus(const void *data) +testQemuMonitorJSONGetStatus(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); int ret = -1; bool running = false; virDomainPausedReason reason = 0; @@ -236,10 +243,11 @@ testQemuMonitorJSONGetStatus(const void *data) } static int -testQemuMonitorJSONGetVersion(const void *data) +testQemuMonitorJSONGetVersion(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); int ret = -1; int major; int minor; @@ -339,10 +347,11 @@ testQemuMonitorJSONGetVersion(const void *data) } static int -testQemuMonitorJSONGetMachines(const void *data) +testQemuMonitorJSONGetMachines(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); int ret = -1; qemuMonitorMachineInfoPtr *info; int ninfo = 0; @@ -421,10 +430,11 @@ testQemuMonitorJSONGetMachines(const void *data) static int -testQemuMonitorJSONGetCPUDefinitions(const void *data) +testQemuMonitorJSONGetCPUDefinitions(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); int ret = -1; qemuMonitorCPUDefInfoPtr *cpus = NULL; int ncpus = 0; @@ -504,10 +514,11 @@ testQemuMonitorJSONGetCPUDefinitions(const void *data) static int -testQemuMonitorJSONGetCommands(const void *data) +testQemuMonitorJSONGetCommands(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); int ret = -1; char **commands = NULL; int ncommands = 0; @@ -569,10 +580,11 @@ testQemuMonitorJSONGetCommands(const void *data) static int -testQemuMonitorJSONGetTPMModels(const void *data) +testQemuMonitorJSONGetTPMModels(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); int ret = -1; char **tpmmodels = NULL; int ntpmmodels = 0; @@ -622,10 +634,11 @@ testQemuMonitorJSONGetTPMModels(const void *data) static int -testQemuMonitorJSONGetCommandLineOptionParameters(const void *data) +testQemuMonitorJSONGetCommandLineOptionParameters(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); int ret = -1; char **params = NULL; int nparams = 0; @@ -776,6 +789,7 @@ testQemuMonitorJSONAttachChardev(const void *opaque) static int qemuMonitorJSONTestAttachOneChardev(virDomainXMLOptionPtr xmlopt, + virHashTablePtr schema, const char *label, virDomainChrSourceDefPtr chr, const char *expectargs, @@ -801,7 +815,7 @@ qemuMonitorJSONTestAttachOneChardev(virDomainXMLOptionPtr xmlopt, data.chr = chr; data.fail = fail; data.expectPty = expectPty; - if (!(data.test = qemuMonitorTestNewSimple(true, xmlopt))) + if (!(data.test = qemuMonitorTestNewSchema(xmlopt, schema))) goto cleanup; if (qemuMonitorTestAddItemExpect(data.test, "chardev-add", @@ -821,14 +835,15 @@ qemuMonitorJSONTestAttachOneChardev(virDomainXMLOptionPtr xmlopt, } static int -qemuMonitorJSONTestAttachChardev(virDomainXMLOptionPtr xmlopt) +qemuMonitorJSONTestAttachChardev(virDomainXMLOptionPtr xmlopt, + virHashTablePtr schema) { virDomainChrSourceDef chr; int ret = 0; #define CHECK(label, fail, expectargs) \ - if (qemuMonitorJSONTestAttachOneChardev(xmlopt, label, &chr, expectargs, \ - NULL, NULL, fail) < 0) \ + if (qemuMonitorJSONTestAttachOneChardev(xmlopt, schema, label, &chr, \ + expectargs, NULL, NULL, fail) < 0) \ ret = -1 chr = (virDomainChrSourceDef) { .type = VIR_DOMAIN_CHR_TYPE_NULL }; @@ -840,7 +855,7 @@ qemuMonitorJSONTestAttachChardev(virDomainXMLOptionPtr xmlopt) "{'id':'alias','backend':{'type':'null','data':{}}}"); chr = (virDomainChrSourceDef) { .type = VIR_DOMAIN_CHR_TYPE_PTY }; - if (qemuMonitorJSONTestAttachOneChardev(xmlopt, "pty", &chr, + if (qemuMonitorJSONTestAttachOneChardev(xmlopt, schema, "pty", &chr, "{'id':'alias'," "'backend':{'type':'pty'," "'data':{}}}", @@ -938,10 +953,11 @@ qemuMonitorJSONTestAttachChardev(virDomainXMLOptionPtr xmlopt) static int -testQemuMonitorJSONDetachChardev(const void *data) +testQemuMonitorJSONDetachChardev(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); int ret = -1; if (!test) @@ -971,10 +987,11 @@ testQemuMonitorJSONDetachChardev(const void *data) * {"name": "type", "type": "string"}]} */ static int -testQemuMonitorJSONGetListPaths(const void *data) +testQemuMonitorJSONGetListPaths(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); int ret = -1; qemuMonitorJSONListPathPtr *paths; int npaths = 0; @@ -1049,10 +1066,11 @@ testQemuMonitorJSONGetListPaths(const void *data) * {"return": true} */ static int -testQemuMonitorJSONGetObjectProperty(const void *data) +testQemuMonitorJSONGetObjectProperty(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); int ret = -1; qemuMonitorJSONObjectProperty prop; @@ -1092,10 +1110,11 @@ testQemuMonitorJSONGetObjectProperty(const void *data) * false is not a good idea... */ static int -testQemuMonitorJSONSetObjectProperty(const void *data) +testQemuMonitorJSONSetObjectProperty(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); int ret = -1; qemuMonitorJSONObjectProperty prop; @@ -1144,10 +1163,11 @@ testQemuMonitorJSONSetObjectProperty(const void *data) static int -testQemuMonitorJSONGetDeviceAliases(const void *data) +testQemuMonitorJSONGetDeviceAliases(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); int ret = -1; char **aliases = NULL; const char **alias; @@ -1204,10 +1224,11 @@ testQemuMonitorJSONGetDeviceAliases(const void *data) } static int -testQemuMonitorJSONCPU(const void *data) +testQemuMonitorJSONCPU(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); int ret = -1; bool running = false; virDomainPausedReason reason = 0; @@ -1407,10 +1428,11 @@ testQEMUMonitorJSONqemuMonitorJSONQueryCPUsHelper(qemuMonitorTestPtr test, static int -testQemuMonitorJSONqemuMonitorJSONQueryCPUs(const void *data) +testQemuMonitorJSONqemuMonitorJSONQueryCPUs(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); int ret = -1; struct qemuMonitorQueryCpusEntry expect_slow[] = { {0, 17622, (char *) "/machine/unattached/device[0]", true}, @@ -1501,10 +1523,11 @@ testQemuMonitorJSONqemuMonitorJSONQueryCPUs(const void *data) } static int -testQemuMonitorJSONqemuMonitorJSONGetBalloonInfo(const void *data) +testQemuMonitorJSONqemuMonitorJSONGetBalloonInfo(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); int ret = -1; unsigned long long currmem; @@ -1537,10 +1560,11 @@ testQemuMonitorJSONqemuMonitorJSONGetBalloonInfo(const void *data) } static int -testQemuMonitorJSONqemuMonitorJSONGetVirtType(const void *data) +testQemuMonitorJSONqemuMonitorJSONGetVirtType(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); int ret = -1; virDomainVirtType virtType; @@ -1614,10 +1638,11 @@ testHashEqualQemuDomainDiskInfo(const void *value1, const void *value2) } static int -testQemuMonitorJSONqemuMonitorJSONGetBlockInfo(const void *data) +testQemuMonitorJSONqemuMonitorJSONGetBlockInfo(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); int ret = -1; virHashTablePtr blockDevices = NULL, expectedBlockDevices = NULL; struct qemuDomainDiskInfo *info; @@ -1693,10 +1718,11 @@ testQemuMonitorJSONqemuMonitorJSONGetBlockInfo(const void *data) } static int -testQemuMonitorJSONqemuMonitorJSONGetAllBlockStatsInfo(const void *data) +testQemuMonitorJSONqemuMonitorJSONGetAllBlockStatsInfo(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); virHashTablePtr blockstats = NULL; qemuBlockStatsPtr stats; int ret = -1; @@ -1855,10 +1881,11 @@ testQemuMonitorJSONqemuMonitorJSONGetAllBlockStatsInfo(const void *data) static int -testQemuMonitorJSONqemuMonitorJSONGetMigrationCacheSize(const void *data) +testQemuMonitorJSONqemuMonitorJSONGetMigrationCacheSize(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); int ret = -1; unsigned long long cacheSize; @@ -1891,10 +1918,11 @@ testQemuMonitorJSONqemuMonitorJSONGetMigrationCacheSize(const void *data) } static int -testQemuMonitorJSONqemuMonitorJSONGetMigrationStats(const void *data) +testQemuMonitorJSONqemuMonitorJSONGetMigrationStats(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); int ret = -1; qemuMonitorMigrationStats stats, expectedStats; char *error = NULL; @@ -1986,10 +2014,11 @@ testHashEqualChardevInfo(const void *value1, const void *value2) static int -testQemuMonitorJSONqemuMonitorJSONGetChardevInfo(const void *data) +testQemuMonitorJSONqemuMonitorJSONGetChardevInfo(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); int ret = -1; virHashTablePtr info = NULL, expectedInfo = NULL; qemuMonitorChardevInfo info0 = { NULL, VIR_DOMAIN_CHR_DEVICE_STATE_DEFAULT }; @@ -2107,10 +2136,11 @@ testValidateGetBlockIoThrottle(const virDomainBlockIoTuneInfo *info, static int -testQemuMonitorJSONqemuMonitorJSONSetBlockIoThrottle(const void *data) +testQemuMonitorJSONqemuMonitorJSONSetBlockIoThrottle(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); int ret = -1; virDomainBlockIoTuneInfo info, expectedInfo; @@ -2162,10 +2192,11 @@ testQemuMonitorJSONqemuMonitorJSONSetBlockIoThrottle(const void *data) } static int -testQemuMonitorJSONqemuMonitorJSONGetTargetArch(const void *data) +testQemuMonitorJSONqemuMonitorJSONGetTargetArch(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); int ret = -1; char *arch; @@ -2199,10 +2230,11 @@ testQemuMonitorJSONqemuMonitorJSONGetTargetArch(const void *data) } static int -testQemuMonitorJSONqemuMonitorJSONGetMigrationCapabilities(const void *data) +testQemuMonitorJSONqemuMonitorJSONGetMigrationCapabilities(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); int ret = -1; const char *cap; char **caps = NULL; @@ -2259,10 +2291,11 @@ testQemuMonitorJSONqemuMonitorJSONGetMigrationCapabilities(const void *data) } static int -testQemuMonitorJSONqemuMonitorJSONSendKey(const void *data) +testQemuMonitorJSONqemuMonitorJSONSendKey(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); int ret = -1; unsigned int keycodes[] = {43, 26, 46, 32}; @@ -2284,10 +2317,11 @@ testQemuMonitorJSONqemuMonitorJSONSendKey(const void *data) } static int -testQemuMonitorJSONqemuMonitorJSONSendKeyHoldtime(const void *data) +testQemuMonitorJSONqemuMonitorJSONSendKeyHoldtime(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); int ret = -1; unsigned int keycodes[] = {43, 26, 46, 32}; @@ -2316,10 +2350,11 @@ testQemuMonitorJSONqemuMonitorJSONSendKeyHoldtime(const void *data) } static int -testQemuMonitorJSONqemuMonitorSupportsActiveCommit(const void *data) +testQemuMonitorJSONqemuMonitorSupportsActiveCommit(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); int ret = -1; const char *error1 = "{" @@ -2362,10 +2397,11 @@ testQemuMonitorJSONqemuMonitorSupportsActiveCommit(const void *data) } static int -testQemuMonitorJSONqemuMonitorJSONGetDumpGuestMemoryCapability(const void *data) +testQemuMonitorJSONqemuMonitorJSONGetDumpGuestMemoryCapability(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); int ret = -1; int cap; const char *reply = @@ -2407,6 +2443,7 @@ testQemuMonitorJSONqemuMonitorJSONGetDumpGuestMemoryCapability(const void *data) struct testCPUData { const char *name; virDomainXMLOptionPtr xmlopt; + virHashTablePtr schema; }; @@ -2414,7 +2451,8 @@ static int testQemuMonitorJSONGetCPUData(const void *opaque) { const struct testCPUData *data = opaque; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, data->xmlopt); + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(data->xmlopt, + data->schema); virCPUDataPtr cpuData = NULL; char *jsonFile = NULL; char *dataFile = NULL; @@ -2480,8 +2518,9 @@ testQemuMonitorJSONGetCPUData(const void *opaque) static int testQemuMonitorJSONGetNonExistingCPUData(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr) opaque; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); virCPUDataPtr cpuData = NULL; int rv, ret = -1; @@ -2522,10 +2561,11 @@ testQemuMonitorJSONGetNonExistingCPUData(const void *opaque) } static int -testQemuMonitorJSONGetIOThreads(const void *data) +testQemuMonitorJSONGetIOThreads(const void *opaque) { - virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); + const testGenericData *data = opaque; + virDomainXMLOptionPtr xmlopt = data->xmlopt; + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(xmlopt, data->schema); qemuMonitorIOThreadInfoPtr *info; int ninfo = 0; int ret = -1; @@ -2596,6 +2636,7 @@ struct testCPUInfoData { size_t maxvcpus; virDomainXMLOptionPtr xmlopt; bool fast; + virHashTablePtr schema; }; @@ -2664,7 +2705,8 @@ static int testQemuMonitorCPUInfo(const void *opaque) { const struct testCPUInfoData *data = opaque; - qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, data->xmlopt); + qemuMonitorTestPtr test = qemuMonitorTestNewSchema(data->xmlopt, + data->schema); virDomainObjPtr vm = NULL; char *queryCpusFile = NULL; char *queryHotpluggableFile = NULL; @@ -2921,8 +2963,11 @@ mymain(void) } #define DO_TEST(name) \ - if (virTestRun(# name, testQemuMonitorJSON ## name, driver.xmlopt) < 0) \ - ret = -1 + do { \ + testGenericData data = { driver.xmlopt, qapiData.schema }; \ + if (virTestRun(# name, testQemuMonitorJSON ## name, &data) < 0) \ + ret = -1; \ + } while (0) #define DO_TEST_SIMPLE(CMD, FNC, ...) \ simpleFunc = (testQemuMonitorJSONSimpleFuncData) {.cmd = CMD, .func = FNC, \ @@ -2941,7 +2986,7 @@ mymain(void) #define DO_TEST_CPU_DATA(name) \ do { \ - struct testCPUData data = { name, driver.xmlopt }; \ + struct testCPUData data = { name, driver.xmlopt, qapiData.schema }; \ const char *label = "GetCPUData(" name ")"; \ if (virTestRun(label, testQemuMonitorJSONGetCPUData, &data) < 0) \ ret = -1; \ @@ -2949,7 +2994,8 @@ mymain(void) #define DO_TEST_CPU_INFO(name, maxvcpus) \ do { \ - struct testCPUInfoData data = {name, maxvcpus, driver.xmlopt, false}; \ + struct testCPUInfoData data = {name, maxvcpus, driver.xmlopt, false, \ + qapiData.schema}; \ if (virTestRun("GetCPUInfo(" name ")", testQemuMonitorCPUInfo, \ &data) < 0) \ ret = -1; \ @@ -2957,7 +3003,8 @@ mymain(void) #define DO_TEST_CPU_INFO_FAST(name, maxvcpus) \ do { \ - struct testCPUInfoData data = {name, maxvcpus, driver.xmlopt, true}; \ + struct testCPUInfoData data = {name, maxvcpus, driver.xmlopt, true, \ + qapiData.schema }; \ if (virTestRun("GetCPUInfo(" name ")", testQemuMonitorCPUInfo, \ &data) < 0) \ ret = -1; \ @@ -2970,7 +3017,7 @@ mymain(void) DO_TEST(GetCommands); DO_TEST(GetTPMModels); DO_TEST(GetCommandLineOptionParameters); - if (qemuMonitorJSONTestAttachChardev(driver.xmlopt) < 0) + if (qemuMonitorJSONTestAttachChardev(driver.xmlopt, qapiData.schema) < 0) ret = -1; DO_TEST(DetachChardev); DO_TEST(GetListPaths); -- 2.20.1

2 1

[libvirt] [PATCH] test_driver: implement virConnectGetLibVersion
by Ilias Stamatis 10 Jun '19

10 Jun '19

Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com> --- src/test/test_driver.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 1aa79ce898..dc267b6ecd 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1453,6 +1453,14 @@ static char *testConnectGetHostname(virConnectPtr conn ATTRIBUTE_UNUSED) } +static int testConnectGetLibVersion(virConnectPtr conn ATTRIBUTE_UNUSED, + unsigned long *libVer) +{ + *libVer = LIBVIR_VERSION_NUMBER; + return 0; +} + + static int testConnectIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) { return 1; @@ -6988,6 +6996,7 @@ static virHypervisorDriver testHypervisorDriver = { .connectClose = testConnectClose, /* 0.1.1 */ .connectGetVersion = testConnectGetVersion, /* 0.1.1 */ .connectGetHostname = testConnectGetHostname, /* 0.6.3 */ + .connectGetLibVersion = testConnectGetLibVersion, /* 5.5.0 */ .connectGetMaxVcpus = testConnectGetMaxVcpus, /* 0.3.2 */ .nodeGetInfo = testNodeGetInfo, /* 0.1.1 */ .nodeGetCPUStats = testNodeGetCPUStats, /* 2.3.0 */ -- 2.21.0

3 4

[libvirt] [PATCHv2] virt-xml-validate: Allow input to be read from stdin
by Johannes Holmberg 10 Jun '19

10 Jun '19

Signed-off-by: Johannes Holmberg <johannes.holmberg(a)dataductus.se> --- Changes from v1: - Quotes around $TMPFILE everywhere. - Explicit -n checks in if statements - Fixed one instance of incorrect indentation - Signed-off-by line in commit message tools/virt-xml-validate.in | 46 ++++++++++++++++++++++++++++---------- 1 file changed, 34 insertions(+), 12 deletions(-) diff --git a/tools/virt-xml-validate.in b/tools/virt-xml-validate.in index 64aeaaaa33..5cb7dcd276 100644 --- a/tools/virt-xml-validate.in +++ b/tools/virt-xml-validate.in @@ -16,7 +16,17 @@ set -e -case $1 in +TMPFILE= + +cleanup() { + if [ -n "$TMPFILE" ]; then + rm -f "$TMPFILE" + fi +} + +trap cleanup EXIT + +case "$1" in -h | --h | --he | --hel | --help) cat <<EOF Usage: @@ -34,7 +44,7 @@ $0 (libvirt) @VERSION@ EOF exit ;; --) shift ;; - -*) + -?*) echo "$0: unrecognized option '$1'" >&2 exit 1 ;; esac @@ -42,18 +52,27 @@ esac XMLFILE="$1" TYPE="$2" -if [ -z "$XMLFILE" ]; then - echo "syntax: $0 XMLFILE [TYPE]" >&2 - exit 1 -fi +if [ "$XMLFILE" = "-" ]; then + TMPFILE=`mktemp --tmpdir virt-xml.XXXX` + cat > "$TMPFILE" +else + if [ -z "$XMLFILE" ]; then + echo "syntax: $0 XMLFILE [TYPE]" >&2 + exit 1 + fi -if [ ! -f "$XMLFILE" ]; then - echo "$0: document $XMLFILE does not exist" >&2 - exit 2 + if [ ! -f "$XMLFILE" ]; then + echo "$0: document $XMLFILE does not exist" >&2 + exit 2 + fi fi if [ -z "$TYPE" ]; then - ROOT=`xmllint --stream --debug "$XMLFILE" 2>/dev/null | grep "^0 1 " | awk '{ print $3 }'` + if [ -n "$TMPFILE" ]; then + ROOT=`xmllint --stream --debug - < "$TMPFILE" 2>/dev/null | grep "^0 1 " | awk '{ print $3 }'` + else + ROOT=`xmllint --stream --debug "$XMLFILE" 2>/dev/null | grep "^0 1 " | awk '{ print $3 }'` + fi case "$ROOT" in *domainsnapshot*) # Must come first, since *domain* is a substring TYPE="domainsnapshot" @@ -101,6 +120,9 @@ if [ ! -f "$SCHEMA" ]; then exit 4 fi -xmllint --noout --relaxng "$SCHEMA" "$XMLFILE" - +if [ -n "$TMPFILE" ]; then + xmllint --noout --relaxng "$SCHEMA" - < "$TMPFILE" +else + xmllint --noout --relaxng "$SCHEMA" "$XMLFILE" +fi exit -- 2.17.1

2 1

[libvirt] [PATCH 8.5/13] qemu: Rename qemuDomainSnapshotDiskDataFree to qemuDomainSnapshotDiskDataCleanup
by Peter Krempa 10 Jun '19

10 Jun '19

In commit cbb4d229de30b5 I named the function with 'free' suffix, but at that time it already did some non-freeing tasks. Rename it to make it obvious that it's not just memory managemet. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_driver.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 9736933143..f1886e37b6 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15035,10 +15035,10 @@ typedef qemuDomainSnapshotDiskData *qemuDomainSnapshotDiskDataPtr; static void -qemuDomainSnapshotDiskDataFree(qemuDomainSnapshotDiskDataPtr data, - size_t ndata, - virQEMUDriverPtr driver, - virDomainObjPtr vm) +qemuDomainSnapshotDiskDataCleanup(qemuDomainSnapshotDiskDataPtr data, + size_t ndata, + virQEMUDriverPtr driver, + virDomainObjPtr vm) { size_t i; @@ -15145,7 +15145,7 @@ qemuDomainSnapshotDiskDataCollect(virQEMUDriverPtr driver, ret = 0; cleanup: - qemuDomainSnapshotDiskDataFree(data, ndata, driver, vm); + qemuDomainSnapshotDiskDataCleanup(data, ndata, driver, vm); return ret; } @@ -15322,7 +15322,7 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr driver, ret = -1; cleanup: - qemuDomainSnapshotDiskDataFree(diskdata, ndiskdata, driver, vm); + qemuDomainSnapshotDiskDataCleanup(diskdata, ndiskdata, driver, vm); virErrorRestore(&orig_err); return ret; -- 2.21.0

2 1

[libvirt] [PATCH 1/2] test_driver: implement virConnectDomainXMLToNative
by Ilias Stamatis 10 Jun '19

10 Jun '19

Since this is the test driver, we can pretend that the native hypervisor representation is the same as libvirt's domain XML. Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com> --- src/test/test_driver.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 1aa79ce898..ec1d3cacbc 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1563,6 +1563,39 @@ static int testConnectNumOfDomains(virConnectPtr conn) return count; } + +# define TEST_CONFIG_FORMAT_ARGV "test-test" + + +static char *testConnectDomainXMLToNative(virConnectPtr conn, + const char *format, + const char *dxml, + unsigned int flags) +{ + char *ret = NULL; + virDomainDefPtr def = NULL; + testDriverPtr privconn = conn->privateData; + + virCheckFlags(0, NULL); + + if (STRNEQ(format, TEST_CONFIG_FORMAT_ARGV)) { + virReportError(VIR_ERR_INVALID_ARG, + _("Unsupported config format '%s'"), format); + return NULL; + } + + if ((def = virDomainDefParseString(dxml, privconn->caps, privconn->xmlopt, NULL, + VIR_DOMAIN_DEF_PARSE_INACTIVE)) == NULL) + goto cleanup; + + ret = virDomainDefFormat(def, privconn->caps, 0); + + cleanup: + virDomainDefFree(def); + return ret; +} + + static int testDomainIsActive(virDomainPtr dom) { virDomainObjPtr obj; @@ -6998,6 +7031,7 @@ static virHypervisorDriver testHypervisorDriver = { .connectGetType = testConnectGetType, /* 2.3.0 */ .connectListDomains = testConnectListDomains, /* 0.1.1 */ .connectNumOfDomains = testConnectNumOfDomains, /* 0.1.1 */ + .connectDomainXMLToNative = testConnectDomainXMLToNative, /* 5.5.0 */ .connectListAllDomains = testConnectListAllDomains, /* 0.9.13 */ .domainCreateXML = testDomainCreateXML, /* 0.1.4 */ .domainLookupByID = testDomainLookupByID, /* 0.1.1 */ -- 2.21.0

1 1

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

10 Jun '19

If the XML doesn't have numa cells, this check is not necessary. But if numa cells are present, it must match with cpu topology count. 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 4d3a8868b2..ab81b9a5be 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4173,15 +4173,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)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("CPU topology doesn't match numa CPU count")); + goto cleanup; + } } /* vCPU hotplug granularity must be respected */ -- 2.20.1

2 1

[libvirt] [PATCH] Fix regression in lxcOpenNamespace
by Sergei Turchanov 10 Jun '19

10 Jun '19

This fixes regression caused by the 1d39dbaf637db03f6e597ed56b96aa065710b4a1 fdlist[i] erroneously was replaced by fdlist[1] which caused lxcOpenNamespace to return a list with identical elements. --- libvirt-lxc-override.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt-lxc-override.c b/libvirt-lxc-override.c index 60c2e48..d7af154 100644 --- a/libvirt-lxc-override.c +++ b/libvirt-lxc-override.c @@ -83,7 +83,7 @@ libvirt_lxc_virDomainLxcOpenNamespace(PyObject *self ATTRIBUTE_UNUSED, goto error; for (i = 0; i < c_retval; i++) - VIR_PY_LIST_APPEND_GOTO(py_retval, libvirt_intWrap(fdlist[1]), error); + VIR_PY_LIST_APPEND_GOTO(py_retval, libvirt_intWrap(fdlist[i]), error); cleanup: VIR_FREE(fdlist); -- 2.17.1

1 0

[libvirt] [PATCH 00/13] qemu: External disk snapshot code refactors/cleanups (blockdev-add saga)
by Peter Krempa 08 Jun '19

08 Jun '19

Few cleanups to the snapshot code extracted from my blockdev branch. Peter Krempa (13): qemu: snapshot: Pass 'cfg' to external snapshot functions qemu: Use VIR_AUTOPTR in qemuDomainSnapshotCreateDiskActive qemu: Use virErrorPreserveLast in qemuDomainSnapshotCreateDiskActive qemu: Use VIR_AUTO* in qemuDomainSnapshotCreateActiveExternal qemu: snapshot: Remove unused cleanup section in qemuDomainSnapshotCreateSingleDiskActive qemu: snapshot: Always save status and config after qemuDomainSnapshotCreateDiskActive qemu: snapshot: Always save config XML after qemuDomainSnapshotCreateDiskActive qemu: snapshot: Densely pack data in qemuDomainSnapshotDiskDataCollect qemu: snapshot: Move all cleanup of snapshot disk data to qemuDomainSnapshotDiskDataFree qemu: snapshot: Don't overload 'ret' in qemuDomainSnapshotCreateDiskActive qemu: snapshot: Unify 'cleanup' and 'error' in qemuDomainSnapshotCreateDiskActive qemu: snapshot: Return early if there's nothing to snapshot qemu: snapshot: Remove unnecessary 'do_transaction' logic in qemuDomainSnapshotCreateDiskActive src/qemu/qemu_driver.c | 189 +++++++++++++++++------------------------ 1 file changed, 79 insertions(+), 110 deletions(-) -- 2.21.0

2 26

[libvirt] [PATCH 0/4] tests: qemu: Allow QMP schema testing with qemuMonitorTestProcessCommandVerbatim
by Peter Krempa 07 Jun '19

07 Jun '19

Allow more tests to be run against QMP schema checker. Peter Krempa (4): tests: Refactor cleanup in qemuMonitorTestProcessCommandVerbatim tests: qemu: Add QMP schema checking in qemuMonitorTestProcessCommandVerbatim tests: Allow QMP schema testing in qemuMonitorTestNewFromFileFull tests: qemuhotplug: Use schema testing with qemuMonitorTestNewFromFileFull tests/qemucapabilitiestest.c | 3 ++- tests/qemuhotplugtest.c | 21 +++++++++++++++++---- tests/qemumonitortestutils.c | 34 +++++++++++++++++++++++++--------- tests/qemumonitortestutils.h | 3 ++- 4 files changed, 46 insertions(+), 15 deletions(-) -- 2.21.0

2 5

[libvirt] [PATCH 0/2] gitdm: Add gitdm configuration
by Andrea Bolognani 07 Jun '19

07 Jun '19

See the commit message for patch 2/2 for more information; patch 1/2 merely addresses some minor issues in .mailmap that I spotted while working on the gitdm configuration. Andrea Bolognani (2): mailmap: Remove some duplicates gitdm: Add gitdm configuration .mailmap | 4 ++ docs/gitdm/aliases | 25 +++++++++ docs/gitdm/companies/canonical | 11 ++++ docs/gitdm/companies/datto | 2 + docs/gitdm/companies/dreamhost | 4 ++ docs/gitdm/companies/nec | 2 + docs/gitdm/companies/others | 98 ++++++++++++++++++++++++++++++++++ docs/gitdm/companies/redhat | 6 +++ docs/gitdm/companies/suse | 7 +++ docs/gitdm/companies/virtuozzo | 2 + docs/gitdm/groups/education | 17 ++++++ docs/gitdm/groups/opensource | 12 +++++ docs/gitdm/groups/unaffiliated | 83 ++++++++++++++++++++++++++++ gitdm.config | 37 +++++++++++++ 14 files changed, 310 insertions(+) create mode 100644 docs/gitdm/aliases create mode 100644 docs/gitdm/companies/canonical create mode 100644 docs/gitdm/companies/datto create mode 100644 docs/gitdm/companies/dreamhost create mode 100644 docs/gitdm/companies/nec create mode 100644 docs/gitdm/companies/others create mode 100644 docs/gitdm/companies/redhat create mode 100644 docs/gitdm/companies/suse create mode 100644 docs/gitdm/companies/virtuozzo create mode 100644 docs/gitdm/groups/education create mode 100644 docs/gitdm/groups/opensource create mode 100644 docs/gitdm/groups/unaffiliated create mode 100644 gitdm.config -- 2.21.0

2 6

[libvirt] [PATCH] test_driver: implement virDomainSendKey
by Ilias Stamatis 07 Jun '19

07 Jun '19

Validate @keycodes and sleep for @holdtime before successfully returning. 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 2f58a1da95..51ded256be 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -64,6 +64,7 @@ #include "virinterfaceobj.h" #include "virhostcpu.h" #include "virdomainsnapshotobjlist.h" +#include "virkeycode.h" #define VIR_FROM_THIS VIR_FROM_TEST @@ -5980,6 +5981,44 @@ testDomainScreenshot(virDomainPtr dom ATTRIBUTE_UNUSED, return ret; } +static int +testDomainSendKey(virDomainPtr domain, + unsigned int codeset, + unsigned int holdtime, + unsigned int *keycodes, + int nkeycodes, + unsigned int flags) +{ + int ret = -1; + size_t i; + virDomainObjPtr vm = NULL; + + virCheckFlags(0, -1); + + if (!(vm = testDomObjFromDomain(domain))) + goto cleanup; + + if (virDomainObjCheckActive(vm) < 0) + goto cleanup; + + for (i = 0; i < nkeycodes; i++) { + if (virKeycodeValueTranslate(codeset, codeset, keycodes[i]) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("invalid keycode %u of %s codeset"), + keycodes[i], + virKeycodeSetTypeToString(codeset)); + goto cleanup; + } + } + + usleep(holdtime * 1000); + ret = 0; + + cleanup: + virDomainObjEndAPI(&vm); + return ret; +} + static int testConnectGetCPUModelNames(virConnectPtr conn ATTRIBUTE_UNUSED, const char *archName, @@ -7000,6 +7039,7 @@ static virHypervisorDriver testHypervisorDriver = { .nodeGetCPUMap = testNodeGetCPUMap, /* 1.0.0 */ .domainRename = testDomainRename, /* 4.1.0 */ .domainScreenshot = testDomainScreenshot, /* 1.0.5 */ + .domainSendKey = testDomainSendKey, /* 5.5.0 */ .domainGetMetadata = testDomainGetMetadata, /* 1.1.3 */ .domainSetMetadata = testDomainSetMetadata, /* 1.1.3 */ .connectGetCPUModelNames = testConnectGetCPUModelNames, /* 1.1.3 */ -- 2.21.0

6 15

[libvirt] [PATCH 0/4] test_driver: implement virDomainSaveImageGetXMLDesc and virDomainSaveImageDefineXML
by Ilias Stamatis 07 Jun '19

07 Jun '19

While implementing virDomainSaveImageGetXMLDesc and virDomainSaveImageDefineXML for the test driver, I realized that there exists already code for saving and loading test images which can be reused. However, it needed to be extracted from testDomainSaveFlags and testDomainRestoreFlags into separate functions. The new functions are inspired by the corresponding QEMU driver code where e.g. qemuDomainSaveImageOpen serves as a helper used by other functions. This series of patches initially extracts the code mentioned above into separate functions and then provides the test driver with implementations for virDomainSaveImageGetXMLDesc and virDomainSaveImageDefineXML which make use of the newly introduced functions. Ilias Stamatis (4): test_driver: extract image saving code into a separate function test_driver: extract image loading code into a separate function test_driver: implement virDomainSaveImageDefineXML test_driver: implement virDomainSaveImageGetXMLDesc src/test/test_driver.c | 281 ++++++++++++++++++++++++++++------------- 1 file changed, 193 insertions(+), 88 deletions(-) -- 2.21.0

3 15

[libvirt] [PATCH] qemu: Fix NULL pointer access in qemuProcessInitCpuAffinity()
by Andrea Bolognani 06 Jun '19

06 Jun '19

Commit 2f2254c7f4e5 attempted to fix a memory leak by ensuring cpumapToSet is always a freshly allocated bitmap, but regrettably introduced a NULL pointer access while doing so, because it called virBitmapCopy() without allocating the destination bitmap first. Solve the issue by using virBitmapNewCopy() instead. Reported-by: John Ferlan <jferlan(a)redhat.com> Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/qemu/qemu_process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 42a6271411..50a76aa0ed 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2498,7 +2498,7 @@ qemuProcessInitCpuAffinity(virDomainObjPtr vm) if (virNumaNodesetToCPUset(nodeset, &cpumapToSet) < 0) return -1; } else if (vm->def->cputune.emulatorpin) { - if (virBitmapCopy(cpumapToSet, vm->def->cputune.emulatorpin) < 0) + if (!(cpumapToSet = virBitmapNewCopy(vm->def->cputune.emulatorpin))) return -1; } else { if (qemuProcessGetAllCpuAffinity(&cpumapToSet) < 0) -- 2.21.0

3 2

[libvirt] [PATCH v2 00/11] Grab modify job for changing domain XML
by Michal Privoznik 06 Jun '19

06 Jun '19

v2 of: https://www.redhat.com/archives/libvir-list/2019-May/msg00858.html diff to v1: - 1/9 from the original series is pushed now. It's independent from the feature. - Acquiring job is done in a way suggested by Nikolay in review of v1. Michal Prívozník (11): virDomainObjListAddObjLocked: Don't expect vm->def to be set virDomainObjListAddLocked: Set vm->def only in success path virDomainObjIsActive: Allow vm->def to be NULL virDomainObjListAdd: Leave def assigning as an exercise for caller virDomainObjListAdd: Remove unused flag qemu: Grab modify job for changing domain XML qemu_domain: Allow qemuDomainObjListAdd to keep job upon return lxc: Grab modify job for changing domain XML lxc_domain: Allow lxcDomainObjListAdd to keep job upon return libxl: Grab modify job for changing domain XML libxl_domain: Allow libxlDomainObjListAdd to keep job upon return src/bhyve/bhyve_driver.c | 10 +++--- src/conf/domain_conf.h | 2 +- src/conf/virdomainobjlist.c | 44 +++++++++--------------- src/conf/virdomainobjlist.h | 6 ++-- src/libxl/libxl_domain.c | 68 +++++++++++++++++++++++++++++++++++++ src/libxl/libxl_domain.h | 8 +++++ src/libxl/libxl_driver.c | 40 +++++----------------- src/libxl/libxl_migration.c | 28 +++------------ src/lxc/lxc_domain.c | 68 +++++++++++++++++++++++++++++++++++++ src/lxc/lxc_domain.h | 8 +++++ src/lxc/lxc_driver.c | 28 ++++++--------- src/openvz/openvz_conf.c | 12 +++---- src/openvz/openvz_driver.c | 17 +++++----- src/qemu/qemu_domain.c | 66 +++++++++++++++++++++++++++++++++++ src/qemu/qemu_domain.h | 7 ++++ src/qemu/qemu_driver.c | 43 ++++++++--------------- src/qemu/qemu_migration.c | 7 ++-- src/test/test_driver.c | 21 +++++++----- src/vmware/vmware_conf.c | 4 +-- src/vmware/vmware_driver.c | 9 +++-- src/vz/vz_sdk.c | 4 ++- 21 files changed, 326 insertions(+), 174 deletions(-) -- 2.21.0

3 22

[libvirt] [PATCH 0/2] qemu: Fix leak in qemuProcessInitCpuAffinity()
by Andrea Bolognani 06 Jun '19

06 Jun '19

Spotted by John through Coverity. Andrea Bolognani (2): qemu: Fix leak in qemuProcessInitCpuAffinity() qemu: Drop cleanup label from qemuProcessInitCpuAffinity() src/qemu/qemu_process.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) -- 2.21.0

3 7

[libvirt] [PATCH] cpu_conf: Fix XPath for parsing TSC frequency
by Jiri Denemark 06 Jun '19

06 Jun '19

Due to this bug the following command would fail on any host where TSC frequency can be probed: $ virsh capabilities | virsh cpu-baseline /dev/stdin error: unsupported configuration: Invalid TSC frequency https://bugzilla.redhat.com/show_bug.cgi?id=1641702 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/conf/cpu_conf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index dc46e7f57a..825df88246 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -417,8 +417,8 @@ virCPUDefParseXML(xmlXPathContextPtr ctxt, if (VIR_ALLOC(tsc) < 0) goto cleanup; - if (virXPathULongLong("./counter[@name='tsc']/@frequency", ctxt, - &tsc->frequency) < 0) { + if (virXPathULongLong("string(./counter[@name='tsc']/@frequency)", + ctxt, &tsc->frequency) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Invalid TSC frequency")); goto cleanup; -- 2.21.0

2 1

[libvirt] [PATCH 0/3] virsh: undefine: Clarify things around snapshots
by Peter Krempa 05 Jun '19

05 Jun '19

Peter Krempa (3): virsh: undefine: Clarify help string for --snapshots-metadata virsh: undefine: Rename --delete-snapshots to --delete-storage-volume-snapshots virsh: undefine: Clarify that --delete-storage-volume-snapshots causes failures tools/virsh-domain.c | 6 +++++- tools/virsh.pod | 10 ++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) -- 2.21.0

3 6

[libvirt] QMP; unsigned 64-bit ints; JSON standards compliance
by Daniel P. Berrangé 05 Jun '19

05 Jun '19

The QEMU QMP service is based on JSON which is nice because that is a widely supported "standard" data format..... ....except QEMU's implementation (and indeed most impls) are not strictly standards compliant. Specifically the problem is around representing 64-bit integers, whether signed or unsigned. The JSON standard declares that largest integer is 2^53-1 and the likewise the smallest is -(2^53-1): http://www.ecma-international.org/ecma-262/6.0/index.html#sec-number.max_sa… A crazy limit inherited from its javascript origins IIUC. QEMU, and indeed many applications, want to handle 64-bit integers. The C JSON library impls have traditionally mapped integers to the data type 'long long int' which gives a min/max of -(2^63) / 2^63-1. QEMU however /really/ needs 64-bit unsigned integers, ie a max 2^64-1. Libvirt has historically used the YAJL library which uses 'long long int' and thus can't officially go beyond 2^63-1 values. Fortunately it lets libvirt get at the raw json string, so libvirt can re-parse the value to get an 'unsigned long long'. We recently tried to switch to Jansson because YAJL has a dead upstream for many years and countless unanswered bugs & patches. Unfortunately we forgot about this need for 2^64-1 max, and Jansson also uses 'long long int' and raises a fatal parse error for unsigned 64-bit values above 2^63-1. It also provides no backdoor for libvirt todo its own integer parsing. Thus we had to abort our switch to jansson as it broke parsing QEMU's JSON: https://bugzilla.redhat.com/show_bug.cgi?id=1614569 Other JSON libraries we've investigated have similar problems. I imagine the same may well be true of non-C based JOSN impls, though I've not investigated in any detail. Essentially libvirt is stuck with either using the dead YAJL library forever, or writing its own JSON parser (most likely copying QEMU's JSON code into libvirt's git). This feels like a very unappealing situation to be in as not being able to use a JSON library of our choice is loosing one of the key benefits of using a standard data format. Thus I'd like to see a solution to this to allow QMP to be reliably consumed by any JSON library that exists. I can think of some options: 1. Encode unsigned 64-bit integers as signed 64-bit integers. This follows the example that most C libraries map JSON ints to 'long long int'. This is still relying on undefined behaviour as apps don't need to support > 2^53-1. Apps would need to cast back to 'unsigned long long' for those QMP fields they know are supposed to be unsigned. 2. Encode all 64-bit integers as a pair of 32-bit integers. This is fully compliant with the JSON spec as each half is fully within the declared limits. App has to split or assemble the 2 pieces from/to a signed/unsigned 64-bit int as needed. 3. Encode all 64-bit integers as strings The application has todo all parsing/formatting client side. None of these changes are backwards compatible, so I doubt we could make the change transparently in QMP. Instead we would have to have a QMP greeting message capability where the client can request enablement of the enhanced integer handling. Any of the three options above would likely work for libvirt, but I would have a slight preference for either 2 or 3, so that we become 100% standards compliant. Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|

5 22

[libvirt] [PATCH] tests: Fix parentheses order in an assignment-comparison conditional
by Erik Skultety 04 Jun '19

04 Jun '19

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1717090 Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- Pushed as trivial. tests/testutilsqemu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index bce847ce5e..9ac9f9bd39 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -918,7 +918,7 @@ testQemuCapsIterate(const char *suffix, if (virDirOpen(&dir, TEST_QEMU_CAPS_PATH) < 0) goto cleanup; - while ((rc = virDirRead(dir, &ent, TEST_QEMU_CAPS_PATH) > 0)) { + while ((rc = virDirRead(dir, &ent, TEST_QEMU_CAPS_PATH)) > 0) { char *tmp = ent->d_name; char *base = NULL; char *archName = NULL; -- 2.20.1

1 0

[libvirt] [PATCH 0/9] Grab modify job for changing domain XML
by Michal Privoznik 04 Jun '19

04 Jun '19

This is an alternative proposal to: https://www.redhat.com/archives/libvir-list/2019-May/msg00830.html The problem I'm trying to fix is described here: https://www.redhat.com/archives/libvir-list/2019-May/msg00810.html Michal Prívozník (9): virDomainObjListAddLocked: Drop useless @cleanup label virDomainObjListAddObjLocked: Don't expect vm->def to be set virDomainObjListAddLocked: Set vm->def only in success path virDomainObjIsActive: Allow vm->def to be NULL virDomainObjListAdd: Leave def assigning as an exercise for caller qemu: Allow vm->def == NULL in job control APIs qemu: Grab modify job for changing domain XML lxc: Grab modify job for changing domain XML libxl: Grab modify job for changing domain XML src/bhyve/bhyve_driver.c | 10 +++++--- src/conf/domain_conf.h | 2 +- src/conf/virdomainobjlist.c | 48 ++++++++++++++---------------------- src/conf/virdomainobjlist.h | 3 +-- src/libxl/libxl_domain.c | 3 ++- src/libxl/libxl_driver.c | 48 ++++++++++++++++++++++++------------ src/libxl/libxl_migration.c | 14 +++++------ src/lxc/lxc_domain.c | 3 ++- src/lxc/lxc_driver.c | 23 +++++++++++------ src/openvz/openvz_conf.c | 12 ++++----- src/openvz/openvz_driver.c | 17 +++++++------ src/qemu/qemu_domain.c | 30 ++++++++++++++--------- src/qemu/qemu_driver.c | 49 ++++++++++++++++++++++++++----------- src/qemu/qemu_migration.c | 13 +++++++--- src/test/test_driver.c | 21 +++++++++------- src/vmware/vmware_conf.c | 4 +-- src/vmware/vmware_driver.c | 9 +++---- src/vz/vz_sdk.c | 4 ++- 18 files changed, 183 insertions(+), 130 deletions(-) -- 2.21.0

2 20