- Devel - libvirt List Archives

[libvirt] How to implement pool support in virt-aa-helper?
by Christian Ehrhardt 19 Sep '17

19 Sep '17

Hi, Currently virt-aa-helper has no support for pools, so if you use a volume from a pool like: <disk type='volume' device='disk'> <driver name='qemu' type='raw' cache='none'/> <source pool='internal' volume='foo'/> <target dev='vdc' bus='virtio'/> </disk> Then there is no matching apparmor rule generated to allow qemu to access the related devices. That goes along a simple pool like: # create a zpool to use $ for i in $(seq 1 3); do dd if=/dev/zero of=/tmp/fdisk${i} bs=1M count=1024; done $ sudo zpool create internal /tmp/fdisk* # make pool in libvirt and guest disk foo $ virsh pool-define-as internal zfs $ virsh pool-start internal $ virsh vol-create-as internal foo 2G When libvirt actually builds up the command for qemu what to use based on the pools information it uses the function "virStorageTranslateDiskSourcePool" to learn about the actual path of the disk. Usually virt-aa-helper tries to stay close to what libvirt does to spawn the guest, because only then the generated rules match what will be used. But in this case this isn't as easy. The lookup by "virStorageTranslateDiskSourcePool" is done on a virConnectPtr via: conn->storageDriver->storagePoolLookupByName That is fine from the code that sets up the guest, but virt-aa-helper has no virConnectPtr context. Surely virt-aa-helper could connect via e.g. "virConnectOpenReadOnly" but the lifecycle of virt-aa-helper doesn't match that. It is invoked as external program by libvirtd local to the execution of the guest e.g. the qemu. So adding a connection via a socket makes not much sense. Also in this environment the connect URI is not set and also not passed to virt-aa-helper so we can't be sure we have "the same". I found that while trying to implement that, but I don't like the preliminary change [1] for the reasons I identified and outlined above. It initializes the storage drivers correctly, but then fails to look up [2] and since I doubt it is the right way for the environment and lifecycle of virt-aa-helper I don't want to go down that way before having a discussion about it. Therefore I wanted to ask for some guidance: 1. is there a reasonable way to be able to call virStorageTranslateDiskSourcePool from virt-aa-helper 2. maybe I overlook a path to get to a valid virConnectPtr from the virDomainDefPtr or any other in [3] that virt-aa-helper aready has. 3. what would be an alternative to be able to translate pool/volume info to real paths from virt-aa-helper [1]: http://paste.ubuntu.com/25570670/ [2]: http://paste.ubuntu.com/25570673/ [3]: http://paste.ubuntu.com/25570720/ -- Christian Ehrhardt Software Engineer, Ubuntu Server Canonical Ltd

2 1

[libvirt] [PATCH 0/2] qemu: blockPeek: Fix invalid buffer usage and
by Peter Krempa 19 Sep '17

19 Sep '17

See 1/2 for the bugfix. Peter Krempa (2): qemu: blockPeek: Fix filling of the return buffer qemu: blockPeek: Enforce buffer filling src/qemu/qemu_driver.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) -- 2.14.1

2 4

[libvirt] [PATCH] qemu: Introduce a wrapper over virFileWrapperFdClose
by Michal Privoznik 19 Sep '17

19 Sep '17

https://bugzilla.redhat.com/show_bug.cgi?id=1448268 When migrating to a file (e.g. when doing 'virsh save file'), couple of things are happening in the thread that is executing the API: 1) the domain obj is locked 2) iohelper is spawned as a separate process to handle all I/O 3) the thread waits for iohelper to finish 4) the domain obj is unlocked Now, the problem is that while the thread waits in step 3 for iohelper to finish this may take ages because iohelper calls fdatasync(). And unfortunately, we are waiting the whole time with the domain locked. So if another thread wants to jump in and say copy the domain name ('virsh list' for instance), they are stuck. The solution is to unlock the domain whenever waiting for I/O and lock it back again when it finished. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_driver.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b334cf20b..f81d3def4 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3216,6 +3216,25 @@ qemuOpenFileAs(uid_t fallback_uid, gid_t fallback_gid, goto cleanup; } + +static int +qemuFileWrapperFDClose(virDomainObjPtr vm, + virFileWrapperFdPtr fd) +{ + int ret; + + /* virFileWrapperFd uses iohelper to write data onto disk. + * However, iohelper calls fdatasync() which may take ages to + * finish. Therefore, we shouldn't be waiting with the domain + * object locked. */ + + virObjectUnlock(vm); + ret = virFileWrapperFdClose(fd); + virObjectLock(vm); + return ret; +} + + /* Helper function to execute a migration to file with a correct save header * the caller needs to make sure that the processors are stopped and do all other * actions besides saving memory */ @@ -3276,7 +3295,7 @@ qemuDomainSaveMemory(virQEMUDriverPtr driver, goto cleanup; } - if (virFileWrapperFdClose(wrapperFd) < 0) + if (qemuFileWrapperFDClose(vm, wrapperFd) < 0) goto cleanup; if ((fd = qemuOpenFile(driver, vm, path, O_WRONLY, NULL, NULL)) < 0 || @@ -3827,7 +3846,7 @@ doCoreDump(virQEMUDriverPtr driver, path); goto cleanup; } - if (virFileWrapperFdClose(wrapperFd) < 0) + if (qemuFileWrapperFDClose(vm, wrapperFd) < 0) goto cleanup; ret = 0; @@ -6687,7 +6706,7 @@ qemuDomainRestoreFlags(virConnectPtr conn, ret = qemuDomainSaveImageStartVM(conn, driver, vm, &fd, data, path, false, QEMU_ASYNC_JOB_START); - if (virFileWrapperFdClose(wrapperFd) < 0) + if (qemuFileWrapperFDClose(vm, wrapperFd) < 0) VIR_WARN("Failed to close %s", path); qemuProcessEndJob(driver, vm); @@ -6962,7 +6981,7 @@ qemuDomainObjRestore(virConnectPtr conn, ret = qemuDomainSaveImageStartVM(conn, driver, vm, &fd, data, path, start_paused, asyncJob); - if (virFileWrapperFdClose(wrapperFd) < 0) + if (qemuFileWrapperFDClose(vm, wrapperFd) < 0) VIR_WARN("Failed to close %s", path); cleanup: -- 2.13.5

2 2

[libvirt] [PATCH v5 0/2] Add support for qcow2 cache
by Liu Qing 19 Sep '17

19 Sep '17

Qcow2 small IO random write performance will drop dramatically if the l2 cache table could not cover the whole disk. This will be a lot of l2 cache table RW operations if cache miss happens frequently. This patch exports the qcow2 driver parameter l2-cache-size/refcount-cache-size, first added in Qemu 2.2, and cache-clean-interval, first added in Qemu 2.5, in libvirt. change since v4: updated doc and did code adjustment based on John Ferlan's review. Liu Qing (2): conf, docs: Add qcow2 cache configuration support qemu: add capability checking for qcow2 cache configuration docs/formatdomain.html.in | 41 +++++++++ docs/schemas/domaincommon.rng | 35 ++++++++ src/conf/domain_conf.c | 96 ++++++++++++++++++++-- src/qemu/qemu_capabilities.c | 11 +++ src/qemu/qemu_capabilities.h | 5 ++ src/qemu/qemu_command.c | 33 ++++++++ src/qemu/qemu_driver.c | 5 ++ src/util/virstoragefile.c | 3 + src/util/virstoragefile.h | 6 ++ tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 3 + .../caps_2.6.0-gicv2.aarch64.xml | 3 + .../caps_2.6.0-gicv3.aarch64.xml | 3 + tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml | 3 + tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 3 + tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 3 + tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 3 + tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 3 + tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 3 + tests/qemucapabilitiesdata/caps_2.9.0.ppc64le.xml | 3 + tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 3 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 3 + .../qemuxml2argv-disk-drive-qcow2-cache.args | 28 +++++++ .../qemuxml2argv-disk-drive-qcow2-cache.xml | 43 ++++++++++ tests/qemuxml2argvtest.c | 4 + .../qemuxml2xmlout-disk-drive-qcow2-cache.xml | 43 ++++++++++ tests/qemuxml2xmltest.c | 1 + 26 files changed, 385 insertions(+), 5 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-qcow2-cache.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-qcow2-cache.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-qcow2-cache.xml -- 1.8.3.1

3 5

[libvirt] [PATCH 0/2] [V2] Implement LVM volume resize via lvresize
by apolyakov＠beget.ru 19 Sep '17

19 Sep '17

From: Alexander Polyakov <apolyakov(a)beget.com> Includes suggestions by John Ferlan & Peter Krempa Alexander Polyakov (2): logical: implement volume resize news: Document lvm volume resize docs/news.xml | 8 ++++++++ m4/virt-storage-lvm.m4 | 4 ++++ src/storage/storage_backend_logical.c | 37 +++++++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+) -- 2.13.5

2 4

[libvirt] [PATCH] apparmor: cater for new AAVMF image location
by Guido Günther 18 Sep '17

18 Sep '17

Things moved again, sigh. --- src/security/virt-aa-helper.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 55a686a59c..0b43c8e391 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -516,7 +516,8 @@ valid_path(const char *path, const bool readonly) "/usr/share/OVMF/", /* for OVMF images */ "/usr/share/ovmf/", /* for OVMF images */ "/usr/share/AAVMF/", /* for AAVMF images */ - "/usr/share/qemu-efi/" /* for AAVMF images */ + "/usr/share/qemu-efi/", /* for AAVMF images */ + "/usr/share/qemu-efi-aarch64/" /* for AAVMF images */ }; /* override the above with these */ const char * const override[] = { -- 2.14.1

4 4

[libvirt] [PATCH] apparmor: add attach_disconnected
by Guido Günther 18 Sep '17

18 Sep '17

Otherwise we fail to reconnect to /dev/net/tun opened by libvirtd like [ 8144.507756] audit: type=1400 audit(1505488162.386:38069121): apparmor="DENIED" operation="file_perm" info="Failed name lookup - disconnected path" error=-13 profile="libvirt-5dfcc8a7-b79a-4fa9-a41f-f6271651934c" name="dev/net/tun" pid=9607 comm="qemu-system-x86" requested_mask="r" denied_mask="r" fsuid=117 ouid=0 --- I do wonder why we didn't see this earlier though. examples/apparmor/TEMPLATE.lxc | 2 +- examples/apparmor/TEMPLATE.qemu | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/apparmor/TEMPLATE.lxc b/examples/apparmor/TEMPLATE.lxc index 7b64885a1c..f1005dc575 100644 --- a/examples/apparmor/TEMPLATE.lxc +++ b/examples/apparmor/TEMPLATE.lxc @@ -4,7 +4,7 @@ #include <tunables/global> -profile LIBVIRT_TEMPLATE { +profile LIBVIRT_TEMPLATE flags=(attach_disconnected) { #include <abstractions/libvirt-lxc> # Globally allows everything to run under this profile diff --git a/examples/apparmor/TEMPLATE.qemu b/examples/apparmor/TEMPLATE.qemu index 008a221244..a327315d92 100644 --- a/examples/apparmor/TEMPLATE.qemu +++ b/examples/apparmor/TEMPLATE.qemu @@ -4,6 +4,6 @@ #include <tunables/global> -profile LIBVIRT_TEMPLATE { +profile LIBVIRT_TEMPLATE flags=(attach_disconnected) { #include <abstractions/libvirt-qemu> } -- 2.14.1

4 4

[libvirt] [PATCHv2] nodedev: add switchdev to NIC capabilities
by Edan David 18 Sep '17

18 Sep '17

Adding functionality to libvirt that will allow querying the interface for the availability of switchdev Offloading NIC capabilities. The switchdev mode was introduced in kernel 4.8, the iproute2-devlink command to retrieve the swtichdev NIC feature, Command example: devlink dev eswitch show pci/0000:03:00.0 This feature is needed for Openstack so we can do a scheduling decision if the NIC is in Hardware Offload (switchdev) or regular SR-IOV (legacy) mode. And select the appropriate hypervisors with the requested capability see [1]. [1] - https://specs.openstack.org/openstack/nova-specs/specs/pike/approved/enable… --- configure.ac | 13 ++ docs/formatnode.html.in | 1 + src/util/virnetdev.c | 187 +++++++++++++++++++++- src/util/virnetdev.h | 1 + tests/nodedevschemadata/net_00_13_02_b9_f9_d3.xml | 1 + tests/nodedevschemadata/net_00_15_58_2f_e9_55.xml | 1 + 6 files changed, 203 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index b12b7fa..c089798 100644 --- a/configure.ac +++ b/configure.ac @@ -627,6 +627,19 @@ if test "$with_linux" = "yes"; then AC_CHECK_HEADERS([linux/btrfs.h]) fi +dnl +dnl check for kernel headers required by devlink +dnl +if test "$with_linux" = "yes"; then + AC_CHECK_HEADERS([linux/devlink.h]) + AC_CHECK_DECLS([DEVLINK_GENL_VERSION, DEVLINK_GENL_NAME, DEVLINK_ATTR_MAX, DEVLINK_CMD_ESWITCH_GET, DEVLINK_ATTR_BUS_NAME, DEVLINK_ATTR_DEV_NAME, DEVLINK_ATTR_ESWITCH_MODE, DEVLINK_ESWITCH_MODE_SWITCHDEV], + [AC_DEFINE([HAVE_DECL_DEVLINK], + [1], + [whether devlink declarations is available])], + [], + [[#include <linux/devlink.h>]]) +fi + dnl Allow perl/python overrides AC_PATH_PROGS([PYTHON], [python2 python]) if test -z "$PYTHON"; then diff --git a/docs/formatnode.html.in b/docs/formatnode.html.in index 4d935b5..29244a8 100644 --- a/docs/formatnode.html.in +++ b/docs/formatnode.html.in @@ -227,6 +227,7 @@ <dt><code>rxhash</code></dt><dd>receive-hashing</dd> <dt><code>rdma</code></dt><dd>remote-direct-memory-access</dd> <dt><code>txudptnl</code></dt><dd>tx-udp-tunnel-segmentation</dd> + <dt><code>switchdev</code></dt><dd>kernel-forward-plane-offload</dd> </dl> </dd> <dt><code>capability</code></dt> diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 51a6e42..fc7c961 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -59,6 +59,10 @@ # include <net/if_dl.h> #endif +#if HAVE_DECL_DEVLINK +# include <linux/devlink.h> +#endif + #ifndef IFNAMSIZ # define IFNAMSIZ 16 #endif @@ -2481,7 +2485,8 @@ VIR_ENUM_IMPL(virNetDevFeature, "ntuple", "rxhash", "rdma", - "txudptnl") + "txudptnl", + "switchdev") #ifdef __linux__ int @@ -2936,6 +2941,7 @@ int virNetDevGetRxFilter(const char *ifname, return ret; } + #if defined(SIOCETHTOOL) && defined(HAVE_STRUCT_IFREQ) /** @@ -3115,6 +3121,182 @@ virNetDevGetEthtoolFeatures(virBitmapPtr bitmap, } +#if HAVE_DECL_DEVLINK +/** + * virNetDevPutExtraHeader + * reserve and prepare room for an extra header + * This function sets to zero the room that is required to put the extra + * header after the initial Netlink header. This function also increases + * the nlmsg_len field. + * + * @nlh: pointer to Netlink header + * @size: size of the extra header that we want to put + * + * Returns pointer to the start of the extended header + */ +static void * +virNetDevPutExtraHeader(struct nlmsghdr *nlh, + size_t size) +{ + char *ptr = (char *)nlh + nlh->nlmsg_len; + size_t len = NLMSG_ALIGN(size); + nlh->nlmsg_len += len; + memset(ptr, 0, len); + return ptr; +} + + +/** + * virNetDevGetFamilyId: + * This function supplies the devlink family id + * + * @family_name: the name of the family to query + * + * Returns family id or 0 on failure. + */ +static uint32_t +virNetDevGetFamilyId(const char *family_name) +{ + struct nl_msg *nl_msg = NULL; + struct nlmsghdr *resp = NULL; + struct genlmsghdr* gmsgh = NULL; + struct nlattr *tb[CTRL_ATTR_MAX + 1] = {NULL, }; + unsigned int recvbuflen; + uint32_t family_id = 0; + + if (!(nl_msg = nlmsg_alloc_simple(GENL_ID_CTRL, + NLM_F_REQUEST | NLM_F_ACK))) { + virReportOOMError(); + goto cleanup; + } + + if (!(gmsgh = virNetDevPutExtraHeader(nlmsg_hdr(nl_msg), sizeof(struct genlmsghdr)))) + 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")); + goto cleanup; + } + + if (virNetlinkCommand(nl_msg, &resp, &recvbuflen, 0, 0, NETLINK_GENERIC, 0) < 0) + goto cleanup; + + if (nlmsg_parse(resp, sizeof(struct nlmsghdr), tb, CTRL_CMD_MAX, NULL) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("malformed netlink response message")); + goto cleanup; + } + + if (tb[CTRL_ATTR_FAMILY_ID] == NULL) + goto cleanup; + + family_id = *(uint32_t *)RTA_DATA(tb[CTRL_ATTR_FAMILY_ID]); + + cleanup: + nlmsg_free(nl_msg); + VIR_FREE(resp); + return family_id; +} + + +/** + * virNetDevSwitchdevFeature + * This function checks for the availability of Switchdev feature + * and add it to bitmap + * + * @ifname: name of the interface + * @out: add Switchdev feature if exist to bitmap + * + * Returns 0 on success, -1 on failure. + */ +static int +virNetDevSwitchdevFeature(const char *ifname, + virBitmapPtr *out) +{ + struct nl_msg *nl_msg = NULL; + struct nlmsghdr *resp = NULL; + unsigned int recvbuflen; + struct nlattr *tb[DEVLINK_ATTR_MAX + 1] = {NULL, }; + virPCIDevicePtr pci_device_ptr = NULL; + struct genlmsghdr* gmsgh = NULL; + const char *pci_name; + char *pfname = NULL; + int is_vf = -1; + int ret = -1; + uint32_t family_id; + + if ((family_id = virNetDevGetFamilyId(DEVLINK_GENL_NAME)) <= 0) + return ret; + + if ((is_vf = virNetDevIsVirtualFunction(ifname)) < 0) + return ret; + + if (is_vf == 1 && virNetDevGetPhysicalFunction(ifname, &pfname) < 0) + goto cleanup; + + if (!(nl_msg = nlmsg_alloc_simple(family_id, + NLM_F_REQUEST | NLM_F_ACK))) { + virReportOOMError(); + goto cleanup; + } + + if (!(gmsgh = virNetDevPutExtraHeader(nlmsg_hdr(nl_msg), sizeof(struct genlmsghdr)))) + goto cleanup; + + gmsgh->cmd = DEVLINK_CMD_ESWITCH_GET; + gmsgh->version = DEVLINK_GENL_VERSION; + + pci_device_ptr = pfname ? virNetDevGetPCIDevice(pfname) : + virNetDevGetPCIDevice(ifname); + if (pci_device_ptr == NULL) + goto cleanup; + + pci_name = virPCIDeviceGetName(pci_device_ptr); + + if (nla_put(nl_msg, DEVLINK_ATTR_BUS_NAME, strlen("pci")+1, "pci") < 0 || + nla_put(nl_msg, DEVLINK_ATTR_DEV_NAME, strlen(pci_name)+1, pci_name) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("allocated netlink buffer is too small")); + goto cleanup; + } + + if (virNetlinkCommand(nl_msg, &resp, &recvbuflen, 0, 0, NETLINK_GENERIC, 0) < 0) + goto cleanup; + + if (nlmsg_parse(resp, sizeof(struct genlmsghdr), tb, DEVLINK_ATTR_MAX, NULL) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("malformed netlink response message")); + goto cleanup; + } + + if (tb[DEVLINK_ATTR_ESWITCH_MODE] && + *(int *)RTA_DATA(tb[DEVLINK_ATTR_ESWITCH_MODE]) == DEVLINK_ESWITCH_MODE_SWITCHDEV) { + ignore_value(virBitmapSetBit(*out, VIR_NET_DEV_FEAT_SWITCHDEV)); + } + + ret = 0; + + cleanup: + nlmsg_free(nl_msg); + virPCIDeviceFree(pci_device_ptr); + VIR_FREE(resp); + VIR_FREE(pfname); + return ret; +} +#else +static int +virNetDevSwitchdevFeature(const char *ifname ATTRIBUTE_UNUSED, + virBitmapPtr *out ATTRIBUTE_UNUSED) +{ + return 0; +} +#endif + + # if HAVE_DECL_ETHTOOL_GFEATURES /** * virNetDevGFeatureAvailable @@ -3315,6 +3497,9 @@ virNetDevGetFeatures(const char *ifname, if (virNetDevRDMAFeature(ifname, out) < 0) goto cleanup; + if (virNetDevSwitchdevFeature(ifname, out) < 0) + goto cleanup; + ret = 0; cleanup: VIR_FORCE_CLOSE(fd); diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h index 9205c0e..71eaf45 100644 --- a/src/util/virnetdev.h +++ b/src/util/virnetdev.h @@ -112,6 +112,7 @@ typedef enum { VIR_NET_DEV_FEAT_RXHASH, VIR_NET_DEV_FEAT_RDMA, VIR_NET_DEV_FEAT_TXUDPTNL, + VIR_NET_DEV_FEAT_SWITCHDEV, VIR_NET_DEV_FEAT_LAST } virNetDevFeature; diff --git a/tests/nodedevschemadata/net_00_13_02_b9_f9_d3.xml b/tests/nodedevschemadata/net_00_13_02_b9_f9_d3.xml index d4c96e8..88252e6 100644 --- a/tests/nodedevschemadata/net_00_13_02_b9_f9_d3.xml +++ b/tests/nodedevschemadata/net_00_13_02_b9_f9_d3.xml @@ -15,6 +15,7 @@ <feature name='rxhash'/> <feature name='rdma'/> <feature name='txudptnl'/> + <feature name='switchdev'/> <capability type='80211'/> </capability> </device> diff --git a/tests/nodedevschemadata/net_00_15_58_2f_e9_55.xml b/tests/nodedevschemadata/net_00_15_58_2f_e9_55.xml index 71bf90e..f77dfcc 100644 --- a/tests/nodedevschemadata/net_00_15_58_2f_e9_55.xml +++ b/tests/nodedevschemadata/net_00_15_58_2f_e9_55.xml @@ -15,6 +15,7 @@ <feature name='rxhash'/> <feature name='rdma'/> <feature name='txudptnl'/> + <feature name='switchdev'/> <capability type='80203'/> </capability> </device> -- 2.1.4

4 11

[libvirt] [PATCH v2 0/3] Be more selective when determining cdrom for taint messaging
by John Ferlan 18 Sep '17

18 Sep '17

v1: https://www.redhat.com/archives/libvir-list/2017-September/msg00103.html Changes since v1: Split into 3 parts... The first patch would be the bare minimum using STRPREFIX instead of STREQ type comparisons for the incoming path to be "/dev/cdrom[N]" or "/dev/srN" (or resolved to that). This would "work" for the most part, but then since it's possible to make even more checks let's check against the collected node device data. Patch 2 therefore will "tag" the already collected cdrom data with a capability. This allows patch3 to find any/all CDROM's on the host and compare the resolved path to that list of devices returning "true" if something matches a node device declared physical CDROM. I split things up mainly to make it easier to decide whether patch 1 is sufficient or not. If patch2 and patch3 are OK, I would also add a release note indicating the improvement to find CDROM by node device capability. It's a separate "improvement" on it's own as well. Whether it's truly useful or not, is a different question... John Ferlan (3): qemu: Be more selective when determining cdrom for taint messaging nodedev: Add capability bit to detect 'cdrom' devices qemu: Add inquiry to nodedev for cdrom taint checking include/libvirt/libvirt-nodedev.h | 1 + src/conf/node_device_conf.c | 6 ++- src/conf/node_device_conf.h | 5 ++- src/conf/virnodedeviceobj.c | 21 ++++++++-- src/node_device/node_device_driver.c | 1 + src/node_device/node_device_udev.c | 2 + src/qemu/qemu_domain.c | 78 +++++++++++++++++++++++++++++++++++- src/qemu/qemu_domain.h | 2 + src/qemu/qemu_driver.c | 4 +- src/qemu/qemu_process.c | 2 +- tools/virsh-nodedev.c | 3 ++ tools/virsh.pod | 2 +- 12 files changed, 116 insertions(+), 11 deletions(-) -- 2.9.5

2 5

[libvirt] [PATCH v3 0/6] Work around the kernel mdev uevent race in nodedev
by Erik Skultety 18 Sep '17

18 Sep '17

v2 here: https://www.redhat.com/archives/libvir-list/2017-July/msg01268.html Since v2: - added patch 4/6 that fixes the issue with the handler thread spamming logs with "udev_monitor_receive_device returned NULL" -> the event loop callback now disables polling on the udev monitor's fd every time there's a new event, leaving the responsibility for re-enabling it back to the handler thread once it had removed the corresponding data from the socket. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1463285 Erik Skultety (6): nodedev: Introduce udevCheckMonitorFD helper function udev: Split udevEventHandleCallback in two functions udev: Convert udevEventHandleThread to an actual thread routine nodedev: Disable/re-enable polling on the udev fd util: Introduce virFileWaitForAccess nodedev: Work around the uevent race by hooking up virFileWaitForAccess src/libvirt_private.syms | 1 + src/node_device/node_device_udev.c | 208 ++++++++++++++++++++++++++++++++----- src/util/virfile.c | 29 ++++++ src/util/virfile.h | 2 + 4 files changed, 214 insertions(+), 26 deletions(-) -- 2.13.3

2 22

[libvirt] [PATCH go-xml] Add support for domain hostdev and test code
by zhenwei.pi 18 Sep '17

18 Sep '17

Signed-off-by: zhenwei.pi <zhenwei.pi(a)youruncloud.com> --- domain.go | 36 ++++++++++++++++++++++++++++++++++++ domain_test.go | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+) diff --git a/domain.go b/domain.go index bead49a..1bcc9cc 100644 --- a/domain.go +++ b/domain.go @@ -407,6 +407,29 @@ type DomainRNG struct { Backend *DomainRNGBackend `xml:"backend"` } +type DomainHostdevAdapter struct { + Name string `xml:"name,attr,omitempty"` +} + +type DomainHostdevSource struct { + Protocol string `xml:"protocol,attr,omitempty"` + Name string `xml:"name,attr,omitempty"` + Wwpn string `xml:"wwpn,attr,omitempty"` + Adapter *DomainHostdevAdapter `xml:"adapter"` + Address *DomainAddress `xml:"address"` +} + +type DomainHostdev struct { + XMLName xml.Name `xml:"hostdev"` + Mode string `xml:"mode,attr"` + Type string `xml:"type,attr"` + Sgio string `xml:"sgio,attr,omitempty"` + Rawio string `xml:"rawio,attr,omitempty"` + Managed string `xml:"managed,attr,omitempty"` + Source *DomainHostdevSource `xml:"source"` + Address *DomainAddress `xml:"address"` +} + type DomainDeviceList struct { Emulator string `xml:"emulator,omitempty"` Controllers []DomainController `xml:"controller"` @@ -422,6 +445,7 @@ type DomainDeviceList struct { MemBalloon *DomainMemBalloon `xml:"memballoon"` Sounds []DomainSound `xml:"sound"` RNGs []DomainRNG `xml:"rng"` + Hostdevs []DomainHostdev `xml:"hostdev"` } type DomainMemory struct { @@ -794,6 +818,18 @@ func (d *DomainRNG) Marshal() (string, error) { return string(doc), nil } +func (d *DomainHostdev) Unmarshal(doc string) error { + return xml.Unmarshal([]byte(doc), d) +} + +func (d *DomainHostdev) Marshal() (string, error) { + doc, err := xml.MarshalIndent(d, "", " ") + if err != nil { + return "", err + } + return string(doc), nil +} + type HexUint uint func (h *HexUint) UnmarshalXMLAttr(attr xml.Attr) error { diff --git a/domain_test.go b/domain_test.go index d1b107d..73dd47b 100644 --- a/domain_test.go +++ b/domain_test.go @@ -37,6 +37,13 @@ type Address struct { Function HexUint } +type ScsiAddress struct { + Controller uint + Bus HexUint + Target uint + Unit uint +} + var uhciIndex uint = 0 var uhciAddr = Address{0, 0, 1, 2} @@ -46,6 +53,7 @@ var videoAddr = Address{0, 0, 5, 0} var fsAddr = Address{0, 0, 6, 0} var balloonAddr = Address{0, 0, 7, 0} var duplexAddr = Address{0, 0, 8, 0} +var hostdevScsi = ScsiAddress{0, 0, 3, 0} var serialPort uint = 0 var tabletBus HexUint = 0 @@ -1457,6 +1465,42 @@ var domainTestData = []struct { `</rng>`, }, }, + { + Object: &DomainHostdev{ + Mode: "subsystem", + Type: "scsi", + Sgio: "unfiltered", + Rawio: "yes", + Source: &DomainHostdevSource{ + Adapter: &DomainHostdevAdapter{ + Name: "scsi_host0", + }, + Address: &DomainAddress{ + Type: "scsi", + Bus: &hostdevScsi.Bus, + Target: &hostdevScsi.Target, + Unit: &hostdevScsi.Unit, + }, + }, + Address: &DomainAddress{ + Type: "drive", + Controller: &hostdevScsi.Controller, + Bus: &hostdevScsi.Bus, + Target: &hostdevScsi.Target, + Unit: &hostdevScsi.Unit, + }, + }, + + Expected: []string{ + `<hostdev mode="subsystem" type="scsi" sgio="unfiltered" rawio="yes">`, + ` <source>`, + ` <adapter name="scsi_host0"></adapter>`, + ` <address type="scsi" bus="0" target="3" unit="0"></address>`, + ` </source>`, + ` <address type="drive" controller="0" bus="0" target="3" unit="0"></address>`, + `</hostdev>`, + }, + }, } func TestDomain(t *testing.T) { -- 2.7.4

2 1

[libvirt] Questions about function virPCIDeviceIsBehindSwitchLackingACS in virpci.c
by Wuzongyong (Euler Dept) 18 Sep '17

18 Sep '17

In function virPCIDeviceIsBehindSwitchLackingACS, I noticed that(line 8): 1 if (virPCIDeviceGetParent(dev, &parent) < 0) 2 return -1; 3 if (!parent) { 4 /* if we have no parent, and this is the root bus, ACS doesn't come 5 * into play since devices on the root bus can't P2P without going 6 * through the root IOMMU. 7 */ 8 if (dev->address.bus == 0) { 9 return 0; 10 } else { 11 virReportError(VIR_ERR_INTERNAL_ERROR, 12 _("Failed to find parent device for %s"), 13 dev->name); 14 return -1; 15 } 16 } Why we just return 0 only if device's bus is 0? In my server, I can see a root bus which bus number is greater than 0, see the results(just a part) after I run lspci -t: +-[0000:80]-+-02.0-[81-83]--+-00.0 | | \-00.1 | +-05.0 | +-05.1 | +-05.2 | \-05.4 +-[0000:7f]-+-08.0 | +-08.2 | +-08.3 | + . . . | \-1f.2 \-[0000:00]-+-00.0 +-01.0-[01]----00.0 +-02.0-[02]--+-00.0 | +-00.1 | +-00.2 | \-00.3 +-02.2-[03]-- +-03.0-[04-0b]----00.0-[05-0b]--+-08.0-[06-08]----00.0 | \-10.0-[09-0b]----00.0 +-05.0 +-05.1 +-05.2 +-05.4 +-11.0 +-11.4 +-16.0 +-16.1 +-1a.0 If I assign the device 0000:81:00.0 to a VM, I get "Failed to find parent device". I think I should get no error with return value 0 just like bus number is 0, because bus 80 is the root bus as well in my case. In the <<Intel C610 Series Chipset and Intel X99 Chipset Platform Controller Hub(PCH)>> Datasheet, I found that(Chapter 9.1): For some server platforms, it may be desirable to have multiple PCHs in the system Which means some PCH's may reside on a bus greater than 0. So, is this a bug? Thanks, Zongyong Wu

1 0

[libvirt] [PATCH python] Skip sparseRecvAll / sparseSendAll in sanity test
by Daniel P. Berrange 18 Sep '17

18 Sep '17

The sanity test check aims to ensure that every function listed in the Python code maps to a corresponding C function. The Sparse send/recv methods are special though - we're never calling the corresponding C APIs, instead we have a pure python impl. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- sanitytest.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sanitytest.py b/sanitytest.py index deec200..a5cb01b 100644 --- a/sanitytest.py +++ b/sanitytest.py @@ -351,7 +351,8 @@ for klass in gotfunctions: for func in sorted(gotfunctions[klass]): # These are pure python methods with no C APi if func in ["connect", "getConnect", "domain", "getDomain", - "virEventInvokeFreeCallback"]: + "virEventInvokeFreeCallback", + "sparseRecvAll", "sparseSendAll"]: continue key = "%s.%s" % (klass, func) -- 2.13.5

3 4

[libvirt] [PATCH 0/3] cpu: Add new Skylake-Server CPU model
by Jiri Denemark 18 Sep '17

18 Sep '17

Jiri Denemark (3): tests: Add CPUID data for Intel(R) Xeon(R) Gold 6148 CPU cpu: Add clwb/pcommit CPU features cpu: Add new Skylake-Server CPU model src/cpu/cpu_map.xml | 81 +++++++ tests/cputest.c | 1 + .../x86_64-cpuid-Xeon-Gold-6148-disabled.xml | 7 + .../x86_64-cpuid-Xeon-Gold-6148-enabled.xml | 9 + .../x86_64-cpuid-Xeon-Gold-6148-guest.xml | 29 +++ .../x86_64-cpuid-Xeon-Gold-6148-host.xml | 30 +++ .../x86_64-cpuid-Xeon-Gold-6148-json.xml | 8 + tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148.json | 235 +++++++++++++++++++++ tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148.xml | 54 +++++ .../domaincapsschemadata/qemu_2.9.0-tcg.x86_64.xml | 2 + 10 files changed, 456 insertions(+) create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-disabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-enabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-guest.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-json.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148.json create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148.xml -- 2.14.1

2 4

[libvirt] RFC: libvirt support for QEMU live patching
by Madhu Pavan 18 Sep '17

18 Sep '17

Hi, QEMU live patching should be just a matter of updating the QEMU RPM package and then live migrating the VMs to another QEMU instance on the same host (which would point to the just installed new QEMU executable). I think it will be useful to support it from libvirt side. After some searching I found a RFC patch posted in Nov 2013. Here is the link to it https://www.redhat.com/archives/libvir-list/2013-November/msg00372.html Approach followed in above mentioned link is as follows: 1. newDef = deep copy oldVm definition 2. newVm = create VM using newDef, start QEMU process with all vCPUs paused 3. oldVm migrate to newVm using unix socket 4. shutdown oldVm 5. newPid = newVm->pid 6. finalDef = live deep copy of newVm definition 7. Drop the newVm from qemu domain table without shutting down QEMU process 8. Assign finalDef to oldVm 9. oldVm attaches to QEMU process newPid using finalDef 10.resume all vCPUs in oldVm I can see it didn't get communities approval for having problems in handling UUID of the vm's. To fix the problem we need to teach libvirt to manage two qemu processes at once both tied to same UUID. I would like to know if there is any interested approach to get this done. I would like to send patches on this. Is there any specific reason why it is not been pursued for the last 4 year? I plan to use postcopy along with the local migration as part of migration, that way the guest need not be even paused for a busy guest. Thanks, Madhu Pavan.

4 6

[libvirt] [PATCH 0/7] qemu: Filter CPU features returned by qemuConnectBaselineCPU
by Jiri Denemark 18 Sep '17

18 Sep '17

The host CPU definitions reported in the capabilities XML may contain CPU features unknown to QEMU, but the result of virConnectBaselineCPU is supposed to be directly usable as a guest CPU definition and thus it should only contain features QEMU knows about. https://bugzilla.redhat.com/show_bug.cgi?id=1450317 Jiri Denemark (7): cpu_conf: Introduce virCPUDefList{Parse,Free} cpu: Use virCPUDefListParse in cpuBaselineXML cpu: Don't log CPU models in cpuBaselineXML cpu: Drop cpuBaselineXML qemu: Pass virArch * to virQEMUCapsCPUFilterFeatures qemu: Publish virQEMUCapsCPUFilterFeatures qemu: Filter CPU features returned by qemuConnectBaselineCPU src/bhyve/bhyve_driver.c | 22 +++++++-- src/conf/cpu_conf.c | 78 ++++++++++++++++++++++++++++++++ src/conf/cpu_conf.h | 7 +++ src/cpu/cpu.c | 104 ------------------------------------------- src/cpu/cpu.h | 7 --- src/libvirt_private.syms | 3 +- src/libxl/libxl_driver.c | 22 +++++++-- src/qemu/qemu_capabilities.c | 8 ++-- src/qemu/qemu_capabilities.h | 3 ++ src/qemu/qemu_driver.c | 32 +++++++++++-- src/test/test_driver.c | 22 +++++++-- src/vz/vz_driver.c | 22 ++++++++- 12 files changed, 201 insertions(+), 129 deletions(-) -- 2.14.1

2 10

[libvirt] [PATCH] virsh: Enhance documentation of --rdma-pin-all option
by Jiri Denemark 18 Sep '17

18 Sep '17

https://bugzilla.redhat.com/show_bug.cgi?id=1373783 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- tools/virsh.pod | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 01453be600..a03f64a262 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1767,7 +1767,13 @@ periodically increased by I<auto-converge-increment>. I<--rdma-pin-all> can be used with RDMA migration (i.e., when I<migrateuri> starts with rdma://) to tell the hypervisor to pin all domain's memory at once -before migration starts rather than letting it pin memory pages as needed. +before migration starts rather than letting it pin memory pages as needed. For +QEMU/KVM this requires hard_limit memory tuning element (in the domain XML) to +be used and set to the maximum memory configured for the domain plus any memory +consumed by the QEMU process itself. Beware of setting the memory limit too +high (and thus allowing the domain to lock most of the host's memory). Doing so +may be dangerous to both the domain and the host itself since the host's kernel +may run out of memory. B<Note>: Individual hypervisors usually do not support all possible types of migration. For example, QEMU does not support direct migration. -- 2.14.1

2 1

[libvirt] [PATCH] util: virPCIGetNetName(): use first netdev name when phys_port_id isn't matched
by Laine Stump 15 Sep '17

15 Sep '17

The mlx4 (Mellanox) netdev driver implements the sysfs phys_port_id file for both VFs and PFs, so you can find the VF netdev plugged into the same physical port as any given PF netdev by comparing the contents of phys_port_id of the respective netdevs. That's what libvirt does when attempting to find the PF netdev for a given VF netdev (or vice versa). Most other netdevs drivers don't implement phys_port_id, so the file shows up in sysfs, but attempts to read it result in ENOTSUPP. In these cases, libvirt is unable to read phys_port_id, so it just returns the first entry in the PF/VF's list of netdevs. But we've found that the i40e driver is in between these two situations - it implements phys_port_id for PF netdevs, but doesn't implement it for VF netdevs. So libvirt would successfully read the phys_port_id of the PF netdev, then try to find a VF netdev with matching phys_port_id, but would fail because it is NULL for all VFs. This would result in a message like the following: Could not find network device with phys_port_id '3cfdfe9edc39' under PCI device at /sys/class/net/ens4f1/device/virtfn0 To solve this problem in a way that won't break functionality for anyone else, this patch saves the first netdev name we find for the device, and returns that if we fail to find a netdev with the desired phys_port_id. --- src/util/virpci.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/src/util/virpci.c b/src/util/virpci.c index 5ded77087..402602678 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -2876,6 +2876,7 @@ virPCIGetNetName(const char *device_link_sysfs_path, int ret = -1; DIR *dir = NULL; struct dirent *entry = NULL; + char *firstEntryName = NULL; char *thisPhysPortID = NULL; size_t i = 0; @@ -2902,6 +2903,15 @@ virPCIGetNetName(const char *device_link_sysfs_path, /* if this one doesn't match, keep looking */ if (STRNEQ_NULLABLE(physPortID, thisPhysPortID)) { VIR_FREE(thisPhysPortID); + /* save the first entry we find to use as a failsafe + * in case we don't match the phys_port_id. This is + * needed because some NIC drivers (e.g. i40e) + * implement phys_port_id for PFs, but not for VFs + */ + if (!firstEntryName && + VIR_STRDUP(firstEntryName, entry->d_name) < 0) + goto cleanup; + continue; } } else { @@ -2918,10 +2928,21 @@ virPCIGetNetName(const char *device_link_sysfs_path, if (ret < 0) { if (physPortID) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not find network device with " - "phys_port_id '%s' under PCI device at %s"), - physPortID, device_link_sysfs_path); + if (firstEntryName) { + /* we didn't match the provided phys_port_id, but this + * is probably because phys_port_id isn't implemented + * for this NIC driver, so just return the first + * (probably only) netname we found. + */ + *netname = firstEntryName; + firstEntryName = NULL; + ret = 0; + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Could not find network device with " + "phys_port_id '%s' under PCI device at %s"), + physPortID, device_link_sysfs_path); + } } else { ret = 0; /* no netdev at the given index is *not* an error */ } @@ -2930,6 +2951,7 @@ virPCIGetNetName(const char *device_link_sysfs_path, VIR_DIR_CLOSE(dir); VIR_FREE(pcidev_sysfs_net_path); VIR_FREE(thisPhysPortID); + VIR_FREE(firstEntryName); return ret; } -- 2.13.5

2 1

[libvirt] [PATCH 0/4] qemu: Validate guest CPU features before starting a domain
by Jiri Denemark 15 Sep '17

15 Sep '17

CPU features are usually checked by libvirt, but not if libvirt decides it should not check the CPU at all, which happens with host-passthrough CPUs, for example. Let's check all used CPU features are valid for all CPU definitions. https://bugzilla.redhat.com/show_bug.cgi?id=1460086 Jiri Denemark (4): cpu: Introduce virCPUValidateFeatures qemu: Validate guest CPU features before starting a domain cpu_s390: Implement virCPUValidateFeatures cpu_x86: Implement virCPUValidateFeatures src/cpu/cpu.c | 29 +++++++++++++++++++++++++++++ src/cpu/cpu.h | 9 +++++++++ src/cpu/cpu_s390.c | 29 +++++++++++++++++++++-------- src/cpu/cpu_x86.c | 23 +++++++++++++++++++++++ src/libvirt_private.syms | 1 + src/qemu/qemu_process.c | 4 ++++ 6 files changed, 87 insertions(+), 8 deletions(-) -- 2.14.1

2 5

[libvirt] [PATCH] spec: Use %license when available
by Cole Robinson 15 Sep '17

15 Sep '17

This is required by the fedora packaging guidelines: https://fedoraproject.org/wiki/Packaging:LicensingGuidelines This macro isn't available on stock RHEL6 so provide a backcompat definition https://bugzilla.redhat.com/show_bug.cgi?id=1483293 Reported-by: Ville Skyttä <ville.skytta(a)iki.fi> Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- libvirt.spec.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 583fb0583..5f232b1ba 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -15,6 +15,8 @@ # touch configure.ac or Makefile.am. %{!?enable_autotools:%global enable_autotools 0} +# RHEL6 doesn't have 'license' macro +%{!?_licensedir:%global license %%doc} # The hypervisor drivers that run in libvirtd %define with_xen 0%{!?_without_xen:1} @@ -2030,7 +2032,7 @@ exit 0 %attr(0755, root, root) %{_libexecdir}/libvirt-guests.sh %files libs -f %{name}.lang -%doc COPYING COPYING.LESSER +%license COPYING COPYING.LESSER %config(noreplace) %{_sysconfdir}/libvirt/libvirt.conf %config(noreplace) %{_sysconfdir}/libvirt/libvirt-admin.conf %{_libdir}/libvirt.so.* -- 2.13.5

2 3

[libvirt] [libvirt-sandbox PATCH 0/2] virt-sandbox-image: unbreak start from library
by Guido Günther 15 Sep '17

15 Sep '17

This is basically a V2 of "Drop library/ from template name and image path" with Dan's comment implemented. Guido Günther (2): Drop library/ from image path Sanitize domain name libvirt-sandbox/image/cli.py | 8 ++++++-- libvirt-sandbox/image/sources/docker.py | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) -- 2.11.0

2 7

[libvirt] [PATCH] qemu: Fix return check on virHashAddEntry call
by John Ferlan 15 Sep '17

15 Sep '17

Luckily it only returns 0 or -1 Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Pushed as trivial.. Tripped across this while working on something else. src/qemu/qemu_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index ab5f7cc59..68c00c1e8 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1300,7 +1300,7 @@ qemuSharedDeviceEntryInsert(virQEMUDriverPtr driver, entry->ref = 1; - if (virHashAddEntry(driver->sharedDevices, key, entry)) + if (virHashAddEntry(driver->sharedDevices, key, entry) < 0) goto error; } -- 2.13.5

1 0

[libvirt] [PATCH 0/6] Some disk auth/encryption cleanups
by John Ferlan 15 Sep '17

15 Sep '17

Perform some cleanups with the auth and encryption processing. This is a precursor to some other changes that will move/create disk <source> level <auth> and <encryption> elements since they are already in the _virStorageSource. I'm still working on the latter, but before there's too many patches. John Ferlan (6): docs: Remove unnecessary <auth> example for iscsi disk type='volume' conf: Add invalid secrettype checks conf: Move <disk> authdef validation conf: Add invalid domain disk encryption test conf: Move <disk> encryption validation conf: Use virXMLFormatElement to format disk source network docs/formatdomain.html.in | 6 - src/conf/domain_conf.c | 126 ++++++++++----------- ...drive-network-iscsi-auth-secrettype-invalid.xml | 33 ++++++ ...k-drive-network-iscsi-auth-wrong-secrettype.xml | 33 ++++++ .../qemuxml2argv-disk-source-pool-mode.args | 3 + .../qemuxml2argv-disk-source-pool-mode.xml | 13 +++ .../qemuxml2argv-luks-disk-invalid.xml | 37 ++++++ tests/qemuxml2argvtest.c | 3 + .../qemuxml2xmlout-disk-source-pool-mode.xml | 13 +++ 9 files changed, 198 insertions(+), 69 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth-secrettype-invalid.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth-wrong-secrettype.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-luks-disk-invalid.xml -- 2.13.5

2 15

[libvirt] [PATCH] spec: Own %{_libdir}/libvirt{, /connection-driver} dirs
by Cole Robinson 15 Sep '17

15 Sep '17

From: Ville Skyttä <ville.skytta(a)iki.fi> Owning all created directories is a requirement of the Fedora packaging guidelines https://bugzilla.redhat.com/show_bug.cgi?id=1483293 Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- libvirt.spec.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 2b58bf3a9..583fb0583 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1794,6 +1794,8 @@ exit 0 %dir %attr(0711, root, root) %{_localstatedir}/cache/libvirt/ +%dir %attr(0755, root, root) %{_libdir}/libvirt/ +%dir %attr(0755, root, root) %{_libdir}/libvirt/connection-driver/ %dir %attr(0755, root, root) %{_libdir}/libvirt/lock-driver %attr(0755, root, root) %{_libdir}/libvirt/lock-driver/lockd.so -- 2.13.5

2 1

[libvirt] [PATCH] spec: Own %{_libdir}/libvirt{, /connection-driver} dirs, mark licenses as %license
by Cole Robinson 14 Sep '17

14 Sep '17

From: Ville Skyttä <ville.skytta(a)iki.fi> https://bugzilla.redhat.com/show_bug.cgi?id=1483293 Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- libvirt.spec.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 2b58bf3a9..2d21e60bc 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1794,6 +1794,8 @@ exit 0 %dir %attr(0711, root, root) %{_localstatedir}/cache/libvirt/ +%dir %attr(0755, root, root) %{_libdir}/libvirt/ +%dir %attr(0755, root, root) %{_libdir}/libvirt/connection-driver/ %dir %attr(0755, root, root) %{_libdir}/libvirt/lock-driver %attr(0755, root, root) %{_libdir}/libvirt/lock-driver/lockd.so @@ -2028,7 +2030,7 @@ exit 0 %attr(0755, root, root) %{_libexecdir}/libvirt-guests.sh %files libs -f %{name}.lang -%doc COPYING COPYING.LESSER +%license COPYING COPYING.LESSER %config(noreplace) %{_sysconfdir}/libvirt/libvirt.conf %config(noreplace) %{_sysconfdir}/libvirt/libvirt-admin.conf %{_libdir}/libvirt.so.* -- 2.13.5

2 2

[libvirt] QEMU -M nvdimm=on and hotplug
by Stefan Hajnoczi 14 Sep '17

14 Sep '17

Hi Michal, You asked how NVDIMM hotplug should work if the domain was launched without -M nvdimm=on. I'm not very familiar with ACPI so this may be incorrect. Hotplug relies on the presence of ACPI tables (SSDT Device=NVDR _HID=ACPI0012) added by -M nvdimm=on. The ACPI tables contain the interface needed to handle hotplug events. The device_add command fails with the following message if -M nvdimm=on is missing: nvdimm is not enabled: missing 'nvdimm' in '-M' I'm not sure if ACPI allows SSDT tables to be dynamically added but in any case the current QEMU code doesn't support that. Options for libvirt: 1. Rely on QEMU's device_add error. Pro: If QEMU behavior ever changes then libvirt will also start working without code changes. Cons: Does libvirt interpret QMP error strings? 2. Only allow NVDIMM hotplug if the domain was started with -M nvdimm=on. I think QEMU will not add -M nvdimm=on to the "pc" machine type by default since it adds the NVDIMM DSM hardware interface that increases the security attack surface. Stefan

5 6

[libvirt] [PATCH 0/8] travis: Fix and improve configuration
by Andrea Bolognani 14 Sep '17

14 Sep '17

This series fixes the precise+gcc combo not being actually tested and significantly improves test coverage by installing a bunch of additional optional dependencies on the workers. Andrea Bolognani (8): travis: Limit git depth to 5 commits travis: Move variables to 'env' section travis: Don't abort build due to -Wvariadic-macros travis: Split building command travis: Don't have a separate script definition for macOS travis: Improve test matrix travis: Install more build dependencies travis: Shuffle sections around .travis.yml | 125 ++++++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 79 insertions(+), 46 deletions(-) -- 2.13.5

3 24

[libvirt] [libvirt-python][PATCH] maint: Require libvirt-3.4.0 at least
by Michal Privoznik 14 Sep '17

14 Sep '17

Currently, we require 0.9.11. However, some APIs are missing there and thus sanity check fails: DEBUG: /usr/bin/python sanitytest.py build/lib.linux-s390x-2.7 /usr/share/libvirt/api/libvirt-api.xml DEBUG: FAIL virStream.sparseRecvAll (Python API not mapped to C) DEBUG: FAIL virStream.sparseSendAll (Python API not mapped to C) DEBUG: error: command '/usr/bin/python' failed with exit status 1 I'm not sure how to fix that so raising minimal required libvirt version is the solution. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- setup.py | 2 +- README | 2 +- libvirt-override.c | 149 ----------------------------------------------------- 3 files changed, 2 insertions(+), 151 deletions(-) diff --git a/setup.py b/setup.py index f33ff1a..f929eb2 100755 --- a/setup.py +++ b/setup.py @@ -17,7 +17,7 @@ import re import shutil import time -MIN_LIBVIRT = "0.9.11" +MIN_LIBVIRT = "3.4.0" MIN_LIBVIRT_LXC = "1.0.2" # Hack to stop 'pip install' failing with error diff --git a/README b/README index 96082f0..bc3ee77 100644 --- a/README +++ b/README @@ -5,7 +5,7 @@ This package provides a python binding to the libvirt.so, libvirt-qemu.so and libvirt-lxc.so library APIs. It is written to build against any version of libvirt that -is 0.9.11 or newer. +is 3.4.0 or newer. This code is distributed under the terms of the LGPL version 2 or later. diff --git a/libvirt-override.c b/libvirt-override.c index 9eba4ed..280856d 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -66,20 +66,9 @@ getPyNodeCPUCount(virConnectPtr conn) { int i_retval; -#if LIBVIR_CHECK_VERSION(1, 0, 0) LIBVIRT_BEGIN_ALLOW_THREADS; i_retval = virNodeGetCPUMap(conn, NULL, NULL, 0); LIBVIRT_END_ALLOW_THREADS; -#else /* fallback: use nodeinfo */ - virNodeInfo nodeinfo; - - LIBVIRT_BEGIN_ALLOW_THREADS; - i_retval = virNodeGetInfo(conn, &nodeinfo); - LIBVIRT_END_ALLOW_THREADS; - - if (i_retval >= 0) - i_retval = VIR_NODEINFO_MAXCPUS(nodeinfo); -#endif /* LIBVIR_CHECK_VERSION(1, 0, 0) */ return i_retval; } @@ -398,14 +387,12 @@ libvirt_virDomainMemoryStats(PyObject *self ATTRIBUTE_UNUSED, case VIR_DOMAIN_MEMORY_STAT_RSS: key = libvirt_constcharPtrWrap("rss"); break; -#if LIBVIR_CHECK_VERSION(2, 1, 0) case VIR_DOMAIN_MEMORY_STAT_USABLE: key = libvirt_constcharPtrWrap("usable"); break; case VIR_DOMAIN_MEMORY_STAT_LAST_UPDATE: key = libvirt_constcharPtrWrap("last_update"); break; -#endif /* LIBVIR_CHECK_VERSION(2, 1, 0) */ default: continue; } @@ -1451,7 +1438,6 @@ libvirt_virDomainGetVcpuPinInfo(PyObject *self ATTRIBUTE_UNUSED, } -#if LIBVIR_CHECK_VERSION(0, 10, 0) static PyObject * libvirt_virDomainPinEmulator(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) @@ -1547,9 +1533,7 @@ libvirt_virDomainGetEmulatorPinInfo(PyObject *self ATTRIBUTE_UNUSED, Py_CLEAR(pycpumap); goto cleanup; } -#endif /* LIBVIR_CHECK_VERSION(0, 10, 0) */ -#if LIBVIR_CHECK_VERSION(1, 2, 14) static PyObject * libvirt_virDomainGetIOThreadInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) @@ -1668,7 +1652,6 @@ libvirt_virDomainPinIOThread(PyObject *self ATTRIBUTE_UNUSED, return ret; } -#endif /* LIBVIR_CHECK_VERSION(1, 2, 14) */ /************************************************************************ * * @@ -2037,7 +2020,6 @@ libvirt_virConnectGetVersion(PyObject *self ATTRIBUTE_UNUSED, return libvirt_intWrap(hvVersion); } -#if LIBVIR_CHECK_VERSION(1, 1, 3) static PyObject * libvirt_virConnectGetCPUModelNames(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) @@ -2083,7 +2065,6 @@ libvirt_virConnectGetCPUModelNames(PyObject *self ATTRIBUTE_UNUSED, Py_CLEAR(rv); goto done; } -#endif /* LIBVIR_CHECK_VERSION(1, 1, 3) */ static PyObject * libvirt_virConnectGetLibVersion(PyObject *self ATTRIBUTE_UNUSED, @@ -2162,7 +2143,6 @@ libvirt_virConnectListDomainsID(PyObject *self ATTRIBUTE_UNUSED, return NULL; } -#if LIBVIR_CHECK_VERSION(0, 9, 13) static PyObject * libvirt_virConnectListAllDomains(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) @@ -2206,7 +2186,6 @@ libvirt_virConnectListAllDomains(PyObject *self ATTRIBUTE_UNUSED, Py_CLEAR(py_retval); goto cleanup; } -#endif /* LIBVIR_CHECK_VERSION(0, 9, 13) */ static PyObject * libvirt_virConnectListDefinedDomains(PyObject *self ATTRIBUTE_UNUSED, @@ -2317,7 +2296,6 @@ libvirt_virDomainSnapshotListNames(PyObject *self ATTRIBUTE_UNUSED, goto cleanup; } -#if LIBVIR_CHECK_VERSION(0, 9, 13) static PyObject * libvirt_virDomainListAllSnapshots(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) @@ -2361,7 +2339,6 @@ libvirt_virDomainListAllSnapshots(PyObject *self ATTRIBUTE_UNUSED, Py_CLEAR(py_retval); goto cleanup; } -#endif /* LIBVIR_CHECK_VERSION(0, 9, 13) */ static PyObject * libvirt_virDomainSnapshotListChildrenNames(PyObject *self ATTRIBUTE_UNUSED, @@ -2417,7 +2394,6 @@ libvirt_virDomainSnapshotListChildrenNames(PyObject *self ATTRIBUTE_UNUSED, goto cleanup; } -#if LIBVIR_CHECK_VERSION(0, 9, 13) static PyObject * libvirt_virDomainSnapshotListAllChildren(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) @@ -2461,7 +2437,6 @@ libvirt_virDomainSnapshotListAllChildren(PyObject *self ATTRIBUTE_UNUSED, Py_CLEAR(py_retval); goto cleanup; } -#endif /* LIBVIR_CHECK_VERSION(0, 9, 13) */ static PyObject * libvirt_virDomainRevertToSnapshot(PyObject *self ATTRIBUTE_UNUSED, @@ -2752,7 +2727,6 @@ libvirt_virDomainGetSecurityLabel(PyObject *self ATTRIBUTE_UNUSED, return NULL; } -#if LIBVIR_CHECK_VERSION(0, 10, 0) static PyObject * libvirt_virDomainGetSecurityLabelList(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) @@ -2803,7 +2777,6 @@ libvirt_virDomainGetSecurityLabelList(PyObject *self ATTRIBUTE_UNUSED, Py_CLEAR(py_retval); goto cleanup; } -#endif /* LIBVIR_CHECK_VERSION(0, 10, 0) */ static PyObject * libvirt_virDomainGetUUID(PyObject *self ATTRIBUTE_UNUSED, @@ -2992,7 +2965,6 @@ libvirt_virConnectListDefinedNetworks(PyObject *self ATTRIBUTE_UNUSED, goto cleanup; } -#if LIBVIR_CHECK_VERSION(0, 10, 2) static PyObject * libvirt_virConnectListAllNetworks(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) @@ -3036,7 +3008,6 @@ libvirt_virConnectListAllNetworks(PyObject *self ATTRIBUTE_UNUSED, Py_CLEAR(py_retval); goto cleanup; } -#endif /* LIBVIR_CHECK_VERSION(0, 10, 2) */ static PyObject * @@ -3437,7 +3408,6 @@ libvirt_virConnectListDefinedStoragePools(PyObject *self ATTRIBUTE_UNUSED, goto cleanup; } -#if LIBVIR_CHECK_VERSION(0, 10, 2) static PyObject * libvirt_virConnectListAllStoragePools(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) @@ -3482,7 +3452,6 @@ libvirt_virConnectListAllStoragePools(PyObject *self ATTRIBUTE_UNUSED, Py_CLEAR(py_retval); goto cleanup; } -#endif /* LIBVIR_CHECK_VERSION(0, 10, 2) */ static PyObject * libvirt_virStoragePoolListVolumes(PyObject *self ATTRIBUTE_UNUSED, @@ -3539,7 +3508,6 @@ libvirt_virStoragePoolListVolumes(PyObject *self ATTRIBUTE_UNUSED, goto cleanup; } -#if LIBVIR_CHECK_VERSION(0, 10, 2) static PyObject * libvirt_virStoragePoolListAllVolumes(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) @@ -3585,7 +3553,6 @@ libvirt_virStoragePoolListAllVolumes(PyObject *self ATTRIBUTE_UNUSED, Py_CLEAR(py_retval); goto cleanup; } -#endif /* LIBVIR_CHECK_VERSION(0, 10, 2) */ static PyObject * @@ -3689,7 +3656,6 @@ libvirt_virStorageVolGetInfo(PyObject *self ATTRIBUTE_UNUSED, return NULL; } -#if LIBVIR_CHECK_VERSION(3, 0, 0) static PyObject * libvirt_virStorageVolGetInfoFlags(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) @@ -3727,7 +3693,6 @@ libvirt_virStorageVolGetInfoFlags(PyObject *self ATTRIBUTE_UNUSED, Py_DECREF(py_retval); return NULL; } -#endif static PyObject * libvirt_virStoragePoolGetUUID(PyObject *self ATTRIBUTE_UNUSED, @@ -3863,7 +3828,6 @@ libvirt_virNodeListDevices(PyObject *self ATTRIBUTE_UNUSED, goto cleanup; } -#if LIBVIR_CHECK_VERSION(0, 10, 2) static PyObject * libvirt_virConnectListAllNodeDevices(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) @@ -3908,7 +3872,6 @@ libvirt_virConnectListAllNodeDevices(PyObject *self ATTRIBUTE_UNUSED, Py_CLEAR(py_retval); goto cleanup; } -#endif /* LIBVIR_CHECK_VERSION(0, 10, 2) */ static PyObject * libvirt_virNodeDeviceListCaps(PyObject *self ATTRIBUTE_UNUSED, @@ -4094,7 +4057,6 @@ libvirt_virConnectListSecrets(PyObject *self ATTRIBUTE_UNUSED, goto cleanup; } -#if LIBVIR_CHECK_VERSION(0, 10, 2) static PyObject * libvirt_virConnectListAllSecrets(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) @@ -4139,7 +4101,6 @@ libvirt_virConnectListAllSecrets(PyObject *self ATTRIBUTE_UNUSED, Py_CLEAR(py_retval); goto cleanup; } -#endif /* LIBVIR_CHECK_VERSION(0, 10, 2) */ static PyObject * libvirt_virSecretGetValue(PyObject *self ATTRIBUTE_UNUSED, @@ -4327,7 +4288,6 @@ libvirt_virConnectListNWFilters(PyObject *self ATTRIBUTE_UNUSED, goto cleanup; } -#if LIBVIR_CHECK_VERSION(0, 10, 2) static PyObject * libvirt_virConnectListAllNWFilters(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) @@ -4372,7 +4332,6 @@ libvirt_virConnectListAllNWFilters(PyObject *self ATTRIBUTE_UNUSED, Py_CLEAR(py_retval); goto cleanup; } -#endif /* LIBVIR_CHECK_VERSION(0, 10, 2) */ static PyObject * libvirt_virConnectListInterfaces(PyObject *self ATTRIBUTE_UNUSED, @@ -4489,7 +4448,6 @@ libvirt_virConnectListDefinedInterfaces(PyObject *self ATTRIBUTE_UNUSED, } -#if LIBVIR_CHECK_VERSION(0, 10, 2) static PyObject * libvirt_virConnectListAllInterfaces(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) @@ -4534,7 +4492,6 @@ libvirt_virConnectListAllInterfaces(PyObject *self ATTRIBUTE_UNUSED, Py_CLEAR(py_retval); goto cleanup; } -#endif /* LIBVIR_CHECK_VERSION(0, 10, 2) */ static PyObject * libvirt_virConnectBaselineCPU(PyObject *self ATTRIBUTE_UNUSED, @@ -4645,7 +4602,6 @@ libvirt_virDomainGetJobInfo(PyObject *self ATTRIBUTE_UNUSED, return NULL; } -#if LIBVIR_CHECK_VERSION(1, 0, 3) static PyObject * libvirt_virDomainGetJobStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) @@ -4684,7 +4640,6 @@ libvirt_virDomainGetJobStats(PyObject *self ATTRIBUTE_UNUSED, Py_CLEAR(dict); goto cleanup; } -#endif /* LIBVIR_CHECK_VERSION(1, 0, 3) */ static PyObject * libvirt_virDomainGetBlockJobInfo(PyObject *self ATTRIBUTE_UNUSED, @@ -4913,7 +4868,6 @@ libvirt_virDomainGetDiskErrors(PyObject *self ATTRIBUTE_UNUSED, } -#if LIBVIR_CHECK_VERSION(1, 2, 14) static PyObject * libvirt_virDomainInterfaceAddresses(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) @@ -5000,7 +4954,6 @@ libvirt_virDomainInterfaceAddresses(PyObject *self ATTRIBUTE_UNUSED, Py_CLEAR(py_retval); goto cleanup; } -#endif /* LIBVIR_CHECK_VERSION(1, 2, 14) */ /******************************************* @@ -7156,7 +7109,6 @@ libvirt_virConnectDomainEventDeregisterAny(PyObject *self ATTRIBUTE_UNUSED, return libvirt_intWrap(ret); } -#if LIBVIR_CHECK_VERSION(1, 2, 1) static void libvirt_virConnectNetworkEventFreeFunc(void *opaque) { @@ -7299,9 +7251,7 @@ libvirt_virConnectNetworkEventDeregisterAny(PyObject *self ATTRIBUTE_UNUSED, return libvirt_intWrap(ret); } -#endif /* LIBVIR_CHECK_VERSION(1, 2, 1)*/ -#if LIBVIR_CHECK_VERSION(0, 10, 0) static void libvirt_virConnectCloseCallbackDispatch(virConnectPtr conn ATTRIBUTE_UNUSED, int reason, @@ -7398,7 +7348,6 @@ libvirt_virConnectUnregisterCloseCallback(PyObject * self ATTRIBUTE_UNUSED, return libvirt_intWrap(ret); } -#endif /* LIBVIR_CHECK_VERSION(0, 10, 0) */ static void libvirt_virStreamEventFreeFunc(void *opaque) @@ -7585,7 +7534,6 @@ libvirt_virDomainSendKey(PyObject *self ATTRIBUTE_UNUSED, return libvirt_intWrap(ret); } -#if LIBVIR_CHECK_VERSION(1, 0, 3) static PyObject * libvirt_virDomainMigrateGetCompressionCache(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) @@ -7612,7 +7560,6 @@ libvirt_virDomainMigrateGetCompressionCache(PyObject *self ATTRIBUTE_UNUSED, return libvirt_ulonglongWrap(cacheSize); } -#endif /* LIBVIR_CHECK_VERSION(1, 0, 3) */ static PyObject * libvirt_virDomainMigrateGetMaxSpeed(PyObject *self ATTRIBUTE_UNUSED, @@ -7669,7 +7616,6 @@ libvirt_virDomainMigrateGetMaxDowntime(PyObject *self ATTRIBUTE_UNUSED, } #endif /* LIBVIR_CHECK_VERSION(3, 7, 0) */ -#if LIBVIR_CHECK_VERSION(1, 1, 0) static PyObject * libvirt_virDomainMigrate3(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) @@ -7731,7 +7677,6 @@ libvirt_virDomainMigrateToURI3(PyObject *self ATTRIBUTE_UNUSED, virTypedParamsFree(params, nparams); return libvirt_intWrap(ret); } -#endif /* LIBVIR_CHECK_VERSION(1, 1, 0) */ static PyObject * libvirt_virDomainBlockPeek(PyObject *self ATTRIBUTE_UNUSED, @@ -7810,7 +7755,6 @@ libvirt_virDomainMemoryPeek(PyObject *self ATTRIBUTE_UNUSED, return py_retval; } -#if LIBVIR_CHECK_VERSION(0, 10, 2) static PyObject * libvirt_virNodeSetMemoryParameters(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) @@ -7930,9 +7874,7 @@ libvirt_virNodeGetMemoryParameters(PyObject *self ATTRIBUTE_UNUSED, virTypedParamsFree(params, nparams); return ret; } -#endif /* LIBVIR_CHECK_VERSION(0, 10, 2) */ -#if LIBVIR_CHECK_VERSION(1, 0, 0) static PyObject * libvirt_virNodeGetCPUMap(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) @@ -7986,10 +7928,8 @@ libvirt_virNodeGetCPUMap(PyObject *self ATTRIBUTE_UNUSED, Py_CLEAR(ret); goto cleanup; } -#endif /* LIBVIR_CHECK_VERSION(1, 0, 0) */ -#if LIBVIR_CHECK_VERSION(1, 1, 1) static PyObject * libvirt_virDomainCreateWithFiles(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) @@ -8083,10 +8023,8 @@ libvirt_virDomainCreateXMLWithFiles(PyObject *self ATTRIBUTE_UNUSED, VIR_FREE(files); return py_retval; } -#endif /* LIBVIR_CHECK_VERSION(1, 1, 1) */ -#if LIBVIR_CHECK_VERSION(1, 2, 5) static PyObject * libvirt_virDomainFSFreeze(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) @@ -8274,10 +8212,8 @@ libvirt_virDomainSetTime(PyObject *self ATTRIBUTE_UNUSED, return libvirt_intWrap(c_retval); } -#endif /* LIBVIR_CHECK_VERSION(1, 2, 5) */ -#if LIBVIR_CHECK_VERSION(1, 2, 6) static PyObject * libvirt_virNodeGetFreePages(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) @@ -8441,9 +8377,7 @@ libvirt_virNetworkGetDHCPLeases(PyObject *self ATTRIBUTE_UNUSED, goto cleanup; } -#endif /* LIBVIR_CHECK_VERSION(1, 2, 6) */ -#if LIBVIR_CHECK_VERSION(1, 2, 8) static PyObject * convertDomainStatsRecord(virDomainStatsRecordPtr *records, @@ -8601,9 +8535,7 @@ libvirt_virDomainBlockCopy(PyObject *self ATTRIBUTE_UNUSED, return libvirt_intWrap(c_retval); } -#endif /* LIBVIR_CHECK_VERSION(1, 2, 8) */ -#if LIBVIR_CHECK_VERSION(1, 2, 9) static PyObject * libvirt_virNodeAllocPages(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) @@ -8665,9 +8597,7 @@ libvirt_virNodeAllocPages(PyObject *self ATTRIBUTE_UNUSED, VIR_FREE(pageCounts); return NULL; } -#endif /* LIBVIR_CHECK_VERSION(1, 2, 8) */ -#if LIBVIR_CHECK_VERSION(1, 2, 11) static PyObject * libvirt_virDomainGetFSInfo(PyObject *self ATTRIBUTE_UNUSED, @@ -8742,9 +8672,7 @@ libvirt_virDomainGetFSInfo(PyObject *self ATTRIBUTE_UNUSED, goto cleanup; } -#endif /* LIBVIR_CHECK_VERSION(1, 2, 11) */ -#if LIBVIR_CHECK_VERSION(1, 3, 3) static PyObject * libvirt_virDomainGetPerfEvents(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) @@ -8837,9 +8765,7 @@ libvirt_virDomainSetPerfEvents(PyObject *self ATTRIBUTE_UNUSED, virTypedParamsFree(new_params, size); return ret; } -#endif /* LIBVIR_CHECK_VERSION(1, 3, 3) */ -#if LIBVIR_CHECK_VERSION(2, 0, 0) static void libvirt_virConnectStoragePoolEventFreeFunc(void *opaque) { @@ -9072,9 +8998,7 @@ libvirt_virDomainGetGuestVcpus(PyObject *self ATTRIBUTE_UNUSED, virTypedParamsFree(params, nparams); return ret; } -#endif /* LIBVIR_CHECK_VERSION(2, 0, 0)*/ -#if LIBVIR_CHECK_VERSION(2, 2, 0) static void libvirt_virConnectNodeDeviceEventFreeFunc(void *opaque) { @@ -9276,9 +9200,7 @@ libvirt_virConnectNodeDeviceEventDeregisterAny(PyObject *self ATTRIBUTE_UNUSED, return libvirt_intWrap(ret); } -#endif /* LIBVIR_CHECK_VERSION(2, 2, 0)*/ -#if LIBVIR_CHECK_VERSION(3, 0, 0) static void libvirt_virConnectSecretEventFreeFunc(void *opaque) { @@ -9475,10 +9397,8 @@ libvirt_virConnectSecretEventDeregisterAny(PyObject *self ATTRIBUTE_UNUSED, return libvirt_intWrap(ret); } -#endif /* LIBVIR_CHECK_VERSION(3, 0, 0)*/ -#if LIBVIR_CHECK_VERSION(3, 4, 0) static PyObject * libvirt_virStreamRecvHole(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) @@ -9571,7 +9491,6 @@ libvirt_virStreamRecvFlags(PyObject *self ATTRIBUTE_UNUSED, return rv; } -#endif /* LIBVIR_CHECK_VERSION(3, 4, 0) */ /************************************************************************ @@ -9583,28 +9502,20 @@ static PyMethodDef libvirtMethods[] = { #include "build/libvirt-export.c" {(char *) "virGetVersion", libvirt_virGetVersion, METH_VARARGS, NULL}, {(char *) "virConnectGetVersion", libvirt_virConnectGetVersion, METH_VARARGS, NULL}, -#if LIBVIR_CHECK_VERSION(1, 1, 3) {(char *) "virConnectGetCPUModelNames", libvirt_virConnectGetCPUModelNames, METH_VARARGS, NULL}, -#endif /* LIBVIR_CHECK_VERSION(1, 1, 3) */ {(char *) "virConnectGetLibVersion", libvirt_virConnectGetLibVersion, METH_VARARGS, NULL}, {(char *) "virConnectOpenAuth", libvirt_virConnectOpenAuth, METH_VARARGS, NULL}, {(char *) "virConnectListDomainsID", libvirt_virConnectListDomainsID, METH_VARARGS, NULL}, {(char *) "virConnectListDefinedDomains", libvirt_virConnectListDefinedDomains, METH_VARARGS, NULL}, -#if LIBVIR_CHECK_VERSION(0, 9, 13) {(char *) "virConnectListAllDomains", libvirt_virConnectListAllDomains, METH_VARARGS, NULL}, -#endif /* LIBVIR_CHECK_VERSION(0, 9, 13) */ {(char *) "virConnectDomainEventRegister", libvirt_virConnectDomainEventRegister, METH_VARARGS, NULL}, {(char *) "virConnectDomainEventDeregister", libvirt_virConnectDomainEventDeregister, METH_VARARGS, NULL}, {(char *) "virConnectDomainEventRegisterAny", libvirt_virConnectDomainEventRegisterAny, METH_VARARGS, NULL}, {(char *) "virConnectDomainEventDeregisterAny", libvirt_virConnectDomainEventDeregisterAny, METH_VARARGS, NULL}, -#if LIBVIR_CHECK_VERSION(1, 2, 1) {(char *) "virConnectNetworkEventRegisterAny", libvirt_virConnectNetworkEventRegisterAny, METH_VARARGS, NULL}, {(char *) "virConnectNetworkEventDeregisterAny", libvirt_virConnectNetworkEventDeregisterAny, METH_VARARGS, NULL}, -#endif /* LIBVIR_CHECK_VERSION(1, 2, 1) */ -#if LIBVIR_CHECK_VERSION(0, 10, 0) {(char *) "virConnectRegisterCloseCallback", libvirt_virConnectRegisterCloseCallback, METH_VARARGS, NULL}, {(char *) "virConnectUnregisterCloseCallback", libvirt_virConnectUnregisterCloseCallback, METH_VARARGS, NULL}, -#endif /* LIBVIR_CHECK_VERSION(0, 10, 0) */ {(char *) "virStreamEventAddCallback", libvirt_virStreamEventAddCallback, METH_VARARGS, NULL}, {(char *) "virStreamRecv", libvirt_virStreamRecv, METH_VARARGS, NULL}, {(char *) "virStreamSend", libvirt_virStreamSend, METH_VARARGS, NULL}, @@ -9615,9 +9526,7 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virNodeGetInfo", libvirt_virNodeGetInfo, METH_VARARGS, NULL}, {(char *) "virNodeGetSecurityModel", libvirt_virNodeGetSecurityModel, METH_VARARGS, NULL}, {(char *) "virDomainGetSecurityLabel", libvirt_virDomainGetSecurityLabel, METH_VARARGS, NULL}, -#if LIBVIR_CHECK_VERSION(0, 10, 0) {(char *) "virDomainGetSecurityLabelList", libvirt_virDomainGetSecurityLabelList, METH_VARARGS, NULL}, -#endif /* LIBVIR_CHECK_VERSION(0, 10, 0) */ {(char *) "virNodeGetCPUStats", libvirt_virNodeGetCPUStats, METH_VARARGS, NULL}, {(char *) "virNodeGetMemoryStats", libvirt_virNodeGetMemoryStats, METH_VARARGS, NULL}, {(char *) "virDomainGetUUID", libvirt_virDomainGetUUID, METH_VARARGS, NULL}, @@ -9628,9 +9537,7 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virConnGetLastError", libvirt_virConnGetLastError, METH_VARARGS, NULL}, {(char *) "virConnectListNetworks", libvirt_virConnectListNetworks, METH_VARARGS, NULL}, {(char *) "virConnectListDefinedNetworks", libvirt_virConnectListDefinedNetworks, METH_VARARGS, NULL}, -#if LIBVIR_CHECK_VERSION(0, 10, 2) {(char *) "virConnectListAllNetworks", libvirt_virConnectListAllNetworks, METH_VARARGS, NULL}, -#endif /* LIBVIR_CHECK_VERSION(0, 10, 2) */ {(char *) "virNetworkGetUUID", libvirt_virNetworkGetUUID, METH_VARARGS, NULL}, {(char *) "virNetworkGetUUIDString", libvirt_virNetworkGetUUIDString, METH_VARARGS, NULL}, {(char *) "virNetworkLookupByUUID", libvirt_virNetworkLookupByUUID, METH_VARARGS, NULL}, @@ -9659,29 +9566,19 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virDomainPinVcpu", libvirt_virDomainPinVcpu, METH_VARARGS, NULL}, {(char *) "virDomainPinVcpuFlags", libvirt_virDomainPinVcpuFlags, METH_VARARGS, NULL}, {(char *) "virDomainGetVcpuPinInfo", libvirt_virDomainGetVcpuPinInfo, METH_VARARGS, NULL}, -#if LIBVIR_CHECK_VERSION(0, 10, 0) {(char *) "virDomainGetEmulatorPinInfo", libvirt_virDomainGetEmulatorPinInfo, METH_VARARGS, NULL}, {(char *) "virDomainPinEmulator", libvirt_virDomainPinEmulator, METH_VARARGS, NULL}, -#endif /* LIBVIR_CHECK_VERSION(0, 10, 0) */ -#if LIBVIR_CHECK_VERSION(1, 2, 14) {(char *) "virDomainGetIOThreadInfo", libvirt_virDomainGetIOThreadInfo, METH_VARARGS, NULL}, {(char *) "virDomainPinIOThread", libvirt_virDomainPinIOThread, METH_VARARGS, NULL}, -#endif /* LIBVIR_CHECK_VERSION(1, 2, 14) */ {(char *) "virConnectListStoragePools", libvirt_virConnectListStoragePools, METH_VARARGS, NULL}, {(char *) "virConnectListDefinedStoragePools", libvirt_virConnectListDefinedStoragePools, METH_VARARGS, NULL}, -#if LIBVIR_CHECK_VERSION(0, 10, 2) {(char *) "virConnectListAllStoragePools", libvirt_virConnectListAllStoragePools, METH_VARARGS, NULL}, -#endif /* LIBVIR_CHECK_VERSION(0, 10, 2) */ {(char *) "virStoragePoolGetAutostart", libvirt_virStoragePoolGetAutostart, METH_VARARGS, NULL}, {(char *) "virStoragePoolListVolumes", libvirt_virStoragePoolListVolumes, METH_VARARGS, NULL}, -#if LIBVIR_CHECK_VERSION(0, 10, 2) {(char *) "virStoragePoolListAllVolumes", libvirt_virStoragePoolListAllVolumes, METH_VARARGS, NULL}, -#endif /* LIBVIR_CHECK_VERSION(0, 10, 2) */ {(char *) "virStoragePoolGetInfo", libvirt_virStoragePoolGetInfo, METH_VARARGS, NULL}, {(char *) "virStorageVolGetInfo", libvirt_virStorageVolGetInfo, METH_VARARGS, NULL}, -#if LIBVIR_CHECK_VERSION(3, 0, 0) {(char *) "virStorageVolGetInfoFlags", libvirt_virStorageVolGetInfoFlags, METH_VARARGS, NULL}, -#endif /* LIBVIR_CHECK_VERSION(3, 0, 0) */ {(char *) "virStoragePoolGetUUID", libvirt_virStoragePoolGetUUID, METH_VARARGS, NULL}, {(char *) "virStoragePoolGetUUIDString", libvirt_virStoragePoolGetUUIDString, METH_VARARGS, NULL}, {(char *) "virStoragePoolLookupByUUID", libvirt_virStoragePoolLookupByUUID, METH_VARARGS, NULL}, @@ -9692,121 +9589,75 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virEventInvokeTimeoutCallback", libvirt_virEventInvokeTimeoutCallback, METH_VARARGS, NULL}, {(char *) "virEventInvokeFreeCallback", libvirt_virEventInvokeFreeCallback, METH_VARARGS, NULL}, {(char *) "virNodeListDevices", libvirt_virNodeListDevices, METH_VARARGS, NULL}, -#if LIBVIR_CHECK_VERSION(0, 10, 2) {(char *) "virConnectListAllNodeDevices", libvirt_virConnectListAllNodeDevices, METH_VARARGS, NULL}, -#endif /* LIBVIR_CHECK_VERSION(0, 10, 2) */ {(char *) "virNodeDeviceListCaps", libvirt_virNodeDeviceListCaps, METH_VARARGS, NULL}, {(char *) "virSecretGetUUID", libvirt_virSecretGetUUID, METH_VARARGS, NULL}, {(char *) "virSecretGetUUIDString", libvirt_virSecretGetUUIDString, METH_VARARGS, NULL}, {(char *) "virSecretLookupByUUID", libvirt_virSecretLookupByUUID, METH_VARARGS, NULL}, {(char *) "virConnectListSecrets", libvirt_virConnectListSecrets, METH_VARARGS, NULL}, -#if LIBVIR_CHECK_VERSION(0, 10, 2) {(char *) "virConnectListAllSecrets", libvirt_virConnectListAllSecrets, METH_VARARGS, NULL}, -#endif /* LIBVIR_CHECK_VERSION(0, 10, 2) */ {(char *) "virSecretGetValue", libvirt_virSecretGetValue, METH_VARARGS, NULL}, {(char *) "virSecretSetValue", libvirt_virSecretSetValue, METH_VARARGS, NULL}, {(char *) "virNWFilterGetUUID", libvirt_virNWFilterGetUUID, METH_VARARGS, NULL}, {(char *) "virNWFilterGetUUIDString", libvirt_virNWFilterGetUUIDString, METH_VARARGS, NULL}, {(char *) "virNWFilterLookupByUUID", libvirt_virNWFilterLookupByUUID, METH_VARARGS, NULL}, {(char *) "virConnectListNWFilters", libvirt_virConnectListNWFilters, METH_VARARGS, NULL}, -#if LIBVIR_CHECK_VERSION(0, 10, 2) {(char *) "virConnectListAllNWFilters", libvirt_virConnectListAllNWFilters, METH_VARARGS, NULL}, -#endif /* LIBVIR_CHECK_VERSION(0, 10, 2) */ {(char *) "virConnectListInterfaces", libvirt_virConnectListInterfaces, METH_VARARGS, NULL}, {(char *) "virConnectListDefinedInterfaces", libvirt_virConnectListDefinedInterfaces, METH_VARARGS, NULL}, -#if LIBVIR_CHECK_VERSION(0, 10, 2) {(char *) "virConnectListAllInterfaces", libvirt_virConnectListAllInterfaces, METH_VARARGS, NULL}, -#endif /* LIBVIR_CHECK_VERSION(0, 10, 2) */ {(char *) "virConnectBaselineCPU", libvirt_virConnectBaselineCPU, METH_VARARGS, NULL}, {(char *) "virDomainGetJobInfo", libvirt_virDomainGetJobInfo, METH_VARARGS, NULL}, -#if LIBVIR_CHECK_VERSION(1, 0, 3) {(char *) "virDomainGetJobStats", libvirt_virDomainGetJobStats, METH_VARARGS, NULL}, -#endif /* LIBVIR_CHECK_VERSION(1, 0, 3) */ {(char *) "virDomainSnapshotListNames", libvirt_virDomainSnapshotListNames, METH_VARARGS, NULL}, -#if LIBVIR_CHECK_VERSION(0, 9, 13) {(char *) "virDomainListAllSnapshots", libvirt_virDomainListAllSnapshots, METH_VARARGS, NULL}, -#endif /* LIBVIR_CHECK_VERSION(0, 9, 13) */ {(char *) "virDomainSnapshotListChildrenNames", libvirt_virDomainSnapshotListChildrenNames, METH_VARARGS, NULL}, -#if LIBVIR_CHECK_VERSION(0, 9, 13) {(char *) "virDomainSnapshotListAllChildren", libvirt_virDomainSnapshotListAllChildren, METH_VARARGS, NULL}, -#endif /* LIBVIR_CHECK_VERSION(0, 9, 13) */ {(char *) "virDomainRevertToSnapshot", libvirt_virDomainRevertToSnapshot, METH_VARARGS, NULL}, {(char *) "virDomainGetBlockJobInfo", libvirt_virDomainGetBlockJobInfo, METH_VARARGS, NULL}, {(char *) "virDomainSetBlockIoTune", libvirt_virDomainSetBlockIoTune, METH_VARARGS, NULL}, {(char *) "virDomainGetBlockIoTune", libvirt_virDomainGetBlockIoTune, METH_VARARGS, NULL}, {(char *) "virDomainSendKey", libvirt_virDomainSendKey, METH_VARARGS, NULL}, -#if LIBVIR_CHECK_VERSION(1, 0, 3) {(char *) "virDomainMigrateGetCompressionCache", libvirt_virDomainMigrateGetCompressionCache, METH_VARARGS, NULL}, -#endif /* LIBVIR_CHECK_VERSION(1, 0, 3) */ {(char *) "virDomainMigrateGetMaxSpeed", libvirt_virDomainMigrateGetMaxSpeed, METH_VARARGS, NULL}, #if LIBVIR_CHECK_VERSION(3, 7, 0) {(char *) "virDomainMigrateGetMaxDowntime", libvirt_virDomainMigrateGetMaxDowntime, METH_VARARGS, NULL}, #endif /* LIBVIR_CHECK_VERSION(3, 7, 0) */ {(char *) "virDomainMigrateGetMaxSpeed", libvirt_virDomainMigrateGetMaxSpeed, METH_VARARGS, NULL}, -#if LIBVIR_CHECK_VERSION(1, 1, 0) {(char *) "virDomainMigrate3", libvirt_virDomainMigrate3, METH_VARARGS, NULL}, {(char *) "virDomainMigrateToURI3", libvirt_virDomainMigrateToURI3, METH_VARARGS, NULL}, -#endif /* LIBVIR_CHECK_VERSION(1, 1, 0) */ {(char *) "virDomainBlockPeek", libvirt_virDomainBlockPeek, METH_VARARGS, NULL}, {(char *) "virDomainMemoryPeek", libvirt_virDomainMemoryPeek, METH_VARARGS, NULL}, {(char *) "virDomainGetDiskErrors", libvirt_virDomainGetDiskErrors, METH_VARARGS, NULL}, -#if LIBVIR_CHECK_VERSION(0, 10, 2) {(char *) "virNodeGetMemoryParameters", libvirt_virNodeGetMemoryParameters, METH_VARARGS, NULL}, {(char *) "virNodeSetMemoryParameters", libvirt_virNodeSetMemoryParameters, METH_VARARGS, NULL}, -#endif /* LIBVIR_CHECK_VERSION(0, 10, 2) */ -#if LIBVIR_CHECK_VERSION(1, 0, 0) {(char *) "virNodeGetCPUMap", libvirt_virNodeGetCPUMap, METH_VARARGS, NULL}, -#endif /* LIBVIR_CHECK_VERSION(1, 0, 0) */ -#if LIBVIR_CHECK_VERSION(1, 1, 1) {(char *) "virDomainCreateXMLWithFiles", libvirt_virDomainCreateXMLWithFiles, METH_VARARGS, NULL}, {(char *) "virDomainCreateWithFiles", libvirt_virDomainCreateWithFiles, METH_VARARGS, NULL}, -#endif /* LIBVIR_CHECK_VERSION(1, 1, 1) */ -#if LIBVIR_CHECK_VERSION(1, 2, 5) {(char *) "virDomainFSFreeze", libvirt_virDomainFSFreeze, METH_VARARGS, NULL}, {(char *) "virDomainFSThaw", libvirt_virDomainFSThaw, METH_VARARGS, NULL}, {(char *) "virDomainGetTime", libvirt_virDomainGetTime, METH_VARARGS, NULL}, {(char *) "virDomainSetTime", libvirt_virDomainSetTime, METH_VARARGS, NULL}, -#endif /* LIBVIR_CHECK_VERSION(1, 2, 5) */ -#if LIBVIR_CHECK_VERSION(1, 2, 6) {(char *) "virNodeGetFreePages", libvirt_virNodeGetFreePages, METH_VARARGS, NULL}, {(char *) "virNetworkGetDHCPLeases", libvirt_virNetworkGetDHCPLeases, METH_VARARGS, NULL}, -#endif /* LIBVIR_CHECK_VERSION(1, 2, 6) */ -#if LIBVIR_CHECK_VERSION(1, 2, 8) {(char *) "virConnectGetAllDomainStats", libvirt_virConnectGetAllDomainStats, METH_VARARGS, NULL}, {(char *) "virDomainListGetStats", libvirt_virDomainListGetStats, METH_VARARGS, NULL}, {(char *) "virDomainBlockCopy", libvirt_virDomainBlockCopy, METH_VARARGS, NULL}, -#endif /* LIBVIR_CHECK_VERSION(1, 2, 8) */ -#if LIBVIR_CHECK_VERSION(1, 2, 9) {(char *) "virNodeAllocPages", libvirt_virNodeAllocPages, METH_VARARGS, NULL}, -#endif /* LIBVIR_CHECK_VERSION(1, 2, 9) */ -#if LIBVIR_CHECK_VERSION(1, 2, 11) {(char *) "virDomainGetFSInfo", libvirt_virDomainGetFSInfo, METH_VARARGS, NULL}, -#endif /* LIBVIR_CHECK_VERSION(1, 2, 11) */ -#if LIBVIR_CHECK_VERSION(1, 2, 14) {(char *) "virDomainInterfaceAddresses", libvirt_virDomainInterfaceAddresses, METH_VARARGS, NULL}, -#endif /* LIBVIR_CHECK_VERSION(1, 2, 14) */ -#if LIBVIR_CHECK_VERSION(1, 3, 3) {(char *) "virDomainGetPerfEvents", libvirt_virDomainGetPerfEvents, METH_VARARGS, NULL}, {(char *) "virDomainSetPerfEvents", libvirt_virDomainSetPerfEvents, METH_VARARGS, NULL}, -#endif /* LIBVIR_CHECK_VERSION(1, 3, 3) */ -#if LIBVIR_CHECK_VERSION(2, 0, 0) {(char *) "virConnectStoragePoolEventRegisterAny", libvirt_virConnectStoragePoolEventRegisterAny, METH_VARARGS, NULL}, {(char *) "virConnectStoragePoolEventDeregisterAny", libvirt_virConnectStoragePoolEventDeregisterAny, METH_VARARGS, NULL}, {(char *) "virDomainGetGuestVcpus", libvirt_virDomainGetGuestVcpus, METH_VARARGS, NULL}, -#endif /* LIBVIR_CHECK_VERSION(2, 0, 0) */ -#if LIBVIR_CHECK_VERSION(2, 2, 0) {(char *) "virConnectNodeDeviceEventRegisterAny", libvirt_virConnectNodeDeviceEventRegisterAny, METH_VARARGS, NULL}, {(char *) "virConnectNodeDeviceEventDeregisterAny", libvirt_virConnectNodeDeviceEventDeregisterAny, METH_VARARGS, NULL}, -#endif /* LIBVIR_CHECK_VERSION(2, 2, 0) */ -#if LIBVIR_CHECK_VERSION(3, 0, 0) {(char *) "virConnectSecretEventRegisterAny", libvirt_virConnectSecretEventRegisterAny, METH_VARARGS, NULL}, {(char *) "virConnectSecretEventDeregisterAny", libvirt_virConnectSecretEventDeregisterAny, METH_VARARGS, NULL}, -#endif /* LIBVIR_CHECK_VERSION(3, 0, 0) */ -#if LIBVIR_CHECK_VERSION(3, 4, 0) {(char *) "virStreamRecvHole", libvirt_virStreamRecvHole, METH_VARARGS, NULL}, {(char *) "virStreamSendHole", libvirt_virStreamSendHole, METH_VARARGS, NULL}, {(char *) "virStreamRecvFlags", libvirt_virStreamRecvFlags, METH_VARARGS, NULL}, -#endif /* LIBVIR_CHECK_VERSION(3, 4, 0) */ {NULL, NULL, 0, NULL} }; -- 2.13.5

3 4

[libvirt] [PATCH 0/3] qemu: hotplig: Improve error reporting
by Peter Krempa 14 Sep '17

14 Sep '17

Add helpers to remember existing errors when they might be overwritten and use it to fix "unknown error" reported when attaching disk with lock manager enabled. Peter Krempa (3): util: error: Add helpers for saving and restoring of last error qemu: hotplug: Use new helpers for storing libvirt errors qemu: Restore errors when rolling back disk image state src/libvirt_private.syms | 2 + src/qemu/qemu_hotplug.c | 97 ++++++++++++++++-------------------------------- src/util/virerror.c | 45 ++++++++++++++++++++++ src/util/virerror.h | 3 ++ 4 files changed, 82 insertions(+), 65 deletions(-) -- 2.14.1

2 4

[libvirt] [PATCH libvirt-glib 0/3] Doc updates
by Guido Günther 14 Sep '17

14 Sep '17

Hi, here are some doc updates I found on a long unused branch but they still apply. Cheers, -- Guido Guido Günther (3): Add some missing docs streams: fix references gvir_stream_send: make it obvious that we send bytes libvirt-gobject/libvirt-gobject-connection.c | 15 ++++++++++- libvirt-gobject/libvirt-gobject-domain.c | 2 +- libvirt-gobject/libvirt-gobject-stream.c | 38 ++++++++++++++++++---------- 3 files changed, 39 insertions(+), 16 deletions(-) -- 2.14.1

1 3

[libvirt] [PATCH v4 0/2] Add support for qcow2 cache
by Liu Qing 14 Sep '17

14 Sep '17

Qcow2 small IO random write performance will drop dramatically if the l2 cache table could not cover the whole disk. This will be a lot of l2 cache table RW operations if cache miss happens frequently. This patch exports the qcow2 driver parameter l2-cache-size/refcount-cache-size, first added in Qemu 2.2, and cache-clean-interval, first added in Qemu 2.5, in libvirt. Change since v3: a) copy qcow2 cache configurion from source to backing to backing file source. Liu Qing (2): conf, docs: Add qcow2 cache configuration support qemu: add capability checking for qcow2 cache configuration docs/formatdomain.html.in | 43 ++++++++++ docs/schemas/domaincommon.rng | 35 ++++++++ src/conf/domain_conf.c | 95 +++++++++++++++++++++- src/qemu/qemu_capabilities.c | 9 ++ src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_command.c | 33 ++++++++ src/qemu/qemu_driver.c | 5 ++ src/util/virstoragefile.c | 3 + src/util/virstoragefile.h | 6 ++ tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 3 + .../caps_2.6.0-gicv2.aarch64.xml | 3 + .../caps_2.6.0-gicv3.aarch64.xml | 3 + tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml | 3 + tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 3 + tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 3 + tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 3 + tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 3 + tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 3 + tests/qemucapabilitiesdata/caps_2.9.0.ppc64le.xml | 3 + tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 3 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 3 + .../qemuxml2argv-disk-drive-qcow2-cache.args | 28 +++++++ .../qemuxml2argv-disk-drive-qcow2-cache.xml | 43 ++++++++++ tests/qemuxml2argvtest.c | 4 + .../qemuxml2xmlout-disk-drive-qcow2-cache.xml | 43 ++++++++++ tests/qemuxml2xmltest.c | 1 + 26 files changed, 386 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-qcow2-cache.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-qcow2-cache.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-qcow2-cache.xml -- 1.8.3.1

3 12

[libvirt] [PATCH 0/5] Misc
by Michal Privoznik 14 Sep '17

14 Sep '17

*** BLURB HERE *** Michal Privoznik (5): rng: Drop useless <choice/> rng: Fix formatting qemuBuildHostNetStr: Don't leak buffer conf: Allow usernet to have an address qemu: Implement usernet address docs/formatdomain.html.in | 13 +- docs/schemas/capability.rng | 28 ++-- docs/schemas/domaincommon.rng | 141 ++++++++------------- docs/schemas/network.rng | 2 +- docs/schemas/nodedev.rng | 8 +- docs/schemas/nwfilter.rng | 54 ++++---- docs/schemas/storagecommon.rng | 4 +- docs/schemas/storagepool.rng | 4 +- src/conf/domain_conf.c | 5 +- src/qemu/qemu_command.c | 35 ++++- src/qemu/qemu_domain.c | 49 +++++++ .../qemuxml2argv-net-user-addr.args | 25 ++++ .../qemuxml2argv-net-user-addr.xml | 42 ++++++ tests/qemuxml2argvtest.c | 1 + .../qemuxml2xmlout-net-user-addr.xml | 1 + tests/qemuxml2xmltest.c | 1 + 16 files changed, 267 insertions(+), 146 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-user-addr.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-user-addr.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-net-user-addr.xml -- 2.13.5

3 15

[libvirt] [PATCH v3 0/2] Add support for qcow2 cache
by Liu Qing 14 Sep '17

14 Sep '17

changes since v2: Patch 1 - a) add new element qcow2 as drive's child, if any qcow2 specific configuration exists. b) merge the three test cases to one. c) update docs. cache size only support bytes. d) move the parameters checking to virDomainDiskDefParseValidate Patch 2 - a) use QMP instead of qemu version to identify qemu capabilities. b) change capablity names with prefix drive.qcow2. c) merge the three test cases to one. Liu Qing (2): conf, docs: Add qcow2 cache configuration support qemu: add capability checking for qcow2 cache configuration docs/formatdomain.html.in | 43 ++++++++++ docs/schemas/domaincommon.rng | 35 ++++++++ src/conf/domain_conf.c | 95 +++++++++++++++++++++- src/qemu/qemu_capabilities.c | 9 ++ src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_command.c | 33 ++++++++ src/util/virstoragefile.c | 3 + src/util/virstoragefile.h | 6 ++ tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 3 + .../caps_2.6.0-gicv2.aarch64.xml | 3 + .../caps_2.6.0-gicv3.aarch64.xml | 3 + tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml | 3 + tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 3 + tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 3 + tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 3 + tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 3 + tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 3 + tests/qemucapabilitiesdata/caps_2.9.0.ppc64le.xml | 3 + tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 3 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 3 + .../qemuxml2argv-disk-drive-qcow2-cache.args | 28 +++++++ .../qemuxml2argv-disk-drive-qcow2-cache.xml | 43 ++++++++++ tests/qemuxml2argvtest.c | 4 + .../qemuxml2xmlout-disk-drive-qcow2-cache.xml | 43 ++++++++++ tests/qemuxml2xmltest.c | 1 + 25 files changed, 381 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-qcow2-cache.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-qcow2-cache.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-qcow2-cache.xml -- 1.8.3.1

2 5

[libvirt] [PATCH v2 0/2] Allow usernet to have an address
by Michal Privoznik 13 Sep '17

13 Sep '17

diff to v1: - moved the <ip/> directly under <interface/> - enhanced the test - tuned some error messages Michal Privoznik (2): conf: Allow usernet to have an address qemu: Implement usernet address docs/formatdomain.html.in | 8 +++- src/qemu/qemu_command.c | 22 +++++++++ src/qemu/qemu_domain.c | 53 +++++++++++++++++++++- .../qemuxml2argv-net-user-addr.args | 26 +++++++++++ .../qemuxml2argv-net-user-addr.xml | 41 +++++++++++++++++ tests/qemuxml2argvtest.c | 1 + .../qemuxml2xmlout-net-user-addr.xml | 1 + tests/qemuxml2xmltest.c | 1 + 8 files changed, 151 insertions(+), 2 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-user-addr.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-user-addr.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-net-user-addr.xml -- 2.13.5

2 4

[libvirt] [PATCH go-xml 0/2] DomainAddress parsing fix
by Dean Smith 13 Sep '17

13 Sep '17

*** BLURB HERE *** I have taken Anton Kryukovs fix from #13 on github and am submitting along with addition of 1.8 and 1.9 as travis go version targets Example of failing running on 1.9, which passes on 1.7 can be found at git@github.com:deasmi/libvirt-go-xml.git branch parsefailtest Anton Kryukov (1): Add support for hex values in DomainAddress struct Dean Smith (1): Adding go 1.8 and 1.9 to travis tests .travis.yml | 2 ++ domain.go | 27 ++++++++++++++++++--------- domain_test.go | 10 +++++----- 3 files changed, 25 insertions(+), 14 deletions(-) -- 1.8.3.1

2 3

[libvirt] [PATCH 0/3] qemu: Remove support for downstream-only blockjob
by Peter Krempa 13 Sep '17

13 Sep '17

See patch 1/3 Peter Krempa (3): qemu: Remove support for legacy block jobs qemu: monitor: Remove support for "legacy" block jobs qemu: caps: Deprecate QEMU_CAPS_BLOCKJOB_SYNC src/qemu/qemu_capabilities.c | 1 - src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_domain.c | 13 +++------- src/qemu/qemu_domain.h | 2 +- src/qemu/qemu_driver.c | 61 +++++++++++--------------------------------- src/qemu/qemu_migration.c | 2 +- src/qemu/qemu_monitor.c | 24 ++++++++--------- src/qemu/qemu_monitor.h | 9 +++---- src/qemu/qemu_monitor_json.c | 17 +++++------- src/qemu/qemu_monitor_json.h | 9 +++---- 10 files changed, 44 insertions(+), 96 deletions(-) -- 2.14.1

2 6

[libvirt] [PATCH 0/2] Use secret objects to pass iSCSI passwords
by John Ferlan 13 Sep '17

13 Sep '17

Fairly simple exercise since similar processing is used for RBD, just needed to check for the proper capabililty and then use it and test that it works. NB 1: Depending on order of submit either this patch will need to add the capability flag into caps_2.10.0 or the other patch will need to add it... Plan is to wait for the other patch to be ACK'd and then add the capability here NB 2: "Theoretically speaking" one could/should also consider the <auth> for the JSON virstoragefile source parse backing code; however, <auth> is not a <source> property rather it is a <disk> property and thus stored in QEMU_DOMAIN_DISK_PRIVATE. But for both RBD and iSCSI the "user" and "password-secret" options are -drive properties that could be parsed and handled (ok well mostly handled). In any case, the RBD code doesn't handle it (for now), so neither will the iSCSI code. John Ferlan (2): qemu: Get capabilities for iscsi usage of password-secret argument qemu: Use secret objects to pass iSCSI passwords src/qemu/qemu_capabilities.c | 4 ++ src/qemu/qemu_capabilities.h | 3 ++ src/qemu/qemu_command.c | 19 ++++++++- src/qemu/qemu_domain.c | 4 ++ tests/qemucapabilitiesdata/caps_2.9.0.ppc64le.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + ...xml2argv-disk-drive-network-iscsi-auth-AES.args | 39 ++++++++++++++++++ ...uxml2argv-disk-drive-network-iscsi-auth-AES.xml | 43 +++++++++++++++++++ ...ml2argv-hostdev-scsi-virtio-iscsi-auth-AES.args | 35 ++++++++++++++++ ...xml2argv-hostdev-scsi-virtio-iscsi-auth-AES.xml | 48 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 10 +++++ 12 files changed, 206 insertions(+), 2 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth-AES.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth-AES.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth-AES.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth-AES.xml -- 2.9.5

3 11

[libvirt] [PATCH] news: document spice rendernode DAC changes
by Cole Robinson 13 Sep '17

13 Sep '17

Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- docs/news.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index 483f9d6d1..17f00a25e 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -37,6 +37,17 @@ <section title="New features"> </section> <section title="Improvements"> + <change> + <summary> + qemu: DAC permissions properly set for spice renderndoe + </summary> + <description> + When a rendernode= path is set for spice GL on qemu:///system, + we now correctly set DAC permissions on the device at VM startup. + This is the last remaining hurdle to let spice GL work for + qemu:///system without any external host changes. + </description> + </change> </section> <section title="Bug fixes"> </section> -- 2.13.5

2 1

[libvirt] [PATCH] virsh.pod: Fix units for dommemstat and domstats
by Michal Privoznik 13 Sep '17

13 Sep '17

The documentation mistakenly states that the unit for returned values is kB (multiple of 1000), while in fact we are returning KiB (multiple of 1024). Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Oops, I forgot to send this one, tools/virsh.pod | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 01453be60..4331c76fc 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -810,16 +810,16 @@ missing from the output. Other fields may appear if communicating with a newer version of libvirtd. B<Explanation of fields>: - swap_in - The amount of data read from swap space (in kB) - swap_out - The amount of memory written out to swap space (in kB) + swap_in - The amount of data read from swap space (in KiB) + swap_out - The amount of memory written out to swap space (in KiB) major_fault - The number of page faults where disk IO was required minor_fault - The number of other page faults - unused - The amount of memory left unused by the system (in kB) - available - The amount of usable memory as seen by the domain (in kB) - actual - Current balloon value (in KB) - rss - Resident Set Size of the running domain's process (in kB) + unused - The amount of memory left unused by the system (in KiB) + available - The amount of usable memory as seen by the domain (in KiB) + actual - Current balloon value (in KiB) + rss - Resident Set Size of the running domain's process (in KiB) usable - The amount of memory which can be reclaimed by balloon -without causing host swapping (in KB) +without causing host swapping (in KiB) last-update - Timestamp of the last update of statistics (in seconds) For QEMU/KVM with a memory balloon, setting the optional I<--period> to a @@ -906,22 +906,22 @@ I<--cpu-total> returns: I<--balloon> returns: - "balloon.current" - the memory in kiB currently used - "balloon.maximum" - the maximum memory in kiB allowed - "balloon.swap_in" - the amount of data read from swap space (in kB) + "balloon.current" - the memory in KiB currently used + "balloon.maximum" - the maximum memory in KiB allowed + "balloon.swap_in" - the amount of data read from swap space (in KiB) "balloon.swap_out" - the amount of memory written out to swap - space (in kB) + space (in KiB) "balloon.major_fault" - the number of page faults then disk IO was required "balloon.minor_fault" - the number of other page faults "balloon.unused" - the amount of memory left unused by the - system (in kB) + system (in KiB) "balloon.available" - the amount of usable memory as seen by - the domain (in kB) + the domain (in KiB) "balloon.rss" - Resident Set Size of running domain's process - (in kB) + (in KiB) "balloon.usable" - the amount of memory which can be reclaimed by - balloon without causing host swapping (in KB) + balloon without causing host swapping (in KiB) "balloon.last-update" - timestamp of the last update of statistics (in seconds) -- 2.13.5

2 2

[libvirt] [PATCH] qemu: Clean up qemuDomainSecretPrepare
by John Ferlan 13 Sep '17

13 Sep '17

No need to pass a @driver parameter since all that's done is deref the @cfg especially since the only caller can just pass an already referenced @cfg. Also, looks like commit id '0298531b' at one time had a different name for the API, so I took the liberty of fixing the comments too since I would already be updating them for the @cfg variable. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Saw this while doing some updates for the recently posted VxHS series. src/qemu/qemu_domain.c | 11 ++++------- src/qemu/qemu_domain.h | 2 +- src/qemu/qemu_process.c | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index cbee151..4cd0087 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -7454,7 +7454,7 @@ qemuDomainPrepareChannel(virDomainChrDefPtr channel, } -/* qemuProcessPrepareDomainChardevSourceTLS: +/* qemuDomainPrepareChardevSourceTLS: * @source: pointer to host interface data for char devices * @cfg: driver configuration * @@ -7478,19 +7478,18 @@ qemuDomainPrepareChardevSourceTLS(virDomainChrSourceDefPtr source, } -/* qemuProcessPrepareDomainChardevSource: +/* qemuDomainPrepareChardevSource: * @def: live domain definition - * @driver: qemu driver + * @cfg: driver configuration * * Iterate through all devices that use virDomainChrSourceDefPtr as host * interface part. */ void qemuDomainPrepareChardevSource(virDomainDefPtr def, - virQEMUDriverPtr driver) + virQEMUDriverConfigPtr cfg) { size_t i; - virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); for (i = 0; i < def->nserials; i++) qemuDomainPrepareChardevSourceTLS(def->serials[i]->source, cfg); @@ -7515,8 +7514,6 @@ qemuDomainPrepareChardevSource(virDomainDefPtr def, for (i = 0; i < def->nredirdevs; i++) qemuDomainPrepareChardevSourceTLS(def->redirdevs[i]->source, cfg); - - virObjectUnref(cfg); } diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index f93b09b..4b030ae 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -842,7 +842,7 @@ void qemuDomainPrepareChardevSourceTLS(virDomainChrSourceDefPtr source, ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); void qemuDomainPrepareChardevSource(virDomainDefPtr def, - virQEMUDriverPtr driver) + virQEMUDriverConfigPtr cfg) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); int qemuDomainPrepareShmemChardev(virDomainShmemDefPtr shmem) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 364c359..44df858 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5327,7 +5327,7 @@ qemuProcessPrepareDomain(virConnectPtr conn, goto cleanup; VIR_DEBUG("Prepare chardev source backends for TLS"); - qemuDomainPrepareChardevSource(vm->def, driver); + qemuDomainPrepareChardevSource(vm->def, cfg); VIR_DEBUG("Add secrets to disks, hostdevs, and chardevs"); if (qemuDomainSecretPrepare(conn, driver, vm) < 0) -- 2.9.5

2 2

[libvirt] external snapshots bug
by Khasan Khafizov 13 Sep '17

13 Sep '17

Suppose we have a disk with several external snapshots of it. This disk is attached to some domain. I found that after destroying and starting the domain the xml of attached disk doesn't contain all backingStore that it has to. Before the restart the part of domain xml that relates to attached disk looks like this: <disk type='file' device='disk'> > <driver name='qemu' type='qcow2'/> > <source file='...'/> > <backingStore type='file' index='1'> > <format type='qcow2'/>  > <source file='...'/> > <backingStore type='file' index='2'> > <format type='qcow2'/> > <source file='...'/> > <backingStore type='file' index='3'> > <format type='qcow2'/> > <source file='...'/> > <backingStore/> > </backingStore> > </backingStore> > </backingStore> > </disk> And after the restart like this: <disk type='file' device='disk'> > <driver name='qemu' type='qcow2'/> > <source file='...'/> > <backingStore type='file' index='1'> > <format type='raw'/>  > <source file='...'/> > <backingStore/> > </backingStore> > </disk> So, the difference in two xml not only in depth of backing stores but in format type also. The result of it is that you can't run blockcommit that will commit overlay into base image if they don't have direct relations (if for example overlay is child of child of base image). Virsh says it can't find base in chain ( exception <https://github.com/libvirt/libvirt/blob/cdecfbed027ab242467580a897a636be82d…> ). Then I got that libvirt stops calling virStorageFileGetMetadataRecurse <https://github.com/libvirt/libvirt/blob/ed8661a309c96e4a1573dc0ca2c76ea7ff1…> function after first call because it thinks that format of first backingStore of disk is raw instead of qcow2. I solved it by adding to the qemu config the following line: > allow_disk_format_probing = 1 But in qemu config it was marked as secure hole. Idea of fix is that we can try assume that backing store of qcow is qcow insted of raw, but I really don't know what to do to implement this idea if it at all possible Thanks!

2 1

[libvirt] [PATCH] domain: add limit description of parameter 'size' for blockPeek and memoryPeek
by Chen Hanxiao 12 Sep '17

12 Sep '17

From: Chen Hanxiao <chenhanxiao(a)gmail.com> We had 'size' limits for virDomainMemoryPeek and virDomainBlockPeek by macro REMOTE_DOMAIN_BLOCK_PEEK_BUFFER_MAX and REMOTE_DOMAIN_MEMORY_PEEK_BUFFER_MAX. The descriptions of the two functions only emphasized RPC buffer size. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- src/libvirt-domain.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index ca5a153..646ce72 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -5802,6 +5802,9 @@ virDomainMemoryStats(virDomainPtr dom, virDomainMemoryStatPtr stats, * within the device or file. 'size' may be 0 to test if the * call would succeed. * + * 'size' should be <= 1048576(1M). Since v1.0.5, 'size' had been + * raised up to 4194304(4M). + * * 'buffer' is the return buffer and must be at least 'size' bytes. * * NB. The remote driver imposes a 64K byte limit on 'size'. @@ -5941,6 +5944,9 @@ virDomainBlockResize(virDomainPtr dom, * 'buffer' is the return buffer and must be at least 'size' bytes. * 'size' may be 0 to test if the call would succeed. * + * 'size' should be <= 1048576(1M). Since v1.0.5, 'size' had been + * raised up to 4194304(4M). + * * NB. The remote driver imposes a 64K byte limit on 'size'. * For your program to be able to work reliably over a remote * connection you should split large requests to <= 65536 bytes. -- 2.7.5

1 1

[libvirt] [PATCH] qemu: blockcopy: Probe image format only with VIR_DOMAIN_BLOCK_COPY_REUSE_EXT
by Peter Krempa 12 Sep '17

12 Sep '17

Commit 703abf1d7 changed the logic so that we don't attempt to re-create the image if it's a block device. This was done by modifying the 'reuse' variable. Unfortunately after modifying it one of the uses was to infer whether we should probe the disk format. After changes in the commit mentioned above we would attempt the probe if the target of the copy is a block device and the format was not provided explicitly rather than using the format of the disk. Fix it by explicitly checking whether the user requested a reuse of the disk rather than the modified boolean flag. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1490826 --- src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 70cdc88e1..23a51359d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16988,7 +16988,7 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm, goto endjob; if (!mirror->format) { - if (!reuse) { + if (!(flags & VIR_DOMAIN_BLOCK_COPY_REUSE_EXT)) { mirror->format = disk->src->format; } else { /* If the user passed the REUSE_EXT flag, then either they -- 2.14.1

2 1

[libvirt] libvirt stats units
by Marko Myllynen 12 Sep '17

12 Sep '17

Hi, virsh.pod states: "balloon.maximum" - the maximum memory in kiB allowed "balloon.swap_in" - the amount of data read from swap space (in kB) But to me it seems there's not such kb vs kib difference [1] so it would be nice to have a confirmation which one is actually used? 1) http://elixir.free-electrons.com/linux/v4.13/source/drivers/virtio/virtio_b… Thanks, -- Marko Myllynen

2 1

[libvirt] [PATCH v2] storage: Adjust expected format for Disk startup processing
by John Ferlan 12 Sep '17

12 Sep '17

https://bugzilla.redhat.com/show_bug.cgi?id=1464313 If a Disk pool was defined/created using XML that either didn't specify a specific format or specified format type='unknown', then restarting a pool after an initial disk backend build with overwrite would fail after a libvirtd restart for a non-autostarted pool. This is because the persistent pool data is not updated during pool build w/ overwrite processing to have the VIR_STORAGE_POOL_DISK_DOS default format. So in addition to the alteration done during disk build processing, alter the default expectation for disk startup to be DOS if nothing has been defined yet. That will either succeed if the pool had been successfully built previously using the default DOS format or fail with a message indicating the format is something else that does not match the expect format 'dos'. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- v1: https://www.redhat.com/archives/libvir-list/2017-September/msg00124.html Changes since v1... * Use a totally different methodology. Rather than updating the persistent config file, alter the start processing to handle the unknown setting in the persistent file properly. src/storage/storage_backend_disk.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c index e8f67bb00..bce3b4e2a 100644 --- a/src/storage/storage_backend_disk.c +++ b/src/storage/storage_backend_disk.c @@ -446,8 +446,7 @@ static int virStorageBackendDiskStartPool(virConnectPtr conn ATTRIBUTE_UNUSED, virStoragePoolObjPtr pool) { - const char *format = - virStoragePoolFormatDiskTypeToString(pool->def->source.format); + const char *format; const char *path = pool->def->source.devices[0].path; virWaitForDevices(); @@ -458,6 +457,9 @@ virStorageBackendDiskStartPool(virConnectPtr conn ATTRIBUTE_UNUSED, return -1; } + if (pool->def->source.format == VIR_STORAGE_POOL_DISK_UNKNOWN) + pool->def->source.format = VIR_STORAGE_POOL_DISK_DOS; + format = virStoragePoolFormatDiskTypeToString(pool->def->source.format); if (!virStorageBackendDeviceIsEmpty(path, format, false)) return -1; -- 2.13.5

2 1

[libvirt] [PATCH v2] qemu: Provide default LUN=0 for iSCSI if not provided
by John Ferlan 12 Sep '17

12 Sep '17

https://bugzilla.redhat.com/show_bug.cgi?id=1477880 If the "/#" is missing from the provided iSCSI path, then we need to provide the default LUN of /0; otherwise, QEMU will fail to parse the URL causing a failure to either create the guest or hotplug attach the storage. During post parse, for any iSCSI disk or hostdev, scan the source path looking for the presence of '/', if found, then we can assume the LUN is provided. If not found, alter the input XML to add the "/0". This will cause the generated XML to have the generated value when the domain config is saved after post parse. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- v1: https://www.redhat.com/archives/libvir-list/2017-September/msg00122.html Alter the patch to make the adjustment during device post parsing rather than command line creation as requested by code review. This will alter the output XML as well as the command line arguments for those entries that don't supply a LUN. We had a few, so that works out testing wise! src/conf/domain_conf.c | 43 ++++++++++++++++++++++ .../qemuargv2xml-disk-drive-network-iscsi.xml | 2 +- .../qemuxml2argv-disk-drive-network-iscsi-lun.args | 2 +- .../qemuxml2argv-disk-drive-network-iscsi.args | 2 +- .../qemuxml2argv-hostdev-scsi-lsi-iscsi.args | 2 +- .../qemuxml2argv-hostdev-scsi-virtio-iscsi.args | 2 +- .../qemuxml2xmlout-disk-drive-network-iscsi.xml | 2 +- .../qemuxml2xmlout-hostdev-scsi-lsi-iscsi.xml | 2 +- .../qemuxml2xmlout-hostdev-scsi-virtio-iscsi.xml | 2 +- 9 files changed, 51 insertions(+), 8 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 676fc0f34..a43b25c31 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4308,16 +4308,54 @@ virDomainHostdevAssignAddress(virDomainXMLOptionPtr xmlopt, } +/** + * virDomainPostParseCheckISCSIPath + * @srcpath: Source path read (a/k/a, IQN) either disk or hostdev + * + * The details of an IQN is defined by RFC 3720 and 3721, but + * we just need to make sure there's a lun provided. If not + * provided, then default to zero. For an ISCSI LUN that is + * is provided by /dev/disk/by-path/... , then that path will + * have the specific lun requested. + * + * Returns 0 on success, -1 on failure + */ +static int +virDomainPostParseCheckISCSIPath(char **srcpath) +{ + char *path = NULL; + + if (strchr(*srcpath, '/')) + return 0; + + if (virAsprintf(&path, "%s/0", *srcpath) < 0) + return -1; + VIR_FREE(*srcpath); + VIR_STEAL_PTR(*srcpath, path); + return 0; +} + + static int virDomainHostdevDefPostParse(virDomainHostdevDefPtr dev, const virDomainDef *def, virDomainXMLOptionPtr xmlopt) { + virDomainHostdevSubsysSCSIPtr scsisrc; + if (dev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) return 0; switch (dev->source.subsys.type) { case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI: + scsisrc = &dev->source.subsys.u.scsi; + if (scsisrc->protocol == VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI) { + virDomainHostdevSubsysSCSIiSCSIPtr iscsisrc = &scsisrc->u.iscsi; + + if (virDomainPostParseCheckISCSIPath(&iscsisrc->path) < 0) + return -1; + } + if (dev->info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE && virDomainHostdevAssignAddress(xmlopt, def, dev) < 0) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -4455,6 +4493,11 @@ virDomainDeviceDefPostParseCommon(virDomainDeviceDefPtr dev, } } + if (disk->src->type == VIR_STORAGE_TYPE_NETWORK && + disk->src->protocol == VIR_STORAGE_NET_PROTOCOL_ISCSI && + virDomainPostParseCheckISCSIPath(&disk->src->path) < 0) + return -1; + if (disk->bus != VIR_DOMAIN_DISK_BUS_VIRTIO && virDomainCheckVirtioOptions(disk->virtio) < 0) return -1; diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi.xml index 23542fa1d..694412b5c 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi.xml @@ -16,7 +16,7 @@ <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='network' device='disk'> <driver name='qemu' type='raw'/> - <source protocol='iscsi' name='iqn.1992-01.com.example'> + <source protocol='iscsi' name='iqn.1992-01.com.example/0'> <host name='example.org' port='6000'/> </source> <target dev='vda' bus='virtio'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-lun.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-lun.args index b25f3a0d6..0fbfd9a6d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-lun.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-lun.args @@ -21,7 +21,7 @@ server,nowait \ -boot c \ -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ -usb \ --drive file=iscsi://example.org:3260/iqn.1992-01.com.example,format=raw,\ +-drive file=iscsi://example.org:3260/iqn.1992-01.com.example/0,format=raw,\ if=none,id=drive-scsi0-0-0-0 \ -device scsi-block,bus=scsi0.0,channel=0,scsi-id=0,lun=0,\ drive=drive-scsi0-0-0-0,id=scsi0-0-0-0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi.args index a1d93af10..ed15fda21 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi.args @@ -19,7 +19,7 @@ server,nowait \ -no-acpi \ -boot c \ -usb \ --drive file=iscsi://example.org:6000/iqn.1992-01.com.example,format=raw,\ +-drive file=iscsi://example.org:6000/iqn.1992-01.com.example/0,format=raw,\ if=none,id=drive-virtio-disk0 \ -device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,\ id=virtio-disk0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi.args index 43c555a50..07ae9f592 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi.args @@ -22,7 +22,7 @@ server,nowait \ -usb \ -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --drive file=iscsi://example.org:3260/iqn.1992-01.com.example,if=none,\ +-drive file=iscsi://example.org:3260/iqn.1992-01.com.example/0,if=none,\ format=raw,id=drive-hostdev0 \ -device scsi-generic,bus=scsi0.0,scsi-id=4,drive=drive-hostdev0,id=hostdev0 \ -drive file=iscsi://example.org:3260/iqn.1992-01.com.example/1,if=none,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi.args index a78e3092c..d80c85918 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi.args @@ -22,7 +22,7 @@ server,nowait \ -usb \ -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --drive file=iscsi://example.org:3260/iqn.1992-01.com.example,if=none,\ +-drive file=iscsi://example.org:3260/iqn.1992-01.com.example/0,if=none,\ format=raw,id=drive-hostdev0 \ -device scsi-generic,bus=scsi0.0,channel=0,scsi-id=2,lun=4,\ drive=drive-hostdev0,id=hostdev0 \ diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-iscsi.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-iscsi.xml index 23542fa1d..694412b5c 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-iscsi.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-iscsi.xml @@ -16,7 +16,7 @@ <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='network' device='disk'> <driver name='qemu' type='raw'/> - <source protocol='iscsi' name='iqn.1992-01.com.example'> + <source protocol='iscsi' name='iqn.1992-01.com.example/0'> <host name='example.org' port='6000'/> </source> <target dev='vda' bus='virtio'/> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-lsi-iscsi.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-lsi-iscsi.xml index e19bce6ea..b7312ca4f 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-lsi-iscsi.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-lsi-iscsi.xml @@ -32,7 +32,7 @@ <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <hostdev mode='subsystem' type='scsi' managed='yes'> - <source protocol='iscsi' name='iqn.1992-01.com.example'> + <source protocol='iscsi' name='iqn.1992-01.com.example/0'> <host name='example.org' port='3260'/> </source> <address type='drive' controller='0' bus='0' target='0' unit='4'/> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-virtio-iscsi.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-virtio-iscsi.xml index 37635b4f9..ddf780160 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-virtio-iscsi.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-virtio-iscsi.xml @@ -32,7 +32,7 @@ <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <hostdev mode='subsystem' type='scsi' managed='yes'> - <source protocol='iscsi' name='iqn.1992-01.com.example'> + <source protocol='iscsi' name='iqn.1992-01.com.example/0'> <host name='example.org' port='3260'/> </source> <address type='drive' controller='0' bus='0' target='2' unit='4'/> -- 2.13.5

2 1

[libvirt] Yet another RFC for CAT
by Martin Kletzander 12 Sep '17

12 Sep '17

Hello everyone. Last couple of weeks [1] I was working on CAT for libvirt. Only clean-ups and minor things were pushed into upstream, but as I'm getting closer and closer to actual functionality I'm seeing a problem with our current (already discussed and approved) design. And I would like to know your thoughts about this, even if you are not familiar with CAT, feel free to keep the questions coming. * Little bit of background about CAT [I wanted to say "Long story short...", but after reading the mail in its entirety before sending it I see it would end up like in "I Should Have Never Gone Ziplining", so I'll rather let you brace for quite elongated or, dare I say, endless stream of words] Since the interface for CAT in the Linux kernel is quite hairy (together with cache information reporting, don't even get me started on that) and might feel pretty inconsistent if you are used to any Linux kernel interface, I would like to summarize how is it used [2]. Feel free to skip this part if you are familiar with it. You can tune how much cache which processes can utilize. Let's talk only about L3 for now, also let's assume only unified caches (no code/data prioritization). For simplicity. The cache is split into parts and when describing the allocation we use hexadecimal representation of bit masks where each bit is the smallest addressable (or rather allocable) part of the cache. Let's say you have 16MB L3 cache which the CPU is able to allocate by chunks of 1MB, so the allocation is represented by 32 bits => 8 hexadecimal characters. Yes, there can be minimum of continuous bits that need to be specified, you can have multiple L3 caches, etc., but that's yet another thing that's not important to what I need to discuss. The whole cache is then referred to as "ffff" in this particular case. Again, for simplicity sake, let's assume the above hardware is constant in future examples. Now, when you want to work with the allocations, it behaves similarly (not the same way, though) as cgroups. The default group, which contains all processes, is in /sys/fs/resctrl, and you can create additional groups (directories under /sys/fs/resctrl). These are flat, not hierarchical, meaning they cannot have subdirectories. Each resource group represents a group of processes (PIDs are written in "tasks" file) that share the same resource settings. One of the settings is the allocation of caches. By default there are no additional resource groups (subdirectories of /sys/fs/resctrl) and the default one occupies all the cache. (IIRC, all bit masks must have only consecutive bits, but I cannot find this in the documentation; let's assume this as well, but feel free to correct me) * Example time (we're almost there) Let's say you have the default group with this setting: L3:0=00ff That is setting of allocation for L3 cache, both code and data, cache id 0 and the occupancy rate is 50% (lower 8MB of the only L3 cache in our example to be precise). If you now create additional resource group, let's say "libvirt-qemu-3-alpine-vcpu3" (truly random name, right?) and set the following allocation: L3:0=0ff0 That specifies it will be allowed to use also 8MB of the cache, but this time from the middle. Half of that will be shared between this group and the default one, the rest is exclusive to this group only. * The current design (finally something libvirt-related, right?) The discussion ended with a conclusion of the following (with my best knowledge, there were so many discussions about so many things that I would spend too much time looking up all of them): - Users should not need to specify bit masks, such complexity should be abstracted. We'll use sizes (e.g. 4MB) - Multiple vCPUs might need to share the same allocation. - Exclusivity of allocations is to be assumed, that is only unoccupied cache should be used for new allocations. The last point seems trivial but it's actually very specific condition that, if removed, can cause several problems. If it's hard to grasp the last point together with the second one, you're on the right track. If not, then I'll try to make a point for why the last point should be removed in 3... 2... 1... * Design flaws 1) Users cannot specify any allocation that would share only part with some other allocation of the domain or the default group. 2) It was not specified what to do with the default resource group. There might be several ways to approach this, with varying pros and cons: a) Treat it as any other group. That is any bit set for this group will be excluded from usable bits when creating new allocation for a domain. - Very predictable behaviour - You will not be able to allocate any amount of cache without previous setting for the default group as that will have all the bits set which will make all the cache unusable b) Automatically remove the appropriate amount of bits that are needed for new domains. - No need to do any change to the system settings in order to use this new feature - We would have to change system settings, which is generally frowned upon when done "automatically" as a side effect of starting a domain, especially for such scarce resource as cache - The change to system settings would not be entirely predictable c) Act like it doesn't exist and don't remove its allocations from consideration - Doesn't really make sense as system processes might be trashing the cache as any VM, moreover when all VM processes without allocations will be based in the default group as well 3) There is no way for users to know what the particular settings are for any running domain. The first point was deemed a corner case. Fair enough on its own, but considering point 2 and its solutions, it is rather difficult for me to justify it. Also, let's say you have domain with 4 vCPUs out of which you know 1 might be trashing the cache, but you don't want to restrict it completely, but others will utilize it very nicely. Sensible allocations for such domain's vCPUs might be: vCPU 0: 000f vCPUs 1-3: ffff as you want vCPUs 1-3 to utilize even the part of cache that might get trashed by vCPU 0. Or they might share some data (especially guest-memory-related). The case above is not possible to set up with only per-vcpu(s) scalar setting. And there are more as you might imagine now. For example how do we behave with iothreads and emulator threads? * My suggestion: - Provide an API for querying and changing the allocation of the default resource group. This would be similar to setting and querying hugepage allocations (see virsh's freepages/allocpages commands). - Let users specify the starting position in addition to the size, i.e. not only specifying "size", but also "from". If "from" is not specified, the whole allocation must be exclusive. If "from" is specified it will be set without checking for collisions. The latter needs them to query the system or know what settings are applied (this should be the case all the time), but is better then adding non-specific and/or meaningless exclusivity settings (how do you specify part-exclusivity of the cache as in the example above) - After starting a domain, fill in any missing information about the allocation (I'm generalizing here, but fro now it would only be the optional "from" attribute) - Add settings not only for vCPUs, but also for other threads as we do with pinning, schedulers, etc. Let me know what you think. As I said before, even if you're not familiar with CAT. And thank you for reading the whole thing or at least skipping to the end. I spend quite some time on this, I changed the underlying code design several times (thanks again for the "consistency" of the design of resctrlfs) and I'm afraid my head is going to burst any moment now. Have a nice day Martin P.S.: I still continue on the implementation, you can follow it on my github [3]. Don't expect the tests to pass or all functions to be complete, thought. You have been warned. [1] Technically months, I can't wrap my head around how much technical debt there is in libvirt. [2] Detailed information in Documentation/x86/intel_rdt_ui.txt [3] https://github.com/nertpinx/libvirt/tree/catwip

3 5

[libvirt] [PATCH] qemu: handle reconnect on chardev hotplug
by ZhiPeng Lu 12 Sep '17

12 Sep '17

The patch passes the reconnect timeout to QEMU by monitor on chardev hotplug. Signed-off-by: ZhiPeng Lu <lu.zhipeng(a)zte.com.cn> --- src/qemu/qemu_monitor_json.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index df5fb7c..4169cd5 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -6444,6 +6444,17 @@ int qemuMonitorJSONGetTPMTypes(qemuMonitorPtr mon, return qemuMonitorJSONGetStringArray(mon, "query-tpm-types", tpmtypes); } +static int +qemuMonitorJSONBuildChrChardevReconnect(virJSONValuePtr object, + const virDomainChrSourceReconnectDef *def) +{ + int ret = 0; + if (def->enabled == VIR_TRISTATE_BOOL_YES) { + ret = virJSONValueObjectAppendNumberUint(object, "reconnect", def->timeout); + } + return ret; +} + static virJSONValuePtr qemuMonitorJSONAttachCharDevCommand(const char *chrID, const virDomainChrSourceDef *chr) @@ -6508,6 +6519,10 @@ qemuMonitorJSONAttachCharDevCommand(const char *chrID, if (virJSONValueObjectAppendString(data, "tls-creds", tlsalias) < 0) goto cleanup; } + + if (qemuMonitorJSONBuildChrChardevReconnect(data, &chr->data.tcp.reconnect) < 0) { + goto cleanup; + } break; case VIR_DOMAIN_CHR_TYPE_UDP: @@ -6545,6 +6560,10 @@ qemuMonitorJSONAttachCharDevCommand(const char *chrID, if (virJSONValueObjectAppendBoolean(data, "wait", false) < 0 || virJSONValueObjectAppendBoolean(data, "server", chr->data.nix.listen) < 0) goto cleanup; + + if (qemuMonitorJSONBuildChrChardevReconnect(data, &chr->data.nix.reconnect) < 0) { + goto cleanup; + } break; case VIR_DOMAIN_CHR_TYPE_SPICEVMC: -- 1.8.3.1

2 1

[libvirt] [PATCH] storage: Check and possibly update config file after build
by John Ferlan 11 Sep '17

11 Sep '17

https://bugzilla.redhat.com/show_bug.cgi?id=1464313 As it turns out, the on-disk config file (e.g. not the stateDir file) needs to be updated when --override is provided since it's possible and highly probable that the def->source.format has been adjusted and could cause a future start after perhaps a libvirtd restart to have the older format from a define operation from the backend. So in the 2 places where it's possible a write would be needed (create after define and build), let's perform a check and do the save/write operation on the configFile if it's necessary. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/storage/storage_driver.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 7cf5943..afb0404 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -651,6 +651,22 @@ storagePoolIsPersistent(virStoragePoolPtr pool) } +/* After a pool build, it's possible the inactive configFile needs to + * be updated especially since overwriting the pool more than likely + * changes the source format and may change/update a few other fields. */ +static int +storagePoolBuildCheckUpdateConfig(virStoragePoolObjPtr obj, + unsigned int flags) +{ + int ret = 0; + + if ((flags & VIR_STORAGE_POOL_BUILD_OVERWRITE) && obj->configFile) + ret = virStoragePoolSaveConfig(obj->configFile, obj->def); + + return ret; +} + + static virStoragePoolPtr storagePoolCreateXML(virConnectPtr conn, const char *xml, @@ -916,6 +932,9 @@ storagePoolCreate(virStoragePoolPtr pool, if (backend->buildPool(pool->conn, obj, build_flags) < 0) goto cleanup; } + + if (storagePoolBuildCheckUpdateConfig(obj, build_flags) < 0) + goto cleanup; } VIR_INFO("Starting up storage pool '%s'", obj->def->name); @@ -980,6 +999,10 @@ storagePoolBuild(virStoragePoolPtr pool, if (backend->buildPool && backend->buildPool(pool->conn, obj, flags) < 0) goto cleanup; + + if (storagePoolBuildCheckUpdateConfig(obj, flags) < 0) + goto cleanup; + ret = 0; cleanup: -- 2.9.5

2 4

[libvirt] [PATCH 0/3] typo fixes
by Guido Günther 11 Sep '17

11 Sep '17

Probably could have gone by the trivial rule. Guido Günther (3): storagefile: fix defintion vs definition typo qemu_driver: fix existance vs existence typo virnetserver: fix mesage vs message typo src/qemu/qemu_driver.c | 2 +- src/rpc/virnetserver.c | 2 +- src/util/virstoragefile.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) -- 2.14.1

2 5