- Devel - libvirt List Archives

[libvirt] [PATCH] rpm: increase min required Fedora to 27
by Fabiano Fidêncio 11 Sep '18

11 Sep '18

Fedora 26 has reached its EOL on May 29th 2018. https://lists.fedoraproject.org/archives/list/announce@lists.fedoraproject.… Signed-off-by: Fabiano Fidêncio <fidencio(a)redhat.com> --- libvirt.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index cc2e662e27..b31947b0f4 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -4,7 +4,7 @@ # that's still supported by the vendor. It may work on other distros # or versions, but no effort will be made to ensure that going forward. %define min_rhel 7 -%define min_fedora 26 +%define min_fedora 27 %if (0%{?fedora} && 0%{?fedora} >= %{min_fedora}) || (0%{?rhel} && 0%{?rhel} >= %{min_rhel}) %define supported_platform 1 -- 2.17.1

2 1

[libvirt] [PATCH] nwfilter:fix deadlock when nwfilter reload
by Wang Yechao 11 Sep '18

11 Sep '18

user run "firewalld-cmd --reload" nwfilterStateReload called in main thread step 1. virRWLockWrite(&updateLock) step 2. virNWFilterLoadAllConfigs step 3. virRWLockUnlock(&updateLock); lauch a vm: qemuDomainCreateXML runs in other thread step 1. virRWLockRead(&updateLock); step 2. qemuProcessStart step 3. qemuProcessWaitForMonitor step 4. ... step 5 virRWLockUnlock(&updateLock); if nwfilterStateReload called in the middle of step 1 and step 5 of qemuDomainCreateXML, it can't get the updateLock and then block the event_loop, so event_loop can't handle the qemu-monitor messages, cause deadlock move nwfilterStateReload into thread to fix this problem. Signed-off-by: Wang Yechao <wang.yechao255(a)zte.com.cn> Reviewed-by: Yi Wang <wang.yi59(a)zte.com.cn> --- src/nwfilter/nwfilter_driver.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) mode change 100644 => 100755 src/nwfilter/nwfilter_driver.c diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c old mode 100644 new mode 100755 index ac3a964..2c099e2 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -81,17 +81,28 @@ static void nwfilterDriverUnlock(void) #if HAVE_FIREWALLD +static void nwfilterThread(void *opaque ATTRIBUTE_UNUSED) +{ + nwfilterStateReload(); +} + static DBusHandlerResult nwfilterFirewalldDBusFilter(DBusConnection *connection ATTRIBUTE_UNUSED, DBusMessage *message, void *user_data ATTRIBUTE_UNUSED) { + virThread thread; + if (dbus_message_is_signal(message, DBUS_INTERFACE_DBUS, "NameOwnerChanged") || dbus_message_is_signal(message, "org.fedoraproject.FirewallD1", "Reloaded")) { VIR_DEBUG("Reload in nwfilter_driver because of firewalld."); - nwfilterStateReload(); + + /* create thread handle the nwfilter reload, don't block the event_loop.*/ + if (virThreadCreate(&thread, false, nwfilterThread, NULL) < 0) { + VIR_ERROR("create nwfilterThread failed."); + } } return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; -- 1.8.3.1

1 0

[libvirt] [PATCH v3 0/3] libxl: implement virDomainPM* functions
by Marek Marczykowski-Górecki 10 Sep '18

10 Sep '18

Needed libxl_domain_suspend_only is supported in Xen >= 4.11. But wakeup should work with older versions. Marek Marczykowski-Górecki (3): libxl: send lifecycle event on suspend libxl: implement virDomainPM* functions libxl: initialize domain state with real data src/libxl/libxl_domain.c | 20 +++--- src/libxl/libxl_driver.c | 138 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 150 insertions(+), 8 deletions(-) base-commit: 3ad77f853230f870efa396636e008292c7f2b1c0 -- git-series 0.9.1

2 5

[libvirt] [PATCH] nwfilter:fix deadlock when nwfilter reload
by Wang Yechao 10 Sep '18

10 Sep '18

user run "firewalld-cmd --reload" nwfilterStateReload called in main thread step 1. virRWLockWrite(&updateLock) step 2. virNWFilterLoadAllConfigs step 3. virRWLockUnlock(&updateLock); lauch a vm: qemuDomainCreateXML runs in other thread step 1. virRWLockRead(&updateLock); step 2. qemuProcessStart step 3. qemuProcessWaitForMonitor step 4. ... step 5 virRWLockUnlock(&updateLock); if nwfilterStateReload called in the middle of step 1 and step 5 of qemuDomainCreateXML, it can't get the updateLock and then block the event_loop, so event_loop can't handle the qemu-monitor messages, cause deadlock move nwfilterStateReload into thread to fix this problem. Signed-off-by: Wang Yechao <wang.yechao255(a)zte.com.cn> Reviewed-by: Wang Yi <wang.yi59(a)zte.com.cn> --- src/nwfilter/nwfilter_driver.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) mode change 100644 => 100755 src/nwfilter/nwfilter_driver.c diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c old mode 100644 new mode 100755 index ac3a964..2c099e2 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -81,17 +81,28 @@ static void nwfilterDriverUnlock(void) #if HAVE_FIREWALLD +static void nwfilterThread(void *opaque ATTRIBUTE_UNUSED) +{ + nwfilterStateReload(); +} + static DBusHandlerResult nwfilterFirewalldDBusFilter(DBusConnection *connection ATTRIBUTE_UNUSED, DBusMessage *message, void *user_data ATTRIBUTE_UNUSED) { + virThread thread; + if (dbus_message_is_signal(message, DBUS_INTERFACE_DBUS, "NameOwnerChanged") || dbus_message_is_signal(message, "org.fedoraproject.FirewallD1", "Reloaded")) { VIR_DEBUG("Reload in nwfilter_driver because of firewalld."); - nwfilterStateReload(); + + /* create thread handle the nwfilter reload, don't block the event_loop.*/ + if (virThreadCreate(&thread, false, nwfilterThread, NULL) < 0) { + VIR_ERROR("create nwfilterThread failed."); + } } return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; -- 1.8.3.1

1 0

[libvirt] [PATCH] util: netlink: Remove virNetDevPutExtraHeader and replace with nlmsg_append
by Shi Lei 08 Sep '18

08 Sep '18

This patch removes virNetDevPutExtraHeader and replaces it with nlmsg_append directly. Signed-off-by: Shi Lei <shi_lei(a)massclouds.com> --- src/util/virnetdev.c | 44 ++++++++++++-------------------------------- 1 file changed, 12 insertions(+), 32 deletions(-) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index c4dd354..5d4ad24 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -3163,28 +3163,6 @@ virNetDevGetEthtoolFeatures(virBitmapPtr bitmap, # if HAVE_DECL_DEVLINK_CMD_ESWITCH_GET -/** - * 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. - * - * @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; - return ptr; -} - /** * virNetDevGetFamilyId: @@ -3199,7 +3177,11 @@ virNetDevGetFamilyId(const char *family_name) { struct nl_msg *nl_msg = NULL; struct nlmsghdr *resp = NULL; - struct genlmsghdr* gmsgh = NULL; + struct genlmsghdr gmsgh = { + .cmd = CTRL_CMD_GETFAMILY, + .version = DEVLINK_GENL_VERSION, + .reserved = 0, + }; struct nlattr *tb[CTRL_ATTR_MAX + 1] = {NULL, }; unsigned int recvbuflen; uint32_t family_id = 0; @@ -3210,12 +3192,9 @@ virNetDevGetFamilyId(const char *family_name) goto cleanup; } - if (!(gmsgh = virNetDevPutExtraHeader(nlmsg_hdr(nl_msg), sizeof(struct genlmsghdr)))) + if (nlmsg_append(nl_msg, &gmsgh, sizeof(gmsgh), NLMSG_ALIGNTO) < 0) 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) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("allocated netlink buffer is too small")); @@ -3262,7 +3241,11 @@ virNetDevSwitchdevFeature(const char *ifname, unsigned int recvbuflen; struct nlattr *tb[DEVLINK_ATTR_MAX + 1] = {NULL, }; virPCIDevicePtr pci_device_ptr = NULL; - struct genlmsghdr* gmsgh = NULL; + struct genlmsghdr gmsgh = { + .cmd = DEVLINK_CMD_ESWITCH_GET, + .version = DEVLINK_GENL_VERSION, + .reserved = 0, + }; const char *pci_name; char *pfname = NULL; int is_vf = -1; @@ -3292,12 +3275,9 @@ virNetDevSwitchdevFeature(const char *ifname, goto cleanup; } - if (!(gmsgh = virNetDevPutExtraHeader(nlmsg_hdr(nl_msg), sizeof(struct genlmsghdr)))) + if (nlmsg_append(nl_msg, &gmsgh, sizeof(gmsgh), NLMSG_ALIGNTO) < 0) goto cleanup; - gmsgh->cmd = DEVLINK_CMD_ESWITCH_GET; - gmsgh->version = DEVLINK_GENL_VERSION; - pci_name = virPCIDeviceGetName(pci_device_ptr); if (nla_put(nl_msg, DEVLINK_ATTR_BUS_NAME, strlen("pci")+1, "pci") < 0 || -- 2.17.1

2 2

[libvirt] [PATCH] util: netdev: fix memleak of virNetDevIPRouteAdd
by Shi Lei 08 Sep '18

08 Sep '18

This patch fixes memleak for *resp* in virNetDevIPRouteAdd. Signed-off-by: Shi Lei <shi_lei(a)massclouds.com> --- src/util/virnetdevip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c index 0f080a5..16570a5 100644 --- a/src/util/virnetdevip.c +++ b/src/util/virnetdevip.c @@ -283,7 +283,7 @@ virNetDevIPRouteAdd(const char *ifname, virSocketAddrPtr gateway, unsigned int metric) { - struct nlmsghdr *resp = NULL; + VIR_AUTOFREE(struct nlmsghdr *) resp = NULL; unsigned int recvbuflen; unsigned int ifindex; struct rtmsg rtmsg; -- 2.17.1

2 2

[libvirt] [PATCH v2 0/3] libxl: implement virDomainPM* functions
by Marek Marczykowski-Górecki 07 Sep '18

07 Sep '18

Needed libxl_domain_suspend_only is supported in Xen >= 4.11. But wakeup should work with older versions. Marek Marczykowski-Górecki (3): libxl: send lifecycle event on suspend libxl: implement virDomainPM* functions libxl: initialize domain state with real data src/libxl/libxl_domain.c | 20 +++--- src/libxl/libxl_driver.c | 132 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 144 insertions(+), 8 deletions(-) base-commit: 3ad77f853230f870efa396636e008292c7f2b1c0 -- git-series 0.9.1

2 7

[libvirt] [PATCH] qemuProcessBuildDestroyMemoryPathsImpl: Don't overwrite error
by Michal Privoznik 07 Sep '18

07 Sep '18

The qemuSecurityDomainSetPathLabel() function reports perfect error itself. Do not overwrite it to something less meaningful. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_process.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 960c3ed011..eb9904b7ba 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3669,11 +3669,8 @@ qemuProcessBuildDestroyMemoryPathsImpl(virQEMUDriverPtr driver, } if (qemuSecurityDomainSetPathLabel(driver->securityManager, - def, path, true) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to label %s"), path); + def, path, true) < 0) return -1; - } } else { if (virFileDeleteTree(path) < 0) return -1; -- 2.16.4

2 1

[libvirt] [PATCH] conf: Fix check for chardev source path
by Andrea Bolognani 07 Sep '18

07 Sep '18

Attempting to use a chardev definition like <serial type='unix'> <target type='isa-serial'/> </serial> correctly results in an error being reported, since the source path - a required piece of information - is missing; however, the very similar <serial type='unix'> <target type='pci-serial'/> </serial> was happily accepted by libvirt, only to result in libvirtd crashing as soon as the guest was started. The issue was caused by checking the chardev's targetType against whitelisted values from virDomainChrChannelTargetType without first checking the chardev's deviceType to make sure it is actually a channel, for which the check makes sense, rather than a different type of chardev. The only reason this wasn't spotted earlier is that the whitelisted values just so happen to correspond to USB and PCI serial devices and Xen and UML consoles respectively, all of which are fairly uncommon. https://bugzilla.redhat.com/show_bug.cgi?id=1609720 Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- I feel compelled to point out that stuff like this wouldn't happen if libvirt was written in Rust O:-) src/conf/domain_conf.c | 8 ++++++-- .../serial-unix-missing-source.xml | 15 +++++++++++++++ tests/qemuxml2argvtest.c | 1 + 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 tests/qemuxml2argvdata/serial-unix-missing-source.xml diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 86199623cc..6162843028 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5467,10 +5467,14 @@ virDomainChrSourceDefValidate(const virDomainChrSourceDef *def, break; case VIR_DOMAIN_CHR_TYPE_UNIX: - /* path can be auto generated */ + /* The source path can be auto generated for certain specific + * types of channels, but in most cases we should report an + * error if the user didn't provide it */ if (!def->data.nix.path && (!chr_def || - (chr_def->targetType != VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_XEN && + chr_def->deviceType != VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL || + (chr_def->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL && + chr_def->targetType != VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_XEN && chr_def->targetType != VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Missing source path attribute for char device")); diff --git a/tests/qemuxml2argvdata/serial-unix-missing-source.xml b/tests/qemuxml2argvdata/serial-unix-missing-source.xml new file mode 100644 index 0000000000..1e1221f12d --- /dev/null +++ b/tests/qemuxml2argvdata/serial-unix-missing-source.xml @@ -0,0 +1,15 @@ +<domain type='qemu'> + <name>guest</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>1048576</memory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='aarch64' machine='virt'>hvm</type> + </os> + <devices> + <emulator>/usr/bin/qemu-system-aarch64</emulator> + <serial type='unix'> + <target type='pci-serial'/> + </serial> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 35df63b2ac..949b203998 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1417,6 +1417,7 @@ mymain(void) DO_TEST("serial-unix-chardev", QEMU_CAPS_DEVICE_ISA_SERIAL); DO_TEST_CAPS_LATEST("serial-unix-chardev"); + DO_TEST_PARSE_ERROR("serial-unix-missing-source", NONE); DO_TEST("serial-tcp-chardev", QEMU_CAPS_DEVICE_ISA_SERIAL); DO_TEST("serial-udp-chardev", -- 2.17.1

2 2

[libvirt] [PATCH 0/9] qemu: remove more capabilities
by Ján Tomko 07 Sep '18

07 Sep '18

While reviewing a bootindex-related patch, I found out that we can also drop all the per-device BOOTINDEX capabilities and more. Ján Tomko (9): qemu: always assume QEMU_CAPS_PCI_CONFIGFD qemu: always assume QEMU_CAPS_PCI_BOOTINDEX qemu: drop unused QEMU_CAPS_DEVICE_USB_NET qemu: always assume QEMU_CAPS_USB_REDIR_BOOTINDEX qemu: always assume QEMU_CAPS_USB_HOST_BOOTINDEX qemu: always assume QEMU_CAPS_VFIO_PCI_BOOTINDEX qemu: always assume QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX qemu: remove leftover property probing FIXUP: renumber replies and microcode version Also available on: git://repo.or.cz/libvirt/jtomko.git caps src/qemu/qemu_capabilities.c | 28 -- src/qemu/qemu_capabilities.h | 14 +- src/qemu/qemu_command.c | 48 +-- src/qemu/qemu_hotplug.c | 3 +- .../qemucapabilitiesdata/caps_1.5.3.x86_64.replies | 262 +++-------------- tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 9 +- .../qemucapabilitiesdata/caps_1.6.0.x86_64.replies | 266 +++-------------- tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 9 +- .../qemucapabilitiesdata/caps_1.7.0.x86_64.replies | 266 +++-------------- tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 9 +- .../qemucapabilitiesdata/caps_2.1.1.x86_64.replies | 270 +++-------------- tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 9 +- .../caps_2.10.0.aarch64.replies | 240 +++------------ tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 6 +- .../qemucapabilitiesdata/caps_2.10.0.ppc64.replies | 240 +++------------ tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 6 +- .../qemucapabilitiesdata/caps_2.10.0.s390x.replies | 175 +++-------- tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 4 +- .../caps_2.10.0.x86_64.replies | 326 ++++----------------- tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 9 +- .../qemucapabilitiesdata/caps_2.11.0.s390x.replies | 179 +++-------- tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 4 +- .../caps_2.11.0.x86_64.replies | 272 ++++------------- tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 7 +- .../caps_2.12.0.aarch64.replies | 252 ++++------------ tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 6 +- .../qemucapabilitiesdata/caps_2.12.0.ppc64.replies | 252 ++++------------ tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 6 +- .../qemucapabilitiesdata/caps_2.12.0.s390x.replies | 191 ++++-------- tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 4 +- .../caps_2.12.0.x86_64.replies | 288 +++++------------- tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 7 +- .../qemucapabilitiesdata/caps_2.4.0.x86_64.replies | 292 ++++-------------- tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 9 +- .../qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 296 ++++--------------- tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 9 +- .../caps_2.6.0.aarch64.replies | 236 +++------------ tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 6 +- .../qemucapabilitiesdata/caps_2.6.0.ppc64.replies | 236 +++------------ tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 6 +- .../qemucapabilitiesdata/caps_2.6.0.x86_64.replies | 296 ++++--------------- tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 9 +- .../qemucapabilitiesdata/caps_2.7.0.s390x.replies | 167 +++-------- tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 4 +- .../qemucapabilitiesdata/caps_2.7.0.x86_64.replies | 305 ++++--------------- tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 9 +- .../qemucapabilitiesdata/caps_2.8.0.s390x.replies | 175 +++-------- tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 4 +- .../qemucapabilitiesdata/caps_2.8.0.x86_64.replies | 305 ++++--------------- tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 9 +- .../qemucapabilitiesdata/caps_2.9.0.ppc64.replies | 179 +++-------- tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 5 +- .../qemucapabilitiesdata/caps_2.9.0.s390x.replies | 175 +++-------- tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 4 +- .../qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 326 ++++----------------- tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 9 +- .../qemucapabilitiesdata/caps_3.0.0.ppc64.replies | 252 ++++------------ tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 6 +- .../caps_3.0.0.riscv32.replies | 167 +++-------- tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml | 1 - .../caps_3.0.0.riscv64.replies | 167 +++-------- tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml | 1 - .../qemucapabilitiesdata/caps_3.0.0.x86_64.replies | 288 +++++------------- tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 7 +- tests/qemuxml2argvtest.c | 9 +- 65 files changed, 1599 insertions(+), 6037 deletions(-) -- 2.16.4

2 17

[libvirt] [PATCH] conf: fix args naming of virDomainChrSourceDefCopy
by Ján Tomko 07 Sep '18

07 Sep '18

Since its introduction in commit 2e37bf42 the naming of the arguments between the prototype and the definition does not match. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- Pushed as trivial. src/conf/domain_conf.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 3ff6eea117..e30a4b2fe7 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2889,8 +2889,8 @@ void virDomainNetDefFree(virDomainNetDefPtr def); void virDomainSmartcardDefFree(virDomainSmartcardDefPtr def); void virDomainChrDefFree(virDomainChrDefPtr def); void virDomainChrSourceDefFree(virDomainChrSourceDefPtr def); -int virDomainChrSourceDefCopy(virDomainChrSourceDefPtr src, - virDomainChrSourceDefPtr dest); +int virDomainChrSourceDefCopy(virDomainChrSourceDefPtr dest, + virDomainChrSourceDefPtr src); void virDomainSoundCodecDefFree(virDomainSoundCodecDefPtr def); void virDomainSoundDefFree(virDomainSoundDefPtr def); void virDomainMemballoonDefFree(virDomainMemballoonDefPtr def); -- 2.16.4

1 0

[libvirt] [PATCH] conf: fix bogus error when <boot order='1'/> is in an <interface type='hostdev'>
by Laine Stump 07 Sep '18

07 Sep '18

virDomainDefCollectBootOrder() is called for every item on the list for each type of device. Since an <interface type='hostdev'> is on both the list of hostdev devices and the list of network devices, it will be counted twice, and the code that checks for multiple devices with the same boot order will give a false positive. To remedy this, we make sure to return early for hostdev devices that have a parent.type != NONE. This was introduced in commit 5b75a4, which was first in libvirt-4.4.0. Resolves: https://bugzilla.redhat.com/1601318 Signed-off-by: Laine Stump <laine(a)laine.org> --- src/conf/domain_conf.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 77cc73744f..71a2fb0426 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5062,6 +5062,14 @@ virDomainDefCollectBootOrder(virDomainDefPtr def ATTRIBUTE_UNUSED, if (info->bootIndex == 0) return 0; + if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV && + dev->data.hostdev->parent.type != VIR_DOMAIN_DEVICE_NONE) { + /* This hostdev is a child of a higher level device + * (e.g. interface), and thus already being counted on the + * list for the other device type. + */ + return 0; + } if (virAsprintf(&order, "%u", info->bootIndex) < 0) goto cleanup; -- 2.14.4

2 2

[libvirt] [PATCH] qemuDomainNamespaceTeardownHostdev: Drop useless check
by Michal Privoznik 07 Sep '18

07 Sep '18

There is no need to check if @npaths is not zero. Let's qemuDomainNamespaceUnlinkPaths() handle that. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_domain.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 05e90c3615..d43b6978ad 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -12606,8 +12606,7 @@ qemuDomainNamespaceTeardownHostdev(virDomainObjPtr vm, &npaths, &paths, NULL) < 0) goto cleanup; - if (npaths != 0 && - qemuDomainNamespaceUnlinkPaths(vm, (const char **)paths, npaths) < 0) + if (qemuDomainNamespaceUnlinkPaths(vm, (const char **)paths, npaths) < 0) goto cleanup; ret = 0; -- 2.16.4

4 4

[libvirt] [PATCH] nwfilter:fix deadlock when nwfilter reload
by Wang Yechao 07 Sep '18

07 Sep '18

user run "firewalld-cmd --reload" nwfilterStateReload called in main thread step 1. virRWLockWrite(&updateLock) step 2. virNWFilterLoadAllConfigs step 3. virRWLockUnlock(&updateLock); lauch a vm: qemuDomainCreateXML runs in other thread step 1. virRWLockRead(&updateLock); step 2. qemuProcessStart step 3. qemuProcessWaitForMonitor step 4. ... step 5 virRWLockUnlock(&updateLock); if nwfilterStateReload called in the middle of step 1 and step 5 of qemuDomainCreateXML, it can't get the updateLock and then block the event_loop, so event_loop can't handle the qemu-monitor messages, cause deadlock move nwfilterStateReload into thread to fix this problem. Signed-off-by: Wang Yechao <wang.yechao255(a)zte.com.cn> Reviewed-by: Wang Yi <wang.yi59(a)zte.com.cn> --- src/nwfilter/nwfilter_driver.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) mode change 100644 => 100755 src/nwfilter/nwfilter_driver.c diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c old mode 100644 new mode 100755 index ac3a964..2c099e2 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -81,17 +81,28 @@ static void nwfilterDriverUnlock(void) #if HAVE_FIREWALLD +static void nwfilterThread(void *opaque ATTRIBUTE_UNUSED) +{ + nwfilterStateReload(); +} + static DBusHandlerResult nwfilterFirewalldDBusFilter(DBusConnection *connection ATTRIBUTE_UNUSED, DBusMessage *message, void *user_data ATTRIBUTE_UNUSED) { + virThread thread; + if (dbus_message_is_signal(message, DBUS_INTERFACE_DBUS, "NameOwnerChanged") || dbus_message_is_signal(message, "org.fedoraproject.FirewallD1", "Reloaded")) { VIR_DEBUG("Reload in nwfilter_driver because of firewalld."); - nwfilterStateReload(); + + /* create thread handle the nwfilter reload, don't block the event_loop.*/ + if (virThreadCreate(&thread, false, nwfilterThread, NULL) < 0) { + VIR_ERROR("create nwfilterThread failed."); + } } return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; -- 1.8.3.1

1 0

[libvirt] [PATCHv2 0/4] Add virNetlinkNewLink for simplifying virNetDev*Create
by Shi Lei 07 Sep '18

07 Sep '18

Patch v1 here: https://www.redhat.com/archives/libvir-list/2018-August/msg01413.html Shi Lei (4): 1/4: Introduce virNetlinkNewLink (Since v1) - Remove callback and just use special-case to handle macvlan in virNetlinkNewLink - Add struct virNetlinkNewLinkData to pack some arguments of virNetlinkNewLink 2/4: Add wrapper macros around nla_nest*/nla_put* to make code more readable (New patch) - Add wrapper macros according to the code written by Erik - Apply these macros to virNetlinkNewLink and virNetDevSetVfConfig and virNetDevVPortProfileOpSetLink 3/4: Using virNetlinkNewLink to simplify virNetDev*Create (Since v1) - Remove the callback for macvlan in virnetdevmacvlan.c 4/4: Remove virNetDevPutExtraHeader and replace with nlmsg_append (New patch) src/libvirt_private.syms | 1 + src/util/virnetdev.c | 98 ++++++++--------------- src/util/virnetdevbridge.c | 78 ++++--------------- src/util/virnetdevmacvlan.c | 109 ++++---------------------- src/util/virnetdevvportprofile.c | 117 +++++++++------------------- src/util/virnetlink.c | 130 +++++++++++++++++++++++++------ src/util/virnetlink.h | 65 ++++++++++++++++ 7 files changed, 270 insertions(+), 328 deletions(-) -- 2.17.1

2 12

[libvirt] [PATCH] nwfilter:fix deadlock when nwfilter reload
by Wang Yechao 07 Sep '18

07 Sep '18

user run "firewalld-cmd --reload" nwfilterStateReload called in main thread step 1. virRWLockWrite(&updateLock) step 2. virNWFilterLoadAllConfigs step 3. virRWLockUnlock(&updateLock); lauch a vm: qemuDomainCreateXML runs in other thread step 1. virRWLockRead(&updateLock); step 2. qemuProcessStart step 3. qemuProcessWaitForMonitor step 4. ... step 5 virRWLockUnlock(&updateLock); if nwfilterStateReload called in the middle of step 1 and step 5 of qemuDomainCreateXML, it can't get the updateLock and then block the event_loop, so event_loop can't handle the qemu-monitor messages, cause deadlock move nwfilterStateReload into thread to fix this problem. Signed-off-by: Wang Yechao <wang.yechao255(a)zte.com.cn> Reviewed-by: Wang Yi <wang.yi59(a)zte.com.cn> --- src/nwfilter/nwfilter_driver.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) mode change 100644 => 100755 src/nwfilter/nwfilter_driver.c diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c old mode 100644 new mode 100755 index ac3a964..2c099e2 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -81,17 +81,28 @@ static void nwfilterDriverUnlock(void) #if HAVE_FIREWALLD +static void nwfilterThread(void *opaque ATTRIBUTE_UNUSED) +{ + nwfilterStateReload(); +} + static DBusHandlerResult nwfilterFirewalldDBusFilter(DBusConnection *connection ATTRIBUTE_UNUSED, DBusMessage *message, void *user_data ATTRIBUTE_UNUSED) { + virThread thread; + if (dbus_message_is_signal(message, DBUS_INTERFACE_DBUS, "NameOwnerChanged") || dbus_message_is_signal(message, "org.fedoraproject.FirewallD1", "Reloaded")) { VIR_DEBUG("Reload in nwfilter_driver because of firewalld."); - nwfilterStateReload(); + + /* create thread handle the nwfilter reload, don't block the event_loop.*/ + if (virThreadCreate(&thread, false, nwfilterThread, NULL) < 0) { + VIR_ERROR("create nwfilterThread failed."); + } } return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; -- 1.8.3.1

1 0

[libvirt] [PATCH] qemu: Fix indentation in virDomainDefFormatInternal
by Jiri Denemark 06 Sep '18

06 Sep '18

Broken by v3.10.0-68-gaed3d038a6. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/conf/domain_conf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 86199623cc..6aa5ff51b4 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -27582,10 +27582,10 @@ virDomainDefFormatInternal(virDomainDefPtr def, * but no leading indentation before the starting element. * Thankfully, libxml maps what looks like globals into * thread-local uses, so we are thread-safe. */ - xmlIndentTreeOutput = 1; - xmlbuf = xmlBufferCreate(); - if (xmlNodeDump(xmlbuf, def->metadata->doc, def->metadata, - virBufferGetIndent(buf, false) / 2, 1) < 0) { + xmlIndentTreeOutput = 1; + xmlbuf = xmlBufferCreate(); + if (xmlNodeDump(xmlbuf, def->metadata->doc, def->metadata, + virBufferGetIndent(buf, false) / 2, 1) < 0) { xmlBufferFree(xmlbuf); xmlIndentTreeOutput = oldIndentTreeOutput; goto error; -- 2.18.0

2 1

[libvirt] [PATCH v5 0/4] Add .domainGetHostname() support for QEMU driver.
by Julio Faracco 06 Sep '18

06 Sep '18

This serie adds a new function into QEMU Guest Agent handler to use the QEMU command 'guest-get-host-name' to retrieve the domain hostname. This approach requires QEMU-GA running inside the guest, but it is the fastest and easiest way to get this info. This serie has some suggestion made by John Ferlan for v3. Specially, some improvements to error handling. v5: Contains news suggested by Han Han on v2. Contains improvements suggested by John on v3. Removes some tabs reported on v4. Julio Faracco (4): qemu: implementing qemuAgentGetHostname() function. qemu: adding domainGetHostname support for QEMU docs: Add QEMU-GA get hostname feature into news.xml qemu: unlink the error report from VIR_STRDUP. docs/news.xml | 10 +++++++ src/qemu/qemu_agent.c | 66 ++++++++++++++++++++++++++++++++++++++---- src/qemu/qemu_agent.h | 4 +++ src/qemu/qemu_driver.c | 42 +++++++++++++++++++++++++++ 4 files changed, 116 insertions(+), 6 deletions(-) -- 2.17.1

3 10

[libvirt] [PATCH v2 0/7] qemu: Unify generation of command line for virtio devices
by Andrea Bolognani 06 Sep '18

06 Sep '18

Or, how to turn a single patch into a seven patches series using the astounding power of review comments! Andrea Bolognani (7): tests: Add missing virtio-input capabilities qemu: Check type range for virtio-input devices qemu: Remove duplicated option formatting for virtio devices qemu: Always format iothread for virtio-blk qemu: Check for virtio-input capabilites at validate time qemu: Refactor virtio-input capabilities checks qemu: Unify generation of command line for virtio devices src/qemu/qemu_command.c | 227 +++++++++++++++++----------------------- src/qemu/qemu_domain.c | 58 +++++++++- tests/qemuxml2xmltest.c | 24 ++++- 3 files changed, 173 insertions(+), 136 deletions(-) -- 2.17.1

2 14

[libvirt] [PATCH v4] qemu: Introduce state_lock_timeout to qemu.conf
by Yi Wang 06 Sep '18

06 Sep '18

When doing some job holding state lock for a long time, we may come across error: "Timed out during operation: cannot acquire state change lock" Well, sometimes it's not a problem and users wanner continue to wait, and this patch allow users decide how long time they can wait the state lock. Signed-off-by: Yi Wang <wang.yi59(a)zte.com.cn> Reviewed-by: Xi Xu <xu.xi8(a)zte.com.cn> --- changes in v4: - fox syntax-check error changes in v3: - add user-friendly description and nb of state lock - check validity of stateLockTimeout changes in v2: - change default value to 30 in qemu.conf - set the default value in virQEMUDriverConfigNew() v4 Signed-off-by: Yi Wang <wang.yi59(a)zte.com.cn> --- src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 10 ++++++++++ src/qemu/qemu_conf.c | 14 ++++++++++++++ src/qemu/qemu_conf.h | 2 ++ src/qemu/qemu_domain.c | 5 +---- src/qemu/test_libvirtd_qemu.aug.in | 1 + 6 files changed, 29 insertions(+), 4 deletions(-) diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug index ddc4bbf..f7287ae 100644 --- a/src/qemu/libvirtd_qemu.aug +++ b/src/qemu/libvirtd_qemu.aug @@ -93,6 +93,7 @@ module Libvirtd_qemu = | limits_entry "max_core" | bool_entry "dump_guest_core" | str_entry "stdio_handler" + | int_entry "state_lock_timeout" let device_entry = bool_entry "mac_filter" | bool_entry "relaxed_acs_check" diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index cd57b3c..8920a1a 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -667,6 +667,16 @@ # #max_queued = 0 + +# When two or more threads want to work with the same domain they use a +# job lock to mutually exclude each other. However, waiting for the lock +# is limited up to state_lock_timeout seconds. +# NB, strong recommendation to set the timeout longer than 30 seconds. +# +# Default is 30 +# +#state_lock_timeout = 60 + ################################################################### # Keepalive protocol: # This allows qemu driver to detect broken connections to remote diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index a4f545e..c761cae 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -129,6 +129,9 @@ void qemuDomainCmdlineDefFree(qemuDomainCmdlineDefPtr def) #endif +/* Give up waiting for mutex after 30 seconds */ +#define QEMU_JOB_WAIT_TIME (1000ull * 30) + virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) { virQEMUDriverConfigPtr cfg; @@ -346,6 +349,8 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) cfg->glusterDebugLevel = 4; cfg->stdioLogD = true; + cfg->stateLockTimeout = QEMU_JOB_WAIT_TIME; + if (!(cfg->namespaces = virBitmapNew(QEMU_DOMAIN_NS_LAST))) goto error; @@ -863,6 +868,9 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, if (virConfGetValueUInt(conf, "keepalive_count", &cfg->keepAliveCount) < 0) goto cleanup; + if (virConfGetValueInt(conf, "state_lock_timeout", &cfg->stateLockTimeout) < 0) + goto cleanup; + if (virConfGetValueInt(conf, "seccomp_sandbox", &cfg->seccompSandbox) < 0) goto cleanup; @@ -1055,6 +1063,12 @@ virQEMUDriverConfigValidate(virQEMUDriverConfigPtr cfg) return -1; } + if (cfg->stateLockTimeout <= 0) { + virReportError(VIR_ERR_CONF_SYNTAX, "%s", + _("state_lock_timeout should larger than zero")); + return -1; + } + return 0; } diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index a8d84ef..97cf2e1 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -190,6 +190,8 @@ struct _virQEMUDriverConfig { int keepAliveInterval; unsigned int keepAliveCount; + int stateLockTimeout; + int seccompSandbox; char *migrateHost; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 886e3fb..5a2ca52 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6652,9 +6652,6 @@ qemuDomainObjCanSetJob(qemuDomainObjPrivatePtr priv, priv->job.agentActive == QEMU_AGENT_JOB_NONE)); } -/* Give up waiting for mutex after 30 seconds */ -#define QEMU_JOB_WAIT_TIME (1000ull * 30) - /** * qemuDomainObjBeginJobInternal: * @driver: qemu driver @@ -6714,7 +6711,7 @@ qemuDomainObjBeginJobInternal(virQEMUDriverPtr driver, } priv->jobs_queued++; - then = now + QEMU_JOB_WAIT_TIME; + then = now + cfg->stateLockTimeout; retry: if ((!async && job != QEMU_JOB_DESTROY) && diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index f1e8806..dc5de96 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -105,3 +105,4 @@ module Test_libvirtd_qemu = { "pr_helper" = "/usr/bin/qemu-pr-helper" } { "swtpm_user" = "tss" } { "swtpm_group" = "tss" } +{ "state_lock_timeout" = "60" } -- 1.8.3.1

3 4

Re: [libvirt] [PATCH] qga: ignore non present cpus when handling qmp_guest_get_vcpus()
by Igor Mammedov 06 Sep '18

06 Sep '18

On Thu, 30 Aug 2018 17:51:13 +0200 Laszlo Ersek <lersek(a)redhat.com> wrote: > +Drew > > On 08/30/18 14:08, Igor Mammedov wrote: > > If VM has VCPUs plugged sparselly (for example a VM started with > > 3 VCPUs (cpu0, cpu1 and cpu2) and then cpu1 was hotunplugged so > > only cpu0 and cpu2 are present), QGA will rise a error > > error: internal error: unable to execute QEMU agent command 'guest-get-vcpus': > > open("/sys/devices/system/cpu/cpu1/"): No such file or directory > > when > > virsh vcpucount FOO --guest > > is executed. > > Fix it by ignoring non present CPUs when fetching CPUs status from sysfs. > > > > Signed-off-by: Igor Mammedov <imammedo(a)redhat.com> > > --- > > qga/commands-posix.c | 4 +++- > > 1 file changed, 3 insertions(+), 1 deletion(-) > > > > diff --git a/qga/commands-posix.c b/qga/commands-posix.c > > index 37e8a2d..2929872 100644 > > --- a/qga/commands-posix.c > > +++ b/qga/commands-posix.c > > @@ -2044,7 +2044,9 @@ static void transfer_vcpu(GuestLogicalProcessor *vcpu, bool sys2vcpu, > > vcpu->logical_id); > > dirfd = open(dirpath, O_RDONLY | O_DIRECTORY); > > if (dirfd == -1) { > > - error_setg_errno(errp, errno, "open(\"%s\")", dirpath); > > + if (!(sys2vcpu && errno == ENOENT)) { > > + error_setg_errno(errp, errno, "open(\"%s\")", dirpath); > > + } > > } else { > > static const char fn[] = "online"; > > int fd; > > > > Originally these guest agent commands (both getting and setting) were > meant to be used in the absence of real VCPU hot[un]plug, as a fallback > / place-holder. > > If the latter (= real VCPU hot(un)plug) works, then these guest agent > commands shouldn't be used at all. Technically there isn't reasons for "get" not to work in sparse usecase hence the patch. > Drew, do I remember correctly? ... The related RHBZ is > <https://bugzilla.redhat.com/show_bug.cgi?id=924684>. (It's a private > one, and I'm not at liberty to open it up, so my apologies to non-RH folks.) > > Anyway, given that "set" should be a subset of the "get" return value > (as documented in the command schema), if we fix up "get" to work with > sparse topologies, then "set" should work at once. > > However... as far as I understand, this change will allow > qmp_guest_get_vcpus() to produce a GuestLogicalProcessor object for the > missing (hot-unplugged) VCPU, with the following contents: > - @logical-id: populated by the loop, > - @online: false (from g_malloc0()), > - @can-offline: present (from the loop), and false (from g_malloc0()). > > The smaller problem with this might be that "online==false && > can-offline==false" is nonsensical and has never been returned before. I > don't know how higher level apps will react. > > The larger problem might be that a higher level app could simply copy > this output structure into the next "set" call unchanged, and then that > "set" call will fail. Libvirt it seems that survives such outrageous output > I wonder if, instead of this patch, we should rework > qmp_guest_get_vcpus(), to silently skip processors for which this > dirpath ENOENT condition arises (i.e., return a shorter list of > GuestLogicalProcessor objects). > But, again, I wouldn't mix this guest agent command with real VCPU > hot(un)plug in the first place. The latter is much-much better, so if > it's available, use that exclusively? Agreed, Maybe we can block invalid usecase on libvirt side with a more clear error message as libvirt sort of knows that sparse cpus are supported. > > Thanks, > Laszlo

3 2

[libvirt] [PATCH] docs: Typo fix in virDomainGetJobStats
by Eric Blake 06 Sep '18

06 Sep '18

Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the trivial rule. src/libvirt-domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 63addbc470..8e91db31f6 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -8707,7 +8707,7 @@ virDomainGetJobInfo(virDomainPtr domain, virDomainJobInfoPtr info) * return statistics about a recently completed job. Specifically, this * flag may be used to query statistics of a completed incoming pre-copy * migration (statistics for post-copy migration are only available on the - * source hsot). Statistics of a completed job are automatically destroyed + * source host). Statistics of a completed job are automatically destroyed * once read or when libvirtd is restarted. Note that time information * returned for completed migrations may be completely irrelevant unless both * source and destination hosts have synchronized time (i.e., NTP daemon is -- 2.17.1

2 1

[libvirt] [jenkins-ci PATCH 0/3] Split off MinGW builds
by Andrea Bolognani 06 Sep '18

06 Sep '18

See patch 2/3 for the rationale. Andrea Bolognani (3): guests: Split MinGW projects Split off MinGW builds Remove 'variant' .../host_vars/libvirt-fedora-rawhide/main.yml | 15 ++++++++----- .../build/jobs/autotools-build-job.yml | 4 ++-- .../build/jobs/autotools-check-job.yml | 4 ++-- .../build/jobs/autotools-rpm-job.yml | 4 ++-- .../build/jobs/autotools-syntax-check-job.yml | 4 ++-- guests/playbooks/build/jobs/defaults.yml | 1 - .../build/jobs/generic-build-job.yml | 4 ++-- .../build/jobs/generic-check-job.yml | 4 ++-- .../playbooks/build/jobs/generic-rpm-job.yml | 4 ++-- .../build/jobs/generic-syntax-check-job.yml | 4 ++-- guests/playbooks/build/jobs/go-build-job.yml | 4 ++-- guests/playbooks/build/jobs/go-check-job.yml | 4 ++-- .../build/jobs/perl-modulebuild-build-job.yml | 4 ++-- .../build/jobs/perl-modulebuild-check-job.yml | 4 ++-- .../build/jobs/perl-modulebuild-rpm-job.yml | 4 ++-- guests/playbooks/build/jobs/prepare.yml | 8 +++---- .../build/jobs/python-distutils-build-job.yml | 4 ++-- .../build/jobs/python-distutils-check-job.yml | 4 ++-- .../build/jobs/python-distutils-rpm-job.yml | 4 ++-- .../build/projects/libosinfo+mingw32.yml | 12 ++++++++++ .../build/projects/libosinfo+mingw64.yml | 12 ++++++++++ guests/playbooks/build/projects/libosinfo.yml | 22 ------------------- .../build/projects/libvirt+mingw32.yml | 12 ++++++++++ .../build/projects/libvirt+mingw64.yml | 12 ++++++++++ .../build/projects/libvirt-glib+mingw32.yml | 12 ++++++++++ .../build/projects/libvirt-glib+mingw64.yml | 12 ++++++++++ .../playbooks/build/projects/libvirt-glib.yml | 22 ------------------- guests/playbooks/build/projects/libvirt.yml | 22 ------------------- .../projects/osinfo-db-tools+mingw32.yml | 12 ++++++++++ .../projects/osinfo-db-tools+mingw64.yml | 13 +++++++++++ .../build/projects/osinfo-db-tools.yml | 22 ------------------- .../build/projects/virt-viewer+mingw32.yml | 12 ++++++++++ .../build/projects/virt-viewer+mingw64.yml | 12 ++++++++++ .../playbooks/build/projects/virt-viewer.yml | 22 ------------------- ...osinfo+mingw.yml => libosinfo+mingw32.yml} | 4 ---- ...osinfo+mingw.yml => libosinfo+mingw64.yml} | 4 ---- ...{libvirt+mingw.yml => libvirt+mingw32.yml} | 12 ---------- ...{libvirt+mingw.yml => libvirt+mingw64.yml} | 12 ---------- ...lib+mingw.yml => libvirt-glib+mingw32.yml} | 2 -- ...lib+mingw.yml => libvirt-glib+mingw64.yml} | 2 -- ...+mingw.yml => osinfo-db-tools+mingw32.yml} | 4 ---- ...+mingw.yml => osinfo-db-tools+mingw64.yml} | 4 ++-- ...ewer+mingw.yml => virt-viewer+mingw32.yml} | 11 ---------- ...ewer+mingw.yml => virt-viewer+mingw64.yml} | 11 ---------- jobs/autotools.yaml | 16 +++++++------- jobs/defaults.yaml | 1 - jobs/generic.yaml | 16 +++++++------- jobs/go.yaml | 8 +++---- jobs/perl-modulebuild.yaml | 12 +++++----- jobs/python-distutils.yaml | 12 +++++----- projects/libosinfo+mingw32.yaml | 12 ++++++++++ projects/libosinfo+mingw64.yaml | 12 ++++++++++ projects/libosinfo.yaml | 12 ---------- projects/libvirt+mingw32.yaml | 12 ++++++++++ projects/libvirt+mingw64.yaml | 12 ++++++++++ projects/libvirt-glib+mingw32.yaml | 12 ++++++++++ projects/libvirt-glib+mingw64.yaml | 12 ++++++++++ projects/libvirt-glib.yaml | 12 ---------- projects/libvirt.yaml | 12 ---------- projects/osinfo-db-tools+mingw32.yaml | 12 ++++++++++ projects/osinfo-db-tools+mingw64.yaml | 12 ++++++++++ projects/osinfo-db-tools.yaml | 12 ---------- projects/virt-viewer+mingw32.yaml | 12 ++++++++++ projects/virt-viewer+mingw64.yaml | 12 ++++++++++ projects/virt-viewer.yaml | 12 ---------- 65 files changed, 321 insertions(+), 309 deletions(-) create mode 100644 guests/playbooks/build/projects/libosinfo+mingw32.yml create mode 100644 guests/playbooks/build/projects/libosinfo+mingw64.yml create mode 100644 guests/playbooks/build/projects/libvirt+mingw32.yml create mode 100644 guests/playbooks/build/projects/libvirt+mingw64.yml create mode 100644 guests/playbooks/build/projects/libvirt-glib+mingw32.yml create mode 100644 guests/playbooks/build/projects/libvirt-glib+mingw64.yml create mode 100644 guests/playbooks/build/projects/osinfo-db-tools+mingw32.yml create mode 100644 guests/playbooks/build/projects/osinfo-db-tools+mingw64.yml create mode 100644 guests/playbooks/build/projects/virt-viewer+mingw32.yml create mode 100644 guests/playbooks/build/projects/virt-viewer+mingw64.yml copy guests/vars/projects/{libosinfo+mingw.yml => libosinfo+mingw32.yml} (56%) rename guests/vars/projects/{libosinfo+mingw.yml => libosinfo+mingw64.yml} (56%) copy guests/vars/projects/{libvirt+mingw.yml => libvirt+mingw32.yml} (51%) rename guests/vars/projects/{libvirt+mingw.yml => libvirt+mingw64.yml} (51%) copy guests/vars/projects/{libvirt-glib+mingw.yml => libvirt-glib+mingw32.yml} (57%) copy guests/vars/projects/{libvirt-glib+mingw.yml => libvirt-glib+mingw64.yml} (57%) rename guests/vars/projects/{osinfo-db-tools+mingw.yml => osinfo-db-tools+mingw32.yml} (53%) rename guests/vars/projects/{libvirt-glib+mingw.yml => osinfo-db-tools+mingw64.yml} (54%) copy guests/vars/projects/{virt-viewer+mingw.yml => virt-viewer+mingw32.yml} (52%) rename guests/vars/projects/{virt-viewer+mingw.yml => virt-viewer+mingw64.yml} (52%) create mode 100644 projects/libosinfo+mingw32.yaml create mode 100644 projects/libosinfo+mingw64.yaml create mode 100644 projects/libvirt+mingw32.yaml create mode 100644 projects/libvirt+mingw64.yaml create mode 100644 projects/libvirt-glib+mingw32.yaml create mode 100644 projects/libvirt-glib+mingw64.yaml create mode 100644 projects/osinfo-db-tools+mingw32.yaml create mode 100644 projects/osinfo-db-tools+mingw64.yaml create mode 100644 projects/virt-viewer+mingw32.yaml create mode 100644 projects/virt-viewer+mingw64.yaml -- 2.17.1

2 7

[libvirt] [PATCH] qemuBuildMemPathStr: Produce -mem-path more frequently
by Michal Privoznik 05 Sep '18

05 Sep '18

https://bugzilla.redhat.com/show_bug.cgi?id=1622455 If a domain is configured to use <source type='file'/> under <memoryBacking/> we have to honour that setting and produce -mem-path on the command line. We are not doing so if domain has no guest NUMA nodes nor hugepages. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_command.c | 29 +++++++++++----------- .../fd-memory-no-numa-topology.args | 1 + 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 8aa20496bc..df5e5841c2 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7531,21 +7531,22 @@ qemuBuildMemPathStr(virQEMUDriverConfigPtr cfg, const long system_page_size = virGetSystemPageSizeKB(); char *mem_path = NULL; - /* - * No-op if hugepages were not requested. - */ - if (!def->mem.nhugepages) + /* There are two cases where we want to put -mem-path onto + * the command line: First one is when there are no guest + * NUMA nodes and hugepages are configured. The second one is + * if user requested file allocation. */ + if (def->mem.nhugepages && + def->mem.hugepages[0].size != system_page_size) { + if (qemuGetDomainHupageMemPath(def, cfg, + def->mem.hugepages[0].size, + &mem_path) < 0) + return -1; + } else if (def->mem.source == VIR_DOMAIN_MEMORY_SOURCE_FILE) { + if (qemuGetMemoryBackingPath(def, cfg, "ram", &mem_path) < 0) + return -1; + } else { return 0; - - /* There is one special case: if user specified "huge" - * pages of regular system pages size. - * And there is nothing to do in this case. - */ - if (def->mem.hugepages[0].size == system_page_size) - return 0; - - if (qemuGetDomainHupageMemPath(def, cfg, def->mem.hugepages[0].size, &mem_path) < 0) - return -1; + } if (def->mem.allocation != VIR_DOMAIN_MEMORY_ALLOCATION_IMMEDIATE) virCommandAddArgList(cmd, "-mem-prealloc", NULL); diff --git a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args index 0e0d0830e8..76c7556468 100644 --- a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args +++ b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args @@ -10,6 +10,7 @@ QEMU_AUDIO_DRV=none \ -machine pc-i440fx-wily,accel=kvm,usb=off,dump-guest-core=off \ -m 14336 \ -mem-prealloc \ +-mem-path /var/lib/libvirt/qemu/ram/libvirt/qemu/-1-instance-00000092/ram \ -smp 8,sockets=8,cores=1,threads=1 \ -uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \ -display none \ -- 2.16.4

2 1

[libvirt] [PATCH 0/2] tests: Use DO_TEST_CAPS_ARCH_LATEST() more
by Andrea Bolognani 05 Sep '18

05 Sep '18

As politely Requested-by: Ján Tomko <jtomko(a)redhat.com> Andrea Bolognani (2): tests: Prepare to use DO_TEST_CAPS_ARCH_LATEST() more tests: Add simple headless guests using latest caps .../aarch64-virt-headless.aarch64-latest.args | 51 ++++++++++++++++++ .../aarch64-virt-headless.xml | 29 ++++++++++ .../ppc64-pseries-headless.ppc64-latest.args | 44 +++++++++++++++ .../ppc64-pseries-headless.xml | 29 ++++++++++ .../riscv64-virt-headless.riscv64-latest.args | 41 ++++++++++++++ .../riscv64-virt-headless.xml | 29 ++++++++++ .../s390x-ccw-headless.s390x-latest.args | 43 +++++++++++++++ tests/qemuxml2argvdata/s390x-ccw-headless.xml | 29 ++++++++++ .../x86_64-pc-headless.x86_64-latest.args | 45 ++++++++++++++++ tests/qemuxml2argvdata/x86_64-pc-headless.xml | 29 ++++++++++ .../x86_64-q35-headless.x86_64-latest.args | 53 +++++++++++++++++++ .../qemuxml2argvdata/x86_64-q35-headless.xml | 29 ++++++++++ tests/qemuxml2argvtest.c | 16 +++++- 13 files changed, 466 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args create mode 100644 tests/qemuxml2argvdata/aarch64-virt-headless.xml create mode 100644 tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args create mode 100644 tests/qemuxml2argvdata/ppc64-pseries-headless.xml create mode 100644 tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args create mode 100644 tests/qemuxml2argvdata/riscv64-virt-headless.xml create mode 100644 tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args create mode 100644 tests/qemuxml2argvdata/s390x-ccw-headless.xml create mode 100644 tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/x86_64-pc-headless.xml create mode 100644 tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/x86_64-q35-headless.xml -- 2.17.1

2 4

[libvirt] [libvirt-snmp][PATCH 0/3] Couple of build improvements
by Michal Privoznik 05 Sep '18

05 Sep '18

I'd like to get some review for these actually. Michal Privoznik (3): Generate AUTHORS from git log Makefile: Introduce srpm target configure: Prevent autoreconf from installing `compile' file .gitignore | 4 ++-- AUTHORS => AUTHORS.in | 12 +++++------- Makefile.am | 38 +++++++++++++++++++++++++++----------- autogen.sh | 10 ++++++---- configure.ac | 8 ++++++-- 5 files changed, 46 insertions(+), 26 deletions(-) rename AUTHORS => AUTHORS.in (44%) -- 2.16.4

2 6

[libvirt] [PATCH v2 0/3] conf: Move stuff out of domain_addr
by Andrea Bolognani 05 Sep '18

05 Sep '18

$ mv blurb here/ Andrea Bolognani (3): conf: Move virDomainPCIAddressAsString() to util/virpci conf: Rename virDomainPCIAddressAsString() util: Drop virPCIGetAddrString() src/conf/domain_addr.c | 20 +++----------------- src/conf/domain_addr.h | 4 ---- src/libvirt_private.syms | 2 +- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_domain_address.c | 6 +++--- src/util/virnetdev.c | 6 +----- src/util/virpci.c | 21 +++++++++------------ src/util/virpci.h | 8 ++------ 8 files changed, 20 insertions(+), 49 deletions(-) -- 2.17.1

2 7

[libvirt] [jenkins-ci PATCH] lcitool: Don't encrypt password manually
by Martin Kletzander 05 Sep '18

05 Sep '18

Since version 1.9 ansible supports password_hash filter that can do that for us. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- guests/lcitool | 29 +------------------------ guests/playbooks/update/tasks/users.yml | 2 +- 2 files changed, 2 insertions(+), 29 deletions(-) diff --git a/guests/lcitool b/guests/lcitool index 2901a92c507b..ad1eee288620 100755 --- a/guests/lcitool +++ b/guests/lcitool @@ -151,34 +151,7 @@ class Config: return vault_pass_file def get_root_password_file(self): - root_pass_file = self._get_config_file("root-password") - root_hash_file = self._get_config_file(".root-password.hash") - - try: - with open(root_pass_file, "r") as infile: - root_pass = infile.readline().strip() - except Exception: - raise Error( - "Missing or invalid root password file ({})".format( - root_pass_file, - ) - ) - - # The hash will be different every time we run, but that doesn't - # matter - it will still validate the correct root password - root_hash = crypt.crypt(root_pass, Util.mksalt()) - - try: - with open(root_hash_file, "w") as infile: - infile.write("{}\n".format(root_hash)) - except Exception: - raise Error( - "Can't write hashed root password file ({})".format( - root_hash_file, - ) - ) - - return root_hash_file + return self._get_config_file("root-password") class Inventory: diff --git a/guests/playbooks/update/tasks/users.yml b/guests/playbooks/update/tasks/users.yml index ec7f798a9c00..0a930d6c382c 100644 --- a/guests/playbooks/update/tasks/users.yml +++ b/guests/playbooks/update/tasks/users.yml @@ -2,7 +2,7 @@ - name: 'root: Set password' user: name: root - password: '{{ lookup("file", root_password_file) }}' + password: '{{ lookup("file", root_password_file)|password_hash("sha512") }}' shell: '{{ bash }}' - name: 'root: Configure ssh access' -- 2.18.0

2 3

[libvirt] [libvirt-snmp][PATCH 0/2] Couple of spec file improvements
by Michal Privoznik 05 Sep '18

05 Sep '18

While trying to build libvirt-snmp on minimalistic RHEL installation I've noticed couple of problems. These two are pushed under trivial rule. Michal Privoznik (2): spec: Require git and gcc for the build spec: Modernize the spec file libvirt-snmp.spec.in | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) -- 2.16.4

2 3

[libvirt] [PATCH v4 0/4] Add .domainGetHostname() support for QEMU driver.
by Julio Faracco 05 Sep '18

05 Sep '18

This serie adds a new function into QEMU Guest Agent handler to use the QEMU command 'guest-get-host-name' to retrieve the domain hostname. This approach requires QEMU-GA running inside the guest, but it is the fastest and easiest way to get this info. This serie has some suggestion made by John Ferlan for v3. Specially, some improvements to error handling. Julio Faracco (4): qemu: implementing qemuAgentGetHostname() function. qemu: adding domainGetHostname support for QEMU docs: Add QEMU-GA get hostname feature into news.xml qemu: unlink the error report from VIR_STRDUP. docs/news.xml | 9 ++++++ src/qemu/qemu_agent.c | 66 ++++++++++++++++++++++++++++++++++++++---- src/qemu/qemu_agent.h | 4 +++ src/qemu/qemu_driver.c | 42 +++++++++++++++++++++++++++ 4 files changed, 115 insertions(+), 6 deletions(-) -- 2.17.1

2 5

[libvirt] Virsh reference is out of date, should it be updated from the man page?
by Povilas Kanapickas 04 Sep '18

04 Sep '18

Hi! The online virsh command reference at [1] seems to be very out of date according to [2]. There's much more recent documentation at tools/virsh.pod in the main libvirt repository. I believe it would be great to update the web docs as they are much more accessible and convenient to use (especially the one-command-per-page version). What would be the best way to approach that? I suppose we could look into automatically converting the current manpages into docbook and using that to update the website? What do you think? Regards, Povilas [1] - https://libvirt.org/virshcmdref.html [2] - https://libvirt.org/git/?p=libvirt-virshcmdref.git;a=summary

4 4

[libvirt] [PATCH v3 00/28] Introduce metadata locking
by Michal Privoznik 04 Sep '18

04 Sep '18

v3 of: https://www.redhat.com/archives/libvir-list/2018-August/msg00814.html What has changed since v2? A lot. - The lock manager was moved into security manager (which requires a lot of preparation which is done in first 8 or so patches). - The VIR_LOCK_SPACE_ACQUIRE_WAIT flag (2/7 in v2) is dropped as it turned out to be harmful. virlockd can't block under any circumstances. And we can not introduce a thread pool for it. - While going through the code I've found couple of bugs which I'm fixing in first few patches. As usual, you can find all the patches at: https://github.com/zippy2/libvirt/tree/disk_metadata_lock_v3 Michal Prívozník (28): virSecurityManagerNewDriver: Fix code pattern virSecurityManagerNewStack: Don't ignore virSecurityStackAddNested retval lock_daemon: Fix some memleaks lock_driver_lockd: Don't leak lockspace dirs virLockManagerLockDaemonAcquire: Drop useless check virLockManagerSanlockAddResource: Do not ignore unknown resource types locking: Don't leak private data in virLockManagerLockDaemonNew virLockManagerLockDaemonAddResource: Switch to cleanup label rather than error virlockspace: Allow caller to specify start and length offset in virLockSpaceAcquireResource lock_driver_lockd: Introduce VIR_LOCK_SPACE_PROTOCOL_ACQUIRE_RESOURCE_METADATA flag lock_driver: Introduce new VIR_LOCK_MANAGER_OBJECT_TYPE_DAEMON _virLockManagerLockDaemonPrivate: Move @hasRWDisks into dom union lock_driver: Introduce VIR_LOCK_MANAGER_RESOURCE_TYPE_METADATA lock_daemon_dispatch: Check for ownerPid rather than ownerId locking: Introduce virLockManagerClearResources lock_driver: Introduce KEEP_OPEN flags lock_manager: Introduce virLockManagerCloseConn lock_manager: Allow disabling configFile for virLockManagerPluginNew qemu_conf: Introduce metadata_lock_manager security_manager: Load lock plugin on init security_manager: Introduce virSecurityManagerLockCloseConn security_manager: Introduce metadata locking APIs security_dac: Pass virSecurityManagerPtr to virSecurityDACSetOwnership security_dac: Pass virSecurityManagerPtr to virSecurityDACRestoreFileLabelInternal security_dac: Fix info messages when chown()-ing security_dac: Fix const correctness security_dac: Move transaction handling up one level security_dac: Lock domain metadata cfg.mk | 4 +- src/libvirt_private.syms | 2 + src/locking/lock_daemon.c | 3 + src/locking/lock_daemon_dispatch.c | 25 +- src/locking/lock_driver.h | 38 +++ src/locking/lock_driver_lockd.c | 520 ++++++++++++++++++++++++++----------- src/locking/lock_driver_lockd.h | 1 + src/locking/lock_driver_nop.c | 14 + src/locking/lock_driver_sanlock.c | 50 ++-- src/locking/lock_manager.c | 31 ++- src/locking/lock_manager.h | 7 + src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 6 + src/qemu/qemu_conf.c | 13 + src/qemu/qemu_conf.h | 1 + src/qemu/qemu_driver.c | 12 +- src/qemu/test_libvirtd_qemu.aug.in | 1 + src/security/security_dac.c | 213 +++++++++------ src/security/security_manager.c | 366 +++++++++++++++++++++++++- src/security/security_manager.h | 17 +- src/util/virlockspace.c | 15 +- src/util/virlockspace.h | 4 + tests/testutilsqemu.c | 2 +- tests/virlockspacetest.c | 29 ++- 24 files changed, 1096 insertions(+), 279 deletions(-) -- 2.16.4

4 71

[libvirt] [PATCH 0/2] qemu: Unify generation of command line for virtio devices
by Andrea Bolognani 04 Sep '18

04 Sep '18

-device virtio-blurb-pci Andrea Bolognani (2): tests: Fix use of virtio-serial for aarch64/virt qemu: Unify generation of command line for virtio devices src/qemu/qemu_command.c | 299 ++++++++++-------- .../mach-virt-console-virtio.args | 2 +- tests/qemuxml2argvtest.c | 3 +- .../mach-virt-console-virtio.xml | 4 +- tests/qemuxml2xmltest.c | 6 +- 5 files changed, 173 insertions(+), 141 deletions(-) -- 2.17.1

2 6

[libvirt] [libvirt-snmp][PATCH] rpm: simplify applying of patches
by Michal Privoznik 04 Sep '18

04 Sep '18

The distros we support for RPM builds all have %autosetup support. Use that instead of what we currently have (nothing). Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial rule and also 'who cares about snmp' rules ;-) libvirt-snmp.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt-snmp.spec.in b/libvirt-snmp.spec.in index c5a1a41..21a9885 100644 --- a/libvirt-snmp.spec.in +++ b/libvirt-snmp.spec.in @@ -15,7 +15,7 @@ BuildRequires: net-snmp-perl net-snmp net-snmp-utils net-snmp-devel libvirt-deve Provides a way to control libvirt through SNMP protocol. %prep -%setup -q +%autosetup -S git_am %build -- 2.16.4

1 0

[libvirt] [jenkins-ci PATCH] guests: Special-case fedora-gpg-keys updates on Rawhide
by Andrea Bolognani 04 Sep '18

04 Sep '18

During each Rawhide development cycle there is a point at which packages start being signed with new keys, which causes updates to fail. To work around the problem, make sure fedora-gpg-keys is updated before attempting to update all other packages; updating fedora-gpg-keys itself requires gpg signature checking to be disabled. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- I am actually not 100% sure we need to disable gpg signature checking in order to update fedora-gpg-keys: it would make sense for that one package to be signed with the old key to make the update possible without breaking trust at any point in time. Unfortunately I updated my Rawhide guest without taking a snapshot first, and I can't figure out a way to get it back to a state suitable for checking whether the above makes sense :( Perhaps someone with deeper understanding of the Fedora release process will confirm or deny. guests/lcitool | 24 +++++++++++++++++------- guests/playbooks/update/tasks/base.yml | 9 +++++++++ 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/guests/lcitool b/guests/lcitool index 821cafc..ddeee6a 100755 --- a/guests/lcitool +++ b/guests/lcitool @@ -511,7 +511,8 @@ class Application: facts = self._inventory.get_facts(host) package_format = facts["package_format"] os_name = facts["os_name"] - os_full = os_name + str(facts["os_version"]) + os_version = str(facts["os_version"]) + os_full = os_name + os_version if package_format not in ["deb", "rpm"]: raise Error("Host {} doesn't support Dockerfiles".format(host)) @@ -560,12 +561,21 @@ class Application: apt-get autoclean -y """)) elif package_format == "rpm": - sys.stdout.write(textwrap.dedent(""" - RUN yum update -y && \\ - yum install -y ${PACKAGES} && \\ - yum autoremove -y && \\ - yum clean all -y - """)) + if os_name == "Fedora" and os_version == "Rawhide": + sys.stdout.write(textwrap.dedent(""" + RUN yum update -y --nogpgcheck fedora-gpg-keys && \\ + yum update -y && \\ + yum install -y ${PACKAGES} && \\ + yum autoremove -y && \\ + yum clean all -y + """)) + else: + sys.stdout.write(textwrap.dedent(""" + RUN yum update -y && \\ + yum install -y ${PACKAGES} && \\ + yum autoremove -y && \\ + yum clean all -y + """)) def run(self): cmdline = self._parser.parse_args() diff --git a/guests/playbooks/update/tasks/base.yml b/guests/playbooks/update/tasks/base.yml index 11f600f..cc16eb0 100644 --- a/guests/playbooks/update/tasks/base.yml +++ b/guests/playbooks/update/tasks/base.yml @@ -64,6 +64,15 @@ - not ( os_name == 'Fedora' and os_version == 'Rawhide' ) +- name: Update installed packages + package: + name: fedora-gpg-keys + state: latest + disable_gpg_check: yes + when: + - os_name == 'Fedora' + - os_version == 'Rawhide' + - name: Update installed packages command: dnf update --refresh --exclude 'kernel*' -y args: -- 2.17.1

2 1

[libvirt] [PATCH] tests: skip some unicode tests if expected output won't match
by Daniel P. Berrangé 04 Sep '18

04 Sep '18

The expected output strings from the vshtabletest.c are created on a modern Linux host where unicode printing support is very good. On older Linux platforms, or non-Linux platforms, some unicode characters will not be considered printable. While the vsh table alignment code will stil do the right thing with escaping & aligning in this case, the result will not match the test's expected output. Since we know the code is working correctly, do a check with iswprint() to validate the platform's quality and skip the test if it fails. This fixes the test on FreeBSD platforms. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as a build fix tests/vshtabletest.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/tests/vshtabletest.c b/tests/vshtabletest.c index 9e9c045226..1138e34161 100644 --- a/tests/vshtabletest.c +++ b/tests/vshtabletest.c @@ -21,6 +21,7 @@ #include <stdlib.h> #include <stdio.h> #include <locale.h> +#include <wctype.h> #include "internal.h" #include "testutils.h" @@ -158,6 +159,15 @@ testUnicodeArabic(const void *opaque ATTRIBUTE_UNUSED) " 1 ﻉﺪﻴﻟ ﺎﻠﺜﻘﻴﻟ ﻕﺎﻣ ﻊﻧ, ٣٠ ﻎﻴﻨﻳﺍ ﻮﺘﻧﺎﻤﺗ ﺎﻠﺛﺎﻠﺛ، ﺄﺳﺭ, ﺩﻮﻟ ﺩﻮﻟ. ﺄﻣﺎﻣ ﺍ ﺎﻧ ﻲﻜﻧ \n" " ﺺﻔﺣﺓ ﺖﻜﺘﻴﻛﺍً ﻊﻟ, ﺎﻠﺠﻧﻭﺩ ﻭﺎﻠﻌﺗﺍﺩ ﺵﺭ \n"; vshTablePtr table; + wchar_t wc; + + /* If this char is not classed as printable, the actual + * output won't match what this test expects. The code + * is still operating correctly, but we have different + * layout */ + mbrtowc(&wc, "،", MB_CUR_MAX, NULL); + if (!iswprint(wc)) + return EXIT_AM_SKIP; table = vshTableNew("ﻡﺍ ﻢﻣﺍ ﻕﺎﺌﻣﺓ", "ﺓ ﺎﻠﺼﻋ", "ﺍﻸﺜﻧﺎﻧ", NULL); if (!table) @@ -192,6 +202,15 @@ testUnicodeZeroWidthChar(const void *opaque ATTRIBUTE_UNUSED) " 1\u200B fedora28 run\u200Bning \n" " 2 rhel7.5 running \n"; char *act = NULL; + wchar_t wc; + + /* If this char is not classed as printable, the actual + * output won't match what this test expects. The code + * is still operating correctly, but we have different + * layout */ + mbrtowc(&wc, "\u200B", MB_CUR_MAX, NULL); + if (!iswprint(wc)) + return EXIT_AM_SKIP; table = vshTableNew("I\u200Bd", "Name", "\u200BStatus", NULL); if (!table) -- 2.17.1

2 2

[libvirt] [snmp PATCH] Fix wrong object OIDs sent by libvirtMib_subagent
by Miguel Martin 04 Sep '18

04 Sep '18

The objects OIDs sent by the guest agent are: libvirtGuestName.0 libvirtGuestUUID.1 libvirtGuestState.2 libvirtGuestRowStatus.3 The expected libvirtGuestNotif objects OID would be: libvirtGuestName.0 libvirtGuestUUID.0 libvirtGuestState.0 libvirtGuestRowStatus.0 Signed-off-by: Miguel Martin <mmartinv(a)redhat.com> Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1624839 --- src/libvirtNotifications.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libvirtNotifications.c b/src/libvirtNotifications.c index 135f177..0522d54 100644 --- a/src/libvirtNotifications.c +++ b/src/libvirtNotifications.c @@ -38,11 +38,11 @@ send_libvirtGuestNotif_trap(virDomainPtr dom) const oid libvirtGuestName_oid[] = { 1, 3, 6, 1, 4, 1, 36957, 1, 1, 1, 2, 0 }; const oid libvirtGuestUUID_oid[] = - { 1, 3, 6, 1, 4, 1, 36957, 1, 1, 1, 1, 1 }; + { 1, 3, 6, 1, 4, 1, 36957, 1, 1, 1, 1, 0 }; const oid libvirtGuestState_oid[] = - { 1, 3, 6, 1, 4, 1, 36957, 1, 1, 1, 3, 2 }; + { 1, 3, 6, 1, 4, 1, 36957, 1, 1, 1, 3, 0 }; const oid libvirtGuestRowStatus_oid[] = - { 1, 3, 6, 1, 4, 1, 36957, 1, 1, 1, 9, 3 }; + { 1, 3, 6, 1, 4, 1, 36957, 1, 1, 1, 9, 0 }; const char *domName = virDomainGetName(dom); -- 2.17.1

2 1

[libvirt] [go PATCH] Avoid clashing path with default storage pool
by Daniel P. Berrangé 04 Sep '18

04 Sep '18

The test driver provides a default storage pool at /default-pool. Libvirt now enforces source path uniqueness, so we must pick a different path for our test pools. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as a build fix connect_test.go | 6 +++--- storage_pool_test.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/connect_test.go b/connect_test.go index 29c274d..da24448 100644 --- a/connect_test.go +++ b/connect_test.go @@ -789,7 +789,7 @@ func TestStoragePoolDefineXML(t *testing.T) { }() defName := "default-pool-test-0" xml := `<pool type='dir'><name>default-pool-test-0</name><target> - <path>/default-pool</path></target></pool>` + <path>/default-pool-test-0</path></target></pool>` pool, err := conn.StoragePoolDefineXML(xml, 0) if err != nil { t.Fatal(err) @@ -900,7 +900,7 @@ func TestLookupStorageVolByKey(t *testing.T) { return } defer pool.Destroy() - defPoolPath := "default-pool" + defPoolPath := "default-pool-test-1" defVolName := time.Now().String() defVolKey := "/" + defPoolPath + "/" + defVolName vol, err := pool.StorageVolCreateXML(testStorageVolXML(defVolName, defPoolPath), 0) @@ -942,7 +942,7 @@ func TestLookupStorageVolByPath(t *testing.T) { return } defer pool.Destroy() - defPoolPath := "default-pool" + defPoolPath := "default-pool-test-1" defVolName := time.Now().String() defVolPath := "/" + defPoolPath + "/" + defVolName vol, err := pool.StorageVolCreateXML(testStorageVolXML(defVolName, defPoolPath), 0) diff --git a/storage_pool_test.go b/storage_pool_test.go index 18cdb3a..7e93b17 100644 --- a/storage_pool_test.go +++ b/storage_pool_test.go @@ -42,7 +42,7 @@ func buildTestStoragePool(poolName string) (*StoragePool, *Connect) { pool, err := conn.StoragePoolDefineXML(`<pool type='dir'> <name>`+name+`</name> <target> - <path>/default-pool</path> + <path>/default-pool-test-1</path> </target> </pool>`, 0) if err != nil { -- 2.17.1

1 0

[libvirt] [perl PATCH] Avoid using /default-pool for test storage pool
by Daniel P. Berrangé 04 Sep '18

04 Sep '18

The path /default-pool is used by a predefined storage pool in the test driver, and libvirt now enforces pool source uniqueness. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as a build fix t/400-storage-pools.t | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/400-storage-pools.t b/t/400-storage-pools.t index 319a21e..c78507d 100644 --- a/t/400-storage-pools.t +++ b/t/400-storage-pools.t @@ -60,7 +60,7 @@ my $xml = "<pool type='dir'> <name>wibble</name> <uuid>12341234-5678-5678-5678-123412341234</uuid> <target> - <path>/default-pool</path> + <path>/wibble</path> </target> </pool>"; -- 2.17.1

1 0

[libvirt] [PATCH] tests: skip qemublocktest if building without YAJL
by Daniel P. Berrangé 04 Sep '18

04 Sep '18

If no JSON parser is available qemublocktest fails, so skip its execution. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as a build fix for platforms without JSON parser installed tests/qemublocktest.c | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c index 0c335abc5b..8e8773e6a8 100644 --- a/tests/qemublocktest.c +++ b/tests/qemublocktest.c @@ -19,17 +19,19 @@ #include <stdlib.h> #include "testutils.h" -#include "testutilsqemu.h" -#include "testutilsqemuschema.h" -#include "virstoragefile.h" -#include "virstring.h" -#include "virlog.h" -#include "qemu/qemu_block.h" -#include "qemu/qemu_qapi.h" -#include "qemu/qemu_command.h" +#if WITH_YAJL +# include "testutilsqemu.h" +# include "testutilsqemuschema.h" +# include "virstoragefile.h" +# include "virstring.h" +# include "virlog.h" +# include "qemu/qemu_block.h" +# include "qemu/qemu_qapi.h" -#define VIR_FROM_THIS VIR_FROM_NONE +# include "qemu/qemu_command.h" + +# define VIR_FROM_THIS VIR_FROM_NONE VIR_LOG_INIT("tests.storagetest"); @@ -355,7 +357,7 @@ mymain(void) virTestCounterReset("qemu storage source xml->json->xml "); -#define TEST_JSON_FORMAT(tpe, xmlstr) \ +# define TEST_JSON_FORMAT(tpe, xmlstr) \ do { \ xmljsonxmldata.type = tpe; \ xmljsonxmldata.xml = xmlstr; \ @@ -364,7 +366,7 @@ mymain(void) ret = -1; \ } while (0) -#define TEST_JSON_FORMAT_NET(xmlstr)\ +# define TEST_JSON_FORMAT_NET(xmlstr) \ TEST_JSON_FORMAT(VIR_STORAGE_TYPE_NETWORK, xmlstr) TEST_JSON_FORMAT(VIR_STORAGE_TYPE_FILE, "<source file='/path/to/file'/>\n"); @@ -417,7 +419,7 @@ mymain(void) " <host name='example.com' port='9999'/>\n" "</source>\n"); -#define TEST_DISK_TO_JSON_FULL(nme, fl) \ +# define TEST_DISK_TO_JSON_FULL(nme, fl) \ do { \ diskxmljsondata.name = nme; \ diskxmljsondata.props = NULL; \ @@ -435,7 +437,7 @@ mymain(void) testQemuDiskXMLToPropsClear(&diskxmljsondata); \ } while (0) -#define TEST_DISK_TO_JSON(nme) TEST_DISK_TO_JSON_FULL(nme, false) +# define TEST_DISK_TO_JSON(nme) TEST_DISK_TO_JSON_FULL(nme, false) if (!(diskxmljsondata.schema = testQEMUSchemaLoad())) { ret = -1; @@ -500,4 +502,12 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } +#else +static int +mymain(void) +{ + return EXIT_AM_SKIP; +} +#endif + VIR_TEST_MAIN(mymain) -- 2.17.1

3 5

[libvirt] [PATCH] qemu: clear seccomp capability if TSYNC is not supported by host
by marcandre.lureau＠redhat.com 04 Sep '18

04 Sep '18

From: Marc-André Lureau <marcandre.lureau(a)redhat.com> With qemu <= 3.0, when using "-seccomp on", the seccomp policy is only applied to the main thread, the vcpu worker thread and other worker threads created after seccomp policy is applied; the seccomp policy is not applied to e.g. the RCU thread because it is created before the seccomp policy is applied. Since qemu commit 70dfabeaa79ba4d7a3b699abe1a047c8012db114 "seccomp: set the seccomp filter to all threads", qemu will require seccomp TSYNC flag, and will fail to start if the flag isn't available. Without it, sandboxing is flawed. Disable seccomp capability if the host is not capable of using seccomp TSYNC. Signed-off-by: Marc-André Lureau <marcandre.lureau(a)redhat.com> --- configure.ac | 2 +- src/qemu/qemu_capabilities.c | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index da940e34df..c206de1cad 100644 --- a/configure.ac +++ b/configure.ac @@ -330,7 +330,7 @@ AC_CHECK_FUNCS_ONCE([cfmakeraw fallocate geteuid getgid getgrnam_r \ dnl Availability of various common headers (non-fatal if missing). AC_CHECK_HEADERS([pwd.h regex.h sys/un.h \ - sys/poll.h syslog.h mntent.h net/ethernet.h linux/magic.h \ + sys/poll.h syslog.h mntent.h net/ethernet.h linux/magic.h linux/seccomp.h \ sys/un.h sys/syscall.h sys/sysctl.h netinet/tcp.h ifaddrs.h \ libtasn1.h sys/ucred.h sys/mount.h stdarg.h]) dnl Check whether endian provides handy macros. diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index a075677421..dd62246eb4 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -54,6 +54,10 @@ #include <sys/wait.h> #include <stdarg.h> #include <sys/utsname.h> +#if defined(HAVE_LINUX_SECCOMP_H) && defined(HAVE_SYS_SYSCALL_H) +#include <linux/seccomp.h> +#include <sys/syscall.h> +#endif #define VIR_FROM_THIS VIR_FROM_QEMU @@ -4615,6 +4619,15 @@ virQEMUCapsLogProbeFailure(const char *binary) } +#if defined(HAVE_LINUX_SECCOMP_H) && defined(HAVE_SYS_SYSCALL_H) +static int +virSeccomp(unsigned int op, unsigned int flags, void *args) +{ + errno = 0; + return syscall(__NR_seccomp, op, flags, args); +} +#endif + virQEMUCapsPtr virQEMUCapsNewForBinaryInternal(virArch hostArch, const char *binary, @@ -4679,6 +4692,20 @@ virQEMUCapsNewForBinaryInternal(virArch hostArch, goto error; } + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SECCOMP_SANDBOX)) { + bool have_seccomp = false; +#if defined(HAVE_LINUX_SECCOMP_H) && defined(HAVE_SYS_SYSCALL_H) + /* check the TSYNC flag - it returns errno == ENOSYS if unavailable */ + if (virSeccomp(SECCOMP_SET_MODE_FILTER, SECCOMP_FILTER_FLAG_TSYNC, NULL) < 0 && + errno == EFAULT) { + have_seccomp = true; + } +#endif + if (!have_seccomp) { + virQEMUCapsClear(qemuCaps, QEMU_CAPS_SECCOMP_SANDBOX); + } + } + cleanup: VIR_FREE(qmperr); return qemuCaps; -- 2.19.0.rc0.48.gb9dfa238d5

5 5

[libvirt] [jenkins-ci PATCH 0/8] lcitool: Support building arbitrary branches
by Andrea Bolognani 04 Sep '18

04 Sep '18

Better (hopefully :) implementation of the feature scrapped from the initial "build support" series. Andrea Bolognani (8): lcitool: Add "-r REVISION" argument for build Don't use "branch" in paths and job names jobs: Hardcode "master" branch guests: Use "git_branch" when building Drop "branch" variable Add "git_urls" dictionary to defaults guests: Use "git_remote" when building guests: Update documentation guests/README.markdown | 8 ++++- guests/lcitool | 36 +++++++++++++------ .../build/jobs/autotools-build-job.yml | 4 +-- .../build/jobs/autotools-check-job.yml | 4 +-- .../build/jobs/autotools-rpm-job.yml | 4 +-- .../build/jobs/autotools-syntax-check-job.yml | 4 +-- guests/playbooks/build/jobs/defaults.yml | 32 ++++++++++++++++- .../build/jobs/generic-build-job.yml | 4 +-- .../build/jobs/generic-check-job.yml | 4 +-- .../playbooks/build/jobs/generic-rpm-job.yml | 4 +-- .../build/jobs/generic-syntax-check-job.yml | 4 +-- guests/playbooks/build/jobs/go-build-job.yml | 4 +-- guests/playbooks/build/jobs/go-check-job.yml | 4 +-- .../build/jobs/perl-modulebuild-build-job.yml | 4 +-- .../build/jobs/perl-modulebuild-check-job.yml | 4 +-- .../build/jobs/perl-modulebuild-rpm-job.yml | 4 +-- guests/playbooks/build/jobs/prepare.yml | 10 +++--- .../build/jobs/python-distutils-build-job.yml | 4 +-- .../build/jobs/python-distutils-check-job.yml | 4 +-- .../build/jobs/python-distutils-rpm-job.yml | 4 +-- guests/playbooks/build/projects/libosinfo.yml | 2 +- .../playbooks/build/projects/libvirt-cim.yml | 2 +- .../playbooks/build/projects/libvirt-dbus.yml | 2 +- .../playbooks/build/projects/libvirt-glib.yml | 2 +- .../build/projects/libvirt-go-xml.yml | 2 +- .../playbooks/build/projects/libvirt-go.yml | 2 +- .../playbooks/build/projects/libvirt-perl.yml | 2 +- .../build/projects/libvirt-python.yml | 2 +- .../build/projects/libvirt-sandbox.yml | 2 +- .../playbooks/build/projects/libvirt-tck.yml | 2 +- guests/playbooks/build/projects/libvirt.yml | 2 +- .../build/projects/osinfo-db-tools.yml | 2 +- guests/playbooks/build/projects/osinfo-db.yml | 2 +- .../playbooks/build/projects/virt-manager.yml | 2 +- .../playbooks/build/projects/virt-viewer.yml | 2 +- jobs/autotools.yaml | 18 +++++----- jobs/defaults.yaml | 32 ++++++++++++++++- jobs/generic.yaml | 18 +++++----- jobs/go.yaml | 10 +++--- jobs/perl-modulebuild.yaml | 14 ++++---- jobs/python-distutils.yaml | 14 ++++---- projects/libosinfo.yaml | 14 ++++---- projects/libvirt-cim.yaml | 6 ++-- projects/libvirt-dbus.yaml | 10 +++--- projects/libvirt-glib.yaml | 14 ++++---- projects/libvirt-go-xml.yaml | 6 ++-- projects/libvirt-go.yaml | 6 ++-- projects/libvirt-perl.yaml | 8 ++--- projects/libvirt-python.yaml | 8 ++--- projects/libvirt-sandbox.yaml | 10 +++--- projects/libvirt-tck.yaml | 8 ++--- projects/libvirt.yaml | 8 ++--- projects/osinfo-db-tools.yaml | 8 ++--- projects/osinfo-db.yaml | 8 ++--- projects/virt-manager.yaml | 10 +++--- projects/virt-viewer.yaml | 14 ++++---- 56 files changed, 253 insertions(+), 171 deletions(-) -- 2.17.1

2 19

[libvirt] Release of libvirt-4.7.0
by Daniel Veillard 03 Sep '18

03 Sep '18

I didn't do this this week-end, that gave time to Andrea to update the release notes :-) it's now tagged in git and signed tarball and rpms are pushed to the usual place: ftp://libvirt.org/libvirt/ I also pushed a release 4.7.0 for the python bindings but they are virtually equivalent to 4.6.0 ones, you can find them at ftp://libvirt.org/libvirt/python/ This seems a reasonably large release, many commits, not that many people were in vacations last month ! The resulting is a balanced release with new features, improvements, and obviously the usual amount of bug fixes ! New features: - storage: add storage pool iscsi-direct Introduce a new storage pool backend that uses libiscsi instead of iscsiadm. It support basic pool operations: checkPool and refreshPool. - Add support for MBA (Memory Bandwidth Allocation technology) Domain vCPU threads can now have allocated some parts of host memory bandwidth by using the memorytune element in cputune. - qemu: Add support for RISC-V guests riscv32 and riscv64 guest architectures are now supported. Improvements: - qemu: Add ccw support for vhost-vsock Support the vhost-vsock-ccw device on S390. - qemu: Make default machine type independent of QEMU We can't control whether or not QEMU will change its default machine type in the future, or whether downstream distributions will decide to compile out some machine types, so our only option to provide a predictable behavior is taking care of the default ourselves; management applications and users are encouraged to explicitly pick a machine type when creating new guests. - apparmor: Various improvements Rules have been added to deal with a number of scenarios that didn't work correctly. Bug fixes: - esx: Truncate CPU model name Some CPU model names are too long to be stored into the corresponding property, and should be explicitly truncated to avoid unexpected behavior in users of the virNodeGetInfo() API such as virsh nodeinfo. - utils: Remove arbitrary limit on socket_id/core_id Both values were assumed to be smaller than 4096, but in fact they are entirely hardware-dependent and there have been reports of machines presenting much bigger values, preventing libvirt from working correctly; all such limits have now been removed. Thanks everybody for your help with this release be it with code, bug reports, patch reviews, documentation, ... Enjoy ! Daniel -- Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/ veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [jenkins-ci PATCH 1/2] guests: enable {media, tree}uris tests for libosinfo
by Fabiano Fidêncio 03 Sep '18

03 Sep '18

Both media and tree uris tests are only run when LIBOSINFO_NETWORK_TESTS is set. Let's have those enabled in order to early catch URL changes in osinfo-db. Signed-off-by: Fabiano Fidêncio <fidencio(a)redhat.com> --- guests/playbooks/build/projects/libosinfo.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/guests/playbooks/build/projects/libosinfo.yml b/guests/playbooks/build/projects/libosinfo.yml index c29053b..3c941d2 100644 --- a/guests/playbooks/build/projects/libosinfo.yml +++ b/guests/playbooks/build/projects/libosinfo.yml @@ -9,6 +9,11 @@ - include: '{{ playbook_base }}/jobs/autotools-build-job.yml' - include: '{{ playbook_base }}/jobs/autotools-syntax-check-job.yml' - include: '{{ playbook_base }}/jobs/autotools-check-job.yml' + vars: + local_env: | + # export LIBOSINFO_NETWORK_TESTS in order to run both + # mediauris and treeuris tests + export LIBOSINFO_NETWORK_TESTS=1 - include: '{{ playbook_base }}/jobs/autotools-rpm-job.yml' vars: machines: '{{ rpm_machines }}' -- 2.17.1

2 3

[libvirt] [PATCH 0/6] conf: Move a bunch of stuff to device_conf
by Andrea Bolognani 03 Sep '18

03 Sep '18

These are the times where I wish we were using a language with support for proper classes and modules like, I dunno, PHP or something. Andrea Bolognani (6): conf: Move virDomainDeviceAddressType to device_conf conf: Move virDomainDeviceAddressIsValid() to device_conf conf: Change return type of *AddressIsValid() to bool conf: Move virDomainPCIAddressAsString() to device_conf conf: Rename virDomainPCIAddressAsString() conf: Move *AddressParseXML() to device_conf src/conf/device_conf.c | 348 ++++++++++++++++++++++++++++++++- src/conf/device_conf.h | 31 ++- src/conf/domain_addr.c | 20 +- src/conf/domain_addr.h | 3 - src/conf/domain_conf.c | 320 ------------------------------ src/conf/domain_conf.h | 3 - src/libvirt_private.syms | 13 +- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_domain_address.c | 6 +- 9 files changed, 386 insertions(+), 360 deletions(-) -- 2.17.1

3 14

[libvirt] [PATCH] qemu: Don't overwrite stats in qemuDomainBlocksStatsGather
by Peter Krempa 03 Sep '18

03 Sep '18

The size/capacity stats gathered in qemuDomainBlocksStatsGather when using -blockdev would be overwritten by assigning/copying the transfered data statistics at the end. Fix it by moving the assignment prior to fetching the capacity data. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a0f7c71675..07ea5473b6 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11114,6 +11114,8 @@ qemuDomainBlocksStatsGather(virQEMUDriverPtr driver, goto cleanup; } + **retstats = *stats; + if (blockdev) { /* capacity are reported only per node-name so we need to transfer them */ qemuBlockStatsPtr capstats; @@ -11127,8 +11129,6 @@ qemuDomainBlocksStatsGather(virQEMUDriverPtr driver, (*retstats)->write_threshold = capstats->write_threshold; } } - - **retstats = *stats; } else { for (i = 0; i < vm->def->ndisks; i++) { disk = vm->def->disks[i]; -- 2.16.2

2 1

[libvirt] [PATCH] news: Update for 4.7.0 release
by Andrea Bolognani 03 Sep '18

03 Sep '18

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- docs/news.xml | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index 2b6d08dc02..3233796f32 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -71,8 +71,51 @@ Support the vhost-vsock-ccw device on S390. </description> </change> + <change> + <summary> + qemu: Make default machine type independent of QEMU + </summary> + <description> + We can't control whether or not QEMU will change its default + machine type in the future, or whether downstream distributions + will decide to compile out some machine types, so our only option + to provide a predictable behavior is taking care of the default + ourselves; management applications and users are encouraged to + explicitly pick a machine type when creating new guests. + </description> + </change> + <change> + <summary> + apparmor: Various improvements + </summary> + <description> + Rules have been added to deal with a number of scenarios that + didn't work correctly. + </description> + </change> </section> <section title="Bug fixes"> + <change> + <summary> + esx: Truncate CPU model name + </summary> + <description> + Some CPU model names are too long to be stored into the + corresponding property, and should be explicitly truncated to + avoid unexpected behavior. + </description> + </change> + <change> + <summary> + utils: Remove arbitrary limit on socket_id/core_id + </summary> + <description> + Both values were assumed to be smaller than 4096, but in fact + they are entirely hardware-dependent and there have been reports + of machines presenting much bigger values, preventing libvirt from + working correctly; all such limits have now been removed. + </description> + </change> </section> </release> <release version="v4.6.0" date="2018-08-06"> -- 2.17.1

2 1

[libvirt] Terminal input “udevadm trigger” command,then produce “nl_recv returned with error:No buffer space available”
by xiajidong＠cmss.chinamobile.com 03 Sep '18

03 Sep '18

Dear libvirt experts， I have add some patch as follow.this two patch add buffer size to avoid to produce “nl_recv returned with error:No buffer space available” 1. libvirt-nodedev-Increase-the-netlink-socket-buffer-size-to-t.patch 2. libvirt-util-increase-libnl-buffer-size.patch but as I set some configuration in /etc/libvirt/libvitd.conf as follows # Logging level: 4 errors, 3 warnings, 2 information, 1 debug log_level =2 # Multiple outputs can be defined, they just need to be separated by spaces. # e.g. to log all warnings and errors to syslog under the libvirtd ident: log_outputs="2:syslog:libvirtd" when I input “udevadm trigger” command [root@localhost ~]# vi /etc/libvirt/libvirtd.conf [root@localhost ~]# systemctl restart libvirtd [root@localhost ~]# udevadm trigger [root@localhost ~]# udevadm trigger [root@localhost ~]# udevadm trigger [root@localhost ~]# then will produce “nl_recv returned with error:No buffer space available” [root@localhost ~]# tail -f /var/log/messages | grep buffer Sep 2 22:44:00 localhost libvirtd: 4004: error : virNetlinkEventCallback:699 : nl_recv returned with error: No buffer space available Sep 2 23:11:33 localhost libvirtd: 4004: error : virNetlinkEventCallback:699 : nl_recv returned with error: No buffer space available Sep 2 23:11:45 localhost libvirtd: 4004: error : virNetlinkEventCallback:699 : nl_recv returned with error: No buffer space available So my question is: When input “udevadm trigger” in terminal, if setting log_level and log_outputs="2:syslog:libvirtd",how to avoid to produce “error virNetlinkEventCallback:699 : nl_recv returned with error: No buffer space available” log information? I am looking forward to your reply. _____ Best Regards, Jidong Xia China Mobile (Suzhou) Software Technology Company.cloud computing product department Tel: (+86) 18896726087 E-Mail：xiajidong(a)cmss.chinamobile.com <mailto:xiajidong@cmss.chinamobile.com>

1 0

[libvirt] Virsh reference is out of date, should it be updated from the man page?
by Povilas Kanapickas 02 Sep '18

02 Sep '18

Hi! The online virsh command reference at [1] seems to be very out of date according to [2]. There's much more recent documentation at tools/virsh.pod in the main libvirt repository. I believe it would be great to update the web docs as they are much more accessible and convenient to use (especially the one-command-per-page version). What would be the best way to approach that? I suppose we could look into automatically converting the current manpages into docbook and using that to update the website? What do you think? Regards, Povilas [1] - https://libvirt.org/virshcmdref.html [2] - https://libvirt.org/git/?p=libvirt-virshcmdref.git;a=summary

1 0

[libvirt] [PATCHv2 0/3] network: new network forward mode 'vlan'
by Shi Lei 02 Sep '18

02 Sep '18

Hi, everyone! This patch supports VLan by '8021q' kernel module other than by OVS. The way of '8021q' is simpler and more robust. Mode 'vlan' is like mode 'route' except these major differences: - mode 'vlan' inserts a vlan-device between the specified host's interface and the internal bridge. The vlan-device is based on '8021q' kernel module. - mode 'vlan' has no routed iptables rules but has other common iptables rules It can simplify the work of management apps whose developers want to implement VLan but don't want to introduce OVS into their project. Thank John for his comments in v1. v1 here: https://www.redhat.com/archives/libvir-list/2018-July/msg00331.html since v1: - Change docs/formatnetwork.html.in - Change docs/schemas/network.rng - Add tests/networkxml2* - Other code fixes Besides, I have post two patches followed by John's suggestions. - Replace 'if' type conditions with 'switch' for VIR_NETWORK_FORWARD_* https://www.redhat.com/archives/libvir-list/2018-July/msg01537.html This has been accepted. - Introduce timeout mode for virKModLoad to solve the potential problem of the 'strange delay' when loading '8021q' module https://www.redhat.com/archives/libvir-list/2018-August/msg00605.html This has been rejected and I don't know wether I should continue to solve this problem. Now I just check the INIT process code of '8021q' module and I think this module should not cause delay now. The loading time of '8021q' by virKModLoad on my PC is about 30 milliseconds. Shi Lei (3): add functions: load 8021q module, create/destroy vlan-dev support new forward mode 'vlan' for virtual network tests and docs for new forward mode 'vlan' configure.ac | 6 + docs/formatnetwork.html.in | 27 ++- docs/schemas/network.rng | 1 + src/conf/domain_conf.c | 1 + src/conf/network_conf.c | 24 ++- src/conf/network_conf.h | 1 + src/conf/virnetworkobj.c | 1 + src/esx/esx_network_driver.c | 1 + src/libvirt_private.syms | 4 + src/network/bridge_driver.c | 55 +++++- src/qemu/qemu_process.c | 1 + src/util/virnetdev.c | 203 +++++++++++++++++++++ src/util/virnetdev.h | 18 ++ tests/networkxml2confdata/vlan-network.conf | 16 ++ tests/networkxml2confdata/vlan-network.xml | 13 ++ tests/networkxml2conftest.c | 1 + .../vlan-network-multi-vlan-tag.xml | 11 ++ .../vlan-network-no-forward-dev.xml | 10 + tests/networkxml2xmlin/vlan-network-with-dhcp.xml | 15 ++ tests/networkxml2xmlin/vlan-network.xml | 10 + tests/networkxml2xmlout/vlan-network-with-dhcp.xml | 17 ++ tests/networkxml2xmlout/vlan-network.xml | 12 ++ tests/networkxml2xmltest.c | 5 + 23 files changed, 448 insertions(+), 5 deletions(-) create mode 100644 tests/networkxml2confdata/vlan-network.conf create mode 100644 tests/networkxml2confdata/vlan-network.xml create mode 100644 tests/networkxml2xmlin/vlan-network-multi-vlan-tag.xml create mode 100644 tests/networkxml2xmlin/vlan-network-no-forward-dev.xml create mode 100644 tests/networkxml2xmlin/vlan-network-with-dhcp.xml create mode 100644 tests/networkxml2xmlin/vlan-network.xml create mode 100644 tests/networkxml2xmlout/vlan-network-with-dhcp.xml create mode 100644 tests/networkxml2xmlout/vlan-network.xml -- 2.7.4

3 5

[libvirt] [PATCH] Add virNetlinkNewLink for simplifying virNetDev*Create
by Shi Lei 02 Sep '18

02 Sep '18

This patch adds virNetlinkNewLink for simplifying virNetDevMacVLanCreate and virNetDevBridgeCreate. Signed-off-by: Shi Lei <shi_lei(a)massclouds.com> --- src/libvirt_private.syms | 1 + src/util/virnetdevbridge.c | 73 +++-------------------- src/util/virnetdevmacvlan.c | 137 ++++++++++++++------------------------------ src/util/virnetlink.c | 104 +++++++++++++++++++++++++++++++++ src/util/virnetlink.h | 8 +++ 5 files changed, 164 insertions(+), 159 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 47ea35f..23931ba 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2439,6 +2439,7 @@ virNetlinkEventServiceStop; virNetlinkEventServiceStopAll; virNetlinkGetErrorCode; virNetlinkGetNeighbor; +virNetlinkNewLink; virNetlinkShutdown; virNetlinkStartup; diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c index bc377b5..1f5b37e 100644 --- a/src/util/virnetdevbridge.c +++ b/src/util/virnetdevbridge.c @@ -417,77 +417,22 @@ virNetDevBridgeCreate(const char *brname) { /* use a netlink RTM_NEWLINK message to create the bridge */ const char *type = "bridge"; - struct nlmsgerr *err; - struct ifinfomsg ifinfo = { .ifi_family = AF_UNSPEC }; - unsigned int recvbuflen; - struct nlattr *linkinfo; - VIR_AUTOPTR(virNetlinkMsg) nl_msg = NULL; - VIR_AUTOFREE(struct nlmsghdr *) resp = NULL; + int error = 0; - nl_msg = nlmsg_alloc_simple(RTM_NEWLINK, - NLM_F_REQUEST | NLM_F_CREATE | NLM_F_EXCL); - if (!nl_msg) { - virReportOOMError(); - return -1; - } - - if (nlmsg_append(nl_msg, &ifinfo, sizeof(ifinfo), NLMSG_ALIGNTO) < 0) - goto buffer_too_small; - if (nla_put(nl_msg, IFLA_IFNAME, strlen(brname)+1, brname) < 0) - goto buffer_too_small; - if (!(linkinfo = nla_nest_start(nl_msg, IFLA_LINKINFO))) - goto buffer_too_small; - if (nla_put(nl_msg, IFLA_INFO_KIND, strlen(type), type) < 0) - goto buffer_too_small; - nla_nest_end(nl_msg, linkinfo); - - if (virNetlinkCommand(nl_msg, &resp, &recvbuflen, 0, 0, - NETLINK_ROUTE, 0) < 0) { - return -1; - } - - if (recvbuflen < NLMSG_LENGTH(0) || resp == NULL) - goto malformed_resp; - - switch (resp->nlmsg_type) { - case NLMSG_ERROR: - err = (struct nlmsgerr *)NLMSG_DATA(resp); - if (resp->nlmsg_len < NLMSG_LENGTH(sizeof(*err))) - goto malformed_resp; - - if (err->error < 0) { + if (virNetlinkNewLink(NULL, brname, NULL, type, NULL, NULL, &error) < 0) { # if defined(HAVE_STRUCT_IFREQ) && defined(SIOCBRADDBR) - if (err->error == -EOPNOTSUPP) { - /* fallback to ioctl if netlink doesn't support creating - * bridges - */ - return virNetDevBridgeCreateWithIoctl(brname); - } -# endif - - virReportSystemError(-err->error, - _("error creating bridge interface %s"), - brname); - return -1; + if (error == -EOPNOTSUPP) { + /* fallback to ioctl if netlink doesn't support creating bridges */ + return virNetDevBridgeCreateWithIoctl(brname); } - break; +# endif + virReportSystemError(-error, _("error creating bridge interface %s"), + brname); - case NLMSG_DONE: - break; - default: - goto malformed_resp; + return -1; } return 0; - - malformed_resp: - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("malformed netlink response message")); - return -1; - buffer_too_small: - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("allocated netlink buffer is too small")); - return -1; } diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index 2035b1f..1629add 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -283,6 +283,37 @@ virNetDevMacVLanReleaseName(const char *name) } +static int +virNetDevMacVLanCreateCallback(struct nl_msg *nl_msg, const void *opaque) +{ + const uint32_t *mode = (const uint32_t *) opaque; + if (!nl_msg || !opaque) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("nl_msg %p or opaque %p is NULL"), + nl_msg, opaque); + return -1; + } + + if (*mode > 0) { + struct nlattr *info_data; + if (!(info_data = nla_nest_start(nl_msg, IFLA_INFO_DATA))) + goto buffer_too_small; + + if (nla_put(nl_msg, IFLA_MACVLAN_MODE, sizeof(*mode), mode) < 0) + goto buffer_too_small; + + nla_nest_end(nl_msg, info_data); + } + + return 0; + + buffer_too_small: + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("allocated netlink buffer is too small")); + return -1; +} + + /** * virNetDevMacVLanCreate: * @@ -307,113 +338,29 @@ virNetDevMacVLanCreate(const char *ifname, uint32_t macvlan_mode, int *retry) { - int rc = -1; - struct nlmsgerr *err; - struct ifinfomsg ifinfo = { .ifi_family = AF_UNSPEC }; int ifindex; - unsigned int recvbuflen; - struct nl_msg *nl_msg; - struct nlattr *linkinfo, *info_data; - char macstr[VIR_MAC_STRING_BUFLEN]; - VIR_AUTOFREE(struct nlmsghdr *) resp = NULL; - - if (virNetDevGetIndex(srcdev, &ifindex) < 0) - return -1; - + int error = 0; *retry = 0; - nl_msg = nlmsg_alloc_simple(RTM_NEWLINK, - NLM_F_REQUEST | NLM_F_CREATE | NLM_F_EXCL); - if (!nl_msg) { - virReportOOMError(); + if (virNetDevGetIndex(srcdev, &ifindex) < 0) return -1; - } - - if (nlmsg_append(nl_msg, &ifinfo, sizeof(ifinfo), NLMSG_ALIGNTO) < 0) - goto buffer_too_small; - - if (nla_put_u32(nl_msg, IFLA_LINK, ifindex) < 0) - goto buffer_too_small; - - if (nla_put(nl_msg, IFLA_ADDRESS, VIR_MAC_BUFLEN, macaddress) < 0) - goto buffer_too_small; - - if (ifname && - nla_put(nl_msg, IFLA_IFNAME, strlen(ifname)+1, ifname) < 0) - goto buffer_too_small; - if (!(linkinfo = nla_nest_start(nl_msg, IFLA_LINKINFO))) - goto buffer_too_small; - - if (nla_put(nl_msg, IFLA_INFO_KIND, strlen(type), type) < 0) - goto buffer_too_small; - - if (macvlan_mode > 0) { - if (!(info_data = nla_nest_start(nl_msg, IFLA_INFO_DATA))) - goto buffer_too_small; - - if (nla_put(nl_msg, IFLA_MACVLAN_MODE, sizeof(macvlan_mode), - &macvlan_mode) < 0) - goto buffer_too_small; - - nla_nest_end(nl_msg, info_data); - } - - nla_nest_end(nl_msg, linkinfo); - - if (virNetlinkCommand(nl_msg, &resp, &recvbuflen, 0, 0, - NETLINK_ROUTE, 0) < 0) { - goto cleanup; - } - - if (recvbuflen < NLMSG_LENGTH(0) || resp == NULL) - goto malformed_resp; - - switch (resp->nlmsg_type) { - case NLMSG_ERROR: - err = (struct nlmsgerr *)NLMSG_DATA(resp); - if (resp->nlmsg_len < NLMSG_LENGTH(sizeof(*err))) - goto malformed_resp; - - switch (err->error) { - - case 0: - break; - - case -EEXIST: + if (virNetlinkNewLink(&ifindex, ifname, macaddress, type, + virNetDevMacVLanCreateCallback, &macvlan_mode, + &error) < 0) { + char macstr[VIR_MAC_STRING_BUFLEN]; + if (error == -EEXIST) *retry = 1; - goto cleanup; - - default: - virReportSystemError(-err->error, + else + virReportSystemError(-error, _("error creating %s interface %s@%s (%s)"), type, ifname, srcdev, virMacAddrFormat(macaddress, macstr)); - goto cleanup; - } - break; - - case NLMSG_DONE: - break; - default: - goto malformed_resp; + return -1; } - rc = 0; - cleanup: - nlmsg_free(nl_msg); - return rc; - - 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; + return 0; } /** diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index 8f06446..817e347 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -489,6 +489,110 @@ virNetlinkDumpLink(const char *ifname, int ifindex, /** + * virNetlinkNewLink: + * + * @ifindex: The index for the 'link' device + * @ifname: The name of the link + * @mac: The MAC address of the device + * @type: The type of device, i.e., "bridge", "macvtap", "macvlan" + * @cb: The callback for filling in IFLA_INFO_DATA for this type + * @opaque: opaque for the callback + * @error: for retrieving error code + * + * Create a network "link" (aka interface aka device) with the given + * args. This works for many different types of network devices, + * including macvtap and bridges. + * + * Returns 0 on success, -1 on fatal error. + */ +int +virNetlinkNewLink(const int *ifindex, + const char *ifname, + const virMacAddr *mac, + const char *type, + virNetlinkNewLinkCallback cb, + const void *opaque, + int *error) +{ + struct nlmsgerr *err; + struct nlattr *linkinfo; + unsigned int buflen; + struct ifinfomsg ifinfo = { .ifi_family = AF_UNSPEC }; + VIR_AUTOPTR(virNetlinkMsg) nl_msg = NULL; + VIR_AUTOFREE(struct nlmsghdr *) resp = NULL; + + *error = 0; + + nl_msg = nlmsg_alloc_simple(RTM_NEWLINK, + NLM_F_REQUEST | NLM_F_CREATE | NLM_F_EXCL); + if (!nl_msg) { + virReportOOMError(); + return -1; + } + + if (nlmsg_append(nl_msg, &ifinfo, sizeof(ifinfo), NLMSG_ALIGNTO) < 0) + goto buffer_too_small; + + if (ifindex && nla_put_u32(nl_msg, IFLA_LINK, *ifindex) < 0) + goto buffer_too_small; + + if (mac && nla_put(nl_msg, IFLA_ADDRESS, VIR_MAC_BUFLEN, mac) < 0) + goto buffer_too_small; + + if (ifname && nla_put(nl_msg, IFLA_IFNAME, strlen(ifname)+1, ifname) < 0) + goto buffer_too_small; + + if (!(linkinfo = nla_nest_start(nl_msg, IFLA_LINKINFO))) + goto buffer_too_small; + + if (nla_put(nl_msg, IFLA_INFO_KIND, strlen(type), type) < 0) + goto buffer_too_small; + + if (cb && cb(nl_msg, opaque) < 0) + return -1; + + nla_nest_end(nl_msg, linkinfo); + + if (virNetlinkCommand(nl_msg, &resp, &buflen, 0, 0, NETLINK_ROUTE, 0) < 0) + return -1; + + if (buflen < NLMSG_LENGTH(0) || resp == NULL) + goto malformed_resp; + + switch (resp->nlmsg_type) { + case NLMSG_ERROR: + err = (struct nlmsgerr *)NLMSG_DATA(resp); + if (resp->nlmsg_len < NLMSG_LENGTH(sizeof(*err))) + goto malformed_resp; + + if (err->error < 0) { + *error = err->error; + return -1; + } + break; + + case NLMSG_DONE: + break; + + default: + goto malformed_resp; + } + + return 0; + + malformed_resp: + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("malformed netlink response message")); + return -1; + + buffer_too_small: + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("allocated netlink buffer is too small")); + return -1; +} + + +/** * virNetlinkDelLink: * * @ifname: Name of the link diff --git a/src/util/virnetlink.h b/src/util/virnetlink.h index 1e1e616..195c7bb 100644 --- a/src/util/virnetlink.h +++ b/src/util/virnetlink.h @@ -65,6 +65,14 @@ int virNetlinkDumpCommand(struct nl_msg *nl_msg, unsigned int protocol, unsigned int groups, void *opaque); +typedef int (*virNetlinkNewLinkCallback)(struct nl_msg *nl_msg, + const void *opaque); + +int virNetlinkNewLink(const int *ifindex, const char *ifname, + const virMacAddr *macaddress, const char *type, + virNetlinkNewLinkCallback cb, const void *opaque, + int *error); + typedef int (*virNetlinkDelLinkFallback)(const char *ifname); int virNetlinkDelLink(const char *ifname, virNetlinkDelLinkFallback fallback); -- 2.7.4

2 4

[libvirt] [PATCH v3 0/2] Add .domainGetHostname() support for QEMU driver.
by Julio Faracco 01 Sep '18

01 Sep '18

This serie adds a new function into QEMU Guest Agent handlers to use the QEMU command 'guest-get-host-name' to retrieve the domain hostname. This approach requires QEMU-GA running inside the guest, but it is the fastest and easiest way to get this info. Julio Faracco (2): qemu: implementing qemuAgentGetHostname() function. qemu: adding domainGetHostname support for QEMU. src/qemu/qemu_agent.c | 39 +++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_agent.h | 4 ++++ src/qemu/qemu_driver.c | 40 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 83 insertions(+) -- 2.17.1

2 5

[libvirt] [PATCH] virsh: Drop dead variables
by Eric Blake 31 Aug '18

31 Aug '18

The helper function virshSnapshotCreate (formerly vshSnapshotCreate) has had dead variables since commit a00c37f2 (Sep 2011). Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the trivial rule. tools/virsh-snapshot.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index 812fa91333..a4ea959230 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -50,9 +50,6 @@ virshSnapshotCreate(vshControl *ctl, virDomainPtr dom, const char *buffer, bool ret = false; virDomainSnapshotPtr snapshot; bool halt = false; - char *doc = NULL; - xmlDocPtr xml = NULL; - xmlXPathContextPtr ctxt = NULL; const char *name = NULL; snapshot = virDomainSnapshotCreateXML(dom, buffer, flags); @@ -101,10 +98,7 @@ virshSnapshotCreate(vshControl *ctl, virDomainPtr dom, const char *buffer, ret = true; cleanup: - xmlXPathFreeContext(ctxt); - xmlFreeDoc(xml); virshDomainSnapshotFree(snapshot); - VIR_FREE(doc); return ret; } -- 2.17.1

1 0

[libvirt] [PATCH] rpc: fix handling of SSH auth failure code
by Daniel P. Berrangé 31 Aug '18

31 Aug '18

The result of libssh2_userauth_password is being assigned to 'ret' in one branch and 'rc' in the other branch. Checks are all done against the 'ret' variable, so one branch never does the correct check. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/rpc/virnetsshsession.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c index 35dc6c5356..54c3a6f7aa 100644 --- a/src/rpc/virnetsshsession.c +++ b/src/rpc/virnetsshsession.c @@ -706,9 +706,9 @@ virNetSSHAuthenticatePassword(virNetSSHSessionPtr sess, if (priv->password) { /* tunelled password authentication */ - if ((ret = libssh2_userauth_password(sess->session, - priv->username, - priv->password)) == 0) { + if ((rc = libssh2_userauth_password(sess->session, + priv->username, + priv->password)) == 0) { ret = 0; goto cleanup; } @@ -737,7 +737,7 @@ virNetSSHAuthenticatePassword(virNetSSHSessionPtr sess, goto cleanup; } - if (ret != LIBSSH2_ERROR_AUTHENTICATION_FAILED) + if (rc != LIBSSH2_ERROR_AUTHENTICATION_FAILED) break; VIR_FREE(password); @@ -750,7 +750,7 @@ virNetSSHAuthenticatePassword(virNetSSHSessionPtr sess, _("authentication failed: %s"), errmsg); /* determine exist status */ - if (ret == LIBSSH2_ERROR_AUTHENTICATION_FAILED) + if (rc == LIBSSH2_ERROR_AUTHENTICATION_FAILED) return 1; else return -1; -- 2.17.1

2 2

[libvirt] [PATCH] qemu: mdev: Set vfio device property 'display' to off only if mdev is vfio-pci
by Farhan Ali 31 Aug '18

31 Aug '18

S390 is aware of both vfio-pci and vfio-ccw devices, so on S390 the capability QEMU_CAPS_VFIO_PCI_DISPLAY will be available. Add an extra check to make sure we only set the display to off for vfio-pci mediated devices. Otherwise we add display for vfio-ccw device and this breaks vfio-ccw device qemu command line. Fixes: d54e45b6e conf: Introduce new <hostdev> attribute 'display' Signed-off-by: Farhan Ali <alifm(a)linux.ibm.com> Reviewed-by: Marc Hartmayer <mhartmay(a)linux.ibm.com> --- src/qemu/qemu_domain.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 22c6d8f..df7e937 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6375,6 +6375,7 @@ qemuDomainHostdevDefMdevPostParse(virDomainHostdevSubsysMediatedDevPtr mdevsrc, /* QEMU 2.12 added support for vfio-pci display type, we default to * 'display=off' to stay safe from future changes */ if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VFIO_PCI_DISPLAY) && + mdevsrc->model == VIR_MDEV_MODEL_TYPE_VFIO_PCI && mdevsrc->display == VIR_TRISTATE_SWITCH_ABSENT) mdevsrc->display = VIR_TRISTATE_SWITCH_OFF; -- 2.7.4

2 1

[libvirt] [PATCH 0/5] JSON test improvements
by Ján Tomko 31 Aug '18

31 Aug '18

{ "BLURB": "HERE" } Ján Tomko (5): virjsontest: store name in testInfo virjsontest: use name instead of doc for deflatten test virjsontest: use the test name in AddRemove test Test parsing of large numbers in JSON tests: pass ULLONG_MAX to qemuMonitorJSONGetBalloonInfo tests/qemumonitorjsontest.c | 4 ++-- tests/virjsontest.c | 22 +++++++++++++--------- 2 files changed, 15 insertions(+), 11 deletions(-) -- 2.16.4

2 10

[libvirt] [PATCH v2 0/2] nwfilter: Fix a couple of session mode issues
by John Ferlan 30 Aug '18

30 Aug '18

v1: https://www.redhat.com/archives/libvir-list/2018-August/msg01464.html Changes in v2 - different approach as review pointed out we should never open the nwfilter driver in session mode (although driver initialization does set up some barebones list infrastructure). First, let's make sure we don't allow creation of the nwfilter filter binding similar to how nwfiler filter creation is not allowed. Second, rather than blindly open the nwfilter during the teardown processing, let's first ensure a filter exists for the network. It's not possible to call instantiation when net->filter == NULL. Rather than alter all the callers, just alter the two teardown API's to check if !net->filter and return prior to opening the nwfilter connection. Since we cannot create a filter nor can we create a binding, this filtering works. Keeps the changes minimal too. John Ferlan (2): nwfilter: Disallow binding creation in session mode nwfilter: Check for filter presence before open connect during teardown src/conf/domain_nwfilter.c | 22 +++++++++++++++------- src/nwfilter/nwfilter_driver.c | 6 ++++++ 2 files changed, 21 insertions(+), 7 deletions(-) -- 2.17.1

2 6

[libvirt] [PATCH] storage: Fix mention of disk pool default
by Eric Blake 30 Aug '18

30 Aug '18

The default disk storage pool type is 'dos', not 'msdos'. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- I ran into this doc bug when trying to figure out why a disk storage pool that I had copied from another machine wouldn't autostart; it turns out that the old disk used BIOS partitioning (dos), and the new one uses UEFI (gpt). I wonder if it would be nicer if a disk pool without a default partition type supplied by the user could auto-detect the right format, rather than defaulting to dos, but that's a bigger question that I won't be tackling, and wouldn't have necessarily helped me (if the <target> element was already present when I copied the file). docs/storage.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/storage.html.in b/docs/storage.html.in index e9e6ec7423..6ec623831c 100644 --- a/docs/storage.html.in +++ b/docs/storage.html.in @@ -310,7 +310,7 @@ on the size and placement of volumes. The 'free extents' information will detail the regions which are available for creating new volumes. A volume cannot span across 2 different free extents. - It will default to using <code>msdos</code> as the pool source format. + It will default to using <code>dos</code> as the pool source format. <h3>Example pool input</h3> -- 2.17.1

2 3

[libvirt] [PATCH] qemuDomainAttachNetDevice: use only one virErrorPtr variable
by Ján Tomko 30 Aug '18

30 Aug '18

Commit f7b5566 added 'save_error' even though the function already has 'originalError' used in the 'try_remove' section. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/qemu/qemu_hotplug.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 4f290b5648..a30cb1f1a0 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1205,7 +1205,6 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, bool charDevPlugged = false; bool netdevPlugged = false; char *netdev_name; - virErrorPtr save_error = NULL; /* preallocate new slot for device */ if (VIR_REALLOC_N(vm->def->nets, vm->def->nnets + 1) < 0) @@ -1487,9 +1486,9 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, qemuDomainReleaseDeviceAddress(vm, &net->info, NULL); if (iface_connected) { - virErrorPreserveLast(&save_error); + virErrorPreserveLast(&originalError); virDomainConfNWFilterTeardown(net); - virErrorRestore(&save_error); + virErrorRestore(&originalError); if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_DIRECT) { ignore_value(virNetDevMacVLanDeleteWithVPortProfile( -- 2.16.4

2 1

[libvirt] [PATCH] virDomainNetDefCheckABIStability: Check for MTU change too
by Michal Privoznik 30 Aug '18

30 Aug '18

https://bugzilla.redhat.com/show_bug.cgi?id=1623157 Changing MTU on a running guest is not possible and trying to do so made us face many problems. That's why we forbid it in 5f44d7e357f61f7. However, there is still one possible path where users can sneak in change: migration XML. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/domain_conf.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 38cac07913..59ca9f5888 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -21901,6 +21901,13 @@ virDomainNetDefCheckABIStability(virDomainNetDefPtr src, return false; } + if (src->mtu != dst->mtu) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target network card MTU %d does not match source %d"), + dst->mtu, src->mtu); + return false; + } + if (src->virtio && dst->virtio && !virDomainVirtioOptionsCheckABIStability(src->virtio, dst->virtio)) return false; -- 2.16.4

2 1

[libvirt] [PATCH] qemuDomainSnapshotCreateActiveExternal: Remove memory snapshot on failure less frequently
by Michal Privoznik 30 Aug '18

30 Aug '18

https://bugzilla.redhat.com/show_bug.cgi?id=1589115 When creating a memory snapshot the domain is suspended and qemu is told to dump memory into the desired file. After that we set a flag so that the file is not left behind if a failure occurs at some later point (e.g. when creating disk snapshot fails). However, the way we currently handle the memory snapshot file is way too aggressive. For instance, if resuming domain vCPUs fails after all snapshots were done successfully, we still remove the memory snapshot (even though we leave disk snapshot be). Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a0f7c71675..2eae3dd49d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15248,6 +15248,7 @@ qemuDomainSnapshotCreateActiveExternal(virQEMUDriverPtr driver, virObjectEventStateQueue(driver->domainEventState, event); } + memory_unlink = false; ret = 0; cleanup: -- 2.16.4

2 3

[libvirt] Entering freeze for libvirt-4.7.0
by Daniel Veillard 30 Aug '18

30 Aug '18

Sorry I forgot to announce it but we are the last week of the month, so it's about time, I tagged RC1 in git and pushed the signed tarball and rpms to the usual place earlier today: ftp://libvirt.org/libvirt/ this seems to work well in my limited testing but as usual we need more review and check on other platforms or OSes before the release. In general https://ci.centos.org/view/libvirt/ is green except for glib bindings and for the master build (weird!) I will likely push the rc2 Thursday morning, but I mwill be travelling at the end of the week so that may depends on conditions, and hopefully the release during this w.e. thanks for giving it a try ! Daniel -- Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/ veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

2 3

[libvirt] [PATCH for v4.7.0] virDomainDefCompatibleDevice: Relax alias change check
by Michal Privoznik 29 Aug '18

29 Aug '18

https://bugzilla.redhat.com/show_bug.cgi?id=1621910 When introducing this check back in 4ad54a417a1 my mindset was that if an element is missing in update XML then user is requesting for removal of the corresponding setting. For instance, if <bandwidth/> is not present in update XML any QoS previously set on <interface/> is cleared out. Well this assumption is correct but only to some extent. Turns out, we have some lazy users who when updating path to ISO image construct very minimalistic disk XML and pass it to device update API. Such XML is lacking a lot of information, and alias is one of them. This triggers error in virDomainDefCompatibleDevice() because we think that user is requesting to remove the alias. Well, they are not. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/domain_conf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 38cac07913..603a4ad652 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -28785,9 +28785,9 @@ virDomainDefCompatibleDevice(virDomainDefPtr def, if (action == VIR_DOMAIN_DEVICE_ACTION_UPDATE && live && - ((!!data.newInfo != !!data.oldInfo) || - (data.newInfo && data.oldInfo && - STRNEQ_NULLABLE(data.newInfo->alias, data.oldInfo->alias)))) { + (data.newInfo && data.oldInfo && + data.newInfo->alias && data.oldInfo->alias && + STRNEQ(data.newInfo->alias, data.oldInfo->alias))) { virReportError(VIR_ERR_OPERATION_DENIED, "%s", _("changing device alias is not allowed")); return -1; -- 2.16.4

2 1

[libvirt] [PATCH] virDomainDetachDeviceFlags: Clarify update semantics
by Michal Privoznik 29 Aug '18

29 Aug '18

https://bugzilla.redhat.com/show_bug.cgi?id=1621910 When users want to update a path to a CDROM they tend to construct a very minimal XML and feed the API with it. This is not a good practice as it breaks the assumptions the API is built on. Most notably, leaving an element out should be treated as a request for removal of the corresponding setting. Just like leaving out <bandwidth/> clears out any QoS previously set. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/libvirt-domain.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index ef460277f7..bd8ca6eff2 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -8318,6 +8318,14 @@ virDomainDetachDeviceFlags(virDomainPtr domain, * media, altering the graphics configuration such as password, * reconfiguring the NIC device backend connectivity, etc. * + * The supplied XML description of the device should contain all + * the information that are found in corresponding domain XML. + * Leaving out any piece of information is treated as request for + * its removal, which may be denied. For instance, when users + * want to change CDROM media only for live XML, they must + * provide live disk XML as found in corresponding live domain + * XML with only the disk path changed. + * * Returns 0 in case of success, -1 in case of failure. */ int -- 2.16.4

3 3

[libvirt] [PATCH] qemu: domain: validate memory access during validate domain config
by Luyao Huang 29 Aug '18

29 Aug '18

commit 6534b3c4 try to raise an error when there is no numa nodes but set access='shared' in domain config. In that commit, we add a memory access validate function for memory device, but this check is not related to memory device and won't work if there is no memory device in guest xml. Move the memory access related check in the domain config validate function, and simplify the unit test xml to avoid other error. https://bugzilla.redhat.com/show_bug.cgi?id=1448149#c14 Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/qemu/qemu_domain.c | 55 +++++++++++----------- tests/qemuxml2argvdata/hugepages-memaccess3.xml | 62 +------------------------ tests/qemuxml2argvtest.c | 6 +-- 3 files changed, 32 insertions(+), 91 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index f570081..f0c461b 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3888,6 +3888,29 @@ qemuDomainDefValidateFeatures(const virDomainDef *def, static int +qemuDomainDefValidateMemory(const virDomainDef *def) +{ + const long system_page_size = virGetSystemPageSizeKB(); + + /* We can't guarantee any other mem.access + * if no guest NUMA nodes are defined. */ + if (def->mem.nhugepages != 0 && + def->mem.hugepages[0].size != system_page_size && + virDomainNumaGetNodeCount(def->numa) == 0 && + def->mem.access != VIR_DOMAIN_MEMORY_ACCESS_DEFAULT && + def->mem.access != VIR_DOMAIN_MEMORY_ACCESS_PRIVATE) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("memory access mode '%s' not supported " + "without guest numa node"), + virDomainMemoryAccessTypeToString(def->mem.access)); + return -1; + } + + return 0; +} + + +static int qemuDomainDefValidate(const virDomainDef *def, virCapsPtr caps ATTRIBUTE_UNUSED, void *opaque) @@ -4009,6 +4032,9 @@ qemuDomainDefValidate(const virDomainDef *def, if (qemuDomainDefValidateFeatures(def, qemuCaps) < 0) goto cleanup; + if (qemuDomainDefValidateMemory(def) < 0) + goto cleanup; + ret = 0; cleanup: @@ -5531,30 +5557,6 @@ qemuDomainDeviceDefValidateController(const virDomainControllerDef *controller, static int -qemuDomainDeviceDefValidateMemory(const virDomainMemoryDef *memory ATTRIBUTE_UNUSED, - const virDomainDef *def) -{ - const long system_page_size = virGetSystemPageSizeKB(); - - /* We can't guarantee any other mem.access - * if no guest NUMA nodes are defined. */ - if (def->mem.nhugepages != 0 && - def->mem.hugepages[0].size != system_page_size && - virDomainNumaGetNodeCount(def->numa) == 0 && - def->mem.access != VIR_DOMAIN_MEMORY_ACCESS_DEFAULT && - def->mem.access != VIR_DOMAIN_MEMORY_ACCESS_PRIVATE) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("memory access mode '%s' not supported " - "without guest numa node"), - virDomainMemoryAccessTypeToString(def->mem.access)); - return -1; - } - - return 0; -} - - -static int qemuDomainDeviceDefValidateVsock(const virDomainVsockDef *vsock, const virDomainDef *def, virQEMUCapsPtr qemuCaps) @@ -5712,10 +5714,6 @@ qemuDomainDeviceDefValidate(const virDomainDeviceDef *dev, qemuCaps); break; - case VIR_DOMAIN_DEVICE_MEMORY: - ret = qemuDomainDeviceDefValidateMemory(dev->data.memory, def); - break; - case VIR_DOMAIN_DEVICE_VSOCK: ret = qemuDomainDeviceDefValidateVsock(dev->data.vsock, def, qemuCaps); break; @@ -5737,6 +5735,7 @@ qemuDomainDeviceDefValidate(const virDomainDeviceDef *dev, case VIR_DOMAIN_DEVICE_MEMBALLOON: case VIR_DOMAIN_DEVICE_NVRAM: case VIR_DOMAIN_DEVICE_SHMEM: + case VIR_DOMAIN_DEVICE_MEMORY: case VIR_DOMAIN_DEVICE_PANIC: case VIR_DOMAIN_DEVICE_IOMMU: case VIR_DOMAIN_DEVICE_NONE: diff --git a/tests/qemuxml2argvdata/hugepages-memaccess3.xml b/tests/qemuxml2argvdata/hugepages-memaccess3.xml index 8ec38d8..43c3ec6 100644 --- a/tests/qemuxml2argvdata/hugepages-memaccess3.xml +++ b/tests/qemuxml2argvdata/hugepages-memaccess3.xml @@ -12,76 +12,18 @@ <type arch='x86_64' machine='pc-i440fx-2.9'>hvm</type> <bootmenu enable='yes'/> </os> - <features> - <acpi/> - <apic/> - <pae/> - </features> <cpu mode='host-model' check='partial'> <model fallback='allow'/> </cpu> - <clock offset='variable' adjustment='500' basis='utc'> - <timer name='rtc' tickpolicy='catchup'/> - <timer name='pit' tickpolicy='delay'/> - <timer name='hpet' present='no'/> - </clock> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> - <pm> - <suspend-to-mem enabled='yes'/> - <suspend-to-disk enabled='yes'/> - </pm> <devices> <emulator>/usr/bin/qemu-system-x86_64</emulator> - <disk type='file' device='disk'> - <driver name='qemu' type='qcow2' discard='unmap'/> - <source file='/var/lib/libvirt/images/fedora.qcow2'/> - <target dev='sda' bus='scsi'/> - <boot order='1'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <controller type='usb' index='0' model='piix3-uhci'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> - </controller> + <controller type='usb' index='0'/> <controller type='pci' index='0' model='pci-root'/> - <controller type='scsi' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> - </controller> - <controller type='virtio-serial' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> - </controller> - <controller type='ide' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> - </controller> - <serial type='pty'> - <target type='isa-serial' port='1'> - <model name='isa-serial'/> - </target> - </serial> - <console type='pty'> - <target type='serial' port='1'/> - </console> - <channel type='unix'> - <target type='virtio' name='org.qemu.guest_agent.0'/> - <address type='virtio-serial' controller='0' bus='0' port='1'/> - </channel> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> - <graphics type='vnc' port='-1' autoport='yes' listen='0.0.0.0'> - <listen type='address' address='0.0.0.0'/> - </graphics> - <graphics type='spice'> - <listen type='socket' socket='/tmp/spice.sock'/> - </graphics> - <video> - <model type='virtio' heads='1' primary='yes'> - <acceleration accel3d='yes'/> - </model> - <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> - </video> - <memballoon model='virtio'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> - </memballoon> + <memballoon model='none'/> </devices> </domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 0e9eef6..6b55316 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1023,9 +1023,9 @@ mymain(void) DO_TEST("hugepages-memaccess2", QEMU_CAPS_OBJECT_MEMORY_FILE, QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_NUMA); - DO_TEST_FAILURE("hugepages-memaccess3", - QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_OBJECT_MEMORY_FILE, - QEMU_CAPS_VIRTIO_SCSI); + DO_TEST_PARSE_ERROR("hugepages-memaccess3", + QEMU_CAPS_OBJECT_MEMORY_RAM, + QEMU_CAPS_OBJECT_MEMORY_FILE); DO_TEST_CAPS_LATEST("hugepages-nvdimm"); DO_TEST("nosharepages", QEMU_CAPS_MEM_MERGE); DO_TEST("disk-cdrom", NONE); -- 1.8.3.1

3 3

[libvirt] [PATCH -v2 0/1] esx: Fix get/set vcpus
by Marcos Paulo de Souza 29 Aug '18

29 Aug '18

Hi guys, this is the second version of the patch, the first one can be found here[1]. This version addresses the comments from Matthias Bolte, making the change simpler and cleaner. Let me know if there are other details that needs to change. [1]: https://www.redhat.com/archives/libvir-list/2018-August/msg00532.html Marcos Paulo de Souza (1): esx: Make esxDomainGetVcpusFlags check flags src/esx/esx_driver.c | 52 ++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 24 deletions(-) -- 2.17.1

2 3

[libvirt] [PATCH] vsh-table: Fix broken build on centos and rhel
by Simon Kobyda 29 Aug '18

29 Aug '18

The reason of broken build was that centos and rhel use older version of glibc. These versions of glibc on these platforms cannot work with newer unicodes, therefore functions iswprint() and wcwidth() failed. So I replaced them with older unicode characters. Signed-off-by: Simon Kobyda <skobyda(a)redhat.com> --- tests/vshtabletest.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/vshtabletest.c b/tests/vshtabletest.c index 1b07c37c56..9e9c045226 100644 --- a/tests/vshtabletest.c +++ b/tests/vshtabletest.c @@ -123,7 +123,7 @@ testUnicode(const void *opaque ATTRIBUTE_UNUSED) " Id 名稱 государство \n" "-----------------------------------------\n" " 1 fedora28 running \n" -" 2 🙊🙉🙈rhel7.5🙆🙆🙅 running \n"; +" 2 つへソrhel7.5つへソ running \n"; vshTablePtr table; table = vshTableNew("Id", "名稱", "государство", NULL); @@ -131,7 +131,7 @@ testUnicode(const void *opaque ATTRIBUTE_UNUSED) goto cleanup; vshTableRowAppend(table, "1", "fedora28", "running", NULL); - vshTableRowAppend(table, "2", "🙊🙉🙈rhel7.5🙆🙆🙅", "running", + vshTableRowAppend(table, "2", "つへソrhel7.5つへソ", "running", NULL); act = vshTablePrintToString(table, true); -- 2.17.1

4 3

[libvirt] [PATCH] tests: Properly reset mocked CPU model
by Jiri Denemark 29 Aug '18

29 Aug '18

When switching the host architecture to something for which we do not have any host CPU model defined, the mocked virQEMUCapsProbeHostCPUForEmulator would just return the previous CPU model resulting in strange combinations, such as "core2duo" host CPU model in QEMU capabilities for "AArch64" architecture. It currently doesn't break any test case, but we should fix it anyway to avoid future surprises which would be quite hard to debug. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- tests/testutilsqemu.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 8438613f28..52ea6bf655 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -575,6 +575,8 @@ qemuTestSetHostCPU(virCapsPtr caps, setenv("VIR_TEST_MOCK_FAKE_HOST_CPU", cpu->model, 1); else unsetenv("VIR_TEST_MOCK_FAKE_HOST_CPU"); + } else { + unsetenv("VIR_TEST_MOCK_FAKE_HOST_CPU"); } caps->host.cpu = cpu; } -- 2.18.0

2 1

[libvirt] clean/simple Q35 support in libvirt+QEMU for guest OSes that don't support virtio-1.0
by Laine Stump 29 Aug '18

29 Aug '18

(Several of us started an offline discussion on this topic, and it quickly became complicated, so we decided it should continue upstream. Here is a synopsis of the discussion so far (as *I've* interpreted it, so corrections are welcome and apologies in advance for anything I got wrong!) Some of the things are stated here as givens, but feel free to rip them apart.) Summary of the problem: 1) We want to persuade libvirt+QEMU users to move away from the i440fx machinetype in favor of Q35. (NB: Someday this *might* lead to the ability to deprecate and even remove the 440fx machinetype, but even if that were to happen, it would be a *very long* time from now, so this discussion is *not* about that!) 2) When Q35 machinetype is used, libvirt assigns virtio devices to a slot on a PCI Express controller (because why have modern PCIe controllers/slots available but force everything onto clunky old legacy controllers?). 3) When a virtio device is plugged into an Express controller, QEMU disables the device's IO port space, and it is put into "modern-only" mode (this is done to avoid a rapid exhaustion of limited IO port space). 4) modern-only virtio devices won't work with a legacy (virtio-0.9-only) guest driver, because virtio-0.9 requires IO port space. 5) Some guest OSes that we still want to support (and which would otherwise work okay on a Q35 virtual machine) have virtio drivers too old to support virtio-1.0 (CentOS6 and RHEL6 are examples of such OSes), but due to the chain of reasons listed above, the "standard" config for a Q35 guest generated by libvirt doesn't support virtio-0.9, hence doesn't support these guest OSes. And here's a list of possible solutions to this problem (note that "consumers" means management applications such as OpenStack, oVirt, virt-manager, virt-install, gnome-boxes, etc. In all cases, it's assumed that the consumer's decision on the action to take will be based on information from libosinfo). For completeness, I've included even the possibilities that have been rejected, along with a brief synopsis of (at least part of) the reason for rejection: (1) Add some way libvirt consumers can ask libvirt to place virtio devices on a legacy pci slot instead of pcie when the machinetype is q35 (qemu sets virtio devices in legacy PCI slots to transitional mode, so io port space is enabled and virtio-0.0 drivers will work). This has been proposed on libvir-list, but rejected. Here is the most elquently stated reasoning for the rejection I could find (with thanks to Dan Berrange): The domain XML is a way to express the configuration of the guest virtual machine. What we're talking about here is a policy tunable for an internal libvirt QEMU driver algorithm, as so does not belong anywhere in the domain XML. (2) Add full-blown pci enumeration support to all libvirt consumers (i.e. they will need to build a model of the PCI bus topology of each guest, and keep track of which addresses are in use). They can then manually place virtio devices on legacy pci slots (again, triggering transitional mode) when the intended guest OS doesn't support virtio-0.9. (This is seen as requiring too much duplicated effort for development and support/maintenance, since up until now libvirt has been the single point of action for PCI address assignment (well, QEMU can do it too, but for > 10 years libvirt has *always* provided full PCI addresses for all devices) (3) Add virtio-1.0 support to all guest OSes. If this is done, existing libvirt configs will work. (Aside from the difficulty of backporting, and the fact that there are going to be some OSes that don't get it *at all*, there will always be older releases that haven't gotten the backport. So this isn't a complete solution). (4) Consumers can continue using the 440fx machinetype for guest OSes that don't support virtio-0.9 (This would work, but perpetuates use of the 440fx machinetype, and all for just this one reason (at least in the case of CentOS6/RHEL6, which otherwise work just fine with Q35)). (5) Introduce virtio-0.9, virtio-1.0 models in libvirt which are explicitly legacy-only and modern-only. QEMU doesn't need to change, as libvirt can simply set the right params on existing QEMU models to force the behavior. (NB: it's unclear to me whether virtio-0.9 simply won't work without forcing the device to be on a legacy PCI slot, or if that's just "a very bad idea" because it will mean that the device uses up extra io port space) The offline discussion had basically come to the point of saying that options (4) and (5) were the only reasonable ones, with option (5) being preferred (I think). As a starter for continuing the discussion, it seems to me that for option (5): a) we don't really need the virtio-1.0 model, since that's what you currently get anyway when you ask for "virtio" on Q35 (and on 440fx, "virtio" gives you transitional, which works for everybody). b) Rather than a "legacy-only" model for virtio-0.9, it would be more useful to have "transitional". This way the config would work for older OSes that don't support virtio-1.0, and when/if the OS was upgraded such that it supported virtio-1.0, that would be automatically used without needing to change the config. c) Even if it's possible to force a device on an Express slot into transitional mode, this is extremely wasteful of io port space, so libvirt should consider virtio-0.9 devices to be legacy PCI, and thus plug them into legacy PCI slots. And once we're doing this, it's unnecessary to add any extra option to the qemu commandline to force legacy support (i.e. transitional mode), as that is what QEMU already does when the device is connected to a legacy PCI slot. So making the naive assumption that we agree on implementing option (5) and there are no objections to my points a-c (Hah! As if!), how does this sound as a plan: A) libosinfo starts telling consumers that the preferred virtio device model for the relevant OSes is "virtio-0.9", and leaves the recommendation for other OSes as "virtio". B) libvirt adds a "virtio-0.9" model for all virtio devices that actually have virtio-0.9 support (a couple of devices never existed prior to virtio-1.0 (rng and ???) so virtio-0.9 would be nonsensical for them). C) inside libvirt, the implementation of the "virtio-0.9" model is identical to "virtio", except that the VIR_PCI_CONNECT_TYPE flags for these devices contain VIR_PCI_CONNECT_TYPE_PCI rather than VIR_PCI_CONNECT_TYPE_PCIE, resulting in those devices being assigned to a legacy PCI slot, and thus they would be transitional mode by default. (If there is disagreement about putting these devices on a legacy PCI slot, then (C) could be changed to add "disable-legacy=off" to the qemu commandline. But again, even if that works, it would use up 4k of IO port space for each device, causing it to rapidly run out, and I don't think that should be the default mode of operation).

7 25

[libvirt] [PATCH v2 0/8] storage: Resolve some locking issues
by Michal Privoznik 29 Aug '18

29 Aug '18

Technically, this is a v2 of: https://www.redhat.com/archives/libvir-list/2018-August/msg00624.html but majority of the patches are new. The review of the patch from above made me look into storage pool locking more and I have found some issues. For best view of the patches (esp. 4/8 use --histogram option). Michal Prívozník (8): storage_backend_rbd: Drop ATTRIBUTE_UNUSED for arguments that are used virstorageobj: Move virStoragePoolObjIsDuplicate up virstorageobj: Check for duplicates from virStoragePoolObjAssignDef virstorageobj: Move virStoragePoolObjSourceFindDuplicate and friends up virStoragePoolObjSourceFindDuplicate: Drop @conn argument virstorageobj: Check for source duplicates from virStoragePoolObjAssignDef storage_driver: Mark volume as 'in use' for some operations storage_driver: Release pool object lock for some long running jobs src/conf/virstorageobj.c | 937 +++++++++++++++-------------- src/conf/virstorageobj.h | 13 +- src/libvirt_private.syms | 2 - src/storage/storage_backend_iscsi_direct.c | 6 +- src/storage/storage_backend_rbd.c | 12 +- src/storage/storage_driver.c | 56 +- src/test/test_driver.c | 12 +- 7 files changed, 529 insertions(+), 509 deletions(-) -- 2.16.4

2 19

[libvirt] [PATCH v4 00/12] PCI passthrough support on s390
by Yi Min Zhao 29 Aug '18

29 Aug '18

Abstract ======== The PCI representation in QEMU has recently been extended for S390 allowing configuration of zPCI attributes like uid (user-defined identifier) and fid (PCI function identifier). The details can be found here: https://lists.gnu.org/archive/html/qemu-devel/2016-06/msg07262.html To support the new zPCI feature of the S390 platform, two new XML attributes, @uid and @fid, are introduced for device addresses of type 'pci', i.e.: <hostdev mode='subsystem' type='pci'> <driver name='vfio'/> <source> <address domain='0x0001' bus='0x00' slot='0x00' function='0x0'/> </source> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0' uid='0x0003' fid='0x00000027'/> </hostdev> uid and fid are optional attributes. If they are defined by the user, unique values within the guest domain must be used. If they are not specified and the architecture requires them, they are automatically generated with non-conflicting values. Current implementation is the most seamless one for the user as it unites the address specific data of a PCI device on one XML element. It could accommodate both specifying our special parameters (uid and fid) and re-using standard statements (domain, bus, slot and function) for PCI devices. User can still specify bus/slot/function for the virtualized PCI devices in the XML. Thus uid/fid act as an extension to the PCI address and are stored in a new structure 'virZPCIDeviceAddress' which is a member of common PCI Address structure. Additionally, two hashtables are used for assignment and reservation of uid/fid. In support of extending the PCI address, a new PCI address extension flag is introduced. This extension flag allows is not only dedicated for the S390 platform but also other architectures needing certain extensions to PCI address space. Code Base ========= commit in master: 3b89e1f962 docs: api_extension: Don't encourage other tools than git Change Log ========== v3->v4: 1. Update docs. 2. Format code style. 3. Optimize zPCI support check. 4. Move the check of zPCI defined in xml but unsupported by Qemu to qemuDomainDeviceDefValidate(). 5. Change zpci address member of PCI address struct from pointer to instance. 6. Modify zpci address definition principle. Currently the user must either define both of uid and fid or not. v2->v3: 1. Revise code style. 2. Update test cases. 3. Introduce qemuDomainCollectPCIAddressExtension() to collect PCI extension addresses. 4. Introduce virDeviceInfoPCIAddressExtensionPresent() to check if zPCI address exists. 5. Optimize zPCI address check logic. 6. Optimize passed parameters of zPCI addr alloc/release/reserve functions. 7. Report enum range error in qemuDomainDeviceSupportZPCI(). 8. Update commit messages. v1->v2: 1. Separate test commit and merge testcases into corresponding commits that introduce the functionalities firstly. 2. Spare some checks for zpci device. 3. Add vsock and controller support. 4. Add uin32 type schema. 5. Rename zpciuid and zpcifid to zpci_uid and zpci_fid. 6. Always return multibus support on S390. Yi Min Zhao (12): conf: Add definitions for 'uid' and 'fid' PCI address attributes qemu: Introduce zPCI capability conf: Introduce a new PCI address extension flag qemu: Enable PCI multi bus for S390 guests qemu: Auto add pci-root for s390/s390x guests conf: Introduce address caching for PCI extensions conf: Introduce parser, formatter for uid and fid conf: Allocate/release 'uid' and 'fid' in PCI address qemu: Generate and use zPCI device in QEMU command line qemu: Add hotpluging support for PCI devices on S390 guests docs: Add 'uid' and 'fid' information news: Update news for PCI address extension attributes cfg.mk | 1 + docs/formatdomain.html.in | 9 +- docs/news.xml | 10 + docs/schemas/basictypes.rng | 23 ++ docs/schemas/domaincommon.rng | 1 + src/conf/device_conf.c | 62 ++++ src/conf/device_conf.h | 14 + src/conf/domain_addr.c | 331 +++++++++++++++++++++ src/conf/domain_addr.h | 29 ++ src/conf/domain_conf.c | 6 + src/libvirt_private.syms | 4 + src/qemu/qemu_capabilities.c | 6 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 95 ++++++ src/qemu/qemu_command.h | 2 + src/qemu/qemu_domain.c | 27 ++ src/qemu/qemu_domain_address.c | 205 ++++++++++++- src/qemu/qemu_hotplug.c | 151 +++++++++- src/util/virpci.h | 11 + tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 + tests/qemuxml2argvdata/disk-virtio-s390-zpci.args | 26 ++ tests/qemuxml2argvdata/disk-virtio-s390-zpci.xml | 17 ++ .../hostdev-vfio-zpci-autogenerate.args | 25 ++ .../hostdev-vfio-zpci-autogenerate.xml | 18 ++ .../hostdev-vfio-zpci-boundaries.args | 29 ++ .../hostdev-vfio-zpci-boundaries.xml | 26 ++ .../hostdev-vfio-zpci-multidomain-many.args | 39 +++ .../hostdev-vfio-zpci-multidomain-many.xml | 67 +++++ tests/qemuxml2argvdata/hostdev-vfio-zpci.args | 25 ++ tests/qemuxml2argvdata/hostdev-vfio-zpci.xml | 19 ++ tests/qemuxml2argvtest.c | 20 ++ tests/qemuxml2xmloutdata/disk-virtio-s390-zpci.xml | 29 ++ .../hostdev-vfio-zpci-autogenerate.xml | 30 ++ .../hostdev-vfio-zpci-boundaries.xml | 42 +++ .../hostdev-vfio-zpci-multidomain-many.xml | 79 +++++ tests/qemuxml2xmloutdata/hostdev-vfio-zpci.xml | 30 ++ tests/qemuxml2xmltest.c | 17 ++ 42 files changed, 1518 insertions(+), 14 deletions(-) create mode 100644 tests/qemuxml2argvdata/disk-virtio-s390-zpci.args create mode 100644 tests/qemuxml2argvdata/disk-virtio-s390-zpci.xml create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.xml create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.xml create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.xml create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci.args create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci.xml create mode 100644 tests/qemuxml2xmloutdata/disk-virtio-s390-zpci.xml create mode 100644 tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate.xml create mode 100644 tests/qemuxml2xmloutdata/hostdev-vfio-zpci-boundaries.xml create mode 100644 tests/qemuxml2xmloutdata/hostdev-vfio-zpci-multidomain-many.xml create mode 100644 tests/qemuxml2xmloutdata/hostdev-vfio-zpci.xml -- Yi Min

3 18

[libvirt] [PATCH] virDomainObjListAddLocked: fix double free
by Marc Hartmayer 29 Aug '18

29 Aug '18

If @vm has flagged as "to be removed" virDomainObjListFindByNameLocked returns NULL (although the definition actually exists). Therefore, the possibility exits that "virHashAddEntry" will raise the error "Duplicate key" => virDomainObjListAddObjLocked fails => virDomainObjEndAPI(&vm) is called and this leads to a freeing of @def since @def is already assigned to vm->def. But actually this leads to a double free since the common usage pattern is that the caller of virDomainObjListAdd(Locked) is responsible for freeing @def in case of an error. Let's fix this by setting vm->def to NULL in case of an error. Backtrace: ➤ bt #0 virFree (ptrptr=0x7575757575757575) #1 0x000003ffb5b25b3e in virDomainResourceDefFree #2 0x000003ffb5b37c34 in virDomainDefFree #3 0x000003ff9123f734 in qemuDomainDefineXMLFlags #4 0x000003ff9123f7f4 in qemuDomainDefineXML #5 0x000003ffb5cd2c84 in virDomainDefineXML #6 0x000000011745aa82 in remoteDispatchDomainDefineXML ... Reviewed-by: Bjoern Walk <bwalk(a)linux.ibm.com> Signed-off-by: Marc Hartmayer <mhartmay(a)linux.ibm.com> --- src/conf/virdomainobjlist.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/conf/virdomainobjlist.c b/src/conf/virdomainobjlist.c index 52171594f34f..805fe9440afe 100644 --- a/src/conf/virdomainobjlist.c +++ b/src/conf/virdomainobjlist.c @@ -329,8 +329,10 @@ virDomainObjListAddLocked(virDomainObjListPtr doms, goto cleanup; vm->def = def; - if (virDomainObjListAddObjLocked(doms, vm) < 0) + if (virDomainObjListAddObjLocked(doms, vm) < 0) { + vm->def = NULL; goto error; + } } cleanup: return vm; -- 2.13.4

4 4

[libvirt] [PATCH v3] virsh: Don't break loop of domblkinfo for disks
by Han Han 28 Aug '18

28 Aug '18

Fix logical error in v2: https://www.redhat.com/archives/libvir-list/2018-August/msg01358.html https://bugzilla.redhat.com/show_bug.cgi?id=1619625 --all option is added to cmdDomblkinfo since commit 62c39193 allowing to show all block devices info. Reset error when empty source in case error breaks the loop of domblkinfo for disks. Signed-off-by: Han Han <hhan(a)redhat.com> --- tools/virsh-domain-monitor.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index b9b4f9739b..ecb98d4128 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -475,6 +475,7 @@ cmdDomblkinfo(vshControl *ctl, const vshCmd *cmd) int ndisks; size_t i; xmlNodePtr *disks = NULL; + char *source = NULL; char *target = NULL; char *protocol = NULL; @@ -505,18 +506,20 @@ cmdDomblkinfo(vshControl *ctl, const vshCmd *cmd) for (i = 0; i < ndisks; i++) { ctxt->node = disks[i]; + source = virXPathString("string(./source)", ctxt); protocol = virXPathString("string(./source/@protocol)", ctxt); target = virXPathString("string(./target/@dev)", ctxt); rc = virDomainGetBlockInfo(dom, target, &info, 0); if (rc < 0) { - /* If protocol is present that's an indication of a networked - * storage device which cannot provide statistics, so generate - * 0 based data and get the next disk. */ - if (protocol && !active && + /* For the case of empty cdrom, networked disk which cannot + * provide statistics, generate 0 based data and get the next + * disk. + */ + if (!source || (protocol && !active && virGetLastErrorCode() == VIR_ERR_INTERNAL_ERROR && - virGetLastErrorDomain() == VIR_FROM_STORAGE) { + virGetLastErrorDomain() == VIR_FROM_STORAGE)) { memset(&info, 0, sizeof(info)); vshResetLibvirtError(); } else { @@ -526,6 +529,7 @@ cmdDomblkinfo(vshControl *ctl, const vshCmd *cmd) cmdDomblkinfoPrint(ctl, &info, target, human, false); + VIR_FREE(source); VIR_FREE(target); VIR_FREE(protocol); } @@ -540,6 +544,7 @@ cmdDomblkinfo(vshControl *ctl, const vshCmd *cmd) cleanup: virshDomainFree(dom); + VIR_FREE(source); VIR_FREE(target); VIR_FREE(protocol); VIR_FREE(disks); -- 2.18.0

2 1

[libvirt] [PATCH] qemu: Introduce 16550A serial console model
by Andrea Bolognani 28 Aug '18

28 Aug '18

None of the existing models is suitable for use with RISC-V virt guests, and we don't want information about the serial console to be missing from the XML. The name is based on comments in qemu/hw/riscv/virt.c: RISC-V machine with 16550a UART and VirtIO MMIO and in qemu/hw/char/serial.c: QEMU 16550A UART emulation along with the output of dmesg in the guest: Serial: 8250/16550 driver, 4 ports, IRQ sharing disabled 10000000.uart: ttyS0 at MMIO 0x10000000 (irq = 13, base_baud= 230400) is a 16550A Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- CC'ing Rich mostly so that he can double-check the name choice is sensible. docs/formatdomain.html.in | 12 +++++----- docs/schemas/domaincommon.rng | 1 + src/conf/domain_conf.c | 1 + src/conf/domain_conf.h | 1 + src/qemu/qemu_command.c | 12 ++++++++++ src/qemu/qemu_domain.c | 27 ++++++++++++++++------- tests/qemuxml2xmloutdata/riscv64-virt.xml | 4 +++- 7 files changed, 44 insertions(+), 14 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 0cbf570a13..eb619a1656 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -7011,7 +7011,8 @@ qemu-kvm -net nic,model=? /dev/null is available) and <code>pci-serial</code> (usable whenever PCI support is available); since 3.10.0, <code>spapr-vio-serial</code> (usable with ppc64/pseries guests), - <code>system-serial</code> (usable with aarch64/virt guests) and + <code>system-serial</code> (usable with aarch64/virt and, + since 4.7.0, riscv/virt guests) and <code>sclp-serial</code> (usable with s390 and s390x guests) are available as well. @@ -7025,10 +7026,11 @@ qemu-kvm -net nic,model=? /dev/null target type); <code>pci-serial</code> (usable with the <code>pci-serial</code> target type); <code>spapr-vty</code> (usable with the <code>spapr-vio-serial</code> - target type); <code>pl011</code> (usable with the - <code>system-serial</code> target type); <code>sclpconsole</code> and - <code>sclplmconsole</code> (usable with the <code>sclp-serial</code> - target type). + target type); <code>pl011</code> and, + since 4.7.0, <code>16550a</code> (usable + with the <code>system-serial</code> target type); + <code>sclpconsole</code> and <code>sclplmconsole</code> (usable with + the <code>sclp-serial</code> target type). diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index f176538195..3796eb4b5e 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -3733,6 +3733,7 @@ <value>pci-serial</value> <value>spapr-vty</value> <value>pl011</value> + <value>16550a</value> <value>sclpconsole</value> <value>sclplmconsole</value> </choice> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index bde9fef914..8af59bb4bb 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -493,6 +493,7 @@ VIR_ENUM_IMPL(virDomainChrSerialTargetModel, "pl011", "sclpconsole", "sclplmconsole", + "16550a", ); VIR_ENUM_IMPL(virDomainChrDevice, VIR_DOMAIN_CHR_DEVICE_TYPE_LAST, diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index c0ad072db5..8a3673361a 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1133,6 +1133,7 @@ typedef enum { VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PL011, VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SCLPCONSOLE, VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SCLPLMCONSOLE, + VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_16550A, VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_LAST } virDomainChrSerialTargetModel; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index fd9e58fd5d..f63e35444e 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9149,6 +9149,7 @@ qemuChrSerialTargetModelToCaps(virDomainChrSerialTargetModel targetModel) return QEMU_CAPS_DEVICE_SCLPLMCONSOLE; case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PL011: return QEMU_CAPS_DEVICE_PL011; + case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_16550A: case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_NONE: case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_LAST: break; @@ -9189,6 +9190,16 @@ qemuChrIsPlatformDevice(const virDomainDef *def, } } + if (ARCH_IS_RISCV(def->os.arch)) { + + /* 16550a (used by riscv/virt guests) is a platform device */ + if (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL && + chr->targetType == VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SYSTEM && + chr->targetModel == VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_16550A) { + return true; + } + } + /* If we got all the way here and we're still stuck with the default * target type for a serial device, it means we have no clue what kind of * device we're talking about and we must treat it as a platform device. */ @@ -10579,6 +10590,7 @@ qemuBuildSerialChrDeviceStr(char **deviceStr, break; case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PL011: + case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_16550A: case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_NONE: case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_LAST: /* Except from _LAST, which is just a guard value and will never diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 886e3fbb72..1cc4cefbd1 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4183,6 +4183,7 @@ qemuDomainChrSerialTargetModelToTargetType(int targetModel) case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SPAPR_VTY: return VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SPAPR_VIO; case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PL011: + case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_16550A: return VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SYSTEM; case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SCLPCONSOLE: case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SCLPLMCONSOLE: @@ -4248,6 +4249,7 @@ qemuDomainChrTargetDefValidate(const virDomainChrDef *chr) case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PL011: case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SCLPCONSOLE: case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SCLPLMCONSOLE: + case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_16550A: expected = qemuDomainChrSerialTargetModelToTargetType(chr->targetModel); @@ -4298,18 +4300,23 @@ qemuDomainChrDefValidate(const virDomainChrDef *dev, if (dev->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL) { bool isCompatible = true; + if (dev->targetType == VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SYSTEM) { + if (dev->targetModel == VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PL011 && + !qemuDomainIsARMVirt(def)) { + isCompatible = false; + } + if (dev->targetModel == VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_16550A && + !qemuDomainIsRISCVVirt(def)) { + isCompatible = false; + } + } + if (!qemuDomainIsPSeries(def) && (dev->targetType == VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SPAPR_VIO || dev->targetModel == VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SPAPR_VTY)) { isCompatible = false; } - if (!qemuDomainIsARMVirt(def) && - (dev->targetType == VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SYSTEM || - dev->targetModel == VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PL011)) { - isCompatible = false; - } - if (!ARCH_IS_S390(def->os.arch) && (dev->targetType == VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SCLP || dev->targetModel == VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SCLPCONSOLE || @@ -6129,7 +6136,7 @@ qemuDomainChrDefPostParse(virDomainChrDefPtr chr, chr->targetType = VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_ISA; } else if (qemuDomainIsPSeries(def)) { chr->targetType = VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SPAPR_VIO; - } else if (qemuDomainIsARMVirt(def)) { + } else if (qemuDomainIsARMVirt(def) || qemuDomainIsRISCVVirt(def)) { chr->targetType = VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SYSTEM; } else if (ARCH_IS_S390(def->os.arch)) { chr->targetType = VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SCLP; @@ -6153,7 +6160,11 @@ qemuDomainChrDefPostParse(virDomainChrDefPtr chr, chr->targetModel = VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SPAPR_VTY; break; case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SYSTEM: - chr->targetModel = VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PL011; + if (qemuDomainIsARMVirt(def)) { + chr->targetModel = VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PL011; + } else if (qemuDomainIsRISCVVirt(def)) { + chr->targetModel = VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_16550A; + } break; case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SCLP: chr->targetModel = VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SCLPCONSOLE; diff --git a/tests/qemuxml2xmloutdata/riscv64-virt.xml b/tests/qemuxml2xmloutdata/riscv64-virt.xml index 822a59a604..daf9ca4978 100644 --- a/tests/qemuxml2xmloutdata/riscv64-virt.xml +++ b/tests/qemuxml2xmloutdata/riscv64-virt.xml @@ -24,7 +24,9 @@ </disk> <controller type='usb' index='0'/> <serial type='pty'> - <target port='0'/> + <target type='system-serial' port='0'> + <model name='16550a'/> + </target> </serial> <console type='pty'> <target type='serial' port='0'/> -- 2.17.1

3 4

[libvirt] [PATCH] qemu: Add more defaults for RISC-V virt guests
by Andrea Bolognani 28 Aug '18

28 Aug '18

We would have used virtio for networking anyway, but it's better to be explicit; for graphics, none of the existing models work right now but virtio is the only one which has a non-PCI variant, so it's as good a default as any. Spotted-by: Ján Tomko <jtomko(a)redhat.com> Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/qemu/qemu_domain.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 22c6d8f090..2410add9c2 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5840,6 +5840,10 @@ qemuDomainDefaultNetModel(const virDomainDef *def, return "lan9118"; } + /* virtio is a sensible default for RISC-V virt guests */ + if (qemuDomainIsRISCVVirt(def)) + return "virtio"; + /* In all other cases the model depends on the capabilities. If they were * not provided don't report any default. */ if (!qemuCaps) @@ -6326,7 +6330,9 @@ qemuDomainDeviceVideoDefPostParse(virDomainVideoDefPtr video, if (video->type == VIR_DOMAIN_VIDEO_TYPE_DEFAULT) { if (ARCH_IS_PPC64(def->os.arch)) video->type = VIR_DOMAIN_VIDEO_TYPE_VGA; - else if (qemuDomainIsARMVirt(def) || ARCH_IS_S390(def->os.arch)) + else if (qemuDomainIsARMVirt(def) || + qemuDomainIsRISCVVirt(def) || + ARCH_IS_S390(def->os.arch)) video->type = VIR_DOMAIN_VIDEO_TYPE_VIRTIO; else video->type = VIR_DOMAIN_VIDEO_TYPE_CIRRUS; -- 2.17.1

2 1

[libvirt] [PATCH] qemu: Don't use legacy USB for RISC-V guests
by Andrea Bolognani 28 Aug '18

28 Aug '18

The architecture is new enough that we don't need to concern ourselves with backwards compatibility in any capacity. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Requires https://www.redhat.com/archives/libvir-list/2018-June/msg01223.html to be applied (and test data to be refreshed in the process). src/qemu/qemu_command.c | 4 +++- tests/qemuxml2argvdata/riscv64-virt.args | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 88d698e262..bac7c938ab 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3046,7 +3046,8 @@ qemuBuildControllerDevCommandLine(virCommandPtr cmd, if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_USB && cont->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_DEFAULT && !qemuDomainIsQ35(def) && - !qemuDomainIsARMVirt(def)) { + !qemuDomainIsARMVirt(def) && + !qemuDomainIsRISCVVirt(def)) { /* An appropriate default USB controller model should already * have been selected in qemuDomainDeviceDefPostParse(); if @@ -3085,6 +3086,7 @@ qemuBuildControllerDevCommandLine(virCommandPtr cmd, if (usbcontroller == 0 && !qemuDomainIsQ35(def) && !qemuDomainIsARMVirt(def) && + !qemuDomainIsRISCVVirt(def) && !ARCH_IS_S390(def->os.arch)) { /* We haven't added any USB controller yet, but we haven't been asked * not to add one either. Add a legacy USB controller, unless we're diff --git a/tests/qemuxml2argvdata/riscv64-virt.args b/tests/qemuxml2argvdata/riscv64-virt.args index 0e103a6755..a373ff2b92 100644 --- a/tests/qemuxml2argvdata/riscv64-virt.args +++ b/tests/qemuxml2argvdata/riscv64-virt.args @@ -21,7 +21,6 @@ server,nowait \ -no-shutdown \ -kernel /var/lib/libvirt/images/bbl \ -append 'console=ttyS0 ro root=/dev/vda' \ --usb \ -drive file=/var/lib/libvirt/images/stage4-disk.img,format=raw,if=none,\ id=drive-virtio-disk0 \ -device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \ -- 2.17.1

2 1

[libvirt] [PATCH 0/3] tests: qemumonitorjson: Improve testing of block-related APIs
by Peter Krempa 28 Aug '18

28 Aug '18

Peter Krempa (3): tests: qemumonitorjson: Add test for 'block-stream' command tests: qemumonitorjson: Change values which would be omitted tests: qemumonitorjson: Add test case for 'blockdev-mirror' tests/qemumonitorjsontest.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) -- 2.16.2

2 4

[libvirt] [PATCH v2] docs: api_extension: Update paths in the examples
by Peter Krempa 28 Aug '18

28 Aug '18

Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- v2: - switched from '$SECTION' to '$MODULE' as a hint for the split files - changed 'domain.rng' to 'domaincommon.rng' which contains the defs - added the '$MODULE' to virsh path Note some still may be wrong as I did not chec all paths rigorously. docs/api_extension.html.in | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/api_extension.html.in b/docs/api_extension.html.in index 33d82e6ac6..d7fbbd6e90 100644 --- a/docs/api_extension.html.in +++ b/docs/api_extension.html.in @@ -96,7 +96,7 @@ schema and document the new elements or attributes: <code> - docs/schemas/domain.rng + docs/schemas/domaincommon.rng docs/formatdomain.html.in </code> @@ -106,7 +106,7 @@ libvirt library and call the new function: <code> - include/libvirt/libvirt.h.in + include/libvirt/libvirt-$MODULE.h.in src/libvirt_public.syms </code> @@ -137,7 +137,7 @@ The driver structs are defined in: - <code>src/driver.h</code> + <code>src/driver-$MODULE.h</code> To define the internal API, first typedef the driver function @@ -177,7 +177,7 @@ The public API calls are implemented in: - <code>src/libvirt.c</code> + <code>src/libvirt-$MODULE.c</code> <h2><a name='remoteproto'>Implementing the remote protocol</a></h2> @@ -219,9 +219,9 @@ <code> - daemon/remote_dispatch_args.h - daemon/remote_dispatch_prototypes.h - daemon/remote_dispatch_table.h + src/remote/remote_daemon_dispatch_stubs.h + src/remote/remote_daemon_dispatch.h + src/remote/remote_daemon_dispatch.c src/remote/remote_protocol.c src/remote/remote_protocol.h </code> @@ -233,7 +233,7 @@ method calls go in: - <code>src/remote/remote_internal.c</code> + <code>src/remote/remote_driver.c</code> Each remote method invocation does the following: @@ -256,7 +256,7 @@ The server side dispatchers are implemented in: - <code>daemon/remote.c</code> + <code>src/remote/daemon_dispatch.c</code> Again, this step uses the .h files generated by make rpcgen. @@ -309,7 +309,7 @@ <code> - tools/virsh.c + tools/virsh-$MODULE.c tools/virsh.pod </code> -- 2.16.2

2 1

[libvirt] [PATCH v5 0/3] vsh: Introduce new API for printing tables
by Simon Kobyda 28 Aug '18

28 Aug '18

Created new API for priting tables, mainly to solve alignment problems. Implemented these test to virsh list. In the future, API may be everywhere in virsh and virt-admin. Also wrote basic tests for the new API, and corrected tests in virshtest which are influenced by implementation of the API in virsh list. Changes in v5: - cleanup and merged code for calculating zero-width, nonprintable and combined character. - replaced virBufferAddStr with virBufferAddChar in some places - in tests moved code for setting correct locale - fixed few leaks and unitialized values Changes in v4: - fixed width calculation for zero-width, nonprintable and combined character. (pulled some code from linux-util) - added tests for cases mentioned above - changed usage of vshControl variables. From now on PrintToStdout calls PrintToString and then prints returned string to stdout Changes in v3: - changed encoding of 3/3 patch, otherwise it cannot be applied Changes in v2: - added tests - fixed alignment for unicode character which span more spaces - moved ncolumns check to vshTableRowAppend - changed arguments for functions vshTablePrint, vshTablePrintToStdout, vshTablePrintToString Simon Kobyda (3): vsh: Add API for printing tables. virsh: Implement new table API for virsh list vsh: Added tests tests/Makefile.am | 8 + tests/virshtest.c | 14 +- tests/vshtabletest.c | 377 +++++++++++++++++++++++++++++ tools/Makefile.am | 4 +- tools/virsh-domain-monitor.c | 43 ++-- tools/vsh-table.c | 449 +++++++++++++++++++++++++++++++++++ tools/vsh-table.h | 42 ++++ 7 files changed, 910 insertions(+), 27 deletions(-) create mode 100644 tests/vshtabletest.c create mode 100644 tools/vsh-table.c create mode 100644 tools/vsh-table.h -- 2.17.1

6 24

[libvirt] [PATCH v4] vl.c deprecate incorrect CPUs topology
by Igor Mammedov 28 Aug '18

28 Aug '18

-smp [cpus],sockets/cores/threads[,maxcpus] should describe topology so that total number of logical CPUs [sockets * cores * threads] would be equal to [maxcpus], however historically we didn't have such check in QEMU and it is possible to start VM with an invalid topology. Deprecate invalid options combination so we can make sure that the topology VM started with is always correct in the future. Users with an invalid sockets/cores/threads/maxcpus values should fix their CLI to make sure that [sockets * cores * threads] == [maxcpus] Signed-off-by: Igor Mammedov <imammedo(a)redhat.com> --- v4: - missed dot comment, fix it with s/./,/ (Andrew Jones <drjones(a)redhat.com>) v3: - more spelling fixes (Andrew Jones <drjones(a)redhat.com>) - place deprecation check after (sockets * cores * threads > max_cpus) check (Eduardo Habkost <ehabkost(a)redhat.com>) v2: - spelling&&co fixes (Andrew Jones <drjones(a)redhat.com>) --- qemu-deprecated.texi | 11 +++++++++++ vl.c | 7 +++++++ 2 files changed, 18 insertions(+) diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index 87212b6..094b4ca 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -159,6 +159,17 @@ The 'file' driver for drives is no longer appropriate for character or host devices and will only accept regular files (S_IFREG). The correct driver for these file types is 'host_cdrom' or 'host_device' as appropriate. +@subsection -smp X,[socket=a,core=b,thread=c],maxcpus=Y (since 3.1) + +CPU topology properties should describe whole machine topology including +possible CPUs, but historically it was possible to start QEMU with +an incorrect topology where + sockets * cores * threads >= X && X < maxcpus +which could lead to an incorrect topology enumeration by the guest. +Support for invalid topologies will be removed, the user must ensure +topologies described with -smp include all possible cpus, i.e. + sockets * cores * threads == maxcpus + @section QEMU Machine Protocol (QMP) commands @subsection block-dirty-bitmap-add "autoload" parameter (since 2.12.0) diff --git a/vl.c b/vl.c index 5ba06ad..7fd700e 100644 --- a/vl.c +++ b/vl.c @@ -1246,6 +1246,13 @@ static void smp_parse(QemuOpts *opts) exit(1); } + if (sockets * cores * threads != max_cpus) { + warn_report("Invalid CPU topology deprecated: " + "sockets (%u) * cores (%u) * threads (%u) " + "!= maxcpus (%u)", + sockets, cores, threads, max_cpus); + } + smp_cpus = cpus; smp_cores = cores; smp_threads = threads; -- 2.7.4

2 1

[libvirt] [PATCH v3] vl.c deprecate incorrect CPUs topology
by Igor Mammedov 28 Aug '18

28 Aug '18

-smp [cpus],sockets/cores/threads[,maxcpus] should describe topology so that total number of logical CPUs [sockets * cores * threads] would be equal to [maxcpus], however historically we didn't have such check in QEMU and it is possible to start VM with an invalid topology. Deprecate invalid options combination so we can make sure that the topology VM started with is always correct in the future. Users with an invalid sockets/cores/threads/maxcpus values should fix their CLI to make sure that [sockets * cores * threads] == [maxcpus] Signed-off-by: Igor Mammedov <imammedo(a)redhat.com> --- v3: - more spelling fixes (Andrew Jones <drjones(a)redhat.com>) - place deprecation check after (sockets * cores * threads > max_cpus) check (Eduardo Habkost <ehabkost(a)redhat.com>) v2: - spelling&&co fixes (Andrew Jones <drjones(a)redhat.com>) --- qemu-deprecated.texi | 11 +++++++++++ vl.c | 7 +++++++ 2 files changed, 18 insertions(+) diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index 87212b6..dc9d9ee 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -159,6 +159,17 @@ The 'file' driver for drives is no longer appropriate for character or host devices and will only accept regular files (S_IFREG). The correct driver for these file types is 'host_cdrom' or 'host_device' as appropriate. +@subsection -smp X,[socket=a,core=b,thread=c],maxcpus=Y (since 3.1) + +CPU topology properties should describe whole machine topology including +possible CPUs. but historically it was possible to start QEMU with +an incorrect topology where + sockets * cores * threads >= X && X < maxcpus +which could lead to an incorrect topology enumeration by the guest. +Support for invalid topologies will be removed, the user must ensure +topologies described with -smp include all possible cpus, i.e. + sockets * cores * threads == maxcpus + @section QEMU Machine Protocol (QMP) commands @subsection block-dirty-bitmap-add "autoload" parameter (since 2.12.0) diff --git a/vl.c b/vl.c index 5ba06ad..7fd700e 100644 --- a/vl.c +++ b/vl.c @@ -1246,6 +1246,13 @@ static void smp_parse(QemuOpts *opts) exit(1); } + if (sockets * cores * threads != max_cpus) { + warn_report("Invalid CPU topology deprecated: " + "sockets (%u) * cores (%u) * threads (%u) " + "!= maxcpus (%u)", + sockets, cores, threads, max_cpus); + } + smp_cpus = cpus; smp_cores = cores; smp_threads = threads; -- 2.7.4

2 1

[libvirt] [PATCH] qemuargv2xmltest: Fix caps loading in VPATH build
by Jiri Denemark 28 Aug '18

28 Aug '18

Broken by v4.7.0-rc1-9-g6700062fb0. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> Pushed as build-breaker fix. --- tests/qemuargv2xmltest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c index 966e75ef5f..7e250b7b9d 100644 --- a/tests/qemuargv2xmltest.c +++ b/tests/qemuargv2xmltest.c @@ -159,7 +159,7 @@ mymain(void) do { \ virQEMUCapsPtr qemuCaps; \ qemuCaps = qemuTestParseCapabilitiesArch(VIR_ARCH_X86_64, \ - "qemucapabilitiesdata/caps_2.12.0." arch ".xml"); \ + abs_srcdir "/qemucapabilitiesdata/caps_2.12.0." arch ".xml"); \ if (virFileCacheInsertData(driver.qemuCapsCache, \ "/usr/bin/qemu-system-" arch, \ qemuCaps) < 0) \ -- 2.18.0

1 0

[libvirt] question about job handling across migration protocol phases
by Jim Fehlig 28 Aug '18

28 Aug '18

While investigating a bug [1] found by Xen's osstest I realized I don't quite understand how to handle modify jobs (e.g. BeginJob/EndJob) on virDomainObj across the various phases of V3 migration protocol. E.g. on the src host the Begin, Perform, and Confirm phases are performed. Should a modify job start (BeginJob) in the Begin phase and stop (EndJob) in the Confirm phase? Or should each phase, if necessary, do BeginJob/EndJob? Same question for dst host. IMO the job should be held across the phases on each host, preventing any modifications during the overall migration process. Although I do worry about orphaned jobs, e.g. a missed EndJob caused by some obscure error in the migration machinery. Regards, Jim [1] https://lists.xenproject.org/archives/html/xen-devel/2018-08/msg01945.html

2 1

[libvirt] [PATCH] util: json: Allow converting a virTristate(Bool|Switch) into JSON
by Peter Krempa 28 Aug '18

28 Aug '18

Add a new modifier letter for virJSONValueObjectAddVArgs which will add a boolean value with our tristate semantics. The value is omitted when the _ABSENT value is used. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/util/virjson.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/util/virjson.c b/src/util/virjson.c index 29530dcb15..e45f1fab06 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -142,6 +142,8 @@ virJSONValueGetType(const virJSONValue *value) * * b: boolean value * B: boolean value, omitted if false + * T: boolean value specified by a virTristate(Bool|Switch) value, omitted on + * the _ABSENT value * * d: double precision floating point number * n: json null value @@ -266,12 +268,23 @@ virJSONValueObjectAddVArgs(virJSONValuePtr obj, } break; case 'B': + case 'T': case 'b': { int val = va_arg(args, int); if (!val && type == 'B') continue; + if (type == 'T') { + if (val == VIR_TRISTATE_SWITCH_ABSENT) + continue; + + if (val == VIR_TRISTATE_BOOL_NO) + val = 0; + else + val = 1; + } + rc = virJSONValueObjectAppendBoolean(obj, key, val); } break; -- 2.16.2

2 2

[libvirt] [PATCH] qemu: initialize variables in qemuParseCommandLine
by Ján Tomko 28 Aug '18

28 Aug '18

Commit 6700062 introduced a jump to error which skipped the initialization of def: qemu/qemu_parse_command.c:1870:9: error: variable 'def' is used uninitialized whenever 'if' condition is true [-Werror,-Wsometimes-uninitialized] if (!(qemuCaps = virQEMUCapsCacheLookup(capsCache, progargv[0]))) Initialize def to fix this warning and qemuCaps, to prevent a future error like this. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- Pushed as a build breaker fix. src/qemu/qemu_parse_command.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c index c0bf27f800..5b4a378a18 100644 --- a/src/qemu/qemu_parse_command.c +++ b/src/qemu/qemu_parse_command.c @@ -1838,7 +1838,7 @@ qemuParseCommandLine(virFileCachePtr capsCache, virDomainChrSourceDefPtr *monConfig, bool *monJSON) { - virDomainDefPtr def; + virDomainDefPtr def = NULL; size_t i; bool nographics = false; bool fullscreen = false; @@ -1852,7 +1852,7 @@ qemuParseCommandLine(virFileCachePtr capsCache, virDomainDiskDefPtr disk = NULL; const char *ceph_args = qemuFindEnv(progenv, "CEPH_ARGS"); bool have_sdl = false; - virQEMUCapsPtr qemuCaps; + virQEMUCapsPtr qemuCaps = NULL; if (pidfile) *pidfile = NULL; -- 2.16.4

1 0

[libvirt] [PATCH] conf: report enum errors in virDomainInputDefValidate
by Ján Tomko 28 Aug '18

28 Aug '18

Commit deb057f added a switch without a default case. Add it and call virReportEnumRangeError for _LAST too. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/conf/domain_conf.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index bde9fef914..8cb28a0880 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5760,7 +5760,6 @@ virDomainInputDefValidate(const virDomainInputDef *input) case VIR_DOMAIN_INPUT_TYPE_MOUSE: case VIR_DOMAIN_INPUT_TYPE_TABLET: case VIR_DOMAIN_INPUT_TYPE_KBD: - case VIR_DOMAIN_INPUT_TYPE_LAST: if (input->source.evdev) { virReportError(VIR_ERR_XML_ERROR, "%s", _("setting source evdev path only supported for " @@ -5771,6 +5770,11 @@ virDomainInputDefValidate(const virDomainInputDef *input) case VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH: break; + + case VIR_DOMAIN_INPUT_TYPE_LAST: + default: + virReportEnumRangeError(virDomainInputType, input->type); + return -1; } return 0; -- 2.16.4

2 1

[libvirt] [PATCH 0/4] tests: qemuxml2argv: More unused files cleanup
by Peter Krempa 28 Aug '18

28 Aug '18

Cleanup most output files unused by our test suite. See justification in individual commits. Peter Krempa (4): tests: qemuxml2argv: Remove 'args' files for tests expecting failure tests: qemuxml2argv: Make use of 'vram64' QXL device tests tests: qemuxml2argv: Remove the 'no-shutdown' test completely tests: qemuxml2argv: Remove 'args' for tests only used in xml2xmltest .../hugepages-default-1G-nodeset-2M.args | 25 ---------------- tests/qemuxml2argvdata/lease.args | 23 --------------- tests/qemuxml2argvdata/metadata.args | 22 -------------- tests/qemuxml2argvdata/no-shutdown.args | 27 ----------------- tests/qemuxml2argvdata/no-shutdown.xml | 24 --------------- tests/qemuxml2argvdata/pcihole64-none.args | 20 ------------- .../qemuxml2argvdata/video-qxl-device-vram64.args | 25 ---------------- .../video-qxl-device-vram64.x86_64-latest.args | 32 ++++++++++++++++++++ tests/qemuxml2argvdata/video-qxl-device-vram64.xml | 6 ---- .../video-qxl-sec-device-vram64.args | 27 ----------------- .../video-qxl-sec-device-vram64.x86_64-latest.args | 34 ++++++++++++++++++++++ .../video-qxl-sec-device-vram64.xml | 6 ---- tests/qemuxml2argvtest.c | 2 ++ 13 files changed, 68 insertions(+), 205 deletions(-) delete mode 100644 tests/qemuxml2argvdata/hugepages-default-1G-nodeset-2M.args delete mode 100644 tests/qemuxml2argvdata/lease.args delete mode 100644 tests/qemuxml2argvdata/metadata.args delete mode 100644 tests/qemuxml2argvdata/no-shutdown.args delete mode 100644 tests/qemuxml2argvdata/no-shutdown.xml delete mode 100644 tests/qemuxml2argvdata/pcihole64-none.args delete mode 100644 tests/qemuxml2argvdata/video-qxl-device-vram64.args create mode 100644 tests/qemuxml2argvdata/video-qxl-device-vram64.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/video-qxl-sec-device-vram64.args create mode 100644 tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-latest.args -- 2.16.2

3 9

[libvirt] [PATCH v2] qemu: Introduce state_lock_timeout to qemu.conf
by Yi Wang 28 Aug '18

28 Aug '18

When doing some job holding state lock for a long time, we may come across error: "Timed out during operation: cannot acquire state change lock" Well, sometimes it's not a problem and users wanner continue to wait, and this patch allow users decide how long time they can wait the state lock. Signed-off-by: Yi Wang <wang.yi59(a)zte.com.cn> Reviewed-by: Xi Xu <xu.xi8(a)zte.com.cn> --- changes in v2: - change default value to 30 in qemu.conf - set the default value in virQEMUDriverConfigNew() --- src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 6 ++++++ src/qemu/qemu_conf.c | 8 ++++++++ src/qemu/qemu_conf.h | 2 ++ src/qemu/qemu_domain.c | 5 +---- src/qemu/test_libvirtd_qemu.aug.in | 1 + 6 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug index ddc4bbf..f7287ae 100644 --- a/src/qemu/libvirtd_qemu.aug +++ b/src/qemu/libvirtd_qemu.aug @@ -93,6 +93,7 @@ module Libvirtd_qemu = | limits_entry "max_core" | bool_entry "dump_guest_core" | str_entry "stdio_handler" + | int_entry "state_lock_timeout" let device_entry = bool_entry "mac_filter" | bool_entry "relaxed_acs_check" diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index cd57b3c..4284786 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -813,3 +813,9 @@ # #swtpm_user = "tss" #swtpm_group = "tss" + +# The timeout (in seconds) waiting for acquiring state lock. +# +# Default is 30 +# +#state_lock_timeout = 60 diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index a4f545e..31e0013 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -129,6 +129,9 @@ void qemuDomainCmdlineDefFree(qemuDomainCmdlineDefPtr def) #endif +/* Give up waiting for mutex after 30 seconds */ +#define QEMU_JOB_WAIT_TIME (1000ull * 30) + virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) { virQEMUDriverConfigPtr cfg; @@ -346,6 +349,8 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) cfg->glusterDebugLevel = 4; cfg->stdioLogD = true; + cfg->stateLockTimeout = QEMU_JOB_WAIT_TIME; + if (!(cfg->namespaces = virBitmapNew(QEMU_DOMAIN_NS_LAST))) goto error; @@ -863,6 +868,9 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, if (virConfGetValueUInt(conf, "keepalive_count", &cfg->keepAliveCount) < 0) goto cleanup; + if (virConfGetValueInt(conf, "state_lock_timeout", &cfg->stateLockTimeout) < 0) + goto cleanup; + if (virConfGetValueInt(conf, "seccomp_sandbox", &cfg->seccompSandbox) < 0) goto cleanup; diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index a8d84ef..97cf2e1 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -190,6 +190,8 @@ struct _virQEMUDriverConfig { int keepAliveInterval; unsigned int keepAliveCount; + int stateLockTimeout; + int seccompSandbox; char *migrateHost; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 886e3fb..5a2ca52 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6652,9 +6652,6 @@ qemuDomainObjCanSetJob(qemuDomainObjPrivatePtr priv, priv->job.agentActive == QEMU_AGENT_JOB_NONE)); } -/* Give up waiting for mutex after 30 seconds */ -#define QEMU_JOB_WAIT_TIME (1000ull * 30) - /** * qemuDomainObjBeginJobInternal: * @driver: qemu driver @@ -6714,7 +6711,7 @@ qemuDomainObjBeginJobInternal(virQEMUDriverPtr driver, } priv->jobs_queued++; - then = now + QEMU_JOB_WAIT_TIME; + then = now + cfg->stateLockTimeout; retry: if ((!async && job != QEMU_JOB_DESTROY) && diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index f1e8806..dc5de96 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -105,3 +105,4 @@ module Test_libvirtd_qemu = { "pr_helper" = "/usr/bin/qemu-pr-helper" } { "swtpm_user" = "tss" } { "swtpm_group" = "tss" } +{ "state_lock_timeout" = "60" } -- 1.8.3.1

5 5

[libvirt] [PATCH] vsh: Fix broken build on mingw
by Simon Kobyda 28 Aug '18

28 Aug '18

The function wcwidth() doesn't exist on mingw. However we can implement this function from gnulib. Broken gnulib on CentOS and RHEL still persists. Signed-off-by: Simon Kobyda <skobyda(a)redhat.com> --- bootstrap.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/bootstrap.conf b/bootstrap.conf index 698a52216b..d9e2b0662c 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -126,6 +126,7 @@ vc-list-files vsnprintf waitpid warnings +wcwidth ' SKIP_PO=true -- 2.17.1

2 1

[libvirt] [PATCH v3] qemu: Introduce state_lock_timeout to qemu.conf
by Yi Wang 28 Aug '18

28 Aug '18

When doing some job holding state lock for a long time, we may come across error: "Timed out during operation: cannot acquire state change lock" Well, sometimes it's not a problem and users wanner continue to wait, and this patch allow users decide how long time they can wait the state lock. Signed-off-by: Yi Wang <wang.yi59(a)zte.com.cn> Reviewed-by: Xi Xu <xu.xi8(a)zte.com.cn> --- changes in v3: - add user-friendly description and nb of state lock - check validity of stateLockTimeout changes in v2: - change default value to 30 in qemu.conf - set the default value in virQEMUDriverConfigNew() --- src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 10 ++++++++++ src/qemu/qemu_conf.c | 14 ++++++++++++++ src/qemu/qemu_conf.h | 2 ++ src/qemu/qemu_domain.c | 5 +---- src/qemu/test_libvirtd_qemu.aug.in | 1 + 6 files changed, 29 insertions(+), 4 deletions(-) diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug index ddc4bbf..f7287ae 100644 --- a/src/qemu/libvirtd_qemu.aug +++ b/src/qemu/libvirtd_qemu.aug @@ -93,6 +93,7 @@ module Libvirtd_qemu = | limits_entry "max_core" | bool_entry "dump_guest_core" | str_entry "stdio_handler" + | int_entry "state_lock_timeout" let device_entry = bool_entry "mac_filter" | bool_entry "relaxed_acs_check" diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index cd57b3c..8920a1a 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -667,6 +667,16 @@ # #max_queued = 0 + +# When two or more threads want to work with the same domain they use a +# job lock to mutually exclude each other. However, waiting for the lock +# is limited up to state_lock_timeout seconds. +# NB, strong recommendation to set the timeout longer than 30 seconds. +# +# Default is 30 +# +#state_lock_timeout = 60 + ################################################################### # Keepalive protocol: # This allows qemu driver to detect broken connections to remote diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index a4f545e..5fb962f 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -129,6 +129,9 @@ void qemuDomainCmdlineDefFree(qemuDomainCmdlineDefPtr def) #endif +/* Give up waiting for mutex after 30 seconds */ +#define QEMU_JOB_WAIT_TIME (1000ull * 30) + virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) { virQEMUDriverConfigPtr cfg; @@ -346,6 +349,8 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) cfg->glusterDebugLevel = 4; cfg->stdioLogD = true; + cfg->stateLockTimeout = QEMU_JOB_WAIT_TIME; + if (!(cfg->namespaces = virBitmapNew(QEMU_DOMAIN_NS_LAST))) goto error; @@ -863,6 +868,9 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, if (virConfGetValueUInt(conf, "keepalive_count", &cfg->keepAliveCount) < 0) goto cleanup; + if (virConfGetValueInt(conf, "state_lock_timeout", &cfg->stateLockTimeout) < 0) + goto cleanup; + if (virConfGetValueInt(conf, "seccomp_sandbox", &cfg->seccompSandbox) < 0) goto cleanup; @@ -1055,6 +1063,12 @@ virQEMUDriverConfigValidate(virQEMUDriverConfigPtr cfg) return -1; } + if (cfg->stateLockTimeout <= 0) { + virReportError(VIR_ERR_CONF_SYNTAX, + _("state_lock_timeout should larger than zero")); + return -1; + } + return 0; } diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index a8d84ef..97cf2e1 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -190,6 +190,8 @@ struct _virQEMUDriverConfig { int keepAliveInterval; unsigned int keepAliveCount; + int stateLockTimeout; + int seccompSandbox; char *migrateHost; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 886e3fb..5a2ca52 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6652,9 +6652,6 @@ qemuDomainObjCanSetJob(qemuDomainObjPrivatePtr priv, priv->job.agentActive == QEMU_AGENT_JOB_NONE)); } -/* Give up waiting for mutex after 30 seconds */ -#define QEMU_JOB_WAIT_TIME (1000ull * 30) - /** * qemuDomainObjBeginJobInternal: * @driver: qemu driver @@ -6714,7 +6711,7 @@ qemuDomainObjBeginJobInternal(virQEMUDriverPtr driver, } priv->jobs_queued++; - then = now + QEMU_JOB_WAIT_TIME; + then = now + cfg->stateLockTimeout; retry: if ((!async && job != QEMU_JOB_DESTROY) && diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index f1e8806..dc5de96 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -105,3 +105,4 @@ module Test_libvirtd_qemu = { "pr_helper" = "/usr/bin/qemu-pr-helper" } { "swtpm_user" = "tss" } { "swtpm_group" = "tss" } +{ "state_lock_timeout" = "60" } -- 1.8.3.1

2 1

[libvirt] [PATCH v2] vl.c deprecate incorrect CPUs topology
by Igor Mammedov 28 Aug '18

28 Aug '18

-smp [cpus],sockets/cores/threads[,maxcpus] should describe topology so that total number of logical CPUs [sockets * cores * threads] would be equal to [maxcpus], however historically we didn't have such check in QEMU and it is possible to start VM with an invalid topology. Deprecate invalid options combination so we can make sure that the topology VM started with is always correct in the future. Users with an invalid sockets/cores/threads/maxcpus values should fix their CLI to make sure that [sockets * cores * threads] == [maxcpus] Signed-off-by: Igor Mammedov <imammedo(a)redhat.com> --- v2: - spelling&&co fixes (Andrew Jones <drjones(a)redhat.com>) --- qemu-deprecated.texi | 11 +++++++++++ vl.c | 6 ++++++ 2 files changed, 17 insertions(+) diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index 87212b6..b649b2e 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -159,6 +159,17 @@ The 'file' driver for drives is no longer appropriate for character or host devices and will only accept regular files (S_IFREG). The correct driver for these file types is 'host_cdrom' or 'host_device' as appropriate. +@subsection -smp X,[socket=a,core=b,thread=c],maxcpus=Y (since 3.1) + +CPU topology properties should describe whole machine topology including +possible CPUs. but historically it was possible to start QEMU with +an incorrect topology where + sockets * cores * threads >= X && X < maxcpus +which could lead to incorrect topology enumeration by the guest. +Support for invalid topology will be removed, the user must ensure +topologies described with -smp includes all possible cpus, i.e.: + sockets * cores * threads == maxcpus + @section QEMU Machine Protocol (QMP) commands @subsection block-dirty-bitmap-add "autoload" parameter (since 2.12.0) diff --git a/vl.c b/vl.c index 5ba06ad..238f856 100644 --- a/vl.c +++ b/vl.c @@ -1238,6 +1238,12 @@ static void smp_parse(QemuOpts *opts) exit(1); } + if (sockets * cores * threads != max_cpus) { + warn_report("Invalid CPU topology deprecated: " + "sockets (%u) * cores (%u) * threads (%u) " + "!= maxcpus (%u)", + sockets, cores, threads, max_cpus); + } if (sockets * cores * threads > max_cpus) { error_report("cpu topology: " "sockets (%u) * cores (%u) * threads (%u) > " -- 2.7.4

3 2

[libvirt] [PATCH] qemu: Introduce state_lock_timeout to qemu.conf
by Yi Wang 27 Aug '18

27 Aug '18

When doing some job holding state lock for a long time, we may come across error: "Timed out during operation: cannot acquire state change lock" Well, sometimes it's not a problem and users wanner continue to wait, and this patch allow users decide how long time they can wait the state lock. Signed-off-by: Yi Wang <wang.yi59(a)zte.com.cn> Reviewed-by: Xi Xu <xu.xi8(a)zte.com.cn> --- src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 6 ++++++ src/qemu/qemu_conf.c | 3 +++ src/qemu/qemu_conf.h | 2 ++ src/qemu/qemu_domain.c | 6 +++++- src/qemu/test_libvirtd_qemu.aug.in | 1 + 6 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug index ddc4bbf..f7287ae 100644 --- a/src/qemu/libvirtd_qemu.aug +++ b/src/qemu/libvirtd_qemu.aug @@ -93,6 +93,7 @@ module Libvirtd_qemu = | limits_entry "max_core" | bool_entry "dump_guest_core" | str_entry "stdio_handler" + | int_entry "state_lock_timeout" let device_entry = bool_entry "mac_filter" | bool_entry "relaxed_acs_check" diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index cd57b3c..e88db3f 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -813,3 +813,9 @@ # #swtpm_user = "tss" #swtpm_group = "tss" + +# Override the timeout (in seconds) for acquiring state lock. +# +# Default is 0 +# +#state_lock_timeout = 60 diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index a4f545e..f452714 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -863,6 +863,9 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, if (virConfGetValueUInt(conf, "keepalive_count", &cfg->keepAliveCount) < 0) goto cleanup; + if (virConfGetValueInt(conf, "state_lock_timeout", &cfg->stateLockTimeout) < 0) + goto cleanup; + if (virConfGetValueInt(conf, "seccomp_sandbox", &cfg->seccompSandbox) < 0) goto cleanup; diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index a8d84ef..97cf2e1 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -190,6 +190,8 @@ struct _virQEMUDriverConfig { int keepAliveInterval; unsigned int keepAliveCount; + int stateLockTimeout; + int seccompSandbox; char *migrateHost; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 886e3fb..d375a73 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6714,7 +6714,11 @@ qemuDomainObjBeginJobInternal(virQEMUDriverPtr driver, } priv->jobs_queued++; - then = now + QEMU_JOB_WAIT_TIME; + if (cfg->stateLockTimeout > 0) + then = now + cfg->stateLockTimeout; + else + then = now + QEMU_JOB_WAIT_TIME; + retry: if ((!async && job != QEMU_JOB_DESTROY) && diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index f1e8806..dc5de96 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -105,3 +105,4 @@ module Test_libvirtd_qemu = { "pr_helper" = "/usr/bin/qemu-pr-helper" } { "swtpm_user" = "tss" } { "swtpm_group" = "tss" } +{ "state_lock_timeout" = "60" } -- 1.8.3.1

3 2

[libvirt] [PATCH 0/2] conf: Cleanups for some device_conf predicates
by Andrea Bolognani 27 Aug '18

27 Aug '18

Andrea Bolognani (2): conf: Rename some device_conf predicates conf: Move some device_conf predicates src/bhyve/bhyve_device.c | 6 ++-- src/conf/device_conf.c | 22 ++++++++++++++ src/conf/device_conf.h | 23 ++------------- src/conf/domain_addr.c | 2 +- src/libvirt_private.syms | 3 ++ src/qemu/qemu_domain_address.c | 52 +++++++++++++++++----------------- 6 files changed, 58 insertions(+), 50 deletions(-) -- 2.17.1

2 3

[libvirt] [PATCH 0/3] Fix default machine when converting argv to xml
by Daniel P. Berrangé 27 Aug '18

27 Aug '18

We must honour the QEMU built-in default machine when converting from argv Daniel P. Berrangé (3): qemu: record the QEMU default machine in capabilities qemu: rename method for getting preferred machine type qemu: fix default machine for argv -> xml convertor src/qemu/qemu_capabilities.c | 37 ++++++++++++++--- src/qemu/qemu_capabilities.h | 3 +- src/qemu/qemu_driver.c | 6 ++- src/qemu/qemu_parse_command.c | 34 ++++++++++------ src/qemu/qemu_parse_command.h | 8 +++- tests/domaincapstest.c | 2 +- tests/qemuargv2xmldata/nomachine-aarch64.args | 11 ----- tests/qemuargv2xmldata/nomachine-aarch64.xml | 40 ------------------- tests/qemuargv2xmldata/nomachine-ppc64.xml | 4 +- tests/qemuargv2xmldata/nomachine-x86_64.xml | 4 +- tests/qemuargv2xmldata/pseries-disk.xml | 4 +- tests/qemuargv2xmldata/pseries-nvram.xml | 4 +- tests/qemuargv2xmltest.c | 18 ++++++++- .../caps_1.5.3.x86_64.xml | 2 +- .../caps_1.6.0.x86_64.xml | 2 +- .../caps_1.7.0.x86_64.xml | 2 +- .../caps_2.1.1.x86_64.xml | 2 +- .../caps_2.10.0.ppc64.xml | 2 +- .../caps_2.10.0.s390x.xml | 2 +- .../caps_2.10.0.x86_64.xml | 2 +- .../caps_2.11.0.s390x.xml | 2 +- .../caps_2.11.0.x86_64.xml | 2 +- .../caps_2.12.0.ppc64.xml | 2 +- .../caps_2.12.0.s390x.xml | 2 +- .../caps_2.12.0.x86_64.xml | 2 +- .../caps_2.4.0.x86_64.xml | 2 +- .../caps_2.5.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 2 +- .../caps_2.6.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.7.0.s390x.xml | 2 +- .../caps_2.7.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.8.0.s390x.xml | 2 +- .../caps_2.8.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_2.9.0.s390x.xml | 2 +- .../caps_2.9.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 2 +- .../caps_3.0.0.x86_64.xml | 2 +- 38 files changed, 116 insertions(+), 109 deletions(-) delete mode 100644 tests/qemuargv2xmldata/nomachine-aarch64.args delete mode 100644 tests/qemuargv2xmldata/nomachine-aarch64.xml -- 2.17.1

2 6

[libvirt] [PATCH 0/4] Remove more deprecated options
by Thomas Huth 27 Aug '18

27 Aug '18

These options are deprecated since at least two releases, and nobody complained. Time to remove them now. (I'm sending these patches as a series since Paolo asked me to send a PULL request on my own for them ... but if one of the subsystems maintainers prefers to take the patches through their own tree instead, just let me know) Thomas Huth (4): Remove the deprecated -balloon option Remove the deprecated -nodefconfig option Remove the deprecated options -startdate, -localtime and -rtc-td-hack net: Remove the deprecated -tftp, -bootp, -redir and -smb options docs/interop/live-block-operations.rst | 4 +- docs/virtio-balloon-stats.txt | 6 +- include/net/net.h | 3 - include/net/slirp.h | 4 - net/slirp.c | 132 ++++++++------------------------- os-posix.c | 8 -- qemu-deprecated.texi | 56 -------------- qemu-options.hx | 36 +-------- vl.c | 132 ++++++--------------------------- 9 files changed, 58 insertions(+), 323 deletions(-) -- 1.8.3.1

5 9

[libvirt] [PATCH] tests: qemuxml2argv: Drop some unused args files
by Peter Krempa 27 Aug '18

27 Aug '18

aarch64-acpi-nouefi and hostdev-scsi-boot are unused. Noticed when checking whether '-nodefconfig' is still used by libvirt. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- tests/qemuxml2argvdata/aarch64-acpi-nouefi.args | 22 --------------------- tests/qemuxml2argvdata/hostdev-scsi-boot.args | 26 ------------------------- 2 files changed, 48 deletions(-) delete mode 100644 tests/qemuxml2argvdata/aarch64-acpi-nouefi.args delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-boot.args diff --git a/tests/qemuxml2argvdata/aarch64-acpi-nouefi.args b/tests/qemuxml2argvdata/aarch64-acpi-nouefi.args deleted file mode 100644 index 5d9e1fb7c8..0000000000 --- a/tests/qemuxml2argvdata/aarch64-acpi-nouefi.args +++ /dev/null @@ -1,22 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-aarch64 \ --name guest \ --S \ --M virt \ --cpu host \ --m 1024 \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \ --nographic \ --nodefconfig \ --nodefaults \ --monitor unix:/tmp/lib/domain--1-guest/monitor.sock,server,nowait \ --boot c \ --kernel /var/lib/libvirt/images/guest.vmlinux \ --initrd /var/lib/libvirt/images/guest.initramfs \ --append 'console=ttyAMA0 rw root=/dev/vda rootwait' diff --git a/tests/qemuxml2argvdata/hostdev-scsi-boot.args b/tests/qemuxml2argvdata/hostdev-scsi-boot.args deleted file mode 100644 index efbdc81415..0000000000 --- a/tests/qemuxml2argvdata/hostdev-scsi-boot.args +++ /dev/null @@ -1,26 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ --name QEMUGuest1 \ --S \ --M pc \ --m 214 \ --smp 1 \ --uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \ --nographic \ --nodefconfig \ --nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi \ --device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ --usb \ --drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --drive file=/dev/sg0,if=none,id=drive-hostdev0 \ --device scsi-generic,bus=scsi0.0,channel=0,scsi-id=4,lun=8,\ -drive=drive-hostdev0,id=hostdev0,bootindex=1 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 -- 2.16.2

2 1

[libvirt] [PATCH 0/7] cgroup cleanup
by Pavel Hrdina 27 Aug '18

27 Aug '18

Another small set of cgroup cleanup patches as preparation for cgroup v2. Pavel Hrdina (7): vircgroup: Duplicate string before modifying vircgroup: Extract controller detection into function vircgroup: Extract placement validation into function vircgroup: Split virCgroupPathOfController into two functions vircgroup: Call virCgroupRemove inside virCgroupMakeGroup vircgroup: Simplify if conditions in virCgroupMakeGroup vircgroup: Remove obsolete sa_assert src/util/vircgroup.c | 200 +++++++++++++++++++++++++------------------ src/util/vircgroup.h | 2 +- 2 files changed, 118 insertions(+), 84 deletions(-) -- 2.17.1

2 14

[libvirt] [PATCH v4] qemu: qemuDomainChangeNet: validity checks should be done before XML autocompletion
by Katerina Koukiou 27 Aug '18

27 Aug '18

This patch ensures that changes in attributes of interfaces will emit errors accept if they are missing from the XML. Previously we were falsely reporting successful updates, because some changed attributes got overwritten before the validity checks. https://bugzilla.redhat.com/show_bug.cgi?id=1599513 Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com> --- Changes from v3: Adjusted to Jano's comments in v3; type and address are now checked together. src/qemu/qemu_hotplug.c | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 0b84a503bb..4f290b5648 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3598,16 +3598,19 @@ qemuDomainChangeNet(virQEMUDriverPtr driver, goto cleanup; } - /* info: if newdev->info is empty, fill it in from olddev, - * otherwise verify that it matches - nothing is allowed to - * change. (There is no helper function to do this, so - * individually check the few feidls of virDomainDeviceInfo that - * are relevant in this case). + /* info: Nothing is allowed to change. First fill the missing newdev->info + * from olddev and then check for changes. */ - if (!virDomainDeviceAddressIsValid(&newdev->info, - VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) && - virDomainDeviceInfoCopy(&newdev->info, &olddev->info) < 0) { - goto cleanup; + /* if pci addr is missing or is invalid we overwrite it from olddev */ + if (newdev->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE || + !virDomainDeviceAddressIsValid(&newdev->info, + newdev->info.type)) { + newdev->info.type = olddev->info.type; + newdev->info.addr = olddev->info.addr; + } + if (olddev->info.type != newdev->info.type) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("cannot modify network device address type")); } if (!virPCIDeviceAddressEqual(&olddev->info.addr.pci, &newdev->info.addr.pci)) { @@ -3622,21 +3625,33 @@ qemuDomainChangeNet(virQEMUDriverPtr driver, /* device alias is checked already in virDomainDefCompatibleDevice */ + if (newdev->info.rombar == VIR_TRISTATE_BOOL_ABSENT) + newdev->info.rombar = olddev->info.rombar; if (olddev->info.rombar != newdev->info.rombar) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("cannot modify network device rom bar setting")); goto cleanup; } + + if (!newdev->info.romfile && + VIR_STRDUP(newdev->info.romfile, olddev->info.romfile) < 0) + goto cleanup; if (STRNEQ_NULLABLE(olddev->info.romfile, newdev->info.romfile)) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("cannot modify network rom file")); goto cleanup; } + + if (newdev->info.bootIndex == 0) + newdev->info.bootIndex = olddev->info.bootIndex; if (olddev->info.bootIndex != newdev->info.bootIndex) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("cannot modify network device boot index setting")); goto cleanup; } + + if (newdev->info.romenabled == VIR_TRISTATE_BOOL_ABSENT) + newdev->info.romenabled = olddev->info.romenabled; if (olddev->info.romenabled != newdev->info.romenabled) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("cannot modify network device rom enabled setting")); -- 2.17.1

2 1

[libvirt] [jenkins-ci PATCH] guests: Fix mapping for perl-Digest on Debian Sid
by Andrea Bolognani 27 Aug '18

27 Aug '18

It's now part of perl instead of being its own package. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. guests/vars/mappings.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index 59a4b01..5df918f 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -539,6 +539,7 @@ mappings: deb: libdigest-perl pkg: p5-Digest rpm: perl-Digest + DebianSid: perl perl-Digest-MD5: deb: libdigest-perl-md5-perl -- 2.17.1

1 0

[libvirt] [PULL 00/12] Ui 20180827 v4 patches
by Gerd Hoffmann 27 Aug '18

27 Aug '18

The following changes since commit 5ccac548faf041ff5229a8e8342e3be14a34c8af: Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging (2018-08-23 17:35:48 +0100) are available in the git repository at: git://git.kraxel.org/qemu tags/ui-20180827-v4-pull-request for you to fetch changes up to b1d380372f31672da9318431e84e79bccd8ef3bf: util: promote qemu_egl_rendernode_open() to libqemuutil (2018-08-27 10:51:44 +0200) ---------------------------------------------------------------- ui: misc fixes which piled up during 3.0 release freeze ---------------------------------------------------------------- Daniel P. Berrangé (2): doc: switch to modern syntax for VNC TLS setup vnc: remove support for deprecated tls, x509, x509verify options Marc-André Lureau (3): ui: use enum to string helpers dmabuf: add y0_top, pass it to spice util: promote qemu_egl_rendernode_open() to libqemuutil Paolo Bonzini (2): spice-display: access ptr_x/ptr_y under Mutex spice-display: fix qemu_spice_cursor_refresh_bh locking Peter Wu (1): vnc: fix memleak of the "vnc-worker-output" name Philippe Mathieu-Daudé (1): ui/vnc: Remove useless parenthesis around DIV_ROUND_UP macro Tao Wu (1): sdl2: redraw correctly when scanout_mode enabled. Thomas Huth (2): ui/sdl2: Remove the obsolete SDL_INIT_NOPARACHUTE flag ui/sdl2: Fix broken -full-screen CLI option include/qemu/drm.h | 6 ++++ include/ui/console.h | 1 + qemu-keymap.c | 2 +- ui/console.c | 6 ++-- ui/egl-helpers.c | 51 ++-------------------------- ui/sdl2-gl.c | 5 +++ ui/sdl2.c | 13 +++----- ui/spice-display.c | 42 +++++++++++++++-------- ui/vnc-enc-tight.c | 2 +- ui/vnc-jobs.c | 3 +- ui/vnc.c | 94 ++-------------------------------------------------- util/drm.c | 66 ++++++++++++++++++++++++++++++++++++ MAINTAINERS | 1 + qemu-deprecated.texi | 20 ----------- qemu-doc.texi | 20 ++++++++--- qemu-options.hx | 43 ------------------------ util/Makefile.objs | 1 + 17 files changed, 139 insertions(+), 237 deletions(-) create mode 100644 include/qemu/drm.h create mode 100644 util/drm.c -- 2.9.3

2 13