- Devel - libvirt List Archives

[libvirt] [PATCH] nwfilter_gentech_driver: Fix indentation and typo
by Nitesh Konkar 20 Feb '17

20 Feb '17

Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- src/nwfilter/nwfilter_gentech_driver.c | 4 ++-- src/nwfilter/nwfilter_gentech_driver.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c index 761a01b..7dd2c97 100644 --- a/src/nwfilter/nwfilter_gentech_driver.c +++ b/src/nwfilter/nwfilter_gentech_driver.c @@ -448,7 +448,7 @@ virNWFilterIncludeDefToRuleInst(virNWFilterDriverStatePtr driver, * the filter and its subfilters. * @useNewFilter: instruct whether to use a newDef pointer rather than a * def ptr which is useful during a filter update - * @foundNewFilter: pointer to int indivating whether a newDef pointer was + * @foundNewFilter: pointer to int indicating whether a newDef pointer was * ever used; variable expected to be initialized to 0 by caller * @rulesout: array to be filled with rule instance * @nrulesout: counter to be filled with number of rule instances @@ -738,7 +738,7 @@ virNWFilterInstantiate(const unsigned char *vmuuid ATTRIBUTE_UNUSED, if (rc == 0 && (virNetDevValidateConfig(ifname, NULL, ifindex) <= 0)) { virResetLastError(); - /* interface changed/disppeared */ + /* interface changed/disappeared */ techdriver->allTeardown(ifname); rc = -1; } diff --git a/src/nwfilter/nwfilter_gentech_driver.h b/src/nwfilter/nwfilter_gentech_driver.h index 8349ab4..8163273 100644 --- a/src/nwfilter/nwfilter_gentech_driver.h +++ b/src/nwfilter/nwfilter_gentech_driver.h @@ -58,7 +58,7 @@ int virNWFilterInstantiateFilterLate(virNWFilterDriverStatePtr driver, int virNWFilterTeardownFilter(const virDomainNetDef *net); virNWFilterHashTablePtr virNWFilterCreateVarHashmap(char *macaddr, - const virNWFilterVarValue *value); + const virNWFilterVarValue *value); int virNWFilterDomainFWUpdateCB(virDomainObjPtr vm, void *data); -- 2.1.0

3 2

[libvirt] [PATCH] Disallow inclusion of files from src/conf into src/utils
by Peter Krempa 20 Feb '17

20 Feb '17

The utils code should stay separated from other code (except for very well justified cases). Unfortunately commit 272769beccd7479c75e700a6cb made it trivial to break the separation (and not get slapped by the syntax-check rule) by adding -I src/conf to the CFLAGS for utils. Remove this shortcut and except the two offenders from the syntax check so that the codebase can be kept separated. --- cfg.mk | 3 +++ src/Makefile.am | 3 +-- src/util/virclosecallbacks.h | 2 +- src/util/virhostdev.h | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cfg.mk b/cfg.mk index 69e3f3a1a..aaba61f1d 100644 --- a/cfg.mk +++ b/cfg.mk @@ -1242,3 +1242,6 @@ exclude_file_name_regexp--sc_prohibit_always-defined_macros = \ exclude_file_name_regexp--sc_prohibit_readdir = \ ^tests/.*mock\.c$$ + +exclude_file_name_regexp--sc_prohibit_cross_inclusion = \ + ^(src/util/virclosecallbacks\.h|src/util/virhostdev\.h)$$ diff --git a/src/Makefile.am b/src/Makefile.am index 46ca272eb..4f3f8f0bd 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1137,8 +1137,7 @@ libvirt_util_la_SOURCES = \ libvirt_util_la_CFLAGS = $(CAPNG_CFLAGS) $(YAJL_CFLAGS) $(LIBNL_CFLAGS) \ $(AM_CFLAGS) $(AUDIT_CFLAGS) $(DEVMAPPER_CFLAGS) \ $(DBUS_CFLAGS) $(LDEXP_LIBM) $(NUMACTL_CFLAGS) \ - $(POLKIT_CFLAGS) $(GNUTLS_CFLAGS) $(ACL_CFLAGS) \ - -I$(srcdir)/conf + $(POLKIT_CFLAGS) $(GNUTLS_CFLAGS) $(ACL_CFLAGS) libvirt_util_la_LIBADD = $(CAPNG_LIBS) $(YAJL_LIBS) $(LIBNL_LIBS) \ $(THREAD_LIBS) $(AUDIT_LIBS) $(DEVMAPPER_LIBS) \ $(LIB_CLOCK_GETTIME) $(DBUS_LIBS) $(WIN32_EXTRA_LIBS) $(LIBXML_LIBS) \ diff --git a/src/util/virclosecallbacks.h b/src/util/virclosecallbacks.h index 4df0a0060..d48997181 100644 --- a/src/util/virclosecallbacks.h +++ b/src/util/virclosecallbacks.h @@ -25,7 +25,7 @@ #ifndef __VIR_CLOSE_CALLBACKS__ # define __VIR_CLOSE_CALLBACKS__ -# include "virdomainobjlist.h" +# include "conf/virdomainobjlist.h" typedef struct _virCloseCallbacks virCloseCallbacks; typedef virCloseCallbacks *virCloseCallbacksPtr; diff --git a/src/util/virhostdev.h b/src/util/virhostdev.h index 4c1fea3ef..1202136c2 100644 --- a/src/util/virhostdev.h +++ b/src/util/virhostdev.h @@ -31,7 +31,7 @@ # include "virusb.h" # include "virscsi.h" # include "virscsivhost.h" -# include "domain_conf.h" +# include "conf/domain_conf.h" typedef enum { VIR_HOSTDEV_STRICT_ACS_CHECK = (1 << 0), /* strict acs check */ -- 2.11.0

3 4

[libvirt] [PATCH] qemu: Forbid slashes in shmem name
by Martin Kletzander 20 Feb '17

20 Feb '17

With that users could access files outside /dev/shm. That itself isn't a security problem, but might cause some errors we want to avoid. So let's forbid slashes as we do with domain and volume names and also mention that in the schema. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1395496 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- docs/schemas/domaincommon.rng | 6 +++++- src/qemu/qemu_process.c | 23 +++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index cc6e0d0c0d65..00cdc93bca59 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -3598,7 +3598,11 @@ <define name="shmem"> <element name="shmem"> - <attribute name="name"/> + <attribute name="name"> + <data type="string"> + <param name="pattern">[^/]*</param> + </data> + </attribute> <interleave> <optional> <element name="model"> diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 184440dc1af6..0f63668100a6 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4586,6 +4586,26 @@ qemuProcessStartValidateVideo(virDomainObjPtr vm, static int +qemuProcessStartValidateShmem(virDomainObjPtr vm) +{ + size_t i; + + for (i = 0; i < vm->def->nshmems; i++) { + virDomainShmemDefPtr shmem = vm->def->shmems[i]; + + if (strchr(shmem->name, '/')) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("shmem name '%s' must not contain '/'"), + shmem->name); + return -1; + } + } + + return 0; +} + + +static int qemuProcessStartValidateXML(virQEMUDriverPtr driver, virDomainObjPtr vm, virQEMUCapsPtr qemuCaps, @@ -4661,6 +4681,9 @@ qemuProcessStartValidate(virQEMUDriverPtr driver, if (qemuProcessStartValidateVideo(vm, qemuCaps) < 0) return -1; + if (qemuProcessStartValidateShmem(vm) < 0) + return -1; + VIR_DEBUG("Checking for any possible (non-fatal) issues"); qemuProcessStartWarnShmem(vm); -- 2.11.0

3 3

[libvirt] [PATCH] qemu: Check for maximum vcpus exceeding cpu topology
by Kothapally Madhu Pavan 20 Feb '17

20 Feb '17

This patch will prevent guest to start when the maximum vcpus are greater than cpu topology limit. Currently similar checks do exist only during setvcpus. The patch adds the missing check. The c9cb35c255222 reverted similar check to avoid older configs from vanishing. The current patch adds it in domain validation part to be consistent with the original intent. Signed-off-by: Kothapally Madhu Pavan <kmp(a)linux.vnet.ibm.com> --- src/qemu/qemu_process.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 184440d..f0d42b8 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3738,6 +3738,13 @@ qemuValidateCpuCount(virDomainDefPtr def, return -1; } + if (def->cpu->sockets && virDomainDefGetVcpusMax(def) > + def->cpu->sockets * def->cpu->cores * def->cpu->threads) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Maximum CPUs greater than topology limit")); + return -1; + } + if (maxCpus > 0 && virDomainDefGetVcpusMax(def) > maxCpus) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Maximum CPUs greater than specified machine type limit"));

4 4

[libvirt] [PATCH 0/2] QEMU caps data
by Pavel Hrdina 20 Feb '17

20 Feb '17

Pavel Hrdina (2): tests: update QEMU 2.8.0 caps data tests: add QEMU 2.9.0 caps data .../qemucapabilitiesdata/caps_2.8.0.x86_64.replies | 107 +- tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 7 +- .../qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 14671 +++++++++++++++++++ tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 302 + tests/qemucapabilitiestest.c | 1 + 5 files changed, 15049 insertions(+), 39 deletions(-) create mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies create mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml -- 2.11.1

2 4

[libvirt] [PATCH v2] qemu: Allow @rednernode for virgl domains
by Michal Privoznik 20 Feb '17

20 Feb '17

When enabling virgl, qemu opens /dev/dri/render*. So far, we are not allowing that in devices cgroup nor creating the file in domain's namespace and thus requiring users to set the paths in qemu.conf. This, however, is suboptimal as it allows access to ALL qemu processes even those which don't have virgl configured. Now that we have a way to specify render node that qemu will use we can be more cautious and enable just that. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Technically, this is v2 of: https://www.redhat.com/archives/libvir-list/2017-February/msg00497.html diff to v1: - now that we have @rendernode for <gl/> which selects just one path (and does it in predictable fashion) only that path is enabled in the CGgroups and created in the namespace. src/qemu/qemu_cgroup.c | 27 +++++++++++++++++++++++++++ src/qemu/qemu_domain.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index 209cbc275..f0729743a 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -335,6 +335,28 @@ qemuTeardownHostdevCgroup(virDomainObjPtr vm, return ret; } + +static int +qemuSetupGraphicsCgroup(virDomainObjPtr vm, + virDomainGraphicsDefPtr gfx) +{ + qemuDomainObjPrivatePtr priv = vm->privateData; + const char *rendernode = gfx->data.spice.rendernode; + int ret; + + if (gfx->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE || + gfx->data.spice.gl != VIR_TRISTATE_BOOL_YES || + !rendernode) + return 0; + + ret = virCgroupAllowDevicePath(priv->cgroup, rendernode, + VIR_CGROUP_DEVICE_RW, false); + virDomainAuditCgroupPath(vm, priv->cgroup, "allow", rendernode, + "rw", ret == 0); + return ret; +} + + static int qemuSetupBlkioCgroup(virDomainObjPtr vm) { @@ -604,6 +626,11 @@ qemuSetupDevicesCgroup(virQEMUDriverPtr driver, goto cleanup; } + for (i = 0; i < vm->def->ngraphics; i++) { + if (qemuSetupGraphicsCgroup(vm, vm->def->graphics[i]) < 0) + goto cleanup; + } + for (i = 0; i < vm->def->ninputs; i++) { if (qemuSetupInputCgroup(vm, vm->def->inputs[i]) < 0) goto cleanup; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 92a9a105c..ea4b28288 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -7526,6 +7526,42 @@ qemuDomainSetupTPM(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, } +static int +qemuDomainSetupGraphics(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, + virDomainGraphicsDefPtr gfx, + const char *devPath) +{ + const char *rendernode = gfx->data.spice.rendernode; + + if (gfx->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE || + gfx->data.spice.gl != VIR_TRISTATE_BOOL_YES || + !rendernode) + return 0; + + return qemuDomainCreateDevice(rendernode, devPath, false); +} + + +static int +qemuDomainSetupAllGraphics(virQEMUDriverPtr driver, + virDomainObjPtr vm, + const char *devPath) +{ + size_t i; + + VIR_DEBUG("Setting up graphics"); + for (i = 0; i < vm->def->ngraphics; i++) { + if (qemuDomainSetupGraphics(driver, + vm->def->graphics[i], + devPath) < 0) + return -1; + } + + VIR_DEBUG("Setup all graphics"); + return 0; +} + + static int qemuDomainSetupInput(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, virDomainInputDefPtr input, @@ -7679,6 +7715,9 @@ qemuDomainBuildNamespace(virQEMUDriverPtr driver, if (qemuDomainSetupTPM(driver, vm, devPath) < 0) goto cleanup; + if (qemuDomainSetupAllGraphics(driver, vm, devPath) < 0) + goto cleanup; + if (qemuDomainSetupAllInputs(driver, vm, devPath) < 0) goto cleanup; -- 2.11.0

2 2

[libvirt] [PATCH] news: add entries for recent nodedev driver improvements
by Michal Privoznik 20 Feb '17

20 Feb '17

Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- docs/news.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index 54337f782..8d53e0797 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -63,6 +63,23 @@ other than what's required for remote access of libvirtd. </description> </change> + <change> + <summary> + qemu: add rendernode argument + </summary> + <description> + Add a new attribute 'rendernode' to <gl> spice element. + </description> + </change> + <change> + <summary> + nodedev: add drm capability + </summary> + <description> + Add a new 'drm' capability for Direct Rendering Manager (DRM) + devices, providing device type information. + </description> + </change> </section> <section title="Improvements"> <change> -- 2.11.0

2 1

[libvirt] [PATCH] tests: Add couple of nodedev tests
by Michal Privoznik 20 Feb '17

20 Feb '17

With recent DRM device addition we report more devices. I happen to have some on my system therefore add the nodedev XMLs intou our test suite so that we make sure we won't break it. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tests/nodedevschemadata/drm_card0.xml | 9 +++++++++ tests/nodedevschemadata/drm_controlD64.xml | 9 +++++++++ tests/nodedevschemadata/drm_renderD128.xml | 9 +++++++++ tests/nodedevxml2xmltest.c | 3 +++ 4 files changed, 30 insertions(+) create mode 100644 tests/nodedevschemadata/drm_card0.xml create mode 100644 tests/nodedevschemadata/drm_controlD64.xml create mode 100644 tests/nodedevschemadata/drm_renderD128.xml diff --git a/tests/nodedevschemadata/drm_card0.xml b/tests/nodedevschemadata/drm_card0.xml new file mode 100644 index 000000000..307bada1a --- /dev/null +++ b/tests/nodedevschemadata/drm_card0.xml @@ -0,0 +1,9 @@ +<device> + <name>drm_card0</name> + <path>/sys/devices/pci0000:00/0000:00:02.0/drm/card0</path> + <devnode type='dev'>/dev/dri/card0</devnode> + <parent>pci_0000_00_02_0</parent> + <capability type='drm'> + <type>primary</type> + </capability> +</device> diff --git a/tests/nodedevschemadata/drm_controlD64.xml b/tests/nodedevschemadata/drm_controlD64.xml new file mode 100644 index 000000000..4f36a7068 --- /dev/null +++ b/tests/nodedevschemadata/drm_controlD64.xml @@ -0,0 +1,9 @@ +<device> + <name>drm_controlD64</name> + <path>/sys/devices/pci0000:00/0000:00:02.0/drm/controlD64</path> + <devnode type='dev'>/dev/dri/controlD64</devnode> + <parent>pci_0000_00_02_0</parent> + <capability type='drm'> + <type>control</type> + </capability> +</device> diff --git a/tests/nodedevschemadata/drm_renderD128.xml b/tests/nodedevschemadata/drm_renderD128.xml new file mode 100644 index 000000000..7ae5474b1 --- /dev/null +++ b/tests/nodedevschemadata/drm_renderD128.xml @@ -0,0 +1,9 @@ +<device> + <name>drm_renderD128</name> + <path>/sys/devices/pci0000:00/0000:00:02.0/drm/renderD128</path> + <devnode type='dev'>/dev/dri/renderD128</devnode> + <parent>pci_0000_00_02_0</parent> + <capability type='drm'> + <type>render</type> + </capability> +</device> diff --git a/tests/nodedevxml2xmltest.c b/tests/nodedevxml2xmltest.c index 5e1ae170c..5a8dd7dee 100644 --- a/tests/nodedevxml2xmltest.c +++ b/tests/nodedevxml2xmltest.c @@ -101,6 +101,9 @@ mymain(void) DO_TEST("pci_0000_02_10_7_sriov_pf_vfs_all"); DO_TEST("pci_0000_02_10_7_sriov_pf_vfs_all_header_type"); DO_TEST("drm_renderD129"); + DO_TEST("drm_card0"); + DO_TEST("drm_controlD64"); + DO_TEST("drm_renderD128"); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 2.11.0

2 2

[libvirt] [PATCH 0/7] qemu: Be more cautious about allowed devices
by Michal Privoznik 20 Feb '17

20 Feb '17

As discussed here [1], it's unsafe to allow /dev/vfio/vfio to all the domains (even those not doing PCI assignemnt). The same goes for /dev/dri/*. 1: https://www.redhat.com/archives/libvir-list/2017-February/msg00267.html Michal Privoznik (7): qemu_cgroup: Kill qemuSetupHostUSBDeviceCgroup qemu_cgroup: Kill qemuSetupHostSCSIDeviceCgroup qemu_cgroup: Kill qemuSetupHostSCSIVHostDeviceCgroup qemuSetupHostdevCgroup: Use qemuDomainGetHostdevPath qemuDomainGetHostdevPath: Create /dev/vfio/vfio iff needed qemuDomainGetHostdevPath: Report /dev/vfio/vfio less frequently qemu: Allow /dev/dri/render* for virgl domains src/qemu/qemu.conf | 2 +- src/qemu/qemu_cgroup.c | 311 +++++++++++-------------------------- src/qemu/qemu_domain.c | 207 ++++++++++++++++++++---- src/qemu/qemu_domain.h | 7 + src/qemu/test_libvirtd_qemu.aug.in | 1 - 5 files changed, 274 insertions(+), 254 deletions(-) -- 2.11.0

2 15

[libvirt] [PATCH] util: virvhba: fix typo that breaks build on non-linux systems
by Pavel Hrdina 19 Feb '17

19 Feb '17

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Pushed as build breaker, found by ci.centos.org. src/util/virvhba.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virvhba.c b/src/util/virvhba.c index 3a052f7b2e..203ba43a3d 100644 --- a/src/util/virvhba.c +++ b/src/util/virvhba.c @@ -476,7 +476,7 @@ virVHBAPathExists(const char *sysfs_prefix ATTRIBUTE_UNUSED, bool -virVHBAVportIsCapable(const char *sysfs_prefix ATTRIBUTE_UNUSED, +virVHBAIsVportCapable(const char *sysfs_prefix ATTRIBUTE_UNUSED, int host ATTRIBUTE_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Not supported on this platform")); -- 2.11.1

1 0

[libvirt] [PATCH 00/15] Add more vHBA related tests and module-arize the code
by John Ferlan 18 Feb '17

18 Feb '17

Don't be scared off by the quantity of patches... There's quite a bit of code motion and function renaming going on before being able to more easily add tests that will ensure that from a nodedev perspective creation and deletion of the vHBA will work properly and it's possible to test the various ways to create a vHBA (nothing provide, a parent by name provided, a parent by wwnn/wwpn provided, and a parent by fabric_wwn provided). I did run this through the coverity checking code with no errors... John Ferlan (15): tests: Alter test_driver HBA name/data to be closer to reality test: Add new NPIV capable HBA and a vHBA test: Add helper to create vHBA for testNodeDeviceCreateXML tests: Create a more realistic vHBA test: Fix fchosttest resource leak util: Create a new virvhba module and move/rename API's util: Move/rename virStoragePoolGetVhbaSCSIHostParent to virvhba util: Reduce complexity of virVHBAGetParent util: Move scsi_host specific functions from virutil tests: Add new fchosttest tests for management of a vHBA nodedev: Keep the node device lock longer in nodeDeviceDestroy nodedev: Rework virNodeDeviceGetParentHost tests: Add createVHBAByNodeDevice-no-parent to fchosttest tests: Add createVHBAByNodeDevice-parent-wwn to fchosttest tests: Add createVHBAByNodeDevice-parent-fabric-wwn to fchosttest po/POTFILES.in | 2 + src/Makefile.am | 2 + src/conf/node_device_conf.c | 76 +++- src/conf/node_device_conf.h | 19 +- src/conf/storage_conf.c | 100 ++--- src/conf/storage_conf.h | 5 - src/libvirt_private.syms | 32 +- src/node_device/node_device_driver.c | 92 ++-- src/node_device/node_device_linux_sysfs.c | 24 +- src/storage/storage_backend_scsi.c | 68 +-- src/test/test_driver.c | 178 ++++++-- src/util/virscsi.c | 4 + src/util/virscsihost.c | 297 ++++++++++++ src/util/virscsihost.h | 40 ++ src/util/virutil.c | 724 ------------------------------ src/util/virutil.h | 47 -- src/util/virvhba.c | 591 ++++++++++++++++++++++++ src/util/virvhba.h | 59 +++ tests/fchosttest.c | 183 ++++++-- tests/objecteventtest.c | 6 +- tests/scsihosttest.c | 16 +- tests/virrandommock.c | 9 + 22 files changed, 1463 insertions(+), 1111 deletions(-) create mode 100644 src/util/virscsihost.c create mode 100644 src/util/virscsihost.h create mode 100644 src/util/virvhba.c create mode 100644 src/util/virvhba.h -- 2.7.4

2 40

[libvirt] [PATCH] nodedev: fix build with clang
by Roman Bogorodskiy 18 Feb '17

18 Feb '17

Build fails with: conf/node_device_conf.c:825:62: error: comparison of unsigned enum expression < 0 is always false [-Werror,-Wtautological-compare] if ((data->drm.type = virNodeDevDRMTypeFromString(type)) < 0) { ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~ conf/node_device_conf.c:1801:59: error: comparison of unsigned enum expression < 0 is always false [-Werror,-Wtautological-compare] if ((type = virNodeDevDevnodeTypeFromString(tmp)) < 0) { ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~ 2 errors generated. Fix by using intermediate variable to store the result similarly to how it's done for other FromString* calls. --- Pushed under the build-breaker rule. src/conf/node_device_conf.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index b3063d9ec..c15c917a2 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -814,7 +814,7 @@ virNodeDevCapDRMParseXML(xmlXPathContextPtr ctxt, virNodeDevCapDataPtr data) { xmlNodePtr orignode; - int ret = -1; + int ret = -1, val; char *type = NULL; orignode = ctxt->node; @@ -822,11 +822,12 @@ virNodeDevCapDRMParseXML(xmlXPathContextPtr ctxt, type = virXPathString("string(./type[1])", ctxt); - if ((data->drm.type = virNodeDevDRMTypeFromString(type)) < 0) { + if ((val = virNodeDevDRMTypeFromString(type)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown drm type '%s' for '%s'"), type, def->name); goto out; } + data->drm.type = val; ret = 0; @@ -1791,6 +1792,7 @@ virNodeDeviceDefParseXML(xmlXPathContextPtr ctxt, xmlNodePtr node = nodes[i]; char *tmp = virXMLPropString(node, "type"); virNodeDevDevnodeType type; + int val; if (!tmp) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -1798,12 +1800,13 @@ virNodeDeviceDefParseXML(xmlXPathContextPtr ctxt, goto error; } - if ((type = virNodeDevDevnodeTypeFromString(tmp)) < 0) { + if ((val = virNodeDevDevnodeTypeFromString(tmp)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown devnode type '%s'"), tmp); VIR_FREE(tmp); goto error; } + type = val; switch (type) { case VIR_NODE_DEV_DEVNODE_DEV: -- 2.11.0

1 0

[libvirt] [PATCH v2 00/12] qemu: migration: show disks stats for nbd migration
by Nikolay Shirokovskiy 17 Feb '17

17 Feb '17

diff from v1: ============ 1. patch "qemu: clean out unused migrate to unix" is dropped as it is already pushed. 2. a lot of refactoring patches added, namely all except the last patch. 3. fetching mirroring stats is done separately from getting migration status. Generally speaking refactorings patches removes the function to fetch migrations status altogether. Current migration stats will show something like [1] when in the process of mirroring of non shared disks. This gives very little info on the migration progress. Likewise completed stats miss disks mirroring info. This patch provides disks stats in the said phase like in [2] so user can now understand what's going on. However data stats miss memory stats, so data total and remaining will change when memory migration starts. AFAIU disks stats were available before the nbd based migration becomes the default. So this patch returns disks stats back at some level. [1] Job type: Unbounded Time elapsed: 4964 ms [2] Job type: Unbounded Time elapsed: 4964 ms Data processed: 146.000 MiB Data remaining: 854.000 MiB Data total: 1000.000 MiB File processed: 146.000 MiB File remaining: 854.000 MiB File total: 1000.000 MiB Nikolay Shirokovskiy (12): qemu: qemuDomainJobInfoToParams drop unused code qemu: introduce qemu domain job status qemu: introduce QEMU_DOMAIN_JOB_STATUS_POSTCOPY qemu: drop QEMU_MIGRATION_COMPLETED_UPDATE_STATS qemu: drop excessive zero-out in qemuMigrationFetchJobStatus qemu: drop fetch and update status functions qemu: simplify getting completed job stats qemu: drop unused code in qemuDomainGetJobStatsInternal qemu: drop fetch flag in qemuDomainGetJobStatsInternal qemu: split getting stats for migration and others qemu: introduce QEMU_DOMAIN_JOB_STATUS_PREPARE qemu: show disks stats for nbd migration docs/news.html.in | 4 + src/qemu/qemu_domain.c | 32 ++++++-- src/qemu/qemu_domain.h | 13 +++- src/qemu/qemu_driver.c | 100 ++++++++++++++---------- src/qemu/qemu_migration.c | 195 ++++++++++++++++++++++++++-------------------- src/qemu/qemu_migration.h | 8 +- src/qemu/qemu_process.c | 6 +- 7 files changed, 214 insertions(+), 144 deletions(-) -- 1.8.3.1

2 35

[libvirt] [PATCH] libvirt-override: fix flags mutually exclusize
by Jie Wang 17 Feb '17

17 Feb '17

As virDomainGetBlkioParameters is called in libvirt_virDomainSetBlkioParameters, it will result in the two flags 'VIR_DOMAIN_AFFECT_LIVE' and 'VIR_DOMAIN_AFFECT_CONFIG' are mutually exclusive in libvirt_virDomainSetBlkioParameters, it's unreasonable, So ues this patch to fix it. Signed-off-by: Jie Wang <wangjie88(a)huawei.com> --- libvirt-override.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt-override.c b/libvirt-override.c index 9e40f00..7bdc09c 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -727,7 +727,7 @@ libvirt_virDomainSetBlkioParameters(PyObject *self ATTRIBUTE_UNUSED, } LIBVIRT_BEGIN_ALLOW_THREADS; - i_retval = virDomainGetBlkioParameters(domain, NULL, &nparams, flags); + i_retval = virDomainGetBlkioParameters(domain, NULL, &nparams, 0); LIBVIRT_END_ALLOW_THREADS; if (i_retval < 0) @@ -743,7 +743,7 @@ libvirt_virDomainSetBlkioParameters(PyObject *self ATTRIBUTE_UNUSED, return PyErr_NoMemory(); LIBVIRT_BEGIN_ALLOW_THREADS; - i_retval = virDomainGetBlkioParameters(domain, params, &nparams, flags); + i_retval = virDomainGetBlkioParameters(domain, params, &nparams, 0); LIBVIRT_END_ALLOW_THREADS; if (i_retval < 0) { -- 1.9.5.msysgit.1

4 5

[libvirt] [PATCH resend v2 0/2] Allow saving QEMU libvirt state to a pipe
by Chen Hanxiao 17 Feb '17

17 Feb '17

This series introduce flag VIR_DOMAIN_SAVE_DIRECT to enable command 'save' to write to PIPE. Base upon patches from Roy Keene <rkeene(a)knightpoint.com> with some fixes. Change from original patch: 1) Check whether the specified path is a PIPE. 2) Rebase on upstream. 3) Add doc for virsh command v2-resend: rebase on upstream v2: rename VIR_DOMAIN_SAVE_PIPE to VIR_DOMAIN_SAVE_DIRECT remove S_ISFIFO check Chen Hanxiao (2): qemu: Allow saving QEMU libvirt state to a pipe virsh: introduce flage --direct for save command include/libvirt/libvirt-domain.h | 1 + src/qemu/qemu_driver.c | 54 ++++++++++++++++++++++++++-------------- tools/virsh-domain.c | 6 +++++ tools/virsh.pod | 5 +++- 4 files changed, 47 insertions(+), 19 deletions(-) -- 2.7.4

1 3

[libvirt] [PATCH] qemu_capabilities: introduce QEMU_CAPS_SD_CARD to probe sd-card drivers
by Chen Hanxiao 17 Feb '17

17 Feb '17

From: Chen Hanxiao <chenhanxiao(a)gmail.com> This patch introduces QEMU_CAPS_SD_CARD for probing whether qemu support SD card by: {"execute": "device-list-properties", "arguments":{"typename":"sd-card"}} It will be helpful for apps which used cmd 'virsh domcaps` etc. Also helpful for: https://bugzilla.redhat.com/show_bug.cgi?id=1387218 Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- src/qemu/qemu_capabilities.c | 9 +++++++-- src/qemu/qemu_capabilities.h | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 3247d25..b200b37 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -357,6 +357,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "query-cpu-model-expansion", /* 245 */ "virtio-net.host_mtu", + "sd-card", ); @@ -1624,6 +1625,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = { { "ivshmem-plain", QEMU_CAPS_DEVICE_IVSHMEM_PLAIN }, { "ivshmem-doorbell", QEMU_CAPS_DEVICE_IVSHMEM_DOORBELL }, { "vhost-scsi", QEMU_CAPS_DEVICE_VHOST_SCSI }, + { "sd-card", QEMU_CAPS_SD_CARD }, }; static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioBalloon[] = { @@ -5193,8 +5195,7 @@ virQEMUCapsFillDomainDeviceDiskCaps(virQEMUCapsPtr qemuCaps, VIR_DOMAIN_CAPS_ENUM_SET(disk->bus, VIR_DOMAIN_DISK_BUS_IDE, VIR_DOMAIN_DISK_BUS_SCSI, - VIR_DOMAIN_DISK_BUS_VIRTIO, - /* VIR_DOMAIN_DISK_BUS_SD */); + VIR_DOMAIN_DISK_BUS_VIRTIO); /* PowerPC pseries based VMs do not support floppy device */ if (!ARCH_IS_PPC64(qemuCaps->arch) || @@ -5203,6 +5204,10 @@ virQEMUCapsFillDomainDeviceDiskCaps(virQEMUCapsPtr qemuCaps, if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_USB_STORAGE)) VIR_DOMAIN_CAPS_ENUM_SET(disk->bus, VIR_DOMAIN_DISK_BUS_USB); + + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SD_CARD)) + VIR_DOMAIN_CAPS_ENUM_SET(disk->bus, VIR_DOMAIN_DISK_BUS_SD); + return 0; } diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 95bb67d..85e7959 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -393,6 +393,7 @@ typedef enum { /* 245 */ QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION, /* qmp query-cpu-model-expansion */ QEMU_CAPS_VIRTIO_NET_HOST_MTU, /* virtio-net-*.host_mtu */ + QEMU_CAPS_SD_CARD, /* -sd abc.img */ QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; -- 2.7.4

1 2

[libvirt] [PATCH] nodedev: Introduce new drm cap
by Michal Privoznik 17 Feb '17

17 Feb '17

After 7f1bdec5fa0a0cd25 our nodedev driver is capable of determining DRM devices (DRM stands for Direct Render Manager not Digital rights management). There is still one bit missing though: virConnectListAllNodeDevices() is capable of listing either all devices or just those with specified capability. Well, DRM capability is missing there. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- include/libvirt/libvirt-nodedev.h | 1 + src/conf/node_device_conf.c | 3 ++- src/conf/node_device_conf.h | 3 ++- src/libvirt-nodedev.c | 1 + tools/virsh-nodedev.c | 7 +++++-- tools/virsh.pod | 6 +++--- 6 files changed, 14 insertions(+), 7 deletions(-) diff --git a/include/libvirt/libvirt-nodedev.h b/include/libvirt/libvirt-nodedev.h index 4ff8b416a..85003903d 100644 --- a/include/libvirt/libvirt-nodedev.h +++ b/include/libvirt/libvirt-nodedev.h @@ -78,6 +78,7 @@ typedef enum { VIR_CONNECT_LIST_NODE_DEVICES_CAP_FC_HOST = 1 << 9, /* FC Host Bus Adapter */ VIR_CONNECT_LIST_NODE_DEVICES_CAP_VPORTS = 1 << 10, /* Capable of vport */ VIR_CONNECT_LIST_NODE_DEVICES_CAP_SCSI_GENERIC = 1 << 11, /* Capable of scsi_generic */ + VIR_CONNECT_LIST_NODE_DEVICES_CAP_DRM = 1 << 12, /* DRM device */ } virConnectListAllNodeDeviceFlags; int virConnectListAllNodeDevices (virConnectPtr conn, diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index f996db115..b3063d9ec 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -2224,7 +2224,8 @@ virNodeDeviceMatch(virNodeDeviceObjPtr devobj, MATCH(STORAGE) || MATCH(FC_HOST) || MATCH(VPORTS) || - MATCH(SCSI_GENERIC))) + MATCH(SCSI_GENERIC) || + MATCH(DRM))) return false; } diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h index be7e0e003..40e930a28 100644 --- a/src/conf/node_device_conf.h +++ b/src/conf/node_device_conf.h @@ -340,7 +340,8 @@ void virNodeDeviceObjUnlock(virNodeDeviceObjPtr obj); VIR_CONNECT_LIST_NODE_DEVICES_CAP_STORAGE | \ VIR_CONNECT_LIST_NODE_DEVICES_CAP_FC_HOST | \ VIR_CONNECT_LIST_NODE_DEVICES_CAP_VPORTS | \ - VIR_CONNECT_LIST_NODE_DEVICES_CAP_SCSI_GENERIC) + VIR_CONNECT_LIST_NODE_DEVICES_CAP_SCSI_GENERIC | \ + VIR_CONNECT_LIST_NODE_DEVICES_CAP_DRM) typedef bool (*virNodeDeviceObjListFilter)(virConnectPtr conn, virNodeDeviceDefPtr def); diff --git a/src/libvirt-nodedev.c b/src/libvirt-nodedev.c index 6ea14b3e3..83376b0d9 100644 --- a/src/libvirt-nodedev.c +++ b/src/libvirt-nodedev.c @@ -97,6 +97,7 @@ virNodeNumOfDevices(virConnectPtr conn, const char *cap, unsigned int flags) * VIR_CONNECT_LIST_NODE_DEVICES_CAP_FC_HOST * VIR_CONNECT_LIST_NODE_DEVICES_CAP_VPORTS * VIR_CONNECT_LIST_NODE_DEVICES_CAP_SCSI_GENERIC + * VIR_CONNECT_LIST_NODE_DEVICES_CAP_DRM * * Returns the number of node devices found or -1 and sets @devices to NULL in * case of error. On success, the array stored into @devices is guaranteed to diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c index 9ede96886..c69144021 100644 --- a/tools/virsh-nodedev.c +++ b/tools/virsh-nodedev.c @@ -414,7 +414,7 @@ cmdNodeListDevices(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) goto cleanup; } - switch (cap_type) { + switch ((virNodeDevCapType) cap_type) { case VIR_NODE_DEV_CAP_SYSTEM: flags |= VIR_CONNECT_LIST_NODE_DEVICES_CAP_SYSTEM; break; @@ -451,7 +451,10 @@ cmdNodeListDevices(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) case VIR_NODE_DEV_CAP_SCSI_GENERIC: flags |= VIR_CONNECT_LIST_NODE_DEVICES_CAP_SCSI_GENERIC; break; - default: + case VIR_NODE_DEV_CAP_DRM: + flags |= VIR_CONNECT_LIST_NODE_DEVICES_CAP_DRM; + break; + case VIR_NODE_DEV_CAP_LAST: break; } } diff --git a/tools/virsh.pod b/tools/virsh.pod index a47040984..90f4b5a1f 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -3072,9 +3072,9 @@ List all of the devices available on the node that are known by libvirt. I<cap> is used to filter the list by capability types, the types must be separated by comma, e.g. --cap pci,scsi, valid capability types include 'system', 'pci', 'usb_device', 'usb', 'net', 'scsi_host', 'scsi_target', -'scsi', 'storage', 'fc_host', 'vports', 'scsi_generic'. If I<--tree> is -used, the output is formatted in a tree representing parents of each node. -I<cap> and I<--tree> are mutually exclusive. +'scsi', 'storage', 'fc_host', 'vports', 'scsi_generic', 'drm'.If I<--tree> +is used, the output is formatted in a tree representing parents of each +node. I<cap> and I<--tree> are mutually exclusive. =item B<nodedev-reattach> I<nodedev> -- 2.11.0

3 2

[libvirt] [PATCH 0/5] Add rendernode selection support
by marcandre.lureau＠redhat.com 17 Feb '17

17 Feb '17

From: Marc-André Lureau <marcandre.lureau(a)redhat.com> Hi, The following series implements DRM nodedev, exposes the devices /dev path and symlinks, and allows to configure qemu to use a specific DRM rendernode. (also included a small unrelated cosmetic change) thanks! Marc-André Lureau (5): nodedev: fix extra space in dump nodedev: add <devnode> paths nodedev: parse <path> nodedev: add drm capability qemu: add rendernode argument docs/formatdomain.html.in | 7 +- docs/formatnode.html.in | 16 ++++ docs/schemas/domaincommon.rng | 5 + docs/schemas/nodedev.rng | 30 ++++++ src/conf/domain_conf.c | 28 +++++- src/conf/domain_conf.h | 1 + src/conf/node_device_conf.c | 102 ++++++++++++++++++++- src/conf/node_device_conf.h | 27 ++++++ src/node_device/node_device_driver.c | 1 + src/node_device/node_device_udev.c | 72 +++++++++++++++ src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 10 ++ tests/nodedevschemadata/drm_renderD129.xml | 10 ++ ...ge_serial_3600c0ff000d7a2a5d463ff4902000000.xml | 4 + tests/nodedevxml2xmltest.c | 2 + .../qemuxml2argv-video-virtio-gpu-spice-gl.args | 2 +- .../qemuxml2argv-video-virtio-gpu-spice-gl.xml | 2 +- tests/qemuxml2argvtest.c | 1 + .../qemuxml2xmlout-video-virtio-gpu-spice-gl.xml | 2 +- 20 files changed, 315 insertions(+), 10 deletions(-) create mode 100644 tests/nodedevschemadata/drm_renderD129.xml -- 2.11.0.295.gd7dffce1c.dirty

3 11

[libvirt] [RFC PATCH 00/10] introduce push backups
by Nikolay Shirokovskiy 17 Feb '17

17 Feb '17

Push backup is a backup when hypervisor itself copy backup data to destination in contrast to pull backup when hypervisor exports backup data thru some interface and mgmt itself make a copy. This patch series basically adds API and remote/qemu implementation of backup creation and correspondent backup xml description definition. Just like other blockjobs backup creation is asynchronous. That is creation is merely a backup start and client should track backup error/completion thru blockjob events. Another option is to make backup synchronus operation. AFAIU on this way we have to make backup asynchronus job and thus make all modifying commands unavailable during backup. This makes backup rather obtrusive operation which is not convinient. Backup xml desription follows closely snapshot one and is described in more details in definition patch [1]. Nikolay Shirokovskiy (10): api: add API to create backup add driver based implementation of backup API remote: add backup API qemu: monitor: add backup command misc: add backup block job type conf: add backup definition [1] qemu: add qemuDomainBackupCreateXML implementation qemu: check backup destination before start qemu: prepare backup destination virsh: add create backup command daemon/remote.c | 8 + examples/object-events/event-test.c | 3 + include/libvirt/libvirt-domain-backup.h | 59 +++++++ include/libvirt/libvirt-domain.h | 3 + include/libvirt/libvirt.h | 1 + include/libvirt/virterror.h | 2 + po/POTFILES.in | 2 + src/Makefile.am | 3 + src/access/viraccessperm.c | 3 +- src/access/viraccessperm.h | 6 + src/conf/backup_conf.c | 294 ++++++++++++++++++++++++++++++++ src/conf/backup_conf.h | 69 ++++++++ src/conf/domain_conf.c | 2 +- src/datatypes.c | 60 +++++++ src/datatypes.h | 29 ++++ src/driver-hypervisor.h | 6 + src/libvirt-domain-backup.c | 203 ++++++++++++++++++++++ src/libvirt_private.syms | 9 + src/libvirt_public.syms | 10 ++ src/qemu/qemu_conf.h | 1 + src/qemu/qemu_domain.c | 14 ++ src/qemu/qemu_domain.h | 2 + src/qemu/qemu_driver.c | 249 +++++++++++++++++++++++++++ src/qemu/qemu_monitor.c | 13 ++ src/qemu/qemu_monitor.h | 5 + src/qemu/qemu_monitor_json.c | 36 ++++ src/qemu/qemu_monitor_json.h | 6 + src/remote/remote_driver.c | 7 + src/remote/remote_protocol.x | 24 ++- src/rpc/gendispatch.pl | 29 +++- src/util/virerror.c | 6 + tools/Makefile.am | 1 + tools/virsh-backup.c | 101 +++++++++++ tools/virsh-backup.h | 29 ++++ tools/virsh-domain.c | 3 +- tools/virsh.c | 2 + tools/virsh.h | 1 + 37 files changed, 1290 insertions(+), 11 deletions(-) create mode 100644 include/libvirt/libvirt-domain-backup.h create mode 100644 src/conf/backup_conf.c create mode 100644 src/conf/backup_conf.h create mode 100644 src/libvirt-domain-backup.c create mode 100644 tools/virsh-backup.c create mode 100644 tools/virsh-backup.h -- 1.8.3.1

3 17

[libvirt] [PATCH] cputest: Fix name of the file removed by cpu-parse.sh
by Jiri Denemark 17 Feb '17

17 Feb '17

We want to remove the file created by json <<<"$data" >$fname.json in case it was empty. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- tests/cputestdata/cpu-parse.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/cputestdata/cpu-parse.sh b/tests/cputestdata/cpu-parse.sh index 1b5ab4a5a..c3b5ef106 100755 --- a/tests/cputestdata/cpu-parse.sh +++ b/tests/cputestdata/cpu-parse.sh @@ -53,5 +53,5 @@ json <<<"$data" >$fname.json if [[ -s $fname.json ]]; then echo $fname.json else - rm $fname.new.json + rm $fname.json fi -- 2.11.1

2 2

[libvirt] [RFC PATCH v2 00/18] Introduce vGPU mdev framework to libvirt
by Erik Skultety 17 Feb '17

17 Feb '17

since v1: - new <hostdev> attribute model introduced which tells libvirt which device API should be considered when auto-assigning guest address - device_api is properly checked, thus taking the 'model' attribute only as a hint to assign "some" address - new address type 'mdev' is introduced rather than using plain <uuid> element, since the address element is more conveniently extendable. - the emulated mtty driver now works as well out of the box, so no HW needed to review this series --> let's try it :) - fixed all the nits from v1 Erik Skultety (18): util: Introduce new module virmdev conf: Introduce new hostdev device type mdev conf: Introduce new address type mdev conf: Update XML parser, formatter, and RNG schema to support mdev conf: Introduce virDomainHostdevDefPostParse conf: Add post parse code for mdevs to virDomainHostdevDefPostParse security: dac: Enable labeling of vfio mediated devices security: selinux: Enable labeling of vfio mediated devices conf: Enable cold-plug of a mediated device qemu: Assign PCI addresses for mediated devices as well hostdev: Maintain a driver list of active mediated devices hostdev: Introduce a reattach method for mediated devices qemu: cgroup: Adjust cgroups' logic to allow mediated devices qemu: namespace: Hook up the discovery of mdevs into the namespace code qemu: Format mdevs on the qemu command line test: Add some test cases for our test suite regarding the mdevs docs: Document the new hostdev and address type 'mdev' news: Update the NEWS.xml about the new mdev feature docs/formatdomain.html.in | 48 ++- docs/news.xml | 11 + docs/schemas/domaincommon.rng | 26 ++ po/POTFILES.in | 1 + src/Makefile.am | 1 + src/conf/device_conf.h | 1 + src/conf/domain_conf.c | 203 ++++++++++-- src/conf/domain_conf.h | 9 + src/libvirt_private.syms | 20 ++ src/qemu/qemu_cgroup.c | 34 ++ src/qemu/qemu_command.c | 49 +++ src/qemu/qemu_command.h | 5 + src/qemu/qemu_domain.c | 12 + src/qemu/qemu_domain.h | 1 + src/qemu/qemu_domain_address.c | 16 +- src/qemu/qemu_hostdev.c | 37 +++ src/qemu/qemu_hostdev.h | 8 + src/qemu/qemu_hotplug.c | 2 + src/security/security_apparmor.c | 3 + src/security/security_dac.c | 55 ++++ src/security/security_selinux.c | 54 ++++ src/util/virhostdev.c | 229 ++++++++++++- src/util/virhostdev.h | 16 + src/util/virmdev.c | 358 +++++++++++++++++++++ src/util/virmdev.h | 93 ++++++ tests/domaincapsschemadata/full.xml | 1 + .../qemuxml2argv-hostdev-mdev-unmanaged.args | 25 ++ .../qemuxml2argv-hostdev-mdev-unmanaged.xml | 37 +++ tests/qemuxml2argvtest.c | 6 + .../qemuxml2xmlout-hostdev-mdev-unmanaged.xml | 40 +++ tests/qemuxml2xmltest.c | 1 + 31 files changed, 1362 insertions(+), 40 deletions(-) create mode 100644 src/util/virmdev.c create mode 100644 src/util/virmdev.h create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-mdev-unmanaged.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-mdev-unmanaged.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-mdev-unmanaged.xml -- 2.10.2

2 23

[libvirt] [PATCH] libxl: fix coverity issues introduced by 6a95edf
by Joao Martins 16 Feb '17

16 Feb '17

As discussed here [0][1] Coverity reported two issues: - On libxlDomainMigrationPrepareTunnel3 @@mig will be leaked on failures after sucessfull call libxlDomainMigrationPrepareAny hence we free it. Setting mig = NULL after @mig is assigned plus adding libxlMigrationCookieFree on error paths addresses the issue. In case virThreadCreate fails, unref of args frees the cookie on dispose function (libxlMigrationDstArgsDispose) - On libxlMigrationStartTunnel @tc would be leaked. Fixed by correctly saving the newly allocated @tc onto @tnl such that libxlMigrationStopTunnel would free it up. [0] https://www.redhat.com/archives/libvir-list/2017-February/msg00791.html [1] https://www.redhat.com/archives/libvir-list/2017-February/msg00833.html Signed-off-by: Joao Martins <joao.m.martins(a)oracle.com> --- Cc: John Ferlan <jferlan(a)redhat.com> Cc: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_migration.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index ba1ca5c..fb833d1 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -617,6 +617,8 @@ libxlDomainMigrationPrepareTunnel3(virConnectPtr dconn, /* Receive from pipeOut */ args->recvfd = dataFD[0]; args->nsocks = 0; + mig = NULL; + if (virThreadCreate(&thread, false, libxlDoMigrateReceive, args) < 0) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Failed to create thread for receiving migration data")); @@ -627,6 +629,7 @@ libxlDomainMigrationPrepareTunnel3(virConnectPtr dconn, goto done; error: + libxlMigrationCookieFree(mig); VIR_FORCE_CLOSE(dataFD[1]); VIR_FORCE_CLOSE(dataFD[0]); virObjectUnref(args); @@ -907,13 +910,15 @@ libxlMigrationStartTunnel(libxlDriverPrivatePtr driver, virDomainObjPtr vm, unsigned long flags, virStreamPtr st, - struct libxlTunnelControl *tc) + struct libxlTunnelControl **tnl) { + struct libxlTunnelControl *tc = NULL; libxlTunnelMigrationThread *arg = NULL; int ret = -1; if (VIR_ALLOC(tc) < 0) goto out; + *tnl = tc; tc->dataFD[0] = -1; tc->dataFD[1] = -1; @@ -1045,7 +1050,7 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr driver, VIR_DEBUG("Perform3 uri=%s", NULLSTR(uri_out)); if (flags & VIR_MIGRATE_TUNNELLED) - ret = libxlMigrationStartTunnel(driver, vm, flags, st, tc); + ret = libxlMigrationStartTunnel(driver, vm, flags, st, &tc); else ret = libxlDomainMigrationPerform(driver, vm, NULL, NULL, uri_out, NULL, flags); -- 2.1.4

2 1

[libvirt] [PATCH] nodedev: Return the parent for a virNodeDevicePtr struct
by John Ferlan 16 Feb '17

16 Feb '17

When the 'parent' was added to the virNodeDevicePtr structure by commit id 'e8a4ea75a' the 'parent' field was not properly filled in when a virGetNodeDevice call was made within driver/config code. Only the device name was ever filled in. Fetching the parent required a second trip via virNodeDeviceGetParent into the node device lookup code was required in order to retrieve the specific parent field (and still the parent field was never filled in although it was free'd). Since we have the data when we initially call virGetNodeDevice from within driver/node_config code - let's just fill in the parent field as well for anyone that wants it without requiring another trip into the node_device lookup just to get the parent. This will allow API's such as virConnectListAllNodeDevices, virNodeDeviceLookupByName, and virNodeDeviceLookupSCSIHostByWWN to retrieve both name and parent in the returned virNodeDevicePtr. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Found this while working on some vHBA in the domain code when I was thinking about using a virConnectListAllNodeDevices... The returned structures didn't have the ->parent filled in... src/conf/node_device_conf.c | 4 ++-- src/node_device/node_device_driver.c | 10 ++++++++-- src/test/test_driver.c | 6 +++++- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 4d3268f..f6d7692 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -2158,8 +2158,8 @@ virNodeDeviceObjListExport(virConnectPtr conn, if ((!filter || filter(conn, devobj->def)) && virNodeDeviceMatch(devobj, flags)) { if (devices) { - if (!(device = virGetNodeDevice(conn, - devobj->def->name))) { + if (!(device = virGetNodeDevice(conn, devobj->def->name)) || + VIR_STRDUP(device->parent, devobj->def->parent) < 0) { virNodeDeviceObjUnlock(devobj); goto cleanup; } diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index 5238e23..4900e32 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -261,7 +261,10 @@ nodeDeviceLookupByName(virConnectPtr conn, const char *name) if (virNodeDeviceLookupByNameEnsureACL(conn, obj->def) < 0) goto cleanup; - ret = virGetNodeDevice(conn, name); + if ((ret = virGetNodeDevice(conn, name))) { + if (VIR_STRDUP(ret->parent, obj->def->parent) < 0) + virObjectUnref(ret); + } cleanup: if (obj) @@ -302,7 +305,10 @@ nodeDeviceLookupSCSIHostByWWN(virConnectPtr conn, if (virNodeDeviceLookupSCSIHostByWWNEnsureACL(conn, obj->def) < 0) goto out; - dev = virGetNodeDevice(conn, obj->def->name); + if ((dev = virGetNodeDevice(conn, obj->def->name))) { + if (VIR_STRDUP(dev->parent, obj->def->parent) < 0) + virObjectUnref(dev); + } virNodeDeviceObjUnlock(obj); goto out; } diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 6820298..8dd738b 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -5450,7 +5450,10 @@ testNodeDeviceLookupByName(virConnectPtr conn, const char *name) goto cleanup; } - ret = virGetNodeDevice(conn, name); + if ((ret = virGetNodeDevice(conn, name))) { + if (VIR_STRDUP(ret->parent, obj->def->parent) < 0) + virObjectUnref(ret); + } cleanup: if (obj) @@ -5648,6 +5651,7 @@ testNodeDeviceCreateXML(virConnectPtr conn, 0); dev = virGetNodeDevice(conn, def->name); + ignore_value(VIR_STRDUP(def->parent, def->parent)); def = NULL; cleanup: testDriverUnlock(driver); -- 2.7.4

3 4

[libvirt] [PATCH v3 0/2] libxl: tunnelled migration support
by Joao Martins 16 Feb '17

16 Feb '17

Hey! Presented herewith is take 4 from tunnelled migration addressing all previous comments. No functional changes from v2, only revert to v1 on the top level migration functions and removing unnecessary usage of virReportError. Thanks, Joao Bob Liu (1): libxl: add tunnelled migration support Joao Martins (1): libxl: refactor libxlDomainMigrationPrepare src/libxl/libxl_driver.c | 58 ++++++- src/libxl/libxl_migration.c | 367 +++++++++++++++++++++++++++++++++++++------- src/libxl/libxl_migration.h | 9 ++ 3 files changed, 381 insertions(+), 53 deletions(-) -- 2.1.4

3 11

[libvirt] [PATCH] Revert "news: fix spelling of tunneled"
by Jim Fehlig 16 Feb '17

16 Feb '17

Use of 'tunnelled' is over 100x that of 'tunneled' throughout the code. Also, the commit providing this news item used 'tunnelled'. This reverts commit b5ac475f506cd13adab773cebd125a45d3f2ba8d. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- Heh, so much for the trivial rule. I'll wait for an ACK on this one. Sorry for the chatter... docs/news.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/news.xml b/docs/news.xml index 5bca75ea1..b0629b523 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -55,10 +55,10 @@ </change> <change> <summary> - libxl: add tunneled migration support + libxl: add tunnelled migration support </summary> <description> - Add tunneled migration to libxl driver, which is always capable of + Add tunnelled migration to libxl driver, which is always capable of strong encryption and doesn't require any extra network connection other than what's required for remote access of libvirtd. </description> -- 2.11.0

2 2

[libvirt] [PATCH] libvirt-override: fix flags mutually exclusize
by Jie Wang 16 Feb '17

16 Feb '17

Because of virDomainGetBlkioParameters is called in libvirt_virDomainSetBlkioParameters, it will result in the two flags 'VIR_DOMAIN_AFFECT_LIVE' and 'VIR_DOMAIN_AFFECT_CONFIG' are mutually exclusive in libvirt_virDomainSetBlkioParameters, it's unreasonable, So ues this patch to fix it. Signed-off-by: Jie Wang <wangjie88(a)huawei.com> --- libvirt-override.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt-override.c b/libvirt-override.c index 9e40f00..7bdc09c 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -727,7 +727,7 @@ libvirt_virDomainSetBlkioParameters(PyObject *self ATTRIBUTE_UNUSED, } LIBVIRT_BEGIN_ALLOW_THREADS; - i_retval = virDomainGetBlkioParameters(domain, NULL, &nparams, flags); + i_retval = virDomainGetBlkioParameters(domain, NULL, &nparams, 0); LIBVIRT_END_ALLOW_THREADS; if (i_retval < 0) @@ -743,7 +743,7 @@ libvirt_virDomainSetBlkioParameters(PyObject *self ATTRIBUTE_UNUSED, return PyErr_NoMemory(); LIBVIRT_BEGIN_ALLOW_THREADS; - i_retval = virDomainGetBlkioParameters(domain, params, &nparams, flags); + i_retval = virDomainGetBlkioParameters(domain, params, &nparams, 0); LIBVIRT_END_ALLOW_THREADS; if (i_retval < 0) { -- 1.9.5.msysgit.1

1 0

[libvirt] [PATCH] news: document libxl tunnelled migration support
by Joao Martins 16 Feb '17

16 Feb '17

Signed-off-by: Joao Martins <joao.m.martins(a)oracle.com> --- docs/news.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index b756a97..b0629b5 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -53,6 +53,16 @@ was <code>virtio-net</code>. </description> </change> + <change> + <summary> + libxl: add tunnelled migration support + </summary> + <description> + Add tunnelled migration to libxl driver, which is always capable of + strong encryption and doesn't require any extra network connection + other than what's required for remote access of libvirtd. + </description> + </change> </section> <section title="Improvements"> <change> -- 2.1.4

3 6

[libvirt] [PATCH 0/9] perf: Add software perf events
by Nitesh Konkar 16 Feb '17

16 Feb '17

This patch series adds software perf events. Nitesh Konkar (9): perf: add cpu_clock software perf event support perf: add task_clock software perf event support perf: add page_faults software perf event support perf: add context_switches software perf event support perf: add cpu_migrations software perf event support perf: add page_faults_min software perf event support perf: add page_faults_maj software perf event support perf: add alignment_faults software perf event support perf: add emulation_faults software perf event support docs/formatdomain.html.in | 58 +++++++++++++++++++ docs/news.xml | 7 ++- docs/schemas/domaincommon.rng | 9 +++ include/libvirt/libvirt-domain.h | 90 +++++++++++++++++++++++++++++ src/libvirt-domain.c | 24 ++++++++ src/qemu/qemu_driver.c | 9 +++ src/util/virperf.c | 33 ++++++++++- src/util/virperf.h | 9 +++ tests/genericxml2xmlindata/generic-perf.xml | 9 +++ tools/virsh.pod | 35 +++++++++++ 10 files changed, 280 insertions(+), 3 deletions(-) -- 1.9.3

2 23

[libvirt] [PATCH v2] Ensure disk names follow the disk name regex
by Nitesh Konkar 16 Feb '17

16 Feb '17

Currently disk names do not follow the (regex) /^[fhv]d[a-z]+[0-9]*$/ completely and hence one can assign disk names like vd2 etc. This patch ensures that the disk names follow the regex mentioned. This patch also adds a testcase. Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- src/util/virutil.c | 2 +- tests/utiltest.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/util/virutil.c b/src/util/virutil.c index 91178d1..2796671 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -563,7 +563,7 @@ int virDiskNameParse(const char *name, int *disk, int *partition) } } - if (!ptr) + if (!ptr || !c_islower(*ptr)) return -1; for (i = 0; *ptr; i++) { diff --git a/tests/utiltest.c b/tests/utiltest.c index 9b7a4a3..bd55d44 100644 --- a/tests/utiltest.c +++ b/tests/utiltest.c @@ -37,7 +37,8 @@ static struct testDiskName diskNamesPart[] = { }; static const char* diskNamesInvalid[] = { - "sda00", "sda01", "sdb-1" + "sda00", "sda01", "sdb-1", + "vd2" }; static int -- 1.9.3

2 2

[libvirt] [PATCH] Validate required CPU features even for host-passthrough
by Ján Tomko 16 Feb '17

16 Feb '17

Commit adff345 allowed enabling features with -cpu host without ajdusting the validity checks on domain startup and migration. --- src/qemu/qemu_migration.c | 2 +- src/qemu/qemu_process.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 0f4a6cf..0db1616 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2322,7 +2322,7 @@ qemuMigrationIsAllowed(virQEMUDriverPtr driver, if (!qemuMigrationIsAllowedHostdev(vm->def)) return false; - if (vm->def->cpu && vm->def->cpu->mode != VIR_CPU_MODE_HOST_PASSTHROUGH) { + if (vm->def->cpu) { for (i = 0; i < vm->def->cpu->nfeatures; i++) { virCPUFeatureDefPtr feature = &vm->def->cpu->features[i]; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 184440d..2ad6451 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3819,7 +3819,7 @@ qemuProcessVerifyGuestCPU(virQEMUDriverPtr driver, } } - if (def->cpu && def->cpu->mode != VIR_CPU_MODE_HOST_PASSTHROUGH) { + if (def->cpu) { for (i = 0; i < def->cpu->nfeatures; i++) { virCPUFeatureDefPtr feature = &def->cpu->features[i]; -- 2.10.2

3 2

[libvirt] libvirt-php --with-php-config=/path/to/php is broken.
by Shaun Reitan 16 Feb '17

16 Feb '17

When running the following command I ended up getting errors that phpize was missing. Trying to dig into this further i found that configure.ac was just trying to run php-config without providing a path. The following patch corrects the issue by using the $PHPCONFIG variable instead. ./configure --prefix=/opt/libvirt-php --with-php-config=/path/to/php-config` diff --git a/configure.ac b/configure.ac index f232756..d93e946 100644 --- a/configure.ac +++ b/configure.ac @@ -159,7 +159,7 @@ if test "x$PHPCONFIG" = "xno"; then AC_MSG_ERROR([php-config not found; please install the PHP SDK]) fi -AC_PATH_PROG([PHPIZE], [phpize], [no], [`php-config --prefix`/bin$PATH_SEPARATOR$PATH]) +AC_PATH_PROG([PHPIZE], [phpize], [no], [`$PHPCONFIG --prefix`/bin$PATH_SEPARATOR$PATH]) if test "x$PHPIZE" = "xno"; then AC_MSG_ERROR([phpize not found; please install the PHP SDK]) fi -- Shaun Reitan Network Data Center Host, Inc.

2 1

[libvirt] [PATCH] qemu: Allow empty script path to <interface/>
by Michal Privoznik 16 Feb '17

16 Feb '17

Before 9c17d665fdc5f (v1.3.2 - I know, right?) it was possible to have the following interface configuration: <interface type='ethernet'/> <script path=''/> </interface> This resulted in -netdev tap,script=,.. Fortunately, qemu helped us to get away with this as it just ignored the empty script path. However, after the commit mentioned above it's libvirtd who is executing the script. Unfortunately without special case-ing empty script path. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- docs/news.xml | 10 ++++++++++ src/util/virnetdev.c | 4 ++++ 2 files changed, 14 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index f408293a1..e7388a8f6 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -56,6 +56,16 @@ a fabric name has been removed by making it optional. </description> </change> + <change> + <summary> + qemu: Allow empty script path to <interface/> + </summary> + <description> + Historically, this was always allowed. Unfortunately, due to some + rework done for 1.3.2 release a bug was dragged in which suddenly + stop allowing domain with such configuration to start. + </description> + </change> </section> </release> <release version="v3.0.0" date="2017-01-17"> diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index fa695d4a6..d12324878 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -2615,6 +2615,10 @@ virNetDevRunEthernetScript(const char *ifname, const char *script) virCommandPtr cmd; int ret; + /* Not a bug! Previously we did accept script="" as a NO-OP. */ + if (STREQ(script, "")) + return 0; + cmd = virCommandNew(script); virCommandAddArgFormat(cmd, "%s", ifname); virCommandClearCaps(cmd); -- 2.11.0

3 8

[libvirt] [PATCH] news: add entries for libxl driver improvements and bug fixes
by Jim Fehlig 16 Feb '17

16 Feb '17

Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- Since news changes are not candidates for backport I assume it is fine to include recent libxl improvements and bug fixes in a single commit. I can break this up if that assumption is wrong. docs/news.xml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index 5bca75ea1..22f00cc55 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -83,6 +83,16 @@ and network. </description> </change> + <change> + <summary> + libxl: improve support for <timer> configurations + </summary> + <description> + Add support for multiple timers. Extend the tsc timer to + support the emulate mode. Improve conversion of timer XML + to/from xl.cfg. + </description> + </change> </section> <section title="Bug fixes"> <change> @@ -116,6 +126,25 @@ regenerate it properly. </description> </change> + <change> + <summary> + libxl: maximum memory fixes + </summary> + <description> + Fix reporting of domain maximum memory. Fix setting dom0 + maximum memory. + </description> + </change> + <change> + <summary> + libxl: fix disk detach when <driver> not specified + </summary> + </change> + <change> + <summary> + libxl: fix dom0 autoballooning with Xen 4.8 + </summary> + </change> </section> </release> <release version="v3.0.0" date="2017-01-17"> -- 2.11.0

2 1

[libvirt] [PATCH] libxl: fix potential double free in libxlDriverGetDom0MaxmemConf
by Jim Fehlig 16 Feb '17

16 Feb '17

Commit 4ab0c959 fixed a memory leak in libxlDriverGetDom0MaxmemConf but introduced a potential double free of mem_tokens *** Error in `/usr/sbin/libvirtd': double free or corruption (out): 0x00007fffc808cfd0 *** Avoid double free by setting mem_tokens to NULL after calling virStringListFree. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_conf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index f5b788b50..4bab651b3 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1623,6 +1623,7 @@ libxlDriverGetDom0MaxmemConf(libxlDriverConfigPtr cfg, } } virStringListFree(mem_tokens); + mem_tokens = NULL; } physmem: -- 2.11.0

2 1

[libvirt] [PATCH] news: fix spelling of tunneled
by Jim Fehlig 16 Feb '17

16 Feb '17

s/tunnelled/tunneled/ in news for the libxl tunneled migration feature. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- Pushed under trivial rule. docs/news.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/news.xml b/docs/news.xml index b0629b523..5bca75ea1 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -55,10 +55,10 @@ </change> <change> <summary> - libxl: add tunnelled migration support + libxl: add tunneled migration support </summary> <description> - Add tunnelled migration to libxl driver, which is always capable of + Add tunneled migration to libxl driver, which is always capable of strong encryption and doesn't require any extra network connection other than what's required for remote access of libvirtd. </description> -- 2.11.0

1 0

[libvirt] [v6 00/10] Support cache tune in libvirt
by Eli Qiao 15 Feb '17

15 Feb '17

Addressed comment from v6 -> v5 Marcelo: * Support other APPs to operate /sys/fs/resctrl at same time Libvirt will scan /sys/fs/resctrl again before doing cache allocation. patch 10 will address this. Addressed comment from v4 -> v5: Marcelo: * Several typos * Use flock instead of virFileLock Addressed comment from v3 -> v4: Daniel & Marcelo: * Added concurrence support Addressed comment from v2 -> v3: Daniel: * Fixed coding style, passed `make check` and `make syntax-check` * Variables renaming and move from header file to c file. * For locking/mutex support, no progress. There are some discussion from mailing list, but I can not find a better way to add locking support without performance impact. I'll explain the process and please help to advice what shoud we do. VM create: 1) Get the cache left value on each bank of the host. This should be shared amount all VMs. 2) Calculate the schemata on the bank based on all created resctrl domain's schemata 3) Calculate the default schemata by scaning all domain's schemata. 4) Flush default schemata to /sys/fs/resctrl/schemata VM destroy: 1) Remove the resctrl domain of that VM 2) Recalculate default schemata 3) Flush default schemata to /sys/fs/resctrl/schemata The key point is that all VMs shares /sys/fs/resctrl/schemata, and when a VM create a resctrl domain, the schemata of that VM depends on the default schemata and all other exsited schematas. So a global mutex is reqired. Before calculate a schemata or update default schemata, libvirt should gain this global mutex. I will try to think more about how to support this gracefully in next patch set. Marcelo: * Added vcpu support for cachetune, this will allow user to define which vcpu using which cache allocation bank. <cachetune id='0' host_id=0 size='3072' unit='KiB' vcpus='0,1'/> vcpus is a cpumap, the vcpu pids will be added to tasks file * Added cdp compatible, user can specify l3 cache even host enable cdp. See patch 8. On a cdp enabled host, specify l3code/l3data by <cachetune id='0' host_id='0' type='l3' size='3072' unit='KiB'/> This will create a schemata like: L3data:0=0xff00;... L3code:0=0xff00;... * Would you please help to test if the functions work. Martin: * Xml test case, I have no time to work on this yet, would you please show me an example, would like to amend it later. This series patches are for supportting CAT featues, which also called cache tune in libvirt. First to expose cache information which could be tuned in capabilites XML. Then add new domain xml element support to add cacahe bank which will apply on this libvirt domain. This series patches add a util file `resctrl.c/h`, an interface to talk with linux kernel's system fs. There are still one TODO left: 1. Expose a new public interface to get free cache information. 2. Expose a new public interface to set cachetune lively. Some discussion about this feature support can be found from: https://www.redhat.com/archives/libvir-list/2017-January/msg00644.html Eli Qiao (10): Resctrl: Add some utils functions Resctrl: expose cache information to capabilities Resctrl: Add new xml element to support cache tune Resctrl: Add private interface to set cachebanks Qemu: Set cache banks Resctrl: enable l3code/l3data Resctrl: Make sure l3data/l3code are pairs Resctrl: Compatible mode for cdp enabled Resctrl: concurrence support Resctrl: Scan resctrl before doing cache allocation docs/schemas/domaincommon.rng | 46 ++ include/libvirt/virterror.h | 1 + po/POTFILES.in | 1 + src/Makefile.am | 1 + src/conf/capabilities.c | 56 ++ src/conf/capabilities.h | 23 + src/conf/domain_conf.c | 182 +++++++ src/conf/domain_conf.h | 19 + src/libvirt_private.syms | 11 + src/nodeinfo.c | 64 +++ src/nodeinfo.h | 1 + src/qemu/qemu_capabilities.c | 8 + src/qemu/qemu_driver.c | 6 + src/qemu/qemu_process.c | 53 ++ src/util/virerror.c | 1 + src/util/virresctrl.c | 1208 +++++++++++++++++++++++++++++++++++++++++ src/util/virresctrl.h | 88 +++ 17 files changed, 1769 insertions(+) create mode 100644 src/util/virresctrl.c create mode 100644 src/util/virresctrl.h -- 1.9.1

3 12

[libvirt] [RFC PATCH 00/16] Introduce vGPU mdev framework to libvirt
by Erik Skultety 15 Feb '17

15 Feb '17

Finally. It's here. This is the initial suggestion on how libvirt might interract with the mdev framework, currently only focussing on the non-managed devices, i.e. those pre-created by the user, since that will be revisited once we all settled on how the XML should look like, given we might not want to use the sysfs path directly as an attribute in the domain XML. My proposal on the XML is the following: <hostdev mode='subsystem' type='mdev'> <source>  <address domain='0x0000' bus='0x00' slot='0x00' function='0x00'> <uuid>vGPU_UUID<uuid> <source>  </hostdev> So the mediated device is identified by the physical parent device visible on the host and a UUID which allows us to construct the sysfs path by ourselves, which we then put on the QEMU's command line. A few remarks if you actually happen to have a machine to test this on: - right now the mediated devices are one-time use only, i.e. they have to be recreated before every machine boot - I wouldn't recommend assigning multiple vGPUs to a single domain Once this series is sorted out, we can then continue with 'managed=yes' where as Laine pointed out [1], we need to figure out how exactly should the management layer hint libvirt which vGPU type should be used for device instantiation. [1] https://www.redhat.com/archives/libvir-list/2017-January/msg00287.html #pleaseshareyourfeedback Thanks, Erik Erik Skultety (16): util: Introduce new module virmdev conf: Introduce new hostdev device type mdev docs: Update RNG schema to reflect the new hostdev type mdev conf: Adjust the domain parser to work with mdevs Adjust the formatter to reflect the new hostdev type mdev security: dac: Enable labeling of vfio mediated devices security: selinux: Enable labeling of vfio mediated devices conf: Enable cold-plug of a mediated device qemu: Assign PCI addresses for mediated devices as well hostdev: Maintain a driver list of active mediated devices hostdev: Introduce a reattach method for mediated devices qemu: cgroup: Adjust cgroups' logic to allow mediated devices qemu: namespace: Hook up the discovery of mdevs into the namespace code qemu: Format mdevs on the qemu command line test: Add some test cases for our test suite regarding the mdevs docs: Document the new hostdev device type 'mdev' docs/formatdomain.html.in | 40 ++- docs/schemas/domaincommon.rng | 17 + po/POTFILES.in | 1 + src/Makefile.am | 1 + src/conf/domain_conf.c | 81 ++++- src/conf/domain_conf.h | 10 + src/libvirt_private.syms | 19 ++ src/qemu/qemu_cgroup.c | 35 ++ src/qemu/qemu_command.c | 49 +++ src/qemu/qemu_command.h | 5 + src/qemu/qemu_domain.c | 13 + src/qemu/qemu_domain_address.c | 12 +- src/qemu/qemu_hostdev.c | 37 ++ src/qemu/qemu_hostdev.h | 8 + src/qemu/qemu_hotplug.c | 2 + src/security/security_apparmor.c | 3 + src/security/security_dac.c | 56 +++ src/security/security_selinux.c | 55 +++ src/util/virhostdev.c | 179 +++++++++- src/util/virhostdev.h | 16 + src/util/virmdev.c | 375 +++++++++++++++++++++ src/util/virmdev.h | 85 +++++ tests/domaincapsschemadata/full.xml | 1 + ...qemuxml2argv-hostdev-mdev-unmanaged-no-uuid.xml | 37 ++ .../qemuxml2argv-hostdev-mdev-unmanaged.args | 25 ++ .../qemuxml2argv-hostdev-mdev-unmanaged.xml | 38 +++ tests/qemuxml2argvtest.c | 6 + .../qemuxml2xmlout-hostdev-mdev-unmanaged.xml | 41 +++ tests/qemuxml2xmltest.c | 1 + 29 files changed, 1239 insertions(+), 9 deletions(-) create mode 100644 src/util/virmdev.c create mode 100644 src/util/virmdev.h create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-mdev-unmanaged-no-uuid.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-mdev-unmanaged.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-mdev-unmanaged.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-mdev-unmanaged.xml -- 2.10.2

5 33

[libvirt] [PATCH 0/2] apparmor: bug fix and improvement
by Jim Fehlig 15 Feb '17

15 Feb '17

Patch1 is a small improvement. Patch2 fixes a bug that is triggered when the apparmor security driver is enabled and domain config specifies a different security driver. E.g. # virsh dumpxml test | grep seclabel <seclabel type='none' model='none'/> # virsh start test error: Failed to start domain test error: An error occurred, but the cause is unknown Jim Fehlig (2): apparmor: don't overwrite error from reload_profile apparmor: don't fail on non-apparmor <seclabel> src/security/security_apparmor.c | 72 ++++++++++------------------------------ 1 file changed, 18 insertions(+), 54 deletions(-) -- 2.9.2

3 8

[libvirt] [PATCH 00/33] qemu: Detect host CPU model by asking QEMU on x86_64
by Jiri Denemark 15 Feb '17

15 Feb '17

Until now host-model CPU mode tried to enable all CPU features supported by the host CPU even if QEMU/KVM did not support them. This caused a number of issues and made host-model quite unreliable. Asking QEMU for the CPU it can provide and the current host makes host-model much more robust. This series fixes the following bugs: https://bugzilla.redhat.com/show_bug.cgi?id=1018251 https://bugzilla.redhat.com/show_bug.cgi?id=1371617 https://bugzilla.redhat.com/show_bug.cgi?id=1372581 https://bugzilla.redhat.com/show_bug.cgi?id=1404627 https://bugzilla.redhat.com/show_bug.cgi?id=870071 In addition to that, the following bug should be mostly limited to cases when an unsupported feature is explicitly requested: https://bugzilla.redhat.com/show_bug.cgi?id=1335534 The series relies on features which are not in QEMU yet, but should be hopefully close enough to be pushed in 2.9.0. In the meantime, Eduardo's work/x86-query-cpu-expansion-full branch can be used to play with them. Jiri Denemark (33): docs: Drop obsolete statement about CPU modes and migration docs: Fix since statement in host-model documentation qemucapstest: Add test data for QEMU 2.9.0 domaincapstest: Add test data for QEMU 2.9.0 qemu: Refactor virQEMUCapsInitHostCPUModel qemu: Skip virQEMUCapsCPUFilterFeatures on non-x86 CPUs qemu: Fix CPU model fallback in domain capabilities docs: Update description of the host-model CPU mode qemu: Introduce virQEMUCapsFormatHostCPUModelInfo qemu: Rename hostCPU/feature element in capabilities cache qemu: Store more types in qemuMonitorCPUModelInfo qemu: Probe "max" CPU model in TCG cpu: Introduce virCPUDataNew cpu_x86: Drop virCPUx86MakeData and use virCPUDataNew cpu_x86: Make virCPUx86DataClear static cpu: Rework cpuDataFree cpu_x86: Make virCPUx86DataAddCPUID work with virCPUDataPtr cpu_x86: Introduce virCPUx86DataSetSignature cpu_x86: Introduce virCPUx86DataSetVendor cpu_x86: Introduce virCPUx86DataAddFeature cpu: Use virCPUData.arch in cpuDecode qemu: Get host CPU model from QEMU on x86_64 qemu: Use enum for CPU model expansion type qemu: Use full CPU model expansion on x86 qemu: Make virQEMUCapsInitCPUModel testable cputest: Rename x86 data files cputest: Use virArch enum rather then strings cputest: Switch host CPU data scripts to model expansion cputest: Convert all json data files to query-cpu-model-expansion cputest: Test virQEMUCapsInitCPUModel cputest: Drop obsolete CPU test data files cputest: Drop .new suffix from CPU test data files news: Detect host CPU model by asking QEMU on x86_64 docs/formatdomain.html.in | 38 +- docs/news.xml | 11 + src/bhyve/bhyve_capabilities.c | 2 +- src/cpu/cpu.c | 42 +- src/cpu/cpu.h | 7 +- src/cpu/cpu_arm.c | 7 - src/cpu/cpu_ppc64.c | 6 +- src/cpu/cpu_s390.c | 7 - src/cpu/cpu_x86.c | 280 +- src/cpu/cpu_x86.h | 13 +- src/libvirt_private.syms | 8 +- src/libxl/libxl_capabilities.c | 18 +- src/qemu/qemu_capabilities.c | 452 +- src/qemu/qemu_capabilities.h | 3 +- src/qemu/qemu_capspriv.h | 13 +- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_monitor.c | 26 +- src/qemu/qemu_monitor.h | 31 +- src/qemu/qemu_monitor_json.c | 109 +- src/qemu/qemu_monitor_json.h | 4 +- src/qemu/qemu_parse_command.c | 2 +- src/qemu/qemu_process.c | 7 +- src/vmware/vmware_conf.c | 2 +- src/vz/vz_driver.c | 2 +- tests/cputest.c | 324 +- tests/cputestdata/cpu-convert.py | 244 + tests/cputestdata/cpu-gather.sh | 39 +- tests/cputestdata/cpu-parse.sh | 3 + tests/cputestdata/x86-cpuid-A10-5800K.json | 77 - tests/cputestdata/x86-cpuid-Core-i5-2500.json | 88 - tests/cputestdata/x86-cpuid-Core-i5-2540M.json | 82 - tests/cputestdata/x86-cpuid-Core-i5-4670T.json | 77 - tests/cputestdata/x86-cpuid-Core-i5-6600.json | 82 - tests/cputestdata/x86-cpuid-Core-i7-2600.json | 77 - tests/cputestdata/x86-cpuid-Core-i7-3740QM.json | 77 - tests/cputestdata/x86-cpuid-Core-i7-3770.json | 77 - tests/cputestdata/x86-cpuid-Core-i7-4600U.json | 82 - tests/cputestdata/x86-cpuid-Core-i7-5600U-json.xml | 12 - tests/cputestdata/x86-cpuid-Core-i7-5600U.json | 88 - tests/cputestdata/x86-cpuid-Core2-E6850.json | 77 - tests/cputestdata/x86-cpuid-Opteron-2350.json | 71 - tests/cputestdata/x86-cpuid-Opteron-6234.json | 88 - tests/cputestdata/x86-cpuid-Phenom-B95.json | 77 - tests/cputestdata/x86-cpuid-Xeon-E3-1245.json | 88 - tests/cputestdata/x86-cpuid-Xeon-E5-2630.json | 77 - tests/cputestdata/x86-cpuid-Xeon-E5-2650.json | 71 - tests/cputestdata/x86-cpuid-Xeon-E7-4820.json | 77 - tests/cputestdata/x86-cpuid-Xeon-W3520.json | 77 - ...ack.xml => x86_64-Haswell-noTSX-nofallback.xml} | 0 ...-Haswell-noTSX.xml => x86_64-Haswell-noTSX.xml} | 0 .../{x86-Haswell.xml => x86_64-Haswell.xml} | 0 ...e-1-result.xml => x86_64-baseline-1-result.xml} | 0 .../{x86-baseline-1.xml => x86_64-baseline-1.xml} | 0 ...e-2-result.xml => x86_64-baseline-2-result.xml} | 0 .../{x86-baseline-2.xml => x86_64-baseline-2.xml} | 0 ...expanded.xml => x86_64-baseline-3-expanded.xml} | 0 ...e-3-result.xml => x86_64-baseline-3-result.xml} | 0 .../{x86-baseline-3.xml => x86_64-baseline-3.xml} | 0 ...expanded.xml => x86_64-baseline-4-expanded.xml} | 0 ...e-4-result.xml => x86_64-baseline-4-result.xml} | 0 .../{x86-baseline-4.xml => x86_64-baseline-4.xml} | 0 ...expanded.xml => x86_64-baseline-5-expanded.xml} | 0 ...e-5-result.xml => x86_64-baseline-5-result.xml} | 0 .../{x86-baseline-5.xml => x86_64-baseline-5.xml} | 0 ...atable.xml => x86_64-baseline-6-migratable.xml} | 0 ...e-6-result.xml => x86_64-baseline-6-result.xml} | 0 .../{x86-baseline-6.xml => x86_64-baseline-6.xml} | 0 ...e-7-result.xml => x86_64-baseline-7-result.xml} | 0 .../{x86-baseline-7.xml => x86_64-baseline-7.xml} | 0 ...e-8-result.xml => x86_64-baseline-8-result.xml} | 0 .../{x86-baseline-8.xml => x86_64-baseline-8.xml} | 0 ...ml => x86_64-baseline-incompatible-vendors.xml} | 0 ...lt.xml => x86_64-baseline-no-vendor-result.xml} | 0 ...no-vendor.xml => x86_64-baseline-no-vendor.xml} | 0 ...xml => x86_64-baseline-some-vendors-result.xml} | 0 ...endors.xml => x86_64-baseline-some-vendors.xml} | 0 ...-bogus-feature.xml => x86_64-bogus-feature.xml} | 0 ...{x86-bogus-model.xml => x86_64-bogus-model.xml} | 0 ...86-bogus-vendor.xml => x86_64-bogus-vendor.xml} | 0 ...-guest.xml => x86_64-cpuid-A10-5800K-guest.xml} | 0 ...0K-host.xml => x86_64-cpuid-A10-5800K-host.xml} | 0 ...0K-json.xml => x86_64-cpuid-A10-5800K-json.xml} | 0 tests/cputestdata/x86_64-cpuid-A10-5800K.json | 202 + ...id-A10-5800K.xml => x86_64-cpuid-A10-5800K.xml} | 0 ...-guest.xml => x86_64-cpuid-Atom-D510-guest.xml} | 0 ...10-host.xml => x86_64-cpuid-Atom-D510-host.xml} | 0 ...id-Atom-D510.xml => x86_64-cpuid-Atom-D510.xml} | 0 ...-guest.xml => x86_64-cpuid-Atom-N450-guest.xml} | 0 ...50-host.xml => x86_64-cpuid-Atom-N450-host.xml} | 0 ...id-Atom-N450.xml => x86_64-cpuid-Atom-N450.xml} | 0 ...est.xml => x86_64-cpuid-Core-i5-2500-guest.xml} | 0 ...host.xml => x86_64-cpuid-Core-i5-2500-host.xml} | 0 ...json.xml => x86_64-cpuid-Core-i5-2500-json.xml} | 0 tests/cputestdata/x86_64-cpuid-Core-i5-2500.json | 202 + ...e-i5-2500.xml => x86_64-cpuid-Core-i5-2500.xml} | 0 ...st.xml => x86_64-cpuid-Core-i5-2540M-guest.xml} | 0 ...ost.xml => x86_64-cpuid-Core-i5-2540M-host.xml} | 0 ...son.xml => x86_64-cpuid-Core-i5-2540M-json.xml} | 0 tests/cputestdata/x86_64-cpuid-Core-i5-2540M.json | 202 + ...i5-2540M.xml => x86_64-cpuid-Core-i5-2540M.xml} | 0 ...st.xml => x86_64-cpuid-Core-i5-4670T-guest.xml} | 0 ...ost.xml => x86_64-cpuid-Core-i5-4670T-host.xml} | 0 ...son.xml => x86_64-cpuid-Core-i5-4670T-json.xml} | 0 tests/cputestdata/x86_64-cpuid-Core-i5-4670T.json | 202 + ...i5-4670T.xml => x86_64-cpuid-Core-i5-4670T.xml} | 0 ...est.xml => x86_64-cpuid-Core-i5-6600-guest.xml} | 0 ...host.xml => x86_64-cpuid-Core-i5-6600-host.xml} | 0 ...json.xml => x86_64-cpuid-Core-i5-6600-json.xml} | 0 tests/cputestdata/x86_64-cpuid-Core-i5-6600.json | 202 + ...e-i5-6600.xml => x86_64-cpuid-Core-i5-6600.xml} | 0 ...est.xml => x86_64-cpuid-Core-i7-2600-guest.xml} | 0 ...host.xml => x86_64-cpuid-Core-i7-2600-host.xml} | 0 ...json.xml => x86_64-cpuid-Core-i7-2600-json.xml} | 0 tests/cputestdata/x86_64-cpuid-Core-i7-2600.json | 202 + ...e-i7-2600.xml => x86_64-cpuid-Core-i7-2600.xml} | 0 ...st.xml => x86_64-cpuid-Core-i7-3520M-guest.xml} | 0 ...ost.xml => x86_64-cpuid-Core-i7-3520M-host.xml} | 0 ...i7-3520M.xml => x86_64-cpuid-Core-i7-3520M.xml} | 0 ...t.xml => x86_64-cpuid-Core-i7-3740QM-guest.xml} | 0 ...st.xml => x86_64-cpuid-Core-i7-3740QM-host.xml} | 0 ...on.xml => x86_64-cpuid-Core-i7-3740QM-json.xml} | 0 tests/cputestdata/x86_64-cpuid-Core-i7-3740QM.json | 202 + ...-3740QM.xml => x86_64-cpuid-Core-i7-3740QM.xml} | 0 ...est.xml => x86_64-cpuid-Core-i7-3770-guest.xml} | 0 ...host.xml => x86_64-cpuid-Core-i7-3770-host.xml} | 0 ...json.xml => x86_64-cpuid-Core-i7-3770-json.xml} | 0 tests/cputestdata/x86_64-cpuid-Core-i7-3770.json | 202 + ...e-i7-3770.xml => x86_64-cpuid-Core-i7-3770.xml} | 0 ...st.xml => x86_64-cpuid-Core-i7-4600U-guest.xml} | 0 ...ost.xml => x86_64-cpuid-Core-i7-4600U-host.xml} | 0 ...son.xml => x86_64-cpuid-Core-i7-4600U-json.xml} | 0 tests/cputestdata/x86_64-cpuid-Core-i7-4600U.json | 202 + ...i7-4600U.xml => x86_64-cpuid-Core-i7-4600U.xml} | 0 ...st.xml => x86_64-cpuid-Core-i7-5600U-guest.xml} | 0 ...ost.xml => x86_64-cpuid-Core-i7-5600U-host.xml} | 0 .../x86_64-cpuid-Core-i7-5600U-json.xml | 15 + tests/cputestdata/x86_64-cpuid-Core-i7-5600U.json | 202 + ...i7-5600U.xml => x86_64-cpuid-Core-i7-5600U.xml} | 0 ...uest.xml => x86_64-cpuid-Core2-E6850-guest.xml} | 0 ...-host.xml => x86_64-cpuid-Core2-E6850-host.xml} | 0 ...-json.xml => x86_64-cpuid-Core2-E6850-json.xml} | 4 +- tests/cputestdata/x86_64-cpuid-Core2-E6850.json | 202 + ...ore2-E6850.xml => x86_64-cpuid-Core2-E6850.xml} | 0 ...uest.xml => x86_64-cpuid-Core2-Q9500-guest.xml} | 0 ...-host.xml => x86_64-cpuid-Core2-Q9500-host.xml} | 0 ...ore2-Q9500.xml => x86_64-cpuid-Core2-Q9500.xml} | 0 ...50-guest.xml => x86_64-cpuid-FX-8150-guest.xml} | 0 ...8150-host.xml => x86_64-cpuid-FX-8150-host.xml} | 0 ...-cpuid-FX-8150.xml => x86_64-cpuid-FX-8150.xml} | 0 ...est.xml => x86_64-cpuid-Opteron-1352-guest.xml} | 0 ...host.xml => x86_64-cpuid-Opteron-1352-host.xml} | 0 ...eron-1352.xml => x86_64-cpuid-Opteron-1352.xml} | 0 ...est.xml => x86_64-cpuid-Opteron-2350-guest.xml} | 0 ...host.xml => x86_64-cpuid-Opteron-2350-host.xml} | 0 ...json.xml => x86_64-cpuid-Opteron-2350-json.xml} | 0 tests/cputestdata/x86_64-cpuid-Opteron-2350.json | 202 + ...eron-2350.xml => x86_64-cpuid-Opteron-2350.xml} | 0 ...est.xml => x86_64-cpuid-Opteron-6234-guest.xml} | 0 ...host.xml => x86_64-cpuid-Opteron-6234-host.xml} | 0 ...json.xml => x86_64-cpuid-Opteron-6234-json.xml} | 0 tests/cputestdata/x86_64-cpuid-Opteron-6234.json | 202 + ...eron-6234.xml => x86_64-cpuid-Opteron-6234.xml} | 0 ...est.xml => x86_64-cpuid-Opteron-6282-guest.xml} | 0 ...host.xml => x86_64-cpuid-Opteron-6282-host.xml} | 0 ...eron-6282.xml => x86_64-cpuid-Opteron-6282.xml} | 0 ...st.xml => x86_64-cpuid-Pentium-P6100-guest.xml} | 0 ...ost.xml => x86_64-cpuid-Pentium-P6100-host.xml} | 0 ...um-P6100.xml => x86_64-cpuid-Pentium-P6100.xml} | 0 ...guest.xml => x86_64-cpuid-Phenom-B95-guest.xml} | 0 ...5-host.xml => x86_64-cpuid-Phenom-B95-host.xml} | 0 ...5-json.xml => x86_64-cpuid-Phenom-B95-json.xml} | 0 tests/cputestdata/x86_64-cpuid-Phenom-B95.json | 202 + ...-Phenom-B95.xml => x86_64-cpuid-Phenom-B95.xml} | 0 ...-guest.xml => x86_64-cpuid-Xeon-5110-guest.xml} | 0 ...10-host.xml => x86_64-cpuid-Xeon-5110-host.xml} | 0 ...id-Xeon-5110.xml => x86_64-cpuid-Xeon-5110.xml} | 0 ...est.xml => x86_64-cpuid-Xeon-E3-1245-guest.xml} | 0 ...host.xml => x86_64-cpuid-Xeon-E3-1245-host.xml} | 0 ...json.xml => x86_64-cpuid-Xeon-E3-1245-json.xml} | 0 tests/cputestdata/x86_64-cpuid-Xeon-E3-1245.json | 202 + ...n-E3-1245.xml => x86_64-cpuid-Xeon-E3-1245.xml} | 0 ...est.xml => x86_64-cpuid-Xeon-E5-2630-guest.xml} | 0 ...host.xml => x86_64-cpuid-Xeon-E5-2630-host.xml} | 0 ...json.xml => x86_64-cpuid-Xeon-E5-2630-json.xml} | 0 tests/cputestdata/x86_64-cpuid-Xeon-E5-2630.json | 202 + ...n-E5-2630.xml => x86_64-cpuid-Xeon-E5-2630.xml} | 0 ...est.xml => x86_64-cpuid-Xeon-E5-2650-guest.xml} | 0 ...host.xml => x86_64-cpuid-Xeon-E5-2650-host.xml} | 0 ...json.xml => x86_64-cpuid-Xeon-E5-2650-json.xml} | 0 tests/cputestdata/x86_64-cpuid-Xeon-E5-2650.json | 202 + ...n-E5-2650.xml => x86_64-cpuid-Xeon-E5-2650.xml} | 0 ...est.xml => x86_64-cpuid-Xeon-E7-4820-guest.xml} | 0 ...host.xml => x86_64-cpuid-Xeon-E7-4820-host.xml} | 0 ...json.xml => x86_64-cpuid-Xeon-E7-4820-json.xml} | 0 tests/cputestdata/x86_64-cpuid-Xeon-E7-4820.json | 202 + ...n-E7-4820.xml => x86_64-cpuid-Xeon-E7-4820.xml} | 0 ...guest.xml => x86_64-cpuid-Xeon-W3520-guest.xml} | 0 ...0-host.xml => x86_64-cpuid-Xeon-W3520-host.xml} | 0 ...0-json.xml => x86_64-cpuid-Xeon-W3520-json.xml} | 0 tests/cputestdata/x86_64-cpuid-Xeon-W3520.json | 202 + ...-Xeon-W3520.xml => x86_64-cpuid-Xeon-W3520.xml} | 0 ...guest.xml => x86_64-cpuid-Xeon-X5460-guest.xml} | 0 ...0-host.xml => x86_64-cpuid-Xeon-X5460-host.xml} | 0 ...-Xeon-X5460.xml => x86_64-cpuid-Xeon-X5460.xml} | 0 ...le-extra.xml => x86_64-exact-disable-extra.xml} | 0 ...-exact-disable.xml => x86_64-exact-disable.xml} | 0 ...xact-disable2.xml => x86_64-exact-disable2.xml} | 0 ...bid-extra.xml => x86_64-exact-forbid-extra.xml} | 0 ...86-exact-forbid.xml => x86_64-exact-forbid.xml} | 0 ...-Haswell.xml => x86_64-exact-force-Haswell.xml} | 0 ...{x86-exact-force.xml => x86_64-exact-force.xml} | 0 ...re-extra.xml => x86_64-exact-require-extra.xml} | 0 ...-exact-require.xml => x86_64-exact-require.xml} | 0 .../{x86-exact.xml => x86_64-exact.xml} | 0 ...-nofallback.xml => x86_64-guest-nofallback.xml} | 0 .../{x86-guest.xml => x86_64-guest.xml} | 0 ...t.xml => x86_64-host+guest,model486-result.xml} | 0 ...ult.xml => x86_64-host+guest,models-result.xml} | 0 ...est-result.xml => x86_64-host+guest-result.xml} | 0 .../{x86-host+guest.xml => x86_64-host+guest.xml} | 0 ... x86_64-host+host+host-model,models-result.xml} | 0 ...k.xml => x86_64-host+host-model-nofallback.xml} | 0 ...t+host-model.xml => x86_64-host+host-model.xml} | 0 ...l => x86_64-host+host-passthrough-features.xml} | 0 ...hrough.xml => x86_64-host+host-passthrough.xml} | 0 .../{x86-host+min.xml => x86_64-host+min.xml} | 0 ...ult.xml => x86_64-host+penryn-force-result.xml} | 0 ...-host+pentium3.xml => x86_64-host+pentium3.xml} | 0 ...l => x86_64-host+strict-force-extra-result.xml} | 0 ...-host-Haswell-noTSX+Haswell,haswell-result.xml} | 0 ...Haswell-noTSX+Haswell-noTSX,haswell-result.xml} | 0 ...64-host-Haswell-noTSX+Haswell-noTSX-result.xml} | 0 ...ell-noTSX.xml => x86_64-host-Haswell-noTSX.xml} | 0 ...SandyBridge.xml => x86_64-host-SandyBridge.xml} | 0 ...-host-amd-fake.xml => x86_64-host-amd-fake.xml} | 0 .../{x86-host-amd.xml => x86_64-host-amd.xml} | 0 ....xml => x86_64-host-better+pentium3-result.xml} | 0 ...{x86-host-better.xml => x86_64-host-better.xml} | 0 ...incomp-arch.xml => x86_64-host-incomp-arch.xml} | 0 ...model.xml => x86_64-host-invtsc+host-model.xml} | 0 ...{x86-host-invtsc.xml => x86_64-host-invtsc.xml} | 0 ...llback.xml => x86_64-host-model-nofallback.xml} | 0 .../{x86-host-model.xml => x86_64-host-model.xml} | 0 ...ost-no-vendor.xml => x86_64-host-no-vendor.xml} | 0 ...es.xml => x86_64-host-passthrough-features.xml} | 0 ...passthrough.xml => x86_64-host-passthrough.xml} | 0 ...sult.xml => x86_64-host-worse+guest-result.xml} | 0 .../{x86-host-worse.xml => x86_64-host-worse.xml} | 0 .../cputestdata/{x86-host.xml => x86_64-host.xml} | 0 tests/cputestdata/{x86-min.xml => x86_64-min.xml} | 0 ...86-penryn-force.xml => x86_64-penryn-force.xml} | 0 ...86-pentium3-amd.xml => x86_64-pentium3-amd.xml} | 0 .../{x86-pentium3.xml => x86_64-pentium3.xml} | 0 ...trict-disable.xml => x86_64-strict-disable.xml} | 0 ...rce-extra.xml => x86_64-strict-force-extra.xml} | 0 ...{x86-strict-full.xml => x86_64-strict-full.xml} | 0 .../{x86-strict.xml => x86_64-strict.xml} | 0 tests/domaincapsschemadata/qemu_2.8.0.s390x.xml | 2 +- .../domaincapsschemadata/qemu_2.9.0-tcg.x86_64.xml | 145 + tests/domaincapsschemadata/qemu_2.9.0.x86_64.xml | 124 + tests/domaincapstest.c | 8 + .../qemucapabilitiesdata/caps_2.8.0.s390x.replies | 8 + tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 32 +- .../qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 15365 +++++++++++++++++++ tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 763 + tests/qemucapabilitiestest.c | 1 + tests/qemumonitorjsontest.c | 4 +- tests/qemuxml2argvtest.c | 3 +- 268 files changed, 21475 insertions(+), 2061 deletions(-) create mode 100755 tests/cputestdata/cpu-convert.py delete mode 100644 tests/cputestdata/x86-cpuid-A10-5800K.json delete mode 100644 tests/cputestdata/x86-cpuid-Core-i5-2500.json delete mode 100644 tests/cputestdata/x86-cpuid-Core-i5-2540M.json delete mode 100644 tests/cputestdata/x86-cpuid-Core-i5-4670T.json delete mode 100644 tests/cputestdata/x86-cpuid-Core-i5-6600.json delete mode 100644 tests/cputestdata/x86-cpuid-Core-i7-2600.json delete mode 100644 tests/cputestdata/x86-cpuid-Core-i7-3740QM.json delete mode 100644 tests/cputestdata/x86-cpuid-Core-i7-3770.json delete mode 100644 tests/cputestdata/x86-cpuid-Core-i7-4600U.json delete mode 100644 tests/cputestdata/x86-cpuid-Core-i7-5600U-json.xml delete mode 100644 tests/cputestdata/x86-cpuid-Core-i7-5600U.json delete mode 100644 tests/cputestdata/x86-cpuid-Core2-E6850.json delete mode 100644 tests/cputestdata/x86-cpuid-Opteron-2350.json delete mode 100644 tests/cputestdata/x86-cpuid-Opteron-6234.json delete mode 100644 tests/cputestdata/x86-cpuid-Phenom-B95.json delete mode 100644 tests/cputestdata/x86-cpuid-Xeon-E3-1245.json delete mode 100644 tests/cputestdata/x86-cpuid-Xeon-E5-2630.json delete mode 100644 tests/cputestdata/x86-cpuid-Xeon-E5-2650.json delete mode 100644 tests/cputestdata/x86-cpuid-Xeon-E7-4820.json delete mode 100644 tests/cputestdata/x86-cpuid-Xeon-W3520.json rename tests/cputestdata/{x86-Haswell-noTSX-nofallback.xml => x86_64-Haswell-noTSX-nofallback.xml} (100%) rename tests/cputestdata/{x86-Haswell-noTSX.xml => x86_64-Haswell-noTSX.xml} (100%) rename tests/cputestdata/{x86-Haswell.xml => x86_64-Haswell.xml} (100%) rename tests/cputestdata/{x86-baseline-1-result.xml => x86_64-baseline-1-result.xml} (100%) rename tests/cputestdata/{x86-baseline-1.xml => x86_64-baseline-1.xml} (100%) rename tests/cputestdata/{x86-baseline-2-result.xml => x86_64-baseline-2-result.xml} (100%) rename tests/cputestdata/{x86-baseline-2.xml => x86_64-baseline-2.xml} (100%) rename tests/cputestdata/{x86-baseline-3-expanded.xml => x86_64-baseline-3-expanded.xml} (100%) rename tests/cputestdata/{x86-baseline-3-result.xml => x86_64-baseline-3-result.xml} (100%) rename tests/cputestdata/{x86-baseline-3.xml => x86_64-baseline-3.xml} (100%) rename tests/cputestdata/{x86-baseline-4-expanded.xml => x86_64-baseline-4-expanded.xml} (100%) rename tests/cputestdata/{x86-baseline-4-result.xml => x86_64-baseline-4-result.xml} (100%) rename tests/cputestdata/{x86-baseline-4.xml => x86_64-baseline-4.xml} (100%) rename tests/cputestdata/{x86-baseline-5-expanded.xml => x86_64-baseline-5-expanded.xml} (100%) rename tests/cputestdata/{x86-baseline-5-result.xml => x86_64-baseline-5-result.xml} (100%) rename tests/cputestdata/{x86-baseline-5.xml => x86_64-baseline-5.xml} (100%) rename tests/cputestdata/{x86-baseline-6-migratable.xml => x86_64-baseline-6-migratable.xml} (100%) rename tests/cputestdata/{x86-baseline-6-result.xml => x86_64-baseline-6-result.xml} (100%) rename tests/cputestdata/{x86-baseline-6.xml => x86_64-baseline-6.xml} (100%) rename tests/cputestdata/{x86-baseline-7-result.xml => x86_64-baseline-7-result.xml} (100%) rename tests/cputestdata/{x86-baseline-7.xml => x86_64-baseline-7.xml} (100%) rename tests/cputestdata/{x86-baseline-8-result.xml => x86_64-baseline-8-result.xml} (100%) rename tests/cputestdata/{x86-baseline-8.xml => x86_64-baseline-8.xml} (100%) rename tests/cputestdata/{x86-baseline-incompatible-vendors.xml => x86_64-baseline-incompatible-vendors.xml} (100%) rename tests/cputestdata/{x86-baseline-no-vendor-result.xml => x86_64-baseline-no-vendor-result.xml} (100%) rename tests/cputestdata/{x86-baseline-no-vendor.xml => x86_64-baseline-no-vendor.xml} (100%) rename tests/cputestdata/{x86-baseline-some-vendors-result.xml => x86_64-baseline-some-vendors-result.xml} (100%) rename tests/cputestdata/{x86-baseline-some-vendors.xml => x86_64-baseline-some-vendors.xml} (100%) rename tests/cputestdata/{x86-bogus-feature.xml => x86_64-bogus-feature.xml} (100%) rename tests/cputestdata/{x86-bogus-model.xml => x86_64-bogus-model.xml} (100%) rename tests/cputestdata/{x86-bogus-vendor.xml => x86_64-bogus-vendor.xml} (100%) rename tests/cputestdata/{x86-cpuid-A10-5800K-guest.xml => x86_64-cpuid-A10-5800K-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-A10-5800K-host.xml => x86_64-cpuid-A10-5800K-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-A10-5800K-json.xml => x86_64-cpuid-A10-5800K-json.xml} (100%) create mode 100644 tests/cputestdata/x86_64-cpuid-A10-5800K.json rename tests/cputestdata/{x86-cpuid-A10-5800K.xml => x86_64-cpuid-A10-5800K.xml} (100%) rename tests/cputestdata/{x86-cpuid-Atom-D510-guest.xml => x86_64-cpuid-Atom-D510-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Atom-D510-host.xml => x86_64-cpuid-Atom-D510-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Atom-D510.xml => x86_64-cpuid-Atom-D510.xml} (100%) rename tests/cputestdata/{x86-cpuid-Atom-N450-guest.xml => x86_64-cpuid-Atom-N450-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Atom-N450-host.xml => x86_64-cpuid-Atom-N450-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Atom-N450.xml => x86_64-cpuid-Atom-N450.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i5-2500-guest.xml => x86_64-cpuid-Core-i5-2500-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i5-2500-host.xml => x86_64-cpuid-Core-i5-2500-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i5-2500-json.xml => x86_64-cpuid-Core-i5-2500-json.xml} (100%) create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i5-2500.json rename tests/cputestdata/{x86-cpuid-Core-i5-2500.xml => x86_64-cpuid-Core-i5-2500.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i5-2540M-guest.xml => x86_64-cpuid-Core-i5-2540M-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i5-2540M-host.xml => x86_64-cpuid-Core-i5-2540M-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i5-2540M-json.xml => x86_64-cpuid-Core-i5-2540M-json.xml} (100%) create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i5-2540M.json rename tests/cputestdata/{x86-cpuid-Core-i5-2540M.xml => x86_64-cpuid-Core-i5-2540M.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i5-4670T-guest.xml => x86_64-cpuid-Core-i5-4670T-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i5-4670T-host.xml => x86_64-cpuid-Core-i5-4670T-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i5-4670T-json.xml => x86_64-cpuid-Core-i5-4670T-json.xml} (100%) create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i5-4670T.json rename tests/cputestdata/{x86-cpuid-Core-i5-4670T.xml => x86_64-cpuid-Core-i5-4670T.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i5-6600-guest.xml => x86_64-cpuid-Core-i5-6600-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i5-6600-host.xml => x86_64-cpuid-Core-i5-6600-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i5-6600-json.xml => x86_64-cpuid-Core-i5-6600-json.xml} (100%) create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i5-6600.json rename tests/cputestdata/{x86-cpuid-Core-i5-6600.xml => x86_64-cpuid-Core-i5-6600.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i7-2600-guest.xml => x86_64-cpuid-Core-i7-2600-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i7-2600-host.xml => x86_64-cpuid-Core-i7-2600-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i7-2600-json.xml => x86_64-cpuid-Core-i7-2600-json.xml} (100%) create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-2600.json rename tests/cputestdata/{x86-cpuid-Core-i7-2600.xml => x86_64-cpuid-Core-i7-2600.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i7-3520M-guest.xml => x86_64-cpuid-Core-i7-3520M-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i7-3520M-host.xml => x86_64-cpuid-Core-i7-3520M-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i7-3520M.xml => x86_64-cpuid-Core-i7-3520M.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i7-3740QM-guest.xml => x86_64-cpuid-Core-i7-3740QM-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i7-3740QM-host.xml => x86_64-cpuid-Core-i7-3740QM-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i7-3740QM-json.xml => x86_64-cpuid-Core-i7-3740QM-json.xml} (100%) create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-3740QM.json rename tests/cputestdata/{x86-cpuid-Core-i7-3740QM.xml => x86_64-cpuid-Core-i7-3740QM.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i7-3770-guest.xml => x86_64-cpuid-Core-i7-3770-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i7-3770-host.xml => x86_64-cpuid-Core-i7-3770-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i7-3770-json.xml => x86_64-cpuid-Core-i7-3770-json.xml} (100%) create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-3770.json rename tests/cputestdata/{x86-cpuid-Core-i7-3770.xml => x86_64-cpuid-Core-i7-3770.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i7-4600U-guest.xml => x86_64-cpuid-Core-i7-4600U-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i7-4600U-host.xml => x86_64-cpuid-Core-i7-4600U-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i7-4600U-json.xml => x86_64-cpuid-Core-i7-4600U-json.xml} (100%) create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-4600U.json rename tests/cputestdata/{x86-cpuid-Core-i7-4600U.xml => x86_64-cpuid-Core-i7-4600U.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i7-5600U-guest.xml => x86_64-cpuid-Core-i7-5600U-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core-i7-5600U-host.xml => x86_64-cpuid-Core-i7-5600U-host.xml} (100%) create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-5600U-json.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-5600U.json rename tests/cputestdata/{x86-cpuid-Core-i7-5600U.xml => x86_64-cpuid-Core-i7-5600U.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core2-E6850-guest.xml => x86_64-cpuid-Core2-E6850-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core2-E6850-host.xml => x86_64-cpuid-Core2-E6850-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core2-E6850-json.xml => x86_64-cpuid-Core2-E6850-json.xml} (79%) create mode 100644 tests/cputestdata/x86_64-cpuid-Core2-E6850.json rename tests/cputestdata/{x86-cpuid-Core2-E6850.xml => x86_64-cpuid-Core2-E6850.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core2-Q9500-guest.xml => x86_64-cpuid-Core2-Q9500-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core2-Q9500-host.xml => x86_64-cpuid-Core2-Q9500-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Core2-Q9500.xml => x86_64-cpuid-Core2-Q9500.xml} (100%) rename tests/cputestdata/{x86-cpuid-FX-8150-guest.xml => x86_64-cpuid-FX-8150-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-FX-8150-host.xml => x86_64-cpuid-FX-8150-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-FX-8150.xml => x86_64-cpuid-FX-8150.xml} (100%) rename tests/cputestdata/{x86-cpuid-Opteron-1352-guest.xml => x86_64-cpuid-Opteron-1352-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Opteron-1352-host.xml => x86_64-cpuid-Opteron-1352-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Opteron-1352.xml => x86_64-cpuid-Opteron-1352.xml} (100%) rename tests/cputestdata/{x86-cpuid-Opteron-2350-guest.xml => x86_64-cpuid-Opteron-2350-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Opteron-2350-host.xml => x86_64-cpuid-Opteron-2350-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Opteron-2350-json.xml => x86_64-cpuid-Opteron-2350-json.xml} (100%) create mode 100644 tests/cputestdata/x86_64-cpuid-Opteron-2350.json rename tests/cputestdata/{x86-cpuid-Opteron-2350.xml => x86_64-cpuid-Opteron-2350.xml} (100%) rename tests/cputestdata/{x86-cpuid-Opteron-6234-guest.xml => x86_64-cpuid-Opteron-6234-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Opteron-6234-host.xml => x86_64-cpuid-Opteron-6234-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Opteron-6234-json.xml => x86_64-cpuid-Opteron-6234-json.xml} (100%) create mode 100644 tests/cputestdata/x86_64-cpuid-Opteron-6234.json rename tests/cputestdata/{x86-cpuid-Opteron-6234.xml => x86_64-cpuid-Opteron-6234.xml} (100%) rename tests/cputestdata/{x86-cpuid-Opteron-6282-guest.xml => x86_64-cpuid-Opteron-6282-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Opteron-6282-host.xml => x86_64-cpuid-Opteron-6282-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Opteron-6282.xml => x86_64-cpuid-Opteron-6282.xml} (100%) rename tests/cputestdata/{x86-cpuid-Pentium-P6100-guest.xml => x86_64-cpuid-Pentium-P6100-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Pentium-P6100-host.xml => x86_64-cpuid-Pentium-P6100-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Pentium-P6100.xml => x86_64-cpuid-Pentium-P6100.xml} (100%) rename tests/cputestdata/{x86-cpuid-Phenom-B95-guest.xml => x86_64-cpuid-Phenom-B95-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Phenom-B95-host.xml => x86_64-cpuid-Phenom-B95-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Phenom-B95-json.xml => x86_64-cpuid-Phenom-B95-json.xml} (100%) create mode 100644 tests/cputestdata/x86_64-cpuid-Phenom-B95.json rename tests/cputestdata/{x86-cpuid-Phenom-B95.xml => x86_64-cpuid-Phenom-B95.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-5110-guest.xml => x86_64-cpuid-Xeon-5110-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-5110-host.xml => x86_64-cpuid-Xeon-5110-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-5110.xml => x86_64-cpuid-Xeon-5110.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-E3-1245-guest.xml => x86_64-cpuid-Xeon-E3-1245-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-E3-1245-host.xml => x86_64-cpuid-Xeon-E3-1245-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-E3-1245-json.xml => x86_64-cpuid-Xeon-E3-1245-json.xml} (100%) create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E3-1245.json rename tests/cputestdata/{x86-cpuid-Xeon-E3-1245.xml => x86_64-cpuid-Xeon-E3-1245.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-E5-2630-guest.xml => x86_64-cpuid-Xeon-E5-2630-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-E5-2630-host.xml => x86_64-cpuid-Xeon-E5-2630-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-E5-2630-json.xml => x86_64-cpuid-Xeon-E5-2630-json.xml} (100%) create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2630.json rename tests/cputestdata/{x86-cpuid-Xeon-E5-2630.xml => x86_64-cpuid-Xeon-E5-2630.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-E5-2650-guest.xml => x86_64-cpuid-Xeon-E5-2650-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-E5-2650-host.xml => x86_64-cpuid-Xeon-E5-2650-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-E5-2650-json.xml => x86_64-cpuid-Xeon-E5-2650-json.xml} (100%) create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E5-2650.json rename tests/cputestdata/{x86-cpuid-Xeon-E5-2650.xml => x86_64-cpuid-Xeon-E5-2650.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-E7-4820-guest.xml => x86_64-cpuid-Xeon-E7-4820-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-E7-4820-host.xml => x86_64-cpuid-Xeon-E7-4820-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-E7-4820-json.xml => x86_64-cpuid-Xeon-E7-4820-json.xml} (100%) create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7-4820.json rename tests/cputestdata/{x86-cpuid-Xeon-E7-4820.xml => x86_64-cpuid-Xeon-E7-4820.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-W3520-guest.xml => x86_64-cpuid-Xeon-W3520-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-W3520-host.xml => x86_64-cpuid-Xeon-W3520-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-W3520-json.xml => x86_64-cpuid-Xeon-W3520-json.xml} (100%) create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-W3520.json rename tests/cputestdata/{x86-cpuid-Xeon-W3520.xml => x86_64-cpuid-Xeon-W3520.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-X5460-guest.xml => x86_64-cpuid-Xeon-X5460-guest.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-X5460-host.xml => x86_64-cpuid-Xeon-X5460-host.xml} (100%) rename tests/cputestdata/{x86-cpuid-Xeon-X5460.xml => x86_64-cpuid-Xeon-X5460.xml} (100%) rename tests/cputestdata/{x86-exact-disable-extra.xml => x86_64-exact-disable-extra.xml} (100%) rename tests/cputestdata/{x86-exact-disable.xml => x86_64-exact-disable.xml} (100%) rename tests/cputestdata/{x86-exact-disable2.xml => x86_64-exact-disable2.xml} (100%) rename tests/cputestdata/{x86-exact-forbid-extra.xml => x86_64-exact-forbid-extra.xml} (100%) rename tests/cputestdata/{x86-exact-forbid.xml => x86_64-exact-forbid.xml} (100%) rename tests/cputestdata/{x86-exact-force-Haswell.xml => x86_64-exact-force-Haswell.xml} (100%) rename tests/cputestdata/{x86-exact-force.xml => x86_64-exact-force.xml} (100%) rename tests/cputestdata/{x86-exact-require-extra.xml => x86_64-exact-require-extra.xml} (100%) rename tests/cputestdata/{x86-exact-require.xml => x86_64-exact-require.xml} (100%) rename tests/cputestdata/{x86-exact.xml => x86_64-exact.xml} (100%) rename tests/cputestdata/{x86-guest-nofallback.xml => x86_64-guest-nofallback.xml} (100%) rename tests/cputestdata/{x86-guest.xml => x86_64-guest.xml} (100%) rename tests/cputestdata/{x86-host+guest,model486-result.xml => x86_64-host+guest,model486-result.xml} (100%) rename tests/cputestdata/{x86-host+guest,models-result.xml => x86_64-host+guest,models-result.xml} (100%) rename tests/cputestdata/{x86-host+guest-result.xml => x86_64-host+guest-result.xml} (100%) rename tests/cputestdata/{x86-host+guest.xml => x86_64-host+guest.xml} (100%) rename tests/cputestdata/{x86-host+host+host-model,models-result.xml => x86_64-host+host+host-model,models-result.xml} (100%) rename tests/cputestdata/{x86-host+host-model-nofallback.xml => x86_64-host+host-model-nofallback.xml} (100%) rename tests/cputestdata/{x86-host+host-model.xml => x86_64-host+host-model.xml} (100%) rename tests/cputestdata/{x86-host+host-passthrough-features.xml => x86_64-host+host-passthrough-features.xml} (100%) rename tests/cputestdata/{x86-host+host-passthrough.xml => x86_64-host+host-passthrough.xml} (100%) rename tests/cputestdata/{x86-host+min.xml => x86_64-host+min.xml} (100%) rename tests/cputestdata/{x86-host+penryn-force-result.xml => x86_64-host+penryn-force-result.xml} (100%) rename tests/cputestdata/{x86-host+pentium3.xml => x86_64-host+pentium3.xml} (100%) rename tests/cputestdata/{x86-host+strict-force-extra-result.xml => x86_64-host+strict-force-extra-result.xml} (100%) rename tests/cputestdata/{x86-host-Haswell-noTSX+Haswell,haswell-result.xml => x86_64-host-Haswell-noTSX+Haswell,haswell-result.xml} (100%) rename tests/cputestdata/{x86-host-Haswell-noTSX+Haswell-noTSX,haswell-result.xml => x86_64-host-Haswell-noTSX+Haswell-noTSX,haswell-result.xml} (100%) rename tests/cputestdata/{x86-host-Haswell-noTSX+Haswell-noTSX-result.xml => x86_64-host-Haswell-noTSX+Haswell-noTSX-result.xml} (100%) rename tests/cputestdata/{x86-host-Haswell-noTSX.xml => x86_64-host-Haswell-noTSX.xml} (100%) rename tests/cputestdata/{x86-host-SandyBridge.xml => x86_64-host-SandyBridge.xml} (100%) rename tests/cputestdata/{x86-host-amd-fake.xml => x86_64-host-amd-fake.xml} (100%) rename tests/cputestdata/{x86-host-amd.xml => x86_64-host-amd.xml} (100%) rename tests/cputestdata/{x86-host-better+pentium3-result.xml => x86_64-host-better+pentium3-result.xml} (100%) rename tests/cputestdata/{x86-host-better.xml => x86_64-host-better.xml} (100%) rename tests/cputestdata/{x86-host-incomp-arch.xml => x86_64-host-incomp-arch.xml} (100%) rename tests/cputestdata/{x86-host-invtsc+host-model.xml => x86_64-host-invtsc+host-model.xml} (100%) rename tests/cputestdata/{x86-host-invtsc.xml => x86_64-host-invtsc.xml} (100%) rename tests/cputestdata/{x86-host-model-nofallback.xml => x86_64-host-model-nofallback.xml} (100%) rename tests/cputestdata/{x86-host-model.xml => x86_64-host-model.xml} (100%) rename tests/cputestdata/{x86-host-no-vendor.xml => x86_64-host-no-vendor.xml} (100%) rename tests/cputestdata/{x86-host-passthrough-features.xml => x86_64-host-passthrough-features.xml} (100%) rename tests/cputestdata/{x86-host-passthrough.xml => x86_64-host-passthrough.xml} (100%) rename tests/cputestdata/{x86-host-worse+guest-result.xml => x86_64-host-worse+guest-result.xml} (100%) rename tests/cputestdata/{x86-host-worse.xml => x86_64-host-worse.xml} (100%) rename tests/cputestdata/{x86-host.xml => x86_64-host.xml} (100%) rename tests/cputestdata/{x86-min.xml => x86_64-min.xml} (100%) rename tests/cputestdata/{x86-penryn-force.xml => x86_64-penryn-force.xml} (100%) rename tests/cputestdata/{x86-pentium3-amd.xml => x86_64-pentium3-amd.xml} (100%) rename tests/cputestdata/{x86-pentium3.xml => x86_64-pentium3.xml} (100%) rename tests/cputestdata/{x86-strict-disable.xml => x86_64-strict-disable.xml} (100%) rename tests/cputestdata/{x86-strict-force-extra.xml => x86_64-strict-force-extra.xml} (100%) rename tests/cputestdata/{x86-strict-full.xml => x86_64-strict-full.xml} (100%) rename tests/cputestdata/{x86-strict.xml => x86_64-strict.xml} (100%) create mode 100644 tests/domaincapsschemadata/qemu_2.9.0-tcg.x86_64.xml create mode 100644 tests/domaincapsschemadata/qemu_2.9.0.x86_64.xml create mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies create mode 100644 tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml -- 2.11.1

1 34

[libvirt] [PATCH] qemu_conf: Check for namespaces availability more wisely
by Michal Privoznik 15 Feb '17

15 Feb '17

The bare fact that mnt namespace is available is not enough for us to allow/enable qemu namespaces feature. There are other requirements: we must copy all the ACL & SELinux labels otherwise we might grant access that is administratively forbidden or vice versa. At the same time, the check for namespace prerequisites is moved from domain startup time to qemu.conf parser as it doesn't make much sense to allow users to start misconfigured libvirt just to find out they can't start a single domain. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_conf.c | 20 ++++++++++++++++---- src/qemu/qemu_conf.h | 3 ++- src/qemu/qemu_domain.c | 43 ++++++++++++++++++++++++++++--------------- src/qemu/qemu_domain.h | 2 ++ src/qemu/qemu_driver.c | 2 +- 5 files changed, 49 insertions(+), 21 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 0223a95d2..ad482d0ee 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -321,12 +321,10 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) if (!(cfg->namespaces = virBitmapNew(QEMU_DOMAIN_NS_LAST))) goto error; -#if defined(__linux__) if (privileged && - virProcessNamespaceAvailable(VIR_PROCESS_NAMESPACE_MNT) == 0 && + qemuDomainNamespaceAvailable(QEMU_DOMAIN_NS_MOUNT) && virBitmapSetBit(cfg->namespaces, QEMU_DOMAIN_NS_MOUNT) < 0) goto error; -#endif /* defined(__linux__) */ #ifdef DEFAULT_LOADER_NVRAM if (virFirmwareParseList(DEFAULT_LOADER_NVRAM, @@ -438,7 +436,8 @@ virQEMUDriverConfigHugeTLBFSInit(virHugeTLBFSPtr hugetlbfs, int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, - const char *filename) + const char *filename, + bool privileged) { virConfPtr conf = NULL; int ret = -1; @@ -832,6 +831,19 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, goto cleanup; } + if (!privileged) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("cannot use namespaces in session mode")); + goto cleanup; + } + + if (qemuDomainNamespaceAvailable(ns) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("%s namespace is not available"), + namespaces[i]); + goto cleanup; + } + if (virBitmapSetBit(cfg->namespaces, ns) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to enable namespace: %s"), diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 91904ed4f..e585f81af 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -294,7 +294,8 @@ void qemuDomainCmdlineDefFree(qemuDomainCmdlineDefPtr def); virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged); int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, - const char *filename); + const char *filename, + bool privileged); virQEMUDriverConfigPtr virQEMUDriverGetConfig(virQEMUDriverPtr driver); bool virQEMUDriverIsPrivileged(virQEMUDriverPtr driver); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 3adec5c14..c3dcea0c4 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -7643,21 +7643,8 @@ qemuDomainCreateNamespace(virQEMUDriverPtr driver, virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); int ret = -1; - if (!virBitmapIsBitSet(cfg->namespaces, QEMU_DOMAIN_NS_MOUNT)) { - ret = 0; - goto cleanup; - } - - if (!virQEMUDriverIsPrivileged(driver)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("cannot use namespaces in session mode")); - goto cleanup; - } - - if (virProcessNamespaceAvailable(VIR_PROCESS_NAMESPACE_MNT) < 0) - goto cleanup; - - if (qemuDomainEnableNamespace(vm, QEMU_DOMAIN_NS_MOUNT) < 0) + if (virBitmapIsBitSet(cfg->namespaces, QEMU_DOMAIN_NS_MOUNT) && + qemuDomainEnableNamespace(vm, QEMU_DOMAIN_NS_MOUNT) < 0) goto cleanup; ret = 0; @@ -7667,6 +7654,32 @@ qemuDomainCreateNamespace(virQEMUDriverPtr driver, } +bool +qemuDomainNamespaceAvailable(qemuDomainNamespace ns) +{ + + switch (ns) { + case QEMU_DOMAIN_NS_MOUNT: +#if !defined(__linux__) + /* Namespaces are Linux specific. */ + return false; +#endif +#if !defined(HAVE_SYS_ACL_H) || !defined(WITH_SELINUX) + /* We can't create the exact copy of paths if either of + * these is not available. */ + return false; +#endif + if (virProcessNamespaceAvailable(VIR_PROCESS_NAMESPACE_MNT) < 0) + return false; + break; + case QEMU_DOMAIN_NS_LAST: + break; + } + + return true; +} + + struct qemuDomainAttachDeviceMknodData { virQEMUDriverPtr driver; virDomainObjPtr vm; diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 5cfa3e114..524a6729c 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -808,6 +808,8 @@ int qemuDomainBuildNamespace(virQEMUDriverPtr driver, int qemuDomainCreateNamespace(virQEMUDriverPtr driver, virDomainObjPtr vm); +bool qemuDomainNamespaceAvailable(qemuDomainNamespace ns); + int qemuDomainNamespaceSetupDisk(virQEMUDriverPtr driver, virDomainObjPtr vm, virStorageSourcePtr src); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 89bc833de..afbcded93 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -676,7 +676,7 @@ qemuStateInitialize(bool privileged, if (virAsprintf(&driverConf, "%s/qemu.conf", cfg->configBaseDir) < 0) goto error; - if (virQEMUDriverConfigLoadFile(cfg, driverConf) < 0) + if (virQEMUDriverConfigLoadFile(cfg, driverConf, privileged) < 0) goto error; VIR_FREE(driverConf); -- 2.11.0

2 3

[libvirt] [v4 0/9] Support cache tune in libvirt
by Eli Qiao 15 Feb '17

15 Feb '17

Addressed comment from v3 -> v4: Daniel & Marcelo: * Added concurrence support Addressed comment from v2 -> v3: Daniel: * Fixed coding style, passed `make check` and `make syntax-check` * Variables renaming and move from header file to c file. * For locking/mutex support, no progress. There are some discussion from mailing list, but I can not find a better way to add locking support without performance impact. I'll explain the process and please help to advice what shoud we do. VM create: 1) Get the cache left value on each bank of the host. This should be shared amount all VMs. 2) Calculate the schemata on the bank based on all created resctrl domain's schemata 3) Calculate the default schemata by scaning all domain's schemata. 4) Flush default schemata to /sys/fs/resctrl/schemata VM destroy: 1) Remove the resctrl domain of that VM 2) Recalculate default schemata 3) Flush default schemata to /sys/fs/resctrl/schemata The key point is that all VMs shares /sys/fs/resctrl/schemata, and when a VM create a resctrl domain, the schemata of that VM depends on the default schemata and all other exsited schematas. So a global mutex is reqired. Before calculate a schemata or update default schemata, libvirt should gain this global mutex. I will try to think more about how to support this gracefully in next patch set. Marcelo: * Added vcpu support for cachetune, this will allow user to define which vcpu using which cache allocation bank. <cachetune id='0' host_id=0 size='3072' unit='KiB' vcpus='0,1'/> vcpus is a cpumap, the vcpu pids will be added to tasks file * Added cdp compatible, user can specify l3 cache even host enable cdp. See patch 8. On a cdp enabled host, specify l3code/l3data by <cachetune id='0' host_id='0' type='l3' size='3072' unit='KiB'/> This will create a schemata like: L3data:0=0xff00;... L3code:0=0xff00;... * Would you please help to test if the functions work. Martin: * Xml test case, I have no time to work on this yet, would you please show me an example, would like to amend it later. This series patches are for supportting CAT featues, which also called cache tune in libvirt. First to expose cache information which could be tuned in capabilites XML. Then add new domain xml element support to add cacahe bank which will apply on this libvirt domain. This series patches add a util file `resctrl.c/h`, an interface to talk with linux kernel's system fs. There are still one TODO left: 1. Expose a new public interface to get free cache information. Some discussion about this feature support can be found from: https://www.redhat.com/archives/libvir-list/2017-January/msg00644.html Eli Qiao (9): Resctrl: Add some utils functions Resctrl: expose cache information to capabilities Resctrl: Add new xml element to support cache tune Resctrl: Add private interface to set cachebanks Qemu: Set cache banks Resctrl: enable l3code/l3data Resctrl: Make sure l3data/l3code are pairs Resctrl: Compatible mode for cdp enabled Resctrl: concurrence support docs/schemas/domaincommon.rng | 46 ++ include/libvirt/virterror.h | 1 + po/POTFILES.in | 1 + src/Makefile.am | 1 + src/conf/capabilities.c | 56 ++ src/conf/capabilities.h | 23 + src/conf/domain_conf.c | 182 +++++++ src/conf/domain_conf.h | 19 + src/libvirt_private.syms | 11 + src/nodeinfo.c | 64 +++ src/nodeinfo.h | 1 + src/qemu/qemu_capabilities.c | 8 + src/qemu/qemu_driver.c | 6 + src/qemu/qemu_process.c | 53 ++ src/util/virerror.c | 1 + src/util/virresctrl.c | 1156 +++++++++++++++++++++++++++++++++++++++++ src/util/virresctrl.h | 88 ++++ 17 files changed, 1717 insertions(+) create mode 100644 src/util/virresctrl.c create mode 100644 src/util/virresctrl.h -- 1.9.1

4 18

[libvirt] [PATCH go v2] domain.go: construct cpumaps correctly for CPU pinning verbs
by Leonid Podolny 15 Feb '17

15 Feb '17

In PinEmulator() and PinIOThread() there is an identical code that converts []bool into a bitmask. It calculates the location in the bitmask and then sets it always to 1, instead of looking at the actual bool value. --- domain.go | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/domain.go b/domain.go index 5482f1a..9ee908b 100644 --- a/domain.go +++ b/domain.go @@ -3967,10 +3967,12 @@ func (d *Domain) PinEmulator(cpumap []bool, flags DomainModificationImpact) erro maplen := (len(cpumap) + 7) / 8 ccpumaps := make([]C.uchar, maplen) for i := 0; i < len(cpumap); i++ { - byte := i / 8 - bit := i % 8 + if cpumap[i] { + byte := i / 8 + bit := i % 8 - ccpumaps[byte] |= (1 << uint(bit)) + ccpumaps[byte] |= (1 << uint(bit)) + } } ret := C.virDomainPinEmulator(d.ptr, &ccpumaps[0], C.int(maplen), C.uint(flags)) @@ -3989,10 +3991,12 @@ func (d *Domain) PinIOThread(iothreadid uint, cpumap []bool, flags DomainModific maplen := (len(cpumap) + 7) / 8 ccpumaps := make([]C.uchar, maplen) for i := 0; i < len(cpumap); i++ { - byte := i / 8 - bit := i % 8 + if cpumap[i] { + byte := i / 8 + bit := i % 8 - ccpumaps[byte] |= (1 << uint(bit)) + ccpumaps[byte] |= (1 << uint(bit)) + } } ret := C.virDomainPinIOThreadCompat(d.ptr, C.uint(iothreadid), &ccpumaps[0], C.int(maplen), C.uint(flags)) -- 2.11.0

2 1

[libvirt] [PATCH v2 0/3] libxl: tunnelled migration support
by Joao Martins 15 Feb '17

15 Feb '17

Hey! Presented herewith is take 2 from tunnelled migration addressing all previous comments. Changelog in individual patches (patch 1 and 2 are small refactorings suggested in v1) Despite being functional changes mostly I had a quick round of testing too. Thanks, Joao Bob Liu (1): libxl: add tunnelled migration support Joao Martins (2): libxl: refactor libxlDomainMigrationPrepare libxl: streamline top-level migrate functions src/libxl/libxl_driver.c | 79 ++++++++-- src/libxl/libxl_migration.c | 372 +++++++++++++++++++++++++++++++++++++------- src/libxl/libxl_migration.h | 9 ++ 3 files changed, 393 insertions(+), 67 deletions(-) -- 2.1.4

2 9

[libvirt] [PATCH go] domain.go: construct cpumaps correctly for CPU pinning verbs
by Leonid Podolny 14 Feb '17

14 Feb '17

In PinVcpu(), PinVcpuFlags(), PinEmulator() and PinIOThread() there is an almost identical code that converts []bool into a bitmask. It calculates the location in the bitmask and then sets it always to 1, instead of looking at the actual bool value. --- domain.go | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/domain.go b/domain.go index 5482f1a..9a24bc5 100644 --- a/domain.go +++ b/domain.go @@ -1750,7 +1750,9 @@ func (d *Domain) PinVcpu(vcpu uint, cpuMap []bool) error { if cpuMap[i] { byte := i / 8 bit := i % 8 - ccpumap[byte] |= (1 << uint(bit)) + if cpuMap[i] { + ccpumap[byte] |= (1 << uint(bit)) + } } } @@ -1770,7 +1772,9 @@ func (d *Domain) PinVcpuFlags(vcpu uint, cpuMap []bool, flags DomainModification if cpuMap[i] { byte := (i + 7) / 8 bit := i % 8 - ccpumap[byte] |= (1 << uint(bit)) + if cpuMap[i] { + ccpumap[byte] |= (1 << uint(bit)) + } } } @@ -3970,7 +3974,9 @@ func (d *Domain) PinEmulator(cpumap []bool, flags DomainModificationImpact) erro byte := i / 8 bit := i % 8 - ccpumaps[byte] |= (1 << uint(bit)) + if cpumap[i] { + ccpumaps[byte] |= (1 << uint(bit)) + } } ret := C.virDomainPinEmulator(d.ptr, &ccpumaps[0], C.int(maplen), C.uint(flags)) @@ -3992,7 +3998,9 @@ func (d *Domain) PinIOThread(iothreadid uint, cpumap []bool, flags DomainModific byte := i / 8 bit := i % 8 - ccpumaps[byte] |= (1 << uint(bit)) + if cpumap[i] { + ccpumaps[byte] |= (1 << uint(bit)) + } } ret := C.virDomainPinIOThreadCompat(d.ptr, C.uint(iothreadid), &ccpumaps[0], C.int(maplen), C.uint(flags)) -- 2.11.0

1 1

[libvirt] [PATCH 0/4] Fix private /dev file access issues
by Andrea Bolognani 14 Feb '17

14 Feb '17

Several heads were banged against several walls while trying to figure this out. No animals were harmed in the writing of this series, though. Andrea Bolognani (4): configure: Move ACL checks to a separate file configure: Make ACL mandatory when building the QEMU driver spec: Require libacl and its headers qemu: Call chmod() after mknod() configure.ac | 12 +++--------- libvirt.spec.in | 4 ++++ m4/virt-acl.m4 | 39 +++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_domain.c | 10 ++++++++++ 4 files changed, 56 insertions(+), 9 deletions(-) create mode 100644 m4/virt-acl.m4 -- 2.7.4

3 16

[libvirt] [v5 0/9] Support cache tune in libvirt
by Eli Qiao 14 Feb '17

14 Feb '17

Addressed comment from v4 -> v5: Marcelo: * Several typos * Use flock instead of virFileLock Addressed comment from v3 -> v4: Daniel & Marcelo: * Added concurrence support Addressed comment from v2 -> v3: Daniel: * Fixed coding style, passed `make check` and `make syntax-check` * Variables renaming and move from header file to c file. * For locking/mutex support, no progress. There are some discussion from mailing list, but I can not find a better way to add locking support without performance impact. I'll explain the process and please help to advice what shoud we do. VM create: 1) Get the cache left value on each bank of the host. This should be shared amount all VMs. 2) Calculate the schemata on the bank based on all created resctrl domain's schemata 3) Calculate the default schemata by scaning all domain's schemata. 4) Flush default schemata to /sys/fs/resctrl/schemata VM destroy: 1) Remove the resctrl domain of that VM 2) Recalculate default schemata 3) Flush default schemata to /sys/fs/resctrl/schemata The key point is that all VMs shares /sys/fs/resctrl/schemata, and when a VM create a resctrl domain, the schemata of that VM depends on the default schemata and all other exsited schematas. So a global mutex is reqired. Before calculate a schemata or update default schemata, libvirt should gain this global mutex. I will try to think more about how to support this gracefully in next patch set. Marcelo: * Added vcpu support for cachetune, this will allow user to define which vcpu using which cache allocation bank. <cachetune id='0' host_id=0 size='3072' unit='KiB' vcpus='0,1'/> vcpus is a cpumap, the vcpu pids will be added to tasks file * Added cdp compatible, user can specify l3 cache even host enable cdp. See patch 8. On a cdp enabled host, specify l3code/l3data by <cachetune id='0' host_id='0' type='l3' size='3072' unit='KiB'/> This will create a schemata like: L3data:0=0xff00;... L3code:0=0xff00;... * Would you please help to test if the functions work. Martin: * Xml test case, I have no time to work on this yet, would you please show me an example, would like to amend it later. This series patches are for supportting CAT featues, which also called cache tune in libvirt. First to expose cache information which could be tuned in capabilites XML. Then add new domain xml element support to add cacahe bank which will apply on this libvirt domain. This series patches add a util file `resctrl.c/h`, an interface to talk with linux kernel's system fs. There are still one TODO left: 1. Expose a new public interface to get free cache information. 2. Expose a new public interface to set cachetune lively. Some discussion about this feature support can be found from: https://www.redhat.com/archives/libvir-list/2017-January/msg00644.html Eli Qiao (9): Resctrl: Add some utils functions Resctrl: expose cache information to capabilities Resctrl: Add new xml element to support cache tune Resctrl: Add private interface to set cachebanks Qemu: Set cache banks Resctrl: enable l3code/l3data Resctrl: Make sure l3data/l3code are pairs Resctrl: Compatible mode for cdp enabled Resctrl: concurrence support docs/schemas/domaincommon.rng | 46 ++ include/libvirt/virterror.h | 1 + po/POTFILES.in | 1 + src/Makefile.am | 1 + src/conf/capabilities.c | 56 ++ src/conf/capabilities.h | 23 + src/conf/domain_conf.c | 182 +++++++ src/conf/domain_conf.h | 19 + src/libvirt_private.syms | 11 + src/nodeinfo.c | 64 +++ src/nodeinfo.h | 1 + src/qemu/qemu_capabilities.c | 8 + src/qemu/qemu_driver.c | 6 + src/qemu/qemu_process.c | 53 ++ src/util/virerror.c | 1 + src/util/virresctrl.c | 1157 +++++++++++++++++++++++++++++++++++++++++ src/util/virresctrl.h | 88 ++++ 17 files changed, 1718 insertions(+) create mode 100644 src/util/virresctrl.c create mode 100644 src/util/virresctrl.h -- 1.9.1

2 10

[libvirt] [PATCH] Ensure disk names follow the disk name regex
by Nitesh Konkar 14 Feb '17

14 Feb '17

Currently disk names do not follow the (regex) /^[fhv]d[a-z]+[0-9]*$/ completely and hence one can assign disk names like vd2 etc. This patch ensures that the disk names follow the regex mentioned. Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- src/util/virutil.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virutil.c b/src/util/virutil.c index 91178d1..2796671 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -563,7 +563,7 @@ int virDiskNameParse(const char *name, int *disk, int *partition) } } - if (!ptr) + if (!ptr || !c_islower(*ptr)) return -1; for (i = 0; *ptr; i++) { -- 2.1.0

2 3

[libvirt] [PATCHv2] util: fix off-by-one when expanding a bitmap
by Ján Tomko 14 Feb '17

14 Feb '17

To make sure bit 'b' fits into the bitmap, we need to allocate b+1 bits, since we number from 0. Adjust the bitmap test to set a bit at a multiple of 16. That way the test fails without this fix, because the VIR_REALLOC call clears the newly added memory even if the original pointer has not changed. --- src/util/virbitmap.c | 2 +- tests/virbitmaptest.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) v2: use a multiple of 16 instead of just 8 to actually reproduce the failure in the test. diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c index 0c04f1a..1b47d74 100644 --- a/src/util/virbitmap.c +++ b/src/util/virbitmap.c @@ -187,7 +187,7 @@ int virBitmapSetBit(virBitmapPtr bitmap, size_t b) */ static int virBitmapExpand(virBitmapPtr map, size_t b) { - size_t new_len = VIR_DIV_UP(b, VIR_BITMAP_BITS_PER_UNIT); + size_t new_len = VIR_DIV_UP(b + 1, VIR_BITMAP_BITS_PER_UNIT); /* resize the memory if necessary */ if (map->map_len < new_len) { diff --git a/tests/virbitmaptest.c b/tests/virbitmaptest.c index a17ef82..3ee07ff 100644 --- a/tests/virbitmaptest.c +++ b/tests/virbitmaptest.c @@ -639,15 +639,15 @@ test12(const void *opaque ATTRIBUTE_UNUSED) TEST_MAP(0, ""); - if (virBitmapSetBitExpand(map, 100) < 0) + if (virBitmapSetBitExpand(map, 128) < 0) goto cleanup; - TEST_MAP(101, "100"); + TEST_MAP(129, "128"); if (virBitmapClearBitExpand(map, 150) < 0) goto cleanup; - TEST_MAP(151, "100"); + TEST_MAP(151, "128"); virBitmapFree(map); if (virBitmapParseUnlimited("34,1023", &map) < 0) -- 2.10.2

2 1

[libvirt] [PATCH] qemu_monitor_json: Properly check GetArray return value
by Jiri Denemark 14 Feb '17

14 Feb '17

Commit 2a8d40f4ec refactored qemuMonitorJSONGetCPUx86Data and replaced virJSONValueObjectGet(reply, "return") with virJSONValueObjectGetArray. While the former is guaranteed to always return non-NULL pointer the latter may return NULL if the returned JSON object is not an array. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_monitor_json.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index e30b72cd4..1d281af48 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -6554,7 +6554,7 @@ qemuMonitorJSONParseCPUx86Features(virJSONValuePtr data, ssize_t n; int ret = -1; - if ((n = virJSONValueArraySize(data)) < 0) { + if (!data || (n = virJSONValueArraySize(data)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("invalid array of CPUID features")); return -1; @@ -6644,9 +6644,8 @@ qemuMonitorJSONCheckCPUx86(qemuMonitorPtr mon) if (qemuMonitorJSONCheckError(cmd, reply)) goto cleanup; - data = virJSONValueObjectGetArray(reply, "return"); - - if ((n = virJSONValueArraySize(data)) < 0) { + if (!(data = virJSONValueObjectGetArray(reply, "return")) || + (n = virJSONValueArraySize(data)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("qom-list reply data was not an array")); goto cleanup; -- 2.11.1

2 1

[libvirt] [PATCH] qemu: Filter ARAT CPU feature from host-model
by Jiri Denemark 14 Feb '17

14 Feb '17

ARAT feature was first introduced in QEMU 2.4.0, which means host-model CPU mode is unusable with QEMU < 2.4.0 on any host CPU which supports ARAT. Let's not include this feature in host-model CPUs unless a user explicitly asks for it. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- Notes: We will do this properly in the future since we will ask QEMU what CPU features it understands and what it thinks about host CPU. However, the required QMP interface is not upstream yet. src/qemu/qemu_capabilities.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index cfd090c3f..2da4c76ab 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2959,7 +2959,8 @@ virQEMUCapsCPUFilterFeatures(const char *name, { if (STREQ(name, "cmt") || STREQ(name, "mbm_total") || - STREQ(name, "mbm_local")) + STREQ(name, "mbm_local") || + STREQ(name, "arat")) return false; return true; -- 2.11.0.rc2

2 1

[libvirt] [PATCHv2] qemu: Emit domain events for all virtio-serial channels
by Matt Broadstone 14 Feb '17

14 Feb '17

Presently domain events are emitted for the "agent lifecycle" which is a specialization on virtio-serial events specific to the channel named "org.qemu.guest_agent.0". This patch adds a generic event for "channel lifecycles", which emit state change events for all attached channels. --- daemon/remote.c | 42 +++++++++++++++++ examples/object-events/event-test.c | 57 ++++++++++++++++++++++++ include/libvirt/libvirt-domain.h | 44 ++++++++++++++++++ src/conf/domain_event.c | 89 +++++++++++++++++++++++++++++++++++++ src/conf/domain_event.h | 12 +++++ src/libvirt_private.syms | 2 + src/qemu/qemu_driver.c | 5 +++ src/qemu/qemu_process.c | 6 +++ src/remote/remote_driver.c | 32 +++++++++++++ src/remote/remote_protocol.x | 17 ++++++- src/remote_protocol-structs | 7 +++ tools/virsh-domain.c | 35 +++++++++++++++ 12 files changed, 347 insertions(+), 1 deletion(-) diff --git a/daemon/remote.c b/daemon/remote.c index e414f92..25b32f2 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -1086,6 +1086,47 @@ remoteRelayDomainEventAgentLifecycle(virConnectPtr conn, static int +remoteRelayDomainEventChannelLifecycle(virConnectPtr conn, + virDomainPtr dom, + const char *channelName, + int state, + int reason, + void *opaque) +{ + daemonClientEventCallbackPtr callback = opaque; + remote_domain_event_callback_channel_lifecycle_msg data; + + if (callback->callbackID < 0 || + !remoteRelayDomainEventCheckACL(callback->client, conn, dom)) + return -1; + + VIR_DEBUG("Relaying domain channel lifecycle event %s %d, callback %d, " + " name: %s, state %d, reason %d", + dom->name, dom->id, callback->callbackID, channelName, state, reason); + + /* build return data */ + memset(&data, 0, sizeof(data)); + data.callbackID = callback->callbackID; + make_nonnull_domain(&data.dom, dom); + + if (VIR_STRDUP(data.channelName, channelName) < 0) + goto error; + data.state = state; + data.reason = reason; + + remoteDispatchObjectEventSend(callback->client, remoteProgram, + REMOTE_PROC_DOMAIN_EVENT_CALLBACK_CHANNEL_LIFECYCLE, + (xdrproc_t)xdr_remote_domain_event_callback_channel_lifecycle_msg, + &data); + + return 0; + error: + VIR_FREE(data.channelName); + return -1; +} + + +static int remoteRelayDomainEventDeviceAdded(virConnectPtr conn, virDomainPtr dom, const char *devAlias, @@ -1248,6 +1289,7 @@ static virConnectDomainEventGenericCallback domainEventCallbacks[] = { VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventMigrationIteration), VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventJobCompleted), VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventDeviceRemovalFailed), + VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventChannelLifecycle) }; verify(ARRAY_CARDINALITY(domainEventCallbacks) == VIR_DOMAIN_EVENT_ID_LAST); diff --git a/examples/object-events/event-test.c b/examples/object-events/event-test.c index 730cb8b..da023eb 100644 --- a/examples/object-events/event-test.c +++ b/examples/object-events/event-test.c @@ -337,6 +337,46 @@ guestAgentLifecycleEventReasonToString(int event) return "unknown"; } + +static const char * +guestChannelLifecycleEventStateToString(int event) +{ + switch ((virConnectDomainEventChannelLifecycleState) event) { + case VIR_CONNECT_DOMAIN_EVENT_CHANNEL_LIFECYCLE_STATE_DISCONNECTED: + return "Disconnected"; + + case VIR_CONNECT_DOMAIN_EVENT_CHANNEL_LIFECYCLE_STATE_CONNECTED: + return "Connected"; + + case VIR_CONNECT_DOMAIN_EVENT_CHANNEL_LIFECYCLE_STATE_LAST: + break; + } + + return "unknown"; +} + + +static const char * +guestChannelLifecycleEventReasonToString(int event) +{ + switch ((virConnectDomainEventChannelLifecycleReason) event) { + case VIR_CONNECT_DOMAIN_EVENT_CHANNEL_LIFECYCLE_REASON_UNKNOWN: + return "Unknown"; + + case VIR_CONNECT_DOMAIN_EVENT_CHANNEL_LIFECYCLE_REASON_DOMAIN_STARTED: + return "Domain started"; + + case VIR_CONNECT_DOMAIN_EVENT_CHANNEL_LIFECYCLE_REASON_CHANNEL: + return "Channel event"; + + case VIR_CONNECT_DOMAIN_EVENT_CHANNEL_LIFECYCLE_REASON_LAST: + break; + } + + return "unknown"; +} + + static const char * storagePoolEventToString(int event) { @@ -797,6 +837,22 @@ myDomainEventAgentLifecycleCallback(virConnectPtr conn ATTRIBUTE_UNUSED, return 0; } +static int +myDomainEventChannelLifecycleCallback(virConnectPtr conn ATTRIBUTE_UNUSED, + virDomainPtr dom, + const char *channelName, + int state, + int reason, + void *opaque ATTRIBUTE_UNUSED) +{ + printf("%s EVENT: Domain %s(%d) guest channel(%s) state changed: %s reason: %s\n", + __func__, virDomainGetName(dom), virDomainGetID(dom), channelName, + guestChannelLifecycleEventStateToString(state), + guestChannelLifecycleEventReasonToString(reason)); + + return 0; +} + static int myDomainEventDeviceAddedCallback(virConnectPtr conn ATTRIBUTE_UNUSED, @@ -971,6 +1027,7 @@ struct domainEventData domainEvents[] = { DOMAIN_EVENT(VIR_DOMAIN_EVENT_ID_MIGRATION_ITERATION, myDomainEventMigrationIterationCallback), DOMAIN_EVENT(VIR_DOMAIN_EVENT_ID_JOB_COMPLETED, myDomainEventJobCompletedCallback), DOMAIN_EVENT(VIR_DOMAIN_EVENT_ID_DEVICE_REMOVAL_FAILED, myDomainEventDeviceRemovalFailedCallback), + DOMAIN_EVENT(VIR_DOMAIN_EVENT_ID_CHANNEL_LIFECYCLE, myDomainEventChannelLifecycleCallback) }; struct storagePoolEventData { diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 5f50660..9a5c664 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -3965,6 +3965,49 @@ typedef void (*virConnectDomainEventAgentLifecycleCallback)(virConnectPtr conn, int reason, void *opaque); +typedef enum { + VIR_CONNECT_DOMAIN_EVENT_CHANNEL_LIFECYCLE_STATE_CONNECTED = 1, /* channel connected */ + VIR_CONNECT_DOMAIN_EVENT_CHANNEL_LIFECYCLE_STATE_DISCONNECTED = 2, /* channel disconnected */ + +# ifdef VIR_ENUM_SENTINELS + VIR_CONNECT_DOMAIN_EVENT_CHANNEL_LIFECYCLE_STATE_LAST +# endif +} virConnectDomainEventChannelLifecycleState; + +typedef enum { + VIR_CONNECT_DOMAIN_EVENT_CHANNEL_LIFECYCLE_REASON_UNKNOWN = 0, /* unknown state change reason */ + VIR_CONNECT_DOMAIN_EVENT_CHANNEL_LIFECYCLE_REASON_DOMAIN_STARTED = + VIR_CONNECT_DOMAIN_EVENT_AGENT_LIFECYCLE_REASON_DOMAIN_STARTED, /* state changed due to domain start */ + VIR_CONNECT_DOMAIN_EVENT_CHANNEL_LIFECYCLE_REASON_CHANNEL = + VIR_CONNECT_DOMAIN_EVENT_AGENT_LIFECYCLE_REASON_CHANNEL, /* channel state changed */ + +# ifdef VIR_ENUM_SENTINELS + VIR_CONNECT_DOMAIN_EVENT_CHANNEL_LIFECYCLE_REASON_LAST +# endif +} virConnectDomainEventChannelLifecycleReason; + +/** + * virConnectDomainEventChannelLifecycleCallback: + * @conn: connection object + * @dom: domain on which the event occurred + * @channelName: the name of the channel on which the event occurred + * @state: new state of the guest channel, one of virConnectDomainEventChannelLifecycleState + * @reason: reason for state change; one of virConnectDomainEventChannelLifecycleReason + * @opaque: application specified data + * + * This callback occurs when libvirt detects a change in the state of a guest + * serial channel. The hypervisor must support serial notification, and this is + * currently limited to modern versions of qemu. + * + * The callback signature to use when registering for an event of type + * VIR_DOMAIN_EVENT_ID_CHANNEL_LIFECYCLE with virConnectDomainEventRegisterAny() + */ +typedef void (*virConnectDomainEventChannelLifecycleCallback)(virConnectPtr conn, + virDomainPtr dom, + const char *channelName, + int state, + int reason, + void *opaque); /** * VIR_DOMAIN_EVENT_CALLBACK: @@ -4006,6 +4049,7 @@ typedef enum { VIR_DOMAIN_EVENT_ID_MIGRATION_ITERATION = 20, /* virConnectDomainEventMigrationIterationCallback */ VIR_DOMAIN_EVENT_ID_JOB_COMPLETED = 21, /* virConnectDomainEventJobCompletedCallback */ VIR_DOMAIN_EVENT_ID_DEVICE_REMOVAL_FAILED = 22, /* virConnectDomainEventDeviceRemovalFailedCallback */ + VIR_DOMAIN_EVENT_ID_CHANNEL_LIFECYCLE = 23, /* virConnectDomainEventChannelLifecycleCallback */ # ifdef VIR_ENUM_SENTINELS VIR_DOMAIN_EVENT_ID_LAST diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index 63ae9e1..f971a0d 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -55,6 +55,7 @@ static virClassPtr virDomainEventPMClass; static virClassPtr virDomainQemuMonitorEventClass; static virClassPtr virDomainEventTunableClass; static virClassPtr virDomainEventAgentLifecycleClass; +static virClassPtr virDomainEventChannelLifecycleClass; static virClassPtr virDomainEventDeviceAddedClass; static virClassPtr virDomainEventMigrationIterationClass; static virClassPtr virDomainEventJobCompletedClass; @@ -75,6 +76,7 @@ static void virDomainEventPMDispose(void *obj); static void virDomainQemuMonitorEventDispose(void *obj); static void virDomainEventTunableDispose(void *obj); static void virDomainEventAgentLifecycleDispose(void *obj); +static void virDomainEventChannelLifecycleDispose(void *obj); static void virDomainEventDeviceAddedDispose(void *obj); static void virDomainEventMigrationIterationDispose(void *obj); static void virDomainEventJobCompletedDispose(void *obj); @@ -241,6 +243,16 @@ struct _virDomainEventAgentLifecycle { typedef struct _virDomainEventAgentLifecycle virDomainEventAgentLifecycle; typedef virDomainEventAgentLifecycle *virDomainEventAgentLifecyclePtr; +struct _virDomainEventChannelLifecycle { + virDomainEvent parent; + + char *channelName; + int state; + int reason; +}; +typedef struct _virDomainEventChannelLifecycle virDomainEventChannelLifecycle; +typedef virDomainEventChannelLifecycle *virDomainEventChannelLifecyclePtr; + struct _virDomainEventMigrationIteration { virDomainEvent parent; @@ -367,6 +379,12 @@ virDomainEventsOnceInit(void) sizeof(virDomainEventAgentLifecycle), virDomainEventAgentLifecycleDispose))) return -1; + if (!(virDomainEventChannelLifecycleClass = + virClassNew(virDomainEventClass, + "virDomainEventChannelLifecycle", + sizeof(virDomainEventChannelLifecycle), + virDomainEventChannelLifecycleDispose))) + return -1; if (!(virDomainEventMigrationIterationClass = virClassNew(virDomainEventClass, "virDomainEventMigrationIteration", @@ -557,6 +575,15 @@ virDomainEventAgentLifecycleDispose(void *obj) }; static void +virDomainEventChannelLifecycleDispose(void *obj) +{ + virDomainEventChannelLifecyclePtr event = obj; + VIR_DEBUG("obj=%p", event); + + VIR_FREE(event->channelName); +}; + +static void virDomainEventMigrationIterationDispose(void *obj) { virDomainEventMigrationIterationPtr event = obj; @@ -1460,6 +1487,56 @@ virDomainEventAgentLifecycleNewFromDom(virDomainPtr dom, } static virObjectEventPtr +virDomainEventChannelLifecycleNew(int id, + const char *name, + const unsigned char *uuid, + const char *channelName, + int state, + int reason) +{ + virDomainEventChannelLifecyclePtr ev; + + if (virDomainEventsInitialize() < 0) + return NULL; + + if (!(ev = virDomainEventNew(virDomainEventChannelLifecycleClass, + VIR_DOMAIN_EVENT_ID_CHANNEL_LIFECYCLE, + id, name, uuid))) + return NULL; + + if (VIR_STRDUP(ev->channelName, channelName) < 0) { + virObjectUnref(ev); + return NULL; + } + + ev->state = state; + ev->reason = reason; + + return (virObjectEventPtr)ev; +} + +virObjectEventPtr +virDomainEventChannelLifecycleNewFromObj(virDomainObjPtr obj, + const char *channelName, + int state, + int reason) +{ + return virDomainEventChannelLifecycleNew(obj->def->id, obj->def->name, + obj->def->uuid, channelName, state, reason); +} + +virObjectEventPtr +virDomainEventChannelLifecycleNewFromDom(virDomainPtr dom, + const char *channelName, + int state, + int reason) +{ + return virDomainEventChannelLifecycleNew(dom->id, dom->name, dom->uuid, + channelName, state, reason); +} + + +static virObjectEventPtr virDomainEventMigrationIterationNew(int id, const char *name, const unsigned char *uuid, @@ -1812,6 +1889,18 @@ virDomainEventDispatchDefaultFunc(virConnectPtr conn, goto cleanup; } + case VIR_DOMAIN_EVENT_ID_CHANNEL_LIFECYCLE: + { + virDomainEventChannelLifecyclePtr channelLifecycleEvent; + channelLifecycleEvent = (virDomainEventChannelLifecyclePtr)event; + ((virConnectDomainEventChannelLifecycleCallback)cb)(conn, dom, + channelLifecycleEvent->channelName, + channelLifecycleEvent->state, + channelLifecycleEvent->reason, + cbopaque); + goto cleanup; + } + case VIR_DOMAIN_EVENT_ID_DEVICE_ADDED: { virDomainEventDeviceAddedPtr deviceAddedEvent; diff --git a/src/conf/domain_event.h b/src/conf/domain_event.h index 54fa879..3a689b3 100644 --- a/src/conf/domain_event.h +++ b/src/conf/domain_event.h @@ -217,6 +217,18 @@ virDomainEventAgentLifecycleNewFromDom(virDomainPtr dom, int reason); virObjectEventPtr +virDomainEventChannelLifecycleNewFromObj(virDomainObjPtr obj, + const char *channelName, + int state, + int reason); + +virObjectEventPtr +virDomainEventChannelLifecycleNewFromDom(virDomainPtr dom, + const char *channelName, + int state, + int reason); + +virObjectEventPtr virDomainEventMigrationIterationNewFromObj(virDomainObjPtr obj, int iteration); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 74dd527..e259687 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -535,6 +535,8 @@ virDomainEventBlockJob2NewFromDom; virDomainEventBlockJob2NewFromObj; virDomainEventBlockJobNewFromDom; virDomainEventBlockJobNewFromObj; +virDomainEventChannelLifecycleNewFromDom; +virDomainEventChannelLifecycleNewFromObj; virDomainEventControlErrorNewFromDom; virDomainEventControlErrorNewFromObj; virDomainEventDeviceAddedNewFromDom; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 38c8414..b464412 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4407,6 +4407,7 @@ processSerialChangedEvent(virQEMUDriverPtr driver, virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); virDomainChrDeviceState newstate; virObjectEventPtr event = NULL; + virObjectEventPtr channelEvent = NULL; virDomainDeviceDef dev; qemuDomainObjPrivatePtr priv = vm->privateData; int rc; @@ -4482,6 +4483,10 @@ processSerialChangedEvent(virQEMUDriverPtr driver, qemuDomainEventQueue(driver, event); } + channelEvent = virDomainEventChannelLifecycleNewFromObj(vm, dev.data.chr->target.name, newstate, + VIR_CONNECT_DOMAIN_EVENT_CHANNEL_LIFECYCLE_REASON_CHANNEL); + qemuDomainEventQueue(driver, channelEvent); + endjob: qemuDomainObjEndJob(driver, vm); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 1b67aee..31b5028 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1931,6 +1931,7 @@ qemuProcessRefreshChannelVirtioState(virQEMUDriverPtr driver, int agentReason = VIR_CONNECT_DOMAIN_EVENT_AGENT_LIFECYCLE_REASON_CHANNEL; qemuMonitorChardevInfoPtr entry; virObjectEventPtr event = NULL; + virObjectEventPtr channelEvent = NULL; char id[32]; if (booted) @@ -1958,6 +1959,11 @@ qemuProcessRefreshChannelVirtioState(virQEMUDriverPtr driver, agentReason))) qemuDomainEventQueue(driver, event); + + channelEvent = + virDomainEventChannelLifecycleNewFromObj(vm, chr->target.name, entry->state, agentReason); + qemuDomainEventQueue(driver, channelEvent); + chr->state = entry->state; } } diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index a3cd7cd..eb783cb 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -345,6 +345,11 @@ remoteDomainBuildEventCallbackAgentLifecycle(virNetClientProgramPtr prog, void *evdata, void *opaque); static void +remoteDomainBuildEventCallbackChannelLifecycle(virNetClientProgramPtr prog, + virNetClientPtr client, + void *evdata, void *opaque); + +static void remoteDomainBuildEventCallbackMigrationIteration(virNetClientProgramPtr prog, virNetClientPtr client, void *evdata, void *opaque); @@ -574,6 +579,10 @@ static virNetClientProgramEvent remoteEvents[] = { remoteNodeDeviceBuildEventUpdate, sizeof(remote_node_device_event_update_msg), (xdrproc_t)xdr_remote_node_device_event_update_msg }, + { REMOTE_PROC_DOMAIN_EVENT_CALLBACK_CHANNEL_LIFECYCLE, + remoteDomainBuildEventCallbackChannelLifecycle, + sizeof(remote_domain_event_callback_channel_lifecycle_msg), + (xdrproc_t)xdr_remote_domain_event_callback_channel_lifecycle_msg }, }; static void @@ -5152,6 +5161,29 @@ remoteDomainBuildEventCallbackAgentLifecycle(virNetClientProgramPtr prog ATTRIBU static void +remoteDomainBuildEventCallbackChannelLifecycle(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, + virNetClientPtr client ATTRIBUTE_UNUSED, + void *evdata, void *opaque) +{ + virConnectPtr conn = opaque; + remote_domain_event_callback_channel_lifecycle_msg *msg = evdata; + struct private_data *priv = conn->privateData; + virDomainPtr dom; + virObjectEventPtr event = NULL; + + if (!(dom = get_nonnull_domain(conn, msg->dom))) + return; + + event = virDomainEventChannelLifecycleNewFromDom(dom, msg->channelName, msg->state, + msg->reason); + + virObjectUnref(dom); + + remoteEventQueue(priv, event, msg->callbackID); +} + + +static void remoteDomainBuildEventCallbackMigrationIteration(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, virNetClientPtr client ATTRIBUTE_UNUSED, void *evdata, diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index e8382dc..e5227c4 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -3242,6 +3242,15 @@ struct remote_domain_event_callback_agent_lifecycle_msg { int reason; }; +struct remote_domain_event_callback_channel_lifecycle_msg { + int callbackID; + remote_nonnull_domain dom; + + char *channelName; + int state; + int reason; +}; + struct remote_connect_get_all_domain_stats_ret { remote_domain_stats_record retStats<REMOTE_DOMAIN_LIST_MAX>; }; @@ -5934,5 +5943,11 @@ enum remote_procedure { * @generate: both * @acl: none */ - REMOTE_PROC_NODE_DEVICE_EVENT_UPDATE = 377 + REMOTE_PROC_NODE_DEVICE_EVENT_UPDATE = 377, + + /** + * @generate: both + * @acl: none + */ + REMOTE_PROC_DOMAIN_EVENT_CALLBACK_CHANNEL_LIFECYCLE = 378 }; diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index b71accc..7921016 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -2689,6 +2689,13 @@ struct remote_domain_event_callback_agent_lifecycle_msg { int state; int reason; }; +struct remote_domain_event_callback_channel_lifecycle_msg { + int callbackID; + remote_nonnull_domain dom; + remote_string channelName; + int state; + int reason; +}; struct remote_connect_get_all_domain_stats_ret { struct { u_int retStats_len; diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 184f64d..e085358 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -12637,6 +12637,20 @@ VIR_ENUM_IMPL(virshEventAgentLifecycleReason, N_("domain started"), N_("channel event")) +VIR_ENUM_DECL(virshEventChannelLifecycleState) +VIR_ENUM_IMPL(virshEventChannelLifecycleState, + VIR_CONNECT_DOMAIN_EVENT_CHANNEL_LIFECYCLE_STATE_LAST, + N_("unknown"), + N_("connected"), + N_("disconnected")) + +VIR_ENUM_DECL(virshEventChannelLifecycleReason) +VIR_ENUM_IMPL(virshEventChannelLifecycleReason, + VIR_CONNECT_DOMAIN_EVENT_CHANNEL_LIFECYCLE_REASON_LAST, + N_("unknown"), + N_("domain started"), + N_("channel event")) + #define UNKNOWNSTR(str) (str ? str : N_("unsupported value")) static void virshEventAgentLifecyclePrint(virConnectPtr conn ATTRIBUTE_UNUSED, @@ -12656,6 +12670,25 @@ virshEventAgentLifecyclePrint(virConnectPtr conn ATTRIBUTE_UNUSED, } static void +virshEventChannelLifecyclePrint(virConnectPtr conn ATTRIBUTE_UNUSED, + virDomainPtr dom, + const char *channelName, + int state, + int reason, + void *opaque) +{ + virBuffer buf = VIR_BUFFER_INITIALIZER; + + virBufferAsprintf(&buf, _("event 'channel-lifecycle' for domain %s: name: '%s', " + "state: '%s' reason: '%s'\n"), + virDomainGetName(dom), + channelName, + UNKNOWNSTR(virshEventChannelLifecycleStateTypeToString(state)), + UNKNOWNSTR(virshEventChannelLifecycleReasonTypeToString(reason))); + virshEventPrint(opaque, &buf); +} + +static void virshEventMigrationIterationPrint(virConnectPtr conn ATTRIBUTE_UNUSED, virDomainPtr dom, int iteration, @@ -12755,6 +12788,8 @@ static vshEventCallback vshEventCallbacks[] = { VIR_DOMAIN_EVENT_CALLBACK(virshEventJobCompletedPrint), }, { "device-removal-failed", VIR_DOMAIN_EVENT_CALLBACK(virshEventDeviceRemovalFailedPrint), }, + { "channel-lifecycle", + VIR_DOMAIN_EVENT_CALLBACK(virshEventChannelLifecyclePrint), }, }; verify(VIR_DOMAIN_EVENT_ID_LAST == ARRAY_CARDINALITY(vshEventCallbacks)); -- 2.7.4 (Apple Git-66)

2 1

[libvirt] [PATCH] qemu: Set umask before calling mknod()
by Andrea Bolognani 14 Feb '17

14 Feb '17

When we populate the private /dev that's going to be used by an isolated QEMU process, we take care all metadata matches what's in the top-level namespace: in particular, we copy the file permissions directly. However, since the permissions passed to mknod() are still affected by the active umask, we need to set it to a very permissive value before creating device nodes to avoid file access issues. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1421036 --- src/qemu/qemu_domain.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index f62bf8f..7993acc 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -7040,6 +7040,7 @@ qemuDomainCreateDeviceRecursive(const char *device, #ifdef WITH_SELINUX char *tcon = NULL; #endif + mode_t oldUmask = umask((mode_t) 0); if (!ttl) { virReportSystemError(ELOOP, @@ -7205,6 +7206,7 @@ qemuDomainCreateDeviceRecursive(const char *device, #ifdef WITH_SELINUX freecon(tcon); #endif + umask(oldUmask); return ret; } @@ -7678,6 +7680,7 @@ qemuDomainAttachDeviceMknodHelper(pid_t pid ATTRIBUTE_UNUSED, int ret = -1; bool delDevice = false; bool isLink = S_ISLNK(data->sb.st_mode); + mode_t oldUmask = umask((mode_t) 0); virSecurityManagerPostFork(data->driver->securityManager); @@ -7756,6 +7759,7 @@ qemuDomainAttachDeviceMknodHelper(pid_t pid ATTRIBUTE_UNUSED, freecon(data->tcon); #endif virFileFreeACLs(&data->acl); + umask(oldUmask); return ret; } -- 2.7.4

2 2

[libvirt] [PATCH] valgrind: add suppression for bash memory leak
by Tomáš Golembiovský 14 Feb '17

14 Feb '17

Add suppression for memory leak in bash observerd with bash 4.4.011 on Arch Linux. Signed-off-by: Tomáš Golembiovský <tgolembi(a)redhat.com> --- tests/.valgrind.supp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tests/.valgrind.supp b/tests/.valgrind.supp index d4fef857b..d474d63e9 100644 --- a/tests/.valgrind.supp +++ b/tests/.valgrind.supp @@ -32,6 +32,15 @@ ... obj:*/bin/bash } +{ + bashMemoryLeak4 + Memcheck:Leak + match-leak-kinds: definite + fun:malloc + fun:xmalloc + fun:set_default_locale + fun:main +} # # Failure seen in /usr/lib64/ld-2.15.so # -- 2.11.1

2 1

[libvirt] [PATCH] RFC: qemu: add spice/virgl rendernode
by marcandre.lureau＠redhat.com 13 Feb '17

13 Feb '17

From: Marc-André Lureau <marcandre.lureau(a)redhat.com> I am working on a WIP series to add QEMU Spice/virgl rendernode option. Since rendernodes are not stable across reboots, I propose that QEMU accepts also a PCI address (other bus types may be added in the future). This is how I translated it to libvirt. I picked <gpu> over <rendernode>, since it seems more generic. Comments welcome! Signed-off-by: Marc-André Lureau <marcandre.lureau(a)redhat.com> --- docs/formatdomain.html.in | 13 ++++++- docs/schemas/domaincommon.rng | 5 +++ src/conf/domain_conf.c | 45 ++++++++++++++++++++-- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 22 +++++++++++ .../qemuxml2argv-video-virtio-gpu-spice-gl.args | 2 +- .../qemuxml2argv-video-virtio-gpu-spice-gl.xml | 6 ++- tests/qemuxml2argvtest.c | 1 + .../qemuxml2xmlout-video-virtio-gpu-spice-gl.xml | 6 ++- 11 files changed, 97 insertions(+), 7 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 0a115f5dc..5c0f80b3c 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -5619,7 +5619,11 @@ qemu-kvm -net nic,model=? /dev/null <clipboard copypaste='no'/> <mouse mode='client'/> <filetransfer enable='no'/> - <gl enable='yes'/> + <gl enable='yes'> + <gpu> + <address type='pci' domain='0x0000' bus='0x06' slot='0x12' function='0x5'/> + </gpu> + </gl> </graphics></pre> <p> Spice supports variable compression settings for audio, images and @@ -5665,6 +5669,13 @@ qemu-kvm -net nic,model=? /dev/null the <code>gl</code> element, by setting the <code>enable</code> property. (QEMU only, <span class="since">since 1.3.3</span>). </p> + <p> + By default, QEMU will pick the first available GPU. You + may specify a host GPU to use for rendering with the + <code>gpu</code> element that supports a PCI + <code>address</code> child element. (QEMU only, <span + class="since">since 3.1</span>). + </p> </dd> <dt><code>rdp</code></dt> <dd> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index d715bff29..cc85e07d8 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -3033,6 +3033,11 @@ <attribute name="enable"> <ref name="virYesNo"/> </attribute> + <optional> + <element name="gpu"> + <ref name="address"/> + </element> + </optional> <empty/> </element> </optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 1bc72a4e9..a18db6dd9 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1300,6 +1300,7 @@ void virDomainGraphicsDefFree(virDomainGraphicsDefPtr def) break; case VIR_DOMAIN_GRAPHICS_TYPE_SPICE: + virDomainDeviceInfoClear(&def->data.spice.gpu); VIR_FREE(def->data.spice.keymap); virDomainGraphicsAuthDefClear(&def->data.spice.auth); break; @@ -12159,6 +12160,13 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def, VIR_FREE(enable); def->data.spice.gl = enableVal; + + if (cur->children && cur->children->type == XML_ELEMENT_NODE && + xmlStrEqual(cur->children->name, BAD_CAST "gpu") && + virDomainDeviceInfoParseXML(cur->children, NULL, + &def->data.spice.gpu, flags) < 0) + goto error; + } else if (xmlStrEqual(cur->name, BAD_CAST "mouse")) { char *mode = virXMLPropString(cur, "mode"); int modeVal; @@ -22839,6 +22847,36 @@ virDomainGraphicsListenDefFormatAddr(virBufferPtr buf, virBufferAsprintf(buf, " listen='%s'", glisten->address); } +static int +virDomainSpiceGLDefFormat(virBufferPtr buf, virDomainGraphicsDefPtr def) +{ + virBuffer childrenBuf = VIR_BUFFER_INITIALIZER; + int indent = virBufferGetIndent(buf, false); + + if (def->data.spice.gl == VIR_TRISTATE_BOOL_ABSENT) { + return 0; + } + + virBufferAsprintf(buf, "<gl enable='%s'", + virTristateBoolTypeToString(def->data.spice.gl)); + + virBufferAdjustIndent(&childrenBuf, indent + 4); + if (virDomainDeviceInfoFormat(&childrenBuf, &def->data.spice.gpu, 0) < 0) + return -1; + if (virBufferUse(&childrenBuf)) { + virBufferAddLit(buf, ">\n"); + virBufferAdjustIndent(buf, 2); + virBufferAddLit(buf, "<gpu>\n"); + virBufferAddBuffer(buf, &childrenBuf); + virBufferAddLit(buf, "</gpu>\n"); + virBufferAdjustIndent(buf, -2); + virBufferAddLit(buf, "</gl>\n"); + } else { + virBufferAddLit(buf, "/>\n"); + } + virBufferFreeAndReset(&childrenBuf); + return 0; +} static int virDomainGraphicsDefFormat(virBufferPtr buf, @@ -23082,9 +23120,10 @@ virDomainGraphicsDefFormat(virBufferPtr buf, if (def->data.spice.filetransfer) virBufferAsprintf(buf, "<filetransfer enable='%s'/>\n", virTristateBoolTypeToString(def->data.spice.filetransfer)); - if (def->data.spice.gl) - virBufferAsprintf(buf, "<gl enable='%s'/>\n", - virTristateBoolTypeToString(def->data.spice.gl)); + + if (virDomainSpiceGLDefFormat(buf, def) < 0) { + return -1; + } } if (children) { diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index dd79206f6..04bdf8914 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1544,6 +1544,7 @@ struct _virDomainGraphicsDef { virTristateBool copypaste; virTristateBool filetransfer; virTristateBool gl; + virDomainDeviceInfo gpu; } spice; } data; /* nListens, listens, and *port are only useful if type is vnc, diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 399e31447..e851eec7a 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -357,6 +357,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "query-cpu-model-expansion", /* 245 */ "virtio-net.host_mtu", + "spice-rendernode", ); @@ -2950,6 +2951,7 @@ static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = { { "spice", "unix", QEMU_CAPS_SPICE_UNIX }, { "drive", "throttling.bps-total-max-length", QEMU_CAPS_DRIVE_IOTUNE_MAX_LENGTH }, { "drive", "throttling.group", QEMU_CAPS_DRIVE_IOTUNE_GROUP }, + { "spice", "rendernode", QEMU_CAPS_SPICE_RENDERNODE }, }; static int diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 95bb67d44..0f998c473 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -393,6 +393,7 @@ typedef enum { /* 245 */ QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION, /* qmp query-cpu-model-expansion */ QEMU_CAPS_VIRTIO_NET_HOST_MTU, /* virtio-net-*.host_mtu */ + QEMU_CAPS_SPICE_RENDERNODE, /* -spice rendernode */ QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c00a47a91..3c1de3862 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7920,6 +7920,28 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg, * TristateSwitch helper */ virBufferAsprintf(&opt, "gl=%s,", virTristateSwitchTypeToString(graphics->data.spice.gl)); + + if (graphics->data.spice.gpu.type != + VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { + virDomainDeviceInfo *info = &graphics->data.spice.gpu; + char *devstr; + + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SPICE_RENDERNODE)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("This QEMU doesn't support spice OpenGL rendernode")); + goto error; + } + if (info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("only 'pci' addresses are supported for the gpu device")); + goto error; + } + if (!(devstr = virDomainPCIAddressAsString(&info->addr.pci))) + goto error; + + virBufferAsprintf(&opt, "rendernode=%s,", devstr); + VIR_FREE(devstr); + } } if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SEAMLESS_MIGRATION)) { diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-spice-gl.args b/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-spice-gl.args index f1ebb62e4..1e0728fb5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-spice-gl.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-spice-gl.args @@ -19,6 +19,6 @@ QEMU_AUDIO_DRV=spice \ -drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,\ id=drive-ide0-0-0,cache=none \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --spice port=0,gl=on \ +-spice port=0,gl=on,rendernode=0000:06:12.5 \ -device virtio-gpu-pci,id=video0,virgl=on,bus=pci.0,addr=0x2 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-spice-gl.xml b/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-spice-gl.xml index b9c7c8af0..fdd3939d2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-spice-gl.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-spice-gl.xml @@ -26,7 +26,11 @@ <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <graphics type='spice' autoport='no'> - <gl enable='yes'/> + <gl enable='yes'> + <gpu> + <address type='pci' domain='0x0000' bus='0x06' slot='0x12' function='0x5'/> + </gpu> + </gl> </graphics> <video> <model type='virtio' heads='1'> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 8d737fdc8..dcc094960 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1722,6 +1722,7 @@ mymain(void) QEMU_CAPS_VIRTIO_GPU_VIRGL, QEMU_CAPS_SPICE, QEMU_CAPS_SPICE_GL, + QEMU_CAPS_SPICE_RENDERNODE, QEMU_CAPS_DEVICE_VIDEO_PRIMARY); DO_TEST("video-virtio-gpu-secondary", QEMU_CAPS_DEVICE_VIRTIO_GPU, diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-video-virtio-gpu-spice-gl.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-video-virtio-gpu-spice-gl.xml index 9fb533ad9..89972d1fe 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-video-virtio-gpu-spice-gl.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-video-virtio-gpu-spice-gl.xml @@ -31,7 +31,11 @@ <input type='keyboard' bus='ps2'/> <graphics type='spice'> <listen type='none'/> - <gl enable='yes'/> + <gl enable='yes'> + <gpu> + <address type='pci' domain='0x0000' bus='0x06' slot='0x12' function='0x5'/> + </gpu> + </gl> </graphics> <video> <model type='virtio' heads='1' primary='yes'> -- 2.11.0.295.gd7dffce1c.dirty

3 6

[libvirt] [PATCH] docs: document bhyve e1000 support
by Roman Bogorodskiy 13 Feb '17

13 Feb '17

* Add bhyve e1000 support entry to release nodes * Update the bhyve driver page with usage sample --- docs/drvbhyve.html.in | 15 +++++++++++++++ docs/news.xml | 9 +++++++++ 2 files changed, 24 insertions(+) diff --git a/docs/drvbhyve.html.in b/docs/drvbhyve.html.in index 9b7872ba0..da6f1e0b2 100644 --- a/docs/drvbhyve.html.in +++ b/docs/drvbhyve.html.in @@ -278,5 +278,20 @@ you'll need to explicitly specify 'localtime' in this case:</p> </domain> </pre> +<h3><a name="e1000">e1000 NIC</a></h3> + +<p>As of <a href="https://svnweb.freebsd.org/changeset/base/302504">r302504</a> bhyve +supports Intel e1000 network adapter emulation. It's supported in libvirt +<span class="since">since 3.1.0</span> and could be used as follows:</p> + +<pre> +... + <interface type='bridge'> + <source bridge='virbr0'/> + <model type='<b>e1000</b>'/> + </interface> +... +</pre> + </body> </html> diff --git a/docs/news.xml b/docs/news.xml index a214b3316..b756a970f 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -44,6 +44,15 @@ openvswitch calls in the libvirtd configuration file. </description> </change> + <change> + <summary> + bhyve: add e1000 NIC support + </summary> + <description> + Add support for e1000 NIC. Previously, the only available option + was <code>virtio-net</code>. + </description> + </change> </section> <section title="Improvements"> <change> -- 2.11.0

2 3

[libvirt] [RFC v3 0/8] Support cache tune in libvirt
by Eli Qiao 13 Feb '17

13 Feb '17

Addressed comment from v2 -> v3: Daniel: * Fixed coding style, passed `make check` and `make syntax-check` * Variables renaming and move from header file to c file. * For locking/mutex support, no progress. There are some discussion from mailing list, but I can not find a better way to add locking support without performance impact. I'll explain the process and please help to advice what shoud we do. VM create: 1) Get the cache left value on each bank of the host. This should be shared amount all VMs. 2) Calculate the schemata on the bank based on all created resctrl domain's schemata 3) Calculate the default schemata by scaning all domain's schemata. 4) Flush default schemata to /sys/fs/resctrl/schemata VM destroy: 1) Remove the resctrl domain of that VM 2) Recalculate default schemata 3) Flush default schemata to /sys/fs/resctrl/schemata The key point is that all VMs shares /sys/fs/resctrl/schemata, and when a VM create a resctrl domain, the schemata of that VM depends on the default schemata and all other exsited schematas. So a global mutex is reqired. Before calculate a schemata or update default schemata, libvirt should gain this global mutex. I will try to think more about how to support this gracefully in next patch set. Marcelo: * Added vcpu support for cachetune, this will allow user to define which vcpu using which cache allocation bank. <cachetune id='0' host_id=0 size='3072' unit='KiB' vcpus='0,1'/> vcpus is a cpumap, the vcpu pids will be added to tasks file * Added cdp compatible, user can specify l3 cache even host enable cdp. See patch 8. On a cdp enabled host, specify l3code/l3data by <cachetune id='0' host_id='0' type='l3' size='3072' unit='KiB'/> This will create a schemata like: L3data:0=0xff00;... L3code:0=0xff00;... * Would you please help to test if the functions work. Martin: * Xml test case, I have no time to work on this yet, would you please show me an example, would like to amend it later. This series patches are for supportting CAT featues, which also called cache tune in libvirt. First to expose cache information which could be tuned in capabilites XML. Then add new domain xml element support to add cacahe bank which will apply on this libvirt domain. This series patches add a util file `resctrl.c/h`, an interface to talk with linux kernel's sys fs. There are still some TODOs such as expose new public interface to get free cache information. Some discussion about this feature support can be found from: https://www.redhat.com/archives/libvir-list/2017-January/msg00644.html Eli Qiao (8): Resctrl: Add some utils functions Resctrl: expose cache information to capabilities Resctrl: Add new xml element to support cache tune Resctrl: Add private interface to set cachebanks Qemu: Set cache banks Resctrl: enable l3code/l3data Resctrl: Make sure l3data/l3code are pairs Resctrl: Compatible mode for cdp enabled docs/schemas/domaincommon.rng | 46 ++ include/libvirt/virterror.h | 1 + po/POTFILES.in | 1 + src/Makefile.am | 1 + src/conf/capabilities.c | 56 +++ src/conf/capabilities.h | 23 + src/conf/domain_conf.c | 182 +++++++ src/conf/domain_conf.h | 19 + src/libvirt_private.syms | 11 + src/nodeinfo.c | 64 +++ src/nodeinfo.h | 1 + src/qemu/qemu_capabilities.c | 8 + src/qemu/qemu_driver.c | 6 + src/qemu/qemu_process.c | 53 ++ src/util/virerror.c | 1 + src/util/virresctrl.c | 1091 +++++++++++++++++++++++++++++++++++++++++ src/util/virresctrl.h | 85 ++++ 17 files changed, 1649 insertions(+) create mode 100644 src/util/virresctrl.c create mode 100644 src/util/virresctrl.h -- 1.9.1

3 14

[libvirt] [PATCH v4] bhyve: add e1000 nic support
by Roman Bogorodskiy 11 Feb '17

11 Feb '17

Recently e1000 NIC support was added to bhyve; implement that in the bhyve driver: - Add capability check by analyzing output of the 'bhyve -s 0,e1000' command - Modify bhyveBuildNetArgStr() to support e1000 and also pass virConnectPtr so it could call bhyveDriverGetCaps() to check if this NIC is supported - Modify command parsing code to add support for e1000 and adjust tests - Add net-e1000 test --- src/bhyve/bhyve_capabilities.c | 26 ++++++++++++++++++ src/bhyve/bhyve_capabilities.h | 1 + src/bhyve/bhyve_command.c | 31 +++++++++++++++++++--- src/bhyve/bhyve_parse_command.c | 10 ++++++- tests/bhyveargv2xmldata/bhyveargv2xml-e1000.args | 8 ++++++ tests/bhyveargv2xmldata/bhyveargv2xml-e1000.xml | 30 +++++++++++++++++++++ .../bhyveargv2xmldata/bhyveargv2xml-virtio-net.xml | 2 ++ .../bhyveargv2xml-virtio-net4.xml | 1 + tests/bhyveargv2xmltest.c | 1 + .../bhyvexml2argvdata/bhyvexml2argv-net-e1000.args | 9 +++++++ .../bhyvexml2argv-net-e1000.ldargs | 3 +++ .../bhyvexml2argvdata/bhyvexml2argv-net-e1000.xml | 22 +++++++++++++++ tests/bhyvexml2argvtest.c | 7 ++++- 13 files changed, 145 insertions(+), 6 deletions(-) create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-e1000.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-e1000.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.xml diff --git a/src/bhyve/bhyve_capabilities.c b/src/bhyve/bhyve_capabilities.c index 83e3ae1b4..a647cd19b 100644 --- a/src/bhyve/bhyve_capabilities.c +++ b/src/bhyve/bhyve_capabilities.c @@ -216,6 +216,29 @@ bhyveProbeCapsAHCI32Slot(unsigned int *caps, char *binary) return ret; } +static int +bhyveProbeCapsNetE1000(unsigned int *caps, char *binary) +{ + char *error; + virCommandPtr cmd = NULL; + int ret = 0, exit; + + cmd = virCommandNew(binary); + virCommandAddArgList(cmd, "-s", "0,e1000", NULL); + virCommandSetErrorBuffer(cmd, &error); + if (virCommandRun(cmd, &exit) < 0) { + ret = -1; + goto out; + } + + if (strstr(error, "pci slot 0:0: unknown device \"e1000\"") == NULL) + *caps |= BHYVE_CAP_NET_E1000; + + out: + VIR_FREE(error); + virCommandFree(cmd); + return ret; +} int virBhyveProbeCaps(unsigned int *caps) @@ -235,6 +258,9 @@ virBhyveProbeCaps(unsigned int *caps) if ((ret = bhyveProbeCapsAHCI32Slot(caps, binary))) goto out; + if ((ret = bhyveProbeCapsNetE1000(caps, binary))) + goto out; + out: VIR_FREE(binary); return ret; diff --git a/src/bhyve/bhyve_capabilities.h b/src/bhyve/bhyve_capabilities.h index 55581bd68..690feadb8 100644 --- a/src/bhyve/bhyve_capabilities.h +++ b/src/bhyve/bhyve_capabilities.h @@ -39,6 +39,7 @@ typedef enum { typedef enum { BHYVE_CAP_RTC_UTC = 1 << 0, BHYVE_CAP_AHCI32SLOT = 1 << 1, + BHYVE_CAP_NET_E1000 = 1 << 2, } virBhyveCapsFlags; int virBhyveProbeGrubCaps(virBhyveGrubCapsFlags *caps); diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index a50bd1066..5c86c9f1b 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -44,7 +44,8 @@ VIR_LOG_INIT("bhyve.bhyve_command"); static int -bhyveBuildNetArgStr(const virDomainDef *def, +bhyveBuildNetArgStr(virConnectPtr conn, + const virDomainDef *def, virDomainNetDefPtr net, virCommandPtr cmd, bool dryRun) @@ -52,9 +53,30 @@ bhyveBuildNetArgStr(const virDomainDef *def, char macaddr[VIR_MAC_STRING_BUFLEN]; char *realifname = NULL; char *brname = NULL; + char *nic_model = NULL; int ret = -1; virDomainNetType actualType = virDomainNetGetActualType(net); + if (STREQ(net->model, "virtio")) { + if (VIR_STRDUP(nic_model, "virtio-net") < 0) + return -1; + } else if (STREQ(net->model, "e1000")) { + if ((bhyveDriverGetCaps(conn) & BHYVE_CAP_NET_E1000) != 0) { + if (VIR_STRDUP(nic_model, "e1000") < 0) + return -1; + } else { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("NIC model 'e1000' is not supported " + "by given bhyve binary")); + return -1; + } + } else { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("NIC model '%s' is not supported"), + net->model); + return -1; + } + if (actualType == VIR_DOMAIN_NET_TYPE_BRIDGE) { if (VIR_STRDUP(brname, virDomainNetGetActualBridgeName(net)) < 0) goto cleanup; @@ -101,8 +123,8 @@ bhyveBuildNetArgStr(const virDomainDef *def, virCommandAddArg(cmd, "-s"); - virCommandAddArgFormat(cmd, "%d:0,virtio-net,%s,mac=%s", - net->info.addr.pci.slot, + virCommandAddArgFormat(cmd, "%d:0,%s,%s,mac=%s", + net->info.addr.pci.slot, nic_model, realifname, virMacAddrFormat(&net->mac, macaddr)); ret = 0; @@ -111,6 +133,7 @@ bhyveBuildNetArgStr(const virDomainDef *def, VIR_FREE(net->ifname); VIR_FREE(brname); VIR_FREE(realifname); + VIR_FREE(nic_model); return ret; } @@ -345,7 +368,7 @@ virBhyveProcessBuildBhyveCmd(virConnectPtr conn, } for (i = 0; i < def->nnets; i++) { virDomainNetDefPtr net = def->nets[i]; - if (bhyveBuildNetArgStr(def, net, cmd, dryRun) < 0) + if (bhyveBuildNetArgStr(conn, def, net, cmd, dryRun) < 0) goto error; } for (i = 0; i < def->ndisks; i++) { diff --git a/src/bhyve/bhyve_parse_command.c b/src/bhyve/bhyve_parse_command.c index e31f5fbd1..fcaaed275 100644 --- a/src/bhyve/bhyve_parse_command.c +++ b/src/bhyve/bhyve_parse_command.c @@ -496,6 +496,7 @@ bhyveParsePCINet(virDomainDefPtr def, unsigned pcislot, unsigned pcibus, unsigned function, + const char *model, const char *config) { /* -s slot,virtio-net,tapN[,mac=xx:xx:xx:xx:xx:xx] */ @@ -514,6 +515,9 @@ bhyveParsePCINet(virDomainDefPtr def, if (VIR_STRDUP(net->data.bridge.brname, "virbr0") < 0) goto error; + if (VIR_STRDUP(net->model, model) < 0) + goto error; + net->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI; net->info.addr.pci.slot = pcislot; net->info.addr.pci.bus = pcibus; @@ -620,7 +624,11 @@ bhyveParseBhyvePCIArg(virDomainDefPtr def, nahcidisk, conf); else if (STREQ(emulation, "virtio-net")) - bhyveParsePCINet(def, xmlopt, caps, pcislot, bus, function, conf); + bhyveParsePCINet(def, xmlopt, caps, pcislot, bus, function, + "virtio", conf); + else if (STREQ(emulation, "e1000")) + bhyveParsePCINet(def, xmlopt, caps, pcislot, bus, function, + "e1000", conf); VIR_FREE(emulation); VIR_FREE(slotdef); diff --git a/tests/bhyveargv2xmldata/bhyveargv2xml-e1000.args b/tests/bhyveargv2xmldata/bhyveargv2xml-e1000.args new file mode 100644 index 000000000..aa568fe3a --- /dev/null +++ b/tests/bhyveargv2xmldata/bhyveargv2xml-e1000.args @@ -0,0 +1,8 @@ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-H \ +-P \ +-s 0:0,hostbridge \ +-s 1:0,e1000,tap0 \ +-s 1:1,e1000,tap1,mac=FE:ED:AD:EA:DF:15 bhyve diff --git a/tests/bhyveargv2xmldata/bhyveargv2xml-e1000.xml b/tests/bhyveargv2xmldata/bhyveargv2xml-e1000.xml new file mode 100644 index 000000000..c6b6c0ef8 --- /dev/null +++ b/tests/bhyveargv2xmldata/bhyveargv2xml-e1000.xml @@ -0,0 +1,30 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type>hvm</type> + </os> + <clock offset='localtime'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>destroy</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <interface type='bridge'> + <mac address='52:54:00:00:00:00'/> + <source bridge='virbr0'/> + <target dev='tap0'/> + <model type='e1000'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> + </interface> + <interface type='bridge'> + <mac address='fe:ed:ad:ea:df:15'/> + <source bridge='virbr0'/> + <target dev='tap1'/> + <model type='e1000'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </interface> + </devices> +</domain> diff --git a/tests/bhyveargv2xmldata/bhyveargv2xml-virtio-net.xml b/tests/bhyveargv2xmldata/bhyveargv2xml-virtio-net.xml index 5895c8c53..ed3279d9d 100644 --- a/tests/bhyveargv2xmldata/bhyveargv2xml-virtio-net.xml +++ b/tests/bhyveargv2xmldata/bhyveargv2xml-virtio-net.xml @@ -16,12 +16,14 @@ <mac address='52:54:00:00:00:00'/> <source bridge='virbr0'/> <target dev='tap0'/> + <model type='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> </interface> <interface type='bridge'> <mac address='fe:ed:ad:ea:df:15'/> <source bridge='virbr0'/> <target dev='tap1'/> + <model type='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> </interface> </devices> diff --git a/tests/bhyveargv2xmldata/bhyveargv2xml-virtio-net4.xml b/tests/bhyveargv2xmldata/bhyveargv2xml-virtio-net4.xml index 5f1972080..7c5493cbb 100644 --- a/tests/bhyveargv2xmldata/bhyveargv2xml-virtio-net4.xml +++ b/tests/bhyveargv2xmldata/bhyveargv2xml-virtio-net4.xml @@ -16,6 +16,7 @@ <mac address='00:00:00:00:00:00'/> <source bridge='virbr0'/> <target dev='tap1'/> + <model type='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> </interface> </devices> diff --git a/tests/bhyveargv2xmltest.c b/tests/bhyveargv2xmltest.c index 0995f6928..e759e4fa3 100644 --- a/tests/bhyveargv2xmltest.c +++ b/tests/bhyveargv2xmltest.c @@ -175,6 +175,7 @@ mymain(void) DO_TEST("ahci-hd"); DO_TEST("virtio-blk"); DO_TEST("virtio-net"); + DO_TEST("e1000"); DO_TEST_WARN("virtio-net2"); DO_TEST_WARN("virtio-net3"); DO_TEST_WARN("virtio-net4"); diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.args b/tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.args new file mode 100644 index 000000000..09e30db46 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.args @@ -0,0 +1,9 @@ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ +-s 2:0,ahci,hd:/tmp/freebsd.img \ +-s 3:0,e1000,faketapdev,mac=52:54:00:00:00:00 bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.ldargs new file mode 100644 index 000000000..32538b558 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.ldargs @@ -0,0 +1,3 @@ +/usr/sbin/bhyveload \ +-m 214 \ +-d /tmp/freebsd.img bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.xml new file mode 100644 index 000000000..805efe301 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.xml @@ -0,0 +1,22 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory>219136</memory> + <vcpu>1</vcpu> + <os> + <type>hvm</type> + </os> + <devices> + <disk type='file'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='hda' bus='sata'/> + <address type='drive' controller='0' bus='0' target='2' unit='0'/> + </disk> + <interface type='bridge'> + <model type='e1000'/> + <source bridge="virbr0"/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + </devices> +</domain> diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index e80705780..158f9617e 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -162,7 +162,7 @@ mymain(void) DO_TEST_FULL(name, FLAG_EXPECT_PARSE_ERROR) driver.grubcaps = BHYVE_GRUB_CAP_CONSDEV; - driver.bhyvecaps = BHYVE_CAP_RTC_UTC | BHYVE_CAP_AHCI32SLOT; + driver.bhyvecaps = BHYVE_CAP_RTC_UTC | BHYVE_CAP_AHCI32SLOT | BHYVE_CAP_NET_E1000; DO_TEST("base"); DO_TEST("acpiapic"); @@ -185,6 +185,7 @@ mymain(void) DO_TEST("disk-cdrom-grub"); DO_TEST("serial-grub"); DO_TEST("localtime"); + DO_TEST("net-e1000"); /* Address allocation tests */ DO_TEST("addr-single-sata-disk"); @@ -201,6 +202,10 @@ mymain(void) DO_TEST("serial-grub-nocons"); + driver.bhyvecaps &= ~BHYVE_CAP_NET_E1000; + + DO_TEST_FAILURE("net-e1000"); + virObjectUnref(driver.caps); virObjectUnref(driver.xmlopt); -- 2.11.0

2 3

[libvirt] [PATCH] util: Fix indentation for virnetdevmacvlan
by Nitesh Konkar 10 Feb '17

10 Feb '17

Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- src/util/virnetdevmacvlan.c | 30 +++++++++++++++--------------- src/util/virnetdevmacvlan.h | 20 ++++++++++---------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index c8c16b5..b106ca1 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -1222,11 +1222,11 @@ int virNetDevMacVLanDeleteWithVPortProfile(const char *ifname, * Returns 0; returns -1 on error. */ int virNetDevMacVLanRestartWithVPortProfile(const char *cr_ifname, - const virMacAddr *macaddress, - const char *linkdev, - const unsigned char *vmuuid, - virNetDevVPortProfilePtr virtPortProfile, - virNetDevVPortProfileOp vmOp) + const virMacAddr *macaddress, + const char *linkdev, + const unsigned char *vmuuid, + virNetDevVPortProfilePtr virtPortProfile, + virNetDevVPortProfileOp vmOp) { int rc = 0; @@ -1301,11 +1301,11 @@ int virNetDevMacVLanDeleteWithVPortProfile(const char *ifname ATTRIBUTE_UNUSED, } int virNetDevMacVLanRestartWithVPortProfile(const char *cr_ifname ATTRIBUTE_UNUSED, - const virMacAddr *macaddress ATTRIBUTE_UNUSED, - const char *linkdev ATTRIBUTE_UNUSED, - const unsigned char *vmuuid ATTRIBUTE_UNUSED, - virNetDevVPortProfilePtr virtPortProfile ATTRIBUTE_UNUSED, - virNetDevVPortProfileOp vmOp ATTRIBUTE_UNUSED) + const virMacAddr *macaddress ATTRIBUTE_UNUSED, + const char *linkdev ATTRIBUTE_UNUSED, + const unsigned char *vmuuid ATTRIBUTE_UNUSED, + virNetDevVPortProfilePtr virtPortProfile ATTRIBUTE_UNUSED, + virNetDevVPortProfileOp vmOp ATTRIBUTE_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Cannot create macvlan devices on this platform")); @@ -1313,11 +1313,11 @@ int virNetDevMacVLanRestartWithVPortProfile(const char *cr_ifname ATTRIBUTE_UNUS } int virNetDevMacVLanVPortProfileRegisterCallback(const char *ifname ATTRIBUTE_UNUSED, - const virMacAddr *macaddress ATTRIBUTE_UNUSED, - const char *linkdev ATTRIBUTE_UNUSED, - const unsigned char *vmuuid ATTRIBUTE_UNUSED, - virNetDevVPortProfilePtr virtPortProfile ATTRIBUTE_UNUSED, - virNetDevVPortProfileOp vmOp ATTRIBUTE_UNUSED) + const virMacAddr *macaddress ATTRIBUTE_UNUSED, + const char *linkdev ATTRIBUTE_UNUSED, + const unsigned char *vmuuid ATTRIBUTE_UNUSED, + virNetDevVPortProfilePtr virtPortProfile ATTRIBUTE_UNUSED, + virNetDevVPortProfileOp vmOp ATTRIBUTE_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Cannot create macvlan devices on this platform")); diff --git a/src/util/virnetdevmacvlan.h b/src/util/virnetdevmacvlan.h index 8e0a352..9a85a65 100644 --- a/src/util/virnetdevmacvlan.h +++ b/src/util/virnetdevmacvlan.h @@ -92,20 +92,20 @@ int virNetDevMacVLanDeleteWithVPortProfile(const char *ifname, ATTRIBUTE_NONNULL(6) ATTRIBUTE_RETURN_CHECK; int virNetDevMacVLanRestartWithVPortProfile(const char *cr_ifname, - const virMacAddr *macaddress, - const char *linkdev, - const unsigned char *vmuuid, - virNetDevVPortProfilePtr virtPortProfile, - virNetDevVPortProfileOp vmOp) + const virMacAddr *macaddress, + const char *linkdev, + const unsigned char *vmuuid, + virNetDevVPortProfilePtr virtPortProfile, + virNetDevVPortProfileOp vmOp) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4) ATTRIBUTE_RETURN_CHECK; int virNetDevMacVLanVPortProfileRegisterCallback(const char *ifname, - const virMacAddr *macaddress, - const char *linkdev, - const unsigned char *vmuuid, - virNetDevVPortProfilePtr virtPortProfile, - virNetDevVPortProfileOp vmOp) + const virMacAddr *macaddress, + const char *linkdev, + const unsigned char *vmuuid, + virNetDevVPortProfilePtr virtPortProfile, + virNetDevVPortProfileOp vmOp) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4) ATTRIBUTE_RETURN_CHECK; #endif /* __UTIL_MACVTAP_H__ */ -- 1.9.3

2 1

[libvirt] [PATCH] remote generator: Increase upper limit on lists of node devices
by Boris Fiuczynski 10 Feb '17

10 Feb '17

On a system with 697 SCSI disks each configured with 8 paths the command virsh nodedev-list fails with error: Failed to list node devices error: internal error: Too many node_devices '16816' for limit '16384' Increasing the upper limit on lists of node devices from 16K to 64K. Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.vnet.ibm.com> --- src/remote/remote_protocol.x | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index 68469a5..cd0a14c 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -86,7 +86,7 @@ const REMOTE_STORAGE_POOL_LIST_MAX = 4096; const REMOTE_STORAGE_VOL_LIST_MAX = 16384; /* Upper limit on lists of node devices. */ -const REMOTE_NODE_DEVICE_LIST_MAX = 16384; +const REMOTE_NODE_DEVICE_LIST_MAX = 65536; /* Upper limit on lists of node device capabilities. */ const REMOTE_NODE_DEVICE_CAPS_LIST_MAX = 65536; -- 2.5.5

2 2

[libvirt] [PATCH v2 0/3] Add callback mech for qemu and nodedev
by John Ferlan 10 Feb '17

10 Feb '17

v1: http://www.redhat.com/archives/libvir-list/2017-February/msg00354.html Changes since v1: - Rather than calling the enumeration API from node_device_conf, return the address of the enumeration API to the calling driver and let it make the callback. - If the enumeration callback doesn't exist add a failure to the registration function - Rather than fail when the registration add callback fails, just splat a VIR_WARN message. Changed the remove code to use VIR_WARN instead of VIR_DEBUG too John Ferlan (3): nodedev: Add driver callback mechanism to add/remove devices qemu: Use nodedev callback mechanism to to get a nodedev data qemu: Add configuration variable to control nodedev enumeration src/check-aclrules.pl | 3 +- src/check-driverimpls.pl | 1 + src/conf/node_device_conf.c | 115 ++++++++++++++++++++++++++++++++++++- src/conf/node_device_conf.h | 18 ++++++ src/libvirt_private.syms | 3 + src/node_device/node_device_udev.c | 29 ++++++++++ src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 19 ++++++ src/qemu/qemu_conf.c | 53 +++++++++++++++++ src/qemu/qemu_conf.h | 17 ++++++ src/qemu/qemu_driver.c | 46 +++++++++++++++ src/qemu/test_libvirtd_qemu.aug.in | 1 + 12 files changed, 304 insertions(+), 2 deletions(-) -- 2.7.4

1 3

[libvirt] [PATCH] libxl: Resolve possible resource leak in dom0 maximum memory setting
by John Ferlan 10 Feb '17

10 Feb '17

If either the "if (STRPREFIX(mem_tokens[j], "max:"))" is never entered or the "if (virStrToLong_ull(mem_tokens[j] + 4, &p, 10, maxmem) < 0)" break is hit, control goes back to the outer loop processing 'cmd_tokens' and it's possible that the 'mem_tokens' would be overwritten. Found by Coverity Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Of course this is what led me down the path of the recently sent virusbmock patch... src/libxl/libxl_conf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 6ce2e0a..f5b788b 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1622,6 +1622,7 @@ libxlDriverGetDom0MaxmemConf(libxlDriverConfigPtr cfg, goto cleanup; } } + virStringListFree(mem_tokens); } physmem: -- 2.7.4

2 1

[libvirt] [PATCH] tests: Link virusbmock with probes
by John Ferlan 10 Feb '17

10 Feb '17

Seeing similar error to commit id '997be5c27' with the inability to find the libvirt_event_poll_purge_timeout_semaphore symbol causing a virusbtest failure. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- This is a really strange one... I applied Michal's patches, the error occurred. I rebuilt cleanly and the error went away. This morning after apply the top of tree, the error returns. Just changing the Makefile.am doesn't always "clean" up the error, but after a make clean and rebuild the error goes away. Perhaps has to do with some build dependency on the virusbmock that virusbtest has that somehow isn't being recognized in the Makefile.am... But I'm not sure what magic incantation needs to be levied at the Makefile.am in order to tell it to do the right thing! tests/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/Makefile.am b/tests/Makefile.am index 7149a86..32a7282 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1204,6 +1204,7 @@ virusbmock_la_SOURCES = virusbmock.c virusbmock_la_CFLAGS = $(AM_CFLAGS) virusbmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) virusbmock_la_LIBADD = $(MOCKLIBS_LIBS) \ + $(PROBES_O) \ ../src/libvirt_util.la virnetdevbandwidthmock_la_SOURCES = \ -- 2.7.4

3 2

[libvirt] [PATCH] Mention the min duration for nodesuspend explicitly
by Nitesh Konkar 10 Feb '17

10 Feb '17

Although currently this is documented in virsh man page and virsh help, the expicit mention in the error message is helful for tools using the API directly. Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- src/util/virnodesuspend.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/util/virnodesuspend.c b/src/util/virnodesuspend.c index 8bb8d93..71b2d4c 100644 --- a/src/util/virnodesuspend.c +++ b/src/util/virnodesuspend.c @@ -76,7 +76,9 @@ static int virNodeSuspendSetNodeWakeup(unsigned long long alarmTime) int ret = -1; if (alarmTime < MIN_TIME_REQ_FOR_SUSPEND) { - virReportError(VIR_ERR_INVALID_ARG, "%s", _("Suspend duration is too short")); + virReportError(VIR_ERR_INVALID_ARG, + _("Suspend duration is too short, must be at least %u seconds"), + MIN_TIME_REQ_FOR_SUSPEND); return -1; } -- 2.1.0

2 1

[libvirt] [PATCH 0/3] storage: Fix FS pool destroy not unmounting its source
by Erik Skultety 10 Feb '17

10 Feb '17

The issue lies in how we check whether a FS is already mounted or not, we compare the pool's source/target with source/target in the mount's binary output both of which can actually be just symlinks to the same location yet failing our check on the FS being mounted, thus reporting a strange error that the pool's source is already mounted. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1417203 Erik Skultety (3): storage: Fix reporting an error on an already mounted filesystem util: Introduce virFileComparePaths storage: Fix checking whether source filesystem is mounted src/libvirt_private.syms | 1 + src/storage/storage_backend_fs.c | 25 ++++++++++++++-------- src/util/virfile.c | 45 ++++++++++++++++++++++++++++++++++++++++ src/util/virfile.h | 2 ++ 4 files changed, 64 insertions(+), 9 deletions(-) -- 2.10.2

2 8

[libvirt] [PATCH 0/4] Fixes for segmentation faults
by Marc Hartmayer 10 Feb '17

10 Feb '17

This patch series fixes some segmentation faults. Marc Hartmayer (4): qemu: Check if virQEMUCapsNewCopy(...) has failed conf: Fix libvirtd free() segfault if virDomainChrSourceDefNew(...) fails util: reset the counters to zero rpc: Fix potentially segfaults src/conf/domain_conf.c | 2 +- src/qemu/qemu_capabilities.c | 4 ++++ src/rpc/virnetserverservice.c | 20 +++++++++++--------- src/util/virnetdevip.c | 2 ++ 4 files changed, 18 insertions(+), 10 deletions(-) -- 2.5.5

2 13

[libvirt] [PATCH] remote generator: handle remoteDomainCreateWithFlags()
by Marc Hartmayer 10 Feb '17

10 Feb '17

This commit removes the handcrafted code for remoteDomainCreateWithFlags() and lets it auto generate. A little bit of history repeating... Commit 03d813bbcd7b4a183601055006 removed the auto generation of remoteDomainCreateWithFlags() because it was thought that the design flaw in the remote protocol for virDomainCreate is also within the remote protocol for virDomainCreateWithFlags. As the commit message of ddaf15d7a3863d54e242f8ff75 mentions this is not the case therefore we can auto generate the client part. Even worse there was a typo in remoteDomainCreateWithFlags() 'remote_domain_create_with_flags_args ret;' but in fact it has to be 'remote_domain_create_with_flags_ret ret;'. Signed-off-by: Marc Hartmayer <mhartmay(a)linux.vnet.ibm.com> Reviewed-by: Bjoern Walk <bwalk(a)linux.vnet.ibm.com> Reviewed-by: Boris Fiuczynski <fiuczy(a)linux.vnet.ibm.com> --- src/remote/remote_driver.c | 29 ----------------------------- src/remote/remote_protocol.x | 2 +- 2 files changed, 1 insertion(+), 30 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 8880520..7be9f17 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -2627,35 +2627,6 @@ remoteDomainCreate(virDomainPtr domain) return rv; } -static int -remoteDomainCreateWithFlags(virDomainPtr dom, unsigned int flags) -{ - int rv = -1; - struct private_data *priv = dom->conn->privateData; - remote_domain_create_with_flags_args args; - remote_domain_create_with_flags_args ret; - - remoteDriverLock(priv); - - make_nonnull_domain(&args.dom, dom); - args.flags = flags; - - memset(&ret, 0, sizeof(ret)); - if (call(dom->conn, priv, 0, REMOTE_PROC_DOMAIN_CREATE_WITH_FLAGS, - (xdrproc_t)xdr_remote_domain_create_with_flags_args, (char *)&args, - (xdrproc_t)xdr_remote_domain_create_with_flags_ret, (char *)&ret) == -1) { - goto done; - } - - dom->id = ret.dom.id; - xdr_free((xdrproc_t) &xdr_remote_domain_create_with_flags_ret, (char *) &ret); - rv = 0; - - done: - remoteDriverUnlock(priv); - return rv; -} - static char * remoteDomainGetSchedulerType(virDomainPtr domain, int *nparams) { diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index e8382dc..5b594ea 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -4741,7 +4741,7 @@ enum remote_procedure { REMOTE_PROC_DOMAIN_EVENT_IO_ERROR_REASON = 195, /** - * @generate: server + * @generate: both * @acl: domain:start */ REMOTE_PROC_DOMAIN_CREATE_WITH_FLAGS = 196, -- 2.5.5

2 3

[libvirt] [PATCH 0/5] Fix couple of memleaks
by Michal Privoznik 09 Feb '17

09 Feb '17

*** BLURB HERE *** Michal Privoznik (5): tests: Trace re-executing processes with valgrind virusbmock: Link with libvirt_utils testUSBList: don't leak @dev qemuMonitorCPUModelInfoFree: Don't leak model_info->props xenFoxenFormatXLDisk: Don't leak @target src/qemu/qemu_monitor.c | 1 + src/xenconfig/xen_xl.c | 5 +++-- tests/Makefile.am | 6 ++++-- tests/virusbtest.c | 1 + 4 files changed, 9 insertions(+), 4 deletions(-) -- 2.11.0

3 11

[libvirt] [PATCH] Fix indentation in datatypes.h
by Nitesh Konkar 09 Feb '17

09 Feb '17

Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- src/datatypes.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/datatypes.h b/src/datatypes.h index 5830482..d525835 100644 --- a/src/datatypes.h +++ b/src/datatypes.h @@ -696,11 +696,11 @@ virStoragePoolPtr virGetStoragePool(virConnectPtr conn, void *privateData, virFreeCallback freeFunc); virStorageVolPtr virGetStorageVol(virConnectPtr conn, - const char *pool, - const char *name, - const char *key, - void *privateData, - virFreeCallback freeFunc); + const char *pool, + const char *name, + const char *key, + void *privateData, + virFreeCallback freeFunc); virNodeDevicePtr virGetNodeDevice(virConnectPtr conn, const char *name); virSecretPtr virGetSecret(virConnectPtr conn, -- 2.1.0

2 1

[libvirt] [PATCH] conf: check port range even for USB hubs
by Ján Tomko 09 Feb '17

09 Feb '17

Move the range check introduced by commit 2650d5e into virDomainUSBAddressFindPort. That way both virDomainUSBAddressRelease and virDomainUSBAddressSetAddHub can benefit from it. Reported-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/domain_addr.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 555da59..acff32f 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -1785,7 +1785,7 @@ virDomainUSBAddressFindPort(virDomainUSBAddressSetPtr addrs, const char *portStr) { virDomainUSBAddressHubPtr hub = NULL; - ssize_t i, lastIdx; + ssize_t i, lastIdx, targetPort; if (info->addr.usb.bus >= addrs->nbuses || !addrs->buses[info->addr.usb.bus]) { @@ -1820,7 +1820,15 @@ virDomainUSBAddressFindPort(virDomainUSBAddressSetPtr addrs, } } - *targetIdx = info->addr.usb.port[lastIdx] - 1; + targetPort = info->addr.usb.port[lastIdx] - 1; + if (targetPort >= virBitmapSize(hub->portmap)) { + virReportError(VIR_ERR_XML_ERROR, + _("requested USB port %s not present on USB bus %u"), + portStr, info->addr.usb.bus); + return NULL; + } + + *targetIdx = targetPort; return hub; } @@ -2072,13 +2080,6 @@ virDomainUSBAddressReserve(virDomainDeviceInfoPtr info, portStr))) goto cleanup; - if (targetPort >= virBitmapSize(targetHub->portmap)) { - virReportError(VIR_ERR_XML_ERROR, - _("requested USB port %s not present on USB bus %u"), - portStr, info->addr.usb.bus); - goto cleanup; - } - if (virBitmapIsBitSet(targetHub->portmap, targetPort)) { virReportError(VIR_ERR_XML_ERROR, _("Duplicate USB address bus %u port %s"), -- 2.10.2

2 1

[libvirt] [PATCH] qemu: assign USB port on a selected hub for all devices
by Ján Tomko 09 Feb '17

09 Feb '17

Due to a logic error, the autofilling of USB port when a bus is specified: <address type='usb' bus='0'/> does not work for non-hub devices on domain startup. Fix the logic in qemuDomainAssignUSBPortsIterator to also assign ports for USB addresses that do not yet have one. https://bugzilla.redhat.com/show_bug.cgi?id=1374128 --- src/qemu/qemu_domain_address.c | 7 ++++++- tests/qemuxml2argvdata/qemuxml2argv-usb-port-missing.args | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 9cd1e9e..5c09620 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -2238,7 +2238,12 @@ qemuDomainAssignUSBPortsIterator(virDomainDeviceInfoPtr info, { struct qemuAssignUSBIteratorInfo *data = opaque; - if (info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) + if (info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE && + info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB) + return 0; + + if (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB && + virDomainUSBAddressPortIsValid(info->addr.usb.port)) return 0; return virDomainUSBAddressAssign(data->addrs, info); diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-port-missing.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-port-missing.args index ff743c8..fbb328e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-port-missing.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-port-missing.args @@ -22,5 +22,5 @@ server,nowait \ -usb \ -device usb-hub,id=hub0,bus=usb.0,port=1 \ -device usb-hub,id=hub1,bus=usb.0,port=2 \ --device usb-mouse,id=input0,bus=usb.0 \ +-device usb-mouse,id=input0,bus=usb.0,port=1.1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 -- 2.10.2

2 1

[libvirt] [PATCH] [libvirt-perl PATCH] Add more PERF_ constants
by Nitesh Konkar 09 Feb '17

09 Feb '17

Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- Changes | 10 +++++++++- Virt.xs | 9 +++++++++ lib/Sys/Virt/Domain.pm | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 72 insertions(+), 1 deletion(-) diff --git a/Changes b/Changes index 90ee3a4..81a4ff4 100644 --- a/Changes +++ b/Changes @@ -2,7 +2,15 @@ Revision history for perl module Sys::Virt 3.1.0 2017-03-00 - - XXX + - Add PERF_PARAM_CPU_CLOCK constant + - Add PERF_PARAM_TASK_CLOCK constant + - Add PERF_PARAM_PAGE_FAULTS constant + - Add PERF_PARAM_CONTEXT_SWITCHES constant + - Add PERF_PARAM_CPU_MIGRATIONS constant + - Add PERF_PARAM_PAGE_FAULTS_MIN constant + - Add PERF_PARAM_PAGE_FAULTS_MAJ constant + - Add PERF_PARAM_ALIGNMENT_FAULTS constant + - Add PERF_PARAM_EMULATION_FAULTS constant 3.0.0 2017-01-19 diff --git a/Virt.xs b/Virt.xs index a2947b6..7a33d7b 100644 --- a/Virt.xs +++ b/Virt.xs @@ -8491,6 +8491,15 @@ BOOT: REGISTER_CONSTANT_STR(VIR_PERF_PARAM_STALLED_CYCLES_FRONTEND, PERF_PARAM_STALLED_CYCLES_FRONTEND); REGISTER_CONSTANT_STR(VIR_PERF_PARAM_STALLED_CYCLES_BACKEND, PERF_PARAM_STALLED_CYCLES_BACKEND); REGISTER_CONSTANT_STR(VIR_PERF_PARAM_REF_CPU_CYCLES, PERF_PARAM_REF_CPU_CYCLES); + REGISTER_CONSTANT_STR(VIR_PERF_PARAM_CPU_CLOCK, PERF_PARAM_CPU_CLOCK); + REGISTER_CONSTANT_STR(VIR_PERF_PARAM_TASK_CLOCK, PERF_PARAM_TASK_CLOCK); + REGISTER_CONSTANT_STR(VIR_PERF_PARAM_PAGE_FAULTS, PERF_PARAM_PAGE_FAULTS); + REGISTER_CONSTANT_STR(VIR_PERF_PARAM_CONTEXT_SWITCHES, PERF_PARAM_CONTEXT_SWITCHES); + REGISTER_CONSTANT_STR(VIR_PERF_PARAM_CPU_MIGRATIONS, PERF_PARAM_CPU_MIGRATIONS); + REGISTER_CONSTANT_STR(VIR_PERF_PARAM_PAGE_FAULTS_MIN, PERF_PARAM_PAGE_FAULTS_MIN); + REGISTER_CONSTANT_STR(VIR_PERF_PARAM_PAGE_FAULTS_MAJ, PERF_PARAM_PAGE_FAULTS_MAJ); + REGISTER_CONSTANT_STR(VIR_PERF_PARAM_ALIGNMENT_FAULTS, PERF_PARAM_ALIGNMENT_FAULTS); + REGISTER_CONSTANT_STR(VIR_PERF_PARAM_EMULATION_FAULTS, PERF_PARAM_EMULATION_FAULTS); REGISTER_CONSTANT_STR(VIR_DOMAIN_BANDWIDTH_IN_AVERAGE, BANDWIDTH_IN_AVERAGE); REGISTER_CONSTANT_STR(VIR_DOMAIN_BANDWIDTH_IN_PEAK, BANDWIDTH_IN_PEAK); diff --git a/lib/Sys/Virt/Domain.pm b/lib/Sys/Virt/Domain.pm index aa7b5bd..d191ec0 100644 --- a/lib/Sys/Virt/Domain.pm +++ b/lib/Sys/Virt/Domain.pm @@ -2809,6 +2809,60 @@ frequency scaling by applications running on the platform. It corresponds to the "perf.ref_cpu_cycles" field in the *Stats APIs. +=item Sys::Virt::Domain::PERF_PARAM_CPU_CLOCK +The cpu_clock perf event counter which can be used to +measure the count of cpu clock by applications running +on the platform. It corresponds to the "perf.cpu_clock" +field in the *Stats APIs. + +=item Sys::Virt::Domain::PERF_PARAM_TASK_CLOCK +The task_clock perf event counter which can be used to +measure the count of task clock by applications running +on the platform. It corresponds to the "perf.task_clock" +field in the *Stats APIs. + +=item Sys::Virt::Domain::PERF_PARAM_PAGE_FAULTS +The page_faults perf event counter which can be used to +measure the count of page faults by applications running +on the platform. It corresponds to the "perf.page_faults" +field in the *Stats APIs. + +=item Sys::Virt::Domain::PERF_PARAM_CONTEXT_SWITCHES +The context_switches perf event counter which can be used to +measure the count of context switches by applications running +on the platform. It corresponds to the "perf.context_switches" +field in the *Stats APIs. + +=item Sys::Virt::Domain::PERF_PARAM_CPU_MIGRATIONS +The cpu_migrations perf event counter which can be used to +measure the count of cpu migrations by applications running +on the platform. It corresponds to the "perf.cpu_migrations" +field in the *Stats APIs. + +=item Sys::Virt::Domain::PERF_PARAM_PAGE_FAULTS_MIN +The page_faults_min perf event counter which can be used to +measure the count of minor page faults by applications running +on the platform. It corresponds to the "perf.page_faults_min" +field in the *Stats APIs. + +=item Sys::Virt::Domain::PERF_PARAM_PAGE_FAULTS_MAJ +The page_faults_maj perf event counter which can be used to +measure the count of major page faults by applications running +on the platform. It corresponds to the "perf.page_faults_maj" +field in the *Stats APIs. + +=item Sys::Virt::Domain::PERF_PARAM_ALIGNMENT_FAULTS +The alignment_faults perf event counter which can be used to +measure the count of alignment faults by applications running +on the platform. It corresponds to the "perf.alignment_faults" +field in the *Stats APIs. + +=item Sys::Virt::Domain::PERF_PARAM_EMULATION_FAULTS +The emulation_faults perf event counter which can be used to +measure the count of emulation faults by applications running +on the platform. It corresponds to the "perf.emulation_faults" +field in the *Stats APIs. + =back =head2 VCPU FLAGS -- 1.9.3

2 1

[libvirt] [PATCH] qemu: Allow /dev/dri/renderD128
by Michal Privoznik 09 Feb '17

09 Feb '17

This demand comes from qemu_egl_rendernode_open() in qemu source code. It is needed for virgl to work with qemu:///system connection. The session one works just fine. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- docs/drvqemu.html.in | 1 + src/qemu/qemu.conf | 3 ++- src/qemu/qemu_cgroup.c | 1 + src/qemu/test_libvirtd_qemu.aug.in | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/drvqemu.html.in b/docs/drvqemu.html.in index fa1eca78a..c7c34c9f2 100644 --- a/docs/drvqemu.html.in +++ b/docs/drvqemu.html.in @@ -397,6 +397,7 @@ chmod o+x /path/to/directory /dev/random, /dev/urandom, /dev/ptmx, /dev/kvm, /dev/kqemu, /dev/rtc, /dev/hpet, /dev/net/tun +/dev/dri/renderD128 </pre> <p> diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index a8cd369cb..087e6bcce 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -354,7 +354,8 @@ # "/dev/null", "/dev/full", "/dev/zero", # "/dev/random", "/dev/urandom", # "/dev/ptmx", "/dev/kvm", "/dev/kqemu", -# "/dev/rtc","/dev/hpet", "/dev/vfio/vfio" +# "/dev/rtc","/dev/hpet", "/dev/vfio/vfio", +# "/dev/dri/renderD128" #] # # RDMA migration requires the following extra files to be added to the list: diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index 6c90d46d1..b47f714fc 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -47,6 +47,7 @@ const char *const defaultDeviceACL[] = { "/dev/random", "/dev/urandom", "/dev/ptmx", "/dev/kvm", "/dev/kqemu", "/dev/rtc", "/dev/hpet", "/dev/vfio/vfio", + "/dev/dri/renderD128", NULL, }; #define DEVICE_PTY_MAJOR 136 diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index a749f0900..b7067f7b7 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -56,6 +56,7 @@ module Test_libvirtd_qemu = { "9" = "/dev/rtc" } { "10" = "/dev/hpet" } { "11" = "/dev/vfio/vfio" } + { "12" = "/dev/dri/renderD128" } } { "save_image_format" = "raw" } { "dump_image_format" = "raw" } -- 2.11.0

3 6

[libvirt] [PATCH 0/3] Add callback mech for qemu and nodedev
by John Ferlan 09 Feb '17

09 Feb '17

Add a callback mechanism for the nodedev driver (mimics the nwfilter) to allow the (c)ability to directly enumerate node devices and add/remove devices based on udev events. This is a set up of sorts for the ability to add a vHBA definition to a domain, create the vHBA, and allow the LUN's associated with the vHBA to be automagially added/removed to/from the domain. The vHBA code exists partially in some local branches I have, but I figure I need to get this part of the logic accepted. See bz: https://bugzilla.redhat.com/show_bug.cgi?id=1404964 for some "thoughts" on where this is headed. An alternative solution would require the qemu driver to handle or recognize nodedev connection events, but would require a few more calls in order to get the data needed for vHBA handling. The logic ends up being "hidden" behind a new qemu configuration variable "enumerate_nodedev" (I'm fine using a different name). The default is for the code to be disabled. The end result may be usable by the (on list) vGPU mdev code as well as a way to find/recogize an mdev create and the various "children" of the mdev that would be created (and of course deletion). But that's just me considering other uses. John Ferlan (3): nodedev: Add driver callback mechanism to add/remove devices qemu: Use nodedev callback mechanism to to get a nodedev data qemu: Add configuration variable to control nodedev enumeration src/check-aclrules.pl | 3 +- src/check-driverimpls.pl | 1 + src/conf/node_device_conf.c | 125 ++++++++++++++++++++++++++++++++++++- src/conf/node_device_conf.h | 18 ++++++ src/libvirt_private.syms | 3 + src/node_device/node_device_udev.c | 29 +++++++++ src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 19 ++++++ src/qemu/qemu_conf.c | 53 ++++++++++++++++ src/qemu/qemu_conf.h | 17 +++++ src/qemu/qemu_driver.c | 34 ++++++++++ src/qemu/test_libvirtd_qemu.aug.in | 1 + 12 files changed, 302 insertions(+), 2 deletions(-) -- 2.7.4

2 5

[libvirt] [PATCH 1/1] qemu: libvirt live migration over RDMA of ipv6 addr failed
by David Dai 09 Feb '17

09 Feb '17

Using libvirt to do live migration over RDMA via ip v6 address failed. For example: # virsh migrate --live --migrateuri rdma://[deba::2222]:49152 \ rhel73_host1_guest1 qemu+ssh://[deba::2222]/system --verbose root@deba::2222's password: error: internal error: unable to execute QEMU command 'migrate': RDMA ERROR: could not rdma_getaddrinfo address deba As we can see, the ip v6 address used by rdma_getaddrinfo() has only "deba" part. It should be "deba::2222". 1) According to rfc 3986, a literal ip v6 address should be enclosed in '[' and ']'. When using virsh command to do live migration via ip v6 addresss, user will input the ip v6 address with brackets (i.e. rdma://[deba::2222]:49152). libvirt will parse command line option by calling virURIParse(). Inside it calls virStringStripIPv6Brackets() to strip off the brackets. The uri passed in to virURIParse() is: "uri = rdma://[deba::2222]:49152" Inside virURIParse() routine, it will strip off the bracket '[' and ']' if it's ip v6 address. Then save the ip v6 address in this format "deba::2222" in the virURI->server field, and to be passed to qemu. 2) At the beginning of migration, in qemu's qemu_rdma_data_init(host_port) routine, it calls inet_parse(host_port) routine to parse the ip v6 address and port string obtained from libvirt. The input string host_port passed to qemu_rdma_data_init() can be: "hostname:port", or "ipv4address:port", or "[ipv6address]:port" (i.e "[deba::2222]:49152"), or "ipv6address:port" (i.e "deba::2222:49152"). Existing qemu api inet_parse() can handle the above first 3 cases properly, but didn't handle the last case ("ipv6address:port") correctly. In this live migration over rdma via ip v6 address case, the server ip v6 address obtained from libvirt doesn't contain the brackets '[' and ']' (i.e. "deba::2222:49152"). It caused inet_parse() to parse only "deba" part, and stopped at the 1st colon ':'. As the result, the subsequent rdma_getaddrinfo() with ip address "deba" will fail. NOTE: If using libvirt to do live migration over TCP via ip v6 address: # virsh migrate --live --migrateuri tcp://[deba::2222]:49152 \ rhel73_host1_guest1 qemu+ssh://[deba::2222]/system --verbose It works fine. In migrateuri of tcp case, libvirt will call virNetSocketNewConnectTCP() directly to connect to remote "deba::2222" after it strips off the brackets '[' and ']' for an ip v6 address. On qemu side, fd_start_outgoing_migration() will be called to do migration. It doesn't call inet_parse(). So we don't see issue in tcp case. Solution: Originally the patch was proposed to Qemu-devel commuity to changed code in inet_parse() to handle ipv6 address w/o brackets ("ipv6:port" format). Daniel's review comment is it's mandatory to use [] when providing a numeric IPv6 address. So there's nothing broken in QEMU. libvirt needs fixing to pass correct data to QEMU. Now the new proposed patch is in libvirt's qemu driver, in qemuMonitorMigrateToHost() routine, it will assemble uri based on host and port values passed in. If the host passed in is an ipv6 address, we will enclose brackets [] for the ipv6 address here before calling qemuMonitorJSONMigrate(). The -incoming CLI part of enclosed brackets ipv6 address is already taken care of in qemuMigrationPrepareIncoming() routine. Signed-off-by: David Dai <zdai(a)linux.vnet.ibm.com> --- src/qemu/qemu_monitor.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index b7be5e7..258665c 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -2577,8 +2577,12 @@ qemuMonitorMigrateToHost(qemuMonitorPtr mon, QEMU_CHECK_MONITOR(mon); - if (virAsprintf(&uri, "%s:%s:%d", protocol, hostname, port) < 0) - return -1; + if (strchr(hostname, ':')) { + if (virAsprintf(&uri, "%s:[%s]:%d", protocol, hostname, port) < 0) + return -1; + } else if (virAsprintf(&uri, "%s:%s:%d", protocol, hostname, port) < 0) { + return -1; + } if (mon->json) ret = qemuMonitorJSONMigrate(mon, flags, uri); -- 1.7.1

2 1

[libvirt] [PATCH V2 0/2] libxl: a few domain maximum memory fixes
by Jim Fehlig 09 Feb '17

09 Feb '17

Patch 1 fixes reporting of domain maximum memory for running domains. When creating a virDomainDef object to represent dom0, max memory was not set correctly, which is fixed by patch2. V2: Check return value of libxl_get_physinfo and libxlDriverGetDom0MaxmemConf in patch2. Jim Fehlig (2): libxl: fix reporting of maximum memory libxl: fix dom0 maximum memory setting src/libxl/libxl_conf.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++++ src/libxl/libxl_conf.h | 4 +++ src/libxl/libxl_driver.c | 10 ++++--- 3 files changed, 87 insertions(+), 4 deletions(-) -- 2.9.2

2 8

[libvirt] [PATCH V2 0/2] libxl: fix handling of <disk> driver and format settings
by Jim Fehlig 09 Feb '17

09 Feb '17

V2 of https://www.redhat.com/archives/libvir-list/2017-February/msg00185.html Patch1 is new in V2 and essentially moves default setting of disk format from domain build time to device post-parse, which addresses Michal's comment from V1. Patch2 is mostly unchanged. The hunk setting format of virDomainDiskDef in libxlMakeDisk is removed since that is now handled by patch1. Jim Fehlig (2): libxl: set default disk format in device post-parse libxl: fix disk detach when <driver> not specified src/libxl/libxl_conf.c | 42 ++++++++++++++++++++++++++++++++++-------- src/libxl/libxl_conf.h | 4 ++++ src/libxl/libxl_domain.c | 32 +++++++++++++++++++++++++++++++- src/libxl/libxl_driver.c | 1 + 4 files changed, 70 insertions(+), 9 deletions(-) -- 2.9.2

2 5

[libvirt] [PATCH v3 0/3] network: make openvswitch call timeout configurable
by Boris Fiuczynski 09 Feb '17

09 Feb '17

Since a successful completion of openvswitch calls is expected a longer timeout should be able to be chosen in order to account for loaded systems. Therefore this patch series provides the ability to specify the timeout value for openvswitch calls in the libvirtd configuration file. Boris Fiuczynski (3): libvirtd: add openvitch timeout value network: allow to specify timeout for openvswitch calls libvirtd: set openvswitch timeout value based on config data daemon/libvirtd-config.c | 6 ++++ daemon/libvirtd-config.h | 2 ++ daemon/libvirtd.aug | 1 + daemon/libvirtd.c | 13 +++++++++ daemon/libvirtd.conf | 9 ++++++ daemon/test_libvirtd.aug.in | 1 + src/libvirt_private.syms | 1 + src/util/virnetdevopenvswitch.c | 64 +++++++++++++++++++++++++++++++++++------ src/util/virnetdevopenvswitch.h | 5 ++++ 9 files changed, 94 insertions(+), 8 deletions(-) -- 2.5.5

2 12

[libvirt] question about connection between vms in two physical hosts
by 无敌浪子 09 Feb '17

09 Feb '17

Hi there, I have some vms in two different physical hosts, the hosts are connected directly instead of a switcher, I'd like to make all these vms connected. the condition right now is that vm network type is nat, vm behind nat cannot get the new connection inbound, I suppose if I can make the inbound connection acceptable or if there is any other solution ? Thank you best wishes bill

2 1

[libvirt] [PATCHv5 0/4] Add support for memory backing with file source
by Jaroslav Safka 09 Feb '17

09 Feb '17

Hi, we would like to introduce 3 new elements source,access and allocation in memoryBacking element. For now it was made for numa topology. <memoryBacking> <source type="file|anonymous"/> <access mode="shared|private"/> <allocation mode="immediate|ondemand"/> </memoryBacking> If allocation is immediate then -mem-prealloc should be added to the qemu commanline. If source is file then -object memory-backend-file,id=mem,size=1024M,mem-path=*lib dir path* -numa node,memdev=mem Will be added to the qemu commandline If access is shared then the "share=on" parameter will be added to the memory-backend-file e.g. -object memory-backend-file,id=mem,size=1024M,mem-path=/var/lib/libvirt/qemu,share=on The access mode can be overriden by specifying token memAccess in numa cell. The mem-path can be defined by new config parameter memory_backing_dir. PS: the sometime failing test qemuhotplug was failing also before this patch :) Jaroslav Safka (4): qemu,conf: Rename virNumaMemAccess to virDomainMemoryAccess qemu_conf: Add param memory_backing_dir conf: Add new xml elements for file memorybacking support qemu: Add args generation for file memory backing docs/formatdomain.html.in | 9 ++ docs/schemas/domaincommon.rng | 30 +++++ src/conf/domain_conf.c | 133 ++++++++++++++++----- src/conf/domain_conf.h | 22 ++++ src/conf/numa_conf.c | 15 +-- src/conf/numa_conf.h | 14 +-- src/qemu/libvirtd_qemu.aug | 3 + src/qemu/qemu.conf | 4 + src/qemu/qemu_command.c | 55 ++++++--- src/qemu/qemu_conf.c | 9 ++ src/qemu/qemu_conf.h | 2 + src/qemu/qemu_process.c | 2 +- src/qemu/test_libvirtd_qemu.aug.in | 1 + .../qemuxml2argv-fd-memory-no-numa-topology.args | 21 ++++ .../qemuxml2argv-fd-memory-no-numa-topology.xml | 27 +++++ .../qemuxml2argv-fd-memory-numa-topology.args | 24 ++++ .../qemuxml2argv-fd-memory-numa-topology.xml | 30 +++++ .../qemuxml2argv-fd-memory-numa-topology2.args | 27 +++++ .../qemuxml2argv-fd-memory-numa-topology2.xml | 31 +++++ .../qemuxml2argv-fd-memory-numa-topology3.args | 30 +++++ .../qemuxml2argv-fd-memory-numa-topology3.xml | 32 +++++ .../qemuxml2argv-memorybacking-set.xml | 24 ++++ .../qemuxml2argv-memorybacking-unset.xml | 24 ++++ tests/qemuxml2argvtest.c | 13 ++ .../qemuxml2xmlout-memorybacking-set.xml | 32 +++++ .../qemuxml2xmlout-memorybacking-unset.xml | 32 +++++ tests/qemuxml2xmltest.c | 3 + 27 files changed, 584 insertions(+), 65 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-fd-memory-no-numa-topology.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-fd-memory-no-numa-topology.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-fd-memory-numa-topology.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-fd-memory-numa-topology.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-fd-memory-numa-topology2.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-fd-memory-numa-topology2.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-fd-memory-numa-topology3.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-fd-memory-numa-topology3.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memorybacking-set.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memorybacking-unset.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-memorybacking-set.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-memorybacking-unset.xml -- 2.7.4 -------------------------------------------------------------- Intel Research and Development Ireland Limited Registered in Ireland Registered Office: Collinstown Industrial Park, Leixlip, County Kildare Registered Number: 308263 This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.

3 7

[libvirt] [PATCH v2] cpu: fix typo: rename __kvm_hv_spinlock to __kvm_hv_spinlocks
by Maxim Nestratov 09 Feb '17

09 Feb '17

Strings associated with virDomainHyperv values in domain_conf.c are used to construct HyperV CPU features names to be compared with names defined in cpu_x86_data.h and the names for HyperV "spinlocks" feature don't match. This leads to a misleading warning: "host doesn't support hyperv 'spinlocks' feature" even when it's supported. Let's fix it and rename along with it VIR_CPU_x86_KVM_HV_SPINLOCK to VIR_CPU_x86_KVM_HV_SPINLOCKS. Signed-off-by: Maxim Nestratov <mnestratov(a)virtuozzo.com> --- src/cpu/cpu_x86.c | 4 ++-- src/cpu/cpu_x86_data.h | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 23a519e..40d98ee 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -100,7 +100,7 @@ KVM_FEATURE_DEF(VIR_CPU_x86_KVM_HV_STIMER, 0x40000003, 0x00000008); KVM_FEATURE_DEF(VIR_CPU_x86_KVM_HV_RELAXED, 0x40000003, 0x00000020); -KVM_FEATURE_DEF(VIR_CPU_x86_KVM_HV_SPINLOCK, +KVM_FEATURE_DEF(VIR_CPU_x86_KVM_HV_SPINLOCKS, 0x40000003, 0x00000022); KVM_FEATURE_DEF(VIR_CPU_x86_KVM_HV_VAPIC, 0x40000003, 0x00000030); @@ -124,7 +124,7 @@ static virCPUx86Feature x86_kvm_features[] = KVM_FEATURE(VIR_CPU_x86_KVM_HV_SYNIC), KVM_FEATURE(VIR_CPU_x86_KVM_HV_STIMER), KVM_FEATURE(VIR_CPU_x86_KVM_HV_RELAXED), - KVM_FEATURE(VIR_CPU_x86_KVM_HV_SPINLOCK), + KVM_FEATURE(VIR_CPU_x86_KVM_HV_SPINLOCKS), KVM_FEATURE(VIR_CPU_x86_KVM_HV_VAPIC), KVM_FEATURE(VIR_CPU_x86_KVM_HV_VPINDEX), KVM_FEATURE(VIR_CPU_x86_KVM_HV_RESET), diff --git a/src/cpu/cpu_x86_data.h b/src/cpu/cpu_x86_data.h index 4660ab6..4c51e43 100644 --- a/src/cpu/cpu_x86_data.h +++ b/src/cpu/cpu_x86_data.h @@ -49,11 +49,17 @@ struct _virCPUx86CPUID { # define VIR_CPU_x86_KVM_PV_EOI "__kvm_pv_eoi" # define VIR_CPU_x86_KVM_PV_UNHALT "__kvm_pv_unhalt" # define VIR_CPU_x86_KVM_CLOCKSOURCE_STABLE_BIT "__kvm_clocksource_stable" + +/* + * The following HyperV feature names suffixes must exactly match corresponding + * ones defined in domain_conf.c. E.g "__kvm_runtime" -> "runtime", + * "__kvm_hv_spinlocks" -> "spinlocks" etc. +*/ # define VIR_CPU_x86_KVM_HV_RUNTIME "__kvm_hv_runtime" # define VIR_CPU_x86_KVM_HV_SYNIC "__kvm_hv_synic" # define VIR_CPU_x86_KVM_HV_STIMER "__kvm_hv_stimer" # define VIR_CPU_x86_KVM_HV_RELAXED "__kvm_hv_relaxed" -# define VIR_CPU_x86_KVM_HV_SPINLOCK "__kvm_hv_spinlock" +# define VIR_CPU_x86_KVM_HV_SPINLOCKS "__kvm_hv_spinlocks" # define VIR_CPU_x86_KVM_HV_VAPIC "__kvm_hv_vapic" # define VIR_CPU_x86_KVM_HV_VPINDEX "__kvm_hv_vpindex" # define VIR_CPU_x86_KVM_HV_RESET "__kvm_hv_reset" -- 2.4.11

2 2

[libvirt] [PATCH] cpu_x86: Fix memory leak in virCPUx86Translate
by Jiri Denemark 09 Feb '17

09 Feb '17

virCPUDefStealModel is called with keepVendor == true which means the cpu structure will keep its original vendor/vendor_id values. Thus it makes no sense to copy them to the translated definition as they won't be used there anyway. Except that the translated->vendor pointer might get lost in x86Decode. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/cpu/cpu_x86.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 23a519ec0..9e22f896e 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -2709,10 +2709,6 @@ virCPUx86Translate(virCPUDefPtr cpu, if (!(translated = virCPUDefCopyWithoutModel(cpu))) goto cleanup; - if (VIR_STRDUP(translated->vendor, cpu->vendor) < 0 || - VIR_STRDUP(translated->vendor_id, cpu->vendor_id) < 0) - goto cleanup; - if (x86Decode(translated, &model->data, models, nmodels, NULL, 0) < 0) goto cleanup; -- 2.11.1

2 1

[libvirt] [PATCH 00/11] qemu: Big namespace cleanup
by Michal Privoznik 09 Feb '17

09 Feb '17

Couple of these patches were requested in reviews to my previous namespace patches, couple of them are my own idea. At the same time, 3 bugs are fixed: 1) qemuSecurity wrappers are preferred over virSecurityManager 2) corresponding /dev entry is not created when attaching vhost scsi device 3) corresponding /dev entry is not created when doing blockjobs Michal Privoznik (11): qemuDomainAttachSCSIVHostDevice: Prefer qemuSecurity wrappers syntax-check: Enforce qemuSecurity qemuDomainAttachSCSIVHostDevice: manage /dev entry qemu_security: Kill code duplication qemu_security: Drop qemuSecuritySetRestoreAllLabelData struct qemu_domain: Don't pass virDomainDeviceDefPtr to ns helpers qemuDomainNamespaceSetupDisk: Drop useless @src variable qemuDomainNamespace{Setup,Teardown}Disk: Don't pass pointer to full disk qemuDomainDiskChainElement{Prepare,Revoke}: manage /dev entry qemu_security: Introduce ImageLabel APIs qemuDomainNamespaceSetupDisk: Simplify disk check cfg.mk | 8 ++ src/qemu/qemu_domain.c | 65 ++++++---------- src/qemu/qemu_domain.h | 4 +- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_hotplug.c | 20 +++-- src/qemu/qemu_security.c | 189 ++++++++++++----------------------------------- src/qemu/qemu_security.h | 8 ++ 7 files changed, 102 insertions(+), 194 deletions(-) -- 2.11.0

3 37

[libvirt] [PATCH] qemu_command: Fix check for gluster disks
by Jiri Denemark 09 Feb '17

09 Feb '17

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 0767c6649..1880bd386 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1419,7 +1419,7 @@ qemuBuildDriveSourceStr(virDomainDiskDefPtr disk, } virBufferAddLit(buf, ","); - if (disk->src && + if (disk->src->type == VIR_STORAGE_TYPE_NETWORK && disk->src->protocol == VIR_STORAGE_NET_PROTOCOL_GLUSTER) { if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_GLUSTER_DEBUG_LEVEL)) virBufferAsprintf(buf, "file.debug=%d,", cfg->glusterDebugLevel); -- 2.11.1

2 1

[libvirt] [PATCH] vz: cleanup: remove unused constant
by Maxim Nestratov 09 Feb '17

09 Feb '17

PARALLELS_STATISTICS_DROP_COUNT isn't used anymore Signed-off-by: Maxim Nestratov <mnestratov(a)virtuozzo.com> --- src/vz/vz_sdk.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 614dca1..30eb743 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -2187,8 +2187,6 @@ prlsdkHandleVmRemovedEvent(vzDriverPtr driver, return; } -#define PARALLELS_STATISTICS_DROP_COUNT 3 - static void prlsdkHandlePerfEvent(vzDriverPtr driver, PRL_HANDLE event, -- 2.4.11

2 2

[libvirt] [PATCH 0/2] vz: fix two handle leaks
by Maxim Nestratov 09 Feb '17

09 Feb '17

Maxim Nestratov (2): vz: fix handle leak in prlsdkHandleVmStateEvent vz: fix event handle leak in prlsdkHandlePerfEvent src/vz/vz_sdk.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -- 2.4.11

2 5

[libvirt] [PATCH] qemu_blockjob: Avoid dereferencing NULL on OOM
by Jiri Denemark 09 Feb '17

09 Feb '17

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_blockjob.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index 4ada4cd27..985fae1e9 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -123,7 +123,8 @@ qemuBlockJobEventProcess(virQEMUDriverPtr driver, if ((persistDisk = virDomainDiskByName(vm->newDef, disk->dst, false))) { copy = virStorageSourceCopy(disk->mirror, false); - if (virStorageSourceInitChainElement(copy, + if (!copy || + virStorageSourceInitChainElement(copy, persistDisk->src, true) < 0) { VIR_WARN("Unable to update persistent definition " -- 2.11.1

2 1

Re: [libvirt] [PATCHv5 0/4] UPDATE Add support for memory backing with file source
by Safka, JaroslavX 09 Feb '17

09 Feb '17

I updated a little the description diff --git a/docs/news.xml b/docs/news.xml index f408293..5f37592 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -23,6 +23,16 @@ built-in replication and disaster recovery. </description> </change> + <change> + <summary> + qemu: Add support for memory backing with file source + </summary> + <description> + Add support in numa topology for file source inside memory backing (hugepages are not needed) + Three new elements <source>,<access> and <allocation> were added to <memoryBacking> element. + Also new configuration parameter "memory_backing_dir" was added. + </description> + </change> </section> <section title="Improvements"> <change> > -----Original Message----- > From: Michal Privoznik [mailto:mprivozn@redhat.com] > Sent: Thursday, February 09, 2017 9:58 AM > To: Safka, JaroslavX <jaroslavx.safka(a)intel.com>; libvir-list(a)redhat.com > Cc: Mooney, Sean K <sean.k.mooney(a)intel.com>; Ptacek, MichalX > <michalx.ptacek(a)intel.com> > Subject: Re: [libvirt] [PATCHv5 0/4] Add support for memory backing with file > source > > On 02/02/2017 02:27 PM, Jaroslav Safka wrote: > > Hi, > > we would like to introduce 3 new elements source,access and allocation in > memoryBacking element. > > For now it was made for numa topology. > > > > <memoryBacking> > > <source type="file|anonymous"/> > > <access mode="shared|private"/> > > <allocation mode="immediate|ondemand"/> </memoryBacking> > > > > If allocation is immediate then -mem-prealloc should be added to the qemu > commanline. > > If source is file then > > -object memory-backend-file,id=mem,size=1024M,mem-path=*lib dir path* > > -numa node,memdev=mem Will be added to the qemu commandline > > > > If access is shared then the "share=on" parameter will be added to the > memory-backend-file e.g. > > -object > > memory-backend-file,id=mem,size=1024M,mem-path=/var/lib/libvirt/qemu,s > > hare=on > > > > The access mode can be overriden by specifying token memAccess in numa > cell. > > The mem-path can be defined by new config parameter > memory_backing_dir. > > > > PS: the sometime failing test qemuhotplug was failing also before this > > patch :) > > > > Jaroslav Safka (4): > > qemu,conf: Rename virNumaMemAccess to virDomainMemoryAccess > > qemu_conf: Add param memory_backing_dir > > conf: Add new xml elements for file memorybacking support > > qemu: Add args generation for file memory backing > > > > docs/formatdomain.html.in | 9 ++ > > docs/schemas/domaincommon.rng | 30 +++++ > > src/conf/domain_conf.c | 133 ++++++++++++++++----- > > src/conf/domain_conf.h | 22 ++++ > > src/conf/numa_conf.c | 15 +-- > > src/conf/numa_conf.h | 14 +-- > > src/qemu/libvirtd_qemu.aug | 3 + > > src/qemu/qemu.conf | 4 + > > src/qemu/qemu_command.c | 55 ++++++--- > > src/qemu/qemu_conf.c | 9 ++ > > src/qemu/qemu_conf.h | 2 + > > src/qemu/qemu_process.c | 2 +- > > src/qemu/test_libvirtd_qemu.aug.in | 1 + > > .../qemuxml2argv-fd-memory-no-numa-topology.args | 21 ++++ > > .../qemuxml2argv-fd-memory-no-numa-topology.xml | 27 +++++ > > .../qemuxml2argv-fd-memory-numa-topology.args | 24 ++++ > > .../qemuxml2argv-fd-memory-numa-topology.xml | 30 +++++ > > .../qemuxml2argv-fd-memory-numa-topology2.args | 27 +++++ > > .../qemuxml2argv-fd-memory-numa-topology2.xml | 31 +++++ > > .../qemuxml2argv-fd-memory-numa-topology3.args | 30 +++++ > > .../qemuxml2argv-fd-memory-numa-topology3.xml | 32 +++++ > > .../qemuxml2argv-memorybacking-set.xml | 24 ++++ > > .../qemuxml2argv-memorybacking-unset.xml | 24 ++++ > > tests/qemuxml2argvtest.c | 13 ++ > > .../qemuxml2xmlout-memorybacking-set.xml | 32 +++++ > > .../qemuxml2xmlout-memorybacking-unset.xml | 32 +++++ > > tests/qemuxml2xmltest.c | 3 + > > 27 files changed, 584 insertions(+), 65 deletions(-) create mode > > 100644 > > tests/qemuxml2argvdata/qemuxml2argv-fd-memory-no-numa-topology.args > > create mode 100644 > > tests/qemuxml2argvdata/qemuxml2argv-fd-memory-no-numa-topology.xml > > create mode 100644 > > tests/qemuxml2argvdata/qemuxml2argv-fd-memory-numa-topology.args > > create mode 100644 > > tests/qemuxml2argvdata/qemuxml2argv-fd-memory-numa-topology.xml > > create mode 100644 > > tests/qemuxml2argvdata/qemuxml2argv-fd-memory-numa-topology2.args > > create mode 100644 > > tests/qemuxml2argvdata/qemuxml2argv-fd-memory-numa-topology2.xml > > create mode 100644 > > tests/qemuxml2argvdata/qemuxml2argv-fd-memory-numa-topology3.args > > create mode 100644 > > tests/qemuxml2argvdata/qemuxml2argv-fd-memory-numa-topology3.xml > > create mode 100644 > > tests/qemuxml2argvdata/qemuxml2argv-memorybacking-set.xml > > create mode 100644 > > tests/qemuxml2argvdata/qemuxml2argv-memorybacking-unset.xml > > create mode 100644 > > tests/qemuxml2xmloutdata/qemuxml2xmlout-memorybacking-set.xml > > create mode 100644 > > tests/qemuxml2xmloutdata/qemuxml2xmlout-memorybacking-unset.xml > > > > Looking good. ACK to all of them. However, please send a patch (as a reply to > this cover letter) that updates docs/news.xml. Only after that it is possible to > push these. > > Michal -------------------------------------------------------------- Intel Research and Development Ireland Limited Registered in Ireland Registered Office: Collinstown Industrial Park, Leixlip, County Kildare Registered Number: 308263 This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.

1 0

[libvirt] [PATCH 0/2] libxl: a few domain maximum memory fixes
by Jim Fehlig 08 Feb '17

08 Feb '17

Patch 1 fixes reporting of domain maximum memory for running domains. When creating a virDomainDef object to represent dom0, max memory was not set correctly, which is fixed by patch2. Jim Fehlig (2): libxl: fix reporting of maximum memory libxl: fix dom0 maximum memory setting src/libxl/libxl_conf.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++++ src/libxl/libxl_conf.h | 3 ++ src/libxl/libxl_driver.c | 7 ++--- 3 files changed, 81 insertions(+), 4 deletions(-) -- 2.9.2

2 6

[libvirt] [PATCH 0/2] libxl: some small fixes
by Jim Fehlig 08 Feb '17

08 Feb '17

I noticed a few small bugs while fixing the domain maximum memory bugs :-). See patches for details. Jim Fehlig (2): libxl: honor autoballoon setting in libxl.conf libxl: use init and dispose functions with libxl_physinfo src/libxl/libxl_capabilities.c | 16 +++++++++++----- src/libxl/libxl_conf.c | 7 ++++++- src/libxl/libxl_driver.c | 2 ++ 3 files changed, 19 insertions(+), 6 deletions(-) -- 2.9.2

2 7

[libvirt] [PATCH] xenconfig: fix xml conversion convert with no graphics
by Joao Martins 08 Feb '17

08 Feb '17

If no graphics element is in XML xenFormatXLSpice will access graphics without checking it has one in the first place, leading to a segmentation fault. Signed-off-by: Joao Martins <joao.m.martins(a)oracle.com> --- src/xenconfig/xen_xl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/xenconfig/xen_xl.c b/src/xenconfig/xen_xl.c index 2c9174e..74f68b3 100644 --- a/src/xenconfig/xen_xl.c +++ b/src/xenconfig/xen_xl.c @@ -1168,7 +1168,7 @@ xenFormatXLSpice(virConfPtr conf, virDomainDefPtr def) virDomainGraphicsListenDefPtr glisten; virDomainGraphicsDefPtr graphics; - if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) { + if (def->os.type == VIR_DOMAIN_OSTYPE_HVM && def->graphics) { graphics = def->graphics[0]; if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE) { -- 2.1.4

2 1

[libvirt] [PATCH] qemu_security: Introduce ImageLabel APIs
by Michal Privoznik 08 Feb '17

08 Feb '17

Just like we need wrappers over other virSecurityManager APIs, we need one for virSecurityManagerSetImageLabel and virSecurityManagerRestoreImageLabel. Otherwise we might end up relabelling device in wrong namespace. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_domain.c | 7 +++--- src/qemu/qemu_security.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_security.h | 8 +++++++ 3 files changed, 67 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index d3f765605..7c696963e 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -31,6 +31,7 @@ #include "qemu_parse_command.h" #include "qemu_capabilities.h" #include "qemu_migration.h" +#include "qemu_security.h" #include "viralloc.h" #include "virlog.h" #include "virerror.h" @@ -5094,8 +5095,7 @@ qemuDomainDiskChainElementRevoke(virQEMUDriverPtr driver, VIR_WARN("Failed to teardown cgroup for disk path %s", NULLSTR(elem->path)); - if (virSecurityManagerRestoreImageLabel(driver->securityManager, - vm->def, elem) < 0) + if (qemuSecurityRestoreImageLabel(driver, vm, elem) < 0) VIR_WARN("Unable to restore security label on %s", NULLSTR(elem->path)); if (qemuDomainNamespaceTeardownDisk(driver, vm, elem) < 0) @@ -5135,8 +5135,7 @@ qemuDomainDiskChainElementPrepare(virQEMUDriverPtr driver, if (qemuSetupImageCgroup(vm, elem) < 0) goto cleanup; - if (virSecurityManagerSetImageLabel(driver->securityManager, vm->def, - elem) < 0) + if (qemuSecuritySetImageLabel(driver, vm, elem) < 0) goto cleanup; ret = 0; diff --git a/src/qemu/qemu_security.c b/src/qemu/qemu_security.c index ceac5bf56..f2931976b 100644 --- a/src/qemu/qemu_security.c +++ b/src/qemu/qemu_security.c @@ -133,6 +133,62 @@ qemuSecurityRestoreDiskLabel(virQEMUDriverPtr driver, } +int +qemuSecuritySetImageLabel(virQEMUDriverPtr driver, + virDomainObjPtr vm, + virStorageSourcePtr src) +{ + int ret = -1; + + if (qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT) && + virSecurityManagerTransactionStart(driver->securityManager) < 0) + goto cleanup; + + if (virSecurityManagerSetImageLabel(driver->securityManager, + vm->def, + src) < 0) + goto cleanup; + + if (qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT) && + virSecurityManagerTransactionCommit(driver->securityManager, + vm->pid) < 0) + goto cleanup; + + ret = 0; + cleanup: + virSecurityManagerTransactionAbort(driver->securityManager); + return ret; +} + + +int +qemuSecurityRestoreImageLabel(virQEMUDriverPtr driver, + virDomainObjPtr vm, + virStorageSourcePtr src) +{ + int ret = -1; + + if (qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT) && + virSecurityManagerTransactionStart(driver->securityManager) < 0) + goto cleanup; + + if (virSecurityManagerRestoreImageLabel(driver->securityManager, + vm->def, + src) < 0) + goto cleanup; + + if (qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT) && + virSecurityManagerTransactionCommit(driver->securityManager, + vm->pid) < 0) + goto cleanup; + + ret = 0; + cleanup: + virSecurityManagerTransactionAbort(driver->securityManager); + return ret; +} + + int qemuSecuritySetHostdevLabel(virQEMUDriverPtr driver, virDomainObjPtr vm, diff --git a/src/qemu/qemu_security.h b/src/qemu/qemu_security.h index cc373b3e1..54638908d 100644 --- a/src/qemu/qemu_security.h +++ b/src/qemu/qemu_security.h @@ -45,6 +45,14 @@ int qemuSecurityRestoreDiskLabel(virQEMUDriverPtr driver, virDomainObjPtr vm, virDomainDiskDefPtr disk); +int qemuSecuritySetImageLabel(virQEMUDriverPtr driver, + virDomainObjPtr vm, + virStorageSourcePtr src); + +int qemuSecurityRestoreImageLabel(virQEMUDriverPtr driver, + virDomainObjPtr vm, + virStorageSourcePtr src); + int qemuSecuritySetHostdevLabel(virQEMUDriverPtr driver, virDomainObjPtr vm, virDomainHostdevDefPtr hostdev); -- 2.11.0

2 1

[libvirt] [resend v2 0/7] Support cache tune in libvirt
by Eli Qiao 08 Feb '17

08 Feb '17

This series patches are for supportting CAT featues, which also called cache tune in libvirt. First to expose cache information which could be tuned in capabilites XML. Then add new domain xml element support to add cacahe bank which will apply on this libvirt domain. This series patches add a util file `resctrl.c/h`, an interface to talk with linux kernel's sys fs. There are still some TODOs such as expose new public interface to get free cache information. Some discussion about this feature support can be found from: https://www.redhat.com/archives/libvir-list/2017-January/msg00644.html Eli Qiao (7): Resctrl: Add some utils functions Resctrl: expose cache information to capabilities Resctrl: Add new xml element to support cache tune Resctrl: Add private interface to set cachebanks Qemu: Set cache banks Resctrl: enable l3code/l3data Resctrl: Make sure l3data/l3code are pairs docs/schemas/domaincommon.rng | 41 ++ include/libvirt/virterror.h | 1 + src/Makefile.am | 1 + src/conf/capabilities.c | 56 +++ src/conf/capabilities.h | 23 + src/conf/domain_conf.c | 154 +++++++ src/conf/domain_conf.h | 18 + src/libvirt_private.syms | 10 + src/qemu/qemu_capabilities.c | 68 +++ src/qemu/qemu_driver.c | 4 + src/qemu/qemu_process.c | 11 + src/util/virerror.c | 1 + src/util/virresctrl.c | 1019 +++++++++++++++++++++++++++++++++++++++++ src/util/virresctrl.h | 135 ++++++ 14 files changed, 1542 insertions(+) create mode 100644 src/util/virresctrl.c create mode 100644 src/util/virresctrl.h -- 1.9.1

5 25

[libvirt] [PATCH] conf: fix use-after-free when sending event message
by Wang King 08 Feb '17

08 Feb '17

If there is a process with a client which registers event callbacks, and it calls libvirt's API which uses the same virConnectPtr in that callback function. When this process exit abnormally lead to client disconnect, there is a possibility that the main thread is refer to virServerClient just after the virServerClient been freed by job thread of libvirtd. Following is the backtrace: #0 0x00007fda223d66d8 in virClassIsDerivedFrom (klass=0xdeadbeef,parent=0x7fda24c81b40) #1 0x00007fda223d6a1e in virObjectIsClass (anyobj=anyobj@entry=0x7fd9e575b400,klass=) #2 0x00007fda223d6a44 in virObjectLock (anyobj=anyobj@entry=0x7fd9e575b400) #3 0x00007fda22507f71 in virNetServerClientSendMessage (client=client@entry=0x7fd9e575b400, msg=msg@entry=0x7fd9ec30de90) #4 0x00007fda230d714d in remoteDispatchObjectEventSend (client=0x7fd9e575b400, program=0x7fda24c844e0, procnr=procnr@entry=348, proc=0x7fda2310e5e0 , data=data@entry=0x7ffc3857fdb0) #5 0x00007fda230dd71b in remoteRelayDomainEventTunable (conn=, dom=0x7fda27cd7660, params=0x7fda27f3aae0, nparams=1, opaque=0x7fd9e6c99e00) #6 0x00007fda224484cb in virDomainEventDispatchDefaultFunc (conn=0x7fda27cd0120, event=0x7fda2736ea00, cb=0x7fda230dd610 , cbopaque=0x7fd9e6c99e00) #7 0x00007fda22446871 in virObjectEventStateDispatchCallbacks (callbacks=, callbacks=, event=0x7fda2736ea00, state=0x7fda24ca3960) #8 virObjectEventStateQueueDispatch (callbacks=0x7fda24c65800, queue=0x7ffc3857fe90, state=0x7fda24ca3960) #9 virObjectEventStateFlush (state=0x7fda24ca3960) #10 virObjectEventTimer (timer=, opaque=0x7fda24ca3960) #11 0x00007fda223ae8b9 in virEventPollDispatchTimeouts () #12 virEventPollRunOnce () #13 0x00007fda223ad1d2 in virEventRunDefaultImpl () #14 0x00007fda225046cd in virNetDaemonRun (dmn=dmn@entry=0x7fda24c775c0) #15 0x00007fda230d6351 in main (argc=, argv=) (gdb) p *(virNetServerClientPtr)0x7fd9e575b400 $2 = {parent = {parent = {u = {dummy_align1 = 140573849338048, dummy_align2 = 0x7fd9e65ac0c0, s = {magic = 3864707264, refs = 32729}}, klass = 0x7fda00000078}, lock = {lock = {__data = {__lock = 0, __count = 0, __owner = 0, __nusers = 0, __kind = 0, __spins = 0, __list = {__prev = 0x0, __next = 0x0}}, __size = '\000' , __align = 0}}}, wantClose = false, delayedClose = false, sock = 0x0, auth = 0, readonly = false, tlsCtxt = 0x0, tls = 0x0, sasl = 0x0, sockTimer = 0, identity = 0x0, nrequests = 0, nrequests_max = 0, rx = 0x0, tx = 0x0, filters = 0x0, nextFilterID = 0, dispatchFunc = 0x0, dispatchOpaque = 0x0, privateData = 0x0, privateDataFreeFunc = 0x0, privateDataPreExecRestart = 0x0, privateDataCloseFunc = 0x0, keepalive = 0x0} --- src/rpc/virnetserverclient.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c index 81da82c..562516f 100644 --- a/src/rpc/virnetserverclient.c +++ b/src/rpc/virnetserverclient.c @@ -1021,6 +1021,12 @@ void virNetServerClientClose(virNetServerClientPtr client) client->sock = NULL; } + if (client->privateData && + client->privateDataFreeFunc) { + client->privateDataFreeFunc(client->privateData); + client->privateData = NULL; + } + virObjectUnlock(client); } -- 2.8.3

2 1

[libvirt] [PATCH] Remove additional newline from virsh-domain-monitor.c
by Nitesh Konkar 08 Feb '17

08 Feb '17

Currently "virsh domstats domainName" result ends with two blanklines. This shall remove the additional blank line. Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- tools/virsh-domain-monitor.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 77aa272..c558819 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -2047,7 +2047,6 @@ virshDomainStatsPrintRecord(vshControl *ctl ATTRIBUTE_UNUSED, VIR_FREE(param); } - vshPrint(ctl, "\n"); return true; } -- 1.9.3

2 1

[libvirt] [Block Replication] Question about supporting COLO in libvirt
by Hailiang Zhang 08 Feb '17

08 Feb '17

Hi, I'm trying to implement supporting COLO in libvirt, But i found an annoying problem that libvirt does not support the command line option argument syntax we used for block replication in QEMU. That is libvirt does not support the bellow syntax for block: -drive driver=qcow2,file.filename=test:a.qcow2 -drive file=test.qcow2,\ backing.file.filename=/dev/fdset/1 It seems to be a new syntax that libvirt does not support thought it has been exist in QEMU for a time. I found some introductions from http://www.linux-kvm.org/images/3/34/Kvm-forum-2013-block-dev-configuration… The command line we use for COLO is just like the above syntax, For example, for the shared disk in COLO, it is: -drive if=none,driver=qcow2,file.filename=/mnt/ramfs/hidden_disk.img,id=hidden_disk0,\ backing.driver=raw,backing.file.filename=1.raw \ -drive if=virtio,id=active-disk0,driver=replication,mode=secondary,\ file.driver=qcow2,top-id=active-disk0,\ file.file.filename=/mnt/ramfs/active_disk.img,\ file.backing=hidden_disk0,shared-disk=on For the none-shared disk in COLO, it is quite same with the shared-disk: -drive if=none,driver=raw,file.filename=1.raw,id=colo1 \ -drive if=xxx,id=topxxx,driver=replication,mode=secondary,top-id=topxxx\ file.file.filename=active_disk.qcow2,\ file.driver=qcow2,\ file.backing.file.filename=hidden_disk.qcow2,\ file.backing.driver=qcow2,\ file.backing.backing=colo1 So there seems to be two ways to solve this problem. One is to support this new option argument syntax in libvirt, but I'm not sure if it is difficult or not to implement it, and i don't know where to start either. Another way is to convert these command line options in QEMU totally, I mean hidden the descriptions of 'active_disk' and 'hidden_disk' disks. Create/add them dynamicly by qmp commands while users want to make VM goes into COLO state. That's just like to support live image clone in QEMU. Any ideas ? Thanks, Hailiang

2 2

[libvirt] [PATCH] libxl: fix disk detach when <driver> not specified
by Jim Fehlig 07 Feb '17

07 Feb '17

When a user does not explicitly set a <driver> in the disk config, libvirt defers selection of a default to libxl. This approach works fine when starting a domain with such configuration or attaching a disk to a running domain. But when detaching such a disk, libxl will fail with "unrecognized disk backend type: 0". libxl makes no attempt to recalculate a default backend (driver) on detach and simply fails when uninitialized. This patch updates the libvirt disk config with the backend selected by libxl when starting a domain or attaching a disk to a running domain. Another benefit of this approach is that the live XML is also updated with the backend driver selected by libxl. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_conf.c | 33 +++++++++++++++++++++++++++++++++ src/libxl/libxl_conf.h | 4 ++++ src/libxl/libxl_domain.c | 25 +++++++++++++++++++++++++ src/libxl/libxl_driver.c | 2 +- 4 files changed, 63 insertions(+), 1 deletion(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index b5186f2..6ef7570 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -851,6 +851,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk) * xl-disk-configuration.txt in the xen documentation and let * libxl pick a suitable backend. */ + virDomainDiskSetFormat(l_disk, VIR_STORAGE_FILE_RAW); x_disk->format = LIBXL_DISK_FORMAT_RAW; x_disk->backend = LIBXL_DISK_BACKEND_UNKNOWN; } @@ -913,6 +914,38 @@ libxlMakeDiskList(virDomainDefPtr def, libxl_domain_config *d_config) return -1; } +/* + * Update libvirt disk config with libxl disk config. + * + * This function can be used to update the libvirt disk config with default + * values selected by libxl. Currently only the backend type is selected by + * libxl when not explicitly specified by the user. + */ +void +libxlUpdateDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk) +{ + const char *driver = NULL; + + if (virDomainDiskGetDriver(l_disk)) + return; + + switch (x_disk->backend) { + case LIBXL_DISK_BACKEND_QDISK: + driver = "qemu"; + break; + case LIBXL_DISK_BACKEND_TAP: + driver = "tap"; + break; + case LIBXL_DISK_BACKEND_PHY: + driver = "phy"; + break; + case LIBXL_DISK_BACKEND_UNKNOWN: + break; + } + if (driver) + ignore_value(virDomainDiskSetDriver(l_disk, driver)); +} + int libxlMakeNic(virDomainDefPtr def, virDomainNetDefPtr l_nic, diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h index 69d7885..732a1d2 100644 --- a/src/libxl/libxl_conf.h +++ b/src/libxl/libxl_conf.h @@ -175,6 +175,10 @@ int libxlDriverConfigLoadFile(libxlDriverConfigPtr cfg, int libxlMakeDisk(virDomainDiskDefPtr l_dev, libxl_device_disk *x_dev); + +void +libxlUpdateDisk(virDomainDiskDefPtr l_dev, libxl_device_disk *x_dev); + int libxlMakeNic(virDomainDefPtr def, virDomainNetDefPtr l_nic, diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index ed73cd2..0168777 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -1067,6 +1067,30 @@ libxlDomainCreateIfaceNames(virDomainDefPtr def, libxl_domain_config *d_config) } } +static void +libxlDomainUpdateDiskParams(virDomainDefPtr def, libxl_ctx *ctx) +{ + libxl_device_disk *disks; + int num_disks = 0; + size_t i; + int idx; + + disks = libxl_device_disk_list(ctx, def->id, &num_disks); + if (!disks) + return; + + for (i = 0; i < num_disks; i++) { + if ((idx = virDomainDiskIndexByName(def, disks[i].vdev, false)) < 0) + continue; + + libxlUpdateDisk(def->disks[idx], &disks[i]); + } + + for (i = 0; i < num_disks; i++) + libxl_device_disk_dispose(&disks[i]); + VIR_FREE(disks); +} + #ifdef LIBXL_HAVE_DEVICE_CHANNEL static void libxlDomainCreateChannelPTY(virDomainDefPtr def, libxl_ctx *ctx) @@ -1310,6 +1334,7 @@ libxlDomainStart(libxlDriverPrivatePtr driver, goto destroy_dom; libxlDomainCreateIfaceNames(vm->def, &d_config); + libxlDomainUpdateDiskParams(vm->def, cfg->ctx); #ifdef LIBXL_HAVE_DEVICE_CHANNEL if (vm->def->nchannels > 0) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 3a69720..6dddf9f 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -3027,7 +3027,7 @@ libxlDomainAttachDeviceDiskLive(virDomainObjPtr vm, virDomainDeviceDefPtr dev) } goto cleanup; } - + libxlUpdateDisk(l_disk, &x_disk); virDomainDiskInsertPreAlloced(vm->def, l_disk); } else { -- 2.9.2

2 3

[libvirt] [PATCH v3] qemu: Forbid <memoryBacking><locked> without <memtune><hard_limit>
by Andrea Bolognani 07 Feb '17

07 Feb '17

In order for memory locking to work, the hard limit on memory locking (and usage) has to be set appropriately by the user. The documentation mentions the requirement already: with this patch, it's going to be enforced by runtime checks as well, by forbidding a non-compliant guest from being defined as well as edited and started. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1316774 --- Changes from [v2] * Address review feedback: - move the check from BuildCommandLine to Validate. Changes from [v1] * Address review feeback: - check in BuildCommandLine rather than in PostParse, so that non-compliant guests will merely fail to start rather than disappear completely. [v1] https://www.redhat.com/archives/libvir-list/2017-February/msg00180.html [v2] https://www.redhat.com/archives/libvir-list/2017-February/msg00214.html src/qemu/qemu_domain.c | 10 ++++++++++ tests/qemuxml2argvdata/qemuxml2argv-mlock-on.xml | 3 +++ 2 files changed, 13 insertions(+) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index c6ce090..ce3aa69 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2831,6 +2831,16 @@ qemuDomainDefValidate(const virDomainDef *def, } } + /* Memory locking can only work properly if the memory locking limit + * for the QEMU process has been raised appropriately: the default one + * is extrememly low, so there's no way the guest will fit in there */ + if (def->mem.locked && !virMemoryLimitIsSet(def->mem.hard_limit)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Setting <memoryBacking><locked> requires " + "<memtune><hard_limit> to be set as well")); + goto cleanup; + } + if (qemuDomainDefValidateVideo(def) < 0) goto cleanup; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-mlock-on.xml b/tests/qemuxml2argvdata/qemuxml2argv-mlock-on.xml index 20a5eaa..2046663 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-mlock-on.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-mlock-on.xml @@ -3,6 +3,9 @@ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <memory unit='KiB'>219136</memory> <currentMemory unit='KiB'>219136</currentMemory> + <memtune> + <hard_limit unit='KiB'>256000</hard_limit> + </memtune> <memoryBacking> <locked/> </memoryBacking> -- 2.7.4

2 2

[libvirt] [PATCH v2 0/4] Support setting MTU in libvirt networks
by Laine Stump 07 Feb '17

07 Feb '17

Similar to V1, but changing the XML to match Michal's patches, and adding a patch that plumbs network MTU back through to the qemu host_mtu option. Laine Stump (4): util: add MTU arg to virNetDevTapCreateInBridgePort() conf: support configuring mtu size in a virtual network network: honor mtu setting when creating network qemu: propagate bridge MTU into qemu "host_mtu" option docs/formatnetwork.html.in | 19 ++++++++++++++++++- docs/news.xml | 5 +++-- docs/schemas/network.rng | 5 +++++ src/bhyve/bhyve_command.c | 1 + src/conf/network_conf.c | 31 ++++++++++++++++++++++++++++++- src/conf/network_conf.h | 1 + src/network/bridge_driver.c | 1 + src/qemu/qemu_command.c | 32 ++++++++++++++++++++++---------- src/qemu/qemu_command.h | 3 ++- src/qemu/qemu_hotplug.c | 5 +++-- src/qemu/qemu_interface.c | 4 +++- src/qemu/qemu_interface.h | 3 ++- src/uml/uml_conf.c | 1 + src/util/virnetdevtap.c | 32 +++++++++++++++++++++++++++----- src/util/virnetdevtap.h | 2 ++ tests/bhyvexml2argvmock.c | 2 ++ tests/networkxml2xmlin/set-mtu.xml | 12 ++++++++++++ tests/networkxml2xmlout/set-mtu.xml | 12 ++++++++++++ tests/networkxml2xmltest.c | 1 + 19 files changed, 148 insertions(+), 24 deletions(-) create mode 100644 tests/networkxml2xmlin/set-mtu.xml create mode 100644 tests/networkxml2xmlout/set-mtu.xml -- 2.9.3

4 9

[libvirt] [PATCH v2] docs: mention bhyve SATA address changes in news.xml
by Roman Bogorodskiy 07 Feb '17

07 Feb '17

--- docs/news.xml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index f408293a1..7990cc6d4 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -56,6 +56,25 @@ a fabric name has been removed by making it optional. </description> </change> + <change> + <summary> + bhyve: change address allocation schema for SATA disks + </summary> + <description> + Previously, the bhyve driver assigned PCI addresses to SATA disks + directly rather than assigning that to a controller and + using SATA addresses for disks. It was implemented this way + because bhyve has no notion of an explicit SATA controller. + However, as this doesn't match libvirt's understanding of + disk addresses, it was changed for the bhyve driver + to follow the common schema and have PCI addresses + for SATA controllers and SATA addresses for disks. If you're + having issues because of this, it's recommended to edit + the domain's XML and remove <address type='pci'> + from the <disk> elements with <target bus='sata'/> + and let libvirt regenerate it properly. + </description> + </change> </section> </release> <release version="v3.0.0" date="2017-01-17"> -- 2.11.0

2 3

[libvirt] [PATCH] bhyve: fix virtio disk addresses
by Roman Bogorodskiy 07 Feb '17

07 Feb '17

Like it usually happens, I fixed one thing and broke another: in 803966c76 address allocation was fixed for SATA disks, but broke that for virtio disks, because it dropped disk address assignment completely. It's not needed for SATA disks anymore, but still needed for the virtio ones. Bring that back and add a couple of tests to make sure it won't happen again. --- src/bhyve/bhyve_device.c | 16 +++++++++ .../bhyvexml2argv-addr-multiple-virtio-disks.args | 11 ++++++ ...bhyvexml2argv-addr-multiple-virtio-disks.ldargs | 3 ++ .../bhyvexml2argv-addr-multiple-virtio-disks.xml | 32 +++++++++++++++++ .../bhyvexml2argv-addr-single-virtio-disk.args | 9 +++++ .../bhyvexml2argv-addr-single-virtio-disk.ldargs | 3 ++ .../bhyvexml2argv-addr-single-virtio-disk.xml | 22 ++++++++++++ tests/bhyvexml2argvtest.c | 2 ++ .../bhyvexml2xmlout-addr-multiple-virtio-disks.xml | 42 ++++++++++++++++++++++ .../bhyvexml2xmlout-addr-single-virtio-disk.xml | 30 ++++++++++++++++ tests/bhyvexml2xmltest.c | 2 ++ 11 files changed, 172 insertions(+) create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-disks.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-disks.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-disks.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-virtio-disk.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-virtio-disk.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-virtio-disk.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-multiple-virtio-disks.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-single-virtio-disk.xml diff --git a/src/bhyve/bhyve_device.c b/src/bhyve/bhyve_device.c index 29528230f..55ce631ec 100644 --- a/src/bhyve/bhyve_device.c +++ b/src/bhyve/bhyve_device.c @@ -129,6 +129,22 @@ bhyveAssignDevicePCISlots(virDomainDefPtr def, goto error; } + for (i = 0; i < def->ndisks; i++) { + /* We only handle virtio disk addresses as SATA disks are + * attached to a controller and don't have their own PCI + * addresses */ + if (def->disks[i]->bus != VIR_DOMAIN_DISK_BUS_VIRTIO) + continue; + + if (def->disks[i]->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI && + !virPCIDeviceAddressIsEmpty(&def->disks[i]->info.addr.pci)) + continue; + if (virDomainPCIAddressReserveNextAddr(addrs, &def->disks[i]->info, + VIR_PCI_CONNECT_TYPE_PCI_DEVICE, + -1) < 0) + goto error; + } + return 0; error: diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-disks.args b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-disks.args new file mode 100644 index 000000000..8cc166894 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-disks.args @@ -0,0 +1,11 @@ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ +-s 3:0,virtio-net,faketapdev,mac=52:54:00:bc:85:fe \ +-s 2:0,virtio-blk,/tmp/freebsd.img \ +-s 4:0,virtio-blk,/tmp/test.img \ +-s 5:0,virtio-blk,/tmp/test2.img bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-disks.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-disks.ldargs new file mode 100644 index 000000000..32538b558 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-disks.ldargs @@ -0,0 +1,3 @@ +/usr/sbin/bhyveload \ +-m 214 \ +-d /tmp/freebsd.img bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-disks.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-disks.xml new file mode 100644 index 000000000..9bcd0a629 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-disks.xml @@ -0,0 +1,32 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory>219136</memory> + <vcpu>1</vcpu> + <os> + <type>hvm</type> + </os> + <devices> + <disk type='file' device='disk'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='vda' bus='virtio'/> + </disk> + <disk type='file' device='disk'> + <driver name='file' type='raw'/> + <source file='/tmp/test.img'/> + <target dev='vdb' bus='virtio'/> + </disk> + <disk type='file' device='disk'> + <driver name='file' type='raw'/> + <source file='/tmp/test2.img'/> + <target dev='vdc' bus='virtio'/> + </disk> + <interface type='bridge'> + <mac address='52:54:00:bc:85:fe'/> + <model type='virtio'/> + <source bridge="virbr0"/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + </devices> +</domain> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-virtio-disk.args b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-virtio-disk.args new file mode 100644 index 000000000..4dcc40404 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-virtio-disk.args @@ -0,0 +1,9 @@ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ +-s 3:0,virtio-net,faketapdev,mac=52:54:00:bc:85:fe \ +-s 2:0,virtio-blk,/tmp/freebsd.img bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-virtio-disk.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-virtio-disk.ldargs new file mode 100644 index 000000000..32538b558 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-virtio-disk.ldargs @@ -0,0 +1,3 @@ +/usr/sbin/bhyveload \ +-m 214 \ +-d /tmp/freebsd.img bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-virtio-disk.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-virtio-disk.xml new file mode 100644 index 000000000..6be9ae134 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-virtio-disk.xml @@ -0,0 +1,22 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory>219136</memory> + <vcpu>1</vcpu> + <os> + <type>hvm</type> + </os> + <devices> + <disk type='file'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='vda' bus='virtio'/> + </disk> + <interface type='bridge'> + <mac address='52:54:00:bc:85:fe'/> + <model type='virtio'/> + <source bridge="virbr0"/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + </devices> +</domain> diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index e80705780..c36b55a0a 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -190,6 +190,8 @@ mymain(void) DO_TEST("addr-single-sata-disk"); DO_TEST("addr-multiple-sata-disks"); DO_TEST("addr-more-than-32-sata-disks"); + DO_TEST("addr-single-virtio-disk"); + DO_TEST("addr-multiple-virtio-disks"); /* The same without 32 devs per controller support */ driver.bhyvecaps ^= BHYVE_CAP_AHCI32SLOT; diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-multiple-virtio-disks.xml b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-multiple-virtio-disks.xml new file mode 100644 index 000000000..542bff121 --- /dev/null +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-multiple-virtio-disks.xml @@ -0,0 +1,42 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <disk type='file' device='disk'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='vda' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </disk> + <disk type='file' device='disk'> + <driver name='file' type='raw'/> + <source file='/tmp/test.img'/> + <target dev='vdb' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </disk> + <disk type='file' device='disk'> + <driver name='file' type='raw'/> + <source file='/tmp/test2.img'/> + <target dev='vdc' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> + </disk> + <controller type='pci' index='0' model='pci-root'/> + <interface type='bridge'> + <mac address='52:54:00:bc:85:fe'/> + <source bridge='virbr0'/> + <model type='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + </devices> +</domain> diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-single-virtio-disk.xml b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-single-virtio-disk.xml new file mode 100644 index 000000000..d7abb5abc --- /dev/null +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-addr-single-virtio-disk.xml @@ -0,0 +1,30 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <disk type='file' device='disk'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='vda' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </disk> + <controller type='pci' index='0' model='pci-root'/> + <interface type='bridge'> + <mac address='52:54:00:bc:85:fe'/> + <source bridge='virbr0'/> + <model type='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + </devices> +</domain> diff --git a/tests/bhyvexml2xmltest.c b/tests/bhyvexml2xmltest.c index 004afda14..ba9af2996 100644 --- a/tests/bhyvexml2xmltest.c +++ b/tests/bhyvexml2xmltest.c @@ -109,6 +109,8 @@ mymain(void) DO_TEST_DIFFERENT("addr-single-sata-disk"); DO_TEST_DIFFERENT("addr-multiple-sata-disks"); DO_TEST_DIFFERENT("addr-more-than-32-sata-disks"); + DO_TEST_DIFFERENT("addr-single-virtio-disk"); + DO_TEST_DIFFERENT("addr-multiple-virtio-disks"); /* The same without 32 devs per controller support */ driver.bhyvecaps ^= BHYVE_CAP_AHCI32SLOT; -- 2.11.0

2 2