- Devel - libvirt List Archives

[libvirt] [gconfig v6 1/5] gconfig: Add gvir_config_object_has_child
by Zeeshan Ali (Khattak) 21 Jul '16

21 Jul '16

From: Christophe Fergeau <cfergeau(a)redhat.com> --- libvirt-gconfig/libvirt-gconfig-object-private.h | 2 ++ libvirt-gconfig/libvirt-gconfig-object.c | 13 +++++++++++++ 2 files changed, 15 insertions(+) diff --git a/libvirt-gconfig/libvirt-gconfig-object-private.h b/libvirt-gconfig/libvirt-gconfig-object-private.h index e91c4ef..7a0d21f 100644 --- a/libvirt-gconfig/libvirt-gconfig-object-private.h +++ b/libvirt-gconfig/libvirt-gconfig-object-private.h @@ -117,6 +117,8 @@ GVirConfigObject *gvir_config_object_get_child(GVirConfigObject *object, GVirConfigObject *gvir_config_object_get_child_with_type(GVirConfigObject *object, const gchar *child_name, GType child_type); +gboolean gvir_config_object_has_child(GVirConfigObject *object, + const gchar *child_name); G_END_DECLS diff --git a/libvirt-gconfig/libvirt-gconfig-object.c b/libvirt-gconfig/libvirt-gconfig-object.c index bf328f3..6225de2 100644 --- a/libvirt-gconfig/libvirt-gconfig-object.c +++ b/libvirt-gconfig/libvirt-gconfig-object.c @@ -970,3 +970,16 @@ gvir_config_object_get_child(GVirConfigObject *object, child_name, GVIR_CONFIG_TYPE_OBJECT); } + +G_GNUC_INTERNAL gboolean +gvir_config_object_has_child(GVirConfigObject *object, const gchar *child_name) +{ + xmlNodePtr node; + + g_return_val_if_fail(GVIR_CONFIG_IS_OBJECT(object), FALSE); + g_return_val_if_fail(child_name != NULL, FALSE); + + node = gvir_config_xml_get_element(object->priv->node, child_name, NULL); + + return (node != NULL); +} -- 2.7.4

1 4

[libvirt] [RFC PATCH 0/2] nodeinfo: PPC64: Fix topology and siblings info on capabilities and nodeinfo
by Shivaprasad G Bhat 21 Jul '16

21 Jul '16

The nodeinfo output was fixed earlier to reflect the actual cpus available in KVM mode on PPC64. The earlier fixes covered the aspect of not making a host look overcommitted when its not. The current fixes are aimed at helping the users make better decisions on the kind of guest cpu topology that can be supported on the given sucore_per_core setting of KVM host and also hint the way to pin the guest vcpus efficiently. I am planning to add some test cases once the approach is accepted. With respect to Patch 2: The second patch adds a new element to the cpus tag and I need your inputs on if that is okay. Also if there is a better way. I am not sure if the existing clients have RNG checks that might fail with the approach. Or if the checks are not enoforced on the elements but only on the tags. With my approach if the rng checks pass, the new element "capacity" even if ignored by many clients would have no impact except for PPC64. To the extent I looked at code, the siblings changes dont affect existing libvirt functionality. Please do let me know otherwise. --- Shivaprasad G Bhat (2): nodeinfo: Reflect guest usable host topology on PPC64 Introduce capacity to virCapsHostNUMACellCPU to help vcpu pinning decisions src/conf/capabilities.c | 3 + src/conf/capabilities.h | 1 src/nodeinfo.c | 51 ++++++++++++++++++++++-- tests/vircaps2xmldata/vircaps-basic-4-4-2G.xml | 32 ++++++++------- tests/vircaps2xmltest.c | 1 5 files changed, 67 insertions(+), 21 deletions(-) -- Signature

5 17

[libvirt] [PATCH] Remove code duplication in domain_addr.c
by Tomasz Flendrich 21 Jul '16

21 Jul '16

Two functions, virDomainValidateDevicePCISlotsQ35 and virDomainValidateDevicePCISlotsPIIX3, had almost exactly the same code for verifying the PCI address of the primary video device. The only difference between them was the slot number. To avoid code duplication, I moved it to a new function: virDomainValidateVideoDevice. --- src/conf/domain_addr.c | 218 +++++++++++++++++++++---------------------------- 1 file changed, 94 insertions(+), 124 deletions(-) diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 7abe44c..9a6f977 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -1391,6 +1391,82 @@ virDomainMachineIsI440FX(const virDomainDef *def) static int +virDomainValidateVideoDevice(virDomainDefPtr def, + virDomainPCIAddressSetPtr addrs, + virDomainPCIConnectFlags flags, + bool videoPrimaryEnabled, + unsigned int slot) +{ + int ret = -1; + char *addrStr = NULL; + virPCIDeviceAddress tmp_addr; + + if (def->nvideos > 0) { + virDomainVideoDefPtr primaryVideo = def->videos[0]; + if (virDeviceInfoPCIAddressWanted(&primaryVideo->info)) { + memset(&tmp_addr, 0, sizeof(tmp_addr)); + tmp_addr.slot = slot; + + if (!(addrStr = virDomainPCIAddressAsString(&tmp_addr))) + goto cleanup; + if (!virDomainPCIAddressValidate(addrs, &tmp_addr, + addrStr, flags, false)) + goto cleanup; + + if (virDomainPCIAddressSlotInUse(addrs, &tmp_addr)) { + if (videoPrimaryEnabled) { + if (virDomainPCIAddressReserveNextSlot(addrs, + &primaryVideo->info, + flags) < 0) + goto cleanup; + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("PCI address 0:0:%u.0 is in use, " + "QEMU needs it for primary video"), slot); + goto cleanup; + } + } else { + if (virDomainPCIAddressReserveSlot(addrs, &tmp_addr, flags) < 0) + goto cleanup; + primaryVideo->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI; + primaryVideo->info.addr.pci = tmp_addr; + } + } else if (!videoPrimaryEnabled) { + if (primaryVideo->info.addr.pci.domain != 0 || + primaryVideo->info.addr.pci.bus != 0 || + primaryVideo->info.addr.pci.slot != slot || + primaryVideo->info.addr.pci.function != 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Primary video card must have " + "PCI address 0:0:%u.0"), slot); + goto cleanup; + } + /* If TYPE == PCI, then virDomainCollectPCIAddress() function + * has already reserved the address, so we must skip */ + } + } else if (addrs->nbuses && !videoPrimaryEnabled) { + memset(&tmp_addr, 0, sizeof(tmp_addr)); + tmp_addr.slot = slot; + + if (virDomainPCIAddressSlotInUse(addrs, &tmp_addr)) { + VIR_DEBUG("PCI address 0:0:%u.0 in use, future addition of a video" + " device will not be possible without manual" + " intervention", slot); + virResetLastError(); + } else if (virDomainPCIAddressReserveSlot(addrs, &tmp_addr, flags) < 0) { + goto cleanup; + } + } + + ret = 0; + + cleanup: + VIR_FREE(addrStr); + return ret; +} + + +static int virDomainValidateDevicePCISlotsPIIX3(virDomainDefPtr def, virDomainPCIAddressSetPtr addrs, bool videoPrimaryEnabled) @@ -1398,7 +1474,6 @@ virDomainValidateDevicePCISlotsPIIX3(virDomainDefPtr def, int ret = -1; size_t i; virPCIDeviceAddress tmp_addr; - char *addrStr = NULL; virDomainPCIConnectFlags flags = (VIR_PCI_CONNECT_HOTPLUGGABLE | VIR_PCI_CONNECT_TYPE_PCI_DEVICE); @@ -1456,69 +1531,17 @@ virDomainValidateDevicePCISlotsPIIX3(virDomainDefPtr def, goto cleanup; } - if (def->nvideos > 0) { - /* Because the PIIX3 integrated IDE/USB controllers are - * already at slot 1, when qemu looks for the first free slot - * to place the VGA controller (which is always the first - * device added after integrated devices), it *always* ends up - * at slot 2. - */ - virDomainVideoDefPtr primaryVideo = def->videos[0]; - if (virDeviceInfoPCIAddressWanted(&primaryVideo->info)) { - memset(&tmp_addr, 0, sizeof(tmp_addr)); - tmp_addr.slot = 2; - - if (!(addrStr = virDomainPCIAddressAsString(&tmp_addr))) - goto cleanup; - if (!virDomainPCIAddressValidate(addrs, &tmp_addr, - addrStr, flags, false)) - goto cleanup; - - if (virDomainPCIAddressSlotInUse(addrs, &tmp_addr)) { - if (videoPrimaryEnabled) { - if (virDomainPCIAddressReserveNextSlot(addrs, - &primaryVideo->info, - flags) < 0) - goto cleanup; - } else { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("PCI address 0:0:2.0 is in use, " - "QEMU needs it for primary video")); - goto cleanup; - } - } else { - if (virDomainPCIAddressReserveSlot(addrs, &tmp_addr, flags) < 0) - goto cleanup; - primaryVideo->info.addr.pci = tmp_addr; - primaryVideo->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI; - } - } else if (!videoPrimaryEnabled) { - if (primaryVideo->info.addr.pci.domain != 0 || - primaryVideo->info.addr.pci.bus != 0 || - primaryVideo->info.addr.pci.slot != 2 || - primaryVideo->info.addr.pci.function != 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Primary video card must have PCI address 0:0:2.0")); - goto cleanup; - } - /* If TYPE == PCI, then virDomainCollectPCIAddress() function - * has already reserved the address, so we must skip */ - } - } else if (addrs->nbuses && !videoPrimaryEnabled) { - memset(&tmp_addr, 0, sizeof(tmp_addr)); - tmp_addr.slot = 2; - - if (virDomainPCIAddressSlotInUse(addrs, &tmp_addr)) { - VIR_DEBUG("PCI address 0:0:2.0 in use, future addition of a video" - " device will not be possible without manual" - " intervention"); - } else if (virDomainPCIAddressReserveSlot(addrs, &tmp_addr, flags) < 0) { - goto cleanup; - } - } + /* Because the PIIX3 integrated IDE/USB controllers are + * already at slot 1, when qemu looks for the first free slot + * to place the VGA controller (which is always the first + * device added after integrated devices), it *always* ends up + * at slot 2. + */ + if (virDomainValidateVideoDevice(def, addrs, flags, + videoPrimaryEnabled, 2) < 0) + goto cleanup; ret = 0; cleanup: - VIR_FREE(addrStr); return ret; } @@ -1531,7 +1554,6 @@ virDomainValidateDevicePCISlotsQ35(virDomainDefPtr def, int ret = -1; size_t i; virPCIDeviceAddress tmp_addr; - char *addrStr = NULL; virDomainPCIConnectFlags flags = VIR_PCI_CONNECT_TYPE_PCIE_DEVICE; for (i = 0; i < def->ncontrollers; i++) { @@ -1646,70 +1668,18 @@ virDomainValidateDevicePCISlotsQ35(virDomainDefPtr def, goto cleanup; } - if (def->nvideos > 0) { - /* NB: unlike the pc machinetypes, on q35 machinetypes the - * integrated devices are at slot 0x1f, so when qemu looks for - * the first free lot for the first VGA, it will always be at - * slot 1 (which was used up by the integrated PIIX3 devices - * on pc machinetypes). - */ - virDomainVideoDefPtr primaryVideo = def->videos[0]; - if (virDeviceInfoPCIAddressWanted(&primaryVideo->info)) { - memset(&tmp_addr, 0, sizeof(tmp_addr)); - tmp_addr.slot = 1; - - if (!(addrStr = virDomainPCIAddressAsString(&tmp_addr))) - goto cleanup; - if (!virDomainPCIAddressValidate(addrs, &tmp_addr, - addrStr, flags, false)) - goto cleanup; - - if (virDomainPCIAddressSlotInUse(addrs, &tmp_addr)) { - if (videoPrimaryEnabled) { - if (virDomainPCIAddressReserveNextSlot(addrs, - &primaryVideo->info, - flags) < 0) - goto cleanup; - } else { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("PCI address 0:0:1.0 is in use, " - "QEMU needs it for primary video")); - goto cleanup; - } - } else { - if (virDomainPCIAddressReserveSlot(addrs, &tmp_addr, flags) < 0) - goto cleanup; - primaryVideo->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI; - primaryVideo->info.addr.pci = tmp_addr; - } - } else if (!videoPrimaryEnabled) { - if (primaryVideo->info.addr.pci.domain != 0 || - primaryVideo->info.addr.pci.bus != 0 || - primaryVideo->info.addr.pci.slot != 1 || - primaryVideo->info.addr.pci.function != 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Primary video card must have PCI address 0:0:1.0")); - goto cleanup; - } - /* If TYPE == PCI, then virDomainCollectPCIAddress() function - * has already reserved the address, so we must skip */ - } - } else if (addrs->nbuses && !videoPrimaryEnabled) { - memset(&tmp_addr, 0, sizeof(tmp_addr)); - tmp_addr.slot = 1; + /* NB: unlike the pc machinetypes, on q35 machinetypes the + * integrated devices are at slot 0x1f, so when qemu looks for + * the first free lot for the first VGA, it will always be at + * slot 1 (which was used up by the integrated PIIX3 devices + * on pc machinetypes). + */ + if (virDomainValidateVideoDevice(def, addrs, flags, + videoPrimaryEnabled, 1) < 0) + goto cleanup; - if (virDomainPCIAddressSlotInUse(addrs, &tmp_addr)) { - VIR_DEBUG("PCI address 0:0:1.0 in use, future addition of a video" - " device will not be possible without manual" - " intervention"); - virResetLastError(); - } else if (virDomainPCIAddressReserveSlot(addrs, &tmp_addr, flags) < 0) { - goto cleanup; - } - } ret = 0; cleanup: - VIR_FREE(addrStr); return ret; } -- 2.7.4 (Apple Git-66)

1 1

[libvirt] RFC: disk tray opened event and changing media API cooperation
by Nikolay Shirokovskiy 21 Jul '16

21 Jul '16

Hi, all. I want to remove media if disk is ejected from guest. I can leverage tray opened event for it but this event generated if i change media thru API call too. Thus I can't just remove media on any such event. However it would be possible if libvirt do not propagate tray opened event that originates from qemuDomainUpdateDeviceFlags actions. On this way we need also to close tray back if it was originally closed so state visible to client is in sync with actual. I can imagine other cases when closing tray at the end of qemuDomainUpdateDeviceFlags will be useful. Say implementing a kind of changer in mgmt layer so that if guest ejects disk mgmt insert next media from some playlist. In this case tray should be closed so that guest will see that media is changed. In short I suggest: 1. close tray at the end of chaning/ejecting media 2. if tray is opened during the operation than mask this event from client Nikolay

1 1

[libvirt] wireshark compilation warning
by Cole Robinson 21 Jul '16

21 Jul '16

I'm seeing this compilation warning on Fedora 24, with wireshark-devel-2.1.0-3.fc24.x86_64 which has the header file fix that was previously breaking compilation: CC wireshark/src/wireshark_src_libvirt_la-packet-libvirt.lo CC wireshark/src/wireshark_src_libvirt_la-plugin.lo CCLD nss/libnss_libvirt.la wireshark/src/packet-libvirt.c: In function 'proto_reg_handoff_libvirt': wireshark/src/packet-libvirt.c:548:46: warning: passing argument 1 of 'create_dissector_handle' from incompatible pointer type [-Wincompatible-pointer-types] libvirt_handle = create_dissector_handle(dissect_libvirt, proto_libvirt); ^~~~~~~~~~~~~~~ In file included from wireshark/src/packet-libvirt.c:28:0: /usr/include/wireshark/epan/packet.h:525:68: note: expected 'dissector_t {aka int (*)(struct tvbuff *, struct _packet_info *, struct _proto_node *, void *)}' but argument is of type 'void (*)(tvbuff_t *, packet_info *, proto_tree *) {aka void (*)(struct tvbuff *, struct _packet_info *, struct _proto_node *)}' WS_DLL_PUBLIC dissector_handle_t create_dissector_handle(dissector_t dissector, I can't even find the definition of dissect_libvirt so I assume there's some weird magic going on here... Thanks, Cole

2 1

[libvirt] [PATCHv5 0/8] Assign addresses to USB devices
by Ján Tomko 20 Jul '16

20 Jul '16

Patches 1-2 from v4 are pushed already. Patch 5/8 is new, adding new tests. Patches 6/8 and 8/8 have not been ACKed in the previous version. Ján Tomko (8): Introduce virDomainUSBAddressSet Add functions for adding USB controllers to addrs Add functions for adding USB hubs to addrs Reserve existing USB addresses Add tests for USB address assignment Assign addresses to USB devices Assign addresses on USB device hotplug Auto-add one hub if there are too many USB devices src/conf/domain_addr.c | 501 +++++++++++++++++++++ src/conf/domain_addr.h | 51 +++ src/libvirt_private.syms | 9 + src/qemu/qemu_domain.c | 1 + src/qemu/qemu_domain.h | 1 + src/qemu/qemu_domain_address.c | 156 ++++++- src/qemu/qemu_hotplug.c | 27 ++ .../qemuhotplug-base-live+disk-usb.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-bios-nvram.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-bios.args | 2 +- .../qemuxml2argv-controller-order.args | 8 +- .../qemuxml2argv-disk-usb-device-removable.args | 3 +- .../qemuxml2argv-disk-usb-device.args | 2 +- .../qemuxml2argv-graphics-spice-timeout.args | 2 +- .../qemuxml2argv-graphics-spice-usb-redir.args | 2 +- ...muxml2argv-hostdev-usb-address-device-boot.args | 3 +- .../qemuxml2argv-hostdev-usb-address-device.args | 2 +- .../qemuxml2argv-hostdev-usb-address.args | 2 +- .../qemuxml2argv-hugepages-numa.args | 6 +- .../qemuxml2argv-input-usbmouse.args | 2 +- .../qemuxml2argv-input-usbtablet.args | 2 +- .../qemuxml2argv-pseries-usb-kbd.args | 2 +- .../qemuxml2argv-serial-spiceport.args | 2 +- .../qemuxml2argv-smartcard-controller.args | 2 +- .../qemuxml2argv-smartcard-host-certificates.args | 2 +- .../qemuxml2argv-smartcard-host.args | 2 +- ...emuxml2argv-smartcard-passthrough-spicevmc.args | 2 +- .../qemuxml2argv-smartcard-passthrough-tcp.args | 2 +- .../qemuxml2argv-sound-device.args | 2 +- .../qemuxml2argv-usb-hub-autoadd.args | 28 ++ .../qemuxml2argv-usb-hub-autoadd.xml | 23 + .../qemuxml2argv-usb-hub-conflict.xml | 22 + .../qemuxml2argv-usb-ich9-autoassign.args | 32 ++ .../qemuxml2argv-usb-ich9-autoassign.xml | 39 ++ .../qemuxml2argv-usb-port-autoassign.args | 28 ++ .../qemuxml2argv-usb-port-autoassign.xml | 27 ++ .../qemuxml2argv-usb-port-missing.args | 4 +- .../qemuxml2argv-usb-redir-boot.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-usb-redir.args | 2 +- .../qemuxml2argv-usb-xhci-autoassign.args | 27 ++ .../qemuxml2argv-usb-xhci-autoassign.xml | 25 + tests/qemuxml2argvtest.c | 17 + 42 files changed, 1046 insertions(+), 31 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-hub-autoadd.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-hub-autoadd.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-hub-conflict.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-autoassign.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-autoassign.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-port-autoassign.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-port-autoassign.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-xhci-autoassign.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-xhci-autoassign.xml -- 2.7.3

2 9

[libvirt] [PATCH v2 0/5] vz: make vz driver more responsive
by Nikolay Shirokovskiy 20 Jul '16

20 Jul '16

diff from original: ======================== 1. include patch to check domain status on acquiring job condition 2. add patch to fix domain objects naming (update device patch series which was created before convention was enstablished sneak in) 3. squash in all quickfixes 4. rename vzDomainObjIsExist to vzEnsureDomainExists Nikolay Shirokovskiy (5): vz: use state variable sdkdom in prlsdkApplyConfig vz: remove redundant variable in prlsdkHandleVmAddedEvent vz: keep naming convention for domain objects vz: make vz driver more responsive vz: handle gracefully races on undefining domain src/vz/vz_driver.c | 257 +++++++++++++++++++++++++++++++++++++++-------------- src/vz/vz_sdk.c | 207 ++++++++++++++++++++++++++++-------------- src/vz/vz_utils.c | 50 +++++++++++ src/vz/vz_utils.h | 7 ++ 4 files changed, 387 insertions(+), 134 deletions(-) -- 1.8.3.1

2 6

[libvirt] [PATCH v2] configure: Check for MSG_NOSIGNAL availability
by Andrea Bolognani 20 Jul '16

20 Jul '16

The symbol being missing has been reported as causing build failures on OS X. Check for its availability before using it. --- Changes from v1: * don't unnecessarily check for availability at configure time (thanks J��n) src/util/virsystemd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index 969cd68..81ee538 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -482,7 +482,7 @@ int virSystemdTerminateMachine(const char *name) void virSystemdNotifyStartup(void) { -#ifdef HAVE_SYS_UN_H +#if defined(HAVE_SYS_UN_H) && defined(MSG_NOSIGNAL) const char *path; const char *msg = "READY=1"; int fd; @@ -526,7 +526,7 @@ virSystemdNotifyStartup(void) VIR_WARN("Failed to notify systemd"); VIR_FORCE_CLOSE(fd); -#endif /* HAVE_SYS_UN_H */ +#endif /* defined(HAVE_SYS_UN_H) && defined(MSG_NOSIGNAL) */ } static int -- 2.7.4

3 4

[libvirt] [PATCH] configure: Check for MSG_NOSIGNAL availability
by Andrea Bolognani 20 Jul '16

20 Jul '16

The symbol being missing has been reported as causing build failures on OS X. Check for its availability before using it. --- See https://www.redhat.com/archives/libvir-list/2016-July/msg00613.html configure.ac | 4 ++++ src/util/virsystemd.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 2c81c95..af5d2f8 100644 --- a/configure.ac +++ b/configure.ac @@ -402,6 +402,10 @@ AC_CHECK_TYPE([struct sockpeercred], [], [[#include <sys/socket.h> ]]) +AC_CHECK_DECLS([MSG_NOSIGNAL], + [], [], [[#include <sys/socket.h> + ]]) + AC_CHECK_DECLS([ETH_FLAG_TXVLAN, ETH_FLAG_NTUPLE, ETH_FLAG_RXHASH, ETH_FLAG_LRO, ETHTOOL_GGSO, ETHTOOL_GGRO, ETHTOOL_GFLAGS, ETHTOOL_GFEATURES], [], [], [[#include <linux/ethtool.h> diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index 969cd68..d2f4bfb 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -482,7 +482,7 @@ int virSystemdTerminateMachine(const char *name) void virSystemdNotifyStartup(void) { -#ifdef HAVE_SYS_UN_H +#if defined(HAVE_SYS_UN_H) && defined(HAVE_MSG_NOSIGNAL) const char *path; const char *msg = "READY=1"; int fd; @@ -526,7 +526,7 @@ virSystemdNotifyStartup(void) VIR_WARN("Failed to notify systemd"); VIR_FORCE_CLOSE(fd); -#endif /* HAVE_SYS_UN_H */ +#endif /* defined(HAVE_SYS_UN_H) && defined(HAVE_MSG_NOSIGNAL) */ } static int -- 2.7.4

3 3

[libvirt] Minor compile failure on OSX for libvirt 2.0.0
by Justin Clift 20 Jul '16

20 Jul '16

Hi all, There's a minor compile failure on OSX with libvirt 2.0.0: CC util/libvirt_util_la-virtime.lo CC util/libvirt_util_la-virtpm.lo util/virsystemd.c:524:26: error: use of undeclared identifier 'MSG_NOSIGNAL' if (sendmsg(fd, &mh, MSG_NOSIGNAL) < 0) ^ 1 error generated. make[3]: *** [util/libvirt_util_la-virsystemd.lo] Error 1 make[3]: *** Waiting for unfinished jobs.... Seems solvable by adding a stub declaration for MSG_NOSIGNAL on systems that don't implement it. An initial patch with the declaration, developed by Tomasz Pajor (CC'd), is below: --- src/util/virsystemd.h.orig 2016-07-03 21:40:12.000000000 +0200 +++ src/util/virsystemd.h 2016-07-03 21:37:53.000000000 +0200 @@ -57,3 +57,7 @@ char *virSystemdGetMachineNameByPID(pid_t pid); #endif /* __VIR_SYSTEMD_H__ */ + +#ifndef MSG_NOSIGNAL +#define MSG_NOSIGNAL 0x0 //Don't request NOSIGNAL on systems where this is not implemented. +#endif It's outside the #endif for __VIR_SYSTEMD_H___ though, so I'm kind of thinking it would need to be move inside the guard (which also compiles ok), or is there a better place/file for it instead? :) Regards and best wishes, Justin Clift -- "My grandfather once told me that there are two kinds of people: those who work and those who take the credit. He told me to try to be in the first group; there was less competition there." - Indira Gandhi

3 9

[libvirt] [PATCH] qemu: Reset error if we're not going to error label
by Martin Kletzander 20 Jul '16

20 Jul '16

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/qemu/qemu_conf.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index fa9d65e91967..2a889381090f 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -266,8 +266,11 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) virFileFindHugeTLBFS(&cfg->hugetlbfs, &cfg->nhugetlbfs) < 0) { /* This however is not implemented on all platforms. */ virErrorPtr err = virGetLastError(); - if (err && err->code != VIR_ERR_NO_SUPPORT) - goto error; + if (err) { + if (err->code == VIR_ERR_NO_SUPPORT) + virResetError(err); + else + goto error; } if (VIR_STRDUP(cfg->bridgeHelperName, QEMU_BRIDGE_HELPER) < 0) -- 2.9.2

3 3

[libvirt] [PATCH 0/2] Need to set booleans in right place for hotplug cleanup
by John Ferlan 20 Jul '16

20 Jul '16

After pushing and working on the next set of changes, I realized that the setting of some booleans needed to be inside an if condition <sigh>. John Ferlan (2): qemu: Move setting of obj bools for qemuDomainAttachVirtioDiskDevice qemu: Move setting of encobjAdded for qemuDomainAttachSCSIDisk src/qemu/qemu_hotplug.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.5.5

2 3

[libvirt] [PATCH 0/3] Resolve CI build integration test failure
by John Ferlan 20 Jul '16

20 Jul '16

Details in patches... The first patch was seen by inspection. The second patch will fix the test failure. The third patch is the lipstick on the pig. John Ferlan (3): storage: Fix error path qemu: Disallow usage of luks encryption if aes secret not possible storage: Add extra failure condition for luks volume creation src/qemu/qemu_domain.c | 7 +++++++ src/storage/storage_backend.c | 8 ++++++++ tests/qemuxml2argvtest.c | 4 ++++ 3 files changed, 19 insertions(+) -- 2.5.5

2 6

[libvirt] [PATCHv2 0/3] Speed up hvsupport.pl
by Ján Tomko 20 Jul '16

20 Jul '16

This reduces the script execution time from 14.7s to 60 ms. Since this was by far the longest taking target from the docs/ directory and make does not parallelize across Makefiles, the savings are similar for a complete build from a fresh git checkout. The second patch shaves off 8.2s, the third 6.4s and the last one shaves off half of the remaining time. v2: * renamed parseAPIXML to getAPIFilenames * documented getAPIFilenames * comment in apibuild.py above the line that generates the data consumed by hvsupport.pl * more verbose commit messages Ján Tomko (3): hvsupport: use a regex instead of XML::XPath hvsupport: construct the group regex upfront hvsupport: skip non-matching lines early bootstrap.conf | 1 - docs/apibuild.py | 1 + docs/hvsupport.pl | 69 +++++++++++++++++++++++++++++++++++++------------------ 3 files changed, 48 insertions(+), 23 deletions(-) -- 2.7.3

2 6

[libvirt] [PATCH 0/3] vz: make vz driver more responsive
by Nikolay Shirokovskiy 19 Jul '16

19 Jul '16

Patches 1 and 2 are tiny fixes and cleanups. 3 has the essence. Nikolay Shirokovskiy (3): vz: use state variable sdkdom in prlsdkApplyConfig vz: remove redundant variable in prlsdkHandleVmAddedEvent vz: make vz driver more responsive src/vz/vz_driver.c | 183 ++++++++++++++++++++++++++++++++++--------------- src/vz/vz_sdk.c | 195 ++++++++++++++++++++++++++++++++++------------------- src/vz/vz_utils.c | 50 ++++++++++++++ src/vz/vz_utils.h | 7 ++ 4 files changed, 310 insertions(+), 125 deletions(-) -- 1.8.3.1

2 12

Re: [libvirt] [Libvirt-ci] Build failed in Jenkins: libvirt-daemon-check » libvirt-centos-6 #1473
by Daniel P. Berrange 19 Jul '16

19 Jul '16

Hi John, On Tue, Jul 19, 2016 at 02:58:06PM +0000, ci(a)centos.org wrote: > See <https://ci.centos.org/job/libvirt-daemon-check/systems=libvirt-centos-6/147…> This failure points to the LUKS patches. 372) QEMU XML-2-ARGV luks-disks ... In '/home/jenkins/libvirt/systems/libvirt-centos-6/tests/qemuxml2argvdata/qemuxml2argv-luks-disks.args': Offset 0 Expect [LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none /usr/bin/qemu -name encryptdisk -S -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-encryptdisk/master-key.aes -M pc-i440fx-2.1 -m 1024 -smp 1,sockets=1,cores=1,threads=1 -uuid 496898a6-e6ff-f7c8-5dc2-3cf410945ee9 -nographic -nodefaults -monitor unix:/tmp/lib/domain--1-encryptdisk/monitor.sock,server,nowait -no-acpi -boot c -usb -object secret,id=virtio-disk0-luks-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 -drive file=/storage/guest_disks/encryptdisk,key-secret=virtio-disk0-luks-secret0,format=luks,if=none,id=drive-virtio-disk0 -device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0 -object secret,id=virtio-disk1-luks-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 -drive file=/storage/guest_disks/encryptdisk2,key-secret=virtio-disk1-luks-secret0,format=luks,if=none,id=drive-virtio-disk1 -device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk1,id=virtio-disk1 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 ] Actual [LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none /usr/bin/qemu -name encryptdisk -S -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-encryptdisk/master-key.aes -M pc-i440fx-2.1 -m 1024 -smp 1,sockets=1,cores=1,threads=1 -uuid 496898a6-e6ff-f7c8-5dc2-3cf410945ee9 -nographic -nodefaults -monitor unix:/tmp/lib/domain--1-encryptdisk/monitor.sock,server,nowait -no-acpi -boot c -usb -drive file=/storage/guest_disks/encryptdisk,key-secret=AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A,format=luks,if=none,id=drive-virtio-disk0 -device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0 -drive file=/storage/guest_disks/encryptdisk2,key-secret=AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A,format=luks,if=none,id=drive-virtio-disk1 -device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk1,id=virtio-disk1 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3] ... FAILED Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

2 1

[libvirt] [PATCH] lxc: errors after the handshake won't be reported
by Cédric Bosdonnat 19 Jul '16

19 Jul '16

Any error happening after the hand shake in the lxc controller will not result in a failure as errors are checked during the handshake. Move the handshake after the last possible error. --- src/lxc/lxc_controller.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index f55aadc..825b4d4 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -2444,13 +2444,13 @@ virLXCControllerRun(virLXCControllerPtr ctrl) if (lxcControllerClearCapabilities() < 0) goto cleanup; - if (virLXCControllerDaemonHandshake(ctrl) < 0) - goto cleanup; - for (i = 0; i < ctrl->nconsoles; i++) if (virLXCControllerConsoleSetNonblocking(&(ctrl->consoles[i])) < 0) goto cleanup; + if (virLXCControllerDaemonHandshake(ctrl) < 0) + goto cleanup; + /* We must not hold open a dbus connection for life * of LXC instance, since dbus-daemon is limited to * only a few 100 connections by default -- 2.6.6

2 1

[libvirt] [PATCH v4 0/7] Add support for LUKS encrypted devices
by John Ferlan 19 Jul '16

19 Jul '16

According to Dan's post commit response: http://www.redhat.com/archives/libvir-list/2016-July/msg00088.html to the v3 series: http://www.redhat.com/archives/libvir-list/2016-June/msg01935.html using a 'passphrase' usage is not desired, rather a 'volume' usage model should be used for LUKS. So patches 1 & 2 make those alterations to already pushed docs and tests Patch 3 then repurposes the 'passphrase' usage to a 'tls' usage type. I posted with this series since it removed the 'passphrase' usage and thus flushed out any errors in subsequent patches. I could hold off and repost it with the TLS changes that will also need to be made... Patches 4-7 were reviewed previously and had been given what I took as provisional ACK's; however, I reposted the changes after the most recent review "just in case". Fortunately (I guess) I didn't push them along with the other changes. In any case, there are once again posted here - the primary difference between what's posted in this series vs. what was posted previously is the change to use a "volume" secret plus a tweak to the qemuxml2argvtest to fix some issues found while making the change. John Ferlan (7): tests: Adjust LUKS tests to use 'volume' secret type docs: Update docs to reflect LUKS secret changes Repurpose the 'passphrase' secret to 'tls' storage: Add support to create a luks volume qemu: Add secinfo for hotplug virtio disk qemu: Alter the qemuDomainGetSecretAESAlias to add new arg qemu: Add luks support for domain disk docs/aclpolkit.html.in | 2 +- docs/formatsecret.html.in | 81 +++++--- docs/formatstorage.html.in | 16 ++ docs/formatstorageencryption.html.in | 29 ++- docs/schemas/secret.rng | 6 +- include/libvirt/libvirt-secret.h | 2 +- src/access/viraccessdriverpolkit.c | 2 +- src/conf/secret_conf.c | 12 +- src/conf/virsecretobj.c | 2 +- src/libvirt_private.syms | 1 + src/qemu/qemu_alias.c | 10 +- src/qemu/qemu_alias.h | 3 +- src/qemu/qemu_command.c | 9 + src/qemu/qemu_domain.c | 40 +++- src/qemu/qemu_hotplug.c | 126 +++++++++++- src/storage/storage_backend.c | 218 +++++++++++++++++++-- src/storage/storage_backend.h | 3 +- src/util/virqemu.c | 23 +++ src/util/virqemu.h | 6 + .../qemuxml2argv-luks-disk-cipher.xml | 45 ----- .../qemuxml2argvdata/qemuxml2argv-luks-disks.args | 36 ++++ tests/qemuxml2argvdata/qemuxml2argv-luks-disks.xml | 2 +- tests/qemuxml2argvtest.c | 24 ++- .../qemuxml2xmlout-luks-disk-cipher.xml | 1 - tests/qemuxml2xmltest.c | 1 - tests/secretxml2xmlin/usage-passphrase.xml | 7 - tests/secretxml2xmlin/usage-tls.xml | 7 + tests/secretxml2xmltest.c | 2 +- tests/storagevolxml2argvtest.c | 3 +- tests/storagevolxml2xmlin/vol-luks-cipher.xml | 2 +- tests/storagevolxml2xmlin/vol-luks.xml | 2 +- tests/storagevolxml2xmlout/vol-luks-cipher.xml | 2 +- tests/storagevolxml2xmlout/vol-luks.xml | 2 +- 33 files changed, 577 insertions(+), 150 deletions(-) delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-luks-disk-cipher.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-luks-disks.args delete mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-luks-disk-cipher.xml delete mode 100644 tests/secretxml2xmlin/usage-passphrase.xml create mode 100644 tests/secretxml2xmlin/usage-tls.xml -- 2.5.5

3 20

[libvirt] [PATCH] Debug: Record the VM PID in per-VM logs.
by Prerna Saxena 19 Jul '16

19 Jul '16

For certain situations such as Out-of-memory scenarios, it is helpful to record the QEMU PID in the per-VM logs, so that correlation with kernel-reported events is easier. While this is already recorded in libvirt daemon logs as a DEBUG message, I believe it merits more attention :-) Hence introducing it in per-VM log. Signed-off-by: Prerna Saxena <saxenap.ltc(a)gmail.com> --- src/qemu/qemu_process.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 4adb14e..2d3b0f5 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4983,6 +4983,7 @@ qemuProcessLaunch(virConnectPtr conn, int ret = -1; int rv; int logfile = -1; + char *msg_buffer = NULL; qemuDomainLogContextPtr logCtxt = NULL; qemuDomainObjPrivatePtr priv = vm->privateData; virCommandPtr cmd = NULL; @@ -5095,8 +5096,14 @@ qemuProcessLaunch(virConnectPtr conn, _("Domain %s didn't show up"), vm->def->name); rv = -1; } + VIR_DEBUG("QEMU vm=%p name=%s running with pid=%llu", vm, vm->def->name, (unsigned long long)vm->pid); + ignore_value(virAsprintf(&msg_buffer, + "QEMU vm=%p name=%s running with pid=%llu", + vm, vm->def->name, (unsigned long long)vm->pid)); + qemuLogOperation(vm, msg_buffer, NULL, logCtxt); + virFree(msg_buffer); } else { VIR_DEBUG("QEMU vm=%p name=%s failed to spawn", vm, vm->def->name); -- 1.8.1.2

2 1

[libvirt] [PATCH] virt-admin: Output srv-threadpool-info data as unsigned int rather than signed
by Erik Skultety 19 Jul '16

19 Jul '16

Internally, all the data are represented as unsigned int, it is also documented in the header file that users should use our exported constants that also indicate that the data should be unsigned int. However, when polling for the current server threadpool's configuration, virt-admin uses an incorrect formatting parameter '%d' for printf. Instead, virt-admin should use formatting parameter '%u'. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1356769 Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- tools/virt-admin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virt-admin.c b/tools/virt-admin.c index c4ee8f5..a59c4c7 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -458,7 +458,7 @@ cmdSrvThreadpoolInfo(vshControl *ctl, const vshCmd *cmd) } for (i = 0; i < nparams; i++) - vshPrint(ctl, "%-15s: %d\n", params[i].field, params[i].value.ui); + vshPrint(ctl, "%-15s: %u\n", params[i].field, params[i].value.ui); ret = true; -- 2.5.5

3 2

[libvirt] [PATCH 0/7] Error path cleanup for hotplug and one function move/rename
by John Ferlan 19 Jul '16

19 Jul '16

During review of the LUKS series: http://www.redhat.com/archives/libvir-list/2016-July/msg00488.html it was noted that the error paths should use bools rather than goto failxxx type labels. So this series does that for a few of the affect APIs. There's also changes to qemuDomainAttachMemory since it seems it wasn't properly handling 'props' at least w/r/t how qemuDomainAttachRNGDevice would clean things up. Finally - another part of the review noted that the qemu command line comma escaping could be made more available since the storage driver would potentially need it to build the qemuimg command line. So I moved to virqemu and renamed. John Ferlan (7): qemu: Alter error path cleanup for qemuDomainAttachHostSCSIDevice qemu: Alter error path cleanup for qemuDomainAttachVirtioDiskDevice qemu: Alter error path cleanup for qemuDomainAttachSCSIDisk qemu: Alter error path cleanup for qemuDomainAttachChrDevice qemu: Alter error path cleanup for qemuDomainAttachRNGDevice qemu: Alter error path cleanup for qemuDomainAttachMemory qemu: Move and rename qemuBufferEscapeComma src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 33 +++------- src/qemu/qemu_hotplug.c | 163 +++++++++++++++++++++++++++-------------------- src/util/virqemu.c | 15 +++++ src/util/virqemu.h | 2 + 5 files changed, 122 insertions(+), 92 deletions(-) -- 2.5.5

2 13

[libvirt] [PATCH 0/9] Various patches as a result of Coverity
by John Ferlan 19 Jul '16

19 Jul '16

Been piling up a few Coverity changes, the later patches aren't anything critical, but the first few are newer and it seems more likely to be hit in common paths. In particular, the first 2 are from recent virconf changes. John Ferlan (9): util: Fix incorrect VIR_FREE in virConfGetValueStringList tools: Fix comparison in virLoginShellGetShellArgv tests: Need to check return of virGetLastError conf: Need to check for glisten before accessing vsh: Properly initialize res esx: Replace strtok_r usage with virStringSplitCount conf: Add ignore_value to virDomainDeviceInfoIterate calls for Clear helpers openvz: Remove need for strtok_r in openvzGenerateContainerVethName openvz: Remove strtok_r calls from openvzReadNetworkConf src/conf/domain_conf.c | 12 ++++++--- src/esx/esx_vi.c | 61 ++++++++++++++++++++-------------------------- src/openvz/openvz_conf.c | 33 +++++++++++++++---------- src/openvz/openvz_driver.c | 16 ++++++++---- src/util/virconf.c | 2 +- tests/qemuhelptest.c | 4 ++- tools/virt-login-shell.c | 6 +++-- tools/vsh.c | 4 +-- 8 files changed, 76 insertions(+), 62 deletions(-) -- 2.5.5

2 11

[libvirt] Adding ips and routes to type="ethernet" devices
by Ruben Kerkhof 19 Jul '16

19 Jul '16

Hi all, I've been playing with the recently added support for adding ips and routes to a type"ethernet" kind of device. My goal is to get rid of bridging and use host routes (/32) combined with Bird for a pure layer3 setup. Something similar to what https://www.projectcalico.org/ is doing Instead of p2p addresses with peers they use device routes (ip route add 192.168.0.1/32 dev vnet0) combined with static arp entries. I am a bit stuck though. I've created the vm with a tap device: <interface type='ethernet'> <mac address='00:1a:4a:1b:d9:cc'/> <model type='virtio'/> <rom bar="off"/> <source> <ip address='192.168.42.41' family='ipv4' peer='192.168.42.42' prefix='32'/> <route family='ipv4' address='192.168.100.0' prefix='24' gateway='192.168.42.42'/> </source> </interface> After starting, the link stays down and no ips or routes are being created: root@test1: ~# ip link show dev vnet0 15: vnet0: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state DOWN mode DEFAULT qlen 1000 link/ether fe:1a:4a:1b:d9:cc brd ff:ff:ff:ff:ff:ff root@test1: ~# ip route show default via 10.10.5.1 dev br1010 10.10.5.0/24 dev br1010 proto kernel scope link src 10.10.5.2 I feel like I'm missing a step. Who is responsible for setting the link up, it this libvirtd, qemu, or do I need to write a qemu-ifup script? Any help is greatly appreciated. Kind regards, Ruben Kerkhof

2 2

[libvirt] [PATCH] Changes to support Veritas HyperScale (VxHS) block device protocol with qemu-kvm.
by Ashish Mittal 19 Jul '16

19 Jul '16

>From 9036f749f12d3bf4bf08e7e55b6d98109dd5e5c0 Mon Sep 17 00:00:00 2001 From: Ashish Mittal <ashish.mittal(a)veritas.com> Date: Mon, 18 Jul 2016 16:21:37 -0700 Subject: [PATCH] Changes to support Veritas HyperScale (VxHS) block device protocol with qemu-kvm. Changes to support Veritas HyperScale (VxHS) block device protocol with qemu-kvm. Sample XML for a vxhs vdisk is as follows: <disk type='network' device='disk'> <driver name='qemu' type='raw' cache='none'/> <source protocol='vxhs' name='{f7dea4ad-b3b1-4a54-ad78-468b248ebdd8}'> <host name='172.172.17.2' port='9999'/> <host name='172.172.17.5' port='9999'/> </source> <backingStore/> <target dev='vda' bus='virtio'/> <serial>f7dea4ad-b3b1-4a54-ad78-468b248ebdd8</serial> <alias name='virtio-disk0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </disk> --- docs/formatdomain.html.in | 12 +++-- docs/schemas/domaincommon.rng | 1 + src/qemu/qemu_command.c | 51 ++++++++++++++++++++++ src/qemu/qemu_driver.c | 3 ++ src/qemu/qemu_parse_command.c | 21 +++++++++ src/util/virstoragefile.c | 4 +- src/util/virstoragefile.h | 1 + .../qemuxml2argv-disk-drive-network-vxhs.args | 24 ++++++++++ .../qemuxml2argv-disk-drive-network-vxhs.xml | 35 +++++++++++++++ tests/qemuxml2argvtest.c | 1 + 10 files changed, 149 insertions(+), 4 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-vxhs.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-vxhs.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 59a8bb9..13705fb 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -2171,9 +2171,9 @@ <dd> The <code>protocol</code> attribute specifies the protocol to access to the requested image. Possible values are "nbd", - "iscsi", "rbd", "sheepdog" or "gluster". If the - <code>protocol</code> attribute is "rbd", "sheepdog" or - "gluster", an additional attribute <code>name</code> is + "iscsi", "rbd", "sheepdog", "gluster" or "vxhs". If the + <code>protocol</code> attribute is "rbd", "sheepdog", "gluster" + or "vxhs", an additional attribute <code>name</code> is mandatory to specify which volume/image will be used. For "nbd", the <code>name</code> attribute is optional. For "iscsi" (<span class="since">since 1.0.4</span>), the <code>name</code> @@ -2283,6 +2283,12 @@ <td> only one </td> <td> 24007 </td> </tr> + <tr> + <td> vxhs </td> + <td> a server running Veritas HyperScale daemon </td> + <td> one or more </td> + <td> 9999 </td> + </tr> </table> <p> gluster supports "tcp", "rdma", "unix" as valid values for the diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 348dbfe..f279bf2 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1416,6 +1416,7 @@ <value>ftp</value> <value>ftps</value> <value>tftp</value> + <value>vxhs</value> </choice> </attribute> <optional> diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index fe4bb88..a52b78c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -497,6 +497,7 @@ qemuNetworkDriveGetPort(int protocol, return 0; case VIR_STORAGE_NET_PROTOCOL_RBD: + case VIR_STORAGE_NET_PROTOCOL_VXHS: case VIR_STORAGE_NET_PROTOCOL_LAST: case VIR_STORAGE_NET_PROTOCOL_NONE: /* not applicable */ @@ -889,6 +890,56 @@ qemuBuildNetworkDriveURI(virStorageSourcePtr src, ret = virBufferContentAndReset(&buf); break; + case VIR_STORAGE_NET_PROTOCOL_VXHS: + if (VIR_ALLOC(uri) < 0) + goto cleanup; + + if (src->hosts->transport == VIR_STORAGE_NET_HOST_TRANS_TCP) { + if (VIR_STRDUP(uri->scheme, + virStorageNetProtocolTypeToString(src->protocol)) < 0) + goto cleanup; + } else { + if (virAsprintf(&uri->scheme, "%s+%s", + virStorageNetProtocolTypeToString(src->protocol), + virStorageNetHostTransportTypeToString(src->hosts->transport)) < 0) + goto cleanup; + } + + if (src->path) { + if (src->volume) { + if (virAsprintf(&uri->path, "/%s%s", + src->volume, src->path) < 0) + goto cleanup; + } else { + if (virAsprintf(&uri->path, "%s%s", + src->path[0] == '/' ? "" : "/", + src->path) < 0) + goto cleanup; + } + } + + if (src->hosts->socket && + virAsprintf(&uri->query, "socket=%s", src->hosts->socket) < 0) + goto cleanup; + + if (qemuBuildGeneralSecinfoURI(uri, secinfo) < 0) + goto cleanup; + + for (i = 0; i < src->nhosts; i++) { + if ((uri->port = qemuNetworkDriveGetPort(src->protocol, src->hosts[i].port)) < 0) + goto cleanup; + + if (VIR_STRDUP(uri->server, src->hosts[i].name) < 0) + goto cleanup; + + ret = virURIFormat(uri); + virBufferEscape(&buf, ',', ",", "%s", ret); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("qemuBuildVxHSString builturi '%s'"), ret); + } + + ret = virBufferContentAndReset(&buf); + break; case VIR_STORAGE_NET_PROTOCOL_LAST: case VIR_STORAGE_NET_PROTOCOL_NONE: diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index cda85f6..1fdc8b0 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -13359,6 +13359,7 @@ qemuDomainSnapshotPrepareDiskExternalBackingInactive(virDomainDiskDefPtr disk) case VIR_STORAGE_NET_PROTOCOL_FTP: case VIR_STORAGE_NET_PROTOCOL_FTPS: case VIR_STORAGE_NET_PROTOCOL_TFTP: + case VIR_STORAGE_NET_PROTOCOL_VXHS: case VIR_STORAGE_NET_PROTOCOL_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, _("external inactive snapshots are not supported on " @@ -13421,6 +13422,7 @@ qemuDomainSnapshotPrepareDiskExternalOverlayActive(virDomainSnapshotDiskDefPtr d case VIR_STORAGE_NET_PROTOCOL_FTP: case VIR_STORAGE_NET_PROTOCOL_FTPS: case VIR_STORAGE_NET_PROTOCOL_TFTP: + case VIR_STORAGE_NET_PROTOCOL_VXHS: case VIR_STORAGE_NET_PROTOCOL_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, _("external active snapshots are not supported on " @@ -13565,6 +13567,7 @@ qemuDomainSnapshotPrepareDiskInternal(virConnectPtr conn, case VIR_STORAGE_NET_PROTOCOL_FTP: case VIR_STORAGE_NET_PROTOCOL_FTPS: case VIR_STORAGE_NET_PROTOCOL_TFTP: + case VIR_STORAGE_NET_PROTOCOL_VXHS: case VIR_STORAGE_NET_PROTOCOL_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, _("internal inactive snapshots are not supported on " diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c index 3f7e445..65d9983 100644 --- a/src/qemu/qemu_parse_command.c +++ b/src/qemu/qemu_parse_command.c @@ -263,6 +263,16 @@ qemuParseNBDString(virDomainDiskDefPtr disk) return -1; } +static int +qemuParseVxHSString(virDomainDiskDefPtr def) +{ + virURIPtr uri = NULL; + + if (!(uri = virURIParse(def->src->path))) + return -1; + + return qemuParseDriveURIString(def, uri, "vxhs"); +} /* * This method takes a string representing a QEMU command line ARGV set @@ -737,6 +747,12 @@ qemuParseCommandLineDisk(virDomainXMLOptionPtr xmlopt, if (VIR_STRDUP(def->src->path, vdi) < 0) goto error; } + } else if (STRPREFIX(def->src->path, "vxhs:")) { + def->src->type = VIR_STORAGE_TYPE_NETWORK; + def->src->protocol = VIR_STORAGE_NET_PROTOCOL_VXHS; + + if (qemuParseVxHSString(def) < 0) + goto error; } else { def->src->type = VIR_STORAGE_TYPE_FILE; } @@ -2009,6 +2025,11 @@ qemuParseCommandLine(virCapsPtr caps, goto error; break; + case VIR_STORAGE_NET_PROTOCOL_VXHS: + if (qemuParseVxHSString(disk) < 0) + goto error; + + break; case VIR_STORAGE_NET_PROTOCOL_HTTP: case VIR_STORAGE_NET_PROTOCOL_HTTPS: case VIR_STORAGE_NET_PROTOCOL_FTP: diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 16de603..11f9b2c 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -83,7 +83,8 @@ VIR_ENUM_IMPL(virStorageNetProtocol, VIR_STORAGE_NET_PROTOCOL_LAST, "https", "ftp", "ftps", - "tftp") + "tftp", + "vxhs") VIR_ENUM_IMPL(virStorageNetHostTransport, VIR_STORAGE_NET_HOST_TRANS_LAST, "tcp", @@ -2500,6 +2501,7 @@ virStorageSourceParseBackingColon(virStorageSourcePtr src, case VIR_STORAGE_NET_PROTOCOL_TFTP: case VIR_STORAGE_NET_PROTOCOL_ISCSI: case VIR_STORAGE_NET_PROTOCOL_GLUSTER: + case VIR_STORAGE_NET_PROTOCOL_VXHS: virReportError(VIR_ERR_INTERNAL_ERROR, _("malformed backing store path for protocol %s"), protocol); diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h index 78beaf4..586d843 100644 --- a/src/util/virstoragefile.h +++ b/src/util/virstoragefile.h @@ -132,6 +132,7 @@ typedef enum { VIR_STORAGE_NET_PROTOCOL_FTP, VIR_STORAGE_NET_PROTOCOL_FTPS, VIR_STORAGE_NET_PROTOCOL_TFTP, + VIR_STORAGE_NET_PROTOCOL_VXHS, VIR_STORAGE_NET_PROTOCOL_LAST } virStorageNetProtocol; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-vxhs.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-vxhs.args new file mode 100644 index 0000000..3553bad --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-vxhs.args @@ -0,0 +1,24 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/libexec/qemu-kvm \ +-name QEMUGuest1 \ +-S \ +-M pc \ +-cpu qemu32 \ +-m 214 \ +-smp 1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-drive file=vxhs://192.168.0.1:9999/%7Beb90327c-8302-4725-9e1b-4e85ed4dc251%7D\ +vxhs://172.172.17.56:9999/%7Beb90327c-8302-4725-9e1b-4e85ed4dc251%7D,\ +format=raw,if=none,id=drive-virtio-disk0,cache=none \ +-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-vxhs.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-vxhs.xml new file mode 100644 index 0000000..6ef2d98 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-vxhs.xml @@ -0,0 +1,35 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/libexec/qemu-kvm</emulator> + <disk type='network' device='disk'> + <driver name='qemu' type='raw' cache='none'/> + <source protocol='vxhs' name='{eb90327c-8302-4725-9e1b-4e85ed4dc251}'> + <host name='192.168.0.1' port='9999'/> + <host name='172.172.17.56' port='9999'/> + </source> + <backingStore/> + <target dev='vda' bus='virtio'/> + <serial>eb90327c-8302-4725-9e1b-4e85ed4dc251</serial> + <alias name='virtio-disk0'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index e0d07e8..13ef4e4 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -801,6 +801,7 @@ mymain(void) # endif DO_TEST("disk-drive-network-rbd-ipv6", NONE); DO_TEST_FAILURE("disk-drive-network-rbd-no-colon", NONE); + DO_TEST("disk-drive-network-vxhs", NONE); DO_TEST("disk-drive-no-boot", QEMU_CAPS_BOOTINDEX); DO_TEST_PARSE_ERROR("disk-device-lun-type-invalid", -- 2.5.4 (Apple Git-61)

2 1

[libvirt] [PATCH] fs: Fix '<' comparison of value produced by logical not '!'
by Erik Skultety 19 Jul '16

19 Jul '16

Commit da665fbd introduced the following condition to virLXCProcessEnsureRootFS and openvzReadFSConf: if (!(<some_var> = virDomainFSDefNew()) < 0) which broke the build on fedora with GCC 5.3.1: "logical not is only applied to the left hand side of comparison". Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- Pushed under the build breaker rule. src/lxc/lxc_process.c | 2 +- src/openvz/openvz_conf.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 6761394..7703fe1 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -1153,7 +1153,7 @@ virLXCProcessEnsureRootFS(virDomainObjPtr vm) if (root) return 0; - if (!(root = virDomainFSDefNew()) < 0) + if (!(root = virDomainFSDefNew())) goto error; root->type = VIR_DOMAIN_FS_TYPE_MOUNT; diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index cb30b32..9b820a9 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -351,7 +351,7 @@ openvzReadFSConf(virDomainDefPtr def, veid); goto error; } else if (ret > 0) { - if (!(fs = virDomainFSDefNew()) < 0) + if (!(fs = virDomainFSDefNew())) goto error; fs->type = VIR_DOMAIN_FS_TYPE_TEMPLATE; -- 2.5.5

1 0