- Devel - libvirt List Archives

[libvirt] [PATCH v2 0/4] qemu: handle ',' and '=' in VM name
by Cole Robinson 06 May '16

06 May '16

This series adds qemu cli comma escaping to several places that are dependent on the VM name, to enable names with embedded commas. Patch 4 makes use of qemu -name guest=X value to allow names with '=' in them. https://bugzilla.redhat.com/show_bug.cgi?id=639926 https://bugzilla.redhat.com/show_bug.cgi?id=1276485 Note: There's likely other places that are VM name dependent that need comma escaping too, but this hits the mandatory ones. I've listed some more on the BiteSizedTasks page: http://wiki.libvirt.org/page/BiteSizedTasks#qemu:_Use_comma_escaping_for_mo… v2: Rebase to master Cole Robinson (4): qemu: command: escape commas in VM name qemu: command: escape commas in secret master path qemu: command: escape commas in chardev socket path qemu: command: Use -name guest= if available src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 22 ++++++++++++-------- tests/qemucapabilitiesdata/caps_2.1.1-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.4.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.5.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.6.0-1.caps | 1 + .../qemuxml2argvdata/qemuxml2argv-name-escape.args | 24 ++++++++++++++++++++++ .../qemuxml2argvdata/qemuxml2argv-name-escape.xml | 18 ++++++++++++++++ tests/qemuxml2argvtest.c | 2 ++ 10 files changed, 65 insertions(+), 8 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-name-escape.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-name-escape.xml -- 2.7.4

2 10

[libvirt] [PATCH] domain_conf: fix migration/managedsave with usb keyboad
by Pavel Hrdina 06 May '16

06 May '16

Commint 36785c7e refactored the code for input devices but introduced a bug that we removed all keyboard from migratable XML. We have to remove only implicit keyboards like PS2 or XEN. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/conf/domain_conf.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 2c97bc1..b90c2b6 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -21193,8 +21193,10 @@ virDomainInputDefFormat(virBufferPtr buf, const char *bus = virDomainInputBusTypeToString(def->bus); /* don't format keyboard into migratable XML for backward compatibility */ - if (def->type == VIR_DOMAIN_INPUT_TYPE_KBD && - flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE) + if (flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE && + def->type == VIR_DOMAIN_INPUT_TYPE_KBD && + (def->bus == VIR_DOMAIN_INPUT_BUS_PS2 || + def->bus == VIR_DOMAIN_INPUT_BUS_XEN)) return 0; if (!type) { -- 2.8.2

2 1

[libvirt] [PATCH] virCgroupValidateMachineGroup: Reflect change in CGroup struct naming
by Michal Privoznik 06 May '16

06 May '16

Fron c3bd0019c0e on instead of creating the following path for cgroups: /sys/fs/cgroupX/$name.libvirt-$driver we generate rather more verbose one: /sys/fs/cgroupX/$driver-$id-$name.libvirt-$driver where $name is optional and included iff contains allowed chars. See original commit for more reasoning. Now, problem with the original commit is that we are unable to start any LXC domain after it. Because when starting LXC container, the CGroup layout is created by our lxc_controller process and then detected and validated by libvirtd. The validation is done by trying to match detected layout against all the possible patterns for cgroup paths that we've ever had. And the commit in question forgot to update this part of the code. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- I am really surprised how long this bug went unnoticed. Is anybody using LXC? When pushed, it should be backported to 1.3.2+. src/util/vircgroup.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index da5ccff..add6c5f 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -261,12 +261,17 @@ virCgroupValidateMachineGroup(virCgroupPtr group, char *scopename_new = NULL; char *machinename = virSystemdMakeMachineName(drivername, id, name, privileged); + char *partmachinename = NULL; if (virAsprintf(&partname, "%s.libvirt-%s", - name, drivername) < 0) + name, drivername) < 0 || + (machinename && + virAsprintf(&partmachinename, "%s.libvirt-%s", + machinename, drivername) < 0)) goto cleanup; - if (virCgroupPartitionEscape(&partname) < 0) + if (virCgroupPartitionEscape(&partname) < 0 || + (machinename && virCgroupPartitionEscape(&partmachinename) < 0)) goto cleanup; if (!(scopename_old = virSystemdMakeScopeName(name, drivername, true))) @@ -315,6 +320,7 @@ virCgroupValidateMachineGroup(virCgroupPtr group, if (STRNEQ(tmp, name) && STRNEQ_NULLABLE(tmp, machinename) && STRNEQ(tmp, partname) && + STRNEQ_NULLABLE(tmp, partmachinename) && STRNEQ(tmp, scopename_old) && STRNEQ_NULLABLE(tmp, scopename_new)) { VIR_DEBUG("Name '%s' for controller '%s' does not match " @@ -329,6 +335,7 @@ virCgroupValidateMachineGroup(virCgroupPtr group, valid = true; cleanup: + VIR_FREE(partmachinename); VIR_FREE(partname); VIR_FREE(scopename_old); VIR_FREE(scopename_new); -- 2.8.1

3 2

[libvirt] [PATCH 00/12] Enhance QEMU/domain capabilities tests
by Jiri Denemark 06 May '16

06 May '16

Jiri Denemark (12): tests: Refactor domaincapstest qemucapabilitiestest: Prepare for testing non-x86_64 archs qemu: Separate formatting from saving into caps cache qemu: Export caps cache APIs for tests qemucapabilitiestest: Uses consistent names qemucapabilitiestest: Reindent *.caps files qemucapabilitiestest: Reorder flags in caps files qemucapabilitiestest: Test all capabilities qemucapabilitiestest: Rename *.caps to *.xml domaincapstest: Use default machine type qemucapabilitiestest: Add tests for aarch64 and ppc64le domaincapstest: Add tests for QEMU 2.6 src/qemu/qemu_capabilities.c | 34 +- src/qemu/qemu_capspriv.h | 9 + .../domaincaps-qemu_1.6.50-1.xml | 3 +- .../domaincaps-qemu_2.6.0-1.xml | 63 + .../domaincaps-qemu_2.6.0-2.xml | 63 + .../domaincaps-qemu_2.6.0-3.xml | 67 + .../domaincaps-qemu_2.6.0-4.xml | 67 + .../domaincaps-qemu_2.6.0-5.xml | 61 + tests/domaincapstest.c | 209 +- tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 117 - ...1.2.2-1.replies => caps_1.2.2-1.x86_64.replies} | 0 tests/qemucapabilitiesdata/caps_1.2.2-1.x86_64.xml | 159 + tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 133 - ...1.3.1-1.replies => caps_1.3.1-1.x86_64.replies} | 0 tests/qemucapabilitiesdata/caps_1.3.1-1.x86_64.xml | 179 + tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 134 - ...1.4.2-1.replies => caps_1.4.2-1.x86_64.replies} | 0 tests/qemucapabilitiesdata/caps_1.4.2-1.x86_64.xml | 181 + tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 143 - ...1.5.3-1.replies => caps_1.5.3-1.x86_64.replies} | 0 tests/qemucapabilitiesdata/caps_1.5.3-1.x86_64.xml | 190 + tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 149 - ...1.6.0-1.replies => caps_1.6.0-1.x86_64.replies} | 0 tests/qemucapabilitiesdata/caps_1.6.0-1.x86_64.xml | 200 + tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 149 - ...6.50-1.replies => caps_1.6.50-1.x86_64.replies} | 0 .../qemucapabilitiesdata/caps_1.6.50-1.x86_64.xml | 202 + tests/qemucapabilitiesdata/caps_2.1.1-1.caps | 167 - ...2.1.1-1.replies => caps_2.1.1-1.x86_64.replies} | 0 tests/qemucapabilitiesdata/caps_2.1.1-1.x86_64.xml | 225 + tests/qemucapabilitiesdata/caps_2.4.0-1.caps | 180 - ...2.4.0-1.replies => caps_2.4.0-1.x86_64.replies} | 0 tests/qemucapabilitiesdata/caps_2.4.0-1.x86_64.xml | 245 + tests/qemucapabilitiesdata/caps_2.5.0-1.caps | 181 - ...2.5.0-1.replies => caps_2.5.0-1.x86_64.replies} | 0 tests/qemucapabilitiesdata/caps_2.5.0-1.x86_64.xml | 246 + .../caps_2.6.0-1.aarch64.replies | 4940 ++++++++++++++++ .../qemucapabilitiesdata/caps_2.6.0-1.aarch64.xml | 238 + tests/qemucapabilitiesdata/caps_2.6.0-1.caps | 186 - .../caps_2.6.0-1.ppc64le.replies | 6163 ++++++++++++++++++++ .../qemucapabilitiesdata/caps_2.6.0-1.ppc64le.xml | 604 ++ ...2.6.0-1.replies => caps_2.6.0-1.x86_64.replies} | 0 tests/qemucapabilitiesdata/caps_2.6.0-1.x86_64.xml | 251 + .../caps_2.6.0-2.aarch64.replies | 4940 ++++++++++++++++ .../qemucapabilitiesdata/caps_2.6.0-2.aarch64.xml | 238 + tests/qemucapabilitiestest.c | 92 +- tests/testutilsqemu.c | 41 +- 47 files changed, 19740 insertions(+), 1709 deletions(-) create mode 100644 tests/domaincapsschemadata/domaincaps-qemu_2.6.0-1.xml create mode 100644 tests/domaincapsschemadata/domaincaps-qemu_2.6.0-2.xml create mode 100644 tests/domaincapsschemadata/domaincaps-qemu_2.6.0-3.xml create mode 100644 tests/domaincapsschemadata/domaincaps-qemu_2.6.0-4.xml create mode 100644 tests/domaincapsschemadata/domaincaps-qemu_2.6.0-5.xml delete mode 100644 tests/qemucapabilitiesdata/caps_1.2.2-1.caps rename tests/qemucapabilitiesdata/{caps_1.2.2-1.replies => caps_1.2.2-1.x86_64.replies} (100%) create mode 100644 tests/qemucapabilitiesdata/caps_1.2.2-1.x86_64.xml delete mode 100644 tests/qemucapabilitiesdata/caps_1.3.1-1.caps rename tests/qemucapabilitiesdata/{caps_1.3.1-1.replies => caps_1.3.1-1.x86_64.replies} (100%) create mode 100644 tests/qemucapabilitiesdata/caps_1.3.1-1.x86_64.xml delete mode 100644 tests/qemucapabilitiesdata/caps_1.4.2-1.caps rename tests/qemucapabilitiesdata/{caps_1.4.2-1.replies => caps_1.4.2-1.x86_64.replies} (100%) create mode 100644 tests/qemucapabilitiesdata/caps_1.4.2-1.x86_64.xml delete mode 100644 tests/qemucapabilitiesdata/caps_1.5.3-1.caps rename tests/qemucapabilitiesdata/{caps_1.5.3-1.replies => caps_1.5.3-1.x86_64.replies} (100%) create mode 100644 tests/qemucapabilitiesdata/caps_1.5.3-1.x86_64.xml delete mode 100644 tests/qemucapabilitiesdata/caps_1.6.0-1.caps rename tests/qemucapabilitiesdata/{caps_1.6.0-1.replies => caps_1.6.0-1.x86_64.replies} (100%) create mode 100644 tests/qemucapabilitiesdata/caps_1.6.0-1.x86_64.xml delete mode 100644 tests/qemucapabilitiesdata/caps_1.6.50-1.caps rename tests/qemucapabilitiesdata/{caps_1.6.50-1.replies => caps_1.6.50-1.x86_64.replies} (100%) create mode 100644 tests/qemucapabilitiesdata/caps_1.6.50-1.x86_64.xml delete mode 100644 tests/qemucapabilitiesdata/caps_2.1.1-1.caps rename tests/qemucapabilitiesdata/{caps_2.1.1-1.replies => caps_2.1.1-1.x86_64.replies} (100%) create mode 100644 tests/qemucapabilitiesdata/caps_2.1.1-1.x86_64.xml delete mode 100644 tests/qemucapabilitiesdata/caps_2.4.0-1.caps rename tests/qemucapabilitiesdata/{caps_2.4.0-1.replies => caps_2.4.0-1.x86_64.replies} (100%) create mode 100644 tests/qemucapabilitiesdata/caps_2.4.0-1.x86_64.xml delete mode 100644 tests/qemucapabilitiesdata/caps_2.5.0-1.caps rename tests/qemucapabilitiesdata/{caps_2.5.0-1.replies => caps_2.5.0-1.x86_64.replies} (100%) create mode 100644 tests/qemucapabilitiesdata/caps_2.5.0-1.x86_64.xml create mode 100644 tests/qemucapabilitiesdata/caps_2.6.0-1.aarch64.replies create mode 100644 tests/qemucapabilitiesdata/caps_2.6.0-1.aarch64.xml delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0-1.caps create mode 100644 tests/qemucapabilitiesdata/caps_2.6.0-1.ppc64le.replies create mode 100644 tests/qemucapabilitiesdata/caps_2.6.0-1.ppc64le.xml rename tests/qemucapabilitiesdata/{caps_2.6.0-1.replies => caps_2.6.0-1.x86_64.replies} (100%) create mode 100644 tests/qemucapabilitiesdata/caps_2.6.0-1.x86_64.xml create mode 100644 tests/qemucapabilitiesdata/caps_2.6.0-2.aarch64.replies create mode 100644 tests/qemucapabilitiesdata/caps_2.6.0-2.aarch64.xml -- 2.8.2

3 29

[libvirt] [PATCH] conf: Skip generating random MAC in DetachDevice xml
by Kothapally Madhu Pavan 06 May '16

06 May '16

When we try to detach a network device without specifying the mac address, random mac address is generated. As the generated mac address will not be available in the running vm, detaching device will fail erroring out "error: operation failed: no device matching mac address xx:xx:xx:xx:xx:xx found". Signed-off-by: Kothapally Madhu Pavan <kmp(a)linux.vnet.ibm.com> --- src/conf/domain_conf.c | 4 ++++ src/conf/domain_conf.h | 3 +++ src/libxl/libxl_driver.c | 12 ++++++------ src/lxc/lxc_driver.c | 7 ++++--- src/qemu/qemu_driver.c | 2 ++ src/uml/uml_driver.c | 6 ++++-- src/vbox/vbox_common.c | 6 ++++-- src/vz/vz_driver.c | 4 +++- src/xen/xend_internal.c | 6 ++++-- src/xen/xm_internal.c | 8 ++++---- 10 files changed, 38 insertions(+), 20 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 28248c8..512d877 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8784,6 +8784,10 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, (const char *)macaddr); goto error; } + } else if (flags & VIR_DOMAIN_DEF_PARSE_SKIP_GENERATE_MACADDR) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("mac address not specified in the device xml")); + goto error; } else { virDomainNetGenerateMAC(xmlopt, &def->mac); } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 1986f53..74692f1 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2679,6 +2679,9 @@ typedef enum { VIR_DOMAIN_DEF_PARSE_SKIP_OSTYPE_CHECKS = 1 << 8, /* allow updates in post parse callback that would break ABI otherwise */ VIR_DOMAIN_DEF_PARSE_ABI_UPDATE = 1 << 9, + /* don't generate random mac address when a network device without mac address + * is detached */ + VIR_DOMAIN_DEF_PARSE_SKIP_GENERATE_MACADDR = 1 << 10, } virDomainDefParseFlags; typedef enum { diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index bf97c9c..507edcf 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -3726,6 +3726,8 @@ libxlDomainDetachDeviceFlags(virDomainPtr dom, const char *xml, virDomainDefPtr vmdef = NULL; virDomainDeviceDefPtr dev = NULL; int ret = -1; + unsigned int parse_flags = VIR_DOMAIN_DEF_PARSE_INACTIVE | + VIR_DOMAIN_DEF_PARSE_SKIP_GENERATE_MACADDR; virCheckFlags(VIR_DOMAIN_DEVICE_MODIFY_LIVE | VIR_DOMAIN_DEVICE_MODIFY_CONFIG, -1); @@ -3743,9 +3745,8 @@ libxlDomainDetachDeviceFlags(virDomainPtr dom, const char *xml, goto endjob; if (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG) { - if (!(dev = virDomainDeviceDefParse(xml, vm->def, - cfg->caps, driver->xmlopt, - VIR_DOMAIN_DEF_PARSE_INACTIVE))) + if (!(dev = virDomainDeviceDefParse(xml, vm->def, cfg->caps, + driver->xmlopt, parse_flags))) goto endjob; /* Make a copy for updated domain. */ @@ -3760,9 +3761,8 @@ libxlDomainDetachDeviceFlags(virDomainPtr dom, const char *xml, if (flags & VIR_DOMAIN_DEVICE_MODIFY_LIVE) { /* If dev exists it was created to modify the domain config. Free it. */ virDomainDeviceDefFree(dev); - if (!(dev = virDomainDeviceDefParse(xml, vm->def, - cfg->caps, driver->xmlopt, - VIR_DOMAIN_DEF_PARSE_INACTIVE))) + if (!(dev = virDomainDeviceDefParse(xml, vm->def, cfg->caps, + driver->xmlopt, parse_flags))) goto endjob; if (libxlDomainDetachDeviceLive(driver, vm, dev) < 0) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index ef48812..23f0d80 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -5196,6 +5196,8 @@ static int lxcDomainDetachDeviceFlags(virDomainPtr dom, virDomainDefPtr vmdef = NULL; virDomainDeviceDefPtr dev = NULL, dev_copy = NULL; int ret = -1; + unsigned int parse_flags = VIR_DOMAIN_DEF_PARSE_INACTIVE | + VIR_DOMAIN_DEF_PARSE_SKIP_GENERATE_MACADDR; virLXCDriverConfigPtr cfg = virLXCDriverGetConfig(driver); virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | @@ -5213,9 +5215,8 @@ static int lxcDomainDetachDeviceFlags(virDomainPtr dom, if (!(caps = virLXCDriverGetCapabilities(driver, false))) goto cleanup; - dev = dev_copy = virDomainDeviceDefParse(xml, vm->def, - caps, driver->xmlopt, - VIR_DOMAIN_DEF_PARSE_INACTIVE); + dev = dev_copy = virDomainDeviceDefParse(xml, vm->def, caps, + driver->xmlopt, parse_flags); if (dev == NULL) goto cleanup; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 862c44c..df85fd5 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8486,6 +8486,8 @@ static int qemuDomainDetachDeviceFlags(virDomainPtr dom, const char *xml, !(flags & VIR_DOMAIN_AFFECT_LIVE)) parse_flags |= VIR_DOMAIN_DEF_PARSE_INACTIVE; + parse_flags |= VIR_DOMAIN_DEF_PARSE_SKIP_GENERATE_MACADDR; + dev = dev_copy = virDomainDeviceDefParse(xml, vm->def, caps, driver->xmlopt, parse_flags); diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index 84e1df8..c232435 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -2346,6 +2346,8 @@ static int umlDomainDetachDevice(virDomainPtr dom, const char *xml) virDomainObjPtr vm; virDomainDeviceDefPtr dev = NULL; int ret = -1; + unsigned int parse_flags = VIR_DOMAIN_DEF_PARSE_INACTIVE | + VIR_DOMAIN_DEF_PARSE_SKIP_GENERATE_MACADDR; umlDriverLock(driver); vm = virDomainObjListFindByUUID(driver->domains, dom->uuid); @@ -2366,8 +2368,8 @@ static int umlDomainDetachDevice(virDomainPtr dom, const char *xml) goto cleanup; } - dev = virDomainDeviceDefParse(xml, vm->def, driver->caps, driver->xmlopt, - VIR_DOMAIN_DEF_PARSE_INACTIVE); + dev = virDomainDeviceDefParse(xml, vm->def, driver->caps, + driver->xmlopt, parse_flags); if (dev == NULL) goto cleanup; diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 0cead10..4c539ef 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -4228,6 +4228,8 @@ static int vboxDomainDetachDevice(virDomainPtr dom, const char *xml) virDomainDeviceDefPtr dev = NULL; nsresult rc; int ret = -1; + unsigned int parse_flags = VIR_DOMAIN_DEF_PARSE_INACTIVE | + VIR_DOMAIN_DEF_PARSE_SKIP_GENERATE_MACADDR; if (!data->vboxObj) return ret; @@ -4238,8 +4240,8 @@ static int vboxDomainDetachDevice(virDomainPtr dom, const char *xml) def->os.type = VIR_DOMAIN_OSTYPE_HVM; - dev = virDomainDeviceDefParse(xml, def, data->caps, data->xmlopt, - VIR_DOMAIN_DEF_PARSE_INACTIVE); + dev = virDomainDeviceDefParse(xml, def, data->caps, + data->xmlopt, parse_flags); if (dev == NULL) goto cleanup; diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index ffa6f45..f5f5395 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -1172,6 +1172,8 @@ static int vzDomainDetachDeviceFlags(virDomainPtr dom, const char *xml, vzConnPtr privconn = dom->conn->privateData; virDomainDeviceDefPtr dev = NULL; virDomainObjPtr privdom = NULL; + unsigned int parse_flags = VIR_DOMAIN_XML_INACTIVE | + VIR_DOMAIN_DEF_PARSE_SKIP_GENERATE_MACADDR; virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1); @@ -1184,7 +1186,7 @@ static int vzDomainDetachDeviceFlags(virDomainPtr dom, const char *xml, goto cleanup; dev = virDomainDeviceDefParse(xml, privdom->def, privconn->driver->caps, - privconn->driver->xmlopt, VIR_DOMAIN_XML_INACTIVE); + privconn->driver->xmlopt, parse_flags); if (dev == NULL) goto cleanup; diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index cf7cdd0..216c4f4 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -2327,6 +2327,8 @@ xenDaemonDetachDeviceFlags(virConnectPtr conn, int ret = -1; char *xendev = NULL; virBuffer buf = VIR_BUFFER_INITIALIZER; + unsigned int parse_flags = VIR_DOMAIN_DEF_PARSE_INACTIVE | + VIR_DOMAIN_DEF_PARSE_SKIP_GENERATE_MACADDR; virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1); @@ -2354,8 +2356,8 @@ xenDaemonDetachDeviceFlags(virConnectPtr conn, NULL))) goto cleanup; - if (!(dev = virDomainDeviceDefParse(xml, def, priv->caps, priv->xmlopt, - VIR_DOMAIN_DEF_PARSE_INACTIVE))) + if (!(dev = virDomainDeviceDefParse(xml, def, priv->caps, + priv->xmlopt, parse_flags); goto cleanup; if (virDomainXMLDevID(conn, minidef, dev, class, ref, sizeof(ref))) diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c index ef1a460..ae142a3 100644 --- a/src/xen/xm_internal.c +++ b/src/xen/xm_internal.c @@ -1322,6 +1322,8 @@ xenXMDomainDetachDeviceFlags(virConnectPtr conn, int ret = -1; size_t i; xenUnifiedPrivatePtr priv = conn->privateData; + unsigned int parse_flags = VIR_DOMAIN_DEF_PARSE_INACTIVE | + VIR_DOMAIN_DEF_PARSE_SKIP_GENERATE_MACADDR; virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1); @@ -1340,10 +1342,8 @@ xenXMDomainDetachDeviceFlags(virConnectPtr conn, goto cleanup; def = entry->def; - if (!(dev = virDomainDeviceDefParse(xml, entry->def, - priv->caps, - priv->xmlopt, - VIR_DOMAIN_DEF_PARSE_INACTIVE))) + if (!(dev = virDomainDeviceDefParse(xml, entry->def, priv->caps, + priv->xmlopt, parse_flags))) goto cleanup; switch (dev->type) {

2 1

[libvirt] [PATCH 0/4] rpc: Fix fd leak and potential crash
by Cole Robinson 05 May '16

05 May '16

Patch 1 was already sent, I'd like to get it in for the release, it should be quite safe. Remaining patches centralize some cleanup code and fix a potential crasher, but since it should be rare I'd like to wait till after the release. Previous thread: http://www.redhat.com/archives/libvir-list/2016-April/msg01618.html Ben Gray (1): rpc: Don't leak fd via CreateXMLWithFiles Cole Robinson (3): rpc: Add virNetMessageClearPayload rpc: Clear more in virNetMessageClearPayload rpc: use virNetMessageClearPayload in client src/libvirt_remote.syms | 1 + src/rpc/virnetclient.c | 5 +---- src/rpc/virnetmessage.c | 28 +++++++++++++++++++--------- src/rpc/virnetmessage.h | 2 ++ 4 files changed, 23 insertions(+), 13 deletions(-) -- 2.7.4

2 10

[libvirt] [PATCH v2 0/8] Add IV Secret Object support
by John Ferlan 05 May '16

05 May '16

v1 here (specifically patches 11 & 12) http://www.redhat.com/archives/libvir-list/2016-April/msg01077.html What's new/changed: Patches 1-3 address comments made by Jan in his review of v1. Patch 4 is essentially following through on the Patch 3 comment Patch 5 was part of patch 11, but I split it out for easier review Patch 6 is the remainder of the former patch 11. Other than using the ...SECRET_INFO_TYPE_xxx nomenclature, no other real changes. Patch 7 was part of patch 12, but I split it out to reduce the amount to review. Beyond the aforementioned ...SECRET_INFO_TYPE_xxx changes, I removed qemuDomainSecretInfoGetAlias. Initially created to help with any hotplug code, but that's not necessary, so remove it for now. It was brought up on Jan's comments as well. Create qemuDomainSecretSetup in order to address Jan's other comment about a common API This code could be merged with patch 8, but separating it *and* leaving qemuDomainSecretHaveEncrypt essentially brain-dead worked made for a shorter pile to look at Patch 8 is the remainder of patch 12. I investigated extracting the iSCSI and RBD code out, but it really just didn't make practice sense. I altered qemuBuildSecretIVCommandLine to just access the IV alias directly since the callers were adjusted to only try to build the IV object if necessary. The qemuBuild{Disk|Hostdev}iSCSICommandLine were renamed to qemuBuild{Disk|Hostdev}SecinfoCommandLine and each encapsulated the call to qemuBuildSecretIVCommandLine rather than inlining it in each of the callers The qemuDomainSecretHaveEncrypt will not be braindead. None of the tests changed, so it doesn't seem I messed anything up with all the requested adjustments. John Ferlan (8): qemu: Adjust names of qemuDomainSecretInfoType enums qemu: Split out the master key create and write qemu: Move qemuDomainSecretPrepare to qemuProcessPrepareDomain qemu: Move qemuDomainSecretDestroy to qemuProcessLaunch qemu: Separate network URI command building code qemu: Introduce qemuDomainSecretIV qemu: Introduce new Secret IV API's qemu: Utilize qemu secret objects for SCSI/RBD auth/secret configure.ac | 1 + src/qemu/qemu_alias.c | 23 ++ src/qemu/qemu_alias.h | 2 + src/qemu/qemu_command.c | 359 +++++++++++++++++++-- src/qemu/qemu_domain.c | 242 ++++++++++++-- src/qemu/qemu_domain.h | 34 +- src/qemu/qemu_hotplug.c | 6 +- src/qemu/qemu_process.c | 23 +- ...uxml2argv-disk-drive-network-iscsi-auth-IV.args | 39 +++ ...muxml2argv-disk-drive-network-iscsi-auth-IV.xml | 43 +++ ...emuxml2argv-disk-drive-network-rbd-auth-IV.args | 31 ++ ...qemuxml2argv-disk-drive-network-rbd-auth-IV.xml | 42 +++ ...emuxml2argv-hostdev-scsi-lsi-iscsi-auth-IV.args | 41 +++ ...qemuxml2argv-hostdev-scsi-lsi-iscsi-auth-IV.xml | 48 +++ ...xml2argv-hostdev-scsi-virtio-iscsi-auth-IV.args | 43 +++ ...uxml2argv-hostdev-scsi-virtio-iscsi-auth-IV.xml | 48 +++ tests/qemuxml2argvmock.c | 31 +- tests/qemuxml2argvtest.c | 19 ++ 18 files changed, 1009 insertions(+), 66 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth-IV.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth-IV.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth-IV.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth-IV.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth-IV.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth-IV.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth-IV.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth-IV.xml -- 2.5.5

3 20

[libvirt] Fwd: Dump network traffic from each VM.
by Julio Faracco 05 May '16

05 May '16

Forwarding to devel-list. Julio Cesar Faracco ---------- Forwarded message ---------- From: Julio Faracco <jcfaracco(a)gmail.com> Date: 2016-05-04 12:37 GMT-03:00 Subject: Dump network traffic from each VM. To: libvirt-users(a)redhat.com Hi guys, Does anybody know how to dump the network trafic from each virtual machine using libvirt? Here, we usually use VPN softwares and other network tools inside Virtual Machines (Windows and Linux). Sometimes, this applications does not work properly, so we need to dump the network traffic of each Virtual Machine to compare and debug. How can I enable it using libvirt? I know that if you use a QEMU instance, you can enable the dump using "-netdev dump,...". Thanks! :-) Julio Cesar Faracco

1 0

[libvirt] [PATCH 00/27] Remove many conditionals from the RPM
by Daniel P. Berrange 05 May '16

05 May '16

Cole previously suggested that we should simplify the RPM spec by removing conditionals that we never need to toggle for RHEL / Fedora builds, rather than having conditionals for every single feature that exists. This series does just that.... Daniel P. Berrange (27): libvirt.spec.in: explicitly disable xenapi & vz drivers libvirt.spec.in: drop Fedora < 20 and RHEL < 6 libvirt.spec.in: remove client only build option libvirt.spec.in: remove conditional for driver modules libvirt.spec.in: remove libvirtd conditional libvirt.spec.in: remove avahi conditional libvirt.spec.in: remove hal conditional libvirt.spec.in: remove apparmor conditional libvirt.spec.in: remove capng conditional libvirt.spec.in: remove udev conditional libvirt.spec.in: remove netcf conditional libvirt.spec.in: remove audit conditional libvirt.spec.in: remove dtrace conditional libvirt.spec.in: remove sasl conditionals libvirt.spec.in: remove polkit conditional libvirt.spec.in: remove yajl conditional libvirt.spec.in: remove selinux conditional libvirt.spec.in: remove interface driver conditional libvirt.spec.in: remove network driver conditiaonl libvirt.spec.in: remove most storage conditionals libvirt.spec.in: remove nodedev conditional libvirt.spec.in: remove nwfilter driver conditional libvirt.spec.in: remove libpcap conditional libvirt.spec.in: remove macvtap conditional libvirt.spec.in: remove libnl conditional libvirt.spec.in: remove nss plugin conditional libvirt.spec.in: use explicit --with-xxx for all features libvirt.spec.in | 1205 +++++++++++++++---------------------------------------- 1 file changed, 333 insertions(+), 872 deletions(-) -- 2.5.5

2 30

[libvirt] [PATCH 0/2] Two trivial fixes
by Michal Privoznik 05 May '16

05 May '16

*** BLURB HERE *** Michal Privoznik (2): virNetServerClientNewPostExecRestart: Drop useless typecasts virNetServerClientNewPostExecRestart: Avoid align problems src/rpc/virnetserverclient.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) -- 2.8.1

2 6