- Devel - libvirt List Archives

[libvirt] [PATCH] Revert "maint: Update to latest gnulib"
by Erik Skultety 25 Aug '17

25 Aug '17

Revert @f8172388c which broke the build on Centos 6, because of old autoconf (< 2.63b) not properly quoting arguments for shell. --- So, the last working commit is cbc700208, but I didn't want to revert to that one directly, since I'd like to poke gnulib about the issue first and find a proper solution. Anyhow, pushed under the build breaker rule. .gnulib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gnulib b/.gnulib index 47c634c05..ce4ee4cbb 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 47c634c05a946651e2834dcf0cd7cd0dc7a21d3c +Subproject commit ce4ee4cbb596a9d7de2786cf8c48cf62a4edede7 -- 2.13.3

2 3

[libvirt] libvirt 3.5.0 locks
by Vasiliy Tolstov 25 Aug '17

25 Aug '17

Hi. I'm testing libvirt 3.5.0 and have many issues like this: Jul 14 09:47:25 cn25 libvirtd[18820]: 2017-07-14 06:47:25.598+0000: 18841: error : qemuDomainObjBeginJobInternal:3872 : Timed out during operation: cannot acquire state change lock (held by remoteDispatchConnectGetAllDomainStats) Jul 14 09:47:25 cn25 libvirtd[18820]: 2017-07-14 06:47:25.598+0000: 18841: warning : qemuDomainObjBeginJobInternal:3860 : Cannot start job (query, none) for domain 147565; current job is (query, none) owned by (18828 remoteDispatchConnectGetAllDomainStats, 0 <null>) for (53670s, 0s) Jul 14 09:46:55 cn25 libvirtd[18820]: 2017-07-14 06:46:55.576+0000: 18836: error : virNetDevTapInterfaceStats:751 : internal error: /proc/net/dev: Interface not found Jul 14 09:46:55 cn25 libvirtd[18820]: 2017-07-14 06:46:55.542+0000: 18832: warning : qemuGetProcessInfo:1428 : cannot parse process status data Jul 14 09:46:31 cn25 libvirtd[18820]: 2017-07-14 06:46:31.050+0000: 18838: warning : qemuGetProcessInfo:1428 : cannot parse process status data Domain in status in shutdown as i see tap device already removed from the system, so virNetDevTapInterfaceStats says right info. My question - why lock now released and why only libvirt restart can helps in this case -- Vasiliy Tolstov, e-mail: v.tolstov(a)selfip.ru

2 8

[libvirt] [PATCH v2] virt-host-validate: Fix warning for IOMMU detection on PPC
by Nitesh Konkar 24 Aug '17

24 Aug '17

Fix the warning generated on PPC by virt-host-validate for IOMMU Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- tools/virt-host-validate-common.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/virt-host-validate-common.c b/tools/virt-host-validate-common.c index 6faed04..51fa8c0 100644 --- a/tools/virt-host-validate-common.c +++ b/tools/virt-host-validate-common.c @@ -35,6 +35,7 @@ #include "virfile.h" #include "virt-host-validate-common.h" #include "virstring.h" +#include "virarch.h" #define VIR_FROM_THIS VIR_FROM_NONE @@ -442,8 +443,7 @@ int virHostValidateIOMMU(const char *hvname, virBitmapPtr flags; struct stat sb; const char *bootarg = NULL; - bool isAMD = false, isIntel = false; - + bool isAMD = false, isIntel = false, isPPC = false; flags = virHostValidateGetCPUFlags(); if (flags && virBitmapIsBitSet(flags, VIR_HOST_VALIDATE_CPU_FLAG_VMX)) @@ -453,9 +453,10 @@ int virHostValidateIOMMU(const char *hvname, virBitmapFree(flags); - virHostMsgCheck(hvname, "%s", _("for device assignment IOMMU support")); + isPPC = ARCH_IS_PPC64(virArchFromHost()); if (isIntel) { + virHostMsgCheck(hvname, "%s", _("for device assignment IOMMU support")); if (access("/sys/firmware/acpi/tables/DMAR", F_OK) == 0) { virHostMsgPass(); bootarg = "intel_iommu=on"; @@ -467,6 +468,7 @@ int virHostValidateIOMMU(const char *hvname, return -1; } } else if (isAMD) { + virHostMsgCheck(hvname, "%s", _("for device assignment IOMMU support")); if (access("/sys/firmware/acpi/tables/IVRS", F_OK) == 0) { virHostMsgPass(); bootarg = "iommu=pt iommu=1"; @@ -477,6 +479,8 @@ int virHostValidateIOMMU(const char *hvname, "hardware platform"); return -1; } + } else if (isPPC) { + /* Empty Block */ } else { virHostMsgFail(level, "Unknown if this platform has IOMMU support"); -- 2.7.4

2 3

[libvirt] [PATCH] libxl: Avoid a variable named 'stat'
by George Dunlap 24 Aug '17

24 Aug '17

Using a variable named 'stat' clashes with the system function 'stat()' causing compiler warnings on some platforms: libxl/libxl_driver.c: In function 'libxlDomainBlockStatsVBD': libxl/libxl_driver.c:5387: error: declaration of 'stat' shadows a global declaration [-Wshadow] /usr/include/sys/stat.h:455: error: shadowed declaration is here [-Wshadow] Signed-off-by: George Dunlap <george.dunlap(a)citrix.com> --- CC: Daniel P. Berrange <berrange(a)redhat.com> CC: Jim Fehlig <jfehlig(a)suse.com> CC: xen-devel(a)xenproject.org CC: libvir-list(a)redhat.com --- src/libxl/libxl_driver.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index c261e2155..4c7775358 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -5374,7 +5374,7 @@ libxlDomainBlockStatsVBD(virDomainObjPtr vm, int devno = libxlDiskPathToID(dev); int size; char *path, *name, *val; - unsigned long long stat; + unsigned long long status; path = name = val = NULL; if (devno < 0) { @@ -5401,12 +5401,12 @@ libxlDomainBlockStatsVBD(virDomainObjPtr vm, # define LIBXL_SET_VBDSTAT(FIELD, VAR, MUL) \ if ((virAsprintf(&name, "%s/"FIELD, path) < 0) || \ (virFileReadAll(name, 256, &val) < 0) || \ - (sscanf(val, "%llu", &stat) != 1)) { \ + (sscanf(val, "%llu", &status) != 1)) { \ virReportError(VIR_ERR_OPERATION_FAILED, \ _("cannot read %s"), name); \ goto cleanup; \ } \ - VAR += (stat * MUL); \ + VAR += (status * MUL); \ VIR_FREE(name); \ VIR_FREE(val); -- 2.14.1

3 2

[libvirt] [PATCH] qemu: Report error on failure to set isolation group
by Andrea Bolognani 24 Aug '17

24 Aug '17

This is more user-friendly because the error will be displayed directly instead of being buried in the log. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/qemu/qemu_domain_address.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 8066ed123..16bf0cdf9 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -1012,10 +1012,11 @@ qemuDomainFillDeviceIsolationGroup(virDomainDefPtr def, tmp = virPCIDeviceAddressGetIOMMUGroupNum(hostAddr); if (tmp < 0) { - VIR_WARN("Can't look up isolation group for host device " - "%04x:%02x:%02x.%x", - hostAddr->domain, hostAddr->bus, - hostAddr->slot, hostAddr->function); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Can't look up isolation group for host device " + "%04x:%02x:%02x.%x"), + hostAddr->domain, hostAddr->bus, + hostAddr->slot, hostAddr->function); goto cleanup; } @@ -1056,9 +1057,11 @@ qemuDomainFillDeviceIsolationGroup(virDomainDefPtr def, tmp = qemuDomainFindUnusedIsolationGroup(def); if (tmp == 0) { - VIR_WARN("Can't obtain usable isolation group for interface " - "configured to use hostdev-backed network '%s'", - iface->data.network.name); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Can't obtain usable isolation group for " + "interface configured to use hostdev-backed " + "network '%s'"), + iface->data.network.name); goto cleanup; } -- 2.13.5

2 1

[libvirt] Question about "f16c", "rdrand" and "vme" in cpu_map.xml
by Jay Zhou 24 Aug '17

24 Aug '17

Hi all, "f16c", "rdrand" and "vme" are all standard features, the IvyBridge CPU model has these three features in the file of src/cpu/cpu_map.xml, but the higher model of Haswell-noTSX, Haswell, Broadwell-noTSX and Broadwell do not, which makes it incompatible. BTW, I noticed that "f16c", "rdrand" and "vme" are a part of features of Haswell-noTSX, Haswell, Broadwell-noTSX and Broadwell in QEMU. The commit 732d3d147adecb867f62c67ab3743c0aefd87e50(which introduces the Haswell-noTSX CPU model in libvirt) said that: "Inheritance among CPU model is cool but it makes reviewing CPU model definitions and comparing them to CPU models from QEMU rather hard and unpleasant." I do not get the point "it makes reviewing CPU model definitions and comparing them to CPU models from QEMU rather hard and unpleasant" clearly. Could anyone explain it more explicitly? Looking forward to your replay. Thanks, Jay

2 1

[libvirt] [PATCH] maint: Update to latest gnulib
by Erik Skultety 24 Aug '17

24 Aug '17

This pulls in, among other new things, vc-list-files fix to make syntax-check work with git worktrees. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- .gnulib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gnulib b/.gnulib index ce4ee4cbb..47c634c05 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit ce4ee4cbb596a9d7de2786cf8c48cf62a4edede7 +Subproject commit 47c634c05a946651e2834dcf0cd7cd0dc7a21d3c -- 2.13.3

2 2

[libvirt] [PATCH v5 00/15] virObject adjustments for common object
by John Ferlan 24 Aug '17

24 Aug '17

v4: https://www.redhat.com/archives/libvir-list/2017-August/msg00537.html Changes since v4... I've removed the virObjectLookupKeys completely relying on LookupHash completely. The adjusted LookupHash object uses named "objsUUID" and "objsName" as well as API's to specifically Search or ForEach by Name or UUID. The New, Add, and Remove API's were adjusted in order to handle creating things properly. Even if that adjustment isn't considered what's desired, at least look at patches 1, 10, and 14 separately. John Ferlan (15): util: Use VIR_ERROR instead of VIR_WARN util: Introduce virObjectLookupHash util: Introduce virObjectLookupHash{Add|Remove} util: Introduce virObjectLookupHashFind[Locked] util: Introduce virObjectLookupHashForEach{UUID|Name} util: Introduce virObjectLookupHashSearch{UUID|Name}[Locked] nodedev: Use virObjectLookupHash secret: Use virObjectLookupHash util: Introduce virObjectLookupHashClone Revert "interface: Consume @def in virInterfaceObjNew" interface: Use virObjectLookupHash test: Clean up test driver Interface interactions util: Introduce virObjectLookupHashPrune network: Fix virNetworkObjBridgeInUse return type network: Use virObjectLookupHash src/conf/virinterfaceobj.c | 289 ++++++++++--------- src/conf/virnetworkobj.c | 280 ++++++------------ src/conf/virnetworkobj.h | 2 +- src/conf/virnodedeviceobj.c | 273 +++++------------- src/conf/virsecretobj.c | 251 +++++----------- src/libvirt_private.syms | 14 + src/test/test_driver.c | 55 +--- src/util/virobject.c | 675 +++++++++++++++++++++++++++++++++++++++++++- src/util/virobject.h | 123 ++++++++ 9 files changed, 1189 insertions(+), 773 deletions(-) -- 2.9.5

2 17

[libvirt] [PATCH] vz: build fix
by Nikolay Shirokovskiy 24 Aug '17

24 Aug '17

6e6faf6d changed vzDomObjAlloc signature in source but not in header file. --- src/vz/vz_utils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vz/vz_utils.h b/src/vz/vz_utils.h index ea2e2da..d213183 100644 --- a/src/vz/vz_utils.h +++ b/src/vz/vz_utils.h @@ -116,7 +116,7 @@ struct vzDomObj { typedef struct vzDomObj *vzDomObjPtr; -void* vzDomObjAlloc(void); +void* vzDomObjAlloc(void *opaque); void vzDomObjFree(void *p); virDomainObjPtr vzDomObjFromDomain(virDomainPtr domain); -- 1.8.3.1

2 1

[libvirt] [PATCH 0/2] conf: check address type for USB hostdevs
by Ján Tomko 23 Aug '17

23 Aug '17

*** BRB HERE *** Ján Tomko (2): conf: move hostdev address validation to virDomainHostdevDefValidate conf: check address type for USB hostdevs src/conf/domain_conf.c | 83 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 56 insertions(+), 27 deletions(-) -- 2.13.0

2 3

[libvirt] [PATCH] vmx: do not treat controllers as implicit devices
by Ján Tomko 23 Aug '17

23 Aug '17

When parsing the config, we look for the SCSI controllers one by one, remembering their models, then let virDomainDefAddImplicitDevices add them if any SCSI disk is using them. Since these controllers are not really implicit (they are present in the source config), add them explicitly. This patch maintains the behavior of not adding a controller if it was present in the config, but no disk was using it. This also resolves the memory leak of virVMXParseConfig overwriting the video device added by calling virDomainDefAddImplicitDevices before the parsing is finished. Reported-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/vmx/vmx.c | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 3e2f4c3e1..849cfc6b1 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -1650,6 +1650,18 @@ virVMXParseConfig(virVMXContext *ctx, if (def->disks[def->ndisks] != NULL) ++def->ndisks; } + + } + + /* add all the SCSI controllers we've seen, up until the last one that is + * currently used by a disk */ + if (def->ndisks != 0) { + virDomainDeviceInfoPtr info = &def->disks[def->ndisks - 1]->info; + for (controller = 0; controller <= info->addr.drive.controller; controller++) { + if (virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_SCSI, + controller, scsi_virtualDev[controller]) < 0) + goto cleanup; + } } /* def:disks (ide) */ @@ -1689,26 +1701,6 @@ virVMXParseConfig(virVMXContext *ctx, ++def->ndisks; } - /* def:controllers */ - if (virDomainDefAddImplicitDevices(def) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not add controllers")); - goto cleanup; - } - - for (controller = 0; controller < def->ncontrollers; ++controller) { - if (def->controllers[controller]->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI) { - if (def->controllers[controller]->idx > 3) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("SCSI controller index %d out of [0..3] range"), - def->controllers[controller]->idx); - goto cleanup; - } - - def->controllers[controller]->model = - scsi_virtualDev[def->controllers[controller]->idx]; - } - } - /* def:fss */ if (virVMXGetConfigBoolean(conf, "isolation.tools.hgfs.disable", &hgfs_disabled, true, true) < 0) { -- 2.13.0

2 1

[libvirt] [PATCH] tests: Fix leak in securityselinuxtest
by John Ferlan 23 Aug '17

23 Aug '17

If we jump to the error: label and @secbuf is allocated, then it's not free'd at all. Found by Coverity Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- tests/securityselinuxtest.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/securityselinuxtest.c b/tests/securityselinuxtest.c index f6bc07a..0ac2828 100644 --- a/tests/securityselinuxtest.c +++ b/tests/securityselinuxtest.c @@ -68,7 +68,7 @@ testBuildDomainDef(bool dynamic, const char *baselabel) { virDomainDefPtr def; - virSecurityLabelDefPtr secdef; + virSecurityLabelDefPtr secdef = NULL; if (!(def = virDomainDefNew())) goto error; @@ -98,6 +98,7 @@ testBuildDomainDef(bool dynamic, error: virDomainDefFree(def); + virSecurityLabelDefFree(secdef); return NULL; } -- 2.9.5

2 1

[libvirt] [PATCH 0/2] Yet another namespace fix, kinda
by Martin Kletzander 23 Aug '17

23 Aug '17

Fixing easy problem (patch 1) lead me to finding out that there is yet another problem that needs fixing (patch 2). For more information read the code. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1443434 Martin Kletzander (2): qemu: Don't mangle the storage format for type='dir' qemu: Also treat directories properly when using namespaces src/qemu/qemu_domain.c | 38 +++++++++++++++++++--- src/storage/storage_source.c | 5 +++ .../qemuxml2argv-floppy-drive-noformat.args | 24 ++++++++++++++ .../qemuxml2argv-floppy-drive-noformat.xml | 31 ++++++++++++++++++ tests/qemuxml2argvtest.c | 2 ++ 5 files changed, 95 insertions(+), 5 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-noformat.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-noformat.xml -- 2.14.1

2 5

[libvirt] [PATCH v2] vz: support disabled items in vz boot order
by Nikolay Shirokovskiy 23 Aug '17

23 Aug '17

At the time the check was written virtuozzo did not use disabled items in boot order configuration. Boot items were always enabled. Now they can be disabled as well. Supporting such items is easy - they just should be ignored. --- src/vz/vz_sdk.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 8ccd7ea..a6eb0dd 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -1736,11 +1736,8 @@ prlsdkConvertBootOrderVm(PRL_HANDLE sdkdom, virDomainDefPtr def) pret = PrlBootDev_IsInUse(bootDev, &inUse); prlsdkCheckRetGoto(pret, cleanup); - if (!inUse) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Boot ordering with disabled items is not supported")); - goto cleanup; - } + if (!inUse) + continue; pret = PrlBootDev_GetSequenceIndex(bootDev, &bootIndex); prlsdkCheckRetGoto(pret, cleanup); -- 1.8.3.1

2 3

[libvirt] [PATCH 0/3] Add support for virtio-vga/gpu's max_outputs= parameter
by Martin Kletzander 23 Aug '17

23 Aug '17

The subject of this cover letter goes very nicely together with the subjects of the subsequent messages. I hope my literature teachers are proud of me. Martin Kletzander (3): qemu: Add capabilities for virtio-vga/gpu's max_outputs= parameter qemu: Add support for virtio-vga/gpu's max_outputs= parameter docs: Update news with virtio-vga/gpu's max_outputs= parameter docs/news.xml | 5 +++++ src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 5 +++++ tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.ppc64le.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-video-virtio-vga.args | 2 +- tests/qemuxml2argvtest.c | 3 ++- 19 files changed, 29 insertions(+), 2 deletions(-) -- 2.14.1

2 4

[libvirt] [PATCH] docs: Define anchors correctly in pci-hotplug
by Andrea Bolognani 23 Aug '17

23 Aug '17

HTML5 obsoletes the 'name' attribute in favor of 'id', and our TOC generator apparently follows the recommendation to the letter, resulting in a broken TOC if you use the old-school attribute. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. docs/pci-hotplug.html.in | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/pci-hotplug.html.in b/docs/pci-hotplug.html.in index cddc6f81b..6e0648ee2 100644 --- a/docs/pci-hotplug.html.in +++ b/docs/pci-hotplug.html.in @@ -33,9 +33,9 @@ types, hence the way it's organized. </p> - <h2><a name="x86_64">x86_64 architecture</a></h2> + <h2><a id="x86_64">x86_64 architecture</a></h2> - <h3><a name="x86_64-q35">q35 machine type</a></h3> + <h3><a id="x86_64-q35">q35 machine type</a></h3> <p> This is a PCI Express native machine type. The default PCI topology @@ -104,7 +104,7 @@ from 0x01 to 0x1f of the <code>pci-bridge</code> controller. </p> - <h3><a name="x86_64-i440fx">i440fx (pc) machine type</a></h3> + <h3><a id="x86_64-i440fx">i440fx (pc) machine type</a></h3> <p> This is a legacy PCI native machine type. The default PCI @@ -121,9 +121,9 @@ assigned from the guest. </p> - <h2><a name="ppc64">ppc64 architecture</a></h2> + <h2><a id="ppc64">ppc64 architecture</a></h2> - <h3><a name="ppc64-pseries">pseries machine type</a></h3> + <h3><a id="ppc64-pseries">pseries machine type</a></h3> <p> The default PCI topology for the <code>pseries</code> machine @@ -162,9 +162,9 @@ from the host. </p> - <h2><a name="aarch64">aarch64 architecture</a></h2> + <h2><a id="aarch64">aarch64 architecture</a></h2> - <h3><a name="aarch64-virt">mach-virt (virt) machine type</a></h3> + <h3><a id="aarch64-virt">mach-virt (virt) machine type</a></h3> <p> This machine type mostly behaves the same as the -- 2.13.5

1 0

[libvirt] [PATCH v2] qemu: command: align disk serial check to schema
by Nikolay Shirokovskiy 23 Aug '17

23 Aug '17

Disk serial schema has extra '.+' allowed characters in comparison with check in code. Looks like there is no reason for that as qemu allows any character AFAIK for serial. This discrepancy is originated in 85d15b51 where ability to add serial was added. --- Diff from v1: * fix xml2argv disk serial test to use all valid chars Looks like there is no existing infrastructure to test every invalid character. src/qemu/qemu_command.c | 2 +- tests/qemuxml2argvdata/qemuxml2argv-disk-serial.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-disk-serial.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c76f923..c5369b0 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -432,7 +432,7 @@ qemuBuildIoEventFdStr(virBufferPtr buf, } #define QEMU_SERIAL_PARAM_ACCEPTED_CHARS \ - "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_ " + "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_ .+" static int qemuSafeSerialParamValue(const char *value) diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-serial.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-serial.args index 2cefdca..fa0fc93 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-serial.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-serial.args @@ -18,6 +18,6 @@ QEMU_AUDIO_DRV=none \ -boot c \ -usb \ -drive 'file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-1,\ -serial=\ \ WD-WMAP9A966149' \ +serial=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_\ .+' \ -device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-serial.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-serial.xml index 565462e..d54d73b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-serial.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-serial.xml @@ -17,7 +17,7 @@ <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <target dev='hda' bus='ide'/> - <serial> WD-WMAP9A966149</serial> + <serial>abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_ .+</serial> <address type='drive' controller='0' bus='0' target='0' unit='1'/> </disk> <controller type='usb' index='0'/> -- 1.8.3.1

2 3

[libvirt] [PATCH v4 00/17] virObject adjustments for common object
by John Ferlan 22 Aug '17

22 Aug '17

v3: https://www.redhat.com/archives/libvir-list/2017-June/msg00916.html Changes since v3 - honestly it's been too long to remember exactly what changes have taken place. This series provide the util/virobject changes and the implementation for nodedev, secret, interface, and network drivers/vir*obj's. The nwfilter is awaiting more upstream review and work and some more Storage Pool/Volume patches will be posted in conjunction with these. These changes also use the rwlocks Michal recently added to virobject as the means to provide locks for the LookupHash table(s). Although I understand it's not the preference of one reviewer, I've kept with the virObject model. If that still doesn't pass muster and someone else wants to create some other mechanism to combine the existing drivers in a more sane manner, then have at it. This is the model I've chosen. I personally don't see the value in just a shim API. This set of patches moves away from using a strict "uuid/name" designation in favor of using "key1" and "key2". While some may find that "too generic", I think that's the whole purpose of it. After some soul searching I feel using "name" or "uuid" is too restrictive and lends more towards the shim API model. Besides for some consumers they don't have a uuid (nodedev, interface, and nwfilter). In the long run it doesn't matter whether it's a uuid, name, or whatever as long as it's a character string. FWIW: Patches 1, 12, and 16 could be easily separated out, but since I was working in the area - they were added here as well. John Ferlan (17): util: Use VIR_ERROR instead of VIR_WARN util: Introduce virObjectLookupKeys util: Introduce virObjectLookupHash util: Introduce virObjectLookupKeys*Active API's util: Introduce virObjectLookupHash{Add|Remove} util: Introduce virObjectLookupHashFind[Locked] util: Introduce virObjectLookupHashForEach util: Introduce virObjectLookupHashSearch[Locked] nodedev: Use virObjectLookup{Keys|Hash} secret: Use virObjectLookup{Keys|Hash} util: Introduce virObjectLookupHashClone Revert "interface: Consume @def in virInterfaceObjNew" interface: Use virObjectLookup{Keys|Hash} test: Clean up test driver Interface interactions util: Introduce virObjectLookupHashPrune network: Fix virNetworkObjBridgeInUse return type network: Use virObjectLookup{Keys|Hash} src/conf/virinterfaceobj.c | 301 ++++++++++---------- src/conf/virnetworkobj.c | 293 ++++++-------------- src/conf/virnetworkobj.h | 5 +- src/conf/virnodedeviceobj.c | 286 ++++++------------- src/conf/virsecretobj.c | 263 +++++------------- src/libvirt_private.syms | 15 + src/test/test_driver.c | 55 +--- src/util/virobject.c | 658 +++++++++++++++++++++++++++++++++++++++++++- src/util/virobject.h | 119 ++++++++ tests/networkxml2conftest.c | 4 +- 10 files changed, 1190 insertions(+), 809 deletions(-) -- 2.9.4

2 21

[libvirt] [PATCHv2 0/3] conf: do not count per-device boot elements when parsing <os><boot>
by Ján Tomko 22 Aug '17

22 Aug '17

Ján Tomko (3): conf: rename virDomain*PostParseInternal to virDomain*PostParseCommon conf: create a thin wrapper above virDomainDefPostParse conf: do not count per-device boot elements when parsing <os><boot> src/conf/domain_conf.c | 82 +++++++++++++++++++++++++++----------------------- 1 file changed, 45 insertions(+), 37 deletions(-) -- 2.13.0

2 6

[libvirt] [PATCH 00/17] chardev parsing cleanup and improvements
by Pavel Hrdina 22 Aug '17

22 Aug '17

Pavel Hrdina (17): tests: introduce genericxml test for TCP chardev tests: introduce genericxml test for UDP chardev tests: introduce genericxml test for UNIX chardev conf: switch from while to for loop for chardev parsing conf: error out for multiple source elements while parsing chardev conf: error out for multiple log elements while parsing chardev conf: error out for multiple protocol elements while parsing chardev conf: move chardev protocol parsing to separate function conf: move chardev log parsing to separate function conf: move mode parsing of chardev source to separate function conf: move TCP chardev source parsing to separate function conf: move UDP chardev source parsing to separate function conf: move UNIX chardev source parsing to separate function conf: assign parsed strings directly into chardev source definition conf: move FILE chardev source parsing to separate function conf: separate PTY chardev source parsing conf: move chardev validation into virDomainDeviceDefValidateInternal src/conf/domain_conf.c | 700 ++++++++++++--------- .../generic-chardev-tcp-missing-host.xml | 25 + .../generic-chardev-tcp-missing-service.xml | 25 + .../generic-chardev-tcp-multiple-source.xml | 26 + tests/genericxml2xmlindata/generic-chardev-tcp.xml | 32 + ...generic-chardev-udp-missing-connect-service.xml | 24 + .../generic-chardev-udp-multiple-source.xml | 26 + tests/genericxml2xmlindata/generic-chardev-udp.xml | 47 ++ .../generic-chardev-unix-redirdev-missing-path.xml | 24 + .../generic-chardev-unix-rng-missing-path.xml | 25 + ...generic-chardev-unix-smartcard-missing-path.xml | 23 + .../genericxml2xmlindata/generic-chardev-unix.xml | 43 ++ .../genericxml2xmloutdata/generic-chardev-tcp.xml | 35 ++ .../genericxml2xmloutdata/generic-chardev-udp.xml | 47 ++ .../genericxml2xmloutdata/generic-chardev-unix.xml | 44 ++ tests/genericxml2xmltest.c | 20 + 16 files changed, 875 insertions(+), 291 deletions(-) create mode 100644 tests/genericxml2xmlindata/generic-chardev-tcp-missing-host.xml create mode 100644 tests/genericxml2xmlindata/generic-chardev-tcp-missing-service.xml create mode 100644 tests/genericxml2xmlindata/generic-chardev-tcp-multiple-source.xml create mode 100644 tests/genericxml2xmlindata/generic-chardev-tcp.xml create mode 100644 tests/genericxml2xmlindata/generic-chardev-udp-missing-connect-service.xml create mode 100644 tests/genericxml2xmlindata/generic-chardev-udp-multiple-source.xml create mode 100644 tests/genericxml2xmlindata/generic-chardev-udp.xml create mode 100644 tests/genericxml2xmlindata/generic-chardev-unix-redirdev-missing-path.xml create mode 100644 tests/genericxml2xmlindata/generic-chardev-unix-rng-missing-path.xml create mode 100644 tests/genericxml2xmlindata/generic-chardev-unix-smartcard-missing-path.xml create mode 100644 tests/genericxml2xmlindata/generic-chardev-unix.xml create mode 100644 tests/genericxml2xmloutdata/generic-chardev-tcp.xml create mode 100644 tests/genericxml2xmloutdata/generic-chardev-udp.xml create mode 100644 tests/genericxml2xmloutdata/generic-chardev-unix.xml -- 2.13.5

2 36

[libvirt] [PATCH] conf: do not count per-device boot elements when parsing <os><boot>
by Ján Tomko 22 Aug '17

22 Aug '17

When parsing bootable devices, we maintain a bitmap of used <boot order=""> elements. Use it in the post-parse function to figure out whether the user tried to mix per-device and per-domain boot elements. This removes the need to count them twice. --- src/conf/domain_conf.c | 46 ++++++++++++++++++++----------------------- src/conf/domain_conf.h | 3 ++- src/lxc/lxc_native.c | 2 +- src/qemu/qemu_driver.c | 6 +++--- src/qemu/qemu_parse_command.c | 2 +- src/qemu/qemu_process.c | 2 +- src/vmx/vmx.c | 2 +- src/xenconfig/xen_sxpr.c | 2 +- src/xenconfig/xen_xl.c | 2 +- src/xenconfig/xen_xm.c | 2 +- 10 files changed, 33 insertions(+), 36 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6f0f038b7..355da1478 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4784,7 +4784,8 @@ virDomainDefPostParseCPU(virDomainDefPtr def) static int virDomainDefPostParseInternal(virDomainDefPtr def, - struct virDomainDefPostParseDeviceIteratorData *data) + struct virDomainDefPostParseDeviceIteratorData *data, + virHashTablePtr bootHash) { /* verify init path for container based domains */ if (def->os.type == VIR_DOMAIN_OSTYPE_EXE && !def->os.init) { @@ -4793,6 +4794,20 @@ virDomainDefPostParseInternal(virDomainDefPtr def, return -1; } + if (def->os.type == VIR_DOMAIN_OSTYPE_HVM && bootHash) { + if (def->os.nBootDevs > 0 && virHashSize(bootHash) > 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("per-device boot elements cannot be used" + " together with os/boot elements")); + return -1; + } + + if (def->os.nBootDevs == 0 && virHashSize(bootHash) == 0) { + def->os.nBootDevs = 1; + def->os.bootDevs[0] = VIR_DOMAIN_BOOT_DISK; + } + } + if (virDomainVcpuDefPostParse(def) < 0) return -1; @@ -4861,7 +4876,8 @@ virDomainDefPostParse(virDomainDefPtr def, virCapsPtr caps, unsigned int parseFlags, virDomainXMLOptionPtr xmlopt, - void *parseOpaque) + void *parseOpaque, + virHashTablePtr bootHash) { int ret = -1; bool localParseOpaque = false; @@ -4917,7 +4933,7 @@ virDomainDefPostParse(virDomainDefPtr def, if (virDomainDefPostParseCheckFailure(def, parseFlags, ret) < 0) goto cleanup; - if ((ret = virDomainDefPostParseInternal(def, &data)) < 0) + if ((ret = virDomainDefPostParseInternal(def, &data, bootHash)) < 0) goto cleanup; if (xmlopt->config.assignAddressesCallback) { @@ -16135,28 +16151,11 @@ virDomainDefParseBootXML(xmlXPathContextPtr ctxt, int n; char *tmp = NULL; int ret = -1; - unsigned long deviceBoot; - - if (virXPathULong("count(./devices/disk[boot]" - "|./devices/interface[boot]" - "|./devices/hostdev[boot]" - "|./devices/redirdev[boot])", ctxt, &deviceBoot) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("cannot count boot devices")); - goto cleanup; - } /* analysis of the boot devices */ if ((n = virXPathNodeSet("./os/boot", ctxt, &nodes)) < 0) goto cleanup; - if (n > 0 && deviceBoot) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("per-device boot elements cannot be used" - " together with os/boot elements")); - goto cleanup; - } - for (i = 0; i < n && i < VIR_DOMAIN_BOOT_LAST; i++) { int val; char *dev = virXMLPropString(nodes[i], "dev"); @@ -16175,10 +16174,6 @@ virDomainDefParseBootXML(xmlXPathContextPtr ctxt, VIR_FREE(dev); def->os.bootDevs[def->os.nBootDevs++] = val; } - if (def->os.nBootDevs == 0 && !deviceBoot) { - def->os.nBootDevs = 1; - def->os.bootDevs[0] = VIR_DOMAIN_BOOT_DISK; - } if ((node = virXPathNode("./os/bootmenu[1]", ctxt))) { tmp = virXMLPropString(node, "enable"); @@ -18947,7 +18942,8 @@ virDomainDefParseXML(xmlDocPtr xml, goto error; /* callback to fill driver specific domain aspects */ - if (virDomainDefPostParse(def, caps, flags, xmlopt, parseOpaque) < 0) + if (virDomainDefPostParse(def, caps, flags, xmlopt, parseOpaque, + bootHash) < 0) goto error; /* valdiate configuration */ diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 1f1dc1de0..2fe7e545d 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2643,7 +2643,8 @@ int virDomainDefPostParse(virDomainDefPtr def, virCapsPtr caps, unsigned int parseFlags, virDomainXMLOptionPtr xmlopt, - void *parseOpaque); + void *parseOpaque, + virHashTablePtr bootHash); int virDomainDefValidate(virDomainDefPtr def, virCapsPtr caps, diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c index 5fc6e7cda..1542eda11 100644 --- a/src/lxc/lxc_native.c +++ b/src/lxc/lxc_native.c @@ -1095,7 +1095,7 @@ lxcParseConfigString(const char *config, lxcSetCapDrop(vmdef, properties); if (virDomainDefPostParse(vmdef, caps, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, - xmlopt, NULL) < 0) + xmlopt, NULL, NULL) < 0) goto cleanup; goto cleanup; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e9f07c6e7..f2cc1ee34 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7916,7 +7916,7 @@ qemuDomainAttachDeviceConfig(virDomainDefPtr vmdef, return -1; } - if (virDomainDefPostParse(vmdef, caps, parse_flags, xmlopt, NULL) < 0) + if (virDomainDefPostParse(vmdef, caps, parse_flags, xmlopt, NULL, NULL) < 0) return -1; return 0; @@ -8082,7 +8082,7 @@ qemuDomainDetachDeviceConfig(virDomainDefPtr vmdef, return -1; } - if (virDomainDefPostParse(vmdef, caps, parse_flags, xmlopt, NULL) < 0) + if (virDomainDefPostParse(vmdef, caps, parse_flags, xmlopt, NULL, NULL) < 0) return -1; return 0; @@ -8169,7 +8169,7 @@ qemuDomainUpdateDeviceConfig(virDomainDefPtr vmdef, return -1; } - if (virDomainDefPostParse(vmdef, caps, parse_flags, xmlopt, NULL) < 0) + if (virDomainDefPostParse(vmdef, caps, parse_flags, xmlopt, NULL, NULL) < 0) return -1; return 0; diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c index ee7112775..345d31e6a 100644 --- a/src/qemu/qemu_parse_command.c +++ b/src/qemu/qemu_parse_command.c @@ -2639,7 +2639,7 @@ qemuParseCommandLine(virCapsPtr caps, VIR_FREE(nics); - if (virDomainDefPostParse(def, caps, 0, xmlopt, NULL) < 0) + if (virDomainDefPostParse(def, caps, 0, xmlopt, NULL, NULL) < 0) goto error; if (cmd->num_args || cmd->num_env) { diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 589d0ed2c..d0e1ad6f7 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4696,7 +4696,7 @@ qemuProcessInit(virQEMUDriverPtr driver, if (vm->def->postParseFailed) { VIR_DEBUG("re-running the post parse callback"); - if (virDomainDefPostParse(vm->def, caps, 0, driver->xmlopt, NULL) < 0) + if (virDomainDefPostParse(vm->def, caps, 0, driver->xmlopt, NULL, NULL) < 0) goto cleanup; } diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 3e2f4c3e1..822ba1230 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -1819,7 +1819,7 @@ virVMXParseConfig(virVMXContext *ctx, } if (virDomainDefPostParse(def, caps, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, - xmlopt, NULL) < 0) + xmlopt, NULL, NULL) < 0) goto cleanup; success = true; diff --git a/src/xenconfig/xen_sxpr.c b/src/xenconfig/xen_sxpr.c index fefa61ac2..ea19ca0bf 100644 --- a/src/xenconfig/xen_sxpr.c +++ b/src/xenconfig/xen_sxpr.c @@ -1458,7 +1458,7 @@ xenParseSxpr(const struct sexpr *root, } if (virDomainDefPostParse(def, caps, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, - xmlopt, NULL) < 0) + xmlopt, NULL, NULL) < 0) goto error; return def; diff --git a/src/xenconfig/xen_xl.c b/src/xenconfig/xen_xl.c index d168d3fa4..11eb1a2e6 100644 --- a/src/xenconfig/xen_xl.c +++ b/src/xenconfig/xen_xl.c @@ -882,7 +882,7 @@ xenParseXL(virConfPtr conf, goto cleanup; if (virDomainDefPostParse(def, caps, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, - xmlopt, NULL) < 0) + xmlopt, NULL, NULL) < 0) goto cleanup; return def; diff --git a/src/xenconfig/xen_xm.c b/src/xenconfig/xen_xm.c index 8ef68bbc0..5f4572b84 100644 --- a/src/xenconfig/xen_xm.c +++ b/src/xenconfig/xen_xm.c @@ -461,7 +461,7 @@ xenParseXM(virConfPtr conf, goto cleanup; if (virDomainDefPostParse(def, caps, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, - xmlopt, NULL) < 0) + xmlopt, NULL, NULL) < 0) goto cleanup; return def; -- 2.13.0

2 1

[libvirt] [PATCH] conf: useserial: drop useless check for serial devices
by Ján Tomko 22 Aug '17

22 Aug '17

Since its introduction in commit 874e65aa, if someone requests: <os><bios useserial="yes"/><os/> we report an error if we cannot successfully count the number of serial devices via an XPath query. Instead of fixing the check (and moving it to the validation phase, to prevent existing domains from disappearing), drop it completely. For QEMU, the number of serials is checked when building the command line. --- src/conf/domain_conf.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 3bef5bed3..e563007ba 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -16127,7 +16127,7 @@ virDomainDefParseBootXML(xmlXPathContextPtr ctxt, int n; char *tmp = NULL; int ret = -1; - unsigned long deviceBoot, serialPorts; + unsigned long deviceBoot; if (virXPathULong("count(./devices/disk[boot]" "|./devices/interface[boot]" @@ -16204,18 +16204,10 @@ virDomainDefParseBootXML(xmlXPathContextPtr ctxt, if ((node = virXPathNode("./os/bios[1]", ctxt))) { tmp = virXMLPropString(node, "useserial"); if (tmp) { - if (STREQ(tmp, "yes")) { - if (virXPathULong("count(./devices/serial)", - ctxt, &serialPorts) < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("need at least one serial port " - "for useserial")); - goto cleanup; - } + if (STREQ(tmp, "yes")) def->os.bios.useserial = VIR_TRISTATE_BOOL_YES; - } else { + else def->os.bios.useserial = VIR_TRISTATE_BOOL_NO; - } VIR_FREE(tmp); } -- 2.13.0

2 1

[libvirt] [PATCH V2 0/2] Don't autogenerate seclabels of type 'none'
by Jim Fehlig 21 Aug '17

21 Aug '17

V2 of https://www.redhat.com/archives/libvir-list/2017-August/msg00376.html The first patch fixes a few issues I found in securityselinuxtest while working on the second patch. In V2, a seclabel is not generated if the domain has no seclabel and confinement is disabled. Jim Fehlig (2): Fix building domain def in securityselinuxtest Don't autogenerate seclabels of type 'none' src/security/security_manager.c | 42 +++++++++++++++++++++-------------------- tests/securityselinuxtest.c | 14 +++++++++----- 2 files changed, 31 insertions(+), 25 deletions(-) -- 2.13.1

2 8

[libvirt] [PATCH] Doc fix of /etc/libvirt/libvirt-guests
by Lily Zhu 21 Aug '17

21 Aug '17

As in previous doc, it may cause confusion about whether parallel_shutdown would take effect when guests are asked to suspend on host shutdown. Hence, changed the doc of parallel_shutdown, make it more clear. Signed-off-by: Lily Zhu <lizhu(a)redhat.com> --- tools/libvirt-guests.sysconf | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/libvirt-guests.sysconf b/tools/libvirt-guests.sysconf index 2770056..785c3c0 100644 --- a/tools/libvirt-guests.sysconf +++ b/tools/libvirt-guests.sysconf @@ -24,8 +24,10 @@ # value suitable for your guests. #ON_SHUTDOWN=suspend -# If set to non-zero, shutdown will suspend guests concurrently. Number of -# guests on shutdown at any time will not exceed number set in this variable. +# Number of guests will be shutdown concurrently, taking effect when +# "ON_SHUTDOWN" is set to "shutdown". If Set to 0, guests will be +# shutdown one after another. Number of guests on shutdown at any +# time will not exceed number set in this variable. #PARALLEL_SHUTDOWN=0 # Number of seconds we're willing to wait for a guest to shut down. If parallel -- 1.8.3.1

2 1

[libvirt] [PATCH] docs: Improve PCI topology and hotplug guidelines
by Andrea Bolognani 21 Aug '17

21 Aug '17

Address some minor flaws in the original document that were pointed out during review. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- docs/pci-hotplug.html.in | 46 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 32 insertions(+), 14 deletions(-) diff --git a/docs/pci-hotplug.html.in b/docs/pci-hotplug.html.in index 809e36f5d..a90d47bc3 100644 --- a/docs/pci-hotplug.html.in +++ b/docs/pci-hotplug.html.in @@ -13,10 +13,12 @@ <p> The reason for this apparent limitation is the fact that each hotplugged PCI device might require additional PCI controllers to - be added to the guest, and libvirt has no way of knowing in advance - how many devices will be hotplugged during the guest's lifetime, - thus making it impossible to automatically provide the right amount - of PCI controllers: any arbitrary number would end up being too big + be added to the guest. Since most PCI controllers can't be + hotplugged, they need to be added before the guest is started; + however, libvirt has no way of knowing in advance how many devices + will be hotplugged during the guest's lifetime, thus making it + impossible to automatically provide the right amount of PCI + controllers: any arbitrary number would end up being too big for some users, and too small for others. </p> <p> @@ -53,6 +55,14 @@ emulated or assigned from the host. </p> <p> + If you have a very specialized use case, such as the appliances + used by <a href="http://libguestfs.org/">libguestfs</a> behind + the scenes to access disk images, and this automatically-added + <code>pcie-root-port</code> controller ends up being a nuisance, + you can prevent libvirt from adding it by manually managing PCI + controllers and addresses according to you needs. + </p> + <p> Slots on the <code>pcie-root</code> controller do not support hotplug, so the device will be hotplugged into the <code>pcie-root-port</code> controller. If you plan to hotplug @@ -73,6 +83,12 @@ remaining details automatically. </p> <p> + Note that if you're adding PCI controllers to a guest at the + same time you're also adding PCI devices, some of the + controllers will be used for the newly-added devices and won't + be available for hotplug once the guest has been started. + </p> + <p> If you expect to hotplug legacy PCI devices, then you will need specialized controllers, since all those mentioned above are intended for PCI Express devices only: add @@ -84,7 +100,8 @@ <p> and you'll be able to hotplug up to 31 legacy PCI devices, - either emulated or assigned from the host. + either emulated or assigned from the host, in the slots + from 0x01 to 0x1f of the <code>pci-bridge</code> controller. </p> <h3><a name="x86_64-i440fx">i440fx (pc) machine type</a></h3> @@ -98,9 +115,10 @@ <controller type='pci' index='0' model='pci-root'/></pre> <p> - where each of the 31 slots on the <code>pci-root</code> - controller is hotplug capable and can accept a legacy PCI - device, either emulated or assigned from the guest. + where each of the 31 slots (from 0x01 to 0x1f) on the + <code>pci-root</code> controller is hotplug capable and + can accept a legacy PCI device, either emulated or + assigned from the guest. </p> <h2><a name="ppc64">ppc64 architecture</a></h2> @@ -119,12 +137,12 @@ </controller></pre> <p> - The 31 slots on a <code>pci-root</code> controller are all - hotplug capable and, despite the name suggesting otherwise, - starting with QEMU 2.9 all of them can accept PCI Express - devices in addition to legacy PCI devices; however, - libvirt will only place emulated devices on the default - <code>pci-root</code> controller. + The 31 slots, from 0x01 to 0x1f, on a <code>pci-root</code> + controller are all hotplug capable and, despite the name + suggesting otherwise, starting with QEMU 2.9 all of them + can accept PCI Express devices in addition to legacy PCI + devices; however, libvirt will only place emulated devices + on the default <code>pci-root</code> controller. </p> <p> In order to take advantage of improved error reporting and -- 2.13.5

2 2

[libvirt] [PATCH] virsh: Honour --readonly with cmdConnect and no name
by Martin Kletzander 21 Aug '17

21 Aug '17

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- tools/virsh.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 94bb7ff6c93a..9883e87df2b5 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -218,7 +218,13 @@ virshReconnect(vshControl *ctl, const char *name, bool readonly, bool force) { bool connected = false; virshControlPtr priv = ctl->privData; - bool ro = name ? readonly : priv->readonly; + + /* If the flag was not specified, then it depends on whether we are + * reconnecting to the default URI (in which case we want to keep the + * readonly flag as it was) or to a specified URI in which case it + * should stay false */ + if (!readonly && !name) + readonly = priv->readonly; if (priv->conn) { int ret; @@ -233,7 +239,7 @@ virshReconnect(vshControl *ctl, const char *name, bool readonly, bool force) "disconnect from the hypervisor")); } - priv->conn = virshConnect(ctl, name ? name : ctl->connname, ro); + priv->conn = virshConnect(ctl, name ? name : ctl->connname, readonly); if (!priv->conn) { if (disconnected) -- 2.14.1

2 3

[libvirt] [PATCH] nodedev: add switchdev to NIC capabilities
by Edan David 21 Aug '17

21 Aug '17

Adding functionality to libvirt that will allow it query the interface for the availability of switchdev Offloading NIC capabilities --- configure.ac | 13 ++ docs/formatnode.html.in | 1 + src/util/virnetdev.c | 204 +++++++++++++++++++++- src/util/virnetdev.h | 1 + tests/nodedevschemadata/net_00_13_02_b9_f9_d3.xml | 1 + tests/nodedevschemadata/net_00_15_58_2f_e9_55.xml | 1 + 6 files changed, 220 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index afacf40..a050b99 100644 --- a/configure.ac +++ b/configure.ac @@ -627,6 +627,19 @@ if test "$with_linux" = "yes"; then AC_CHECK_HEADERS([linux/btrfs.h]) fi +dnl +dnl check for kernel headers required by devlink +dnl +if test "$with_linux" = "yes"; then + AC_CHECK_HEADERS([linux/devlink.h]) + AC_CHECK_DECLS([DEVLINK_GENL_VERSION, DEVLINK_GENL_NAME, DEVLINK_ATTR_MAX, DEVLINK_CMD_ESWITCH_GET, DEVLINK_ATTR_BUS_NAME, DEVLINK_ATTR_DEV_NAME, DEVLINK_ATTR_ESWITCH_MODE, DEVLINK_ESWITCH_MODE_SWITCHDEV], + [AC_DEFINE([HAVE_DECL_DEVLINK], + [1], + [whether devlink declarations is available])], + [], + [[#include <linux/devlink.h>]]) +fi + dnl Allow perl/python overrides AC_PATH_PROGS([PYTHON], [python2 python]) if test -z "$PYTHON"; then diff --git a/docs/formatnode.html.in b/docs/formatnode.html.in index 32451d5..e7b30ea 100644 --- a/docs/formatnode.html.in +++ b/docs/formatnode.html.in @@ -227,6 +227,7 @@ <dt><code>rxhash</code></dt><dd>receive-hashing</dd> <dt><code>rdma</code></dt><dd>remote-direct-memory-access</dd> <dt><code>txudptnl</code></dt><dd>tx-udp-tunnel-segmentation</dd> + <dt><code>switchdev</code></dt><dd>kernel-forward-plane-offload</dd> </dl> </dd> <dt><code>capability</code></dt> diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 90b7bee..084fb41 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -59,6 +59,10 @@ # include <net/if_dl.h> #endif +#if HAVE_DECL_DEVLINK +# include <linux/devlink.h> +#endif + #ifndef IFNAMSIZ # define IFNAMSIZ 16 #endif @@ -95,6 +99,7 @@ VIR_LOG_INIT("util.netdev"); (FEATURE_WORD(blocks, index, field) & FEATURE_FIELD_FLAG(index)) #endif + typedef enum { VIR_MCAST_TYPE_INDEX_TOKEN, VIR_MCAST_TYPE_NAME_TOKEN, @@ -2396,7 +2401,8 @@ VIR_ENUM_IMPL(virNetDevFeature, "ntuple", "rxhash", "rdma", - "txudptnl") + "txudptnl", + "switchdev") #ifdef __linux__ int @@ -2851,6 +2857,199 @@ int virNetDevGetRxFilter(const char *ifname, return ret; } + + +#if HAVE_DECL_DEVLINK +/** + * virNetDevPutExtraHeader + * reserve and prepare room for an extra header + * This function sets to zero the room that is required to put the extra + * header after the initial Netlink header. This function also increases + * the nlmsg_len field. You have to invoke mnl_nlmsg_put_header() before + * you call this function. This function returns a pointer to the extra + * header. + * + * @nlh: pointer to Netlink header + * @size: size of the extra header that we want to put + * + * Returns pointer to the start of the extended header + */ +static void * +virNetDevPutExtraHeader(struct nlmsghdr *nlh, size_t size) +{ + char *ptr = (char *)nlh + nlh->nlmsg_len; + size_t len = NLMSG_ALIGN(size); + nlh->nlmsg_len += len; + memset(ptr, 0, len); + return ptr; +} + + +/** + * virNetDevGetFamilyId: + * This function supplies the devlink family id + * + * @family_name: the name of the family to query + * + * Returns family id or 0 on failure. + */ +static int +virNetDevGetFamilyId(const char *family_name) +{ + struct nl_msg *nl_msg = NULL; + struct nlmsghdr *resp = NULL; + struct genlmsghdr* gmsgh = NULL; + struct nlattr *tb[CTRL_ATTR_MAX + 1] = {NULL, }; + unsigned int recvbuflen; + uint32_t family_id = 0; + + if (!(nl_msg = nlmsg_alloc_simple(GENL_ID_CTRL, + NLM_F_REQUEST | NLM_F_ACK))) { + virReportOOMError(); + goto cleanup; + } + + gmsgh = virNetDevPutExtraHeader(nlmsg_hdr(nl_msg), sizeof(struct genlmsghdr)); + if (!gmsgh) + goto cleanup; + + gmsgh->cmd = CTRL_CMD_GETFAMILY; + gmsgh->version = DEVLINK_GENL_VERSION; + + if (nla_put_string(nl_msg, CTRL_ATTR_FAMILY_NAME, family_name) < 0) + goto buffer_too_small; + + if (virNetlinkCommand(nl_msg, &resp, &recvbuflen, 0, 0, NETLINK_GENERIC, 0) < 0) + goto cleanup; + + if (nlmsg_parse(resp, sizeof(struct nlmsghdr), tb, CTRL_CMD_MAX, NULL) < 0) + goto malformed_resp; + + if (tb[CTRL_ATTR_FAMILY_ID] == NULL) + goto cleanup; + + family_id = *(int *)RTA_DATA(tb[CTRL_ATTR_FAMILY_ID]); + + cleanup: + nlmsg_free(nl_msg); + VIR_FREE(resp); + return family_id; + + malformed_resp: + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("malformed netlink response message")); + goto cleanup; + + buffer_too_small: + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("allocated netlink buffer is too small")); + goto cleanup; +} + + +/** + * virNetDevSwitchdevFeature + * This function checks for the availability of Switchdev feature + * and add it to bitmap + * + * @ifname: name of the interface + * @out: add Switchdev feature if exist to bitmap + * + * Returns 0 on success, -1 on failure. + */ +static int +virNetDevSwitchdevFeature(const char *ifname, + virBitmapPtr *out) +{ + struct nl_msg *nl_msg = NULL; + struct nlmsghdr *resp = NULL; + unsigned int recvbuflen; + struct nlattr *tb[DEVLINK_ATTR_MAX + 1] = {NULL, }; + virPCIDevicePtr pci_device_ptr = NULL; + struct genlmsghdr* gmsgh = NULL; + const char *pci_name; + char *pfname = NULL; + int func_ret_val = -1; + int ret = -1; + + int family_id = virNetDevGetFamilyId(DEVLINK_GENL_NAME); + if (family_id == 0) + goto cleanup; + + func_ret_val = virNetDevIsVirtualFunction(ifname); + if (func_ret_val == 1) { + if (virNetDevGetPhysicalFunction(ifname, &pfname) < 0) + goto cleanup; + } + else if (func_ret_val < 0) + goto cleanup; + + if (!(nl_msg = nlmsg_alloc_simple(family_id, + NLM_F_REQUEST | NLM_F_ACK))) { + virReportOOMError(); + goto cleanup; + } + + pci_device_ptr = pfname ? virNetDevGetPCIDevice(pfname) : + virNetDevGetPCIDevice(ifname); + if (!pci_device_ptr) + goto cleanup; + + pci_name = virPCIDeviceGetName(pci_device_ptr); + + gmsgh = virNetDevPutExtraHeader(nlmsg_hdr(nl_msg), sizeof(struct genlmsghdr)); + if (!gmsgh) + goto cleanup; + + gmsgh->cmd = DEVLINK_CMD_ESWITCH_GET; + gmsgh->version = DEVLINK_GENL_VERSION; + + if (nla_put(nl_msg, DEVLINK_ATTR_BUS_NAME, strlen("pci")+1, "pci") < 0) + goto buffer_too_small; + + if (nla_put(nl_msg, DEVLINK_ATTR_DEV_NAME, strlen(pci_name)+1, pci_name) < 0) + goto buffer_too_small; + + if (virNetlinkCommand(nl_msg, &resp, &recvbuflen, 0, 0, + NETLINK_GENERIC, 0) < 0) + goto cleanup; + + if (nlmsg_parse(resp, sizeof(struct genlmsghdr), tb, DEVLINK_ATTR_MAX, NULL) < 0) + goto malformed_resp; + + if (tb[DEVLINK_ATTR_ESWITCH_MODE] && + *(int *)RTA_DATA(tb[DEVLINK_ATTR_ESWITCH_MODE]) == DEVLINK_ESWITCH_MODE_SWITCHDEV) { + ignore_value(virBitmapSetBit(*out, VIR_NET_DEV_FEAT_SWITCHDEV)); + } + + ret = 0; + + cleanup: + nlmsg_free(nl_msg); + virPCIDeviceFree(pci_device_ptr); + VIR_FREE(resp); + return ret; + + malformed_resp: + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("malformed netlink response message")); + goto cleanup; + + buffer_too_small: + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("allocated netlink buffer is too small")); + goto cleanup; +} +# else +static int +virNetDevSwitchdevFeature(const char *ifname, + virBitmapPtr *out) +{ + return 0; +} +# endif + + #if defined(SIOCETHTOOL) && defined(HAVE_STRUCT_IFREQ) /** @@ -3230,6 +3429,9 @@ virNetDevGetFeatures(const char *ifname, if (virNetDevRDMAFeature(ifname, out) < 0) goto cleanup; + if (virNetDevSwitchdevFeature(ifname, out) < 0) + goto cleanup; + ret = 0; cleanup: VIR_FORCE_CLOSE(fd); diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h index 2e9a9c4..8fd6036 100644 --- a/src/util/virnetdev.h +++ b/src/util/virnetdev.h @@ -112,6 +112,7 @@ typedef enum { VIR_NET_DEV_FEAT_RXHASH, VIR_NET_DEV_FEAT_RDMA, VIR_NET_DEV_FEAT_TXUDPTNL, + VIR_NET_DEV_FEAT_SWITCHDEV, VIR_NET_DEV_FEAT_LAST } virNetDevFeature; diff --git a/tests/nodedevschemadata/net_00_13_02_b9_f9_d3.xml b/tests/nodedevschemadata/net_00_13_02_b9_f9_d3.xml index d4c96e8..88252e6 100644 --- a/tests/nodedevschemadata/net_00_13_02_b9_f9_d3.xml +++ b/tests/nodedevschemadata/net_00_13_02_b9_f9_d3.xml @@ -15,6 +15,7 @@ <feature name='rxhash'/> <feature name='rdma'/> <feature name='txudptnl'/> + <feature name='switchdev'/> <capability type='80211'/> </capability> </device> diff --git a/tests/nodedevschemadata/net_00_15_58_2f_e9_55.xml b/tests/nodedevschemadata/net_00_15_58_2f_e9_55.xml index 71bf90e..f77dfcc 100644 --- a/tests/nodedevschemadata/net_00_15_58_2f_e9_55.xml +++ b/tests/nodedevschemadata/net_00_15_58_2f_e9_55.xml @@ -15,6 +15,7 @@ <feature name='rxhash'/> <feature name='rdma'/> <feature name='txudptnl'/> + <feature name='switchdev'/> <capability type='80203'/> </capability> </device> -- 2.1.4

2 2

[libvirt] [PATCH 0/3] tests: Make hash table mocking arch independent
by Peter Krempa 21 Aug '17

21 Aug '17

Plus one fix. Peter Krempa (3): util: hash: Include stdbool.h in the header file util: hash: Make virHashCodeGen mockable tests: deterministichash: Make hash tables arch-independent src/libvirt_private.syms | 4 ++++ src/util/virhash.h | 1 + src/util/virhashcode.h | 3 ++- .../qemumonitorjson-nodename-relative.result | 24 +++++++++++----------- .../qemumonitorjson-nodename-same-backing.result | 24 +++++++++++----------- tests/virdeterministichashmock.c | 17 +++++++++++---- tests/virmacmaptestdata/simple2.json | 12 +++++------ 7 files changed, 50 insertions(+), 35 deletions(-) -- 2.13.2

6 18

[libvirt] [PATCH] qemu: don't check whether offline migration is safe
by Pavel Hrdina 18 Aug '17

18 Aug '17

Offline migration transfers only the domain definition. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1449715 Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/qemu/qemu_migration.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 056c051b3e..ca1f67146b 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1946,7 +1946,7 @@ qemuMigrationBeginPhase(virQEMUDriverPtr driver, if (!qemuMigrationIsAllowed(driver, vm, true, flags)) goto cleanup; - if (!(flags & VIR_MIGRATE_UNSAFE) && + if (!(flags & (VIR_MIGRATE_UNSAFE | VIR_MIGRATE_OFFLINE)) && !qemuMigrationIsSafe(vm->def, nmigrate_disks, migrate_disks, flags)) goto cleanup; @@ -4809,7 +4809,7 @@ qemuMigrationPerformJob(virQEMUDriverPtr driver, if (!qemuMigrationIsAllowed(driver, vm, true, flags)) goto endjob; - if (!(flags & VIR_MIGRATE_UNSAFE) && + if (!(flags & (VIR_MIGRATE_UNSAFE | VIR_MIGRATE_OFFLINE)) && !qemuMigrationIsSafe(vm->def, nmigrate_disks, migrate_disks, flags)) goto endjob; -- 2.13.5

3 3

[libvirt] [PATCH v2 0/3] conf: Use the correct limit for the number of PHBs
by Andrea Bolognani 18 Aug '17

18 Aug '17

Andrea Bolognani (3): tests: Improve target index validation coverage conf: Move target index validation conf: Use the correct limit for the number of PHBs src/conf/domain_conf.c | 40 +++++++++++++--------- ...ml2argv-pseries-phb-invalid-target-index-1.xml} | 4 --- ...ml2argv-pseries-phb-invalid-target-index-2.xml} | 6 +--- ...ml2argv-pseries-phb-invalid-target-index-3.xml} | 11 +++--- tests/qemuxml2argvtest.c | 4 ++- 5 files changed, 32 insertions(+), 33 deletions(-) copy tests/qemuxml2argvdata/{qemuxml2argv-pseries-phb-wrong-target-index.xml => qemuxml2argv-pseries-phb-invalid-target-index-1.xml} (79%) copy tests/qemuxml2argvdata/{qemuxml2argv-pseries-phb-wrong-target-index.xml => qemuxml2argv-pseries-phb-invalid-target-index-2.xml} (68%) rename tests/qemuxml2argvdata/{qemuxml2argv-pseries-phb-wrong-target-index.xml => qemuxml2argv-pseries-phb-invalid-target-index-3.xml} (57%) -- 2.13.5

2 4

[libvirt] [PATCH] util: string: Introduce virStringHasChars
by Peter Krempa 18 Aug '17

18 Aug '17

The helper returns true if a string contains any of the given chars. virStringHasControlChars can be reimplemented using that helper. --- Pavel was loudly thinking about such function. It turns out that I have it ready on one of my branches. src/util/virstring.c | 23 +++++++++++++++++++---- src/util/virstring.h | 2 ++ 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/src/util/virstring.c b/src/util/virstring.c index 58abf9dd6..0288d1e67 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -1195,6 +1195,24 @@ virStringStripIPv6Brackets(char *str) } +/** + * virStringHasChars: + * @str: string to look for chars in + * @chars: chars to find in string @str + * + * Returns true if @str contains any of the chars in @chars. + */ +bool +virStringHasChars(const char *str, + const char *chars) +{ + if (!str) + return false; + + return str[strcspn(str, chars)] != '\0'; +} + + static const char control_chars[] = "\x01\x02\x03\x04\x05\x06\x07" "\x08" /* \t \n */ "\x0B\x0C" /* \r */ "\x0E\x0F" @@ -1204,10 +1222,7 @@ static const char control_chars[] = bool virStringHasControlChars(const char *str) { - if (!str) - return false; - - return str[strcspn(str, control_chars)] != '\0'; + return virStringHasChars(str, control_chars); } diff --git a/src/util/virstring.h b/src/util/virstring.h index ff5f0148d..1290fcce1 100644 --- a/src/util/virstring.h +++ b/src/util/virstring.h @@ -286,6 +286,8 @@ char *virStringReplace(const char *haystack, ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); void virStringStripIPv6Brackets(char *str); +bool virStringHasChars(const char *str, + const char *chars); bool virStringHasControlChars(const char *str); void virStringStripControlChars(char *str); -- 2.14.0

2 1

[libvirt] [PATCH 00/12] qemu: don't lose VMs if emulator is not installed
by Peter Krempa 18 Aug '17

18 Aug '17

The post-parse callback grew into an abomination which requires qemuCaps to succeed. That won't work out well if for some reasons qemu is uninstalled. Restarting of libvirtd would result in all VMs being lost untill qemu is reinstalled. Fix this by allowing qemuCaps to be missing and re-running the postparse callbacks when attempting a VM start. Peter Krempa (12): conf: domainlist: Explicitly report failure to load domain config conf: Add 'basic' post parse callback qemu: Move assignment of default emulator to the basic post parse callback conf: Add callbacks that allocate per-def private data qemu: domain: Don't re-allocate qemuCaps in post parse callbacks conf: Return any non-zero value from virDomainDeviceInfoIterateInternal callback conf: add infrastructure for tolerating certain post parse callback failures qemu: capabilities: Tolerate missing @qemuCaps in virQEMUCapsGetCanonicalMachine qemu: capabilities: Tolerate missing @qemuCaps in virQEMUCapsSupportsGICVersion qemu: domain: Don't return default NIC model if @qemuCaps are missing qemu: domain: Don't set default USB model if qemuCaps is missing qemu: Implement postParse callback skipping on config reload src/conf/domain_conf.c | 202 +++++++++++++++++++++++++++++-------------- src/conf/domain_conf.h | 35 +++++++- src/conf/virdomainobjlist.c | 8 +- src/qemu/qemu_capabilities.c | 20 +++-- src/qemu/qemu_domain.c | 111 ++++++++++++++++-------- src/qemu/qemu_process.c | 9 ++ 6 files changed, 277 insertions(+), 108 deletions(-) -- 2.14.0

2 16

Re: [libvirt] [PATCH v2] Add support for virtio-net.tx_queue_size
by Jan Scheurich 18 Aug '17

18 Aug '17

On Thu, Jul 27 at 14:05:09 +0200 Peter Krempa wrote: > On Thu, Jul 20, 2017 at 21:36:28 -0400, Laine Stump wrote: > > On 07/18/2017 07:12 AM, Michal Privoznik wrote: [...] > > >>> So only users that know how virtio works under the hood are > > >>> expected to also know what rx/tx queue size is and how to set it. > > >>> But frankly, I > > >> This statement is ridiculous by itself. > > > Why? There are more experienced users (for whom libvirt's just a > > > stable > > > API) and less experienced ones (for whom libvirt's and tools on the > > > top of it are great for their automatic chose of parameters, e.g. gnome > boxes). > > > > Beyond that, that same statement (or something nearly identical) is > > repeated in multiple places throughout the XML documentation. There > > are at least two classes of these attributes that I can think of: > > > > 1) attributes that are automatically set to a sane value by libvirt > > when not specified (and they usually *aren't* specified), and saved in > > the config XML in order to assure they are set the same every time the > > domain is started (to preserve guest ABI). These are intended to > > record whatever was the default setting for the attribute at the time > > the domain was created. For example, a pcie-root-port controller might > > have <model name='ioh3420'/> set, if that was the only type of > > pcie-root-port available at the time a domain was created; this comes > > in handy now that there is a generic pcie-root-port (which also has > > <model > > name='pcie-root-port'/>) - existing domains don't get their ABI > > screwed up when they're migrated to a newer host. > > > > 2) knobs that have been added in over the years at the request/demand > > from below (qemu) and above (ovirt / openstack), many of them obscure, > > difficult to explain with any amount of useful detail, and almost > > never worthy of being manually set (and if you "don't know what you're > > doing", you're just as likely to make things worse as to make them > better). > > > > tx_queue_size is one of the latter. > > > > For either of these types of attributes, they need to be documented so > > that someone encountering them (or actively searching them out) will > > at least have a basic idea what the attribute is named / used for, but > > we also need to warn the casual user to not mess with them. I don't > > see anything ridiculous about that. > We, Ericsson, have been driving the possibility to increase the Rx and Tx queue sizes for virtio interfaces in Qemu because our throughput-intensive and packet-drop sensitive virtual network functions (VNFs) were suffering frequent early packet drops. In the age of DPDK and with packet rates in the Mpps range the hard-coded default queue size of 256 in Qemu was no longer adequate to compensate short interrupts on the receiving side or microbursts on the sending size. Many measurements across the industry had proven that increasing the queue size to 1024 very effectively reduced the packet drop probability and consequently improved throughput significantly. The Qemu community could not change the virtio-net default queue size to 1024 to avoid compatibility issues and limitations in legacy virtio drivers and virtio backends. But many VNFs and the DPDK vhostuser backend in vSwitches like OVS and fd.io/VPP can handle 1K queue size and benefit from it. So they made the queue sizes configurable in Qemu to give NFVI operators the chance to tune the performance of their infrastructure. This change in Libvirt is about making this tuning option available for Qemu users like OpenStack. There is no other way than Libvirt to make this accessible as Qemu does not have the facility of global default parameters. > > >>> think users setting this are always gonna go with the highest > > >>> value avaliable (1024). Such detailed description is a copy of > > >>> rx_virtio_queue size description which is result of review. Reasons not to set to 1024 could include compatibility constraints (see above) or a trade-off between packet drop probability and maximum latency/jitter. > > >>> > > >>>> Is it really needed? How should it be configured? Can't we or > > >>>> qemu pick a sane value? > > >>>> > > >>> No. Some users need bigger virtio rings otherwise they see a > > >>> packet drop. So this is a fine tuning that heavily depends on the use > case. > > >>> Thus libvirt should not try to come up with some value. > > >> That's why I think it's wrong. What's the drawback of setting it > > >> to maximum? Which workloads will hit it? Why is the default not > sufficient? > > >> > > >> And most notably, how do the users figure out that they need it? In our case the "user" is the NFVI deployment tool chain with tuning input from NFV solution architects, guided by Installation/Dimensioning guides. > > > > > > I think it's a bit too much burden on libvirt to expect that much > > detail to be included in formatdomain.html. Heck, I don't know if > > anyone even > > *knows* that much detail right now. > > That proves my point kind of. If there isn't knowledge how to set up this, > then why even add the option. Is there really a point? I think we could improve the documentation a bit with reference to vhostuser interfaces as main target interface type and mentioning potential compatibility constraints for applications. We would actually like to see an additional global config knob in Libvirt to (optionally) set default Rx and Tx queue sizes for vhostuser interfaces, so that Libvirt consumers like OpenStack would not have to be modified to use 1K queues. BR, Jan

1 0

[libvirt] [PATCH 0/5] A few fixes and improvements to the nodedev driver
by Erik Skultety 17 Aug '17

17 Aug '17

These are just the few I came across when working on another nodedev-related series. Erik Skultety (5): nodedev: mdev: Report an error when virFileResolveLink fails nodedev: udev: Remove the udevEventHandleCallback on fatal error nodedev: Clear the udev_monitor reference once unref'd nodedev: Introduce udevHandleOneDevice nodedev: Protect every access to udev_monitor by locking the driver src/node_device/node_device_udev.c | 59 +++++++++++++++++++++++++++----------- 1 file changed, 42 insertions(+), 17 deletions(-) -- 2.13.3

2 14

[libvirt] [PATCH] virt-aa-helper: locking disk files for qemu 2.10
by Christian Ehrhardt 17 Aug '17

17 Aug '17

Testing qemu-2.10-rc2 shows issues like: qemu-system-x86_64: -drive file=/var/lib/uvtool/libvirt/images/kvmguest- \ artful-normal.qcow,format=qcow2,if=none,id=drive-virtio-disk0: Failed to lock byte 100 It seems the following qemu commit changed the needs for the backing image rules: (qemu) commit 244a5668106297378391b768e7288eb157616f64 Author: Fam Zheng <famz(a)redhat.com> file-posix: Add image locking to perm operations The block appears as: apparmor="DENIED" operation="file_lock" [...] name="/var/lib/uvtool/libvirt/images/kvmguest-artful-normal.qcow" [...] comm="qemu-system-x86" requested_mask="k" denied_mask="k" With that qemu change in place the rules generated for the image and backing files need the allowance to also lock (k) the files. Disks are added via add_file_path and with this fix rules now get that permission, but no other rules are changed, example: - "/var/lib/uvtool/libvirt/images/kvmguest-artful-normal-a2.qcow" rw, + "/var/lib/uvtool/libvirt/images/kvmguest-artful-normal-a2.qcow" rwk Signed-off-by: Christian Ehrhardt <christian.ehrhardt(a)canonical.com> --- src/security/virt-aa-helper.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 35dcb35..ab82f12 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -892,11 +892,11 @@ add_file_path(virDomainDiskDefPtr disk, if (depth == 0) { if (disk->src->readonly) - ret = vah_add_file(buf, path, "r"); + ret = vah_add_file(buf, path, "rk"); else - ret = vah_add_file(buf, path, "rw"); + ret = vah_add_file(buf, path, "rwk"); } else { - ret = vah_add_file(buf, path, "r"); + ret = vah_add_file(buf, path, "rk"); } if (ret != 0) -- 2.7.4

3 4

[libvirt] [PATCH] virt-aa-helper: locking loader/nvram for qemu 2.10
by Christian Ehrhardt 17 Aug '17

17 Aug '17

Testing qemu-2.10-rc3 shows issues like: qemu-system-aarch64: -drive file=/home/ubuntu/vm-start-stop/vms/ 7936-0_CODE.fd,if=pflash,format=raw,unit=1: Failed to unlock byte 100 There is an apparmor deny due to qemu now locking those files: apparmor="DENIED" operation="file_lock" [...] name="/home/ubuntu/vm-start-stop/vms/7936-0_CODE.fd" name="/var/lib/uvtool/libvirt/images/kvmguest-artful-normal.qcow" [...] comm="qemu-system-aarch64" requested_mask="k" denied_mask="k" The profile needs to allow locking for loader and nvram files via the locking (k) rule. Signed-off-by: Christian Ehrhardt <christian.ehrhardt(a)canonical.com> --- src/security/virt-aa-helper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index ab82f12..2308323 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -1029,11 +1029,11 @@ get_files(vahControl * ctl) goto cleanup; if (ctl->def->os.loader && ctl->def->os.loader->path) - if (vah_add_file(&buf, ctl->def->os.loader->path, "r") != 0) + if (vah_add_file(&buf, ctl->def->os.loader->path, "rk") != 0) goto cleanup; if (ctl->def->os.loader && ctl->def->os.loader->nvram) - if (vah_add_file(&buf, ctl->def->os.loader->nvram, "rw") != 0) + if (vah_add_file(&buf, ctl->def->os.loader->nvram, "rwk") != 0) goto cleanup; for (i = 0; i < ctl->def->ngraphics; i++) { -- 2.7.4

3 4

[libvirt] [PATCH] network: Use self inflating bitmap for class IDs
by Michal Privoznik 17 Aug '17

17 Aug '17

Back in the day when I was implementing QoS for networks there were no self inflating virBitmaps. Only the static ones. Therefore, I had to allocate the whole 8KB of memory in order to keep track of used/unused class IDs. This is rather wasteful because nobody is ever gonna use that much classes (kernel overhead would drastically lower the bandwidth). Anyway, now that we have self inflating bitmaps we can start small and allocate more if there's need for it. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/virnetworkobj.c | 18 ++++++++++-------- src/network/bridge_driver.c | 5 +++-- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index 918ef44ea..455b604bb 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -34,8 +34,10 @@ VIR_LOG_INIT("conf.virnetworkobj"); -/* currently, /sbin/tc implementation allows up to 16 bits for minor class size */ -#define CLASS_ID_BITMAP_SIZE (1<<16) +/* Currently, /sbin/tc implementation allows up to 16 bits for + * minor class size. But the initial bitmap doesn't have to be + * that big. */ +#define INIT_CLASS_ID_BITMAP_SIZE (1<<4) struct _virNetworkObj { virObjectLockable parent; @@ -100,13 +102,14 @@ virNetworkObjNew(void) if (!(obj = virObjectLockableNew(virNetworkObjClass))) return NULL; - if (!(obj->classIdMap = virBitmapNew(CLASS_ID_BITMAP_SIZE))) + if (!(obj->classIdMap = virBitmapNew(INIT_CLASS_ID_BITMAP_SIZE))) goto error; /* The first three class IDs are already taken */ - ignore_value(virBitmapSetBit(obj->classIdMap, 0)); - ignore_value(virBitmapSetBit(obj->classIdMap, 1)); - ignore_value(virBitmapSetBit(obj->classIdMap, 2)); + if (virBitmapSetBitExpand(obj->classIdMap, 0) < 0 || + virBitmapSetBitExpand(obj->classIdMap, 1) < 0 || + virBitmapSetBitExpand(obj->classIdMap, 2) < 0) + goto error; virObjectLock(obj); @@ -909,8 +912,7 @@ virNetworkLoadState(virNetworkObjListPtr nets, ctxt->node = node; if ((classIdStr = virXPathString("string(./class_id[1]/@bitmap)", ctxt))) { - if (virBitmapParse(classIdStr, &classIdMap, - CLASS_ID_BITMAP_SIZE) < 0) { + if (!(classIdMap = virBitmapParseUnlimited(classIdStr))) { VIR_FREE(classIdStr); goto error; } diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 74ce92e43..e8d093a31 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -5395,9 +5395,10 @@ networkNextClassID(virNetworkObjPtr obj) ssize_t ret = 0; virBitmapPtr classIdMap = virNetworkObjGetClassIdMap(obj); - ret = virBitmapNextClearBit(classIdMap, -1); + if ((ret = virBitmapNextClearBit(classIdMap, -1)) < 0) + ret = virBitmapSize(classIdMap); - if (ret < 0 || virBitmapSetBit(classIdMap, ret) < 0) + if (virBitmapSetBitExpand(classIdMap, ret) < 0) return -1; return ret; -- 2.13.0

2 1

[libvirt] [PATCH] virt-host-validate: Fix warning for IOMMU detection on PPC
by Nitesh Konkar 17 Aug '17

17 Aug '17

Fix the warning generated on PPC by virt-host-validate for IOMMU Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- tools/virt-host-validate-common.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/virt-host-validate-common.c b/tools/virt-host-validate-common.c index 6faed04..e0ca1dd 100644 --- a/tools/virt-host-validate-common.c +++ b/tools/virt-host-validate-common.c @@ -35,6 +35,7 @@ #include "virfile.h" #include "virt-host-validate-common.h" #include "virstring.h" +#include "virarch.h" #define VIR_FROM_THIS VIR_FROM_NONE @@ -443,7 +444,7 @@ int virHostValidateIOMMU(const char *hvname, struct stat sb; const char *bootarg = NULL; bool isAMD = false, isIntel = false; - + virArch hostarch; flags = virHostValidateGetCPUFlags(); if (flags && virBitmapIsBitSet(flags, VIR_HOST_VALIDATE_CPU_FLAG_VMX)) @@ -454,6 +455,7 @@ int virHostValidateIOMMU(const char *hvname, virBitmapFree(flags); virHostMsgCheck(hvname, "%s", _("for device assignment IOMMU support")); + hostarch = virArchFromHost(); if (isIntel) { if (access("/sys/firmware/acpi/tables/DMAR", F_OK) == 0) { @@ -477,7 +479,7 @@ int virHostValidateIOMMU(const char *hvname, "hardware platform"); return -1; } - } else { + } else if (!ARCH_IS_PPC64(hostarch)) { virHostMsgFail(level, "Unknown if this platform has IOMMU support"); return -1; @@ -491,6 +493,9 @@ int virHostValidateIOMMU(const char *hvname, if (!S_ISDIR(sb.st_mode)) return 0; + if (S_ISDIR(sb.st_mode) && ARCH_IS_PPC64(hostarch)) + virHostMsgPass(); + virHostMsgCheck(hvname, "%s", _("if IOMMU is enabled by kernel")); if (sb.st_nlink <= 2) { virHostMsgFail(level, -- 2.7.4

2 1

[libvirt] [PATCH 00/10] another set of parsing improvements
by Pavel Hrdina 17 Aug '17

17 Aug '17

Pavel Hrdina (10): util: introduce virXMLPropStringLimit util: introduce virXMLNodeContentString conf: use virXMLPropString for virDomainVirtioOptionsParseXML conf: use virXMLPropString for IOMMU def parsing conf: use virXMLPropString for network parsing conf: use virXMLPropString for boot parsing conf: use virXMLPropString for actual network parsing conf: use virXMLPropStringLimit where it makes sense conf: use virXMLNodeContentString for boot options parsing conf: use virXMLPropString and virXMLNodeContentString for vcpu parsing src/conf/domain_conf.c | 601 +++++++++++++++++++++++++---------------------- src/libvirt_private.syms | 2 + src/util/virxml.c | 68 +++++- src/util/virxml.h | 4 + 4 files changed, 381 insertions(+), 294 deletions(-) -- 2.13.5

2 20

[libvirt] [PATCH] network: Use @nnames instead of @got
by John Ferlan 17 Aug '17

17 Aug '17

To make it clearer, let's use @nnames instead of @got for counting the names in the @names array. Keeps things consistent and clear. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- NB: Be sure you're tree is up to date before attempting to apply ;-) src/conf/virnetworkobj.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index 918ef44..b16844d 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -1444,9 +1444,9 @@ struct virNetworkObjListGetHelperData { virConnectPtr conn; virNetworkObjListFilter filter; char **names; + int nnames; int maxnames; bool active; - int got; bool error; }; @@ -1462,7 +1462,7 @@ virNetworkObjListGetHelper(void *payload, return 0; if (data->maxnames >= 0 && - data->got == data->maxnames) + data->nnames == data->maxnames) return 0; virObjectLock(obj); @@ -1474,11 +1474,11 @@ virNetworkObjListGetHelper(void *payload, if ((data->active && virNetworkObjIsActive(obj)) || (!data->active && !virNetworkObjIsActive(obj))) { if (data->names && - VIR_STRDUP(data->names[data->got], obj->def->name) < 0) { + VIR_STRDUP(data->names[data->nnames], obj->def->name) < 0) { data->error = true; goto cleanup; } - data->got++; + data->nnames++; } cleanup: @@ -1498,8 +1498,8 @@ virNetworkObjListGetNames(virNetworkObjListPtr nets, int ret = -1; struct virNetworkObjListGetHelperData data = { - .conn = conn, .filter = filter, .names = names, - .maxnames = maxnames, .active = active, .got = 0, .error = false}; + .conn = conn, .filter = filter, .names = names, .nnames = 0, + .maxnames = maxnames, .active = active, .error = false}; virObjectLock(nets); virHashForEach(nets->objs, virNetworkObjListGetHelper, &data); @@ -1508,11 +1508,11 @@ virNetworkObjListGetNames(virNetworkObjListPtr nets, if (data.error) goto cleanup; - ret = data.got; + ret = data.nnames; cleanup: if (ret < 0) { - while (data.got) - VIR_FREE(data.names[--data.got]); + while (data.nnames) + VIR_FREE(data.names[--data.nnames]); } return ret; } @@ -1525,14 +1525,14 @@ virNetworkObjListNumOfNetworks(virNetworkObjListPtr nets, virConnectPtr conn) { struct virNetworkObjListGetHelperData data = { - .conn = conn, .filter = filter, .names = NULL, - .maxnames = -1, .active = active, .got = 0, .error = false}; + .conn = conn, .filter = filter, .names = NULL, .nnames = 0, + .maxnames = -1, .active = active, .error = false}; virObjectLock(nets); virHashForEach(nets->objs, virNetworkObjListGetHelper, &data); virObjectUnlock(nets); - return data.got; + return data.nnames; } -- 2.9.4

2 1

[libvirt] [PATCH] conf: Use the correct limit for the number of PHBs
by Andrea Bolognani 17 Aug '17

17 Aug '17

I mistakenly thought pSeries guests supported 32 PHBs, but it turns out they only support 31. Validate the target index accordingly. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1479647 Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/conf/domain_conf.c | 4 ++-- src/qemu/qemu_domain_address.c | 4 ++-- .../qemuxml2argv-pseries-phb-too-many.xml | 19 +++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + 4 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-phb-too-many.xml diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 281dc68f0..8257f04ab 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9326,10 +9326,10 @@ virDomainControllerDefParseXML(xmlNodePtr node, goto error; } if (def->opts.pciopts.targetIndex < 0 || - def->opts.pciopts.targetIndex > 31) { + def->opts.pciopts.targetIndex > 30) { virReportError(VIR_ERR_XML_ERROR, _("PCI controller target index '%s' out of " - "range - must be 0-31"), + "range - must be 0-30"), targetIndex); goto error; } diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 8066ed123..04438fae9 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -2157,9 +2157,9 @@ qemuDomainAddressFindNewTargetIndex(virDomainDefPtr def) int targetIndex; int ret = -1; - /* Try all indexes between 1 and 31 - QEMU only supports 32 + /* Try all indexes between 1 and 30 - QEMU only supports 31 * PHBs, and 0 is reserved for the default, implicit one */ - for (targetIndex = 1; targetIndex <= 31; targetIndex++) { + for (targetIndex = 1; targetIndex <= 30; targetIndex++) { bool found = false; size_t i; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-phb-too-many.xml b/tests/qemuxml2argvdata/qemuxml2argv-pseries-phb-too-many.xml new file mode 100644 index 000000000..3d99da499 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-phb-too-many.xml @@ -0,0 +1,19 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid> + <memory unit='KiB'>524288</memory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='ppc64' machine='pseries'>hvm</type> + </os> + <devices> + <emulator>/usr/bin/qemu-system-ppc64</emulator> +  + <controller type='pci' model='pci-root'> + <target index='31'/> + </controller> + <controller type='usb' model='none'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 77cfe8d28..47ca90f04 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1761,6 +1761,7 @@ mymain(void) DO_TEST("pseries-phb-simple", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE); + DO_TEST_PARSE_ERROR("pseries-phb-too-many", NONE); DO_TEST("pseries-phb-default-missing", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE); -- 2.13.5

2 1

[libvirt] [PATCH] Don't autogenerate seclabels of type 'none'
by Jim Fehlig 16 Aug '17

16 Aug '17

When security drivers are active and domain def contains no <seclabel> elements, there is no need to autogenerate seclabels when starting the domain, e.g. <seclabel type='none' model='apparmor'/> In fact, autogenerating the label can result in needless save/restore and migration failures when the security driver is not active on the restore/migration target. The virSecurityManagerGenLabel function in src/security_manager.c even has logic to skip autogenerated labels, but the logic is a bit flawed. Autogeneration should be skipped when the domain has not seclabels, i.e. vm->nseclabels == 0. Resolves: https://bugzilla.opensuse.org/show_bug.cgi?id=1051017 Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/security/security_manager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/security/security_manager.c b/src/security/security_manager.c index 013bbc37e..441c4d1fd 100644 --- a/src/security/security_manager.c +++ b/src/security/security_manager.c @@ -670,7 +670,7 @@ virSecurityManagerGenLabel(virSecurityManagerPtr mgr, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Unconfined guests are not allowed on this host")); goto cleanup; - } else if (vm->nseclabels && generated) { + } else if (vm->nseclabels == 0 && generated) { VIR_DEBUG("Skipping auto generated seclabel of type none"); virSecurityLabelDefFree(seclabel); seclabel = NULL; -- 2.13.1

2 2

[libvirt] [PATCH v2 00/20] Make the virNetworkObjPtr private
by John Ferlan 16 Aug '17

16 Aug '17

v1: https://www.redhat.com/archives/libvir-list/2017-May/msg00701.html (but reviewed much more recently) NOTE from v1: Patches 1-3 already pushed Former patch 4: * Patch 1 (NEW) - splits out the formatting change in bridge_driver.h * Patch 2 - Remainder of the change for consistent naming NB: Without the split, there was a R-B, but I didn't push so that the split could be "seen". Former patch 5: * Patch 3 (NEW) - from review create virMacMapFileName in src/util/virmacmap.c * Patch 4 - Remainder of the previous change w/ adjusted name of course * Patch 5 (NEW) - from review, alter virNetworkObjUnrefMacMap Former patch 6: * Patch 6 - No change Former patch 7: * Patch 7 (NEW) - Split out the @class_id to @classIdMap change * Patch 8 - Remainder of previous change Former patch 8: * Patch 9 - No change Former patch 9: * Patch 10 - Make suggested naming adjustments Add/use virNetworkObjSetDef API Former patch 10: * Patch 11 - Move code back to driver, just have accessors for @autostart Former patch 11: * Patch 12 - No change Former patch 12: * Patch 13 - Use virNetworkObjIsPersistent in networkSetAutostart Former patch 13: * Patch 14 - No change Former patch 14: * Patch 15 - Just have the virNetworkObjNew lock the object now and make use of that with using virNetworkObjEndAPI in networkxml2conftest NB: Since we'll have a refcnt=1 and lock=true after New the EndAPI is proper * Patch 16 (NEW) - Just move the virObjectRef - makes it clearer why it's being ref'd Former patch 15: * Patch 17 (NEW) - Split out the rename of @nnames to @maxnames and explain the reason better * Patch 18 (NEW) - Split out the rename of @filter to @aclnames and explain the reason better * Patch 19 - The remainder of the former patch Former patch 16: * Patch 20 - No change (other than merge conflict resolution) John Ferlan (20): network: Perform some formatting cleanup in bridge_driver.h network: Use consistent naming in bridge_driver for virNetwork objects network: Move and rename networkMacMgrFileName network: Move macmap mgmt from bridge_driver to virnetworkobj network: Unconditionally initialize macmap when stopping virtual network network: Add virNetworkObj Get/Set API's for @dnsmasqPid and @radvdPid network: Alter virNetworkObj @class_id to be @classIdMap network: Introduce virNetworkObjGetClassIdMap network: Add virNetworkObj Get/Set API's for @floor_sum network: Add virNetworkObj Get/Set API's for @def and @newDef network: Introduce virNetworkObj{Get|Set}Autostart network: Introduce virNetworkObj{Is|Set}Active network: Introduce virNetworkObjIsPersistent network: Consistent use of @obj for virnetworkobj network: Have virNetworkObjNew lock the returned object network: Move virObjectRef during AssignDef processing network: Use @maxnames instead of @nnames network: Rename @filter to @aclfilter network: Modify naming for virNetworkObjList* fetching APIs network: Privatize virNetworkObj src/conf/virnetworkobj.c | 614 +++++++++++++++------- src/conf/virnetworkobj.h | 105 ++-- src/libvirt_private.syms | 21 + src/network/bridge_driver.c | 1218 ++++++++++++++++++++++--------------------- src/network/bridge_driver.h | 50 +- src/test/test_driver.c | 83 +-- src/util/virmacmap.c | 12 + src/util/virmacmap.h | 4 + tests/networkxml2conftest.c | 11 +- 9 files changed, 1231 insertions(+), 887 deletions(-) -- 2.9.4

3 38

[libvirt] [PATCH 0/4] Alter @aclfilter to just @filter
by John Ferlan 16 Aug '17

16 Aug '17

>From recent review comments in the network series, Michal and Pavel have both stated the preference to use @filter, so to be consistent, rename variables that were changed in prior series. John Ferlan (4): nodedev: Alter @aclfilter to just @filter nwfilter: Alter @aclfilter to just @filter secret: Alter @aclfilter to just @filter storage: Alter @aclfilter to just @filter src/conf/virnodedeviceobj.c | 28 ++++++++++++++-------------- src/conf/virnodedeviceobj.h | 6 +++--- src/conf/virnwfilterobj.c | 18 +++++++++--------- src/conf/virnwfilterobj.h | 6 +++--- src/conf/virsecretobj.c | 24 ++++++++++++------------ src/conf/virsecretobj.h | 6 +++--- src/conf/virstorageobj.c | 20 ++++++++++---------- src/conf/virstorageobj.h | 10 +++++----- 8 files changed, 59 insertions(+), 59 deletions(-) -- 2.9.4

2 5

[libvirt] question about locking in qemuDomainObjBeginJobInternal()
by Chris Friesen 16 Aug '17

16 Aug '17

Hi, I'm hitting a scenario (on libvirt 1.2.12, so yeah it's a bit old) where I'm attempting to create two domains at the same time, and they both end up erroring out with "cannot acquire state change lock": 2017-08-14T12:57:00.000 79674: warning : qemuDomainObjBeginJobInternal:1380 : Cannot start job (modify, none) for domain instance-00000001; current job is (modify, none) owned by (79673, 0) 2017-08-14T12:57:00.000 79674: error : qemuDomainObjBeginJobInternal:1385 : Timed out during operation: cannot acquire state change lock 2017-08-14T12:57:01.000 79675: warning : qemuDomainObjBeginJobInternal:1380 : Cannot start job (modify, none) for domain instance-00000002; current job is (modify, none) owned by (79677, 0) 2017-08-14T12:57:01.000 79675: error : qemuDomainObjBeginJobInternal:1385 : Timed out during operation: cannot acquire state change lock Given that the lock appears to be per-domain, I assume this means that something is trying to issue multiple operations in parallel to each domain? Chris

2 1

[libvirt] IRC support thanks
by Rob Whyte 16 Aug '17

16 Aug '17

Hi from Tasmania Australia, I am writing to express gratitude twoard those on the IRC channel for soem hand-holding support iwth FVirt. In turn I would like to commit some patches to tidy up some docus. Until then. cheers Rob

2 1

[libvirt] [PATCH] libvirtd.conf: Drop max_requests
by Michal Privoznik 16 Aug '17

16 Aug '17

Since its introduction in f61341173bdaa2e0 it was never implemented nor there are plans to implement it. Drop it. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- daemon/libvirtd-config.c | 3 --- daemon/libvirtd-config.h | 1 - daemon/libvirtd.aug | 1 - daemon/libvirtd.conf | 14 ++------------ daemon/test_libvirtd.aug.in | 1 - 5 files changed, 2 insertions(+), 18 deletions(-) diff --git a/daemon/libvirtd-config.c b/daemon/libvirtd-config.c index db283a41f..19b3d168e 100644 --- a/daemon/libvirtd-config.c +++ b/daemon/libvirtd-config.c @@ -153,7 +153,6 @@ daemonConfigNew(bool privileged ATTRIBUTE_UNUSED) data->prio_workers = 5; - data->max_requests = 20; data->max_client_requests = 5; data->audit_level = 1; @@ -348,8 +347,6 @@ daemonConfigLoadOptions(struct daemonConfig *data, if (virConfGetValueUInt(conf, "prio_workers", &data->prio_workers) < 0) goto error; - if (virConfGetValueUInt(conf, "max_requests", &data->max_requests) < 0) - goto error; if (virConfGetValueUInt(conf, "max_client_requests", &data->max_client_requests) < 0) goto error; diff --git a/daemon/libvirtd-config.h b/daemon/libvirtd-config.h index 1edf5fadb..d618c9660 100644 --- a/daemon/libvirtd-config.h +++ b/daemon/libvirtd-config.h @@ -71,7 +71,6 @@ struct daemonConfig { unsigned int prio_workers; - unsigned int max_requests; unsigned int max_client_requests; unsigned int log_level; diff --git a/daemon/libvirtd.aug b/daemon/libvirtd.aug index 24fdf445c..df310d876 100644 --- a/daemon/libvirtd.aug +++ b/daemon/libvirtd.aug @@ -60,7 +60,6 @@ module Libvirtd = | int_entry "max_clients" | int_entry "max_queued_clients" | int_entry "max_anonymous_clients" - | int_entry "max_requests" | int_entry "max_client_requests" | int_entry "prio_workers" diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf index e83e9a1c1..8a1b3a92d 100644 --- a/daemon/libvirtd.conf +++ b/daemon/libvirtd.conf @@ -301,20 +301,10 @@ # (notably domainDestroy) can be executed in this pool. #prio_workers = 5 -# Total global limit on concurrent RPC calls. Should be -# at least as large as max_workers. Beyond this, RPC requests -# will be read into memory and queued. This directly impacts -# memory usage, currently each request requires 256 KB of -# memory. So by default up to 5 MB of memory is used -# -# XXX this isn't actually enforced yet, only the per-client -# limit is used so far -#max_requests = 20 - # Limit on concurrent requests from a single client # connection. To avoid one client monopolizing the server -# this should be a small fraction of the global max_requests -# and max_workers parameter +# this should be a small fraction of the global max_workers +# parameter. #max_client_requests = 5 # Same processing controls, but this time for the admin interface. diff --git a/daemon/test_libvirtd.aug.in b/daemon/test_libvirtd.aug.in index 12009528f..b24b32e33 100644 --- a/daemon/test_libvirtd.aug.in +++ b/daemon/test_libvirtd.aug.in @@ -42,7 +42,6 @@ module Test_libvirtd = { "min_workers" = "5" } { "max_workers" = "20" } { "prio_workers" = "5" } - { "max_requests" = "20" } { "max_client_requests" = "5" } { "admin_min_workers" = "1" } { "admin_max_workers" = "5" } -- 2.13.0

2 1

Re: [libvirt] [Qemu-devel] ask a question
by Stefan Hajnoczi 16 Aug '17

16 Aug '17

On Wed, Aug 16, 2017 at 02:25:19PM +0800, 皮智 wrote: > Hi，I meet a problem with vm, my environment is qemu-kvm-2.3, > virtio-win-0.1.126, host(centos7.2), guest(windows10). > > libvirt xml has four virtio-serial channel as follows: CCing the libvirt mailing list. This may be a libvirt issue. > <channel type='spicevmc'> > <target type='virtio' name='com.redhat.spice.0' state='connected'/> > <alias name='channel0'/> > <address type='virtio-serial' controller='0' bus='0' port='1'/> > </channel> > <channel type='unix'> > <source mode='bind' > path='/var/lib/libvirt/qemu/e597eab9-95db-46e9-96f0-12a84c692569'/> > <target type='virtio' name='pv-mon' state='connected'/> > <alias name='channel1'/> > <address type='virtio-serial' controller='0' bus='0' port='2'/> > </channel> > <channel type='unix'> > <source mode='bind' > path='/var/lib/libvirt/qemu/e597eab9-95db-46e9-96f0-12a84c692569-qga'/> > <target type='virtio' name='org.qemu.guest_agent.0' > state='connected'/> > <alias name='channel2'/> > <address type='virtio-serial' controller='0' bus='0' port='3'/> > </channel> > <channel type='unix'> > <source mode='bind' > path='/var/lib/libvirt/qemu/e597eab9-95db-46e9-96f0-12a84c692569-report'/> > <target type='virtio' name='qga-active-report' state='connected'/> > <alias name='channel3'/> > <address type='virtio-serial' controller='0' bus='0' port='4'/> > </channel> > > If I hard reboot the vm, it may happen as follows: > > 2017-08-14T07:51:18.401008Z qemu-kvm: virtio-serial-bus: Unexpected port id > 1122983520 for device virtio-serial0.0 > 2017-08-14T07:51:18.956482Z qemu-kvm: virtio-serial-bus: Guest failure in > adding device virtio-serial0.0 > 2017-08-14T07:51:29.176795Z qemu-kvm: virtio-serial-bus: Guest failure in > adding device virtio-serial0.0 > 2017-08-14T07:51:34.454819Z qemu-kvm: virtio-serial-bus: Unexpected port id > 2042451128 for device virtio-serial0.0 > 2017-08-14T07:51:44.655068Z qemu-kvm: virtio-serial-bus: Guest failure in > adding device virtio-serial0.0 > 2017-08-14T07:51:49.764201Z qemu-kvm: virtio-serial-bus: Unexpected port id > 1122983520 for device virtio-serial0.0 > 2017-08-14T07:51:59.969836Z qemu-kvm: virtio-serial-bus: Guest failure in > adding device virtio-serial0.0 > 2017-08-14T07:52:21.564461Z qemu-kvm: virtio-serial-bus: Unexpected port id > 1122983520 for device virtio-serial0.0 > 2017-08-14T07:52:47.059452Z qemu-kvm: virtio-serial-bus: Guest failure in > adding device virtio-serial0.0 > 2017-08-14T07:53:22.710677Z qemu-kvm: virtio-serial-bus: Unexpected port id > 1122983520 for device virtio-serial0.0 > 2017-08-14T07:53:32.781204Z qemu-kvm: virtio-serial-bus: Guest failure in > adding device virtio-serial0.0 > 2017-08-14T07:53:48.040513Z qemu-kvm: virtio-serial-bus: Unexpected port id > 3179968584 for device virtio-serial0.0 > 2017-08-14T07:54:23.547393Z qemu-kvm: virtio-serial-bus: Unexpected port id > 1122983520 for device virtio-serial0.0 > 2017-08-14T07:55:54.350754Z qemu-kvm: virtio-serial-bus: Unexpected port id > 1122983520 for device virtio-serial0.0 > 2017-08-14T07:56:09.393056Z qemu-kvm: virtio-serial-bus: Unexpected port id > 1122983520 for device virtio-serial0.0 > 2017-08-14T07:57:39.670850Z qemu-kvm: virtio-serial-bus: Unexpected port id > 1122983520 for device virtio-serial0.0 > 2017-08-14T07:58:09.867650Z qemu-kvm: virtio-serial-bus: Unexpected port id > 1185792 for device virtio-serial0.0 > 2017-08-14T07:59:10.053208Z qemu-kvm: virtio-serial-bus: Unexpected port id > 1122983520 for device virtio-serial0.0 > 2017-08-14T08:00:20.235162Z qemu-kvm: virtio-serial-bus: Guest failure in > adding device virtio-serial0.0 > 2017-08-14T08:01:20.394196Z qemu-kvm: virtio-serial-bus: Guest failure in > adding device virtio-serial0.0 > > So, the virtio-serial port will not be available, it cause my program > doesn't start in guest(windows10). > Can you give me some advices ? > > Looking forward to your reply.

1 0

[libvirt] [RFC v4 00/13] qmp: query-device-slots command
by Eduardo Habkost 15 Aug '17

15 Aug '17

Changelog --------- Changes v3 -> v4: * New compact representation of slot sets. * New generic code to automatically merge similar slots into a single entry in the command output while keeping implementations of the method simpler. * Example implementation of IDE and USB bus enumeration Changes v2 -> v3: * Implemented a "slot set" structure, where multiple slots can be reported by using integer ranges or lists for possible values for each property. Added a ValueSet struct, that can represent a set of values using either a simple list of values, or integer ranges. (Its JSON representation is very verbose, though. See comments below). * Removed the *Properties structs, and replaced them with a simple list of SlotOption structs. * DeviceSlotInfo is not an union anymore, removed the 'type' field only because there are no slot-type-specific fields in the current implementation, but we may add it back if necessary * The implementation is very quick and dirty, the main purpose of this RFC is to evaluate the schema and returned data. Changes v1 -> v2: * Don't show sysbus unless has_dynamic_sysbus is set for the machine type * Removed max-devices and devices properties * Introduced "non-slot" slot type, to explicitly indicate we are returning info on a bus that doesn't implement slot enumeration yet. * Return bus name instead of full QOM path on "bus" field * PCI: Replaced "addr" property (string parsed by property setter) with "device-number" uint32 property * PCI: return only one slot for PCIe ports Summary ------- This adds a new command to QMP: query-device-slots. It will allow management software to query possible slots where devices can be plugged. This implementation of the command will return: * Multiple PCI slots per bus, in the case of PCI buses; * One slot for each entry from query-hotpluggable-cpus. * One slot per bus for the other buses (that don't implement slot enumeration yet), with opts-complete=false Representation of slot sets in JSON ----------------------------------- Slot sets are represented by a list of option names and sets of possible values for each of those options. The command uses a compact representation for the set of valid values for an option. For example, the following set of 5 PCI functions: bus: pcie.0 device-number: 31 functions: 1,4,5,6,7 would be represented in the JSON data as: {"available":false,"count":5, "device-types":["pci-device"],"hotpluggable":false, "opts":[ {"option":"function","values":[1,[4,7]]}, {"option":"device-number","values":31}, {"option":"bus","values":"pcie.0"}], "opts-complete":true} I planned to use QAPI alternates to model/document that in the schema, but it would require implementing a few missing features in QAPI alternate support. TODO ---- * Differentiation between legacy-pci-device and pcie-device * Implement enumeration for other buses * Document the slotinfo.c functions * Optimize the slot/option merging algorithm Example output -------------- Using the following QEMU command-line: $ qemu-system-x86_64 -machine q35,accel=kvm \ -smp 16,maxcpus=32,threads=2,cores=2 query-device-slots will return the following entries: {"available":true,"count":224, "device-types":["pci-device"],"hotpluggable":false, "opts":[ {"option":"function","values":[[0,7]]}, {"option":"device-number","values":[[3,30]]}, {"option":"bus","values":"pcie.0"}], "opts-complete":true} {"available":true,"count":1, "device-types":["ide-device"],"hotpluggable":false, "opts":[ {"option":"unit","values":0}, {"option":"bus","values":"ide.2"}], "opts-complete":true} {"available":true,"count":10, "device-types":["ide-device"],"hotpluggable":false, "opts":[ {"option":"unit","values":[[0,1]]}, {"option":"bus","values":["ide.4","ide.3","ide.5","ide.0","ide.1"]}], "opts-complete":true} {"available":true, "device-types":["isa-device"],"hotpluggable":false, "opts":[ {"option":"bus","values":"isa.0"}], "opts-complete":false} {"available":true,"count":16, "device-types":["qemu64-x86_64-cpu"],"hotpluggable":true, "opts":[ {"option":"socket-id","values":[[4,7]]}, {"option":"thread-id","values":[[0,1]]}, {"option":"core-id","values":[[0,1]]}], "opts-complete":true} {"available":false,"count":1,"device":"/machine/unattached/device[16]", "device-types":["qemu64-x86_64-cpu"],"hotpluggable":true, "opts":[ {"option":"socket-id","values":3}, {"option":"thread-id","values":1}, {"option":"core-id","values":1}], "opts-complete":true} {"available":false,"count":1,"device":"/machine/unattached/device[15]", "device-types":["qemu64-x86_64-cpu"],"hotpluggable":true, "opts":[ {"option":"socket-id","values":3}, {"option":"thread-id","values":0}, {"option":"core-id","values":1}], "opts-complete":true} {"available":false,"count":1,"device":"/machine/unattached/device[14]", "device-types":["qemu64-x86_64-cpu"],"hotpluggable":true, "opts":[ {"option":"socket-id","values":3}, {"option":"thread-id","values":1}, {"option":"core-id","values":0}], "opts-complete":true} {"available":false,"count":1,"device":"/machine/unattached/device[13]", "device-types":["qemu64-x86_64-cpu"],"hotpluggable":true, "opts":[ {"option":"socket-id","values":3}, {"option":"thread-id","values":0}, {"option":"core-id","values":0}], "opts-complete":true} {"available":false,"count":1,"device":"/machine/unattached/device[12]", "device-types":["qemu64-x86_64-cpu"],"hotpluggable":true, "opts":[ {"option":"socket-id","values":2}, {"option":"thread-id","values":1}, {"option":"core-id","values":1}], "opts-complete":true} {"available":false,"count":1,"device":"/machine/unattached/device[11]", "device-types":["qemu64-x86_64-cpu"],"hotpluggable":true, "opts":[ {"option":"socket-id","values":2}, {"option":"thread-id","values":0}, {"option":"core-id","values":1}], "opts-complete":true} {"available":false,"count":1,"device":"/machine/unattached/device[10]", "device-types":["qemu64-x86_64-cpu"],"hotpluggable":true, "opts":[ {"option":"socket-id","values":2}, {"option":"thread-id","values":1}, {"option":"core-id","values":0}], "opts-complete":true} {"available":false,"count":1,"device":"/machine/unattached/device[9]", "device-types":["qemu64-x86_64-cpu"],"hotpluggable":true, "opts":[ {"option":"socket-id","values":2}, {"option":"thread-id","values":0}, {"option":"core-id","values":0}], "opts-complete":true} {"available":false,"count":1,"device":"/machine/unattached/device[8]", "device-types":["qemu64-x86_64-cpu"],"hotpluggable":true, "opts":[ {"option":"socket-id","values":1}, {"option":"thread-id","values":1}, {"option":"core-id","values":1}], "opts-complete":true} {"available":false,"count":1,"device":"/machine/unattached/device[7]", "device-types":["qemu64-x86_64-cpu"],"hotpluggable":true, "opts":[ {"option":"socket-id","values":1}, {"option":"thread-id","values":0}, {"option":"core-id","values":1}], "opts-complete":true} {"available":false,"count":1,"device":"/machine/unattached/device[6]", "device-types":["qemu64-x86_64-cpu"],"hotpluggable":true, "opts":[ {"option":"socket-id","values":1}, {"option":"thread-id","values":1}, {"option":"core-id","values":0}], "opts-complete":true} {"available":false,"count":1,"device":"/machine/unattached/device[5]", "device-types":["qemu64-x86_64-cpu"],"hotpluggable":true, "opts":[ {"option":"socket-id","values":1}, {"option":"thread-id","values":0}, {"option":"core-id","values":0}], "opts-complete":true} {"available":false,"count":1,"device":"/machine/unattached/device[4]", "device-types":["qemu64-x86_64-cpu"],"hotpluggable":true, "opts":[ {"option":"socket-id","values":0}, {"option":"thread-id","values":1}, {"option":"core-id","values":1}], "opts-complete":true} {"available":false,"count":1,"device":"/machine/unattached/device[3]", "device-types":["qemu64-x86_64-cpu"],"hotpluggable":true, "opts":[ {"option":"socket-id","values":0}, {"option":"thread-id","values":0}, {"option":"core-id","values":1}], "opts-complete":true} {"available":false,"count":1,"device":"/machine/unattached/device[2]", "device-types":["qemu64-x86_64-cpu"],"hotpluggable":true, "opts":[ {"option":"socket-id","values":0}, {"option":"thread-id","values":1}, {"option":"core-id","values":0}], "opts-complete":true} {"available":false,"count":1,"device":"/machine/unattached/device[0]", "device-types":["qemu64-x86_64-cpu"],"hotpluggable":true, "opts":[ {"option":"socket-id","values":0}, {"option":"thread-id","values":0}, {"option":"core-id","values":0}], "opts-complete":true} {"available":false,"count":1,"device":"/machine/q35/mch", "device-types":["pci-device"],"hotpluggable":false, "opts":[ {"option":"function","values":0}, {"option":"device-number","values":0}, {"option":"bus","values":"pcie.0"}], "opts-complete":true} {"available":false,"count":21, "device-types":["pci-device"],"hotpluggable":false, "opts":[ {"option":"function","values":[[1,7]]}, {"option":"device-number","values":[[0,2]]}, {"option":"bus","values":"pcie.0"}], "opts-complete":true} {"available":false,"count":1,"device":"/machine/unattached/device[44]", "device-types":["pci-device"],"hotpluggable":false, "opts":[ {"option":"function","values":0}, {"option":"device-number","values":1}, {"option":"bus","values":"pcie.0"}], "opts-complete":true} {"available":false,"count":1,"device":"/machine/unattached/device[45]", "device-types":["pci-device"],"hotpluggable":false, "opts":[ {"option":"function","values":0}, {"option":"device-number","values":2}, {"option":"bus","values":"pcie.0"}], "opts-complete":true} {"available":false,"count":1,"device":"/machine/unattached/device[18]", "device-types":["pci-device"],"hotpluggable":false, "opts":[ {"option":"function","values":0}, {"option":"device-number","values":31}, {"option":"bus","values":"pcie.0"}], "opts-complete":true} {"available":false,"count":5, "device-types":["pci-device"],"hotpluggable":false, "opts":[ {"option":"function","values":[1,[4,7]]}, {"option":"device-number","values":31}, {"option":"bus","values":"pcie.0"}], "opts-complete":true} {"available":false,"count":1,"device":"/machine/unattached/device[33]", "device-types":["pci-device"],"hotpluggable":false, "opts":[ {"option":"function","values":2}, {"option":"device-number","values":31}, {"option":"bus","values":"pcie.0"}], "opts-complete":true} {"available":false,"count":1,"device":"/machine/unattached/device[35]", "device-types":["pci-device"],"hotpluggable":false, "opts":[ {"option":"function","values":3}, {"option":"device-number","values":31}, {"option":"bus","values":"pcie.0"}], "opts-complete":true} {"available":false,"count":1,"device":"/machine/unattached/device[34]", "device-types":["ide-device"],"hotpluggable":false, "opts":[ {"option":"unit","values":1}, {"option":"bus","values":"ide.2"}], "opts-complete":true} {"available":false,"device":"/machine/unattached/device[32]", "device-types":["isa-device"],"hotpluggable":false, "opts":[ {"option":"bus","values":"isa.0"}], "opts-complete":false} {"available":false,"device":"/machine/unattached/device[31]", "device-types":["isa-device"],"hotpluggable":false, "opts":[ {"option":"bus","values":"isa.0"}], "opts-complete":false} {"available":false,"device":"/machine/unattached/device[30]", "device-types":["isa-device"],"hotpluggable":false, "opts":[ {"option":"bus","values":"isa.0"}], "opts-complete":false} {"available":false,"device":"/machine/unattached/device[29]", "device-types":["isa-device"],"hotpluggable":false, "opts":[ {"option":"bus","values":"isa.0"}], "opts-complete":false} {"available":false,"device":"/machine/unattached/device[28]", "device-types":["isa-device"],"hotpluggable":false, "opts":[ {"option":"bus","values":"isa.0"}], "opts-complete":false} {"available":false,"device":"/machine/unattached/device[27]", "device-types":["isa-device"],"hotpluggable":false, "opts":[ {"option":"bus","values":"isa.0"}], "opts-complete":false} {"available":false,"device":"/machine/unattached/device[26]", "device-types":["isa-device"],"hotpluggable":false, "opts":[ {"option":"bus","values":"isa.0"}], "opts-complete":false} {"available":false,"device":"/machine/unattached/device[25]", "device-types":["isa-device"],"hotpluggable":false, "opts":[ {"option":"bus","values":"isa.0"}], "opts-complete":false} {"available":false,"device":"/machine/unattached/device[24]", "device-types":["isa-device"],"hotpluggable":false, "opts":[ {"option":"bus","values":"isa.0"}], "opts-complete":false} {"available":false,"device":"/machine/unattached/device[23]", "device-types":["isa-device"],"hotpluggable":false, "opts":[ {"option":"bus","values":"isa.0"}], "opts-complete":false} {"available":false,"device":"/machine/unattached/device[22]", "device-types":["isa-device"],"hotpluggable":false, "opts":[ {"option":"bus","values":"isa.0"}], "opts-complete":false} {"available":false,"device":"/machine/unattached/device[20]", "device-types":["isa-device"],"hotpluggable":false, "opts":[ {"option":"bus","values":"isa.0"}], "opts-complete":false} {"available":false,"device":"/machine/unattached/device[19]", "device-types":["isa-device"],"hotpluggable":false, "opts":[ {"option":"bus","values":"isa.0"}], "opts-complete":false} Cc: Markus Armbruster <armbru(a)redhat.com> Cc: Marcel Apfelbaum <marcel(a)redhat.com> Cc: libvir-list(a)redhat.com Cc: Igor Mammedov <imammedo(a)redhat.com> Cc: Laine Stump <laine(a)redhat.com> Eduardo Habkost (13): qmp: Define query-device-slots command qapi: qobject_compare() helper qdev: Add BusClass::device_type field qdev: Slot info helpers query-device-slots: Collapse similar entries qdev core: generic enumerate_slots implementation qdev: Enumerate CPU slots on query-device-slots ide: enumerate_slots implementation pci: pci_bus_has_pcie_upstream_port() function pci: device-number & function properties pci: enumerate_slots implementation usb: enumerate_slots implementation tests: Experimental query-device-slots test code qapi-schema.json | 89 ++++++ include/hw/qdev-core.h | 5 + include/hw/qdev-slotinfo.h | 85 ++++++ include/hw/usb.h | 6 +- include/qapi/util.h | 39 +++ hw/audio/intel-hda.c | 7 + hw/block/fdc.c | 15 +- hw/char/virtio-serial-bus.c | 1 + hw/core/bus.c | 42 +++ hw/core/slotinfo.c | 610 ++++++++++++++++++++++++++++++++++++++++++ hw/core/sysbus.c | 8 + hw/i2c/core.c | 7 + hw/ide/qdev.c | 27 ++ hw/input/adb.c | 7 + hw/ipack/ipack.c | 7 + hw/isa/isa-bus.c | 1 + hw/misc/auxbus.c | 1 + hw/pci/pci.c | 120 ++++++++- hw/ppc/spapr_vio.c | 1 + hw/s390x/css-bridge.c | 2 + hw/s390x/event-facility.c | 1 + hw/s390x/s390-pci-bus.c | 7 + hw/scsi/scsi-bus.c | 1 + hw/sd/core.c | 7 + hw/ssi/ssi.c | 7 + hw/usb/bus.c | 37 +++ hw/usb/dev-smartcard-reader.c | 7 + hw/virtio/virtio-bus.c | 1 + qapi/qapi-util.c | 66 +++++ qdev-monitor.c | 109 ++++++++ tests/test-qapi-util.c | 53 ++++ tests/test-slotinfo.c | 398 +++++++++++++++++++++++++++ hw/core/Makefile.objs | 2 + tests/Makefile.include | 14 +- tests/qmp-machine-info.py | 300 +++++++++++++++++++++ 35 files changed, 2075 insertions(+), 15 deletions(-) create mode 100644 include/hw/qdev-slotinfo.h create mode 100644 hw/core/slotinfo.c create mode 100644 tests/test-slotinfo.c create mode 100755 tests/qmp-machine-info.py -- 2.9.4

2 3

[libvirt] [PATCH] qemu: Fix bug assuming usage of default UUID for certificate passphrase
by John Ferlan 15 Aug '17

15 Aug '17

If an environment specific _tls_x509_cert_dir is provided, then do not VIR_STRDUP the defaultTLSx509secretUUID as that would be for the "default" environment and not the vnc, spice, chardev, or migrate environments. If the environment needs a secret to decode it's certificate, then it must provide the secret. If the secrets happen to be the same, then configuration would use the same UUID as the default (but we cannot assume that nor can we assume that the secret would be necessary). Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- While responding to a different patch today regarding Veritas and usage of a default environment w/ or w/o secrets I realized that the existing logic has a flaw in "assuming" that someone would want to use the default secret. What if they defined their own environment without a secret? Then the code would create a secret object to pass to QEMU which would think it needs to use it to decode the server certificate (but it doesn't), so it would seemingly fail the start. I assume based on the lack of complaints about this that everyone just uses the default environment! src/qemu/qemu_conf.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index c4714ed..a7a2aaa 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -526,14 +526,18 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, goto cleanup; \ if (rv == 0) \ cfg->val## TLSx509verify = cfg->defaultTLSx509verify; \ - if (virConfGetValueString(conf, #val "_tls_x509_cert_dir", \ - &cfg->val## TLSx509certdir) < 0) \ + if ((rv = virConfGetValueString(conf, #val "_tls_x509_cert_dir", \ + &cfg->val## TLSx509certdir)) < 0) \ goto cleanup; \ if (virConfGetValueString(conf, \ #val "_tls_x509_secret_uuid", \ &cfg->val## TLSx509secretUUID) < 0) \ goto cleanup; \ - if (!cfg->val## TLSx509secretUUID && \ + /* Only if a *tls_x509_cert_dir wasn't found (e.g. rv == 0), should \ + * we copy the defaultTLSx509secretUUID. If this environment needs \ + * a passphrase to decode the certificate, then it should provide \ + * it's own secretUUID for that. */ \ + if (rv == 0 && !cfg->val## TLSx509secretUUID && \ cfg->defaultTLSx509secretUUID) { \ if (VIR_STRDUP(cfg->val## TLSx509secretUUID, \ cfg->defaultTLSx509secretUUID) < 0) \ -- 2.9.4

2 2