- Devel - libvirt List Archives

[libvirt] [PATCH RESEND RFC V2 0/2] Implement l3 CAT
by Eli Qiao 11 Jul '17

11 Jul '17

Allow user to define cachetune in domain xml. RESEND: * Fix stupid complile problem pointed out by Martin, check and syntax-check passed. V2 -> V1 changes: * Redefine cachetune xml in domain xml. * Create a struct for driver to talk with util/virresctrl.* * Nit fixes Eli Qiao (2): Resctrl: Add new xml element to support cache tune Resctrl: Do cache allocation while boot a qemu VM docs/schemas/domaincommon.rng | 29 ++ include/libvirt/virterror.h | 1 + src/Makefile.am | 1 + src/conf/domain_conf.c | 112 ++++ src/conf/domain_conf.h | 19 + src/libvirt_private.syms | 9 + src/qemu/qemu_process.c | 81 +++ src/util/virerror.c | 1 + src/util/virresctrl.c | 822 ++++++++++++++++++++++++++++++ src/util/virresctrl.h | 88 ++++ tests/Makefile.am | 8 +- tests/virresctrldata/L3-free.schemata | 1 + tests/virresctrldata/L3CODE-free.schemata | 1 + tests/virresctrldata/L3DATA-free.schemata | 1 + tests/virresctrldata/linux-resctrl | 1 + tests/virresctrldata/linux-resctrl-cdp | 1 + tests/virresctrltest.c | 119 +++++ 17 files changed, 1294 insertions(+), 1 deletion(-) create mode 100644 src/util/virresctrl.c create mode 100644 src/util/virresctrl.h create mode 100644 tests/virresctrldata/L3-free.schemata create mode 100644 tests/virresctrldata/L3CODE-free.schemata create mode 100644 tests/virresctrldata/L3DATA-free.schemata create mode 120000 tests/virresctrldata/linux-resctrl create mode 120000 tests/virresctrldata/linux-resctrl-cdp create mode 100644 tests/virresctrltest.c -- 1.9.1

2 3

[libvirt] [PATCHv2 0/2] Adding support for LXC Docker-json configuration
by Venkat Datta N H 10 Jul '17

10 Jul '17

Hi All, I added two patches to support conversion of Docker JSON configuration into LXC Native Domain XML. Venkat Datta N H (2): lxc: add support for docker-json Memory and VCPU conversion lxc: add support for docker-json command conversion po/POTFILES.in | 1 + src/Makefile.am | 1 + src/lxc/lxc_docker.c | 181 +++++++++++++++++++++ src/lxc/lxc_docker.h | 32 ++++ src/lxc/lxc_driver.c | 13 +- src/lxc/lxc_native.h | 1 + tests/Makefile.am | 8 +- .../lxcdocker2xmldata-command.json | 47 ++++++ .../lxcdocker2xmldata-command.xml | 17 ++ .../lxcdocker2xmldata-simple.json | 36 ++++ .../lxcdocker2xmldata/lxcdocker2xmldata-simple.xml | 15 ++ tests/lxcdocker2xmltest.c | 150 +++++++++++++++++ 12 files changed, 496 insertions(+), 6 deletions(-) create mode 100644 src/lxc/lxc_docker.c create mode 100644 src/lxc/lxc_docker.h create mode 100644 tests/lxcdocker2xmldata/lxcdocker2xmldata-command.json create mode 100644 tests/lxcdocker2xmldata/lxcdocker2xmldata-command.xml create mode 100644 tests/lxcdocker2xmldata/lxcdocker2xmldata-simple.json create mode 100644 tests/lxcdocker2xmldata/lxcdocker2xmldata-simple.xml create mode 100644 tests/lxcdocker2xmltest.c -- 2.7.4

3 5

[libvirt] [PATCH] docs: add entry for Ravada to apps page
by Francesc Guasch 10 Jul '17

10 Jul '17

--- docs/apps.html.in | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/apps.html.in b/docs/apps.html.in index 5acf885a7..6b1357733 100644 --- a/docs/apps.html.in +++ b/docs/apps.html.in @@ -458,6 +458,14 @@ providers, OpenStack based public/private clouds, Docker servers, bare metal servers and now KVM hypervisors). </dd> + <dt><a href="http://ravada.upc.edu/">Ravada</a></dt> + <dd> + Ravada is an open source tool for managing Virtual Desktop + Infraestructure (VDI). It is very easy to install and use. Following + the documentation, you'll be ready to deploy virtual machines in + minutes. The only requirements for the users are a web-browser and + a light remote viewer. + </dd> </dl> <h2><a name="mobile">Mobile applications</a></h2> -- 2.11.0

2 1

[libvirt] [PATCH] tests: Add DO_TEST_PARSE_ERROR() to qemuxml2xml
by Andrea Bolognani 10 Jul '17

10 Jul '17

qemuxml2argv already supports the ability to include test cases that are known not to make it past XML parsing, and since we want to keep qemuxml2xml in sync with it as much as possible, we need to implement this missing feature. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- tests/qemuxml2xmltest.c | 104 +++++++++++++++++++++++++++++++----------------- 1 file changed, 67 insertions(+), 37 deletions(-) diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index c74614c..66729fa 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -28,6 +28,10 @@ enum { WHEN_BOTH = 3, }; +typedef enum { + FLAG_EXPECT_PARSE_ERROR = 1 << 0, +} virQemuXML2XMLTestFlags; + struct testInfo { char *inName; char *outActiveName; @@ -36,6 +40,8 @@ struct testInfo { virBitmapPtr activeVcpus; virQEMUCapsPtr qemuCaps; + + virQemuXML2XMLTestFlags flags; }; static int @@ -55,12 +61,15 @@ static int testXML2XMLActive(const void *opaque) { const struct testInfo *info = opaque; + testCompareDomXML2XMLResult flags = TEST_COMPARE_DOM_XML2XML_RESULT_SUCCESS; + + if (info->flags & FLAG_EXPECT_PARSE_ERROR) + flags = TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE; return testCompareDomXML2XMLFiles(driver.caps, driver.xmlopt, info->inName, info->outActiveName, true, qemuXML2XMLActivePreFormatCallback, - opaque, 0, - TEST_COMPARE_DOM_XML2XML_RESULT_SUCCESS); + opaque, 0, flags); } @@ -68,11 +77,14 @@ static int testXML2XMLInactive(const void *opaque) { const struct testInfo *info = opaque; + testCompareDomXML2XMLResult flags = TEST_COMPARE_DOM_XML2XML_RESULT_SUCCESS; + + if (info->flags & FLAG_EXPECT_PARSE_ERROR) + flags = TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE; return testCompareDomXML2XMLFiles(driver.caps, driver.xmlopt, info->inName, info->outInactiveName, false, - NULL, opaque, 0, - TEST_COMPARE_DOM_XML2XML_RESULT_SUCCESS); + NULL, opaque, 0, flags); } @@ -195,6 +207,8 @@ testCompareStatusXMLToXMLFiles(const void *opaque) VIR_DOMAIN_DEF_PARSE_STATUS | VIR_DOMAIN_DEF_PARSE_ACTUAL_NET | VIR_DOMAIN_DEF_PARSE_PCI_ORIG_STATES))) { + if (data->flags & FLAG_EXPECT_PARSE_ERROR) + goto ok; VIR_TEST_DEBUG("Failed to parse domain status XML:\n%s", source); goto cleanup; } @@ -217,6 +231,17 @@ testCompareStatusXMLToXMLFiles(const void *opaque) ret = 0; + ok: + if (data->flags & FLAG_EXPECT_PARSE_ERROR) { + if (ret < 0) { + VIR_TEST_DEBUG("Got expected error"); + ret = 0; + } else { + VIR_TEST_DEBUG("Error expected but there wasn't any"); + ret = -1; + } + } + cleanup: xmlKeepBlanksDefault(keepBlanksDefault); xmlFreeDoc(xml); @@ -249,7 +274,8 @@ static int testInfoSet(struct testInfo *info, const char *name, int when, - int gic) + int gic, + virQemuXML2XMLTestFlags flags) { if (!(info->qemuCaps = virQEMUCapsNew())) goto error; @@ -296,6 +322,8 @@ testInfoSet(struct testInfo *info, } } + info->flags = flags; + return 0; error: @@ -335,9 +363,9 @@ mymain(void) /* TODO: test with format probing disabled too */ driver.config->allowDiskFormatProbing = true; -# define DO_TEST_FULL(name, when, gic, ...) \ +# define DO_TEST_FULL(name, when, gic, flags, ...) \ do { \ - if (testInfoSet(&info, name, when, gic) < 0) { \ + if (testInfoSet(&info, name, when, gic, flags) < 0) { \ VIR_TEST_DEBUG("Failed to generate test data for '%s'", name); \ return -1; \ } \ @@ -364,8 +392,10 @@ mymain(void) # define NONE QEMU_CAPS_LAST # define DO_TEST(name, ...) \ - DO_TEST_FULL(name, WHEN_BOTH, GIC_NONE, __VA_ARGS__) + DO_TEST_FULL(name, WHEN_BOTH, GIC_NONE, 0, __VA_ARGS__) +# define DO_TEST_PARSE_ERROR(name, ...) \ + DO_TEST_FULL(name, WHEN_BOTH, GIC_NONE, FLAG_EXPECT_PARSE_ERROR, __VA_ARGS__) /* Unset or set all envvars here that are copied in qemudBuildCommandLine @@ -493,7 +523,7 @@ mymain(void) QEMU_CAPS_SCSI_DISK_WWN); DO_TEST("disk-mirror-old", NONE); DO_TEST("disk-mirror", NONE); - DO_TEST_FULL("disk-active-commit", WHEN_ACTIVE, GIC_NONE, NONE); + DO_TEST_FULL("disk-active-commit", WHEN_ACTIVE, GIC_NONE, 0, NONE); DO_TEST("graphics-listen-network", NONE); DO_TEST("graphics-vnc", NONE); DO_TEST("graphics-vnc-websocket", NONE); @@ -571,7 +601,7 @@ mymain(void) DO_TEST("channel-virtio", NONE); DO_TEST("channel-virtio-state", NONE); - DO_TEST_FULL("channel-unix-source-path", WHEN_INACTIVE, GIC_NONE, NONE); + DO_TEST_FULL("channel-unix-source-path", WHEN_INACTIVE, GIC_NONE, 0, NONE); DO_TEST("hostdev-usb-address", NONE); DO_TEST("hostdev-pci-address", NONE); @@ -644,17 +674,17 @@ mymain(void) DO_TEST("blkdeviotune-max-length", NONE); DO_TEST("controller-usb-order", NONE); - DO_TEST_FULL("seclabel-dynamic-baselabel", WHEN_INACTIVE, GIC_NONE, NONE); - DO_TEST_FULL("seclabel-dynamic-override", WHEN_INACTIVE, GIC_NONE, NONE); - DO_TEST_FULL("seclabel-dynamic-labelskip", WHEN_INACTIVE, GIC_NONE, NONE); - DO_TEST_FULL("seclabel-dynamic-relabel", WHEN_INACTIVE, GIC_NONE, NONE); + DO_TEST_FULL("seclabel-dynamic-baselabel", WHEN_INACTIVE, GIC_NONE, 0, NONE); + DO_TEST_FULL("seclabel-dynamic-override", WHEN_INACTIVE, GIC_NONE, 0, NONE); + DO_TEST_FULL("seclabel-dynamic-labelskip", WHEN_INACTIVE, GIC_NONE, 0, NONE); + DO_TEST_FULL("seclabel-dynamic-relabel", WHEN_INACTIVE, GIC_NONE, 0, NONE); DO_TEST("seclabel-static", NONE); - DO_TEST_FULL("seclabel-static-labelskip", WHEN_ACTIVE, GIC_NONE, NONE); + DO_TEST_FULL("seclabel-static-labelskip", WHEN_ACTIVE, GIC_NONE, 0, NONE); DO_TEST("seclabel-none", NONE); DO_TEST("seclabel-dac-none", NONE); DO_TEST("seclabel-dynamic-none", NONE); DO_TEST("seclabel-device-multiple", NONE); - DO_TEST_FULL("seclabel-dynamic-none-relabel", WHEN_INACTIVE, GIC_NONE, NONE); + DO_TEST_FULL("seclabel-dynamic-none-relabel", WHEN_INACTIVE, GIC_NONE, 0, NONE); DO_TEST("numad-static-vcpu-no-numatune", NONE); DO_TEST("disk-scsi-lun-passthrough-sgio", @@ -1088,27 +1118,27 @@ mymain(void) QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_VIRTIO_GPU, QEMU_CAPS_BOOTINDEX); - DO_TEST_FULL("aarch64-gic-none", WHEN_BOTH, GIC_NONE, NONE); - DO_TEST_FULL("aarch64-gic-none-v2", WHEN_BOTH, GIC_V2, NONE); - DO_TEST_FULL("aarch64-gic-none-v3", WHEN_BOTH, GIC_V3, NONE); - DO_TEST_FULL("aarch64-gic-none-both", WHEN_BOTH, GIC_BOTH, NONE); - DO_TEST_FULL("aarch64-gic-none-tcg", WHEN_BOTH, GIC_BOTH, NONE); - DO_TEST_FULL("aarch64-gic-default", WHEN_BOTH, GIC_NONE, NONE); - DO_TEST_FULL("aarch64-gic-default", WHEN_BOTH, GIC_V2, NONE); - DO_TEST_FULL("aarch64-gic-default", WHEN_BOTH, GIC_V3, NONE); - DO_TEST_FULL("aarch64-gic-default", WHEN_BOTH, GIC_BOTH, NONE); - DO_TEST_FULL("aarch64-gic-v2", WHEN_BOTH, GIC_NONE, NONE); - DO_TEST_FULL("aarch64-gic-v2", WHEN_BOTH, GIC_V2, NONE); - DO_TEST_FULL("aarch64-gic-v2", WHEN_BOTH, GIC_V3, NONE); - DO_TEST_FULL("aarch64-gic-v2", WHEN_BOTH, GIC_BOTH, NONE); - DO_TEST_FULL("aarch64-gic-v3", WHEN_BOTH, GIC_NONE, NONE); - DO_TEST_FULL("aarch64-gic-v3", WHEN_BOTH, GIC_V2, NONE); - DO_TEST_FULL("aarch64-gic-v3", WHEN_BOTH, GIC_V3, NONE); - DO_TEST_FULL("aarch64-gic-v3", WHEN_BOTH, GIC_BOTH, NONE); - DO_TEST_FULL("aarch64-gic-host", WHEN_BOTH, GIC_NONE, NONE); - DO_TEST_FULL("aarch64-gic-host", WHEN_BOTH, GIC_V2, NONE); - DO_TEST_FULL("aarch64-gic-host", WHEN_BOTH, GIC_V3, NONE); - DO_TEST_FULL("aarch64-gic-host", WHEN_BOTH, GIC_BOTH, NONE); + DO_TEST_FULL("aarch64-gic-none", WHEN_BOTH, GIC_NONE, 0, NONE); + DO_TEST_FULL("aarch64-gic-none-v2", WHEN_BOTH, GIC_V2, 0, NONE); + DO_TEST_FULL("aarch64-gic-none-v3", WHEN_BOTH, GIC_V3, 0, NONE); + DO_TEST_FULL("aarch64-gic-none-both", WHEN_BOTH, GIC_BOTH, 0, NONE); + DO_TEST_FULL("aarch64-gic-none-tcg", WHEN_BOTH, GIC_BOTH, 0, NONE); + DO_TEST_FULL("aarch64-gic-default", WHEN_BOTH, GIC_NONE, 0, NONE); + DO_TEST_FULL("aarch64-gic-default", WHEN_BOTH, GIC_V2, 0, NONE); + DO_TEST_FULL("aarch64-gic-default", WHEN_BOTH, GIC_V3, 0, NONE); + DO_TEST_FULL("aarch64-gic-default", WHEN_BOTH, GIC_BOTH, 0, NONE); + DO_TEST_FULL("aarch64-gic-v2", WHEN_BOTH, GIC_NONE, 0, NONE); + DO_TEST_FULL("aarch64-gic-v2", WHEN_BOTH, GIC_V2, 0, NONE); + DO_TEST_FULL("aarch64-gic-v2", WHEN_BOTH, GIC_V3, 0, NONE); + DO_TEST_FULL("aarch64-gic-v2", WHEN_BOTH, GIC_BOTH, 0, NONE); + DO_TEST_FULL("aarch64-gic-v3", WHEN_BOTH, GIC_NONE, 0, NONE); + DO_TEST_FULL("aarch64-gic-v3", WHEN_BOTH, GIC_V2, 0, NONE); + DO_TEST_FULL("aarch64-gic-v3", WHEN_BOTH, GIC_V3, 0, NONE); + DO_TEST_FULL("aarch64-gic-v3", WHEN_BOTH, GIC_BOTH, 0, NONE); + DO_TEST_FULL("aarch64-gic-host", WHEN_BOTH, GIC_NONE, 0, NONE); + DO_TEST_FULL("aarch64-gic-host", WHEN_BOTH, GIC_V2, 0, NONE); + DO_TEST_FULL("aarch64-gic-host", WHEN_BOTH, GIC_V3, 0, NONE); + DO_TEST_FULL("aarch64-gic-host", WHEN_BOTH, GIC_BOTH, 0, NONE); DO_TEST("memory-hotplug", NONE); DO_TEST("memory-hotplug-nonuma", NONE); -- 2.7.5

2 4

[libvirt] [PATCH] qemu: domain: Use vcpu 'node-id' property and pass it back to qemu
by Peter Krempa 10 Jul '17

10 Jul '17

vcpu properties gathered from query-hotpluggable cpus need to be passed back to qemu. As qemu did not use the node-id property until now and libvirt forgot to pass it back properly (it was parsed but not passed around) we did not honor this. This patch adds node-id to the structures where it was missing and passes it around as necessary. The test data was generated with a VM with following config: <numa> <cell id='0' cpus='0,2,4,6' memory='512000' unit='KiB'/> <cell id='1' cpus='1,3,5,7' memory='512000' unit='KiB'/> </numa> Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1452053 --- src/qemu/qemu_command.c | 4 + src/qemu/qemu_domain.c | 1 + src/qemu/qemu_domain.h | 1 + src/qemu/qemu_monitor.c | 2 + src/qemu/qemu_monitor.h | 1 + ...qemumonitorjson-cpuinfo-x86-node-full-cpus.json | 35 +++++++++ ...umonitorjson-cpuinfo-x86-node-full-hotplug.json | 87 ++++++++++++++++++++++ .../qemumonitorjson-cpuinfo-x86-node-full.data | 48 ++++++++++++ tests/qemumonitorjsontest.c | 3 + 9 files changed, 182 insertions(+) create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-node-full-cpus.json create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-node-full-hotplug.json create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-node-full.data diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c53ab97b9..3fe291863 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -10508,6 +10508,10 @@ qemuBuildHotpluggableCPUProps(const virDomainVcpuDef *vcpu) virJSONValueObjectAdd(ret, "i:thread-id", vcpupriv->thread_id, NULL) < 0) goto error; + if (vcpupriv->node_id != -1 && + virJSONValueObjectAdd(ret, "i:node-id", vcpupriv->node_id, NULL) < 0) + goto error; + return ret; error: diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 8e7404da6..0d9cd94b2 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6986,6 +6986,7 @@ qemuDomainRefreshVcpuInfo(virQEMUDriverPtr driver, vcpupriv->socket_id = info[i].socket_id; vcpupriv->core_id = info[i].core_id; vcpupriv->thread_id = info[i].thread_id; + vcpupriv->node_id = info[i].node_id; vcpupriv->vcpus = info[i].vcpus; VIR_FREE(vcpupriv->type); VIR_STEAL_PTR(vcpupriv->type, info[i].type); diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index aae322473..365b23c96 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -359,6 +359,7 @@ struct _qemuDomainVcpuPrivate { int socket_id; int core_id; int thread_id; + int node_id; int vcpus; }; diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 5c29b3763..2b0afcc21 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1750,6 +1750,7 @@ qemuMonitorCPUInfoClear(qemuMonitorCPUInfoPtr cpus, cpus[i].socket_id = -1; cpus[i].core_id = -1; cpus[i].thread_id = -1; + cpus[i].node_id = -1; cpus[i].vcpus = 0; cpus[i].tid = 0; cpus[i].halted = false; @@ -1902,6 +1903,7 @@ qemuMonitorGetCPUInfoHotplug(struct qemuMonitorQueryHotpluggableCpusEntry *hotpl vcpus[mastervcpu].socket_id = hotplugvcpus[i].socket_id; vcpus[mastervcpu].core_id = hotplugvcpus[i].core_id; vcpus[mastervcpu].thread_id = hotplugvcpus[i].thread_id; + vcpus[mastervcpu].node_id = hotplugvcpus[i].node_id; vcpus[mastervcpu].vcpus = hotplugvcpus[i].vcpus; VIR_STEAL_PTR(vcpus[mastervcpu].qom_path, hotplugvcpus[i].qom_path); VIR_STEAL_PTR(vcpus[mastervcpu].alias, hotplugvcpus[i].alias); diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 8956bf929..1697db55c 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -483,6 +483,7 @@ struct _qemuMonitorCPUInfo { int socket_id; int core_id; int thread_id; + int node_id; unsigned int vcpus; /* number of vcpus added if given entry is hotplugged */ /* name of the qemu type to add in case of hotplug */ diff --git a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-node-full-cpus.json b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-node-full-cpus.json new file mode 100644 index 000000000..6b39efa69 --- /dev/null +++ b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-node-full-cpus.json @@ -0,0 +1,35 @@ +{ + "return": [ + { + "arch": "x86", + "current": true, + "props": { + "core-id": 0, + "thread-id": 0, + "node-id": 0, + "socket-id": 0 + }, + "CPU": 0, + "qom_path": "/machine/unattached/device[0]", + "pc": 1048956, + "halted": true, + "thread_id": 2033724 + }, + { + "arch": "x86", + "current": false, + "props": { + "core-id": 0, + "thread-id": 1, + "node-id": 1, + "socket-id": 0 + }, + "CPU": 1, + "qom_path": "/machine/unattached/device[2]", + "pc": 1037318, + "halted": true, + "thread_id": 2033725 + } + ], + "id": "libvirt-21" +} diff --git a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-node-full-hotplug.json b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-node-full-hotplug.json new file mode 100644 index 000000000..dfddd9632 --- /dev/null +++ b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-node-full-hotplug.json @@ -0,0 +1,87 @@ +{ + "return": [ + { + "props": { + "core-id": 1, + "thread-id": 1, + "node-id": 1, + "socket-id": 1 + }, + "vcpus-count": 1, + "type": "Broadwell-x86_64-cpu" + }, + { + "props": { + "core-id": 1, + "thread-id": 0, + "node-id": 0, + "socket-id": 1 + }, + "vcpus-count": 1, + "type": "Broadwell-x86_64-cpu" + }, + { + "props": { + "core-id": 0, + "thread-id": 1, + "node-id": 1, + "socket-id": 1 + }, + "vcpus-count": 1, + "type": "Broadwell-x86_64-cpu" + }, + { + "props": { + "core-id": 0, + "thread-id": 0, + "node-id": 0, + "socket-id": 1 + }, + "vcpus-count": 1, + "type": "Broadwell-x86_64-cpu" + }, + { + "props": { + "core-id": 1, + "thread-id": 1, + "node-id": 1, + "socket-id": 0 + }, + "vcpus-count": 1, + "type": "Broadwell-x86_64-cpu" + }, + { + "props": { + "core-id": 1, + "thread-id": 0, + "node-id": 0, + "socket-id": 0 + }, + "vcpus-count": 1, + "type": "Broadwell-x86_64-cpu" + }, + { + "props": { + "core-id": 0, + "thread-id": 1, + "node-id": 1, + "socket-id": 0 + }, + "vcpus-count": 1, + "qom-path": "/machine/unattached/device[2]", + "type": "Broadwell-x86_64-cpu" + }, + { + "props": { + "core-id": 0, + "thread-id": 0, + "node-id": 0, + "socket-id": 0 + }, + "vcpus-count": 1, + "qom-path": "/machine/unattached/device[0]", + "type": "Broadwell-x86_64-cpu" + } + ], + "id": "libvirt-20" +} diff --git a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-node-full.data b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-node-full.data new file mode 100644 index 000000000..070ea084e --- /dev/null +++ b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-node-full.data @@ -0,0 +1,48 @@ +[vcpu libvirt-id='0'] + online=yes + hotpluggable=no + thread-id='2033724' + enable-id='1' + query-cpus-id='0' + type='Broadwell-x86_64-cpu' + qom_path='/machine/unattached/device[0]' + topology: socket='0' core='0' thread='0' node='0' vcpus='1' +[vcpu libvirt-id='1'] + online=yes + hotpluggable=no + thread-id='2033725' + enable-id='2' + query-cpus-id='1' + type='Broadwell-x86_64-cpu' + qom_path='/machine/unattached/device[2]' + topology: socket='0' core='0' thread='1' node='1' vcpus='1' +[vcpu libvirt-id='2'] + online=no + hotpluggable=yes + type='Broadwell-x86_64-cpu' + topology: socket='0' core='1' thread='0' node='0' vcpus='1' +[vcpu libvirt-id='3'] + online=no + hotpluggable=yes + type='Broadwell-x86_64-cpu' + topology: socket='0' core='1' thread='1' node='1' vcpus='1' +[vcpu libvirt-id='4'] + online=no + hotpluggable=yes + type='Broadwell-x86_64-cpu' + topology: socket='1' core='0' thread='0' node='0' vcpus='1' +[vcpu libvirt-id='5'] + online=no + hotpluggable=yes + type='Broadwell-x86_64-cpu' + topology: socket='1' core='0' thread='1' node='1' vcpus='1' +[vcpu libvirt-id='6'] + online=no + hotpluggable=yes + type='Broadwell-x86_64-cpu' + topology: socket='1' core='1' thread='0' node='0' vcpus='1' +[vcpu libvirt-id='7'] + online=no + hotpluggable=yes + type='Broadwell-x86_64-cpu' + topology: socket='1' core='1' thread='1' node='1' vcpus='1' diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index e9f9d47b5..6da27f783 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -2604,6 +2604,8 @@ testQemuMonitorCPUInfoFormat(qemuMonitorCPUInfoPtr vcpus, virBufferAsprintf(&buf, " core='%d'", vcpu->core_id); if (vcpu->thread_id != -1) virBufferAsprintf(&buf, " thread='%d'", vcpu->thread_id); + if (vcpu->node_id != -1) + virBufferAsprintf(&buf, " node='%d'", vcpu->node_id); if (vcpu->vcpus != 0) virBufferAsprintf(&buf, " vcpus='%u'", vcpu->vcpus); virBufferAddLit(&buf, "\n"); @@ -2913,6 +2915,7 @@ mymain(void) DO_TEST_CPU_INFO("x86-basic-pluggable", 8); DO_TEST_CPU_INFO("x86-full", 11); + DO_TEST_CPU_INFO("x86-node-full", 8); DO_TEST_CPU_INFO("ppc64-basic", 24); DO_TEST_CPU_INFO("ppc64-hotplug-1", 24); -- 2.12.2

2 2

[libvirt] [PATCH go-xml v2] Add support for QEMU
by Thomas Hipp 10 Jul '17

10 Jul '17

Add support for QEMU, and add test code. Signed-off-by: Thomas Hipp <thipp(a)suse.de> --- Changes since v1: - support multiple Args and Envs --- domain.go | 50 +++++++++++++++++++++++++++++++++----------------- domain_test.go | 28 ++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 17 deletions(-) diff --git a/domain.go b/domain.go index b9b0f77..8c1fa76 100644 --- a/domain.go +++ b/domain.go @@ -590,27 +590,43 @@ type DomainFeatureList struct { SMM *DomainFeatureState `xml:"smm"` } +type DomainQEMUCommandlineArg struct { + Value string `xml:"value,attr"` +} + +type DomainQEMUCommandlineEnv struct { + Name string `xml:"name,attr"` + Value string `xml:"value,attr,omitempty"` +} + +type DomainQEMUCommandline struct { + Args []DomainQEMUCommandlineArg `xml:"qemu arg"` + Envs []DomainQEMUCommandlineEnv `xml:"qemu env"` +} + // NB, try to keep the order of fields in this struct // matching the order of XML elements that libvirt // will generate when dumping XML. type Domain struct { - XMLName xml.Name `xml:"domain"` - Type string `xml:"type,attr,omitempty"` - Name string `xml:"name"` - UUID string `xml:"uuid,omitempty"` - Memory *DomainMemory `xml:"memory"` - CurrentMemory *DomainMemory `xml:"currentMemory"` - MaximumMemory *DomainMaxMemory `xml:"maxMemory"` - VCPU *DomainVCPU `xml:"vcpu"` - Resource *DomainResource `xml:"resource"` - SysInfo *DomainSysInfo `xml:"sysinfo"` - OS *DomainOS `xml:"os"` - Features *DomainFeatureList `xml:"features"` - CPU *DomainCPU `xml:"cpu"` - OnPoweroff string `xml:"on_poweroff,omitempty"` - OnReboot string `xml:"on_reboot,omitempty"` - OnCrash string `xml:"on_crash,omitempty"` - Devices *DomainDeviceList `xml:"devices"` + XMLName xml.Name `xml:"domain"` + XMLNS_QEMU string `xml:"xmlns qemu,attr,omitempty"` + Type string `xml:"type,attr,omitempty"` + Name string `xml:"name"` + UUID string `xml:"uuid,omitempty"` + Memory *DomainMemory `xml:"memory"` + CurrentMemory *DomainMemory `xml:"currentMemory"` + MaximumMemory *DomainMaxMemory `xml:"maxMemory"` + VCPU *DomainVCPU `xml:"vcpu"` + Resource *DomainResource `xml:"resource"` + SysInfo *DomainSysInfo `xml:"sysinfo"` + OS *DomainOS `xml:"os"` + Features *DomainFeatureList `xml:"features"` + CPU *DomainCPU `xml:"cpu"` + OnPoweroff string `xml:"on_poweroff,omitempty"` + OnReboot string `xml:"on_reboot,omitempty"` + OnCrash string `xml:"on_crash,omitempty"` + Devices *DomainDeviceList `xml:"devices"` + QEMUCommandline *DomainQEMUCommandline `xml:"qemu commandline"` } func (d *Domain) Unmarshal(doc string) error { diff --git a/domain_test.go b/domain_test.go index 47e5e26..0aa5938 100644 --- a/domain_test.go +++ b/domain_test.go @@ -1141,6 +1141,34 @@ var domainTestData = []struct { `</domain>`, }, }, + { + Object: &Domain{ + Type: "qemu", + Name: "test", + XMLNS_QEMU: "http://libvirt.org/schemas/domain/qemu/1.0", + QEMUCommandline: &DomainQEMUCommandline{ + Args: []DomainQEMUCommandlineArg{ + DomainQEMUCommandlineArg{Value: "-newarg"}, + DomainQEMUCommandlineArg{Value: "-oldarg"}, + }, + Envs: []DomainQEMUCommandlineEnv{ + DomainQEMUCommandlineEnv{Name: "QEMU_ENV", Value: "VAL"}, + DomainQEMUCommandlineEnv{Name: "QEMU_VAR", Value: "VAR"}, + }, + }, + }, + Expected: []string{ + `<domain xmlns:_xmlns="xmlns" _xmlns:qemu="http://libvirt.org/schemas/domain/qemu/1.0" type="qemu">`, + ` <name>test</name>`, + ` <commandline xmlns="qemu">`, + ` <arg xmlns="qemu" value="-newarg"></arg>`, + ` <arg xmlns="qemu" value="-oldarg"></arg>`, + ` <env xmlns="qemu" name="QEMU_ENV" value="VAL"></env>`, + ` <env xmlns="qemu" name="QEMU_VAR" value="VAR"></env>`, + ` </commandline>`, + `</domain>`, + }, + }, /* Tests for sub-documents that can be hotplugged */ { -- 2.13.2

2 2

[libvirt] [PATCH] tools: domdisplay command is not freeing the domain pointer.
by Julio Faracco 10 Jul '17

10 Jul '17

The command 'domdisplay' is not freeing the domain pointer properly in cleanup section. See the error below: virsh # domdisplay WINDOWS7 vnc://127.0.0.1:0 virsh # quit error: One or more references were leaked after disconnect from the hypervisor Valgrind report: ==29168== 66 (56 direct, 10 indirect) bytes in 1 blocks are definitely lost in loss record 154 of 239 ==29168== at 0x4C2FB55: calloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) ==29168== by 0x5505324: virAllocVar (viralloc.c:560) ==29168== by 0x555A61B: virObjectNew (virobject.c:199) ==29168== by 0x561F367: virGetDomain (datatypes.c:284) ==29168== by 0x5680979: get_nonnull_domain (remote_driver.c:8143) ==29168== by 0x5680979: remoteDomainLookupByName (remote_client_bodies.h:3047) ==29168== by 0x5623D9A: virDomainLookupByName (libvirt-domain.c:425) ==29168== by 0x160480: virshLookupDomainInternal (virsh-util.c:59) ==29168== by 0x160547: virshCommandOptDomainBy (virsh-util.c:98) ==29168== by 0x13D3A9: cmdDomDisplay (virsh-domain.c:10963) ==29168== by 0x165680: vshCommandRun (vsh.c:1327) ==29168== by 0x12E320: main (virsh.c:953) Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- tools/virsh-domain.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 55f4e14..8f3d4d5 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -11153,6 +11153,7 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) VIR_FREE(output); xmlXPathFreeContext(ctxt); xmlFreeDoc(xml); + virshDomainFree(dom); return ret; } -- 2.7.4

2 1

[libvirt] [PATCH 0/2] qemu: Parameter usage cleanups
by Ján Tomko 10 Jul '17

10 Jul '17

Here be patches. Ján Tomko (2): qemuDomainSetSchedulerParametersFlags: use the value_ul variable qemuDomainSetInterfaceParameters: use the temporary params variable src/qemu/qemu_driver.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) -- 2.13.0

2 4

[libvirt] [PATCH] configure: fix typo in nss error message
by Pino Toscano 10 Jul '17

10 Jul '17

This error message refers to the lack of network, not to yajl. Signed-off-by: Pino Toscano <ptoscano(a)redhat.com> --- m4/virt-nss.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4/virt-nss.m4 b/m4/virt-nss.m4 index 8840e7b..951a74e 100644 --- a/m4/virt-nss.m4 +++ b/m4/virt-nss.m4 @@ -37,7 +37,7 @@ AC_DEFUN([LIBVIRT_CHECK_NSS],[ if test "x$with_network" != "xyes" ; then if test "x$with_nss_plugin" = "xyes" ; then - AC_MSG_ERROR([Can't build nss plugin without yajl]) + AC_MSG_ERROR([Can't build nss plugin without network]) else with_nss_plugin=no fi -- 2.9.4

2 1

[libvirt] [PATCH] test: adding tests to virStrToDouble() inside virstringtest.
by Julio Faracco 10 Jul '17

10 Jul '17

There are no occurrences of tests related to Strings and Double numbers inside virstringtest.c. This commit introduces some tests to validate the conversion. The test does not include locale changes yet. Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- tests/virstringtest.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/tests/virstringtest.c b/tests/virstringtest.c index 97c6e76..cc95d3c 100644 --- a/tests/virstringtest.c +++ b/tests/virstringtest.c @@ -652,6 +652,48 @@ testStringToLong(const void *opaque) } +struct stringToDoubleData { + const char *str; + const char *end_ptr; + double res; +}; + +/* This test checks if double strings are successfully converted to double + * number considering the byproduct string too. */ +static int +testStringToDouble(const void *opaque) +{ + const struct stringToDoubleData *data = opaque; + int ret = -1; + char *end_ptr = NULL; + double res = 0; + + /* end_ptr returns or a substring or an empty string. + * It never returns a NULL pointer. */ + if ((ret = virStrToDouble(data->str, + data->end_ptr ? &end_ptr : NULL, + &res)) < 0) { + fprintf(stderr, "Convert error of '%s', expected '%lf'\n", + data->str, data->res); + return ret; + } + + if (res != data->res) { + fprintf(stderr, "Returned '%lf', expected '%lf'\n", + res, data->res); + return -1; + } + + /* Comparing substrings. */ + if (STRNEQ_NULLABLE(end_ptr, data->end_ptr)) { + fprintf(stderr, "Expected substring '%s', but got '%s'\n", + end_ptr, data->end_ptr); + return -1; + } + + return ret; +} + /* The point of this test is to check whether all members of the array are * freed. The test has to be checked using valgrind. */ static int @@ -965,6 +1007,44 @@ mymain(void) TEST_STRTOL("-18446744073709551616", NULL, 0, -1, 0U, -1, 0LL, -1, 0ULL, -1); +#define TEST_STRTOD(str, end_ptr, res) \ + do { \ + struct stringToDoubleData data = { \ + str, end_ptr, res, \ + }; \ + if (virTestRun("virStringToDouble '" str "'", \ + testStringToDouble, &data) < 0) \ + ret = -1; \ + } while (0) + + /* Simple numbers. */ + TEST_STRTOD("0.0", NULL, 0); + TEST_STRTOD("1.0", NULL, 1); + TEST_STRTOD("3.14159", NULL, 3.14159); + TEST_STRTOD("0.57721", NULL, 0.57721); + + /* Testing ending string. */ + TEST_STRTOD("2.718", "", 2.718); + TEST_STRTOD("2.718 281 828 459", " 281 828 459", 2.718); + TEST_STRTOD("2.718,281,828,459", ",281,828,459", 2.718); + + /* Scientific numbers. */ + TEST_STRTOD("3.14159e+000", NULL, 3.14159); + TEST_STRTOD("2.00600e+003", NULL, 2006); + TEST_STRTOD("1.00000e-010", NULL, 1e-010); + + /* Negative numbers. */ + TEST_STRTOD("-1.6180339887", NULL, -1.6180339887); + TEST_STRTOD("-0.00031e-010", NULL, -0.00031e-010); + + /* Long numbers. */ + TEST_STRTOD("57089907708238388904078437636832797971793838081897.0", + NULL, + 57089907708238388904078437636832797971793838081897.0); + TEST_STRTOD("3.141592653589793238462643383279502884197169399375105", + NULL, + 3.141592653589793238462643383279502884197169399375105); + /* test virStringListFreeCount */ if (virTestRun("virStringListFreeCount", testVirStringListFreeCount, NULL) < 0) -- 2.7.4

2 1

[libvirt] [PATCH] Fix guest boot failure when vcpu placement="auto" on memoryless numa node
by Nitesh Konkar 10 Jul '17

10 Jul '17

When the vcpu placement is auto and we have memoryless numa nodes on the host, numad returns a list numa nodes with and without memory. When we try to write it to /sys/fs/cgroup/*/cpuset.mems it errors out as invlaid argument. Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- numactl --hardware available: 4 nodes (0-1,16-17) node 0 cpus: 0 8 16 24 32 node 0 size: 32500 MB node 0 free: 25584 MB node 1 cpus: 40 48 56 64 72 node 1 size: 0 MB----------------------------------------------# node 1 free: 0 MB node 16 cpus: 80 88 96 104 112 node 16 size: 32613 MB node 16 free: 30991 MB node 17 cpus: 120 128 136 144 152 node 17 size: 0 MB--------------------------------------------# node 17 free: 0 MB node distances: node 0 1 16 17 0: 10 20 40 40 1: 20 10 40 40 16: 40 40 10 20 17: 40 40 20 10 virsh start virt-tests-vm1 error: Failed to start domain virt-tests-vm1 error: Invalid value '0-1,16-17' for 'cpuset.mems': Invalid argument--------------NOK src/qemu/qemu_cgroup.c | 4 +++- src/qemu/qemu_process.c | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index 36762d4..fd8deb1 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -723,10 +723,12 @@ qemuSetupCpusetMems(virDomainObjPtr vm) { virCgroupPtr cgroup_temp = NULL; qemuDomainObjPrivatePtr priv = vm->privateData; + virBitmapPtr nodeSet = NULL; virDomainNumatuneMemMode mode; char *mem_mask = NULL; int ret = -1; + nodeSet = virNumaGetHostMemoryNodeset(); if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_CPUSET)) return 0; @@ -735,7 +737,7 @@ qemuSetupCpusetMems(virDomainObjPtr vm) return 0; if (virDomainNumatuneMaybeFormatNodeset(vm->def->numa, - priv->autoNodeset, + nodeSet, &mem_mask, -1) < 0) goto cleanup; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index fa9990e..074a0cd 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2374,6 +2374,7 @@ qemuProcessSetupPid(virDomainObjPtr vm, virDomainNumatuneMemMode mem_mode; virCgroupPtr cgroup = NULL; virBitmapPtr use_cpumask; + virBitmapPtr nodeSet = NULL; char *mem_mask = NULL; int ret = -1; @@ -2397,13 +2398,15 @@ qemuProcessSetupPid(virDomainObjPtr vm, * neither period nor quota settings. And if CPUSET controller is * not initialized either, then there's nothing to do anyway. */ + nodeSet = virNumaGetHostMemoryNodeset(); + if (virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_CPU) || virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_CPUSET)) { if (virDomainNumatuneGetMode(vm->def->numa, -1, &mem_mode) == 0 && mem_mode == VIR_DOMAIN_NUMATUNE_MEM_STRICT && virDomainNumatuneMaybeFormatNodeset(vm->def->numa, - priv->autoNodeset, + nodeSet, &mem_mask, -1) < 0) goto cleanup; -- 1.8.3.1

2 1

[libvirt] [PATCH go-xml] Add support for domain clock and test code
by zhenwei.pi 10 Jul '17

10 Jul '17

Signed-off-by: zhenwei.pi <zhenwei.pi(a)youruncloud.com> --- domain.go | 5 +++++ domain_test.go | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/domain.go b/domain.go index b9b0f77..8bbf82b 100644 --- a/domain.go +++ b/domain.go @@ -532,6 +532,10 @@ type DomainCPU struct { Features []DomainCPUFeature `xml:"feature"` } +type DomainClock struct { + Offset string `xml:"offset,attr,omitempty"` +} + type DomainFeature struct { } @@ -607,6 +611,7 @@ type Domain struct { OS *DomainOS `xml:"os"` Features *DomainFeatureList `xml:"features"` CPU *DomainCPU `xml:"cpu"` + Clock *DomainClock `xml:"clock,omitempty"` OnPoweroff string `xml:"on_poweroff,omitempty"` OnReboot string `xml:"on_reboot,omitempty"` OnCrash string `xml:"on_crash,omitempty"` diff --git a/domain_test.go b/domain_test.go index 47e5e26..a263e72 100644 --- a/domain_test.go +++ b/domain_test.go @@ -491,6 +491,9 @@ var domainTestData = []struct { }, }, }, + Clock: &DomainClock{ + Offset: "utc", + }, }, Expected: []string{ `<domain type="kvm">`, @@ -524,6 +527,7 @@ var domainTestData = []struct { ` <initarg>--unit</initarg>`, ` <initarg>emergency.service</initarg>`, ` </os>`, + ` <clock offset="utc"></clock>`, `</domain>`, }, }, -- 2.7.4

1 0

[libvirt] [PATCH v2] test: adding tests to virStrToDouble() inside virstringtest.
by Julio Faracco 09 Jul '17

09 Jul '17

There are no occurrences of tests related to Strings and Double numbers inside virstringtest.c. This commit introduces some tests to validate the conversion. The test does not include locale changes yet. Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- tests/virstringtest.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/tests/virstringtest.c b/tests/virstringtest.c index 97c6e76..cc95d3c 100644 --- a/tests/virstringtest.c +++ b/tests/virstringtest.c @@ -652,6 +652,48 @@ testStringToLong(const void *opaque) } +struct stringToDoubleData { + const char *str; + const char *end_ptr; + double res; +}; + +/* This test checks if double strings are successfully converted to double + * number considering the byproduct string too. */ +static int +testStringToDouble(const void *opaque) +{ + const struct stringToDoubleData *data = opaque; + int ret = -1; + char *end_ptr = NULL; + double res = 0; + + /* end_ptr returns or a substring or an empty string. + * It never returns a NULL pointer. */ + if ((ret = virStrToDouble(data->str, + data->end_ptr ? &end_ptr : NULL, + &res)) < 0) { + fprintf(stderr, "Convert error of '%s', expected '%lf'\n", + data->str, data->res); + return ret; + } + + if (res != data->res) { + fprintf(stderr, "Returned '%lf', expected '%lf'\n", + res, data->res); + return -1; + } + + /* Comparing substrings. */ + if (STRNEQ_NULLABLE(end_ptr, data->end_ptr)) { + fprintf(stderr, "Expected substring '%s', but got '%s'\n", + end_ptr, data->end_ptr); + return -1; + } + + return ret; +} + /* The point of this test is to check whether all members of the array are * freed. The test has to be checked using valgrind. */ static int @@ -965,6 +1007,44 @@ mymain(void) TEST_STRTOL("-18446744073709551616", NULL, 0, -1, 0U, -1, 0LL, -1, 0ULL, -1); +#define TEST_STRTOD(str, end_ptr, res) \ + do { \ + struct stringToDoubleData data = { \ + str, end_ptr, res, \ + }; \ + if (virTestRun("virStringToDouble '" str "'", \ + testStringToDouble, &data) < 0) \ + ret = -1; \ + } while (0) + + /* Simple numbers. */ + TEST_STRTOD("0.0", NULL, 0); + TEST_STRTOD("1.0", NULL, 1); + TEST_STRTOD("3.14159", NULL, 3.14159); + TEST_STRTOD("0.57721", NULL, 0.57721); + + /* Testing ending string. */ + TEST_STRTOD("2.718", "", 2.718); + TEST_STRTOD("2.718 281 828 459", " 281 828 459", 2.718); + TEST_STRTOD("2.718,281,828,459", ",281,828,459", 2.718); + + /* Scientific numbers. */ + TEST_STRTOD("3.14159e+000", NULL, 3.14159); + TEST_STRTOD("2.00600e+003", NULL, 2006); + TEST_STRTOD("1.00000e-010", NULL, 1e-010); + + /* Negative numbers. */ + TEST_STRTOD("-1.6180339887", NULL, -1.6180339887); + TEST_STRTOD("-0.00031e-010", NULL, -0.00031e-010); + + /* Long numbers. */ + TEST_STRTOD("57089907708238388904078437636832797971793838081897.0", + NULL, + 57089907708238388904078437636832797971793838081897.0); + TEST_STRTOD("3.141592653589793238462643383279502884197169399375105", + NULL, + 3.141592653589793238462643383279502884197169399375105); + /* test virStringListFreeCount */ if (virTestRun("virStringListFreeCount", testVirStringListFreeCount, NULL) < 0) -- 2.7.4

1 1

[libvirt] [PATCH v2] test: adding tests to virStrToDouble() inside virstringtest.
by Julio Faracco 09 Jul '17

09 Jul '17

There are no occurrences of tests related to Strings and Double numbers inside virstringtest.c. This commit introduces some tests to validate the conversion. The test does not include locale changes yet. Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- tests/virstringtest.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/tests/virstringtest.c b/tests/virstringtest.c index 97c6e76..cc95d3c 100644 --- a/tests/virstringtest.c +++ b/tests/virstringtest.c @@ -652,6 +652,48 @@ testStringToLong(const void *opaque) } +struct stringToDoubleData { + const char *str; + const char *end_ptr; + double res; +}; + +/* This test checks if double strings are successfully converted to double + * number considering the byproduct string too. */ +static int +testStringToDouble(const void *opaque) +{ + const struct stringToDoubleData *data = opaque; + int ret = -1; + char *end_ptr = NULL; + double res = 0; + + /* end_ptr returns or a substring or an empty string. + * It never returns a NULL pointer. */ + if ((ret = virStrToDouble(data->str, + data->end_ptr ? &end_ptr : NULL, + &res)) < 0) { + fprintf(stderr, "Convert error of '%s', expected '%lf'\n", + data->str, data->res); + return ret; + } + + if (res != data->res) { + fprintf(stderr, "Returned '%lf', expected '%lf'\n", + res, data->res); + return -1; + } + + /* Comparing substrings. */ + if (STRNEQ_NULLABLE(end_ptr, data->end_ptr)) { + fprintf(stderr, "Expected substring '%s', but got '%s'\n", + end_ptr, data->end_ptr); + return -1; + } + + return ret; +} + /* The point of this test is to check whether all members of the array are * freed. The test has to be checked using valgrind. */ static int @@ -965,6 +1007,44 @@ mymain(void) TEST_STRTOL("-18446744073709551616", NULL, 0, -1, 0U, -1, 0LL, -1, 0ULL, -1); +#define TEST_STRTOD(str, end_ptr, res) \ + do { \ + struct stringToDoubleData data = { \ + str, end_ptr, res, \ + }; \ + if (virTestRun("virStringToDouble '" str "'", \ + testStringToDouble, &data) < 0) \ + ret = -1; \ + } while (0) + + /* Simple numbers. */ + TEST_STRTOD("0.0", NULL, 0); + TEST_STRTOD("1.0", NULL, 1); + TEST_STRTOD("3.14159", NULL, 3.14159); + TEST_STRTOD("0.57721", NULL, 0.57721); + + /* Testing ending string. */ + TEST_STRTOD("2.718", "", 2.718); + TEST_STRTOD("2.718 281 828 459", " 281 828 459", 2.718); + TEST_STRTOD("2.718,281,828,459", ",281,828,459", 2.718); + + /* Scientific numbers. */ + TEST_STRTOD("3.14159e+000", NULL, 3.14159); + TEST_STRTOD("2.00600e+003", NULL, 2006); + TEST_STRTOD("1.00000e-010", NULL, 1e-010); + + /* Negative numbers. */ + TEST_STRTOD("-1.6180339887", NULL, -1.6180339887); + TEST_STRTOD("-0.00031e-010", NULL, -0.00031e-010); + + /* Long numbers. */ + TEST_STRTOD("57089907708238388904078437636832797971793838081897.0", + NULL, + 57089907708238388904078437636832797971793838081897.0); + TEST_STRTOD("3.141592653589793238462643383279502884197169399375105", + NULL, + 3.141592653589793238462643383279502884197169399375105); + /* test virStringListFreeCount */ if (virTestRun("virStringListFreeCount", testVirStringListFreeCount, NULL) < 0) -- 2.7.4

1 0

[libvirt] [PATCH] test: adding tests to virStrToDouble() inside virstringtest.
by Julio Faracco 09 Jul '17

09 Jul '17

There are no occurrences of tests related to Strings and Double numbers inside virstringtest.c. This commit introduces some tests to validate the conversion. The test does not include locale changes yet. Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- tests/virstringtest.c | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/tests/virstringtest.c b/tests/virstringtest.c index 97c6e76..32ce79c 100644 --- a/tests/virstringtest.c +++ b/tests/virstringtest.c @@ -652,6 +652,52 @@ testStringToLong(const void *opaque) } +struct stringToDoubleData { + const char *str; + const char *end_ptr; + double res; +}; + +/* This test checks if double strings are successfully converted to double + * number considering the byproduct string too. */ +static int +testStringToDouble(const void *opaque) +{ + const struct stringToDoubleData *data = opaque; + int ret = -1; + char *end_ptr = NULL; + double res = 0; + + if (data->end_ptr) { + ret = virStrToDouble(data->str, &end_ptr, &res); + } else { + /* end_ptr returns or a substring or an empty string. + * It never returns a NULL pointer. */ + ret = virStrToDouble(data->str, NULL, &res); + } + + if (ret < 0) { + fprintf(stderr, "Convert error of '%s', expected '%f'\n", + data->str, data->res); + return ret; + } + + if (res != data->res) { + fprintf(stderr, "Returned '%f', expected '%f'\n", + res, data->res); + return -1; + } + + /* Comparing substrings. */ + if (STRNEQ_NULLABLE(end_ptr, data->end_ptr)) { + fprintf(stderr, "Expected substring '%s', but got '%s'\n", + end_ptr, data->end_ptr); + return -1; + } + + return ret; +} + /* The point of this test is to check whether all members of the array are * freed. The test has to be checked using valgrind. */ static int @@ -965,6 +1011,44 @@ mymain(void) TEST_STRTOL("-18446744073709551616", NULL, 0, -1, 0U, -1, 0LL, -1, 0ULL, -1); +#define TEST_STRTOD(str, end_ptr, res) \ + do { \ + struct stringToDoubleData data = { \ + str, end_ptr, res, \ + }; \ + if (virTestRun("virStringToDouble '" str "'", \ + testStringToDouble, &data) < 0) \ + ret = -1; \ + } while(0) + + /* Simple numbers. */ + TEST_STRTOD("0.0", NULL, 0); + TEST_STRTOD("1.0", NULL, 1); + TEST_STRTOD("3.14159", NULL, 3.14159); + TEST_STRTOD("0.57721", NULL, 0.57721); + + /* Testing ending string. */ + TEST_STRTOD("2.718", "", 2.718); + TEST_STRTOD("2.718 281 828 459", " 281 828 459", 2.718); + TEST_STRTOD("2.718,281,828,459", ",281,828,459", 2.718); + + /* Scientific numbers. */ + TEST_STRTOD("3.14159e+000", NULL, 3.14159); + TEST_STRTOD("2.00600e+003", NULL, 2006); + TEST_STRTOD("1.00000e-010", NULL, 1e-010); + + /* Negative numbers. */ + TEST_STRTOD("-1.6180339887", NULL, -1.6180339887); + TEST_STRTOD("-0.00031e-010", NULL, -0.00031e-010); + + /* Long numbers. */ + TEST_STRTOD("57089907708238388904078437636832797971793838081897.0", + NULL, + 57089907708238388904078437636832797971793838081897.0); + TEST_STRTOD("3.141592653589793238462643383279502884197169399375105", + NULL, + 3.141592653589793238462643383279502884197169399375105); + /* test virStringListFreeCount */ if (virTestRun("virStringListFreeCount", testVirStringListFreeCount, NULL) < 0) -- 2.7.4

2 2

[libvirt] [PATCH go-xml] Add support for domain clock
by zhenwei.pi 08 Jul '17

08 Jul '17

Signed-off-by: zhenwei.pi <zhenwei.pi(a)youruncloud.com> --- domain.go | 5 +++++ domain_test.go | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/domain.go b/domain.go index b9b0f77..8bbf82b 100644 --- a/domain.go +++ b/domain.go @@ -532,6 +532,10 @@ type DomainCPU struct { Features []DomainCPUFeature `xml:"feature"` } +type DomainClock struct { + Offset string `xml:"offset,attr,omitempty"` +} + type DomainFeature struct { } @@ -607,6 +611,7 @@ type Domain struct { OS *DomainOS `xml:"os"` Features *DomainFeatureList `xml:"features"` CPU *DomainCPU `xml:"cpu"` + Clock *DomainClock `xml:"clock,omitempty"` OnPoweroff string `xml:"on_poweroff,omitempty"` OnReboot string `xml:"on_reboot,omitempty"` OnCrash string `xml:"on_crash,omitempty"` diff --git a/domain_test.go b/domain_test.go index 47e5e26..a263e72 100644 --- a/domain_test.go +++ b/domain_test.go @@ -491,6 +491,9 @@ var domainTestData = []struct { }, }, }, + Clock: &DomainClock{ + Offset: "utc", + }, }, Expected: []string{ `<domain type="kvm">`, @@ -524,6 +527,7 @@ var domainTestData = []struct { ` <initarg>--unit</initarg>`, ` <initarg>emergency.service</initarg>`, ` </os>`, + ` <clock offset="utc"></clock>`, `</domain>`, }, }, -- 2.7.4

1 0

[libvirt] [PATCH] qemu: shared disks with cache=directsync should be safe for migration
by Peng Hao 07 Jul '17

07 Jul '17

From: Hao Peng <peng.hao2(a)zte.com.cn> At present shared disks can be migrated with either readonly or cache=none. But cache=directsync should be safe for migration, because both cache=directsync and cache=none don't use the host page cache, and cache=direct write through qemu block layer cache. Signed-off-by: Peng Hao <peng.hao2(a)zte.com.cn> Reviewed-by: Wang Yechao <wang.yechao255(a)zte.com.cn> --- src/qemu/qemu_migration.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index c23fffe..9d509dd 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1160,11 +1160,12 @@ qemuMigrationIsSafe(virDomainDefPtr def, const char *src = virDomainDiskGetSource(disk); /* Our code elsewhere guarantees shared disks are either readonly (in - * which case cache mode doesn't matter) or used with cache=none */ + * which case cache mode doesn't matter) or used with cache=none or used with cache=directsync */ if (virStorageSourceIsEmpty(disk->src) || disk->src->readonly || disk->src->shared || - disk->cachemode == VIR_DOMAIN_DISK_CACHE_DISABLE) + disk->cachemode == VIR_DOMAIN_DISK_CACHE_DISABLE || + disk->cachemode == VIR_DOMAIN_DISK_CACHE_DIRECTSYNC) continue; /* disks which are migrated by qemu are safe too */ @@ -1188,7 +1189,7 @@ qemuMigrationIsSafe(virDomainDefPtr def, virReportError(VIR_ERR_MIGRATE_UNSAFE, "%s", _("Migration may lead to data corruption if disks" - " use cache != none")); + " use cache != none or cache != directsync")); return false; } -- 1.8.3.1

1 0

[libvirt] [PATCH go-xml] Add support for QEMU
by Thomas Hipp 07 Jul '17

07 Jul '17

Add support for QEMU, and add test code. Signed-off-by: Thomas Hipp <thipp(a)suse.de> --- domain.go | 50 +++++++++++++++++++++++++++++++++----------------- domain_test.go | 20 ++++++++++++++++++++ 2 files changed, 53 insertions(+), 17 deletions(-) diff --git a/domain.go b/domain.go index b9b0f77..15fdb3a 100644 --- a/domain.go +++ b/domain.go @@ -590,27 +590,43 @@ type DomainFeatureList struct { SMM *DomainFeatureState `xml:"smm"` } +type DomainQEMUCommandlineArg struct { + Value string `xml:"value,attr"` +} + +type DomainQEMUCommandlineEnv struct { + Name string `xml:"name,attr"` + Value string `xml:"value,attr,omitempty"` +} + +type DomainQEMUCommandline struct { + Arg DomainQEMUCommandlineArg `xml:"qemu arg"` + Env DomainQEMUCommandlineEnv `xml:"qemu env"` +} + // NB, try to keep the order of fields in this struct // matching the order of XML elements that libvirt // will generate when dumping XML. type Domain struct { - XMLName xml.Name `xml:"domain"` - Type string `xml:"type,attr,omitempty"` - Name string `xml:"name"` - UUID string `xml:"uuid,omitempty"` - Memory *DomainMemory `xml:"memory"` - CurrentMemory *DomainMemory `xml:"currentMemory"` - MaximumMemory *DomainMaxMemory `xml:"maxMemory"` - VCPU *DomainVCPU `xml:"vcpu"` - Resource *DomainResource `xml:"resource"` - SysInfo *DomainSysInfo `xml:"sysinfo"` - OS *DomainOS `xml:"os"` - Features *DomainFeatureList `xml:"features"` - CPU *DomainCPU `xml:"cpu"` - OnPoweroff string `xml:"on_poweroff,omitempty"` - OnReboot string `xml:"on_reboot,omitempty"` - OnCrash string `xml:"on_crash,omitempty"` - Devices *DomainDeviceList `xml:"devices"` + XMLName xml.Name `xml:"domain"` + XMLNS_QEMU string `xml:"xmlns qemu,attr,omitempty"` + Type string `xml:"type,attr,omitempty"` + Name string `xml:"name"` + UUID string `xml:"uuid,omitempty"` + Memory *DomainMemory `xml:"memory"` + CurrentMemory *DomainMemory `xml:"currentMemory"` + MaximumMemory *DomainMaxMemory `xml:"maxMemory"` + VCPU *DomainVCPU `xml:"vcpu"` + Resource *DomainResource `xml:"resource"` + SysInfo *DomainSysInfo `xml:"sysinfo"` + OS *DomainOS `xml:"os"` + Features *DomainFeatureList `xml:"features"` + CPU *DomainCPU `xml:"cpu"` + OnPoweroff string `xml:"on_poweroff,omitempty"` + OnReboot string `xml:"on_reboot,omitempty"` + OnCrash string `xml:"on_crash,omitempty"` + Devices *DomainDeviceList `xml:"devices"` + QEMUCommandline *DomainQEMUCommandline `xml:"qemu commandline"` } func (d *Domain) Unmarshal(doc string) error { diff --git a/domain_test.go b/domain_test.go index 47e5e26..7e683a9 100644 --- a/domain_test.go +++ b/domain_test.go @@ -1141,6 +1141,26 @@ var domainTestData = []struct { `</domain>`, }, }, + { + Object: &Domain{ + Type: "qemu", + Name: "test", + XMLNS_QEMU: "http://libvirt.org/schemas/domain/qemu/1.0", + QEMUCommandline: &DomainQEMUCommandline{ + Arg: DomainQEMUCommandlineArg{Value: "-newarg"}, + Env: DomainQEMUCommandlineEnv{Name: "QEMU_ENV", Value: "VAL"}, + }, + }, + Expected: []string{ + `<domain xmlns:_xmlns="xmlns" _xmlns:qemu="http://libvirt.org/schemas/domain/qemu/1.0" type="qemu">`, + ` <name>test</name>`, + ` <commandline xmlns="qemu">`, + ` <arg xmlns="qemu" value="-newarg"></arg>`, + ` <env xmlns="qemu" name="QEMU_ENV" value="VAL"></env>`, + ` </commandline>`, + `</domain>`, + }, + }, /* Tests for sub-documents that can be hotplugged */ { -- 2.13.2

1 0

[libvirt] [PATCH] qemu: domain: Add missing newline to last element in status XML formatter
by Peter Krempa 07 Jul '17

07 Jul '17

Commit f9758109a7 did not put a newline after the element it added. --- Pushed as trivial. src/qemu/qemu_domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 8e7404da6..9a8ae26ac 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1886,7 +1886,7 @@ qemuDomainObjPrivateXMLFormat(virBufferPtr buf, virCPUDefFormatBufFull(buf, priv->origCPU, NULL, false); if (priv->chardevStdioLogd) - virBufferAddLit(buf, "<chardevStdioLogd/>"); + virBufferAddLit(buf, "<chardevStdioLogd/>\n"); return 0; } -- 2.12.2

1 0

[libvirt] [PATCH] qemu: Use iohelper during restore
by Shivaprasad G Bhat 07 Jul '17

07 Jul '17

Commit afe6e58 & c4caab53 made necessary changes to use io-helpers during save and restore. The commit c4caab53 missed to remove the redundant check in qemuDomainSaveImageOpen() because of which virFileWrapperFdNew() is not called if bypass_cache is false. Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- src/qemu/qemu_driver.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 516a851..ac89372 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6150,9 +6150,11 @@ qemuDomainSaveImageOpen(virQEMUDriverPtr driver, virDomainDefPtr def = NULL; int oflags = open_write ? O_RDWR : O_RDONLY; virCapsPtr caps = NULL; + unsigned int wrapperFlags = VIR_FILE_WRAPPER_NON_BLOCKING; if (bypass_cache) { int directFlag = virFileDirectFdFlag(); + wrapperFlags |= VIR_FILE_WRAPPER_BYPASS_CACHE; if (directFlag < 0) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("bypass cache unsupported by this system")); @@ -6166,9 +6168,8 @@ qemuDomainSaveImageOpen(virQEMUDriverPtr driver, if ((fd = qemuOpenFile(driver, NULL, path, oflags, NULL, NULL)) < 0) goto error; - if (bypass_cache && - !(*wrapperFd = virFileWrapperFdNew(&fd, path, - VIR_FILE_WRAPPER_BYPASS_CACHE))) + if (wrapperFd && + !(*wrapperFd = virFileWrapperFdNew(&fd, path, wrapperFlags))) goto error; if (saferead(fd, &header, sizeof(header)) != sizeof(header)) {

3 4

[libvirt] [PATCH] tests: enable qemu 2.9 capabilities test for s390
by Boris Fiuczynski 07 Jul '17

07 Jul '17

Adjust qemu 2.9 s390 capabilites xml and enable qemu capabilities test. Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.vnet.ibm.com> Reviewed-by: Marc Hartmayer <mhartmay(a)linux.vnet.ibm.com> --- tests/qemucapabilitiesdata/caps_2.9.50.s390x.xml | 8 +++++--- tests/qemucapabilitiestest.c | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/qemucapabilitiesdata/caps_2.9.50.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.50.s390x.xml index 7d46128..fa9d91d 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.50.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.50.s390x.xml @@ -1,7 +1,7 @@ <qemuCaps> - <qemuctime>1495812539</qemuctime> - <selfctime>1496170776</selfctime> - <selfvers>3004000</selfvers> + <qemuctime>0</qemuctime> + <selfctime>0</selfctime> + <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> <flag name='mem-path'/> @@ -133,6 +133,8 @@ <flag name='query-named-block-nodes'/> <flag name='kernel-irqchip'/> <flag name='kernel-irqchip.split'/> + <flag name='virtio.iommu_platform'/> + <flag name='virtio.ats'/> <flag name='loadparm'/> <version>2009050</version> <kvmVersion>0</kvmVersion> diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c index bbb683e..c76da05 100644 --- a/tests/qemucapabilitiestest.c +++ b/tests/qemucapabilitiestest.c @@ -175,6 +175,7 @@ mymain(void) DO_TEST("ppc64le", "caps_2.6.0"); DO_TEST("s390x", "caps_2.7.0"); DO_TEST("s390x", "caps_2.8.0"); + DO_TEST("s390x", "caps_2.9.50"); /* * Run "tests/qemucapsprobe /path/to/qemu/binary >foo.replies" -- 2.7.4

2 1

[libvirt] [PATCH v3 00/26] Multiple PHBs and hostdev isolation for pSeries guests
by Andrea Bolognani 07 Jul '17

07 Jul '17

Changes from [v2]: * support hot(un)plug properly; * add documentation. Changes from [v1]: * address review comments; * implement a much better isolation algorithm that doesn't require parsing and formatting the isolation group and can handle more dynamic scenarios, such as empty PHBs changing their isolation groups to accomodate hotplugged hostdevs; * add more test cases. Known limitations: * hostdevs in IOMMU group 0 are not handled properly - the default isolation group is currently 0, which means hostdevs in IOMMU group 0 will be assigned addresses as if they were emulated devices and will not be isolated properly. Fixing this will be a lot of work because it requires cleaning up the the code that instantiates pretty much anything embedding a virDomainDeviceInfo, which is... A lot of things. Luckily, IOMMU group 0 will probably not contain any devices that are actually usable as hostdevs, so it should be okay to fix this in a follow-up series rather than upfront. Reviewed-by tags have been collected, so figuring out which patches are still in need of reviewing is pretty easy. [v1] https://www.redhat.com/archives/libvir-list/2017-June/msg00110.html [v2] https://www.redhat.com/archives/libvir-list/2017-June/msg00695.html Andrea Bolognani (26): conf: Remove obsolete comment conf: Make virDomainPCIAddressSetGrow() private conf: Make virDomainPCIAddressFlagsCompatible() private conf: Tweak virDomainPCIAddressGetNextAddr() signature qemu: Clean up qemuDomainAttachHostPCIDevice() tests: Update qemumemlock data tests: Mock IOMMU groups conf: Simplify slot allocation qemu: Allow qemuBuildControllerDevStr() to return NULL qemu: Tweak index number checking conf: Move index number checking to drivers qemu: Relax pci-root index requirement for pSeries guests conf: Parse and format <target index='...'/> conf: Add 'spapr-pci-host-bridge' controller model qemu: Automatically pick target index and model for pci-root controllers qemu: Introduce QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE qemu: Deal with PHB naming conventions qemu: Use multiple PHBs for pSeries guests tests: Add tests for pSeries guests with multiple PHBs tests: Add baseline tests for automatic PHB usage qemu: Use PHBs to fill holes in PCI bus numbering qemu: Use PHBs when extending the guest PCI topology conf: Introduce isolation groups conf: Implement isolation rules qemu: Isolate hostdevs on pSeries guests news: Update for multiple PHBs and hostdev isolation docs/formatdomain.html.in | 5 + docs/news.xml | 21 ++ docs/schemas/domaincommon.rng | 7 + src/bhyve/bhyve_device.c | 4 +- src/bhyve/bhyve_domain.c | 15 ++ src/conf/device_conf.h | 14 +- src/conf/domain_addr.c | 222 ++++++++++++------ src/conf/domain_addr.h | 38 ++- src/conf/domain_conf.c | 31 ++- src/conf/domain_conf.h | 2 + src/libvirt_private.syms | 2 - src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 148 ++++++++++-- src/qemu/qemu_command.h | 9 +- src/qemu/qemu_domain.c | 14 ++ src/qemu/qemu_domain_address.c | 261 +++++++++++++++++++-- src/qemu/qemu_hotplug.c | 23 +- .../qemuargv2xmldata/qemuargv2xml-pseries-disk.xml | 5 +- .../qemuargv2xml-pseries-nvram.xml | 5 +- tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml | 1 + .../qemumemlock-pc-hardlimit+hostdev.xml | 2 +- .../qemumemlock-pc-hardlimit+locked+hostdev.xml | 2 +- tests/qemumemlockdata/qemumemlock-pc-hostdev.xml | 2 +- .../qemumemlock-pc-locked+hostdev.xml | 2 +- .../qemumemlock-pseries-hardlimit+hostdev.xml | 2 +- ...emumemlock-pseries-hardlimit+locked+hostdev.xml | 2 +- .../qemumemlock-pseries-hostdev.xml | 2 +- .../qemumemlock-pseries-locked+hostdev.xml | 2 +- tests/qemumemlocktest.c | 21 +- .../qemuxml2argv-pseries-hostdevs-1.args | 25 ++ .../qemuxml2argv-pseries-hostdevs-1.xml | 38 +++ .../qemuxml2argv-pseries-hostdevs-2.args | 25 ++ .../qemuxml2argv-pseries-hostdevs-2.xml | 37 +++ .../qemuxml2argv-pseries-hostdevs-3.args | 24 ++ .../qemuxml2argv-pseries-hostdevs-3.xml | 31 +++ .../qemuxml2argv-pseries-many-buses-1.args | 22 ++ .../qemuxml2argv-pseries-many-buses-1.xml | 19 ++ .../qemuxml2argv-pseries-many-buses-2.args | 22 ++ .../qemuxml2argv-pseries-many-buses-2.xml | 18 ++ .../qemuxml2argv-pseries-many-devices.args | 53 +++++ .../qemuxml2argv-pseries-many-devices.xml | 48 ++++ .../qemuxml2argv-pseries-phb-default-missing.args | 22 ++ .../qemuxml2argv-pseries-phb-default-missing.xml | 16 ++ .../qemuxml2argv-pseries-phb-simple.args | 22 ++ .../qemuxml2argv-pseries-phb-simple.xml | 17 ++ tests/qemuxml2argvtest.c | 64 ++++- .../qemuxml2xmlout-panic-pseries.xml | 5 +- .../qemuxml2xmlout-ppc64-usb-controller-legacy.xml | 5 +- .../qemuxml2xmlout-ppc64-usb-controller.xml | 5 +- .../qemuxml2xmlout-pseries-hostdevs-1.xml | 54 +++++ .../qemuxml2xmlout-pseries-hostdevs-2.xml | 50 ++++ .../qemuxml2xmlout-pseries-hostdevs-3.xml | 47 ++++ ...xml => qemuxml2xmlout-pseries-many-buses-1.xml} | 19 +- ...xml => qemuxml2xmlout-pseries-many-buses-2.xml} | 20 +- .../qemuxml2xmlout-pseries-many-devices.xml | 125 ++++++++++ .../qemuxml2xmlout-pseries-nvram.xml | 5 +- .../qemuxml2xmlout-pseries-panic-missing.xml | 5 +- .../qemuxml2xmlout-pseries-panic-no-address.xml | 5 +- ...qemuxml2xmlout-pseries-phb-default-missing.xml} | 18 +- ...m.xml => qemuxml2xmlout-pseries-phb-simple.xml} | 18 +- tests/qemuxml2xmltest.c | 59 ++++- tests/virpcimock.c | 43 +++- 63 files changed, 1637 insertions(+), 216 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-hostdevs-1.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-hostdevs-1.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-hostdevs-2.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-hostdevs-2.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-hostdevs-3.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-hostdevs-3.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-many-buses-1.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-many-buses-1.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-many-buses-2.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-many-buses-2.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-many-devices.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-many-devices.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-phb-default-missing.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-phb-default-missing.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-phb-simple.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-phb-simple.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-hostdevs-1.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-hostdevs-2.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-hostdevs-3.xml copy tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-nvram.xml => qemuxml2xmlout-pseries-many-buses-1.xml} (55%) copy tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-nvram.xml => qemuxml2xmlout-pseries-many-buses-2.xml} (54%) create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-many-devices.xml copy tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-nvram.xml => qemuxml2xmlout-pseries-phb-default-missing.xml} (56%) copy tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-nvram.xml => qemuxml2xmlout-pseries-phb-simple.xml} (56%) -- 2.7.5

4 66

[libvirt] [PATCH v3 0/4] Virtio-crypto device support
by Longpeng(Mike) 07 Jul '17

07 Jul '17

As virtio-crypto has been supported in QEMU 2.8 and the frontend driver has been merged in linux 4.10, so it's necessary to support virtio-crypto in libvirt. --- Hi guys, Sorry for the long delay... Changes since v2: - PATCH 1: modify docs as Martin & Boris's suggestion. [Martin & Boris] - PATCH 2: add the missing 'ToString'. [Martin] - PATCH 3: use virAsprintf instead of virBufferAsprintf. [Martin] remove pointless virBufferCheckError. [Martin] - rebase on master. [Longpeng] Changes since v1: - split patch [Martin] - rebase on master [Martin] - add docs/tests/schema [Martin] - fix typos [Gonglei] --- Longpeng(Mike) (4): docs: schema: Add basic documentation for the virtual conf: Parse virtio-crypto in the domain XML qemu: Implement support for 'builtin' backend for virtio-crypto tests: Add testcase for virtio-crypto XML parsing docs/formatdomain.html.in | 61 ++++++ docs/schemas/domaincommon.rng | 30 +++ src/conf/domain_conf.c | 213 ++++++++++++++++++++- src/conf/domain_conf.h | 32 ++++ src/libvirt_private.syms | 4 + src/qemu/qemu_alias.c | 20 ++ src/qemu/qemu_alias.h | 3 + src/qemu/qemu_capabilities.c | 6 + src/qemu/qemu_capabilities.h | 4 + src/qemu/qemu_command.c | 126 ++++++++++++ src/qemu/qemu_command.h | 3 + src/qemu/qemu_domain_address.c | 25 +++ src/qemu/qemu_driver.c | 6 + src/qemu/qemu_hotplug.c | 1 + tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 2 + tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 2 + .../qemuxml2argv-virtio-crypto-builtin.xml | 26 +++ .../qemuxml2argv-virtio-crypto.args | 22 +++ .../qemuxml2xmlout-virtio-crypto-builtin.xml | 31 +++ tests/qemuxml2xmltest.c | 2 + 20 files changed, 618 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-virtio-crypto-builtin.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-virtio-crypto.args create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-crypto-builtin.xml -- 1.8.3.1

4 11

[libvirt] [PATCH 0/2] virtio-crypto: ccw support
by Boris Fiuczynski 06 Jul '17

06 Jul '17

The two patches of this series are based on the patch series [libvirt] [PATCH v3 0/4] Virtio-crypto device support https://www.redhat.com/archives/libvir-list/2017-July/msg00097.html They add ccw support and a test for virtio-crypto-ccw. Boris Fiuczynski (2): qemu: virtio-crypto: add ccw support qemu: virtio-crypto: add test for ccw support src/qemu/qemu_command.c | 8 ++++++-- .../qemuxml2argv-virtio-crypto-ccw.args | 22 ++++++++++++++++++++++ .../qemuxml2argv-virtio-crypto-ccw.xml | 16 ++++++++++++++++ tests/qemuxml2argvtest.c | 6 ++++++ 4 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-virtio-crypto-ccw.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-virtio-crypto-ccw.xml -- 2.7.4

1 2

[libvirt] [PATCH 0/4] Misc cleanups for internal.h
by Daniel P. Berrange 06 Jul '17

06 Jul '17

Looking at internal.h there was some cruft we could usefully clean out. Daniel P. Berrange (4): Remove duplicate define of __GNUC_PREREQ Require use of GCC 4.4 or CLang compilers Remove network constants out of internal.h Remove incorrectly used TODO macro config-post.h | 24 +++--- src/internal.h | 153 +++++++-------------------------- src/libxl/libxl_conf.c | 1 + src/nwfilter/nwfilter_dhcpsnoop.c | 1 + src/nwfilter/nwfilter_gentech_driver.c | 1 + src/qemu/qemu_conf.c | 1 + src/util/virsocketaddr.h | 16 ++++ src/util/virutil.c | 1 + src/vz/vz_sdk.c | 1 + src/xen/xen_hypervisor.c | 6 +- src/xen/xend_internal.c | 6 +- 11 files changed, 76 insertions(+), 135 deletions(-) -- 2.9.4

2 6

[libvirt] Entering freeze for libvirt-3.5.0
by Daniel Veillard 06 Jul '17

06 Jul '17

Slightly late so little advance warning see my mail earlier today, I have now tagged RC1 in git head and pushed signed tarball and rpms to the usual place: ftp://libvirt.org/libvirt/ Seems to work well in my limited testing, https://ci.centos.org/view/libvirt/ is all green except one failed build, so things look smooth overall. Please give it a try to find out issues especially for portability accross systems. If everything goes well I will push an RC2 on Friday, and then make the release on Tuesday, thanks for trying it out, Daniel -- Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/ veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

6 22

[libvirt] libvirt binding for DBUS
by Pavel Hrdina 06 Jul '17

06 Jul '17

Hi, Last week (Jun 26 - Jun 30) there was a Cockpit Hackfest and the main topic was integration virtualization support into Cockpit. For that purpose Lars and me have started to work on a new libvirt dbus binding. Currently the binding is written manually and only few APIs are supported, however the ultimate goal is to write a code generator and ensure that all APIs are covered by this binding (similarly to the python binding). Dan, can you please setup hosting on libvirt.org? The binding is experimental and the API may and probably will change until first official release. Thanks, Pavel [1] <https://github.com/larskarlitski/libvirt-dbus>

4 7

[libvirt] [PATCH] qemu: Take all PHBs into account while calculating memlock limits
by Shivaprasad G Bhat 06 Jul '17

06 Jul '17

Now that the multi-phb support series is in, work on the TODO at qemuDomainGetMemLockLimitBytes() to arrive at the correct memlock limit value. Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- This patch should be applied on top of Andrea's multi-phb support patchset. src/qemu/qemu_domain.c | 12 ++++++++---- tests/qemumemlocktest.c | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index a3ce10a..a8293b4 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6674,12 +6674,16 @@ qemuDomainGetMemLockLimitBytes(virDomainDefPtr def) unsigned long long memory; unsigned long long baseLimit; unsigned long long passthroughLimit; - size_t nPCIHostBridges; + size_t nPCIHostBridges = 0; bool usesVFIO = false; - /* TODO: Detect at runtime once we start using more than just - * the default PCI Host Bridge */ - nPCIHostBridges = 1; + for (i = 0; i < def->ncontrollers; i++) { + if (def->controllers[i]->type != VIR_DOMAIN_CONTROLLER_TYPE_PCI || + def->controllers[i]->model != VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT) { + continue; + } + nPCIHostBridges++; + } for (i = 0; i < def->nhostdevs; i++) { virDomainHostdevDefPtr dev = def->hostdevs[i]; diff --git a/tests/qemumemlocktest.c b/tests/qemumemlocktest.c index c0f1dc3..268563d 100644 --- a/tests/qemumemlocktest.c +++ b/tests/qemumemlocktest.c @@ -131,7 +131,7 @@ mymain(void) DO_TEST("pseries-hardlimit", 2147483648); DO_TEST("pseries-locked", VIR_DOMAIN_MEMORY_PARAM_UNLIMITED); - DO_TEST("pseries-hostdev", 2168455168); + DO_TEST("pseries-hostdev", 4320133120); DO_TEST("pseries-hardlimit+locked", 2147483648); DO_TEST("pseries-hardlimit+hostdev", 2147483648);

3 2

[libvirt] Release of libvirt-3.5.0
by Daniel Veillard 05 Jul '17

05 Jul '17

As planned, it is out, I tagged it in git and pushed signed tarball and rpms to the usual place: ftp://libvirt.org/libvirt/ I also made a release 3.5.0 of the python bindings with minimal changes compared to 3.4.0, it can be found at: ftp://libvirt.org/libvirt/python/ This is a balanced release with signiciant amounts of both new features, improvements and bug fixes: New features: - qemu: Add support for loadparm for a boot device Add an optional boot parameter 'loadparm' for a boot device. Loadparm is an 8 byte parameter that, when present, is queried by S390 guests via sclp or diag 308. Linux guests on S390 use it to select a boot entry. - Support controlling how video devices are exposed to the bhyve guests The vgaconf attribute was added to video's driver element. Possible values are: on, off, and io. It controlls the way how bhyve exposes video devices to its guests; various guest OSes might require different settings to boot properly. - qemu: Add support for live updates of coalesce settings Users can now use virsh update-device to change the coalesce settings of an interfaces while the domain is running. - qemu: Allow VirtIO devices to use vIOMMU It is now possible to turn on IOTBL for the vIOMMU and have VirtIO devices use it, provided they have been configured appropriately. Improvements: - qemu: block copy job can be used with persistent domains Until now it was not possible to use block copy with persistent VMs. In use cases where it's not required to recover the job after VM shutdown, it's possible to specify VIR_DOMAIN_BLOCK_COPY_TRANSIENT_JOB flag to start the copy job. - JSON pseudo-protocol backing store parser supports new format of qemu 2.9 QEMU 2.9 modified a few structures corresponding to the JSON format of specifying a backing store for a disk image. Libvirt now implements the new format. - Capabilities now include info about host's CAT settings Various information about resource control from the host is gathered and presented in capabilities if available. - apparmor: Several improvements Allow access to Ceph config, EFI firmware on both x86_64 and aarch64, device tree on ppc64 and more. - qemu: Support host-model on POWER9 machines Bug fixes: - qemu: snapshot: retrieve image metadata from user provided files Disk images of an external snapshot created with VIR_DOMAIN_SNAPSHOT_CREATE_REUSE_EXT flag specified would not be scanned for metadata after recent changes. The metadata is necessary to allow keeping relative paths between images when doing a block-commit. - Parse decimal numbers in a locale-independent way Some locales, such as de_DE and pt_BR, use comma rather than dot to separate the integer part from the fractional part of a decimal number; however, several data sources such as the kernel use a locale-independent representation and need to be treated accordingly. - Support compilation with newer compiler and libc versions Several fixes have been included to make compilation with Clang 4.0.0, GCC 7.1 and glibc >= 2.25.90 possible. - qemu: Query name for vhost-user interfaces at runtime This makes it possible to use virsh subcommands such as domiflist and domifstat on vhost-user interfaces. - qemu: Set MTU for hotplugged interfaces correctly When hotplugging a network interface, the MTU was only set on the guest side. Set it on the host side as well. - qemu: Forbid updating MTU for interfaces of running guests The MTU setting can't be modified while the guest is running, so any attempt to alter it at runtime will now result in an error rather than being silently ignored. - qemu: Fix specifying QXL heads with older QEMU releases Specifying the number of QXL heads was not working correctly for QEMU releases older than 1.6. - qemu: Fix migration to older libvirt/QEMU versions When the guest is started, libvirt updates the CPU definition to reflect the actual CPU features to enforce ABI. We need to send original and updated CPU definition in order to support migration to older libvirt/QEMU versions. Only the updated CPU definition was sent to destination. So thanks everybody for your help toward this release, be it code, bug reports, reviews ideas or doc, it's all appreciated ! So please enjoy this new release ! Daniel -- Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/ veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

2 2

Re: [libvirt] [PATCH v3 1/4] block: Pass bdrv_* methods to bs->file by default
by Eric Blake 05 Jul '17

05 Jul '17

[adding libvirt for block size discussion] On 07/04/2017 04:44 AM, Kevin Wolf wrote: > Am 04.07.2017 um 10:40 hat Manos Pitsidianakis geschrieben: >> The following functions fail if bs->drv does not implement them: >> >> bdrv_probe_blocksizes >> bdrv_probe_geometry >> bdrv_truncate >> bdrv_has_zero_init >> bdrv_get_info >> bdrv_media_changed >> bdrv_eject >> bdrv_lock_medium >> bdrv_co_ioctl >> >> Instead, the call should be passed to bs->file if it exists, to allow >> filter drivers to support those methods without implementing them. >> > >> + return bdrv_probe_blocksizes(bs->file->bs, bsz); >> } >> >> return -ENOTSUP; > > This change actually changes existing behaviour. Basically, all of your > additions also apply for qcow2 images or other image formats, and we > need to check whether they make sense there. > > bdrv_probe_blocksizes() is used for the default values for the physical > and logical block sizes for block devices if no value is explicitly > specified in -device. This makes sense as it will allow the guest to > optimise its requests so that they align with the block size that is > optimal for the storage that contains the image. (I also think that we > probably should implement .bdrv_probe_blocksizes() not only for > host_device, but also for regular files to get optimal performance by > default.) > > Changing the defaults can be a problem for cross-version live migration > if the default values are used. Management tools that want to do live > migration are supposed to explicitly provide all options they can, so > this should be okay. > > Eric, does libvirt set the physical/logical block size explicitly? If > not, it would be good if it started to do so. Libvirt supports user control of block size via this XML in <disk>: <blockio logical_block_size='512' physical_block_size='4096'/> which it translates to command-line logical_block_size= and physical_block_size=. But I didn't see anywhere that libvirt tries to do anything with block size in QMP, which makes me wonder if that is a libvirt bug for not allowing a block size when hot-plugging a drive, or a weakness in QMP. Your point that if libvirt isn't always specifying block size, then we risk the block size changing on migration (that is, libvirt should be patched to specify block size always, and not just when the XML specifies it). -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org

1 0

[libvirt] [PATCH go-xml] Add support for device RNG
by Thomas Hipp 05 Jul '17

05 Jul '17

Add support for device RNG (random number generator), and add test code. Signed-off-by: Thomas Hipp <thipp(a)suse.de> --- domain.go | 34 +++++++++++++++++++++++ domain_test.go | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 119 insertions(+) diff --git a/domain.go b/domain.go index f9e3a80..b4f56bf 100644 --- a/domain.go +++ b/domain.go @@ -184,6 +184,8 @@ type DomainInterfaceSource struct { Path string `xml:"path,attr,omitempty"` Mode string `xml:"mode,attr,omitempty"` Port uint `xml:"port,attr,omitempty"` + Service string `xml:"service,attr,omitempty"` + Host string `xml:"host,attr,omitempty"` } type DomainInterfaceTarget struct { @@ -384,6 +386,25 @@ type DomainSound struct { Address *DomainAddress `xml:"address"` } +type DomainRNGRate struct { + Bytes uint `xml:"bytes,attr"` + Period uint `xml:"period,attr,omitempty"` +} + +type DomainRNGBackend struct { + Backend string `xml:",chardata"` + Model string `xml:"model,attr"` + Type string `xml:"type,attr,omitempty"` + Sources []DomainInterfaceSource `xml:"source"` +} + +type DomainRNG struct { + XMLName xml.Name `xml:"rng"` + Model string `xml:"model,attr"` + Rate *DomainRNGRate `xml:"rate"` + Backend *DomainRNGBackend `xml:"backend"` +} + type DomainDeviceList struct { Emulator string `xml:"emulator,omitempty"` Controllers []DomainController `xml:"controller"` @@ -398,6 +419,7 @@ type DomainDeviceList struct { Channels []DomainChannel `xml:"channel"` MemBalloon *DomainMemBalloon `xml:"memballoon"` Sounds []DomainSound `xml:"sound"` + RNGs []DomainRNG `xml:"rng"` } type DomainMemory struct { @@ -734,3 +756,15 @@ func (d *DomainSound) Marshal() (string, error) { } return string(doc), nil } + +func (d *DomainRNG) Unmarshal(doc string) error { + return xml.Unmarshal([]byte(doc), d) +} + +func (d *DomainRNG) Marshal() (string, error) { + doc, err := xml.MarshalIndent(d, "", " ") + if err != nil { + return "", err + } + return string(doc), nil +} diff --git a/domain_test.go b/domain_test.go index 0ce908b..aac23fe 100644 --- a/domain_test.go +++ b/domain_test.go @@ -333,6 +333,30 @@ var domainTestData = []struct { }, }, }, + RNGs: []DomainRNG{ + DomainRNG{ + Model: "virtio", + Rate: &DomainRNGRate{ + Period: 2000, + Bytes: 1234, + }, + Backend: &DomainRNGBackend{ + Model: "egd", + Type: "udp", + Sources: []DomainInterfaceSource{ + DomainInterfaceSource{ + Mode: "bind", + Service: "1234", + }, + DomainInterfaceSource{ + Mode: "connect", + Host: "1.2.3.4", + Service: "1234", + }, + }, + }, + }, + }, }, }, Expected: []string{ @@ -368,6 +392,13 @@ var domainTestData = []struct { ` <codec type="duplex"></codec>`, ` <address type="pci" domain="0" bus="0" slot="8" function="0"></address>`, ` </sound>`, + ` <rng model="virtio">`, + ` <rate bytes="1234" period="2000"></rate>`, + ` <backend model="egd" type="udp">`, + ` <source mode="bind" service="1234"></source>`, + ` <source mode="connect" service="1234" host="1.2.3.4"></source>`, + ` </backend>`, + ` </rng>`, ` </devices>`, `</domain>`, }, @@ -1334,6 +1365,60 @@ var domainTestData = []struct { `</sound>`, }, }, + { + Object: &DomainRNG{ + Model: "virtio", + Rate: &DomainRNGRate{ + Period: 2000, + Bytes: 1234, + }, + Backend: &DomainRNGBackend{ + Backend: "/dev/random", + Model: "random", + }, + }, + + Expected: []string{ + `<rng model="virtio">`, + ` <rate bytes="1234" period="2000"></rate>`, + ` <backend model="random">/dev/random</backend>`, + `</rng>`, + }, + }, + { + Object: &DomainRNG{ + Model: "virtio", + Rate: &DomainRNGRate{ + Period: 2000, + Bytes: 1234, + }, + Backend: &DomainRNGBackend{ + Model: "egd", + Type: "udp", + Sources: []DomainInterfaceSource{ + DomainInterfaceSource{ + Mode: "bind", + Service: "1234", + }, + DomainInterfaceSource{ + Mode: "connect", + Host: "1.2.3.4", + Service: "1234", + }, + }, + }, + }, + + Expected: []string{ + `<rng model="virtio">`, + ` <rate bytes="1234" period="2000"></rate>`, + ` <backend model="egd" type="udp">`, + ` <source mode="bind" service="1234"></source>`, + ` <source mode="connect" service="1234" host="1.2.3.4"></source>`, + ` </backend>`, + `</rng>`, + }, + }, } func TestDomain(t *testing.T) { -- 2.13.2

2 1

[libvirt] [PATCH v3 0/7] Add new APIs to edit xml configuration of managed save state of a domain
by Kothapally Madhu Pavan 05 Jul '17

05 Jul '17

managedsave command offloads the user from managing the save state file. It does not need the user to specify saved state file location, all it takes is domain name to identify. This makes it much more comfortable to use in emergency where immediate shutdowm is needed. But it doesn't provide a way to edit XML description of the save state file without user going through an extra effort to search manually where the file actually exists. The series aims to overcome the above constraints by adding new APIs and commands to seemlessly edit the managed save state XML description using just the domain name. The Patches mainly make use of the save-image-edit code flow only to simplify the above use case. This patch set provides capability to Dump and Edit the XML configuration associated with a saved state file of a domain which was created by the managedsave command. The new command carry the similar options as the save-image-<XXX> commands to change the running state as to paused state or running on start. This is equivalent to: virsh managedsave-dumpxml domain-name > state-file.xml vi state-file.xml (or make changes with your other text editor) virsh managedsave-define domain-name state-file-xml or you can simply use: virsh managedsave-edit domain-name It's always better when we get more. Changes since v2: - refracted version references from 3.5.0 to 3.6.0 Changes since v1: - qemu implementation called directly rather than going through driver pointer in qemuDomainManagedSaveDefineXML. - check whether the managed save state file exists and report a error if it doesn't. Kothapally Madhu Pavan (7): lib: Add API to dump xml configuration of managed save state domain lib: Add API to edit domain's managed save state xml configuration qemu: Implement qemuDomainManagedSaveGetXMLDesc qemu: Implement qemuDomainManagedSaveDefineXML virsh: Implement managedsave-define command virsh: Implement managedsave-dumpxml command virsh: Implement managedsave-edit command include/libvirt/libvirt-domain.h | 6 ++ src/driver-hypervisor.h | 11 +++ src/libvirt-domain.c | 107 ++++++++++++++++++++ src/libvirt_public.syms | 6 ++ src/qemu/qemu_driver.c | 87 ++++++++++++++++ src/remote/remote_driver.c | 2 + src/remote/remote_protocol.x | 31 +++++- src/remote_protocol-structs | 14 +++ tools/virsh-domain.c | 207 +++++++++++++++++++++++++++++++++++++++ tools/virsh.pod | 41 ++++++++ 10 files changed, 511 insertions(+), 1 deletion(-) -- 1.8.3.1

1 7

[libvirt] [PATCH v3 0/4] lxc improvements
by Cédric Bosdonnat 04 Jul '17

04 Jul '17

Hi all, Here is a series grouping several small patches I sent independently to the mailing list. Main change since v2: * <inituser> and <initgroup> have been changed to hold either a uid or name as text child, rather than in an attribute. * Moved the uid/gid setting to after the pivot_root to allow getting the uid/gid from name. Cédric Bosdonnat (4): lxc: allow defining environment variables util: share code between virExec and virCommandExec lxc: allow user to specify command working directory lxc: add possibility to define init uid/gid docs/formatdomain.html.in | 17 +++++++++ docs/schemas/domaincommon.rng | 29 +++++++++++++++ src/conf/domain_conf.c | 52 ++++++++++++++++++++++++++ src/conf/domain_conf.h | 11 ++++++ src/lxc/lxc_container.c | 59 ++++++++++++++++++++++++++++++ src/util/vircommand.c | 69 ++++++++++++++++++++--------------- tests/lxcxml2xmldata/lxc-initdir.xml | 30 +++++++++++++++ tests/lxcxml2xmldata/lxc-initenv.xml | 30 +++++++++++++++ tests/lxcxml2xmldata/lxc-inituser.xml | 31 ++++++++++++++++ tests/lxcxml2xmltest.c | 3 ++ 10 files changed, 302 insertions(+), 29 deletions(-) create mode 100644 tests/lxcxml2xmldata/lxc-initdir.xml create mode 100644 tests/lxcxml2xmldata/lxc-initenv.xml create mode 100644 tests/lxcxml2xmldata/lxc-inituser.xml -- 2.12.2

3 8

[libvirt] [PATCH] news: CPU add migration fix into Bug fixes
by Pavel Hrdina 04 Jul '17

04 Jul '17

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- docs/news.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index f38abeb91d..f590d9cdfc 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -197,6 +197,18 @@ QEMU releases older than 1.6. </description> </change> + <change> + <summary> + qemu: Fix migration to older libvirt/QEMU versions + </summary> + <description> + When the guest is started libvirt updates the CPU definition to + reflect the actual CPU features to enforce ABI. We need to send + original and updated CPU definition in order to support migration + to older libvirt/QEMU versions. Only the updated CPU definition + was send to destination. + </description> + </change> </section> </release> <release version="v3.4.0" date="2017-06-02"> -- 2.13.2

2 1

[libvirt] [PATCH v3 00/12] Make virNodeDeviceObj and virNodeDeviceObjList private
by John Ferlan 03 Jul '17

03 Jul '17

v2: https://www.redhat.com/archives/libvir-list/2017-May/msg00999.html Some patches from v2 were pushed (3, 4, 6, 7, 8, 9, 11, & 12), but a few remained from that series and are the first 5 patches of this series. What changed? -> Reworked the virNodeDeviceObjRemove patch (former patch 2, but new series patch 1). That affected the Test patch (former patch 1, but now patch 2). This patch removes the address of obj logic and moves the onus of the ObjFree to the caller (see patch for reason). -> Patch 3 is the former patch 5, with no essential change -> Patch 4 is the former patch 10, with no essential change -> Former patch 13 and 14, were altered to remove the offending address of pointer logic. The result is patch 5 which just essentially former patch 14 without the address of pointer logic. -> Patches 6-12 for this series are new, but follow along through the logic to make things private. John Ferlan (12): nodedev: Alter virNodeDeviceObjRemove test: Adjust cleanup/error paths for nodedev test APIs nodedev: Use common naming for virnodedeviceobj nodedev: Use consistent names for driver variables nodedev: Introduce virNodeDeviceObjNew nodedev: Introduce virNodeDeviceObjListNew nodedev: Alter node device obj list function names nodedev: Dereference the obj/def in virNodeDeviceObjListFind* APIs nodedev: Introduce virNodeDeviceGetSCSIHostCaps nodedev: Introduce virNodeDeviceObjListFindSCSIHostByWWNs nodedev: Privatize _virNodeDeviceObj and _virNodeDeviceObjList nodedev: Convert virNodeDeviceObj to use virObjectLockable src/conf/node_device_conf.c | 82 ++++++ src/conf/node_device_conf.h | 20 +- src/conf/virnodedeviceobj.c | 420 ++++++++++++++++++------------ src/conf/virnodedeviceobj.h | 67 ++--- src/libvirt_private.syms | 20 +- src/node_device/node_device_driver.c | 159 +++++------ src/node_device/node_device_hal.c | 47 ++-- src/node_device/node_device_linux_sysfs.c | 77 +----- src/node_device/node_device_udev.c | 52 ++-- src/test/test_driver.c | 136 +++++----- 10 files changed, 570 insertions(+), 510 deletions(-) -- 2.9.4

3 44

[libvirt] [PATCH] docs: add entry to download table listing the Rust language binding
by Daniel P. Berrange 03 Jul '17

03 Jul '17

Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- docs/downloads.html.in | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/docs/downloads.html.in b/docs/downloads.html.in index 99da7a6..0306945 100644 --- a/docs/downloads.html.in +++ b/docs/downloads.html.in @@ -179,6 +179,22 @@ <td></td> </tr> <tr> + <td>Rust</td> + <td> + <a href="ftp://libvirt.org/libvirt/rust/">ftp</a> + <a href="http://libvirt.org/sources/rust/">http</a> + <a href="https://libvirt.org/sources/rust/">https</a> + </td> + <td> + <a href="http://libvirt.org/git/?p=libvirt-rust.git;a=summary">libvirt</a> + </td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-rust">gitlab</a> + <a href="https://github.com/libvirt/libvirt-rust">github</a> + </td> + <td></td> + </tr> + <tr> <th colspan="7">Integration modules</th> </tr> <tr> -- 2.9.4

2 1

[libvirt] [PATCH] news: Update for 3.5.0 release
by Andrea Bolognani 03 Jul '17

03 Jul '17

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- docs/news.xml | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index 636154e..f38abeb 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -68,6 +68,15 @@ running. </description> </change> + <change> + <summary> + qemu: Allow VirtIO devices to use vIOMMU + </summary> + <description> + It is now possible to turn on IOTBL for the vIOMMU and have VirtIO + devices use it, provided they have been configured appropriately. + </description> + </change> </section> <section title="Improvements"> <change> @@ -100,6 +109,20 @@ gathered and presented in capabilities if available. </description> </change> + <change> + <summary> + apparmor: Several improvements + </summary> + <description> + Allow access to Ceph config, EFI firmware on both x86_64 and + aarch64, device tree on ppc64 and more. + </description> + </change> + <change> + <summary> + qemu: Support host-model on POWER9 machines + </summary> + </change> </section> <section title="Bug fixes"> <change> @@ -115,6 +138,65 @@ images when doing a block-commit. </description> </change> + <change> + <summary> + Parse decimal numbers in a locale-independent way + </summary> + <description> + Some locales, such as <code>de_DE</code> and <code>pt_BR</code>, + use comma rather than dot to separate the integer part from the + fractional part of a decimal number; however, several data sources + such as the kernel use a locale-independent representation and need + to be treated accordingly. + </description> + </change> + <change> + <summary> + Support compilation with newer compiler and libc versions + </summary> + <description> + Several fixes have been included to make compilation with Clang + 4.0.0, GCC 7.1 and glibc >= 2.25.90 possible. + </description> + </change> + <change> + <summary> + qemu: Query name for vhost-user interfaces at runtime + </summary> + <description> + This makes it possible to use <code>virsh</code> subcommands such + as <code>domiflist</code> and <code>domifstat</code> on vhost-user + interfaces. + </description> + </change> + <change> + <summary> + qemu: Set MTU for hotplugged interfaces correctly + </summary> + <description> + When hotplugging a network interface, the MTU was only set on the + guest side. Set it on the host side as well. + </description> + </change> + <change> + <summary> + qemu: Forbid updating MTU for interfaces of running guests + </summary> + <description> + The MTU setting can't be modified while the guest is running, so any + attempt to alter it at runtime will now result in an error rather + than being silently ignored. + </description> + </change> + <change> + <summary> + qemu: Fix specifying QXL heads with older QEMU releases + </summary> + <description> + Specifying the number of QXL heads was not working correctly for + QEMU releases older than 1.6. + </description> + </change> </section> </release> <release version="v3.4.0" date="2017-06-02"> -- 2.7.5

2 1

[libvirt] [PATCH RFC V2 0/2] Implement l3 CAT
by Eli Qiao 03 Jul '17

03 Jul '17

Allow user to define cachetune in domain xml. V2 -> V1 changes: * Redefine cachetune xml in domain xml. * Create a struct for driver to talk with util/virresctrl.* * Nit fixes Eli Qiao (2): Resctrl: Add new xml element to support cache tune Resctrl: Do cache allocation while boot a qemu VM docs/schemas/domaincommon.rng | 29 ++ include/libvirt/virterror.h | 1 + src/Makefile.am | 1 + src/conf/domain_conf.c | 112 ++++ src/conf/domain_conf.h | 19 + src/libvirt_private.syms | 9 + src/qemu/qemu_process.c | 81 +++ src/util/virerror.c | 1 + src/util/virresctrl.c | 822 ++++++++++++++++++++++++++++++ src/util/virresctrl.h | 88 ++++ tests/Makefile.am | 8 +- tests/virresctrldata/L3-free.schemata | 1 + tests/virresctrldata/L3CODE-free.schemata | 1 + tests/virresctrldata/L3DATA-free.schemata | 1 + tests/virresctrldata/linux-resctrl | 1 + tests/virresctrldata/linux-resctrl-cdp | 1 + tests/virresctrltest.c | 119 +++++ 17 files changed, 1294 insertions(+), 1 deletion(-) create mode 100644 src/util/virresctrl.c create mode 100644 src/util/virresctrl.h create mode 100644 tests/virresctrldata/L3-free.schemata create mode 100644 tests/virresctrldata/L3CODE-free.schemata create mode 100644 tests/virresctrldata/L3DATA-free.schemata create mode 120000 tests/virresctrldata/linux-resctrl create mode 120000 tests/virresctrldata/linux-resctrl-cdp create mode 100644 tests/virresctrltest.c -- 1.9.1

3 4

[libvirt] [PATCH] pci: add support for VMD domains
by Jon Derrick 30 Jun '17

30 Jun '17

VMD domains start at 0x10000, so expand dev->name to fit at least this many characters. Signed-off-by: Jon Derrick <jonathan.derrick(a)intel.com> --- src/util/virpci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virpci.c b/src/util/virpci.c index 2c1b758..b3afefe 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -50,7 +50,7 @@ VIR_LOG_INIT("util.pci"); #define PCI_SYSFS "/sys/bus/pci/" #define PCI_ID_LEN 10 /* "XXXX XXXX" */ -#define PCI_ADDR_LEN 13 /* "XXXX:XX:XX.X" */ +#define PCI_ADDR_LEN 14 /* "XXXXX:XX:XX.X" */ VIR_ENUM_IMPL(virPCIELinkSpeed, VIR_PCIE_LINK_SPEED_LAST, "", "2.5", "5", "8", "16") -- 2.9.3

1 0

[libvirt] [PATCH 00/10] conf: Clean up virDomain*Def creation
by Andrea Bolognani 30 Jun '17

30 Jun '17

This series is required to solve a known limitation in the current incarnation of device isolation support[1], namely the inability to isolate host devices coming from IOMMU group 0. The issue lies in the fact that virDomainDeviceInfo, and all virDomain*Def that embed it, are usually allocated through VIR_ALLOC(), which result in all their fields being initialized to zero. That's worked out just fine so far, because zero was a sensible default value for all existing fields; however, when implementing isolation groups, we add a new virDomainDeviceInfo::isolationGroup field which we need to be initialized to -1 instead so that it doesn't overlap with IOMMU group 0 mentioned above. Solving the issue involves creating twenty or so virDomain*DefNew() functions and using them instead of VIR_ALLOC() every time a virDomain*Def needs to be created, which is arguably a pretty good idea regardless. The series could probably be organized so that eg. the patch order makes more sense, but honestly I'm pretty tired right now and I just don't have it in me. Moreover, the goal of the series and its implementation are both straighforward enough that I feel reviewers will have no problem following along. My main concern with this series is that, while converting from VIR_ALLOC() to virDomain*DefNew(), I might simply have missed some instances. That would not cause any issue right away, but once we introduce isolation groups it would lead to suboptimal PCI addresses being allocated at best, and to perfectly legitimate hotplug requests being denied at worst. The fact that the test suite[2] passes gives me a lot of confidence that I haven't overlooked anything, but if anyone has clever ideas on how to be actually sure rather than merely confident please do let me know. [1] https://www.redhat.com/archives/libvir-list/2017-June/msg01018.html [2] That is, the version of it where the default isolation group being initialized correctly actually matters Andrea Bolognani (10): conf: Make virDomainDeviceGetInfo() private conf: Rename virDomainHostdevDefAlloc() to virDomainHostdevDefNew() conf: Clean up virDomainHostdevDefNew() conf: Clean up virDomain{Memory,Shmem}DefParseXML() conf: Move some virDomainDeviceInfo functions conf: Introduce virDomainDeviceInfoNew() conf: Clean up virDomainDeviceInfo functions conf, qemu: Use virDomainDeviceInfoNew() conf: Provide missing virDomain*DefNew() functions conf: Call virDomainDeviceInfoClear() in virDomain*DefNew() src/bhyve/bhyve_parse_command.c | 4 +- src/conf/device_conf.c | 146 ++++++++++++ src/conf/device_conf.h | 9 + src/conf/domain_addr.c | 6 +- src/conf/domain_conf.c | 486 ++++++++++++++++++++++++---------------- src/conf/domain_conf.h | 25 ++- src/libvirt_private.syms | 19 +- src/lxc/lxc_native.c | 2 +- src/openvz/openvz_conf.c | 2 +- src/qemu/qemu_command.c | 12 +- src/qemu/qemu_domain.c | 11 +- src/qemu/qemu_domain_address.c | 31 +-- src/qemu/qemu_hotplug.c | 5 +- src/qemu/qemu_parse_command.c | 31 +-- src/vbox/vbox_common.c | 14 +- src/vmx/vmx.c | 2 +- src/vz/vz_sdk.c | 6 +- src/xen/xen_driver.c | 2 +- src/xenapi/xenapi_driver.c | 2 +- src/xenconfig/xen_common.c | 4 +- src/xenconfig/xen_sxpr.c | 10 +- src/xenconfig/xen_xl.c | 4 +- src/xenconfig/xen_xm.c | 2 +- tests/virhostdevtest.c | 2 +- 24 files changed, 561 insertions(+), 276 deletions(-) -- 2.7.5

3 30

[libvirt] [PATCH] qemu: Don't update CPU when checking ABI stability
by Jiri Denemark 30 Jun '17

30 Jun '17

When checking ABI stability between two domain definitions, we first make migratable copies of them. However, we also asked for the guest CPU to be updated, even though the updated CPU is supposed to be already included in the original definitions. Moreover, if we do this on the destination host during migration, we're potentially updating the definition with according to an incompatible host CPU. While updating the CPU when checking ABI stability doesn't make any sense, it actually just worked because updating the CPU doesn't do anything for custom CPUs (only host-model CPUs are affected) and we updated both definitions in the same way. Less then a year ago commit v2.3.0-rc1~42 stopped updating the CPU in the definition we got internally and only the user supplied definition was updated. However, the same commit started updating host-model CPUs to custom CPUs which are not affected by the request to update the CPU. So it still seemed to work right, unless a user upgraded libvirt 2.2.0 to a newer version while there were some domains with host-model CPUs running on the host. Such domains couldn't be migrated with a user supplied XML since libvirt would complain: Target CPU mode custom does not match source host-model The fix is pretty straightforward, we just need to stop updating the CPU when checking ABI stability. https://bugzilla.redhat.com/show_bug.cgi?id=1463957 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_domain.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 8e7404da6..d9357f20c 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5926,7 +5926,6 @@ qemuDomainMigratableDefCheckABIStability(virQEMUDriverPtr driver, #define COPY_FLAGS (VIR_DOMAIN_XML_SECURE | \ - VIR_DOMAIN_XML_UPDATE_CPU | \ VIR_DOMAIN_XML_MIGRATABLE) bool -- 2.13.2

2 1

[libvirt] [PATCH 0/3] Add setting CPU features (CPUID) with libxenlight driver.
by Marek Marczykowski-Górecki 30 Jun '17

30 Jun '17

Marek Marczykowski-Górecki (3): cpu: define sub-leaf 0 for leaf 7 in cpu_map.xml libxl: add support for CPUID features policy tests: check domain XML to libxl structures conversion src/cpu/cpu_map.xml | 58 +++++------ src/libxl/libxl_conf.c | 139 ++++++++++++++++++++----- src/libxl/libxl_conf.h | 1 +- tests/Makefile.am | 8 +- tests/libxlxmltest.c | 232 ++++++++++++++++++++++++++++++++++++++++++- 5 files changed, 383 insertions(+), 55 deletions(-) create mode 100644 tests/libxlxmltest.c base-commit: f914b3f2d24d05615095e5ab5b0c91560c4dc903 -- git-series 0.9.1

4 15

[libvirt] [RFC PATCH 0/5] hotplug: fix premature rebinding of VFIO devices to host
by Michael Roth 30 Jun '17

30 Jun '17

Hi everyone. Hoping to get some feedback on this approach, or some alternatives proposed below, to the following issue: Currently libvirt immediately attempts to rebind a managed device back to the host driver when it receives a DEVICE_DELETED event from QEMU. This is problematic for 2 reasons: 1) If multiple devices from a group are attached to a guest, this can move the group into a "non-viable" state where some devices are assigned to the host and some to the guest. 2) When QEMU emits the DEVICE_DELETED event, there's still a "finalize" phase where additional cleanup occurs. In most cases libvirt can ignore this cleanup, but in the case of VFIO devices this is where closing of a VFIO group FD occurs, and failing to wait before rebinding the device to the host driver can result in unexpected behavior. In the case of powernv hosts at least, this can lead to a host driver crashing due to the default DMA windows not having been fully-restored yet. The window between this is and the initial DEVICE_DELETED seems to be ~6 seconds in practice. We've seen host dumps with Mellanox CX4 VFs being rebound to host driver during this period (on powernv hosts). Patches 1-4 address 1) by deferring rebinding of a hostdev to the host driver until all the devices in the group have been detached, at which point all the hostdevs are rebound as a group. Until that point, the devices are traced by the drvManager's inactiveList in a similar manner to hostdevs that are assigned to VFIO via the nodedev-detach interface. Patch 5 addresses 2) by adding an additional check that, when the last device from a group is detached, polls /proc for open FDs referencing the VFIO group path in /dev/vfio/<iommu_group> and waiting for the FD to be closed. If we time out, we abandon rebinding the hostdevs back to the host. There are a couple alternatives to Patch 5 that might be worth considering: a) Add a DEVICE_FINALIZED event to QEMU and wait for that instead of DEVICE_DELETED. Paired with patches 1-4 this would let us drop patch 5 in favor of minimal changes to libvirt's event handlers. The downsides are: - that we'd incur some latency for all device-detach calls, but it's not apparent to me whether this delay is significant for anything outside of VFIO. - there may be cases where finalization after DEVICE_DELETE/unparent are is not guaranteed, and I'm not sure QOM would encourage such expectations even if that's currently the case. b) Add a GROUP_DELETED event to VFIO's finalize callback. This is the most direct solution. With this we could completely separate out the handling of rebinding to host driver based on receival of this event. The downsides are: - this would only work for newer versions of QEMU, though we could use the poll-wait in patch 5 as a fallback. - synchronizing sync/async device-detach threads with sync/async handlers for this would be a bit hairy, but I have a WIP in progress that seems *fairly reasonable* c) Take the approach in Patch 5, either as a precursor to implementing b) or something else, or just sticking with that for now. d) ??? Personally I'm leaning toward c), but I'm wondering if that's "good enough" for now, or if we should pursue something more robust from the start, or perhaps something else entirely? Any feedback is greatly appreciated! src/libvirt_private.syms | 5 ++ src/qemu/qemu_hostdev.c | 16 +++++ src/qemu/qemu_hostdev.h | 4 ++ src/qemu/qemu_hotplug.c | 56 ++++++++++++++---- src/util/virfile.c | 52 +++++++++++++++++ src/util/virfile.h | 1 + src/util/virhostdev.c | 173 ++++++++++++++++++++++++++++++++++++++++++++++++++----- src/util/virhostdev.h | 16 +++++ src/util/virpci.c | 69 ++++++++++++++++++---- src/util/virpci.h | 4 ++ 10 files changed, 360 insertions(+), 36 deletions(-)

5 15

[libvirt] [PATCH] conf: Move virDomainPCIAddressBusIsFullyReserved()
by Andrea Bolognani 29 Jun '17

29 Jun '17

This function was private to the QEMU driver and was, accordingly, called qemuDomainPCIBusFullyReserved(). However, since it's really not QEMU-specific at all, it makes a lot of sense to have it closer to the virDomainPCIAddressBus struct it operates on; even more so considering we're going to introduce a complementary virDomainPCIAddressBusIsEmpty() function later on. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/conf/domain_addr.c | 14 ++++++++++++++ src/conf/domain_addr.h | 3 +++ src/libvirt_private.syms | 1 + src/qemu/qemu_domain_address.c | 15 +-------------- 4 files changed, 19 insertions(+), 14 deletions(-) diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 639168e..0ae1ed9 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -355,6 +355,20 @@ virDomainPCIAddressBusSetModel(virDomainPCIAddressBusPtr bus, } +bool +virDomainPCIAddressBusIsFullyReserved(virDomainPCIAddressBusPtr bus) +{ + size_t i; + + for (i = bus->minSlot; i <= bus->maxSlot; i++) { + if (!bus->slot[i].functions) + return false; + } + + return true; +} + + /* Ensure addr fits in the address set, by expanding it if needed * * Return value: diff --git a/src/conf/domain_addr.h b/src/conf/domain_addr.h index f884b8a..c90a335 100644 --- a/src/conf/domain_addr.h +++ b/src/conf/domain_addr.h @@ -141,6 +141,9 @@ int virDomainPCIAddressBusSetModel(virDomainPCIAddressBusPtr bus, virDomainControllerModelPCI model) ATTRIBUTE_NONNULL(1); +bool virDomainPCIAddressBusIsFullyReserved(virDomainPCIAddressBusPtr bus) + ATTRIBUTE_NONNULL(1); + bool virDomainPCIAddressSlotInUse(virDomainPCIAddressSetPtr addrs, virPCIDeviceAddressPtr addr) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 888412a..d76c1a7 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -106,6 +106,7 @@ virDomainCCWAddressSetFree; virDomainCCWAddressValidate; virDomainGetBlkioParametersAssignFromDef; virDomainPCIAddressAsString; +virDomainPCIAddressBusIsFullyReserved; virDomainPCIAddressBusSetModel; virDomainPCIAddressEnsureAddr; virDomainPCIAddressFlagsCompatible; diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index b5b863f..efc698d 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -1499,19 +1499,6 @@ qemuDomainValidateDevicePCISlotsChipsets(virDomainDefPtr def, } -static bool -qemuDomainPCIBusFullyReserved(virDomainPCIAddressBusPtr bus) -{ - size_t i; - - for (i = bus->minSlot; i <= bus->maxSlot; i++) - if (!bus->slot[i].functions) - return false; - - return true; -} - - /* * This assigns static PCI slots to all configured devices. * The ordering here is chosen to match the ordering used @@ -2043,7 +2030,7 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def, bool buses_reserved = true; for (i = 0; i < addrs->nbuses; i++) { - if (!qemuDomainPCIBusFullyReserved(&addrs->buses[i])) { + if (!virDomainPCIAddressBusIsFullyReserved(&addrs->buses[i])) { buses_reserved = false; break; } -- 2.7.5

2 1

[libvirt] libvirt-2.0.0 build error (hidden symbol libvirt_event_poll_update_handle_semaphore)
by longguang.yue 29 Jun '17

29 Jun '17

Hi, all: i back port a patch which makes qemu depends on util directory. so i correct its dependency by applying a patch. but another error occur. the patch is http://libvirt.org/git/?p=libvirt.git;a=commit;h=57b5e27d3d74f8dbb77ac909b4… the patch fix dependency : --- libvirt-2.0.0/src/Makefile.am 2016-06-27 22:12:20.523191076 +0800 +++ libvirt-2.0.0-ok/src/Makefile.am 2017-06-22 12:25:17.512000000 +0800 @@ -1362,6 +1362,7 @@ -I$(srcdir)/access \ -I$(srcdir)/conf \ -I$(srcdir)/secret \ + -I$(srcdir)/util \ $(AM_CFLAGS) libvirt_driver_qemu_impl_la_LDFLAGS = $(AM_LDFLAGS) libvirt_driver_qemu_impl_la_LIBADD = $(CAPNG_LIBS) \ @@ -1369,6 +1370,7 @@ $(LIBNL_LIBS) \ $(LIBXML_LIBS) \ libvirt_secret.la \ + libvirt_util.la \ $(NULL) libvirt_driver_qemu_impl_la_SOURCES = $(QEMU_DRIVER_SOURCES) --------- BUILD ERROR: CCLD qemucapsprobe /bin/ld: .libs/qemucapsprobe: hidden symbol `libvirt_event_poll_update_handle_semaphore' in ../src/libvirt_probes.o is referenced by DSO /bin/ld: final link failed: Bad value collect2: error: ld returned 1 exit status make[1]: *** [qemucapsprobe] Error 1 make[1]: Leaving directory `/root/libvirt-2.0/BUILD/libvirt-2.0.0/tests' make: *** [check-am] Error 2 + cat test-suite.log cat: test-suite.log: No such file or directory + true + exit 1 error: Bad exit status from /var/tmp/rpm-tmp.ZVbGSv (%check) RPM build errors: Bad exit status from /var/tmp/rpm-tmp.ZVbGSv (%check) -------------

2 2

[libvirt] [PATCH v2 0/2] vz: fix vz driver compilation
by Mikhail Feoktistov 29 Jun '17

29 Jun '17

Mikhail Feoktistov (2): vz: add argument xmlopt for virDomainDefCheckABIStability call vz: nseclabels member is moved to virDomainChrSourceDef struct src/vz/vz_driver.c | 2 +- src/vz/vz_sdk.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 1.8.3.1

2 3

[libvirt] [PATCH] docs: Document bhyve's vgaconf support
by Roman Bogorodskiy 29 Jun '17

29 Jun '17

- Add a news entry - Update driver's page with information about the new vgaconf attribute and provide usage example; while here, fix a grammar mistake Signed-off-by: Roman Bogorodskiy <bogorodskiy(a)gmail.com> --- docs/drvbhyve.html.in | 28 +++++++++++++++++++++++++++- docs/news.xml | 12 ++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/docs/drvbhyve.html.in b/docs/drvbhyve.html.in index dd6620d..f083db9 100644 --- a/docs/drvbhyve.html.in +++ b/docs/drvbhyve.html.in @@ -351,10 +351,36 @@ FreeBSD port.</p> <p>This way, VNC will be accessible on <code>127.0.0.1:5904</code>.</p> -<p>Please note that the tablet device requires to have an USB controller +<p>Please note that the tablet device requires to have a USB controller of the <code>nec-xhci</code> model. Currently, only a single controller of this type and a single tablet are supported per domain.</p> +<p><span class="since">Since 3.5.0</span>, it's possible to configure how the video device is exposed +to the guest using the <code>vgaconf</code> attribute:</p> + +<pre> +<domain type='bhyve'> + <devices> + ... + <graphics type='vnc' port='5904'> + <listen type='address' address='127.0.0.1'/> + </graphics> + <video> + <driver vgaconf='on'/> + <model type='gop' heads='1' primary='yes'/> + </video> + ... + </devices> + ... +</domain> +</pre> + +<p>If not specified, bhyve's default mode for <code>vgaconf</code> +will be used. Please refer to the +<a href="https://www.freebsd.org/cgi/man.cgi?query=bhyve&sektion=8&manpath=F…">bhyve(8)</a> +manual page and the <a href="https://wiki.freebsd.org/bhyve">bhyve wiki</a> for more details on using +the <code>vgaconf</code> option.</p> + <h3><a name="clockconfig">Clock configuration</a></h3> <p>Originally bhyve supported only localtime for RTC. Support for UTC time was introduced in diff --git a/docs/news.xml b/docs/news.xml index 27562e1..d320965 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -46,6 +46,18 @@ select a boot entry. </description> </change> + <change> + <summary> + Support controlling how video devices are exposed to the bhyve guests + </summary> + <description> + The <code>vgaconf</code> attribute was added to <code>video</code>'s + <code>driver</code> element. Possible values are: <code>on</code>, + <code>off</code>, and <code>io</code>. It controlls the way how + bhyve exposes video devices to its guests; various guest OSes might + require different settings to boot properly. + </description> + </change> </section> <section title="Improvements"> </section> -- 2.7.4

2 2

[libvirt] [PATCH 0/2] Really check for TLS dir if specified in qemu.conf
by John Ferlan 29 Jun '17

29 Jun '17

The qemu.conf indicates that for the various *_tls_x509_cert_dir settings that "If the provided path does not exist then the default_tls_x509_cert_dir path will be used."; however, the code didn't quite do that. The default for each was set during virQEMUDriverConfigNew; however, that was overwritten if the various config settings were used, but whether the directory actually existed and falling back to the default action of using the default configuration was not done. So that's what these patches do. John Ferlan (2): qemu: Clean up long lines in virQEMUDriverConfigLoadFile qemu: Check for existence of provided *_tls_x509_cert_dir src/qemu/qemu.conf | 9 +++- src/qemu/qemu_conf.c | 123 +++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 98 insertions(+), 34 deletions(-) -- 2.9.4

5 11

[libvirt] [PATCH] vz: support disabled items in prlsdk boot order
by Nikolay Shirokovskiy 29 Jun '17

29 Jun '17

--- src/vz/vz_sdk.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 8ccd7ea..a6eb0dd 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -1736,11 +1736,8 @@ prlsdkConvertBootOrderVm(PRL_HANDLE sdkdom, virDomainDefPtr def) pret = PrlBootDev_IsInUse(bootDev, &inUse); prlsdkCheckRetGoto(pret, cleanup); - if (!inUse) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Boot ordering with disabled items is not supported")); - goto cleanup; - } + if (!inUse) + continue; pret = PrlBootDev_GetSequenceIndex(bootDev, &bootIndex); prlsdkCheckRetGoto(pret, cleanup); -- 1.8.3.1

2 1

[libvirt] [PATCH] vz: fix vz driver compilation
by Mikhail Feoktistov 28 Jun '17

28 Jun '17

- add argument xmlopt for virDomainDefCheckABIStability - nseclabels is moved to virDomainChrSourceDefPtr --- src/vz/vz_driver.c | 2 +- src/vz/vz_sdk.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index d47774c..6f4aee3 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -872,7 +872,7 @@ vzDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int flags) * So forbid this operation, if config is changed. If it's * not changed - just do nothing. */ - if (!virDomainDefCheckABIStability(dom->def, def)) { + if (!virDomainDefCheckABIStability(dom->def, def, driver->xmlopt)) { virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", _("Can't change domain configuration " "in managed save state")); diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index a62b310..0aa1a30 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -2894,7 +2894,7 @@ static int prlsdkCheckSerialUnsupportedParams(virDomainChrDefPtr chr) return -1; } - if (chr->nseclabels > 0) { + if (chr->source->nseclabels > 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Setting security labels is not " "supported by vz driver.")); -- 1.8.3.1

2 1