- Devel - libvirt List Archives

[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