- Devel - libvirt List Archives

[libvirt] [PATCH] spec: Enable the iscsi-direct storage driver conditionally
by Andrea Bolognani 14 Aug '18

14 Aug '18

Most distributions we build RPMs on don't ship a recent enough version of libiscsi, so we can't enable the driver unconditionally. Add an explicit dependency on the runtime package while at it. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- libvirt.spec.in | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 63834767dd..883c8a49e7 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -71,6 +71,13 @@ %define with_storage_zfs 0 %endif +# We need a recent enough libiscsi (>= 1.18.0) +%if 0%{?fedora} >= 28 || 0%{?rhel} > 7 + %define with_storage_iscsi_direct 0%{!?_without_storage_iscsi_direct:1} +%else + %define with_storage_iscsi_direct 0 +%endif + # A few optional bits off by default, we enable later %define with_fuse 0%{!?_without_fuse:0} %define with_sanlock 0%{!?_without_sanlock:0} @@ -319,8 +326,10 @@ BuildRequires: /usr/bin/qemu-img BuildRequires: lvm2 # For pool type=iscsi BuildRequires: iscsi-initiator-utils +%if %{with_storage_iscsi_direct} # For pool type=iscsi-direct BuildRequires: libiscsi-devel +%endif # For disk driver BuildRequires: parted-devel # For Multipath support @@ -593,14 +602,17 @@ The storage driver backend adding implementation of the storage APIs for iscsi volumes using the host iscsi stack. +%if %{with_storage_iscsi_direct} %package daemon-driver-storage-iscsi-direct Summary: Storage driver plugin for iscsi-direct Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} Requires: libvirt-libs = %{version}-%{release} +Requires: libiscsi %description daemon-driver-storage-iscsi-direct The storage driver backend adding implementation of the storage APIs for iscsi volumes using libiscsi direct connection. +%endif %package daemon-driver-storage-mpath @@ -679,8 +691,10 @@ Requires: libvirt-daemon-driver-storage-disk = %{version}-%{release} Requires: libvirt-daemon-driver-storage-logical = %{version}-%{release} Requires: libvirt-daemon-driver-storage-scsi = %{version}-%{release} Requires: libvirt-daemon-driver-storage-iscsi = %{version}-%{release} -Requires: libvirt-daemon-driver-storage-iscsi-direct = %{version}-%{release} Requires: libvirt-daemon-driver-storage-mpath = %{version}-%{release} +%if %{with_storage_iscsi_direct} +Requires: libvirt-daemon-driver-storage-iscsi-direct = %{version}-%{release} +%endif %if %{with_storage_gluster} Requires: libvirt-daemon-driver-storage-gluster = %{version}-%{release} %endif @@ -1134,6 +1148,12 @@ exit 1 %define arg_wireshark --without-wireshark-dissector %endif +%if %{with_storage_iscsi_direct} + %define arg_storage_iscsi_direct --with-storage-iscsi-direct +%else + %define arg_storage_iscsi_direct --without-storage-iscsi-direct +%endif + %define when %(date +"%%F-%%T") %define where %(hostname) %define who %{?packager}%{!?packager:Unknown} @@ -1185,7 +1205,7 @@ rm -f po/stamp-po --with-storage-fs \ --with-storage-lvm \ --with-storage-iscsi \ - --with-storage-iscsi-direct \ + %{?arg_storage_iscsi_direct} \ --with-storage-scsi \ --with-storage-disk \ --with-storage-mpath \ @@ -1651,8 +1671,10 @@ exit 0 %files daemon-driver-storage-iscsi %{_libdir}/%{name}/storage-backend/libvirt_storage_backend_iscsi.so +%if %{with_storage_iscsi_direct} %files daemon-driver-storage-iscsi-direct %{_libdir}/%{name}/storage-backend/libvirt_storage_backend_iscsi-direct.so +%endif %files daemon-driver-storage-mpath %{_libdir}/%{name}/storage-backend/libvirt_storage_backend_mpath.so -- 2.17.1

2 1

[libvirt] [PATCH] spec: Require libiscsi-devel instead of libiscsi
by Andrea Bolognani 14 Aug '18

14 Aug '18

Commit 34a6962c41b4 added a BuildRequires for the iscsi-direct backend, but we need the headers rather than the runtime package to be available in order to link against the library. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- libvirt.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 788483cdd4..63834767dd 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -320,7 +320,7 @@ BuildRequires: lvm2 # For pool type=iscsi BuildRequires: iscsi-initiator-utils # For pool type=iscsi-direct -BuildRequires: libiscsi +BuildRequires: libiscsi-devel # For disk driver BuildRequires: parted-devel # For Multipath support -- 2.17.1

3 3

[libvirt] [PATCH v3 00/11] use GNU C's cleanup attribute in src/util (batch III)
by Sukrit Bhatnagar 14 Aug '18

14 Aug '18

This third series of patches also modifies a few files in src/util to use VIR_AUTOFREE and VIR_AUTOPTR for automatic freeing of memory and get rid of some VIR_FREE macro invocations and *Free function calls. This is meant as a follow-up of the v1 series [1] of the same batch, and contains those patches which were not (completely) pushed upstream. [1] https://www.redhat.com/archives/libvir-list/2018-July/msg01947.html Sukrit Bhatnagar (11): util: iscsi: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: netlink: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: netlink: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: netlink: use VIR_AUTOPTR for aggregate types util: netdevbridge: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: netdevbridge: use VIR_AUTOPTR for aggregate types util: netdev: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: netdev: use VIR_AUTOPTR for aggregate types util: netdevip: use VIR_AUTOPTR for aggregate types util: netdevopenvswitch: use VIR_AUTOPTR for aggregate types util: qemu: use VIR_AUTOPTR for aggregate types src/util/viriscsi.c | 22 +- src/util/virnetdev.c | 592 ++++++++++++++++------------------------ src/util/virnetdevbridge.c | 81 ++---- src/util/virnetdevip.c | 130 ++++----- src/util/virnetdevopenvswitch.c | 80 ++---- src/util/virnetlink.c | 112 ++++---- src/util/virnetlink.h | 5 + src/util/virqemu.c | 1 + 8 files changed, 397 insertions(+), 626 deletions(-) -- 1.8.3.1

3 28

[libvirt] [PATCH] bhyve: fix process reconnect
by Roman Bogorodskiy 14 Aug '18

14 Aug '18

To reconnect to the bhyve process after deamon restart, a process VM's pid points to is checked to have proctitle equal to 'bhyve: $vmname'. However, there could be a bug in bhyve(8) which prevents it from setting proctitle, so process arguments will look like: ['/usr/sbin/bhyve', ..., 'vmname', NULL] Fall back to checking this format if proctitle doesn't match as a workaround for this bug. --- src/bhyve/bhyve_process.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/src/bhyve/bhyve_process.c b/src/bhyve/bhyve_process.c index 9276d7d364..78d6ff1389 100644 --- a/src/bhyve/bhyve_process.c +++ b/src/bhyve/bhyve_process.c @@ -416,18 +416,28 @@ virBhyveProcessReconnect(virDomainObjPtr vm, if (proc_argv && proc_argv[0]) { if (STREQ(expected_proctitle, proc_argv[0])) { ret = 0; - priv->mon = bhyveMonitorOpen(vm, data->driver); - if (vm->def->ngraphics == 1 && - vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) { - int vnc_port = vm->def->graphics[0]->data.vnc.port; - if (virPortAllocatorSetUsed(vnc_port) < 0) { - VIR_WARN("Failed to mark VNC port '%d' as used by '%s'", - vnc_port, vm->def->name); - } + } else { + if (STREQ(BHYVE, proc_argv[0])) { + int i = 0; + for (; proc_argv[i+1]; i++); + if ((i != 0) && (STREQ(vm->def->name, proc_argv[i]))) + ret = 0; } } } + if (ret == 0) { + priv->mon = bhyveMonitorOpen(vm, data->driver); + if (vm->def->ngraphics == 1 && + vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) { + int vnc_port = vm->def->graphics[0]->data.vnc.port; + if (virPortAllocatorSetUsed(vnc_port) < 0) { + VIR_WARN("Failed to mark VNC port '%d' as used by '%s'", + vnc_port, vm->def->name); + } + } + } + cleanup: if (ret < 0) { /* If VM is reported to be in active state, but we cannot find -- 2.18.0

3 2

[libvirt] [dockerfiles PATCH] Refresh after switch from jansson to yajl
by Andrea Bolognani 14 Aug '18

14 Aug '18

The corresponding libvirt-jenkins-ci commit is f188ff6a7ceb. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed under the Dockerfile refresh rule. buildenv-centos-7.Dockerfile | 4 ++-- buildenv-debian-8.Dockerfile | 2 +- buildenv-debian-9.Dockerfile | 2 +- buildenv-debian-sid.Dockerfile | 2 +- buildenv-fedora-27.Dockerfile | 2 +- buildenv-fedora-28.Dockerfile | 2 +- buildenv-fedora-rawhide.Dockerfile | 2 +- buildenv-ubuntu-16.Dockerfile | 2 +- buildenv-ubuntu-18.Dockerfile | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/buildenv-centos-7.Dockerfile b/buildenv-centos-7.Dockerfile index 896bf68..cce63fc 100644 --- a/buildenv-centos-7.Dockerfile +++ b/buildenv-centos-7.Dockerfile @@ -23,7 +23,6 @@ ENV PACKAGES audit-libs-devel \ gnutls-devel \ iproute \ iscsi-initiator-utils \ - jansson-devel \ libacl-devel \ libattr-devel \ libblkid-devel \ @@ -64,7 +63,8 @@ ENV PACKAGES audit-libs-devel \ scrub \ sudo \ systemtap-sdt-devel \ - vim + vim \ + yajl-devel RUN yum update -y && \ yum install -y ${PACKAGES} && \ yum autoremove -y && \ diff --git a/buildenv-debian-8.Dockerfile b/buildenv-debian-8.Dockerfile index 8877528..cdf38d3 100644 --- a/buildenv-debian-8.Dockerfile +++ b/buildenv-debian-8.Dockerfile @@ -29,7 +29,6 @@ ENV PACKAGES augeas-tools \ libdevmapper-dev \ libfuse-dev \ libgnutls28-dev \ - libjansson-dev \ libnetcf-dev \ libnl-3-dev \ libnl-route-3-dev \ @@ -51,6 +50,7 @@ ENV PACKAGES augeas-tools \ libxen-dev \ libxml2-dev \ libxml2-utils \ + libyajl-dev \ lvm2 \ make \ nfs-common \ diff --git a/buildenv-debian-9.Dockerfile b/buildenv-debian-9.Dockerfile index 0592c97..ff8de7c 100644 --- a/buildenv-debian-9.Dockerfile +++ b/buildenv-debian-9.Dockerfile @@ -29,7 +29,6 @@ ENV PACKAGES augeas-tools \ libdevmapper-dev \ libfuse-dev \ libgnutls28-dev \ - libjansson-dev \ libnetcf-dev \ libnl-3-dev \ libnl-route-3-dev \ @@ -51,6 +50,7 @@ ENV PACKAGES augeas-tools \ libxen-dev \ libxml2-dev \ libxml2-utils \ + libyajl-dev \ lvm2 \ make \ nfs-common \ diff --git a/buildenv-debian-sid.Dockerfile b/buildenv-debian-sid.Dockerfile index 2d0310d..d06c1e0 100644 --- a/buildenv-debian-sid.Dockerfile +++ b/buildenv-debian-sid.Dockerfile @@ -29,7 +29,6 @@ ENV PACKAGES augeas-tools \ libdevmapper-dev \ libfuse-dev \ libgnutls28-dev \ - libjansson-dev \ libnetcf-dev \ libnl-3-dev \ libnl-route-3-dev \ @@ -51,6 +50,7 @@ ENV PACKAGES augeas-tools \ libxen-dev \ libxml2-dev \ libxml2-utils \ + libyajl-dev \ lvm2 \ make \ nfs-common \ diff --git a/buildenv-fedora-27.Dockerfile b/buildenv-fedora-27.Dockerfile index 09ec721..9953e1c 100644 --- a/buildenv-fedora-27.Dockerfile +++ b/buildenv-fedora-27.Dockerfile @@ -27,7 +27,6 @@ ENV PACKAGES audit-libs-devel \ iproute \ iproute-tc \ iscsi-initiator-utils \ - jansson-devel \ libacl-devel \ libattr-devel \ libblkid-devel \ @@ -72,6 +71,7 @@ ENV PACKAGES audit-libs-devel \ vim \ wireshark-devel \ xen-devel \ + yajl-devel \ zfs-fuse RUN yum update -y && \ yum install -y ${PACKAGES} && \ diff --git a/buildenv-fedora-28.Dockerfile b/buildenv-fedora-28.Dockerfile index 60afba5..6e3587f 100644 --- a/buildenv-fedora-28.Dockerfile +++ b/buildenv-fedora-28.Dockerfile @@ -26,7 +26,6 @@ ENV PACKAGES audit-libs-devel \ iproute \ iproute-tc \ iscsi-initiator-utils \ - jansson-devel \ libacl-devel \ libattr-devel \ libblkid-devel \ @@ -72,6 +71,7 @@ ENV PACKAGES audit-libs-devel \ vim \ wireshark-devel \ xen-devel \ + yajl-devel \ zfs-fuse RUN yum update -y && \ yum install -y ${PACKAGES} && \ diff --git a/buildenv-fedora-rawhide.Dockerfile b/buildenv-fedora-rawhide.Dockerfile index 33b47e1..e7d1fd3 100644 --- a/buildenv-fedora-rawhide.Dockerfile +++ b/buildenv-fedora-rawhide.Dockerfile @@ -26,7 +26,6 @@ ENV PACKAGES audit-libs-devel \ iproute \ iproute-tc \ iscsi-initiator-utils \ - jansson-devel \ libacl-devel \ libattr-devel \ libblkid-devel \ @@ -96,6 +95,7 @@ ENV PACKAGES audit-libs-devel \ vim \ wireshark-devel \ xen-devel \ + yajl-devel \ zfs-fuse RUN yum update -y && \ yum install -y ${PACKAGES} && \ diff --git a/buildenv-ubuntu-16.Dockerfile b/buildenv-ubuntu-16.Dockerfile index c904c6e..d28b9aa 100644 --- a/buildenv-ubuntu-16.Dockerfile +++ b/buildenv-ubuntu-16.Dockerfile @@ -29,7 +29,6 @@ ENV PACKAGES augeas-tools \ libdevmapper-dev \ libfuse-dev \ libgnutls28-dev \ - libjansson-dev \ libnetcf-dev \ libnl-3-dev \ libnl-route-3-dev \ @@ -52,6 +51,7 @@ ENV PACKAGES augeas-tools \ libxen-dev \ libxml2-dev \ libxml2-utils \ + libyajl-dev \ lvm2 \ make \ nfs-common \ diff --git a/buildenv-ubuntu-18.Dockerfile b/buildenv-ubuntu-18.Dockerfile index bbd32c1..14abd98 100644 --- a/buildenv-ubuntu-18.Dockerfile +++ b/buildenv-ubuntu-18.Dockerfile @@ -29,7 +29,6 @@ ENV PACKAGES augeas-tools \ libdevmapper-dev \ libfuse-dev \ libgnutls28-dev \ - libjansson-dev \ libnetcf-dev \ libnl-3-dev \ libnl-route-3-dev \ @@ -52,6 +51,7 @@ ENV PACKAGES augeas-tools \ libxen-dev \ libxml2-dev \ libxml2-utils \ + libyajl-dev \ lvm2 \ make \ nfs-common \ -- 2.17.1

1 0

[libvirt] [jenkins-ci PATCH 0/4] Switch back from jansson to yajl
by Andrea Bolognani 14 Aug '18

14 Aug '18

A straighforward revert of e1575b08511f..d2bbe1eee61a. Andrea Bolognani (4): guests: Re-introduce yajl kludge guests: Add yajl mapping guests: Install yajl for libvirt guests: Don't install jansson for libvirt guests/playbooks/update/tasks/kludges.yml | 2 ++ guests/vars/mappings.yml | 10 +++++----- guests/vars/projects/libvirt.yml | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) -- 2.17.1

2 5

[libvirt] [PATCH] Fix build on non-linux platforms after another VIR_AUTOPTR patches
by Erik Skultety 14 Aug '18

14 Aug '18

Caused by commit f7d0663d49. The problem is missing libnl library on these platforms, so the VIR_DEFINE_AUTOPTR_FUNC has to be compiled in conditionally. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- Checked with Travis CI, local fedora with MinGW and FreeBSD, thus pushed under the build breaker rule. src/util/virnetlink.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/util/virnetlink.h b/src/util/virnetlink.h index 136b42b995..1e1e616b41 100644 --- a/src/util/virnetlink.h +++ b/src/util/virnetlink.h @@ -36,6 +36,9 @@ # undef inline # endif +typedef struct nl_msg virNetlinkMsg; +VIR_DEFINE_AUTOPTR_FUNC(virNetlinkMsg, nlmsg_free) + # else struct nl_msg; @@ -45,8 +48,6 @@ struct nlmsghdr; # endif /* __linux__ */ -typedef struct nl_msg virNetlinkMsg; - int virNetlinkStartup(void); void virNetlinkShutdown(void); @@ -126,6 +127,4 @@ int virNetlinkEventAddClient(virNetlinkEventHandleCallback handleCB, int virNetlinkEventRemoveClient(int watch, const virMacAddr *macaddr, unsigned int protocol); -VIR_DEFINE_AUTOPTR_FUNC(virNetlinkMsg, nlmsg_free) - #endif /* __VIR_NETLINK_H__ */ -- 2.14.4

1 0

[libvirt] [PATCH v2 0/3] conf: standardize naming
by Anya Harter 14 Aug '18

14 Aug '18

on vir*ObjListExport call stack Anya Harter (3): conf: rename structs used by Export function conf: rename Export Callback functions conf: rename Match functions src/conf/virinterfaceobj.c | 16 +++++++++------- src/conf/virnetworkobj.c | 24 ++++++++++++----------- src/conf/virnodedeviceobj.c | 14 ++++++++------ src/conf/virsecretobj.c | 14 ++++++++------ src/conf/virstorageobj.c | 38 ++++++++++++++++++++----------------- 5 files changed, 59 insertions(+), 47 deletions(-) -- 2.17.1

2 4

[libvirt] [PATCH 0/4] Extend apparmor rules for libvirt 4.6
by Christian Ehrhardt 14 Aug '18

14 Aug '18

Hi, this is a summary of things I had to touch recently when working on 4.6. The first two patches are re-submissions and modifications of last year which were never totally challenged, but also not pushed yet (I had no permissions yet back then). The first was lost in a discussion about virt-aa-helper, whicih eventually turned out to be clear that it could not help in that case. - https://www.redhat.com/archives/libvir-list/2017-February/msg01598.html - https://www.redhat.com/archives/libvir-list/2017-March/msg00052.html The second even got a few Acks, but neither made it into upstream yet. Parts of it where introduced already, in 7edcbd02 apparmor: allow libvirt to send term signal to unconfined b482925c apparmor: support ptrace checks But there are still signals blocked with those rules, so I resubmit the remaining bit. Also I added the Acks to the resubmission. The third change came in recently via various bug reports which I finally wanted to adress - e.g. for ceph lib or smb. If we later on spot more cases that have predictable safe paths under /tmp we can add those. Finally the forth change was triggered by me testing libvirt 4.6 in various conditions. Some of them were in containers, and the new libvirt behavior to carry more mount points into the qemu namespace triggers the need to rewrite the existing mount-moving rules that we added last year. Christian Ehrhardt (4): apparmor: allow openGraphicsFD for virt manager >1.4 apparmor: add mediation rules for unconfined guests apparmor: allow expected /tmp access patterns apparmor: allow to preserve /dev mountpoints into qemu namespaces examples/apparmor/libvirt-qemu | 13 +++++++++++++ examples/apparmor/usr.sbin.libvirtd | 24 +++++++++++++----------- 2 files changed, 26 insertions(+), 11 deletions(-) -- 2.17.1

2 11

[libvirt] [PATCH v2 RESEND 00/17] Introduce RDT memory bandwidth allocation support
by bing.niu＠intel.com 14 Aug '18

14 Aug '18

From: Bing Niu <bing.niu(a)intel.com> This series is to introduce RDT memory bandwidth allocation support by extending current virresctrl implementation. The Memory Bandwidth Allocation (MBA) feature provides indirect and approximate control over memory bandwidth available per-core. This feature provides a method to control applications which may be over-utilizing bandwidth relative to their priority in environments such as the data-center. The details can be found in Intel's SDM 17.19.7. Kernel supports MBA through resctrl file system same as CAT. Each resctrl group have a MB parameter to control how much memory bandwidth it can utilize in unit of percentage. In this series, MBA is enabled by enhancing existing virresctrl implementation. The policy employed for MBA is similar with CAT: The sum of each MBA group's bandwidth dose not exceed 100%. The enhancement of virresctrl include two main parts: Part 1: Add two new structures virResctrlInfoMemMB and virResctrlAllocMemBW for collecting host system MBA capability and domain memory bandwidth allocation. Those two structures are the extension of existing virResctrlInfo and virResctrlAlloc. With them, virresctrl framework can support MBA and CAT concurrently. Each virResctrlAlloc represent a resource allocation including CAT, or MBA, or CAT&MBA. The policy of MBA is that: total memory bandwidth of each resctrl group, created by virresctrl, does not exceed to 100%. Part 2: On XML part, add new elements to host capabilities query and domain allocation to support memory bandwidth allocation. --------------------------------------------------------------------------------------------- For host capabilities XML, new XML format like below example, <host> ..... <memory_bandwidth> <node id='0' cpus='0-19'> <control granularity='10' min ='10' maxAllocs='8'/> </node> </memory_bandwidth> </host> granularity --- memory bandwidth granularity min --- minimum memory bandwidth allowed maxAllocs --- maximum concurrent memory bandwidth allocation allowed. --------------------------------------------------------------------------------------------- For domain XML, new format as below example <domain type='kvm' id='2'> ...... <cputune> ...... <shares>1024</shares> <memorytune vcpus='0-1'> <node id='0' bandwidth='20'/> </memorytune> </cputune> ...... </domain> id --- node where memory bandwidth allocation will happen bandwidth --- bandwidth allocated in percentage ---------------------------------------------------------------------------------------------- With this extension of the virresctrl, the overall working follow of CAT and MBA is described by below picture. XML parser will aggregate MBA and CAT configuration and represents it in one virresctrl object. The methods of virresctrl class will manipulate resctrl interface to allocate corresponding resources. <memorytune cpus='0-3'> +---------+ | <cachetune vcpus='0-3'> XML | + parser +-----------+ | | +------------------------------+ | | internal object +------v--------------+ virResctrlAlloc | backing object | +------+--------------+ | | +------------------------------+ | +--v-------+ | | | schemata | /sys/fs/resctrl | tasks | | . | | . | | | +----------+ --------------------------------------------------------------------- previous versions and discussion can be found at v1: https://www.redhat.com/archives/libvir-list/2018-July/msg01144.html RFC v2: https://www.redhat.com/archives/libvir-list/2018-June/msg01268.html RFC v1: https://www.redhat.com/archives/libvir-list/2018-May/msg02101.html Changelog: v1 -> this: John's comment: 1. Split calculation of number of memory bandwidth control to one patch. 2. Split virResctrlAllocMemBW relating methods to 5 patch, each provides one kind of function, eg: schemata processing, memory bandwidth calculation..... 3. Use resctrl to replace cachetune in domain conf. 4. Split refactor virDomainCachetuneDefParse into 3 patches. And adjust some logic, eg: use %s format error log, renaming functions..... 5. Complete doc description. eg: update cachetune part about vcpus overlapping with memorytune, update libvirt version info for memory bandwidth control availability. 6. Some coding style fix. RFC_v2->v1: John's comment: 1. use name MemBW to replace MB for a more clear description. 2. split rename patch and put refactor function part separately. 3. split virResctrlInfoMemMB and virResctrlAllocMemBW to different patches. 4. add docs/schemas/*.rng for XML related patches. 5. some cleanup for coding conventions. RFC_ v1->RFC_v2: Jano's comment: 1. put renaming parts into separated patches. 2. set the initial return value as -1. 3. using full name in structure definition. 4. do not use VIR_CACHE_TYPE_LAST for memory bandwidth allocation formatting. Pavel's comment: 1. add host capabilities XML for memory bandwidth allocation. 2. do not mix use cachetune section in XML for memory bandwidth allocation in domain XML. define a dedicated one for memory bandwidth allocation. Bing Niu (17): util: Rename some functions of virresctrl util: Refactor virResctrlGetInfo in virresctrl util: Refactor virResctrlAllocFormat of virresctrl util: Add MBA capability information query to resctrl util: Add MBA check to virResctrlInfoGetCache util: Add MBA allocation to virresctrl util: Add MBA schemata parse and format methods util: Add support to calculate MBA utilization util: Introduce virResctrlAllocForeachMemory util: Introduce virResctrlAllocSetMemoryBandwidth conf: Rename cachetune to resctrl conf: Factor out vcpus parsing part from virDomainCachetuneDefParse conf: Factor out vcpus overlapping from virDomainCachetuneDefParse conf: Factor out virDomainResctrlDef update from virDomainCachetuneDefParse conf: Add support for memorytune XML processing for resctrl MBA conf: Add return value check to virResctrlAllocForeachCache conf: Add memory bandwidth allocation capability of host docs/formatdomain.html.in | 39 +- docs/schemas/capability.rng | 33 ++ docs/schemas/domaincommon.rng | 17 + src/conf/capabilities.c | 107 ++++ src/conf/capabilities.h | 11 + src/conf/domain_conf.c | 428 ++++++++++++--- src/conf/domain_conf.h | 10 +- src/libvirt_private.syms | 6 +- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_process.c | 18 +- src/util/virresctrl.c | 611 +++++++++++++++++++-- src/util/virresctrl.h | 55 +- .../memorytune-colliding-allocs.xml | 30 + .../memorytune-colliding-cachetune.xml | 32 ++ tests/genericxml2xmlindata/memorytune.xml | 33 ++ tests/genericxml2xmltest.c | 5 + .../linux-resctrl/resctrl/info/MB/bandwidth_gran | 1 + .../linux-resctrl/resctrl/info/MB/min_bandwidth | 1 + .../linux-resctrl/resctrl/info/MB/num_closids | 1 + tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml | 8 + tests/virresctrldata/resctrl.schemata | 1 + 21 files changed, 1280 insertions(+), 169 deletions(-) create mode 100644 tests/genericxml2xmlindata/memorytune-colliding-allocs.xml create mode 100644 tests/genericxml2xmlindata/memorytune-colliding-cachetune.xml create mode 100644 tests/genericxml2xmlindata/memorytune.xml create mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/info/MB/bandwidth_gran create mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/info/MB/min_bandwidth create mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/info/MB/num_closids -- 2.7.4

3 26

[libvirt] [PATCH 0/1] bhyve: Make LPC slot number configurable
by Ivan Mishonov 13 Aug '18

13 Aug '18

Windows UEFI guests didn't have working keyboard input through VNC when LPC is on slot 1. The FreeBSD Handbook examples use slot 31 for UEFI guests. Borrowed most of the code from the qemu:commandline implementation and made LPC slot number configurable e.g. <domain type='bhyve' xmlns:bhyve='http://libvirt.org/schemas/domain/bhyve/1.0'> <bhyve:lpcslotnumber value='31'/> Ivan Mishonov (1): bhyve: Make LPC slot number configurable docs/schemas/domaincommon.rng | 15 ++++++ src/bhyve/bhyve_command.c | 7 ++- src/bhyve/bhyve_conf.c | 12 +++++ src/bhyve/bhyve_conf.h | 9 ++++ src/bhyve/bhyve_device.c | 16 ++++--- src/bhyve/bhyve_domain.c | 86 ++++++++++++++++++++++++++++++++++- src/bhyve/bhyve_domain.h | 1 + 7 files changed, 138 insertions(+), 8 deletions(-) -- 2.17.1

4 17

[libvirt] [PATCH] esx: Fix build when libcurl debug is enabled
by Marcos Paulo de Souza 13 Aug '18

13 Aug '18

When building libvirt with libcurl debug enabled (with ESX_VI__CURL__ENABLE_DEBUG_OUTPUT set), the message bellow pops up: make[3]: Entering directory '/mnt/data/gitroot/libvirt/src' CC esx/libvirt_driver_esx_la-esx_vi.lo esx/esx_vi.c: In function 'esxVI_CURL_Debug': esx/esx_vi.c:191:5: error: enumeration value 'CURLINFO_SSL_DATA_IN' not handled in switch [-Werror=switch-enum] switch (type) { ^~~~~~ esx/esx_vi.c:191:5: error: enumeration value 'CURLINFO_SSL_DATA_OUT' not handled in switch [-Werror=switch-enum] esx/esx_vi.c:191:5: error: enumeration value 'CURLINFO_END' not handled in switch [-Werror=switch-enum] Our build requires at least libcurl 7.18.0, which is pretty stable since it was release in 2008. Fix this problem by handling the mentioned enums in the code. Signed-off-by: Marcos Paulo de Souza <marcos.souza.org(a)gmail.com> --- src/esx/esx_vi.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index a816c3a4f9..588670e137 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -163,7 +163,7 @@ esxVI_CURL_WriteBuffer(char *data, size_t size, size_t nmemb, void *userdata) return 0; } -#define ESX_VI__CURL__ENABLE_DEBUG_OUTPUT 0 +#define ESX_VI__CURL__ENABLE_DEBUG_OUTPUT 1 #if ESX_VI__CURL__ENABLE_DEBUG_OUTPUT static int @@ -205,13 +205,19 @@ esxVI_CURL_Debug(CURL *curl ATTRIBUTE_UNUSED, curl_infotype type, break; case CURLINFO_DATA_IN: + case CURLINFO_SSL_DATA_IN: VIR_DEBUG("CURLINFO_DATA_IN [[[[%s]]]]", buffer); break; case CURLINFO_DATA_OUT: + case CURLINFO_SSL_DATA_OUT: VIR_DEBUG("CURLINFO_DATA_OUT [[[[%s]]]]", buffer); break; + case CURLINFO_END: + VIR_DEBUG("CURLINFO_END [[[[%s]]]]", buffer); + break; + default: VIR_DEBUG("unknown"); break; -- 2.17.1

2 3

[libvirt] [PATCH] rpm: simplify applying of patches
by Daniel P. Berrangé 13 Aug '18

13 Aug '18

The distros we support for RPM builds all have %autosetup support so we can ditch the convoluted code for running git manually and use the RPM defaults. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- libvirt.spec.in | 38 +------------------------------------- 1 file changed, 1 insertion(+), 37 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 19ae55cdaf..a2f3112a0b 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -993,43 +993,7 @@ Libvirt plugin for NSS for translating domain names into IP addresses. %prep -%setup -q - -# Patches have to be stored in a temporary file because RPM has -# a limit on the length of the result of any macro expansion; -# if the string is longer, it's silently cropped -%{lua: - tmp = os.tmpname(); - f = io.open(tmp, "w+"); - count = 0; - for i, p in ipairs(patches) do - f:write(p.."\n"); - count = count + 1; - end; - f:close(); - print("PATCHCOUNT="..count.."\n") - print("PATCHLIST="..tmp.."\n") -} - -git init -q -git config user.name rpm-build -git config user.email rpm-build -git config gc.auto 0 -git add . -git commit -q -a --author 'rpm-build <rpm-build>' \ - -m '%{name}-%{version} base' - -COUNT=$(grep '\.patch$' $PATCHLIST | wc -l) -if [ $COUNT -ne $PATCHCOUNT ]; then - echo "Found $COUNT patches in $PATCHLIST, expected $PATCHCOUNT" - exit 1 -fi -if [ $COUNT -gt 0 ]; then - xargs git am <$PATCHLIST || exit 1 -fi -echo "Applied $COUNT patches" -rm -f $PATCHLIST -rm -rf .git +%autosetup -S git_am %build %if ! %{supported_platform} -- 2.17.1

3 3

[libvirt] [PATCH] qemu_migration: Avoid writing to freed memory
by Jiri Denemark 13 Aug '18

13 Aug '18

When a domain is killed on the source host while it is being migrated and libvirtd is waiting for the migration to finish (waiting for the domain condition in qemuMigrationSrcWaitForCompletion), the run-time state including priv->job.current may already be freed once virDomainObjWait returns with -1. Thus the priv->job.current pointer cached in jobInfo is no longer valid and setting jobInfo->status may crash the daemon. https://bugzilla.redhat.com/show_bug.cgi?id=1593137 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_migration.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 435cd174af..825a9d399b 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1584,7 +1584,8 @@ qemuMigrationSrcWaitForCompletion(virQEMUDriverPtr driver, if (events) { if (virDomainObjWait(vm) < 0) { - jobInfo->status = QEMU_DOMAIN_JOB_STATUS_FAILED; + if (virDomainObjIsActive(vm)) + jobInfo->status = QEMU_DOMAIN_JOB_STATUS_FAILED; return -2; } } else { -- 2.18.0

3 2

[libvirt] [PATCH] spec: Use %make_install
by Cole Robinson 13 Aug '18

13 Aug '18

It's on RHEL7, saves a bit of typing, and lets us drop the comment Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- There's also a %make_build macro which handles smp_mflags, but it uses make -O which makes build output noisier at least libvirt.spec.in | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 4113579e47..01f4e07b1c 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1255,10 +1255,7 @@ rm -fr %{buildroot} export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/%{name}.spec) -# Avoid using makeinstall macro as it changes prefixes rather than setting -# DESTDIR. Newer make_install macro would be better but it's not available -# on RHEL 5, thus we need to expand it here. -make %{?_smp_mflags} install DESTDIR=%{?buildroot} SYSTEMD_UNIT_DIR=%{_unitdir} V=1 +%make_install %{?_smp_mflags} SYSTEMD_UNIT_DIR=%{_unitdir} V=1 make %{?_smp_mflags} -C examples distclean V=1 -- 2.17.1

3 2

[libvirt] [PATCH] vircgroup: fix MinGW build
by Pavel Hrdina 13 Aug '18

13 Aug '18

Broken by commit <901d2b9c87>. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Pushed under build-breaker rule. src/util/vircgroup.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 0ed83932ac..df38bb77e0 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -4335,6 +4335,21 @@ virCgroupSetMemory(virCgroupPtr group ATTRIBUTE_UNUSED, } +int +virCgroupGetMemoryStat(virCgroupPtr group ATTRIBUTE_UNUSED, + unsigned long long *cache ATTRIBUTE_UNUSED, + unsigned long long *activeAnon ATTRIBUTE_UNUSED, + unsigned long long *inactiveAnon ATTRIBUTE_UNUSED, + unsigned long long *activeFile ATTRIBUTE_UNUSED, + unsigned long long *inactiveFile ATTRIBUTE_UNUSED, + unsigned long long *unevictable ATTRIBUTE_UNUSED) +{ + virReportSystemError(ENOSYS, "%s", + _("Control groups not supported on this platform")); + return -1; +} + + int virCgroupGetMemoryUsage(virCgroupPtr group ATTRIBUTE_UNUSED, unsigned long *kb ATTRIBUTE_UNUSED) -- 2.17.1

1 0

[libvirt] [PATCH 00/16] Revert Jansson usage
by Ján Tomko 13 Aug '18

13 Aug '18

For QEMU, we need a JSON parser that is able to handle its non-compliant JSON usage: https://bugzilla.redhat.com/show_bug.cgi?id=1614569 Unfortunately, this does not seem to be possible with Jansson. Revert back to using yajl, which also lets us get rid of the 'dlopen' hacks and their bugfixes. (The QEMU default changes are not strictly required, but the patches specifically use JANSSON) Also available on: git://repo.or.cz/libvirt/jtomko.git revert Ján Tomko (16): Revert "src: Move DLOPEN_LIBS to libraries introducing the dependency" Revert "Fix link errors in tools/nss and tests" Revert "remote: daemon: Make sure that JSON symbols are properly loaded at startup" Revert "util: jsoncompat: Stub out virJSONInitialize when compiling without jansson" Revert "tests: qemucapsprobe: Fix output after switching to jansson" Revert "util: avoid symbol clash between json libraries" Revert "tests: also skip qemuagenttest with old jansson" Revert "m4: Introduce STABLE_ORDERING_JANSSON" Revert "build: require Jansson if QEMU driver is enabled" Revert "build: switch --with-qemu default from yes to check" Revert "Remove virJSONValueNewStringLen" Revert "build: remove references to WITH_YAJL for SETUID_RPC_CLIENT" Revert "Remove functions using yajl" Revert "Switch from yajl to Jansson" Revert "build: undef WITH_JANSSON for SETUID_RPC_CLIENT" Revert "build: add --with-jansson" config-post.h | 3 +- configure.ac | 3 - libvirt.spec.in | 6 +- m4/virt-driver-qemu.m4 | 9 +- m4/virt-jansson.m4 | 32 -- m4/virt-nss.m4 | 4 +- m4/virt-yajl.m4 | 27 +- src/Makefile.am | 14 +- src/libvirt_private.syms | 5 +- src/qemu/qemu_driver.c | 2 +- src/remote/remote_daemon.c | 4 - src/util/Makefile.inc.am | 6 +- src/util/virjson.c | 617 ++++++++++++++++++++++++------- src/util/virjson.h | 1 + src/util/virjsoncompat.c | 285 -------------- src/util/virjsoncompat.h | 88 ----- tests/Makefile.am | 12 +- tests/cputest.c | 16 +- tests/libxlxml2domconfigtest.c | 4 +- tests/qemuagenttest.c | 4 +- tests/qemublocktest.c | 6 - tests/qemucapabilitiestest.c | 7 +- tests/qemucaps2xmltest.c | 2 +- tests/qemucapsprobemock.c | 2 - tests/qemucommandutiltest.c | 7 +- tests/qemuhotplugtest.c | 7 +- tests/qemumigparamsdata/empty.json | 4 +- tests/qemumigparamsdata/unsupported.json | 4 +- tests/qemumigparamstest.c | 7 +- tests/qemumonitorjsontest.c | 7 +- tests/virjsontest.c | 5 - tests/virmacmaptest.c | 5 - tests/virmacmaptestdata/empty.json | 4 +- tests/virmocklibxl.c | 4 +- tests/virnetdaemontest.c | 7 +- tests/virstoragetest.c | 4 +- tools/Makefile.am | 6 +- 37 files changed, 557 insertions(+), 673 deletions(-) delete mode 100644 m4/virt-jansson.m4 delete mode 100644 src/util/virjsoncompat.c delete mode 100644 src/util/virjsoncompat.h -- 2.16.1

3 20

[libvirt] [PATCH] qemu: Prefer nvdimmPath over hugepages for memory-backend-file
by Michal Privoznik 13 Aug '18

13 Aug '18

If a domain has hugepages configured and we're currently building memory-backend-file for a nvdimm device that domain has we will put hugepages path onto the command line. It should have been nvdimm path configured in the XML. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_command.c | 10 ++-- .../hugepages-nvdimm.x86_64-latest.args | 38 ++++++++++++++ tests/qemuxml2argvdata/hugepages-nvdimm.xml | 59 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + tests/qemuxml2xmloutdata/hugepages-nvdimm.xml | 1 + tests/qemuxml2xmltest.c | 1 + 6 files changed, 105 insertions(+), 5 deletions(-) create mode 100644 tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/hugepages-nvdimm.xml create mode 120000 tests/qemuxml2xmloutdata/hugepages-nvdimm.xml diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index a3fadc505d..ddb90895e0 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3148,14 +3148,14 @@ qemuBuildMemoryBackendProps(virJSONValuePtr *backendProps, if (useHugepage || mem->nvdimmPath || memAccess || def->mem.source == VIR_DOMAIN_MEMORY_SOURCE_FILE) { - if (useHugepage) { - if (qemuGetDomainHupageMemPath(def, cfg, pagesize, &memPath) < 0) - goto cleanup; - prealloc = true; - } else if (mem->nvdimmPath) { + if (mem->nvdimmPath) { if (VIR_STRDUP(memPath, mem->nvdimmPath) < 0) goto cleanup; prealloc = true; + } else if (useHugepage) { + if (qemuGetDomainHupageMemPath(def, cfg, pagesize, &memPath) < 0) + goto cleanup; + prealloc = true; } else { /* We can have both pagesize and mem source. If that's the case, * prefer hugepages as those are more specific. */ diff --git a/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args b/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args new file mode 100644 index 0000000000..3a6dd364da --- /dev/null +++ b/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args @@ -0,0 +1,38 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-i686 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object secret,id=masterKey0,format=raw,\ +file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-machine pc,accel=tcg,usb=off,dump-guest-core=off,nvdimm=on \ +-m size=1048576k,slots=16,maxmem=1099511627776k \ +-realtime mlock=off \ +-smp 2,sockets=2,cores=1,threads=1 \ +-object memory-backend-file,id=ram-node0,prealloc=yes,\ +mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=yes,size=1073741824 \ +-numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ +-object memory-backend-file,id=memnvdimm0,prealloc=yes,mem-path=/tmp/nvdimm,\ +share=yes,size=536870912 \ +-device nvdimm,node=0,memdev=memnvdimm0,id=nvdimm0,slot=0 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot strict=on \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ +resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/hugepages-nvdimm.xml b/tests/qemuxml2argvdata/hugepages-nvdimm.xml new file mode 100644 index 0000000000..cdc409ff32 --- /dev/null +++ b/tests/qemuxml2argvdata/hugepages-nvdimm.xml @@ -0,0 +1,59 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <maxMemory slots='16' unit='KiB'>1099511627776</maxMemory> + <memory unit='KiB'>1267710</memory> + <currentMemory unit='KiB'>1267710</currentMemory> + <memoryBacking> + <hugepages> + <page size='2048' unit='KiB'/> + </hugepages> + <access mode='shared'/> + </memoryBacking> + <vcpu placement='static' cpuset='0-1'>2</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <cpu> + <topology sockets='2' cores='1' threads='1'/> + <numa> + <cell id='0' cpus='0-1' memory='1048576' unit='KiB'/> + </numa> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i686</emulator> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </memballoon> + <memory model='nvdimm'> + <source> + <path>/tmp/nvdimm</path> + </source> + <target> + <size unit='KiB'>523264</size> + <node>0</node> + </target> + <address type='dimm' slot='0'/> + </memory> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 96482a84a1..8a7b82a1f2 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -994,6 +994,7 @@ mymain(void) DO_TEST_FAILURE("hugepages-memaccess3", QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_OBJECT_MEMORY_FILE, QEMU_CAPS_VIRTIO_SCSI); + DO_TEST_CAPS_LATEST("hugepages-nvdimm"); DO_TEST("nosharepages", QEMU_CAPS_MEM_MERGE); DO_TEST("disk-cdrom", NONE); DO_TEST_CAPS_LATEST("disk-cdrom"); diff --git a/tests/qemuxml2xmloutdata/hugepages-nvdimm.xml b/tests/qemuxml2xmloutdata/hugepages-nvdimm.xml new file mode 120000 index 0000000000..8288d3c58f --- /dev/null +++ b/tests/qemuxml2xmloutdata/hugepages-nvdimm.xml @@ -0,0 +1 @@ +../qemuxml2argvdata/hugepages-nvdimm.xml \ No newline at end of file diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 7fe5043519..8e58c7b844 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -339,6 +339,7 @@ mymain(void) DO_TEST("hugepages-shared", NONE); DO_TEST("hugepages-memaccess", NONE); DO_TEST("hugepages-memaccess2", NONE); + DO_TEST("hugepages-nvdimm", NONE); DO_TEST("nosharepages", NONE); DO_TEST("restore-v2", NONE); DO_TEST("migrate", NONE); -- 2.16.4

2 1

[libvirt] [PATCH] virsh: Add missed fields to pool-define-as item entry
by John Ferlan 13 Aug '18

13 Aug '18

Commit id d45bee449 updated the pool-define-as qualifier descriptions to add some new fields, but neglected to modify the command item list in order to add those fields as well. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Discovered by QE while validating bz1601377. tools/virsh.pod | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index a5e02c62cd..4e118851f8 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -3831,7 +3831,9 @@ just I<--build> is provided, then B<pool-build> is called with no flags. [I<--auth-type authtype> I<--auth-username username> [I<--secret-usage usage> | I<--secret-uuid uuid>]] [[I<--adapter-name name>] | [I<--adapter-wwnn> wwnn I<--adapter-wwpn> wwpn] -[I<--adapter-parent parent>]] +[I<--adapter-parent parent> | + I<--adapter-parent-wwnn parent_wwnn> I<adapter-parent-wwpn parent_wwpn> | + I<--adapter-parent-fabric-wwn parent_fabric_wwn>]] [I<--build>] [[I<--overwrite>] | [I<--no-overwrite>]] [I<--print-xml>] -- 2.17.1

2 1

[libvirt] [PATCH] esx: Fix nodeGetInfo so cpu model fits inside nodeinfo->model
by Marcos Paulo de Souza 13 Aug '18

13 Aug '18

Commit 6c0d0210cbcd5d647f0d882c07f077d444bc707d changed the behavior of virStr*cpy* functions, so now the nodeGetInfo call fails. Version 4.1.0 (default for Fedora 28) works: Model: Intel Core i7-4500U CPU @ 1.80G Current master tries to write "Intel Core i7-4500U CPU @ 1.80GHz", but the string is bigger than nodeinfo->model (which is a char[32]). So this patch "cuts" the string, and presents the same output from 4.1.0. Signed-off-by: Marcos Paulo de Souza <marcos.souza.org(a)gmail.com> --- When testing both qemu and lxc drivers, both return "x86_64", as both call virCapabilitiesGetNodeInfo in order the get all info the "node", but they are a Linux machine. When it comes to ESX, it returns a string from the ESX server, which is same info that I can find in /proc/cpuinfo of my machine (but without the () parts): model name : Intel(R) Core(TM) i7-4500U CPU @ 1.80GHz The question is: should libvirt increase the model size, or just find a better way for ESX to present this info? src/esx/esx_driver.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index c2154799fa..03a84d7630 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -1317,6 +1317,8 @@ esxNodeGetInfo(virConnectPtr conn, virNodeInfoPtr nodeinfo) ++ptr; } + /* Make sure the string fits in mode */ + dynamicProperty->val->string[sizeof(nodeinfo->model) - 1] = '\0'; if (virStrcpyStatic(nodeinfo->model, dynamicProperty->val->string) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("CPU Model %s too long for destination"), -- 2.17.1

2 1

[libvirt] [PATCH] spec: Add libvirt-daemon-driver-storage-iscsi-direct
by Cole Robinson 13 Aug '18

13 Aug '18

Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- libvirt.spec.in | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 3edb60d2d2..09e69a9309 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -317,8 +317,10 @@ BuildRequires: /usr/bin/qemu-img %endif # For LVM drivers BuildRequires: lvm2 -# For ISCSI driver +# For pool type=iscsi BuildRequires: iscsi-initiator-utils +# For pool type=iscsi-direct +BuildRequires: libiscsi # For disk driver BuildRequires: parted-devel # For Multipath support @@ -591,6 +593,16 @@ The storage driver backend adding implementation of the storage APIs for iscsi volumes using the host iscsi stack. +%package daemon-driver-storage-iscsi-direct +Summary: Storage driver plugin for iscsi-direct +Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} +Requires: libvirt-libs = %{version}-%{release} + +%description daemon-driver-storage-iscsi-direct +The storage driver backend adding implementation of the storage APIs for iscsi +volumes using libiscsi direct connection. + + %package daemon-driver-storage-mpath Summary: Storage driver plugin for multipath volumes Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} @@ -667,6 +679,7 @@ Requires: libvirt-daemon-driver-storage-disk = %{version}-%{release} Requires: libvirt-daemon-driver-storage-logical = %{version}-%{release} Requires: libvirt-daemon-driver-storage-scsi = %{version}-%{release} Requires: libvirt-daemon-driver-storage-iscsi = %{version}-%{release} +Requires: libvirt-daemon-driver-storage-iscsi-direct = %{version}-%{release} Requires: libvirt-daemon-driver-storage-mpath = %{version}-%{release} %if %{with_storage_gluster} Requires: libvirt-daemon-driver-storage-gluster = %{version}-%{release} @@ -1174,6 +1187,7 @@ rm -f po/stamp-po --with-storage-fs \ --with-storage-lvm \ --with-storage-iscsi \ + --with-storage-iscsi-direct \ --with-storage-scsi \ --with-storage-disk \ --with-storage-mpath \ @@ -1639,6 +1653,9 @@ exit 0 %files daemon-driver-storage-iscsi %{_libdir}/%{name}/storage-backend/libvirt_storage_backend_iscsi.so +%files daemon-driver-storage-iscsi-direct +%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_iscsi-direct.so + %files daemon-driver-storage-mpath %{_libdir}/%{name}/storage-backend/libvirt_storage_backend_mpath.so -- 2.17.1

2 1

[libvirt] [PATCH 1/2] Add API for printing tables.
by Simon Kobyda 13 Aug '18

13 Aug '18

It solves problems with alignment of columns. Width of each column is calculated by its biggest cell. Should solve unicode bug. In future, it may be implemented in virsh, virt-admin... This API has 5 public functions: - vshTableNew - adds new table and defines its header - vshTableRowAppend - appends new row (for same number of columns as in header) - vshTablePrintToStdout - vshTablePrintToString - vshTableFree https://bugzilla.redhat.com/show_bug.cgi?id=1574624 https://bugzilla.redhat.com/show_bug.cgi?id=1584630 Signed-off-by: Simon Kobyda <skobyda(a)redhat.com> --- tools/Makefile.am | 4 +- tools/vsh-table.c | 367 ++++++++++++++++++++++++++++++++++++++++++++++ tools/vsh-table.h | 42 ++++++ 3 files changed, 412 insertions(+), 1 deletion(-) create mode 100644 tools/vsh-table.c create mode 100644 tools/vsh-table.h diff --git a/tools/Makefile.am b/tools/Makefile.am index 26c887649e..ed23575aa7 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -144,7 +144,9 @@ libvirt_shell_la_LIBADD = \ $(READLINE_LIBS) \ ../gnulib/lib/libgnu.la \ $(NULL) -libvirt_shell_la_SOURCES = vsh.c vsh.h +libvirt_shell_la_SOURCES = \ + vsh.c vsh.h \ + vsh-table.c vsh-table.h virt_host_validate_SOURCES = \ virt-host-validate.c \ diff --git a/tools/vsh-table.c b/tools/vsh-table.c new file mode 100644 index 0000000000..11dc807ba9 --- /dev/null +++ b/tools/vsh-table.c @@ -0,0 +1,367 @@ +/* + * vsh-table.c: table printing helper + * + * Copyright (C) 2018 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Authors: + * Simon Kobyda <skobyda(a)redhat.com> + * + */ + +#include <config.h> +#include "vsh-table.h" +#include "virsh-util.h" + +#include <string.h> +#include <stdarg.h> +#include <stddef.h> + +#include "viralloc.h" +#include "virbuffer.h" +#include "virstring.h" + +typedef void (*vshPrintCB)(vshControl *ctl, const char *fmt, ...); + +struct _vshTableRow { + char **cells; + size_t ncells; +}; + +struct _vshTable { + vshTableRowPtr *rows; + size_t nrows; +}; + +static void +vshTableRowFree(vshTableRowPtr row) +{ + size_t i; + + if (!row) + return; + + for (i = 0; i < row->ncells; i++) + VIR_FREE(row->cells[i]); + + VIR_FREE(row->cells); + VIR_FREE(row); +} + +void +vshTableFree(vshTablePtr table) +{ + size_t i; + + if (!table) + return; + + for (i = 0; i < table->nrows; i++) + vshTableRowFree(table->rows[i]); + VIR_FREE(table->rows); + VIR_FREE(table); +} + +/** + * vshTableRowNew: + * @size: expected number of cells in row. + * @arg: the first argument. + * @ap: list of variadic arguments + * + * Creates a new row in the table. Each argument passed + * represents a cell in the row. If the number of cells is not + * equal to @size, then NULL is returned. However, if @size is + * equal to 0, the aforementioned check is suppressed. + * + * Returns: pointer to vshTableRowPtr row or NULL. + */ +static vshTableRowPtr +vshTableRowNew(size_t size, const char *arg, va_list ap) +{ + vshTableRowPtr row = NULL; + char *tmp = NULL; + + if (!arg) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Table row cannot be empty")); + goto error; + } + + if (VIR_ALLOC(row) < 0) + goto error; + + while (arg) { + if (VIR_STRDUP(tmp, arg) < 0) + goto error; + + if (VIR_APPEND_ELEMENT(row->cells, row->ncells, tmp) < 0) + goto error; + + arg = va_arg(ap, const char *); + } + + if (size && row->ncells != size) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Incorrect number of cells in a table row")); + goto error; + } + + return row; + + error: + vshTableRowFree(row); + return NULL; +} + +/** + * vshTableNew: + * @arg: List of column names (NULL terminated) + * + * Creates a new table. + * + * Returns: pointer to table or NULL. + */ +vshTablePtr +vshTableNew(const char *arg, ...) +{ + vshTablePtr table; + vshTableRowPtr header = NULL; + va_list ap; + + if (VIR_ALLOC(table) < 0) + goto error; + + va_start(ap, arg); + header = vshTableRowNew(0, arg, ap); + va_end(ap); + + if (!header) + goto error; + + if (VIR_APPEND_ELEMENT(table->rows, table->nrows, header) < 0) + goto error; + + return table; + error: + vshTableRowFree(header); + vshTableFree(table); + return NULL; +} + +/** + * vshTableRowAppend: + * @table: table to append to + * @arg: cells of the row (NULL terminated) + * + * Appends new row into the @table. The number of cells in the row has + * to be equal to the number of cells in the table header. + * + * Returns: 0 if succeeded, -1 if failed. + */ +int +vshTableRowAppend(vshTablePtr table, const char *arg, ...) +{ + vshTableRowPtr row = NULL; + size_t ncolumns = table->rows[0]->ncells; + va_list ap; + int ret = -1; + + va_start(ap, arg); + row = vshTableRowNew(ncolumns, arg, ap); + va_end(ap); + + if (!row) + goto cleanup; + + if (VIR_APPEND_ELEMENT(table->rows, table->nrows, row) < 0) + goto cleanup; + + ret = 0; + cleanup: + vshTableRowFree(row); + return ret; +} + +/** + * vshTableGetColumnsWidths: + * @table: table + * @maxwidths: maximum count of characters for each columns + * @widths: count of characters for each cell in the table + * + * Fills passed @maxwidths and @widths arrays with maximum number + * of characters for columns and number of character per each + * table cell, respectively. + * + * Tries to handle unicode strings. + */ +static void +vshTableGetColumnsWidths(vshTablePtr table, + size_t **maxwidths, + size_t ***widths) +{ + size_t i; + size_t j; + + for (i = 0; i < table->nrows; i++) { + vshTableRowPtr row = table->rows[i]; + + for (j = 0; j < row->ncells; j++) { + size_t len; + + len = mbstowcs(NULL, row->cells[j], 0); + + if (len == (size_t) -1) + len = strlen(row->cells[j]); + + (*widths)[i][j] = len; + if (len > (*maxwidths)[j]) + (*maxwidths)[j] = len; + } + } +} + +/** + * vshTableRowPrint: + * @ctl virtshell control structure + * @row: table to append to + * @maxwidths: maximum count of characters for each columns + * @widths: count of character for each cell in this row + * @printCB function for priting table + * @buf: buffer to store table (only if @toStdout == true) + * @toStdout: whetever print table to Stdout or return in buffer + */ +static void +vshTableRowPrint(vshControl *ctl, + vshTableRowPtr row, + size_t *maxwidths, + size_t *widths, + vshPrintCB printCB, + virBufferPtr buf, + bool toStdout) +{ + size_t i; + size_t j; + + if (toStdout) { + for (i = 0; i < row->ncells; i++) { + printCB(ctl, " %s", row->cells[i]); + + for (j = 0; j < maxwidths[i] - widths[i] + 2; j++) + printCB(ctl, " "); + } + printCB(ctl, "\n"); + } else { + for (i = 0; i < row->ncells; i++) { + virBufferAsprintf(buf, " %s", row->cells[i]); + + for (j = 0; j < maxwidths[i] - widths[i] + 2; j++) + virBufferAddStr(buf, " "); + } + virBufferAddStr(buf, "\n"); + } + +} + +/** + * vshTablePrint: + * @ctl virtshell control structure + * @table: table to print + * @toStdout: whetever to print to stdout (true) or return in string (false) + * + * Prints table. To get an alignment of columns right, function + * fills 2d array @widths with count of characters in each cell and + * array @maxwidths maximum count of character in each column. + * Function then prints tables header and content. + * + * Returns string containing table, or NULL if table was printed to + * stdout + */ +static char * +vshTablePrint(vshControl *ctl, vshTablePtr table, bool toStdout) +{ + size_t i; + size_t j; + size_t *maxwidths; + size_t **widths; + virBuffer buf = VIR_BUFFER_INITIALIZER; + char *ret = NULL; + + if (VIR_ALLOC_N(maxwidths, table->rows[0]->ncells)) + goto cleanup; + + if (VIR_ALLOC_N(widths, table->nrows)) + goto cleanup; + + /* retrieve widths of columns */ + for (i = 0; i < table->nrows; i++) { + if (VIR_ALLOC_N(widths[i], table->rows[0]->ncells)) + goto cleanup; + } + + vshTableGetColumnsWidths(table, &maxwidths, &widths); + + /* print header */ + VIR_WARNINGS_NO_PRINTF + vshTableRowPrint(ctl, table->rows[0], maxwidths, widths[0], + vshPrintExtra, &buf, toStdout); + VIR_WARNINGS_RESET + + /* print dividing line */ + if (toStdout) { + for (i = 0; i < table->rows[0]->ncells; i++) { + for (j = 0; j < maxwidths[i] + 3; j++) + vshPrintExtra(ctl, "-"); + } + vshPrintExtra(ctl, "\n"); + } else { + for (i = 0; i < table->rows[0]->ncells; i++) { + for (j = 0; j < maxwidths[i] + 3; j++) + virBufferAddStr(&buf, "-"); + } + virBufferAddStr(&buf, "\n"); + } + + /* print content */ + for (i = 1; i < table->nrows; i++) { + VIR_WARNINGS_NO_PRINTF + vshTableRowPrint(ctl, table->rows[i], maxwidths, widths[0], + vshPrintExtra, &buf, toStdout); + VIR_WARNINGS_RESET + } + + if (!toStdout) + ret = virBufferContentAndReset(&buf); + + cleanup: + VIR_FREE(maxwidths); + for (i = 0; i < table->nrows; i++) + VIR_FREE(widths[i]); + VIR_FREE(widths); + return ret; +} + + +void +vshTablePrintToStdout(vshControl *ctl, vshTablePtr table) +{ + vshTablePrint(ctl, table, true); +} + +char * +vshTablePrintToString(vshControl *ctl, vshTablePtr table) +{ + return vshTablePrint(ctl, table, false); +} diff --git a/tools/vsh-table.h b/tools/vsh-table.h new file mode 100644 index 0000000000..41600fe06f --- /dev/null +++ b/tools/vsh-table.h @@ -0,0 +1,42 @@ +/* + * vsh-table.h: table printing helper + * + * Copyright (C) 2018 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Authors: + * Simon Kobyda <skobyda(a)redhat.com> + * + */ + +#ifndef VSH_TABLE_H +# define VSH_TABLE_H + +# include "vsh.h" + +/* forward declarations */ +typedef struct _vshTable vshTable; +typedef struct _vshTableRow vshTableRow; +typedef vshTable *vshTablePtr; +typedef vshTableRow *vshTableRowPtr; + +void vshTableFree(vshTablePtr table); +vshTablePtr vshTableNew(const char *format, ...); +int vshTableRowAppend(vshTablePtr table, const char *arg, ...); +void vshTablePrintToStdout(vshControl *ctl, vshTablePtr table); +char *vshTablePrintToString(vshControl *ctl, vshTablePtr table); + +#endif /* VSH_TABLE_H */ -- 2.17.1

3 6

[libvirt] [jenkins-ci PATCH 0/2] Don't build libvirt-dbus on Debian 8
by Andrea Bolognani 13 Aug '18

13 Aug '18

I thought that it would work, but I was clearly mistaken :/ Andrea Bolognani (2): projects: Don't build libvirt-dbus on Debian 8 guests: Don't prepare Debian 8 for libvirt-dbus guests/host_vars/libvirt-debian-8/main.yml | 1 - projects/libvirt-dbus.yaml | 1 - 2 files changed, 2 deletions(-) -- 2.17.1

2 3

[libvirt] [RFC 0/2] util: introduce timeout mode in virCommandRun/Async and virKModLoad
by Shi Lei 13 Aug '18

13 Aug '18

Hi, everyone! It's possible that the running-time of a command is long than its caller expected. Perhaps, it's useful to provide timeout mode for virCommandRun or virCommandRunAsync + virCommandWait. And The caller can restrict the running time of the command if necessary. I introduce a new function virCommandSetTimeout for that. And then, virKModLoad will get a default timeout of 3 seconds. I hope it could solve the problem of "strange delay" as John mentioned. Thanks! Shi Lei (2): introduce timeout mode in virCommandRun/Async introduce timeout mode in virKModLoad docs/internals/command.html.in | 68 +++++++ src/Makefile.am | 4 +- src/libvirt_private.syms | 2 + src/util/vircommand.c | 110 ++++++++++- src/util/vircommand.h | 4 + src/util/virkmod.c | 43 ++++- src/util/virprocess.c | 107 ++++++++--- src/util/virprocess.h | 4 + src/virt-command.conf | 10 + tests/commandtest.c | 411 ++++++++++++++++++++++++++++++++++++++--- 10 files changed, 706 insertions(+), 57 deletions(-) create mode 100644 src/virt-command.conf -- 2.7.4

3 5

[libvirt] [PATCH 0/2] Couple of almost trivial memleak fixes
by Michal Privoznik 13 Aug '18

13 Aug '18

*** NOT PUSHED. PLEASE REVIEW *** Michal Prívozník (2): virnetdevip: Free data.devices in virNetDevIPCheckIPv6Forwarding() too networkStartNetworkVirtual: Don't leak macmap object src/network/bridge_driver.c | 2 ++ src/util/virnetdevip.c | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) -- 2.16.4

2 4

[libvirt] [PATCH] Fix snapshot creating with vm xml persistent
by Bobo Du 13 Aug '18

13 Aug '18

Bobo Du (1): qemu:Fix snapshot creating with vm xml persistent src/qemu/qemu_driver.c | 1 + 1 file changed, 1 insertion(+) -- 1.8.3.1

3 3

[libvirt] [PATCH v3 0/3] add wipeVol to iscsi-direct
by clem＠lse.epita.fr 13 Aug '18

13 Aug '18

From: Clementine Hayat <clem(a)lse.epita.fr> Hello, This series of patch is the follow up of: v1:https://www.redhat.com/archives/libvir-list/2018-August/msg00557.html v2:https://www.redhat.com/archives/libvir-list/2018-August/msg00570.html Best Regards, -- Clementine Hayat Clementine Hayat (3): storage: refactor volume capacity in iscsi-direct backend storage: add SetConnection to iscsi-direct backend storage: add wipeVol to iscsi-direct storage backend src/storage/storage_backend_iscsi_direct.c | 178 ++++++++++++++++++--- 1 file changed, 157 insertions(+), 21 deletions(-) -- 2.18.0

2 6

[libvirt] [PATCH] src: Move DLOPEN_LIBS to libraries introducing the dependency
by Michal Privoznik 13 Aug '18

13 Aug '18

There are few places where dlopen() is called. This call means we have to link with DLOPEN_LIBS. However, instead of having each final, installable library linking with it, move the directive to the source that introduced the dependency. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/Makefile.am | 2 ++ src/util/Makefile.inc.am | 1 + tools/Makefile.am | 4 ++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index a4f213480e..61876cf382 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -752,6 +752,7 @@ libvirt_setuid_rpc_client_la_CFLAGS = \ $(AM_CFLAGS) \ $(SECDRIVER_CFLAGS) \ $(XDR_CFLAGS) \ + $(DLOPEN_LIBS) \ $(NULL) endif WITH_SETUID_RPC_CLIENT @@ -1000,6 +1001,7 @@ libvirt_nss_la_CFLAGS = \ $(NULL) libvirt_nss_la_LDFLAGS = \ $(AM_LDFLAGS) \ + $(DLOPEN_LIBS) \ $(NULL) endif WITH_NSS diff --git a/src/util/Makefile.inc.am b/src/util/Makefile.inc.am index 8ef9ee1dfa..c5c50f1844 100644 --- a/src/util/Makefile.inc.am +++ b/src/util/Makefile.inc.am @@ -278,6 +278,7 @@ libvirt_util_la_LIBADD = \ $(NUMACTL_LIBS) \ $(ACL_LIBS) \ $(GNUTLS_LIBS) \ + $(DLOPEN_LIBS) \ $(NULL) diff --git a/tools/Makefile.am b/tools/Makefile.am index 26c887649e..3e129c04c4 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -528,7 +528,7 @@ nss_libnss_libvirt_impl_la_CFLAGS = \ nss_libnss_libvirt_impl_la_LIBADD = \ ../gnulib/lib/libgnu.la \ ../src/libvirt-nss.la \ - $(DLOPEN_LIBS) + $(NULL) nss_libnss_libvirt_la_SOURCES = nss_libnss_libvirt_la_LDFLAGS = \ @@ -556,7 +556,7 @@ nss_libnss_libvirt_guest_impl_la_CFLAGS = \ nss_libnss_libvirt_guest_impl_la_LIBADD = \ ../gnulib/lib/libgnu.la \ ../src/libvirt-nss.la \ - $(DLOPEN_LIBS) + $(NULL) nss_libnss_libvirt_guest_la_SOURCES = nss_libnss_libvirt_guest_la_LDFLAGS = \ -- 2.16.4

4 3

[libvirt] [PATCH] qemu-doc: mark ppc/prep machine as deprecated
by Hervé Poussineau 13 Aug '18

13 Aug '18

40p machine type should be used instead. Signed-off-by: Hervé Poussineau <hpoussin(a)reactos.org> --- qemu-deprecated.texi | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index 9920a85adc..9c7ff3fe2d 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -218,6 +218,12 @@ support page sizes < 4096 any longer. These machine types are very old and likely can not be used for live migration from old QEMU versions anymore. A newer machine type should be used instead. +@subsection prep (PowerPC) (since 3.1) + +This machine type uses an unmaintained firmware, broken in lots of ways, +and unable to start post-2004 operating systems. 40p machine type should be +used instead. + @section Device options @subsection Block device options -- 2.11.0

3 2

[libvirt] Missing repo file for virt-preview repo on fedorapeople
by Roman Mohr 10 Aug '18

10 Aug '18

Hi everyone, Is there a change on how to get the fedora-virt-preview.repo? So far we were referencing https://fedorapeople.org/groups/virt/virt-preview/fedora-virt-preview.repo but that file does not seem to exist anymore. Best Regards, Roman

3 3

[libvirt] [PATCH 00/17] some cgroup cleanup patches
by Pavel Hrdina 10 Aug '18

10 Aug '18

Preparation for cgroupv2 support. Pavel Hrdina (17): docs: List cpuacct in controllers used by QEMU driver docs: Update how we create cgroup directory names vircgroup: Rename structs to start with underscore vircgroup: Introduce standard set of typedefs and use them vircgroup: Extract file link resolving into separate function vircgroup: Remove unused function virCgroupKill() vircgroup: Unexport unused function virCgroupAddTaskController() vircgroup: Unexport unused function virCgroupRemoveRecursively vircgroup: Move function used in tests into vircgrouppriv.h vircgroup: Remove pointless bool parameter vircgroup: Extract mount options matching into function vircgroup: Use virCgroupMountOptsMatchController in virCgroupDetectPlacement vircgroup: Introduce virCgroupEnableMissingControllers vircgroup: machinename will never be NULL vircgroup: Remove virCgroupAddTaskController vircgroup: Introduce virCgroupGetMemoryStat lxc: Use virCgroupGetMemoryStat docs/cgroups.html.in | 47 ++-- src/libvirt_private.syms | 4 +- src/lxc/lxc_cgroup.c | 65 +---- src/util/vircgroup.c | 521 ++++++++++++++++++++------------------- src/util/vircgroup.h | 31 +-- src/util/vircgrouppriv.h | 21 +- 6 files changed, 330 insertions(+), 359 deletions(-) -- 2.17.1

2 21

[libvirt] [PATCH v2 00/20] Fix and improve hugepage code
by Pavel Hrdina 10 Aug '18

10 Aug '18

changes in v2: - renamed existing test cases to sensible names - split of some existing test cases - fixed uncovered issue with memory discard v1: https://www.redhat.com/archives/libvir-list/2018-July/msg00667.html Pavel Hrdina (20): tests: rename hugepages to hugepages-default tests: extract hugepages-numa-default-dimm out of hugepages-numa tests: rename hugepages-numa into hugepages-numa-default tests: remove unnecessary XML elements from hugepages-numa-default tests: extract pages-discard out of hugepages-pages tests: rename hugepages-pages into hugepages-numa-nodeset tests: rename hugepages-pages2 into hugepages-numa-default-2M tests: extract pages-discard-hugepages out of hugepages-pages3 tests: rename hugepages-pages3 into hugepages-numa-nodeset-part tests: rename hugepages-pages4 into hugepages-numa-nodeset-nonexist tests: rename hugepages-pages5 into hugepages-default-2M tests: rename hugepages-pages6 into hugepages-default-system-size tests: rename hugepages-pages7 into pages-dimm-discard tests: rename hugepages-pages8 into hugepages-nodeset-nonexist tests: introduce hugepages-default-1G-nodeset-2M tests: introduce hugepages-nodeset conf: Move hugepage XML validation check out of qemu_command conf: Move hugepages validation out of XML parser conf: Introduce virDomainDefPostParseMemtune qemu: ensure that memory 'discard' is used if specified in XML src/conf/domain_conf.c | 134 +++++++++++++----- src/qemu/qemu_command.c | 38 +---- ...s => hugepages-default-1G-nodeset-2M.args} | 7 +- .../hugepages-default-1G-nodeset-2M.xml | 31 ++++ ...-pages5.args => hugepages-default-2M.args} | 5 +- ...es-pages5.xml => hugepages-default-2M.xml} | 13 +- .../hugepages-default-system-size.args | 24 ++++ ....xml => hugepages-default-system-size.xml} | 13 +- ...{hugepages.args => hugepages-default.args} | 2 - .../{hugepages.xml => hugepages-default.xml} | 5 - ...es8.xml => hugepages-nodeset-nonexist.xml} | 13 +- tests/qemuxml2argvdata/hugepages-nodeset.args | 26 ++++ tests/qemuxml2argvdata/hugepages-nodeset.xml | 30 ++++ ...s2.args => hugepages-numa-default-2M.args} | 5 +- ...ges2.xml => hugepages-numa-default-2M.xml} | 8 +- ....args => hugepages-numa-default-dimm.args} | 12 +- .../hugepages-numa-default-dimm.xml | 45 ++++++ .../hugepages-numa-default.args | 27 ++++ .../hugepages-numa-default.xml | 30 ++++ ...ml => hugepages-numa-nodeset-nonexist.xml} | 17 +-- ....args => hugepages-numa-nodeset-part.args} | 8 +- .../hugepages-numa-nodeset-part.xml | 34 +++++ ...pages.args => hugepages-numa-nodeset.args} | 17 +-- ...s-pages.xml => hugepages-numa-nodeset.xml} | 15 +- tests/qemuxml2argvdata/hugepages-numa.args | 63 -------- tests/qemuxml2argvdata/hugepages-numa.xml | 111 --------------- .../qemuxml2argvdata/pages-dimm-discard.args | 33 +++++ ...ages-pages7.xml => pages-dimm-discard.xml} | 18 +-- .../pages-discard-hugepages.args | 31 ++++ ...pages3.xml => pages-discard-hugepages.xml} | 16 +-- tests/qemuxml2argvdata/pages-discard.args | 38 +++++ tests/qemuxml2argvdata/pages-discard.xml | 36 +++++ .../seclabel-dynamic-none-relabel.xml | 2 +- tests/qemuxml2argvtest.c | 56 ++++---- .../hugepages-default-2M.xml | 1 + .../hugepages-default-system-size.xml | 1 + .../{hugepages.xml => hugepages-default.xml} | 6 - .../qemuxml2xmloutdata/hugepages-nodeset.xml | 30 ++++ ...ges2.xml => hugepages-numa-default-2M.xml} | 13 +- .../hugepages-numa-default-dimm.xml | 1 + .../hugepages-numa-nodeset-part.xml | 36 +++++ ...s-pages.xml => hugepages-numa-nodeset.xml} | 20 +-- tests/qemuxml2xmloutdata/hugepages-pages3.xml | 47 ------ tests/qemuxml2xmloutdata/hugepages-pages4.xml | 1 - tests/qemuxml2xmloutdata/hugepages-pages5.xml | 1 - tests/qemuxml2xmloutdata/hugepages-pages6.xml | 1 - tests/qemuxml2xmloutdata/hugepages-pages7.xml | 1 - .../qemuxml2xmloutdata/pages-dimm-discard.xml | 1 + .../pages-discard-hugepages.xml | 1 + tests/qemuxml2xmloutdata/pages-discard.xml | 1 + .../seclabel-dynamic-none-relabel.xml | 2 +- tests/qemuxml2xmltest.c | 19 +-- 52 files changed, 634 insertions(+), 512 deletions(-) rename tests/qemuxml2argvdata/{hugepages-pages6.args => hugepages-default-1G-nodeset-2M.args} (72%) create mode 100644 tests/qemuxml2argvdata/hugepages-default-1G-nodeset-2M.xml rename tests/qemuxml2argvdata/{hugepages-pages5.args => hugepages-default-2M.args} (75%) rename tests/qemuxml2argvdata/{hugepages-pages5.xml => hugepages-default-2M.xml} (63%) create mode 100644 tests/qemuxml2argvdata/hugepages-default-system-size.args rename tests/qemuxml2argvdata/{hugepages-pages6.xml => hugepages-default-system-size.xml} (63%) rename tests/qemuxml2argvdata/{hugepages.args => hugepages-default.args} (82%) rename tests/qemuxml2argvdata/{hugepages.xml => hugepages-default.xml} (79%) rename tests/qemuxml2argvdata/{hugepages-pages8.xml => hugepages-nodeset-nonexist.xml} (64%) create mode 100644 tests/qemuxml2argvdata/hugepages-nodeset.args create mode 100644 tests/qemuxml2argvdata/hugepages-nodeset.xml rename tests/qemuxml2argvdata/{hugepages-pages2.args => hugepages-numa-default-2M.args} (77%) rename tests/qemuxml2argvdata/{hugepages-pages2.xml => hugepages-numa-default-2M.xml} (77%) rename tests/qemuxml2argvdata/{hugepages-pages7.args => hugepages-numa-default-dimm.args} (66%) create mode 100644 tests/qemuxml2argvdata/hugepages-numa-default-dimm.xml create mode 100644 tests/qemuxml2argvdata/hugepages-numa-default.args create mode 100644 tests/qemuxml2argvdata/hugepages-numa-default.xml rename tests/qemuxml2argvdata/{hugepages-pages4.xml => hugepages-numa-nodeset-nonexist.xml} (66%) rename tests/qemuxml2argvdata/{hugepages-pages3.args => hugepages-numa-nodeset-part.args} (71%) create mode 100644 tests/qemuxml2argvdata/hugepages-numa-nodeset-part.xml rename tests/qemuxml2argvdata/{hugepages-pages.args => hugepages-numa-nodeset.args} (62%) rename tests/qemuxml2argvdata/{hugepages-pages.xml => hugepages-numa-nodeset.xml} (69%) delete mode 100644 tests/qemuxml2argvdata/hugepages-numa.args delete mode 100644 tests/qemuxml2argvdata/hugepages-numa.xml create mode 100644 tests/qemuxml2argvdata/pages-dimm-discard.args rename tests/qemuxml2argvdata/{hugepages-pages7.xml => pages-dimm-discard.xml} (73%) create mode 100644 tests/qemuxml2argvdata/pages-discard-hugepages.args rename tests/qemuxml2argvdata/{hugepages-pages3.xml => pages-discard-hugepages.xml} (68%) create mode 100644 tests/qemuxml2argvdata/pages-discard.args create mode 100644 tests/qemuxml2argvdata/pages-discard.xml create mode 120000 tests/qemuxml2xmloutdata/hugepages-default-2M.xml create mode 120000 tests/qemuxml2xmloutdata/hugepages-default-system-size.xml rename tests/qemuxml2xmloutdata/{hugepages.xml => hugepages-default.xml} (82%) create mode 100644 tests/qemuxml2xmloutdata/hugepages-nodeset.xml rename tests/qemuxml2xmloutdata/{hugepages-pages2.xml => hugepages-numa-default-2M.xml} (67%) create mode 120000 tests/qemuxml2xmloutdata/hugepages-numa-default-dimm.xml create mode 100644 tests/qemuxml2xmloutdata/hugepages-numa-nodeset-part.xml rename tests/qemuxml2xmloutdata/{hugepages-pages.xml => hugepages-numa-nodeset.xml} (62%) delete mode 100644 tests/qemuxml2xmloutdata/hugepages-pages3.xml delete mode 120000 tests/qemuxml2xmloutdata/hugepages-pages4.xml delete mode 120000 tests/qemuxml2xmloutdata/hugepages-pages5.xml delete mode 120000 tests/qemuxml2xmloutdata/hugepages-pages6.xml delete mode 120000 tests/qemuxml2xmloutdata/hugepages-pages7.xml create mode 120000 tests/qemuxml2xmloutdata/pages-dimm-discard.xml create mode 120000 tests/qemuxml2xmloutdata/pages-discard-hugepages.xml create mode 120000 tests/qemuxml2xmloutdata/pages-discard.xml -- 2.17.1

2 23

[libvirt] [PATCH v2] storage: add wipeVol to iscsi-direct storage backend
by clem＠lse.epita.fr 10 Aug '18

10 Aug '18

From: Clementine Hayat <clem(a)lse.epita.fr> Change set volume capacity to get volume capacity and put the connection and helpers in one function to avoid code duplicates. Signed-off-by: Clementine Hayat <clem(a)lse.epita.fr> --- Set BLOCK_PER_PACKET to 128. Not sure about this value. Should be potentially tuned. src/storage/storage_backend_iscsi_direct.c | 173 ++++++++++++++++++--- 1 file changed, 152 insertions(+), 21 deletions(-) diff --git a/src/storage/storage_backend_iscsi_direct.c b/src/storage/storage_backend_iscsi_direct.c index 0764356b62..958f5937f9 100644 --- a/src/storage/storage_backend_iscsi_direct.c +++ b/src/storage/storage_backend_iscsi_direct.c @@ -41,6 +41,8 @@ #define ISCSI_DEFAULT_TARGET_PORT 3260 #define VIR_ISCSI_TEST_UNIT_TIMEOUT 30 * 1000 +#define BLOCK_PER_PACKET 128 +#define VOL_NAME_PREFIX "unit:0:0:" VIR_LOG_INIT("storage.storage_backend_iscsi_direct"); @@ -225,7 +227,7 @@ virISCSIDirectSetVolumeAttributes(virStoragePoolObjPtr pool, { virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); - if (virAsprintf(&vol->name, "unit:0:0:%u", lun) < 0) + if (virAsprintf(&vol->name, "%s%u", VOL_NAME_PREFIX, lun) < 0) return -1; if (virAsprintf(&vol->key, "ip-%s-iscsi-%s-lun-%u", portal, def->source.devices[0].path, lun) < 0) @@ -237,13 +239,13 @@ virISCSIDirectSetVolumeAttributes(virStoragePoolObjPtr pool, } static int -virISCSIDirectSetVolumeCapacity(struct iscsi_context *iscsi, - virStorageVolDefPtr vol, - int lun) +virISCSIDirectGetVolumeCapacity(struct iscsi_context *iscsi, + int lun, + uint32_t *block_size, + uint32_t *nb_block) { struct scsi_task *task = NULL; struct scsi_inquiry_standard *inq = NULL; - long long size = 0; int ret = -1; if (!(task = iscsi_inquiry_sync(iscsi, lun, 0, 0, 64)) || @@ -282,10 +284,8 @@ virISCSIDirectSetVolumeCapacity(struct iscsi_context *iscsi, goto cleanup; } - size = rc10->block_size; - size *= rc10->lba; - vol->target.capacity = size; - vol->target.allocation = size; + *block_size = rc10->block_size; + *nb_block = rc10->lba; } @@ -303,6 +303,8 @@ virISCSIDirectRefreshVol(virStoragePoolObjPtr pool, { virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); virStorageVolDefPtr vol = NULL; + uint32_t block_size; + uint32_t nb_block; int ret = -1; virStoragePoolObjClearVols(pool); @@ -314,9 +316,12 @@ virISCSIDirectRefreshVol(virStoragePoolObjPtr pool, vol->type = VIR_STORAGE_VOL_NETWORK; - if (virISCSIDirectSetVolumeCapacity(iscsi, vol, lun) < 0) + if (virISCSIDirectGetVolumeCapacity(iscsi, lun, + &block_size, &nb_block) < 0) goto cleanup; + vol->target.capacity = block_size * nb_block; + vol->target.allocation = block_size * nb_block; def->capacity += vol->target.capacity; def->allocation += vol->target.allocation; @@ -553,24 +558,33 @@ virStorageBackendISCSIDirectFindPoolSources(const char *srcSpec, virStoragePoolSourceFree(source); return ret; } +static int +virStorageBackendISCSIDirectSetConnection(virStoragePoolObjPtr pool, + struct iscsi_context **iscsi, + char **portal) +{ + virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); + + if (!(*iscsi = virISCSIDirectCreateContext(def->source.initiator.iqn))) + return -1; + if (!(*portal = virStorageBackendISCSIDirectPortal(&def->source))) + return -1; + if (virStorageBackendISCSIDirectSetAuth(*iscsi, &def->source) < 0) + return -1; + if (virISCSIDirectSetContext(*iscsi, def->source.devices[0].path, ISCSI_SESSION_NORMAL) < 0) + return -1; + if (virISCSIDirectConnect(*iscsi, *portal) < 0) + return -1; + return 0; +} static int virStorageBackendISCSIDirectRefreshPool(virStoragePoolObjPtr pool) { - virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); struct iscsi_context *iscsi = NULL; char *portal = NULL; int ret = -1; - - if (!(iscsi = virISCSIDirectCreateContext(def->source.initiator.iqn))) - goto cleanup; - if (!(portal = virStorageBackendISCSIDirectPortal(&def->source))) - goto cleanup; - if (virStorageBackendISCSIDirectSetAuth(iscsi, &def->source) < 0) - goto cleanup; - if (virISCSIDirectSetContext(iscsi, def->source.devices[0].path, ISCSI_SESSION_NORMAL) < 0) - goto cleanup; - if (virISCSIDirectConnect(iscsi, portal) < 0) + if (virStorageBackendISCSIDirectSetConnection(pool, &iscsi, &portal) <0) goto cleanup; if (virISCSIDirectReportLuns(pool, iscsi, portal) < 0) goto disconect; @@ -584,12 +598,129 @@ virStorageBackendISCSIDirectRefreshPool(virStoragePoolObjPtr pool) return ret; } +static int +virStorageBackendISCSIDirectGetLun(virStorageVolDefPtr vol, + int *lun) +{ + const char *name = vol->name; + int ret = -1; + + if (!STRPREFIX(name, VOL_NAME_PREFIX)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Invalid volume name %s"), name); + goto cleanup; + } + + name += strlen(VOL_NAME_PREFIX); + if (virStrToLong_i(name, NULL, 10, lun) < 0) + goto cleanup; + + ret = 0; + cleanup: + return ret; +} + +static int +virStorageBackendISCSIDirectVolWipeZero(virStorageVolDefPtr vol, + struct iscsi_context *iscsi) +{ + uint32_t lba = 0; + uint32_t block_size; + uint32_t nb_block; + struct scsi_task *task = NULL; + int lun = 0; + int ret = -1; + unsigned char *data; + + if (virStorageBackendISCSIDirectGetLun(vol, &lun) < 0) + return ret; + if (virISCSIDirectTestUnitReady(iscsi, lun) < 0) + return ret; + if (virISCSIDirectGetVolumeCapacity(iscsi, lun, &block_size, &nb_block)) + return ret; + if (VIR_ALLOC_N(data, block_size * BLOCK_PER_PACKET)) + return ret; + + while (lba < nb_block) { + if (nb_block - lba > block_size * BLOCK_PER_PACKET) { + + if (!(task = iscsi_write10_sync(iscsi, lun, lba, data, + block_size * BLOCK_PER_PACKET, + block_size, 0, 0, 0, 0, 0))) + goto cleanup; + scsi_free_scsi_task(task); + lba += BLOCK_PER_PACKET; + } else { + if (!(task = iscsi_write10_sync(iscsi, lun, lba, data, block_size, + block_size, 0, 0, 0, 0, 0))) + goto cleanup; + scsi_free_scsi_task(task); + lba++; + } + } + + ret = 0; + cleanup: + VIR_FREE(data); + return ret; +} + +static int +virStorageBackenISCSIDirectWipeVol(virStoragePoolObjPtr pool, + virStorageVolDefPtr vol, + unsigned int algorithm, + unsigned int flags) +{ + struct iscsi_context *iscsi = NULL; + char *portal = NULL; + int ret = -1; + + virCheckFlags(0, -1); + + if (virStorageBackendISCSIDirectSetConnection(pool, &iscsi, &portal) <0) + goto cleanup; + + switch ((virStorageVolWipeAlgorithm) algorithm) { + case VIR_STORAGE_VOL_WIPE_ALG_ZERO: + if (virStorageBackendISCSIDirectVolWipeZero(vol, iscsi) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("failed to wipe volume %s"), + vol->name); + goto disconnect; + } + break; + case VIR_STORAGE_VOL_WIPE_ALG_TRIM: + case VIR_STORAGE_VOL_WIPE_ALG_NNSA: + case VIR_STORAGE_VOL_WIPE_ALG_DOD: + case VIR_STORAGE_VOL_WIPE_ALG_BSI: + case VIR_STORAGE_VOL_WIPE_ALG_GUTMANN: + case VIR_STORAGE_VOL_WIPE_ALG_SCHNEIER: + case VIR_STORAGE_VOL_WIPE_ALG_PFITZNER7: + case VIR_STORAGE_VOL_WIPE_ALG_PFITZNER33: + case VIR_STORAGE_VOL_WIPE_ALG_RANDOM: + case VIR_STORAGE_VOL_WIPE_ALG_LAST: + virReportError(VIR_ERR_INVALID_ARG, _("unsupported algorithm %d"), + algorithm); + goto disconnect; + } + + ret = 0; + disconnect: + virISCSIDirectDisconnect(iscsi); + cleanup: + VIR_FREE(portal); + iscsi_destroy_context(iscsi); + return ret; +} + + virStorageBackend virStorageBackendISCSIDirect = { .type = VIR_STORAGE_POOL_ISCSI_DIRECT, .checkPool = virStorageBackendISCSIDirectCheckPool, .findPoolSources = virStorageBackendISCSIDirectFindPoolSources, .refreshPool = virStorageBackendISCSIDirectRefreshPool, + .wipeVol = virStorageBackenISCSIDirectWipeVol, }; int -- 2.18.0

3 2

[libvirt] [jenkins-ci PATCH] projects: Document rationale for skipping jobs
by Andrea Bolognani 10 Aug '18

10 Aug '18

In general, we strive for full coverage and build all projects on all targets; however, in some cases that's simply not feasible and we have to skip the corresponding job. Document the rationale for each such case. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- projects/libvirt-dbus.yaml | 3 +++ projects/libvirt-sandbox.yaml | 3 +++ projects/libvirt-tck.yaml | 2 ++ projects/libvirt.yaml | 2 ++ projects/virt-manager.yaml | 1 + projects/virt-viewer.yaml | 2 ++ 6 files changed, 13 insertions(+) diff --git a/projects/libvirt-dbus.yaml b/projects/libvirt-dbus.yaml index 3212465..88b4c88 100644 --- a/projects/libvirt-dbus.yaml +++ b/projects/libvirt-dbus.yaml @@ -18,6 +18,9 @@ - libvirt-freebsd-11 - autotools-check-job: parent_jobs: 'libvirt-dbus-master-build' + # libvirt-dbus' test suite uses Python 3, but Debian 8 doesn't + # include a recent enough version and CentOS 7 doesn't include + # Python 3 at all machines: - libvirt-debian-9 - libvirt-fedora-27 diff --git a/projects/libvirt-sandbox.yaml b/projects/libvirt-sandbox.yaml index da9bf77..6a474c8 100644 --- a/projects/libvirt-sandbox.yaml +++ b/projects/libvirt-sandbox.yaml @@ -1,6 +1,9 @@ - project: name: libvirt-sandbox + # libvirt-sandbox is Linux only; among Linux platforms, CentOS 7 has + # to be excluded because it doesn't ship a version of xz suitable for + # statically linking against machines: - libvirt-debian-8 - libvirt-debian-9 diff --git a/projects/libvirt-tck.yaml b/projects/libvirt-tck.yaml index c406fda..38f8c09 100644 --- a/projects/libvirt-tck.yaml +++ b/projects/libvirt-tck.yaml @@ -1,6 +1,8 @@ - project: name: libvirt-tck + # CentOS 7 doesn't include perl-generators, which is necessary to + # build libvirt-tck machines: - libvirt-debian-8 - libvirt-debian-9 diff --git a/projects/libvirt.yaml b/projects/libvirt.yaml index c64ac5b..ce4698e 100644 --- a/projects/libvirt.yaml +++ b/projects/libvirt.yaml @@ -10,6 +10,8 @@ parent_jobs: - autotools-syntax-check-job: parent_jobs: 'libvirt-master-build' + # We limit syntax-check to Linux platforms because it calls some + # commands with more arguments than FreeBSD supports machines: - libvirt-centos-7 - libvirt-debian-8 diff --git a/projects/virt-manager.yaml b/projects/virt-manager.yaml index 84a95a6..6f806af 100644 --- a/projects/virt-manager.yaml +++ b/projects/virt-manager.yaml @@ -1,6 +1,7 @@ - project: name: virt-manager + # virt-manager is Python 3 only, so it can't be built on CentOS 7 machines: - libvirt-debian-9 - libvirt-fedora-27 diff --git a/projects/virt-viewer.yaml b/projects/virt-viewer.yaml index e68a23b..9188239 100644 --- a/projects/virt-viewer.yaml +++ b/projects/virt-viewer.yaml @@ -13,6 +13,8 @@ parent_jobs: 'virt-viewer-master-syntax-check' - autotools-rpm-job: parent_jobs: 'virt-viewer-master-check' + # The spec file for virt-viewer requires a very recent version + # of spice-gtk, so we have to skip this job on older distros machines: - libvirt-fedora-28 - libvirt-fedora-rawhide -- 2.17.1

1 0

[libvirt] [jenkins-ci PATCH 0/6] Some coverage fixes and improvements
by Andrea Bolognani 10 Aug '18

10 Aug '18

We were installing some unnecessary packages and not building projects on as many platforms as possible. Let's fix that :) Andrea Bolognani (6): guests: Don't prepare Ubuntu 16.04 for virt-manager guests: Don't prepare CentOS 7 for libvirt-sandbox guests: Prepare Debian 8 for libvirt-sandbox projects: Build libvirt-sandbox on Debian 8 guests: Prepare Debian 8 for libvirt-dbus projects: Build libvirt-dbus on Debian 8 guests/host_vars/libvirt-centos-7/main.yml | 1 - guests/host_vars/libvirt-debian-8/main.yml | 2 ++ guests/host_vars/libvirt-ubuntu-16/main.yml | 1 - projects/libvirt-dbus.yaml | 1 + projects/libvirt-sandbox.yaml | 1 + 5 files changed, 4 insertions(+), 2 deletions(-) -- 2.17.1

2 12

[libvirt] [PATCH] storage: add wipeVol to iscsi-direct storage backend
by clem＠lse.epita.fr 10 Aug '18

10 Aug '18

From: Clementine Hayat <clem(a)lse.epita.fr> Change set volume capacity to get volume capacity to avoid code duplicate. Signed-off-by: Clementine Hayat <clem(a)lse.epita.fr> --- Set BLOCK_PER_PACKET to 128. Not sure about this value. Should be potentially tuned. src/storage/storage_backend_iscsi_direct.c | 152 +++++++++++++++++++-- 1 file changed, 143 insertions(+), 9 deletions(-) diff --git a/src/storage/storage_backend_iscsi_direct.c b/src/storage/storage_backend_iscsi_direct.c index 0764356b62..094425c101 100644 --- a/src/storage/storage_backend_iscsi_direct.c +++ b/src/storage/storage_backend_iscsi_direct.c @@ -41,6 +41,7 @@ #define ISCSI_DEFAULT_TARGET_PORT 3260 #define VIR_ISCSI_TEST_UNIT_TIMEOUT 30 * 1000 +#define BLOCK_PER_PACKET 128 VIR_LOG_INIT("storage.storage_backend_iscsi_direct"); @@ -237,13 +238,13 @@ virISCSIDirectSetVolumeAttributes(virStoragePoolObjPtr pool, } static int -virISCSIDirectSetVolumeCapacity(struct iscsi_context *iscsi, - virStorageVolDefPtr vol, - int lun) +virISCSIDirectGetVolumeCapacity(struct iscsi_context *iscsi, + int lun, + uint32_t *block_size, + uint32_t *nb_block) { struct scsi_task *task = NULL; struct scsi_inquiry_standard *inq = NULL; - long long size = 0; int ret = -1; if (!(task = iscsi_inquiry_sync(iscsi, lun, 0, 0, 64)) || @@ -282,10 +283,8 @@ virISCSIDirectSetVolumeCapacity(struct iscsi_context *iscsi, goto cleanup; } - size = rc10->block_size; - size *= rc10->lba; - vol->target.capacity = size; - vol->target.allocation = size; + *block_size = rc10->block_size; + *nb_block = rc10->lba; } @@ -303,6 +302,8 @@ virISCSIDirectRefreshVol(virStoragePoolObjPtr pool, { virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); virStorageVolDefPtr vol = NULL; + uint32_t block_size; + uint32_t nb_block; int ret = -1; virStoragePoolObjClearVols(pool); @@ -314,9 +315,12 @@ virISCSIDirectRefreshVol(virStoragePoolObjPtr pool, vol->type = VIR_STORAGE_VOL_NETWORK; - if (virISCSIDirectSetVolumeCapacity(iscsi, vol, lun) < 0) + if (virISCSIDirectGetVolumeCapacity(iscsi, lun, + &block_size, &nb_block) < 0) goto cleanup; + vol->target.capacity = block_size * nb_block; + vol->target.allocation = block_size * nb_block; def->capacity += vol->target.capacity; def->allocation += vol->target.allocation; @@ -584,12 +588,142 @@ virStorageBackendISCSIDirectRefreshPool(virStoragePoolObjPtr pool) return ret; } +static int +virStorageBackendISCSIDirectGetLun(virStorageVolDefPtr vol, + int *lun) +{ + char *name = NULL; + char **name_split = NULL; + int ret = -1; + + if (VIR_STRDUP(name, vol->name) < 0) + return -1; + if (!(name_split = virStringSplit(name, ":", 4))) + goto cleanup; + if (!name_split[3]) + goto cleanup; + if (virStrToLong_i(name_split[3], NULL, 10, lun) < 0) + goto cleanup; + + ret = 0; + cleanup: + VIR_FREE(name); + virStringListFree(name_split); + printf("\n"); + return ret; +} + +static int +virStorageBackendISCSIDirectVolWipeZero(virStorageVolDefPtr vol, + struct iscsi_context *iscsi) +{ + uint32_t lba = 0; + uint32_t block_size; + uint32_t nb_block; + struct scsi_task *task = NULL; + int lun = 0; + int ret = -1; + unsigned char *data; + + if (virStorageBackendISCSIDirectGetLun(vol, &lun) < 0) + return ret; + if (virISCSIDirectTestUnitReady(iscsi, lun) < 0) + return ret; + if (virISCSIDirectGetVolumeCapacity(iscsi, lun, &block_size, &nb_block)) + return ret; + if (VIR_ALLOC_N(data, block_size * BLOCK_PER_PACKET)) + return ret; + + while (lba < nb_block) { + if (nb_block - lba > block_size * BLOCK_PER_PACKET) { + if (!(task = iscsi_write10_sync(iscsi, lun, lba, data, + block_size * BLOCK_PER_PACKET, + block_size, 0, 0, 0, 0, 0))) + goto cleanup; + scsi_free_scsi_task(task); + lba += BLOCK_PER_PACKET; + } + else { + if (!(task = iscsi_write10_sync(iscsi, lun, lba, data, block_size, + block_size, 0, 0, 0, 0, 0))) + goto cleanup; + scsi_free_scsi_task(task); + lba++; + } + } + + ret = 0; + cleanup: + VIR_FREE(data); + return ret; +} + +static int +virStorageBackenISCSIDirectWipeVol(virStoragePoolObjPtr pool, + virStorageVolDefPtr vol, + unsigned int algorithm, + unsigned int flags) +{ + virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); + struct iscsi_context *iscsi = NULL; + char *portal = NULL; + int ret = -1; + + virCheckFlags(0, -1); + + if (!(iscsi = virISCSIDirectCreateContext(def->source.initiator.iqn))) + goto cleanup; + if (!(portal = virStorageBackendISCSIDirectPortal(&def->source))) + goto cleanup; + if (virStorageBackendISCSIDirectSetAuth(iscsi, &def->source) < 0) + goto cleanup; + if (virISCSIDirectSetContext(iscsi, def->source.devices[0].path, ISCSI_SESSION_NORMAL) < 0) + goto cleanup; + if (virISCSIDirectConnect(iscsi, portal) < 0) + goto cleanup; + + + switch ((virStorageVolWipeAlgorithm) algorithm) { + case VIR_STORAGE_VOL_WIPE_ALG_ZERO: + if (virStorageBackendISCSIDirectVolWipeZero(vol, iscsi) < 0) { + virReportSystemError(VIR_ERR_INTERNAL_ERROR, + _("failed to wipe volume %s"), + vol->name); + goto disconnect; + } + break; + case VIR_STORAGE_VOL_WIPE_ALG_TRIM: + case VIR_STORAGE_VOL_WIPE_ALG_NNSA: + case VIR_STORAGE_VOL_WIPE_ALG_DOD: + case VIR_STORAGE_VOL_WIPE_ALG_BSI: + case VIR_STORAGE_VOL_WIPE_ALG_GUTMANN: + case VIR_STORAGE_VOL_WIPE_ALG_SCHNEIER: + case VIR_STORAGE_VOL_WIPE_ALG_PFITZNER7: + case VIR_STORAGE_VOL_WIPE_ALG_PFITZNER33: + case VIR_STORAGE_VOL_WIPE_ALG_RANDOM: + case VIR_STORAGE_VOL_WIPE_ALG_LAST: + virReportError(VIR_ERR_INVALID_ARG, _("unsupported algorithm %d"), + algorithm); + goto disconnect; + } + + ret = 0; + disconnect: + virISCSIDirectDisconnect(iscsi); + cleanup: + VIR_FREE(portal); + iscsi_destroy_context(iscsi); + return ret; +} + + virStorageBackend virStorageBackendISCSIDirect = { .type = VIR_STORAGE_POOL_ISCSI_DIRECT, .checkPool = virStorageBackendISCSIDirectCheckPool, .findPoolSources = virStorageBackendISCSIDirectFindPoolSources, .refreshPool = virStorageBackendISCSIDirectRefreshPool, + .wipeVol = virStorageBackenISCSIDirectWipeVol, }; int -- 2.18.0

2 1

[libvirt] [PATCH v1 0/6] Introduce metadata locking
by Michal Privoznik 10 Aug '18

10 Aug '18

All patches are for: https://bugzilla.redhat.com/show_bug.cgi?id=1524792 You can find them on my Github too: https://github.com/zippy2/libvirt/tree/disk_metadata_lock_alt The locking by itself make very little sense. I have a patches waiting that implement restoring original seclabels using XATTRs, that should go on the top of these and can be also found on my Github: https://github.com/zippy2/libvirt/tree/seclabels But those are for different bug therefore I'll send them separately. And a bit of warning, I haven't bothered implementing this feature into sanlock driver. The main reason for that was that we tell users to prefer virtlockd over sanlock and if we really want them to switch lets do it by the former offering more features than the latter. Michal Prívozník (6): virlockspace: Introduce VIR_LOCK_SPACE_ACQUIRE_METADATA flag lock_driver.h: Introduce metadata flag lockd_driver_lockd: Implement metadata flag lock_driver_sanlock: Handle metadata flag gracefully domain_lock: Implement metadata locking qemu_security: Lock metadata while relabelling src/libvirt_private.syms | 8 + src/locking/domain_lock.c | 304 ++++++++++++++++++++++++++++++++++--- src/locking/domain_lock.h | 28 ++++ src/locking/lock_daemon_dispatch.c | 5 +- src/locking/lock_driver.h | 2 + src/locking/lock_driver_lockd.c | 31 ++-- src/locking/lock_driver_lockd.h | 1 + src/locking/lock_driver_sanlock.c | 25 ++- src/qemu/qemu_security.c | 107 +++++++++++++ src/util/virlockspace.c | 40 ++++- src/util/virlockspace.h | 1 + 11 files changed, 504 insertions(+), 48 deletions(-) -- 2.16.4

2 7

[libvirt] [PATCH] Fix link errors in tools/nss and tests
by Jim Fehlig 10 Aug '18

10 Aug '18

While local builds succeed fine, a build worker building in a chroot environment is encountering errors when linking some items in tools/nss and tests, e.g. [ 469s] libtool: link: gcc -shared -fPIC -DPIC -Wl,--whole-archive nss/.libs/libnss_libvirt_impl.a -Wl,--no-whole-archive -lpthread -lutil -ltirpc -fstack-protector-strong -grecord-gcc-switches -O2 -fstack-protector-strong -g -Wl,--version-script=./nss/libvirt_nss.syms -Wl,-z -Wl,relro -Wl,-z -Wl,now -Wl,--no-copy-dt-needed-entries -Wl,-z -Wl,defs -grecord-gcc-switches -O2 -fstack-protector-strong -g -pthread -Wl,-soname -Wl,libnss_libvirt.so.2 -o nss/.libs/libnss_libvirt.so.2 [ 469s] nss/.libs/libnss_libvirt_impl.a(libvirt_nss_la-virjsoncompat.o): In function `virJSONJanssonOnce': [ 469s] /home/abuild/rpmbuild/BUILD/libvirt-4.6.0/src/util/virjsoncompat.c:63: undefined reference to `dlopen' [ 469s] /home/abuild/rpmbuild/BUILD/libvirt-4.6.0/src/util/virjsoncompat.c:79: undefined reference to `dlsym' ... A similar problem was fixed in commit b018ada3 and inspires this fix. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- tools/Makefile.am | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index 1452d984a0..26c887649e 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -527,7 +527,8 @@ nss_libnss_libvirt_impl_la_CFLAGS = \ nss_libnss_libvirt_impl_la_LIBADD = \ ../gnulib/lib/libgnu.la \ - ../src/libvirt-nss.la + ../src/libvirt-nss.la \ + $(DLOPEN_LIBS) nss_libnss_libvirt_la_SOURCES = nss_libnss_libvirt_la_LDFLAGS = \ @@ -554,7 +555,8 @@ nss_libnss_libvirt_guest_impl_la_CFLAGS = \ nss_libnss_libvirt_guest_impl_la_LIBADD = \ ../gnulib/lib/libgnu.la \ - ../src/libvirt-nss.la + ../src/libvirt-nss.la \ + $(DLOPEN_LIBS) nss_libnss_libvirt_guest_la_SOURCES = nss_libnss_libvirt_guest_la_LDFLAGS = \ -- 2.18.0

3 4

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

09 Aug '18

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

2 6

[libvirt] [PATCH] Fix libvirt-driver-libxl check
by Marek Marczykowski-Górecki 09 Aug '18

09 Aug '18

Fix saving CFLAGS in LIBVIRT_DRIVER_CHECK_LIBXL - LIBVIRT_CHECK_LIB will override old_CFLAGS, so use a different name. Signed-off-by: Marek Marczykowski-Górecki <marmarek(a)invisiblethingslab.com> --- m4/virt-driver-libxl.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/m4/virt-driver-libxl.m4 b/m4/virt-driver-libxl.m4 index 2cc1c062d8..90338eb306 100644 --- a/m4/virt-driver-libxl.m4 +++ b/m4/virt-driver-libxl.m4 @@ -46,10 +46,10 @@ AC_DEFUN([LIBVIRT_DRIVER_CHECK_LIBXL], [ dnl The libxl driver will make use of this new parameter for specifying dnl the Xen migration stream version. Specify LIBXL_API_VERSION to trigger dnl an error if there is too old xenlight - old_CFLAGS="$CFLAGS" + libxlold_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $LIBXL_API_VERSION" LIBVIRT_CHECK_LIB([LIBXL], [xenlight], [libxl_ctx_alloc], [libxl.h], [fail="1"]) - CFLAGS="$old_CFLAGS" + CFLAGS="$libxlold_CFLAGS" if test $fail = 1; then AC_MSG_ERROR([You must install the libxl Library from Xen >= 4.4 to compile libxenlight driver with -lxl]) -- 2.17.1

2 1

[libvirt] [PATCH] qemuBuildBootCommandLine: remove unused boot_order_str
by Ján Tomko 09 Aug '18

09 Aug '18

After commit caccbba this variable is always NULL. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/qemu/qemu_command.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 65bd88a652..12ff09d46d 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6457,7 +6457,7 @@ qemuBuildBootCommandLine(virCommandPtr cmd, virQEMUCapsPtr qemuCaps) { virBuffer boot_buf = VIR_BUFFER_INITIALIZER; - char *boot_order_str = NULL, *boot_opts_str = NULL; + char *boot_opts_str = NULL; if (def->os.bootmenu) { if (def->os.bootmenu == VIR_TRISTATE_BOOL_YES) @@ -6499,20 +6499,11 @@ qemuBuildBootCommandLine(virCommandPtr cmd, goto error; boot_opts_str = virBufferContentAndReset(&boot_buf); - if (boot_order_str || boot_opts_str) { + if (boot_opts_str) { virCommandAddArg(cmd, "-boot"); - - if (boot_order_str && boot_opts_str) { - virCommandAddArgFormat(cmd, "order=%s,%s", - boot_order_str, boot_opts_str); - } else if (boot_order_str) { - virCommandAddArg(cmd, boot_order_str); - } else if (boot_opts_str) { - virCommandAddArg(cmd, boot_opts_str); - } + virCommandAddArg(cmd, boot_opts_str); } VIR_FREE(boot_opts_str); - VIR_FREE(boot_order_str); if (def->os.kernel) virCommandAddArgList(cmd, "-kernel", def->os.kernel, NULL); @@ -6533,7 +6524,6 @@ qemuBuildBootCommandLine(virCommandPtr cmd, return 0; error: - VIR_FREE(boot_order_str); VIR_FREE(boot_opts_str); virBufferFreeAndReset(&boot_buf); return -1; -- 2.16.1

2 1

[libvirt] [PATCH] network: restrict usage of port management APIs
by Daniel P. Berrangé 09 Aug '18

09 Aug '18

The port allocation APIs are currently called unconditionally for all types of NIC, but (mostly) only do anything for NICs with type=network. The exception is the port allocate API which does some validation even for NICs with type!=network. Relying on this validation is flawed, however, since the network driver may not even be installed, so virt drivers must not delegation validation to it for NICs with type!=network. This change allows us to report errors when the virtual network driver is not registered. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/conf/domain_conf.c | 12 +++++------- src/libxl/libxl_domain.c | 6 ++++-- src/libxl/libxl_driver.c | 9 ++++++--- src/lxc/lxc_driver.c | 6 ++++-- src/lxc/lxc_process.c | 10 ++++++++-- src/network/bridge_driver.c | 22 +++++++++++++++------- src/qemu/qemu_hotplug.c | 17 +++++++++++------ src/qemu/qemu_process.c | 9 ++++++--- 8 files changed, 59 insertions(+), 32 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index adcd8f41b9..e7d2acdcc9 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -29947,13 +29947,11 @@ int virDomainNetAllocateActualDevice(virDomainDefPtr dom, virDomainNetDefPtr iface) { - /* Just silently ignore if network driver isn't present. If something - * has tried to use a NIC with type=network, other code will already - * cause an error. This ensures type=bridge doesn't break when - * network driver is compiled out. - */ - if (!netAllocate) - return 0; + if (!netAllocate) { + virReportError(VIR_ERR_NO_SUPPORT, "%s", + _("Virtual networking driver is not available")); + return -1; + } return netAllocate(dom, iface); } diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 2ab78ac9a5..c78d5ee96c 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -791,7 +791,8 @@ libxlDomainCleanup(libxlDriverPrivatePtr driver, /* cleanup actual device */ virDomainNetRemoveHostdev(vm->def, net); - virDomainNetReleaseActualDevice(vm->def, net); + if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK) + virDomainNetReleaseActualDevice(vm->def, net); } } @@ -948,7 +949,8 @@ libxlNetworkPrepareDevices(virDomainDefPtr def) * network's pool of devices, or resolve bridge device name * to the one defined in the network definition. */ - if (virDomainNetAllocateActualDevice(def, net) < 0) + if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK && + virDomainNetAllocateActualDevice(def, net) < 0) return -1; actualType = virDomainNetGetActualType(net); diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 5a5e792957..fb5f046ade 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -3264,7 +3264,8 @@ libxlDomainAttachNetDevice(libxlDriverPrivatePtr driver, * network's pool of devices, or resolve bridge device name * to the one defined in the network definition. */ - if (virDomainNetAllocateActualDevice(vm->def, net) < 0) + if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK && + virDomainNetAllocateActualDevice(vm->def, net) < 0) goto cleanup; actualType = virDomainNetGetActualType(net); @@ -3314,7 +3315,8 @@ libxlDomainAttachNetDevice(libxlDriverPrivatePtr driver, vm->def->nets[vm->def->nnets++] = net; } else { virDomainNetRemoveHostdev(vm->def, net); - virDomainNetReleaseActualDevice(vm->def, net); + if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK) + virDomainNetReleaseActualDevice(vm->def, net); } virObjectUnref(cfg); return ret; @@ -3737,7 +3739,8 @@ libxlDomainDetachNetDevice(libxlDriverPrivatePtr driver, cleanup: libxl_device_nic_dispose(&nic); if (!ret) { - virDomainNetReleaseActualDevice(vm->def, detach); + if (detach->type == VIR_DOMAIN_NET_TYPE_NETWORK) + virDomainNetReleaseActualDevice(vm->def, detach); virDomainNetRemove(vm->def, detachidx); } virObjectUnref(cfg); diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 8867645cdc..8729fc0174 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -3871,7 +3871,8 @@ lxcDomainAttachDeviceNetLive(virConnectPtr conn, * network's pool of devices, or resolve bridge device name * to the one defined in the network definition. */ - if (virDomainNetAllocateActualDevice(vm->def, net) < 0) + if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK && + virDomainNetAllocateActualDevice(vm->def, net) < 0) return -1; actualType = virDomainNetGetActualType(net); @@ -4425,7 +4426,8 @@ lxcDomainDetachDeviceNetLive(virDomainObjPtr vm, ret = 0; cleanup: if (!ret) { - virDomainNetReleaseActualDevice(vm->def, detach); + if (detach->type == VIR_DOMAIN_NET_TYPE_NETWORK) + virDomainNetReleaseActualDevice(vm->def, detach); virDomainNetRemove(vm->def, detachidx); virDomainNetDefFree(detach); } diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 33c806630b..7a6b40d9b8 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -213,7 +213,8 @@ static void virLXCProcessCleanup(virLXCDriverPtr driver, iface->ifname)); ignore_value(virNetDevVethDelete(iface->ifname)); } - virDomainNetReleaseActualDevice(vm->def, iface); + if (iface->type == VIR_DOMAIN_NET_TYPE_NETWORK) + virDomainNetReleaseActualDevice(vm->def, iface); } virDomainConfVMNWFilterTeardown(vm); @@ -547,6 +548,10 @@ static int virLXCProcessSetupInterfaces(virConnectPtr conn, if (virLXCProcessValidateInterface(net) < 0) goto cleanup; + if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK && + virDomainNetAllocateActualDevice(def, net) < 0) + goto cleanup; + if (virDomainNetAllocateActualDevice(def, net) < 0) goto cleanup; @@ -626,7 +631,8 @@ static int virLXCProcessSetupInterfaces(virConnectPtr conn, ignore_value(virNetDevOpenvswitchRemovePort( virDomainNetGetActualBridgeName(iface), iface->ifname)); - virDomainNetReleaseActualDevice(def, iface); + if (iface->type == VIR_DOMAIN_NET_TYPE_NETWORK) + virDomainNetReleaseActualDevice(def, iface); } } return ret; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index f92cc61e47..c44cb73c5b 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -4458,8 +4458,11 @@ networkAllocateActualDevice(virDomainDefPtr dom, size_t i; int ret = -1; - if (iface->type != VIR_DOMAIN_NET_TYPE_NETWORK) - goto validate; + if (iface->type != VIR_DOMAIN_NET_TYPE_NETWORK) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Expected a interface for a virtual network")); + goto error; + } virDomainActualNetDefFree(iface->data.network.actual); iface->data.network.actual = NULL; @@ -4778,7 +4781,6 @@ networkAllocateActualDevice(virDomainDefPtr dom, if (virNetDevVPortProfileCheckComplete(virtport, true) < 0) goto error; - validate: /* make sure that everything now specified for the device is * actually supported on this type of network. NB: network, * netdev, and iface->data.network.actual may all be NULL. @@ -4881,8 +4883,11 @@ networkNotifyActualDevice(virDomainDefPtr dom, size_t i; char *master = NULL; - if (iface->type != VIR_DOMAIN_NET_TYPE_NETWORK) - return; + if (iface->type != VIR_DOMAIN_NET_TYPE_NETWORK) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Expected a interface for a virtual network")); + goto error; + } obj = virNetworkObjFindByName(driver->networks, iface->data.network.name); if (!obj) { @@ -5114,8 +5119,11 @@ networkReleaseActualDevice(virDomainDefPtr dom, size_t i; int ret = -1; - if (iface->type != VIR_DOMAIN_NET_TYPE_NETWORK) - return 0; + if (iface->type != VIR_DOMAIN_NET_TYPE_NETWORK) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Expected a interface for a virtual network")); + goto error; + } obj = virNetworkObjFindByName(driver->networks, iface->data.network.name); if (!obj) { diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 1488f0a7c2..512fead050 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1062,7 +1062,8 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, * network's pool of devices, or resolve bridge device name * to the one defined in the network definition. */ - if (virDomainNetAllocateActualDevice(vm->def, net) < 0) + if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK && + virDomainNetAllocateActualDevice(vm->def, net) < 0) goto cleanup; actualType = virDomainNetGetActualType(net); @@ -1352,7 +1353,8 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, virDomainNetRemoveHostdev(vm->def, net); - virDomainNetReleaseActualDevice(vm->def, net); + if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK) + virDomainNetReleaseActualDevice(vm->def, net); } VIR_FREE(nicstr); @@ -3722,7 +3724,8 @@ qemuDomainChangeNet(virQEMUDriverPtr driver, /* this function doesn't work with HOSTDEV networks yet, thus * no need to change the pointer in the hostdev structure */ - virDomainNetReleaseActualDevice(vm->def, olddev); + if (olddev->type == VIR_DOMAIN_NET_TYPE_NETWORK) + virDomainNetReleaseActualDevice(vm->def, olddev); virDomainNetDefFree(olddev); /* move newdev into the nets list, and NULL it out from the * virDomainDeviceDef that we were given so that the caller @@ -3753,7 +3756,7 @@ qemuDomainChangeNet(virQEMUDriverPtr driver, * that the changes were minor enough that we didn't need to * replace the entire device object. */ - if (newdev) + if (newdev && newdev->type == VIR_DOMAIN_NET_TYPE_NETWORK) virDomainNetReleaseActualDevice(vm->def, newdev); return ret; @@ -4310,7 +4313,8 @@ qemuDomainRemoveHostDevice(virQEMUDriverPtr driver, virDomainHostdevDefFree(hostdev); if (net) { - virDomainNetReleaseActualDevice(vm->def, net); + if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK) + virDomainNetReleaseActualDevice(vm->def, net); virDomainNetDefFree(net); } @@ -4406,7 +4410,8 @@ qemuDomainRemoveNetDevice(virQEMUDriverPtr driver, qemuDomainNetDeviceVportRemove(net); - virDomainNetReleaseActualDevice(vm->def, net); + if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK) + virDomainNetReleaseActualDevice(vm->def, net); virDomainNetDefFree(net); ret = 0; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index c4e33723d1..440e2b326d 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3127,7 +3127,8 @@ qemuProcessNotifyNets(virDomainDefPtr def) if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_DIRECT) ignore_value(virNetDevMacVLanReserveName(net->ifname, false)); - virDomainNetNotifyActualDevice(def, net); + if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK) + virDomainNetNotifyActualDevice(def, net); } } @@ -5326,7 +5327,8 @@ qemuProcessNetworkPrepareDevices(virDomainDefPtr def) * network's pool of devices, or resolve bridge device name * to the one defined in the network definition. */ - if (virDomainNetAllocateActualDevice(def, net) < 0) + if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK && + virDomainNetAllocateActualDevice(def, net) < 0) goto cleanup; actualType = virDomainNetGetActualType(net); @@ -7075,7 +7077,8 @@ void qemuProcessStop(virQEMUDriverPtr driver, /* kick the device out of the hostdev list too */ virDomainNetRemoveHostdev(def, net); - virDomainNetReleaseActualDevice(vm->def, net); + if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK) + virDomainNetReleaseActualDevice(vm->def, net); } retry: -- 2.17.1

2 4

[libvirt] [PATCH 0/6] qemu: Fix handling of floppy controller setup
by Peter Krempa 09 Aug '18

09 Aug '18

Cleanup always present capability QEMU_CAPS_BOOTINDEX and unused capability QEMU_CAPS_DRIVE_BOOT as a preparation/cleanup step and fix two bugs in setup of the floppy controller for the q35 machine type. Peter Krempa (6): qemu: capabilities: Always assume QEMU_CAPS_BOOTINDEX qemu: capabilities: Remove unused QEMU_CAPS_DRIVE_BOOT qemu: Remove unused argument 'bootable' from qemuBuildDriveStr tests: qemuxml2argv: Add 2 floppy drive tests for q35 with 2.9 and 2.11 machine qemu: command: Don't format -device isa-fdc,... twice with two floppy drives qemu: domain: Fix machine type version check for 'isa-fdc' usage src/qemu/qemu_capabilities.c | 4 +- src/qemu/qemu_capabilities.h | 4 +- src/qemu/qemu_command.c | 233 ++++++++------------- src/qemu/qemu_command.h | 3 +- src/qemu/qemu_domain.c | 12 +- src/qemu/qemu_hotplug.c | 2 +- tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 1 - .../aarch64-aavmf-virtio-mmio.args | 3 +- tests/qemuxml2argvdata/aarch64-acpi-uefi.args | 3 +- .../qemuxml2argvdata/aarch64-cpu-passthrough.args | 3 +- tests/qemuxml2argvdata/aarch64-gic-host.args | 3 +- tests/qemuxml2argvdata/aarch64-gic-none-tcg.args | 3 +- tests/qemuxml2argvdata/aarch64-gic-v2.args | 3 +- tests/qemuxml2argvdata/aarch64-gic-v3.args | 3 +- tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args | 3 +- tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args | 1 - tests/qemuxml2argvdata/aarch64-noacpi-uefi.args | 3 +- tests/qemuxml2argvdata/aarch64-pci-serial.args | 1 - .../qemuxml2argvdata/aarch64-traditional-pci.args | 1 - .../aarch64-usb-controller-nec-xhci.args | 1 - .../aarch64-usb-controller-qemu-xhci.args | 1 - tests/qemuxml2argvdata/aarch64-video-default.args | 1 - .../aarch64-virt-2.6-virtio-pci-default.args | 3 +- .../qemuxml2argvdata/aarch64-virt-default-nic.args | 1 - tests/qemuxml2argvdata/aarch64-virt-virtio.args | 3 +- .../aarch64-virtio-pci-default.args | 3 +- .../aarch64-virtio-pci-manual-addresses.args | 3 +- tests/qemuxml2argvdata/acpi-table.args | 1 - tests/qemuxml2argvdata/arm-vexpressa9-basic.args | 1 - tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args | 1 - tests/qemuxml2argvdata/arm-vexpressa9-virtio.args | 3 +- tests/qemuxml2argvdata/arm-virt-virtio.args | 3 +- tests/qemuxml2argvdata/autoindex.args | 3 +- tests/qemuxml2argvdata/balloon-ccw-deflate.args | 1 - tests/qemuxml2argvdata/balloon-device-auto.args | 4 +- .../balloon-device-deflate-off.args | 4 +- tests/qemuxml2argvdata/balloon-device-deflate.args | 4 +- tests/qemuxml2argvdata/balloon-device-period.args | 4 +- tests/qemuxml2argvdata/balloon-device.args | 4 +- tests/qemuxml2argvdata/balloon-mmio-deflate.args | 1 - tests/qemuxml2argvdata/bios-nvram-secure.args | 4 +- tests/qemuxml2argvdata/bios-nvram.args | 5 +- tests/qemuxml2argvdata/bios.args | 5 +- tests/qemuxml2argvdata/blkdeviotune-group-num.args | 4 +- .../qemuxml2argvdata/blkdeviotune-max-length.args | 4 +- tests/qemuxml2argvdata/blkdeviotune-max.args | 4 +- tests/qemuxml2argvdata/blkiotune-device.args | 4 +- tests/qemuxml2argvdata/blkiotune.args | 4 +- tests/qemuxml2argvdata/boot-cdrom.args | 4 +- tests/qemuxml2argvdata/boot-complex-bootindex.args | 2 +- tests/qemuxml2argvdata/boot-complex.args | 13 +- tests/qemuxml2argvdata/boot-floppy-q35.args | 3 +- tests/qemuxml2argvdata/boot-floppy.args | 4 +- .../qemuxml2argvdata/boot-menu-disable-drive.args | 5 +- tests/qemuxml2argvdata/boot-menu-disable.args | 5 +- .../boot-menu-enable-with-timeout.args | 5 +- tests/qemuxml2argvdata/boot-menu-enable.args | 5 +- tests/qemuxml2argvdata/boot-multi.args | 5 +- tests/qemuxml2argvdata/boot-network.args | 1 - tests/qemuxml2argvdata/boot-strict.args | 2 +- tests/qemuxml2argvdata/channel-guestfwd.args | 4 +- tests/qemuxml2argvdata/channel-spicevmc.args | 4 +- tests/qemuxml2argvdata/channel-virtio-auto.args | 4 +- tests/qemuxml2argvdata/channel-virtio-autoadd.args | 4 +- .../channel-virtio-autoassign.args | 4 +- tests/qemuxml2argvdata/channel-virtio-default.args | 4 +- tests/qemuxml2argvdata/channel-virtio-state.args | 4 +- tests/qemuxml2argvdata/channel-virtio-unix.args | 4 +- tests/qemuxml2argvdata/channel-virtio.args | 4 +- tests/qemuxml2argvdata/chardev-reconnect.args | 1 - tests/qemuxml2argvdata/clock-catchup.args | 4 +- tests/qemuxml2argvdata/clock-france.args | 4 +- tests/qemuxml2argvdata/clock-hpet-off.args | 4 +- .../clock-localtime-basis-localtime.args | 4 +- tests/qemuxml2argvdata/clock-localtime.args | 4 +- tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args | 1 - tests/qemuxml2argvdata/clock-utc.args | 4 +- tests/qemuxml2argvdata/clock-variable.args | 4 +- tests/qemuxml2argvdata/console-compat-auto.args | 4 +- tests/qemuxml2argvdata/console-compat-chardev.args | 4 +- tests/qemuxml2argvdata/console-compat.args | 4 +- tests/qemuxml2argvdata/console-sclp.args | 3 +- tests/qemuxml2argvdata/console-virtio-many.args | 4 +- tests/qemuxml2argvdata/console-virtio.args | 4 +- tests/qemuxml2argvdata/controller-order.args | 6 +- tests/qemuxml2argvdata/cpu-Haswell-noTSX.args | 1 - tests/qemuxml2argvdata/cpu-Haswell.args | 1 - tests/qemuxml2argvdata/cpu-Haswell2.args | 1 - tests/qemuxml2argvdata/cpu-Haswell3.args | 1 - tests/qemuxml2argvdata/cpu-cache-disable.args | 1 - tests/qemuxml2argvdata/cpu-cache-disable2.args | 1 - tests/qemuxml2argvdata/cpu-cache-disable3.args | 1 - tests/qemuxml2argvdata/cpu-cache-emulate-l3.args | 1 - tests/qemuxml2argvdata/cpu-cache-passthrough.args | 1 - tests/qemuxml2argvdata/cpu-cache-passthrough2.args | 1 - tests/qemuxml2argvdata/cpu-check-default-none.args | 1 - .../qemuxml2argvdata/cpu-check-default-none2.args | 1 - .../cpu-check-default-partial.args | 1 - .../cpu-check-default-partial2.args | 1 - tests/qemuxml2argvdata/cpu-check-none.args | 1 - tests/qemuxml2argvdata/cpu-eoi-disabled.args | 1 - tests/qemuxml2argvdata/cpu-eoi-enabled.args | 1 - tests/qemuxml2argvdata/cpu-exact1.args | 1 - tests/qemuxml2argvdata/cpu-exact2-nofallback.args | 1 - tests/qemuxml2argvdata/cpu-exact2.args | 1 - tests/qemuxml2argvdata/cpu-fallback.args | 1 - tests/qemuxml2argvdata/cpu-host-kvmclock.args | 1 - tests/qemuxml2argvdata/cpu-host-model-cmt.args | 1 - .../qemuxml2argvdata/cpu-host-model-fallback.args | 1 - tests/qemuxml2argvdata/cpu-host-model-vendor.args | 1 - tests/qemuxml2argvdata/cpu-host-model.args | 1 - .../cpu-host-passthrough-features.args | 4 +- tests/qemuxml2argvdata/cpu-host-passthrough.args | 1 - tests/qemuxml2argvdata/cpu-hotplug-startup.args | 1 - tests/qemuxml2argvdata/cpu-kvmclock.args | 1 - tests/qemuxml2argvdata/cpu-minimum1.args | 1 - tests/qemuxml2argvdata/cpu-minimum2.args | 1 - tests/qemuxml2argvdata/cpu-numa-disjoint.args | 1 - tests/qemuxml2argvdata/cpu-numa-memshared.args | 1 - .../cpu-numa-no-memory-element.args | 1 - tests/qemuxml2argvdata/cpu-numa1.args | 1 - tests/qemuxml2argvdata/cpu-numa2.args | 1 - tests/qemuxml2argvdata/cpu-s390-features.args | 3 +- tests/qemuxml2argvdata/cpu-s390-zEC12.args | 3 +- tests/qemuxml2argvdata/cpu-strict1.args | 1 - tests/qemuxml2argvdata/cpu-topology1.args | 1 - tests/qemuxml2argvdata/cpu-topology2.args | 1 - tests/qemuxml2argvdata/cpu-topology3.args | 1 - tests/qemuxml2argvdata/cpu-tsc-frequency.args | 1 - tests/qemuxml2argvdata/cputune-numatune.args | 1 - tests/qemuxml2argvdata/cputune-zero-shares.args | 4 +- tests/qemuxml2argvdata/cputune.args | 4 +- tests/qemuxml2argvdata/debug-threads.args | 4 +- tests/qemuxml2argvdata/default-kvm-host-arch.args | 1 - tests/qemuxml2argvdata/default-qemu-host-arch.args | 1 - tests/qemuxml2argvdata/disk-aio.args | 4 +- tests/qemuxml2argvdata/disk-blockio.args | 3 +- tests/qemuxml2argvdata/disk-boot-cdrom.args | 4 +- tests/qemuxml2argvdata/disk-boot-disk.args | 4 +- tests/qemuxml2argvdata/disk-cache.args | 4 +- tests/qemuxml2argvdata/disk-cdrom-network.args | 4 +- tests/qemuxml2argvdata/disk-cdrom-tray.args | 7 +- tests/qemuxml2argvdata/disk-cdrom.args | 4 +- tests/qemuxml2argvdata/disk-copy_on_read.args | 7 +- tests/qemuxml2argvdata/disk-detect-zeroes.args | 7 +- tests/qemuxml2argvdata/disk-discard.args | 7 +- tests/qemuxml2argvdata/disk-error-policy.args | 4 +- .../disk-floppy-q35-2_11.x86_64-latest.args | 35 ++++ tests/qemuxml2argvdata/disk-floppy-q35-2_11.xml | 38 ++++ .../disk-floppy-q35-2_9.x86_64-latest.args | 35 ++++ tests/qemuxml2argvdata/disk-floppy-q35-2_9.xml | 38 ++++ tests/qemuxml2argvdata/disk-floppy-tray.args | 6 +- tests/qemuxml2argvdata/disk-floppy.args | 6 +- .../disk-floppy.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-fmt-qcow.args | 4 +- tests/qemuxml2argvdata/disk-geometry.args | 5 +- .../disk-hostdev-scsi-virtio-iscsi-auth-AES.args | 3 +- tests/qemuxml2argvdata/disk-ide-split.args | 3 +- tests/qemuxml2argvdata/disk-ide-wwn.args | 3 +- tests/qemuxml2argvdata/disk-ioeventfd.args | 7 +- tests/qemuxml2argvdata/disk-iscsi.args | 4 +- tests/qemuxml2argvdata/disk-network-gluster.args | 3 +- .../disk-network-iscsi-modern.args | 3 +- tests/qemuxml2argvdata/disk-network-iscsi.args | 3 +- tests/qemuxml2argvdata/disk-network-nbd.args | 3 +- tests/qemuxml2argvdata/disk-network-sheepdog.args | 4 +- .../qemuxml2argvdata/disk-network-source-auth.args | 3 +- tests/qemuxml2argvdata/disk-network-tlsx509.args | 3 +- tests/qemuxml2argvdata/disk-network-vxhs.args | 3 +- tests/qemuxml2argvdata/disk-order.args | 4 +- tests/qemuxml2argvdata/disk-readonly-disk.args | 4 +- tests/qemuxml2argvdata/disk-sata-device.args | 3 +- tests/qemuxml2argvdata/disk-scsi-device-auto.args | 4 +- tests/qemuxml2argvdata/disk-scsi-device.args | 4 +- tests/qemuxml2argvdata/disk-scsi-disk-split.args | 3 +- tests/qemuxml2argvdata/disk-scsi-disk-vpd.args | 3 +- tests/qemuxml2argvdata/disk-scsi-disk-wwn.args | 3 +- .../disk-scsi-lun-passthrough.args | 3 +- tests/qemuxml2argvdata/disk-scsi-megasas.args | 4 +- tests/qemuxml2argvdata/disk-scsi-mptsas1068.args | 4 +- tests/qemuxml2argvdata/disk-scsi-virtio-scsi.args | 4 +- tests/qemuxml2argvdata/disk-scsi-vscsi.args | 4 +- tests/qemuxml2argvdata/disk-serial.args | 3 +- tests/qemuxml2argvdata/disk-shared-locking.args | 3 +- tests/qemuxml2argvdata/disk-shared.args | 3 +- tests/qemuxml2argvdata/disk-snapshot.args | 4 +- tests/qemuxml2argvdata/disk-source-pool-mode.args | 4 +- tests/qemuxml2argvdata/disk-source-pool.args | 4 +- .../disk-usb-device-removable.args | 4 +- tests/qemuxml2argvdata/disk-usb-device.args | 4 +- tests/qemuxml2argvdata/disk-virtio-ccw-many.args | 4 +- tests/qemuxml2argvdata/disk-virtio-ccw.args | 3 +- tests/qemuxml2argvdata/disk-virtio-queues.args | 3 +- tests/qemuxml2argvdata/disk-virtio-s390.args | 3 +- tests/qemuxml2argvdata/disk-virtio-scsi-ccw.args | 3 +- .../disk-virtio-scsi-cmd_per_lun.args | 3 +- .../disk-virtio-scsi-ioeventfd.args | 3 +- .../disk-virtio-scsi-max_sectors.args | 3 +- .../disk-virtio-scsi-num_queues.args | 3 +- tests/qemuxml2argvdata/disk-virtio.args | 4 +- tests/qemuxml2argvdata/encrypted-disk-usage.args | 3 +- tests/qemuxml2argvdata/encrypted-disk.args | 3 +- tests/qemuxml2argvdata/eoi-disabled.args | 1 - tests/qemuxml2argvdata/eoi-enabled.args | 1 - tests/qemuxml2argvdata/event_idx.args | 7 +- .../fd-memory-no-numa-topology.args | 1 - .../qemuxml2argvdata/fd-memory-numa-topology.args | 1 - .../qemuxml2argvdata/fd-memory-numa-topology2.args | 1 - .../qemuxml2argvdata/fd-memory-numa-topology3.args | 1 - tests/qemuxml2argvdata/fips-enabled.args | 4 +- tests/qemuxml2argvdata/floppy-drive-fat.args | 2 +- tests/qemuxml2argvdata/fs9p-ccw.args | 3 +- tests/qemuxml2argvdata/fs9p.args | 4 +- tests/qemuxml2argvdata/graphics-egl-headless.args | 4 +- .../qemuxml2argvdata/graphics-sdl-fullscreen.args | 4 +- tests/qemuxml2argvdata/graphics-sdl.args | 4 +- .../graphics-spice-agent-file-xfer.args | 4 +- .../graphics-spice-agentmouse.args | 4 +- .../graphics-spice-auto-socket-cfg.args | 1 - .../graphics-spice-auto-socket.args | 1 - .../graphics-spice-compression.args | 4 +- .../graphics-spice-egl-headless.args | 4 +- tests/qemuxml2argvdata/graphics-spice-no-args.args | 1 - tests/qemuxml2argvdata/graphics-spice-qxl-vga.args | 4 +- tests/qemuxml2argvdata/graphics-spice-sasl.args | 4 +- tests/qemuxml2argvdata/graphics-spice-socket.args | 1 - tests/qemuxml2argvdata/graphics-spice-timeout.args | 7 +- .../qemuxml2argvdata/graphics-spice-usb-redir.args | 1 - tests/qemuxml2argvdata/graphics-spice.args | 4 +- .../graphics-vnc-auto-socket-cfg.args | 4 +- .../qemuxml2argvdata/graphics-vnc-auto-socket.args | 1 - .../graphics-vnc-egl-headless.args | 4 +- .../graphics-vnc-no-listen-attr.args | 4 +- tests/qemuxml2argvdata/graphics-vnc-none.args | 1 - tests/qemuxml2argvdata/graphics-vnc-policy.args | 4 +- .../graphics-vnc-remove-generated-socket.args | 4 +- tests/qemuxml2argvdata/graphics-vnc-sasl.args | 4 +- .../graphics-vnc-socket-new-cmdline.args | 1 - tests/qemuxml2argvdata/graphics-vnc-socket.args | 1 - tests/qemuxml2argvdata/graphics-vnc-tls.args | 1 - tests/qemuxml2argvdata/graphics-vnc-websocket.args | 1 - tests/qemuxml2argvdata/graphics-vnc.args | 4 +- .../qemuxml2argvdata/hostdev-mdev-precreated.args | 4 +- .../hostdev-pci-address-device.args | 4 +- tests/qemuxml2argvdata/hostdev-pci-address.args | 4 +- .../hostdev-scsi-lsi-iscsi-auth.args | 4 +- tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.args | 4 +- tests/qemuxml2argvdata/hostdev-scsi-lsi.args | 4 +- tests/qemuxml2argvdata/hostdev-scsi-readonly.args | 4 +- .../hostdev-scsi-vhost-scsi-ccw.args | 3 +- .../hostdev-scsi-vhost-scsi-pci.args | 4 +- .../hostdev-scsi-vhost-scsi-pcie.args | 1 - .../hostdev-scsi-virtio-iscsi-auth.args | 4 +- .../hostdev-scsi-virtio-iscsi.args | 4 +- .../qemuxml2argvdata/hostdev-scsi-virtio-scsi.args | 4 +- .../hostdev-subsys-mdev-vfio-ccw.args | 1 - .../hostdev-usb-address-device.args | 4 +- tests/qemuxml2argvdata/hostdev-usb-address.args | 4 +- .../qemuxml2argvdata/hostdev-vfio-multidomain.args | 4 +- tests/qemuxml2argvdata/hostdev-vfio.args | 4 +- tests/qemuxml2argvdata/hotplug-base.args | 1 - tests/qemuxml2argvdata/hugepages-memaccess.args | 4 +- tests/qemuxml2argvdata/hugepages-memaccess2.args | 4 +- tests/qemuxml2argvdata/hugepages-numa.args | 3 +- tests/qemuxml2argvdata/hugepages-pages.args | 4 +- tests/qemuxml2argvdata/hugepages-pages2.args | 4 +- tests/qemuxml2argvdata/hugepages-pages3.args | 4 +- tests/qemuxml2argvdata/hugepages-pages5.args | 4 +- tests/qemuxml2argvdata/hugepages-pages6.args | 4 +- tests/qemuxml2argvdata/hugepages-pages7.args | 3 +- tests/qemuxml2argvdata/hugepages-shared.args | 4 +- tests/qemuxml2argvdata/hugepages.args | 4 +- tests/qemuxml2argvdata/hyperv-off.args | 1 - tests/qemuxml2argvdata/hyperv-panic.args | 1 - tests/qemuxml2argvdata/hyperv.args | 1 - tests/qemuxml2argvdata/input-usbmouse-addr.args | 4 +- tests/qemuxml2argvdata/input-usbmouse.args | 4 +- tests/qemuxml2argvdata/input-usbtablet.args | 4 +- tests/qemuxml2argvdata/input-virtio-ccw.args | 3 +- .../qemuxml2argvdata/intel-iommu-caching-mode.args | 1 - .../qemuxml2argvdata/intel-iommu-device-iotlb.args | 1 - tests/qemuxml2argvdata/intel-iommu-eim.args | 1 - tests/qemuxml2argvdata/intel-iommu-machine.args | 3 +- tests/qemuxml2argvdata/intel-iommu.args | 1 - .../iothreads-disk-virtio-ccw.args | 3 +- tests/qemuxml2argvdata/iothreads-disk.args | 4 +- tests/qemuxml2argvdata/iothreads-ids-partial.args | 4 +- tests/qemuxml2argvdata/iothreads-ids.args | 4 +- .../iothreads-virtio-scsi-ccw.args | 3 +- .../iothreads-virtio-scsi-pci.args | 4 +- tests/qemuxml2argvdata/iothreads.args | 4 +- tests/qemuxml2argvdata/kvm-features-off.args | 1 - tests/qemuxml2argvdata/kvm-features.args | 1 - tests/qemuxml2argvdata/kvm-pit-delay.args | 4 +- tests/qemuxml2argvdata/kvm-pit-discard.args | 4 +- tests/qemuxml2argvdata/kvmclock+eoi-disabled.args | 1 - tests/qemuxml2argvdata/kvmclock.args | 1 - tests/qemuxml2argvdata/launch-security-sev.args | 4 +- .../qemuxml2argvdata/luks-disks-source-qcow2.args | 3 +- tests/qemuxml2argvdata/luks-disks-source.args | 3 +- tests/qemuxml2argvdata/luks-disks.args | 3 +- .../qemuxml2argvdata/mach-virt-console-virtio.args | 1 - .../qemuxml2argvdata/mach-virt-serial-native.args | 1 - tests/qemuxml2argvdata/mach-virt-serial-pci.args | 1 - tests/qemuxml2argvdata/mach-virt-serial-usb.args | 1 - .../machine-aeskeywrap-off-cap.args | 3 +- .../machine-aeskeywrap-off-caps.args | 3 +- .../machine-aeskeywrap-on-cap.args | 3 +- .../machine-aeskeywrap-on-caps.args | 3 +- tests/qemuxml2argvdata/machine-aliases1.args | 4 +- tests/qemuxml2argvdata/machine-aliases2.args | 4 +- tests/qemuxml2argvdata/machine-core-off.args | 4 +- tests/qemuxml2argvdata/machine-core-on.args | 4 +- .../machine-deakeywrap-off-cap.args | 3 +- .../machine-deakeywrap-off-caps.args | 3 +- .../machine-deakeywrap-on-cap.args | 3 +- .../machine-deakeywrap-on-caps.args | 3 +- .../machine-keywrap-none-caps.args | 3 +- tests/qemuxml2argvdata/machine-keywrap-none.args | 3 +- tests/qemuxml2argvdata/machine-smm-opt.args | 3 +- tests/qemuxml2argvdata/machine-vmport-opt.args | 4 +- tests/qemuxml2argvdata/master-key.args | 4 +- .../qemuxml2argvdata/memory-hotplug-dimm-addr.args | 4 +- tests/qemuxml2argvdata/memory-hotplug-dimm.args | 4 +- .../memory-hotplug-nvdimm-access.args | 4 +- .../memory-hotplug-nvdimm-label.args | 4 +- tests/qemuxml2argvdata/memory-hotplug-nvdimm.args | 4 +- .../memory-hotplug-ppc64-nonuma.args | 1 - tests/qemuxml2argvdata/memory-hotplug.args | 4 +- tests/qemuxml2argvdata/memtune-unlimited.args | 4 +- tests/qemuxml2argvdata/memtune.args | 4 +- tests/qemuxml2argvdata/migrate-numa-unaligned.args | 1 - tests/qemuxml2argvdata/migrate.args | 4 +- tests/qemuxml2argvdata/minimal-msg-timestamp.args | 4 +- tests/qemuxml2argvdata/minimal-sandbox.args | 4 +- tests/qemuxml2argvdata/minimal.args | 4 +- tests/qemuxml2argvdata/misc-acpi.args | 4 +- tests/qemuxml2argvdata/misc-disable-s3.args | 4 +- tests/qemuxml2argvdata/misc-disable-suspends.args | 4 +- tests/qemuxml2argvdata/misc-enable-s4.args | 4 +- tests/qemuxml2argvdata/misc-no-reboot.args | 4 +- tests/qemuxml2argvdata/misc-uuid.args | 4 +- tests/qemuxml2argvdata/mlock-off.args | 1 - tests/qemuxml2argvdata/mlock-on.args | 1 - tests/qemuxml2argvdata/mlock-unsupported.args | 1 - tests/qemuxml2argvdata/monitor-json.args | 4 +- .../qemuxml2argvdata/multifunction-pci-device.args | 4 +- tests/qemuxml2argvdata/name-escape.args | 4 +- tests/qemuxml2argvdata/net-client.args | 4 +- tests/qemuxml2argvdata/net-eth-hostip.args | 4 +- tests/qemuxml2argvdata/net-eth-ifname.args | 4 +- tests/qemuxml2argvdata/net-eth-names.args | 4 +- tests/qemuxml2argvdata/net-eth.args | 4 +- .../qemuxml2argvdata/net-hostdev-multidomain.args | 4 +- .../net-hostdev-vfio-multidomain.args | 4 +- tests/qemuxml2argvdata/net-hostdev-vfio.args | 4 +- tests/qemuxml2argvdata/net-hostdev.args | 4 +- tests/qemuxml2argvdata/net-mcast.args | 4 +- tests/qemuxml2argvdata/net-server.args | 4 +- tests/qemuxml2argvdata/net-udp.args | 4 +- tests/qemuxml2argvdata/net-user-addr.args | 4 +- tests/qemuxml2argvdata/net-user.args | 4 +- tests/qemuxml2argvdata/net-vhostuser-multiq.args | 4 +- tests/qemuxml2argvdata/net-vhostuser.args | 4 +- tests/qemuxml2argvdata/net-virtio-ccw.args | 1 - tests/qemuxml2argvdata/net-virtio-device.args | 4 +- .../net-virtio-disable-offloads.args | 4 +- tests/qemuxml2argvdata/net-virtio-netdev.args | 4 +- .../qemuxml2argvdata/net-virtio-rxtxqueuesize.args | 4 +- tests/qemuxml2argvdata/net-virtio-s390.args | 1 - tests/qemuxml2argvdata/net-virtio.args | 4 +- tests/qemuxml2argvdata/nosharepages.args | 4 +- .../numad-auto-memory-vcpu-cpuset.args | 4 +- ...d-auto-memory-vcpu-no-cpuset-and-placement.args | 4 +- .../numad-auto-vcpu-static-numatune.args | 4 +- .../numad-static-memory-auto-vcpu.args | 4 +- tests/qemuxml2argvdata/numad.args | 4 +- .../numatune-auto-nodeset-invalid.args | 4 +- tests/qemuxml2argvdata/numatune-auto-prefer.args | 1 - tests/qemuxml2argvdata/numatune-distances.args | 1 - .../numatune-memnode-no-memory.args | 1 - tests/qemuxml2argvdata/numatune-memnode.args | 1 - tests/qemuxml2argvdata/numatune-memory.args | 4 +- tests/qemuxml2argvdata/panic-double.args | 1 - tests/qemuxml2argvdata/panic-no-address.args | 4 +- tests/qemuxml2argvdata/panic.args | 4 +- .../qemuxml2argvdata/parallel-parport-chardev.args | 4 +- tests/qemuxml2argvdata/parallel-tcp-chardev.args | 4 +- tests/qemuxml2argvdata/pci-autoadd-addr.args | 1 - tests/qemuxml2argvdata/pci-autoadd-idx.args | 1 - tests/qemuxml2argvdata/pci-autofill-addr.args | 1 - tests/qemuxml2argvdata/pci-bridge-many-disks.args | 3 +- tests/qemuxml2argvdata/pci-bridge.args | 1 - tests/qemuxml2argvdata/pci-expander-bus.args | 1 - tests/qemuxml2argvdata/pci-many.args | 3 +- tests/qemuxml2argvdata/pci-rom-disabled.args | 1 - tests/qemuxml2argvdata/pci-rom.args | 4 +- tests/qemuxml2argvdata/pci-serial-dev-chardev.args | 4 +- tests/qemuxml2argvdata/pcie-expander-bus.args | 3 +- .../pcie-root-port-model-generic.args | 1 - .../pcie-root-port-model-ioh3420.args | 1 - tests/qemuxml2argvdata/pcie-root-port.args | 3 +- tests/qemuxml2argvdata/pcie-root.args | 3 +- .../pcie-switch-downstream-port.args | 3 +- .../pcie-switch-upstream-port.args | 3 +- tests/qemuxml2argvdata/pcihole64-q35.args | 3 +- tests/qemuxml2argvdata/pcihole64.args | 1 - tests/qemuxml2argvdata/pmu-feature-off.args | 1 - tests/qemuxml2argvdata/pmu-feature.args | 1 - tests/qemuxml2argvdata/ppc-dtb.args | 1 - .../ppc64-usb-controller-legacy.args | 1 - .../ppc64-usb-controller-qemu-xhci.args | 1 - tests/qemuxml2argvdata/ppc64-usb-controller.args | 1 - tests/qemuxml2argvdata/ppce500-serial.args | 1 - tests/qemuxml2argvdata/pseries-basic.args | 1 - tests/qemuxml2argvdata/pseries-console-virtio.args | 1 - .../pseries-cpu-compat-power9.args | 1 - tests/qemuxml2argvdata/pseries-cpu-compat.args | 1 - tests/qemuxml2argvdata/pseries-cpu-exact.args | 1 - tests/qemuxml2argvdata/pseries-cpu-le.args | 1 - tests/qemuxml2argvdata/pseries-features.args | 3 +- tests/qemuxml2argvdata/pseries-hostdevs-1.args | 1 - tests/qemuxml2argvdata/pseries-hostdevs-2.args | 1 - tests/qemuxml2argvdata/pseries-hostdevs-3.args | 1 - .../pseries-machine-max-cpu-compat.args | 3 +- tests/qemuxml2argvdata/pseries-many-buses-1.args | 1 - tests/qemuxml2argvdata/pseries-many-buses-2.args | 1 - tests/qemuxml2argvdata/pseries-many-devices.args | 1 - tests/qemuxml2argvdata/pseries-nvram.args | 1 - tests/qemuxml2argvdata/pseries-panic-missing.args | 1 - .../qemuxml2argvdata/pseries-panic-no-address.args | 1 - .../pseries-phb-default-missing.args | 1 - tests/qemuxml2argvdata/pseries-phb-numa-node.args | 1 - tests/qemuxml2argvdata/pseries-phb-simple.args | 1 - tests/qemuxml2argvdata/pseries-serial-native.args | 1 - tests/qemuxml2argvdata/pseries-serial-pci.args | 1 - tests/qemuxml2argvdata/pseries-serial-usb.args | 1 - tests/qemuxml2argvdata/pseries-usb-default.args | 1 - tests/qemuxml2argvdata/pseries-usb-kbd.args | 1 - tests/qemuxml2argvdata/pseries-usb-multi.args | 1 - .../pseries-vio-user-assigned.args | 3 +- tests/qemuxml2argvdata/pseries-vio.args | 3 +- tests/qemuxml2argvdata/pv-spinlock-disabled.args | 1 - tests/qemuxml2argvdata/pv-spinlock-enabled.args | 1 - tests/qemuxml2argvdata/q35-acpi-nouefi.args | 1 - tests/qemuxml2argvdata/q35-acpi-uefi.args | 3 +- .../qemuxml2argvdata/q35-default-devices-only.args | 1 - tests/qemuxml2argvdata/q35-multifunction.args | 1 - tests/qemuxml2argvdata/q35-noacpi-nouefi.args | 1 - tests/qemuxml2argvdata/q35-pci-force-address.args | 1 - tests/qemuxml2argvdata/q35-pcie-autoadd.args | 3 +- tests/qemuxml2argvdata/q35-pcie.args | 3 +- .../qemuxml2argvdata/q35-pm-disable-fallback.args | 1 - tests/qemuxml2argvdata/q35-pm-disable.args | 1 - tests/qemuxml2argvdata/q35-usb2-multi.args | 3 +- tests/qemuxml2argvdata/q35-usb2-reorder.args | 3 +- tests/qemuxml2argvdata/q35-usb2.args | 3 +- tests/qemuxml2argvdata/q35-virt-manager-basic.args | 3 +- tests/qemuxml2argvdata/q35-virtio-pci.args | 3 +- tests/qemuxml2argvdata/q35.args | 3 +- tests/qemuxml2argvdata/qemu-ns-alt.args | 4 +- .../qemuxml2argvdata/qemu-ns-commandline-ns0.args | 4 +- .../qemuxml2argvdata/qemu-ns-commandline-ns1.args | 4 +- tests/qemuxml2argvdata/qemu-ns-commandline.args | 4 +- .../qemu-ns-domain-commandline-ns0.args | 4 +- .../qemu-ns-domain-commandline.args | 4 +- tests/qemuxml2argvdata/qemu-ns-domain-ns0.args | 4 +- tests/qemuxml2argvdata/qemu-ns-no-env.args | 4 +- tests/qemuxml2argvdata/qemu-ns.args | 4 +- .../qemuxml2argvdata/reboot-timeout-disabled.args | 2 +- tests/qemuxml2argvdata/reboot-timeout-enabled.args | 2 +- tests/qemuxml2argvdata/restore-v2-fd.args | 4 +- tests/qemuxml2argvdata/restore-v2.args | 4 +- tests/qemuxml2argvdata/s390-panic-missing.args | 1 - tests/qemuxml2argvdata/s390-panic-no-address.args | 1 - tests/qemuxml2argvdata/s390-serial-2.args | 1 - tests/qemuxml2argvdata/s390-serial-console.args | 1 - tests/qemuxml2argvdata/s390-serial.args | 1 - tests/qemuxml2argvdata/seclabel-dac-none.args | 4 +- .../seclabel-dynamic-baselabel.args | 4 +- .../seclabel-dynamic-labelskip.args | 4 +- .../seclabel-dynamic-override.args | 4 +- .../qemuxml2argvdata/seclabel-dynamic-relabel.args | 4 +- tests/qemuxml2argvdata/seclabel-dynamic.args | 4 +- tests/qemuxml2argvdata/seclabel-none.args | 4 +- .../seclabel-static-labelskip.args | 4 +- .../qemuxml2argvdata/seclabel-static-relabel.args | 4 +- tests/qemuxml2argvdata/seclabel-static.args | 4 +- .../serial-dev-chardev-iobase.args | 4 +- tests/qemuxml2argvdata/serial-dev-chardev.args | 4 +- tests/qemuxml2argvdata/serial-file-chardev.args | 4 +- tests/qemuxml2argvdata/serial-file-log.args | 4 +- tests/qemuxml2argvdata/serial-many-chardev.args | 4 +- tests/qemuxml2argvdata/serial-pty-chardev.args | 4 +- .../qemuxml2argvdata/serial-spiceport-nospice.args | 4 +- tests/qemuxml2argvdata/serial-spiceport.args | 4 +- tests/qemuxml2argvdata/serial-tcp-chardev.args | 4 +- .../serial-tcp-telnet-chardev.args | 4 +- .../serial-tcp-tlsx509-chardev-notls.args | 4 +- .../serial-tcp-tlsx509-chardev-verify.args | 4 +- .../serial-tcp-tlsx509-chardev.args | 4 +- .../serial-tcp-tlsx509-secret-chardev.args | 4 +- tests/qemuxml2argvdata/serial-udp-chardev.args | 4 +- tests/qemuxml2argvdata/serial-unix-chardev.args | 1 - tests/qemuxml2argvdata/serial-vc-chardev.args | 4 +- tests/qemuxml2argvdata/shmem-plain-doorbell.args | 1 - tests/qemuxml2argvdata/shmem.args | 1 - tests/qemuxml2argvdata/smartcard-controller.args | 1 - .../smartcard-host-certificates-database.args | 1 - .../smartcard-host-certificates.args | 1 - tests/qemuxml2argvdata/smartcard-host.args | 1 - .../smartcard-passthrough-spicevmc.args | 1 - .../smartcard-passthrough-tcp.args | 1 - tests/qemuxml2argvdata/smbios.args | 4 +- tests/qemuxml2argvdata/smp.args | 4 +- tests/qemuxml2argvdata/sound-device.args | 4 +- tests/qemuxml2argvdata/sound.args | 4 +- tests/qemuxml2argvdata/tpm-passthrough-crb.args | 2 +- tests/qemuxml2argvdata/tpm-passthrough.args | 2 +- .../usb-controller-default-q35.args | 1 - .../usb-controller-explicit-q35.args | 1 - .../qemuxml2argvdata/usb-controller-qemu-xhci.args | 1 - tests/qemuxml2argvdata/usb-controller-xhci.args | 1 - tests/qemuxml2argvdata/usb-controller.args | 1 - tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args | 1 - tests/qemuxml2argvdata/usb-hub-autoadd.args | 1 - tests/qemuxml2argvdata/usb-hub.args | 1 - tests/qemuxml2argvdata/usb-ich9-autoassign.args | 1 - tests/qemuxml2argvdata/usb-ich9-companion.args | 1 - tests/qemuxml2argvdata/usb-ich9-ehci-addr.args | 1 - tests/qemuxml2argvdata/usb-long-port-path.args | 1 - tests/qemuxml2argvdata/usb-none.args | 1 - tests/qemuxml2argvdata/usb-piix3-controller.args | 1 - tests/qemuxml2argvdata/usb-port-autoassign.args | 1 - tests/qemuxml2argvdata/usb-port-missing.args | 1 - tests/qemuxml2argvdata/usb-ports.args | 1 - .../qemuxml2argvdata/usb-redir-filter-version.args | 1 - tests/qemuxml2argvdata/usb-redir-filter.args | 1 - tests/qemuxml2argvdata/usb-redir.args | 1 - tests/qemuxml2argvdata/usb-xhci-autoassign.args | 1 - tests/qemuxml2argvdata/usb1-usb2.args | 1 - tests/qemuxml2argvdata/user-aliases-usb.args | 1 - tests/qemuxml2argvdata/user-aliases.args | 8 +- tests/qemuxml2argvdata/vcpu-placement-static.args | 3 +- .../video-device-pciaddr-default.args | 4 +- tests/qemuxml2argvdata/video-none-device.args | 4 +- .../qemuxml2argvdata/video-qxl-device-vgamem.args | 4 +- tests/qemuxml2argvdata/video-qxl-device.args | 4 +- tests/qemuxml2argvdata/video-qxl-heads.args | 4 +- tests/qemuxml2argvdata/video-qxl-nodevice.args | 4 +- tests/qemuxml2argvdata/video-qxl-noheads.args | 4 +- .../video-qxl-sec-device-vgamem.args | 4 +- tests/qemuxml2argvdata/video-qxl-sec-device.args | 4 +- .../qemuxml2argvdata/video-vga-device-vgamem.args | 4 +- tests/qemuxml2argvdata/video-vga-device.args | 4 +- tests/qemuxml2argvdata/video-vga-nodevice.args | 4 +- tests/qemuxml2argvdata/video-vga-qxl-heads.args | 4 +- tests/qemuxml2argvdata/video-virtio-gpu-ccw.args | 3 +- .../qemuxml2argvdata/video-virtio-gpu-device.args | 4 +- .../qemuxml2argvdata/video-virtio-gpu-sdl-gl.args | 4 +- .../video-virtio-gpu-secondary.args | 1 - .../video-virtio-gpu-spice-gl.args | 4 +- tests/qemuxml2argvdata/video-virtio-gpu-virgl.args | 4 +- tests/qemuxml2argvdata/video-virtio-vga.args | 4 +- .../qemuxml2argvdata/virtio-input-passthrough.args | 1 - tests/qemuxml2argvdata/virtio-input.args | 1 - tests/qemuxml2argvdata/virtio-lun.args | 4 +- tests/qemuxml2argvdata/virtio-options.args | 3 +- tests/qemuxml2argvdata/virtio-rng-default.args | 1 - tests/qemuxml2argvdata/virtio-rng-egd.args | 1 - tests/qemuxml2argvdata/virtio-rng-multiple.args | 1 - tests/qemuxml2argvdata/virtio-rng-random.args | 1 - tests/qemuxml2argvdata/vmcoreinfo.args | 4 +- tests/qemuxml2argvdata/watchdog-device.args | 4 +- tests/qemuxml2argvdata/watchdog-dump.args | 4 +- tests/qemuxml2argvdata/watchdog-injectnmi.args | 4 +- tests/qemuxml2argvdata/watchdog.args | 4 +- tests/qemuxml2argvdata/x86-kvm-32-on-64.args | 3 +- tests/qemuxml2argvtest.c | 67 ++---- tests/qemuxml2xmltest.c | 5 +- 607 files changed, 935 insertions(+), 1176 deletions(-) create mode 100644 tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-floppy-q35-2_11.xml create mode 100644 tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-floppy-q35-2_9.xml -- 2.16.2

2 14

[libvirt] [PATCH] qemuxml2xmloutdata: Use more symlinks
by Michal Privoznik 09 Aug '18

09 Aug '18

There are couple of files that are the same in both qemuxml2argvdata and qemuxml2xmloutdata directories. Link them instead of having full copy. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tests/qemuxml2xmloutdata/boot-floppy-q35.xml | 33 +--------------- tests/qemuxml2xmloutdata/bootindex-floppy-q35.xml | 33 +--------------- tests/qemuxml2xmloutdata/disk-virtio-queues.xml | 35 +--------------- tests/qemuxml2xmloutdata/intel-iommu-machine.xml | 27 +------------ tests/qemuxml2xmloutdata/intel-iommu.xml | 27 +------------ tests/qemuxml2xmloutdata/luks-disks.xml | 46 +--------------------- tests/qemuxml2xmloutdata/vcpu-placement-static.xml | 34 +--------------- 7 files changed, 7 insertions(+), 228 deletions(-) mode change 100644 => 120000 tests/qemuxml2xmloutdata/boot-floppy-q35.xml mode change 100644 => 120000 tests/qemuxml2xmloutdata/bootindex-floppy-q35.xml mode change 100644 => 120000 tests/qemuxml2xmloutdata/disk-virtio-queues.xml mode change 100644 => 120000 tests/qemuxml2xmloutdata/intel-iommu-machine.xml mode change 100644 => 120000 tests/qemuxml2xmloutdata/intel-iommu.xml mode change 100644 => 120000 tests/qemuxml2xmloutdata/luks-disks.xml mode change 100644 => 120000 tests/qemuxml2xmloutdata/vcpu-placement-static.xml diff --git a/tests/qemuxml2xmloutdata/boot-floppy-q35.xml b/tests/qemuxml2xmloutdata/boot-floppy-q35.xml deleted file mode 100644 index af685d9c98..0000000000 --- a/tests/qemuxml2xmloutdata/boot-floppy-q35.xml +++ /dev/null @@ -1,32 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='x86_64' machine='pc-q35-2.4'>hvm</type> - <boot dev='fd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <disk type='file' device='floppy'> - <driver name='qemu' type='raw'/> - <source file='/tmp/firmware.img'/> - <target dev='fda' bus='fdc'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <controller type='sata' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/> - </controller> - <controller type='pci' index='0' model='pcie-root'/> - <controller type='fdc' index='0'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2xmloutdata/boot-floppy-q35.xml b/tests/qemuxml2xmloutdata/boot-floppy-q35.xml new file mode 120000 index 0000000000..2543835ffb --- /dev/null +++ b/tests/qemuxml2xmloutdata/boot-floppy-q35.xml @@ -0,0 +1 @@ +../qemuxml2argvdata/boot-floppy-q35.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/bootindex-floppy-q35.xml b/tests/qemuxml2xmloutdata/bootindex-floppy-q35.xml deleted file mode 100644 index af685d9c98..0000000000 --- a/tests/qemuxml2xmloutdata/bootindex-floppy-q35.xml +++ /dev/null @@ -1,32 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='x86_64' machine='pc-q35-2.4'>hvm</type> - <boot dev='fd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <disk type='file' device='floppy'> - <driver name='qemu' type='raw'/> - <source file='/tmp/firmware.img'/> - <target dev='fda' bus='fdc'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <controller type='sata' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/> - </controller> - <controller type='pci' index='0' model='pcie-root'/> - <controller type='fdc' index='0'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2xmloutdata/bootindex-floppy-q35.xml b/tests/qemuxml2xmloutdata/bootindex-floppy-q35.xml new file mode 120000 index 0000000000..0ab2dad20f --- /dev/null +++ b/tests/qemuxml2xmloutdata/bootindex-floppy-q35.xml @@ -0,0 +1 @@ +../qemuxml2argvdata/bootindex-floppy-q35.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/disk-virtio-queues.xml b/tests/qemuxml2xmloutdata/disk-virtio-queues.xml deleted file mode 100644 index 37885c6f9c..0000000000 --- a/tests/qemuxml2xmloutdata/disk-virtio-queues.xml +++ /dev/null @@ -1,34 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='file' device='disk'> - <driver name='qemu' type='raw' queues='4'/> - <source file='/tmp/data.img'/> - <target dev='vda' bus='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> - </disk> - <controller type='usb' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> - </controller> - <controller type='ide' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2xmloutdata/disk-virtio-queues.xml b/tests/qemuxml2xmloutdata/disk-virtio-queues.xml new file mode 120000 index 0000000000..d6773202b7 --- /dev/null +++ b/tests/qemuxml2xmloutdata/disk-virtio-queues.xml @@ -0,0 +1 @@ +../qemuxml2argvdata/disk-virtio-queues.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/intel-iommu-machine.xml b/tests/qemuxml2xmloutdata/intel-iommu-machine.xml deleted file mode 100644 index 0961e4288d..0000000000 --- a/tests/qemuxml2xmloutdata/intel-iommu-machine.xml +++ /dev/null @@ -1,26 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='x86_64' machine='q35'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <controller type='pci' index='0' model='pcie-root'/> - <controller type='sata' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/> - </controller> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='none'/> - <iommu model='intel'/> - </devices> -</domain> diff --git a/tests/qemuxml2xmloutdata/intel-iommu-machine.xml b/tests/qemuxml2xmloutdata/intel-iommu-machine.xml new file mode 120000 index 0000000000..dd29ce5ff0 --- /dev/null +++ b/tests/qemuxml2xmloutdata/intel-iommu-machine.xml @@ -0,0 +1 @@ +../qemuxml2argvdata/intel-iommu-machine.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/intel-iommu.xml b/tests/qemuxml2xmloutdata/intel-iommu.xml deleted file mode 100644 index 0961e4288d..0000000000 --- a/tests/qemuxml2xmloutdata/intel-iommu.xml +++ /dev/null @@ -1,26 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='x86_64' machine='q35'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <controller type='pci' index='0' model='pcie-root'/> - <controller type='sata' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/> - </controller> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='none'/> - <iommu model='intel'/> - </devices> -</domain> diff --git a/tests/qemuxml2xmloutdata/intel-iommu.xml b/tests/qemuxml2xmloutdata/intel-iommu.xml new file mode 120000 index 0000000000..97f38b1296 --- /dev/null +++ b/tests/qemuxml2xmloutdata/intel-iommu.xml @@ -0,0 +1 @@ +../qemuxml2argvdata/intel-iommu.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/luks-disks.xml b/tests/qemuxml2xmloutdata/luks-disks.xml deleted file mode 100644 index c84af442a6..0000000000 --- a/tests/qemuxml2xmloutdata/luks-disks.xml +++ /dev/null @@ -1,45 +0,0 @@ -<domain type='qemu'> - <name>encryptdisk</name> - <uuid>496898a6-e6ff-f7c8-5dc2-3cf410945ee9</uuid> - <memory unit='KiB'>1048576</memory> - <currentMemory unit='KiB'>524288</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='x86_64' machine='pc-i440fx-2.1'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <disk type='file' device='disk'> - <driver name='qemu' type='raw'/> - <source file='/storage/guest_disks/encryptdisk'/> - <target dev='vda' bus='virtio'/> - <encryption format='luks'> - <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/> - </encryption> - <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> - </disk> - <disk type='file' device='disk'> - <driver name='qemu' type='raw'/> - <source file='/storage/guest_disks/encryptdisk2'/> - <target dev='vdb' bus='virtio'/> - <encryption format='luks'> - <secret type='passphrase' usage='/storage/guest_disks/encryptdisk2'/> - </encryption> - <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> - </disk> - <controller type='usb' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='virtio'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> - </memballoon> - </devices> -</domain> diff --git a/tests/qemuxml2xmloutdata/luks-disks.xml b/tests/qemuxml2xmloutdata/luks-disks.xml new file mode 120000 index 0000000000..d65e470c32 --- /dev/null +++ b/tests/qemuxml2xmloutdata/luks-disks.xml @@ -0,0 +1 @@ +../qemuxml2argvdata/luks-disks.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/vcpu-placement-static.xml b/tests/qemuxml2xmloutdata/vcpu-placement-static.xml deleted file mode 100644 index a777f50f86..0000000000 --- a/tests/qemuxml2xmloutdata/vcpu-placement-static.xml +++ /dev/null @@ -1,33 +0,0 @@ -<domain type='kvm'> - <name>dummy2</name> - <uuid>4d92ec27-9ebf-400b-ae91-20c71c647c19</uuid> - <memory unit='KiB'>131072</memory> - <currentMemory unit='KiB'>65536</currentMemory> - <vcpu placement='static' current='2'>6</vcpu> - <iothreads>2</iothreads> - <cputune> - <emulatorpin cpuset='1-3'/> - <iothreadpin iothread='1' cpuset='2'/> - </cputune> - <numatune> - <memory mode='strict' placement='auto'/> - </numatune> - <os> - <type arch='x86_64' machine='pc-q35-2.3'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <controller type='sata' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/> - </controller> - <controller type='pci' index='0' model='pcie-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2xmloutdata/vcpu-placement-static.xml b/tests/qemuxml2xmloutdata/vcpu-placement-static.xml new file mode 120000 index 0000000000..9966cf47a7 --- /dev/null +++ b/tests/qemuxml2xmloutdata/vcpu-placement-static.xml @@ -0,0 +1 @@ +../qemuxml2argvdata/vcpu-placement-static.xml \ No newline at end of file -- 2.16.4

2 1

[libvirt] [PATCH] conf: rewrite filtering for capabilities lookup
by Daniel P. Berrangé 09 Aug '18

09 Aug '18

The virCapabilitiesDomainDataLookupInternal() is given a list of parameters representing the desired domain characteristics. It then has to look throught the capabilities to identify an acceptable match. The virCapsDomainDataCompare() method is used for filtering out candidates which don't match the desired criteria. It is called primarily from the innermost loops and as such is doing many repeated checks. For example if architcture and os type were checked at the top level loop the two inner loops could be avoided entirely. If emulator and domain type were checked in the 2nd level loop the 3rd level loop can be avoided too. This change thus removes the virCapsDomainDataCompare() method and puts suitable checks at the start of each loop to ensure it executes the minimal number of loop iterations possible. The code becomes clearer to understand as a nice side-effect. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/conf/capabilities.c | 100 ++++++++++++++++++---------------------- 1 file changed, 45 insertions(+), 55 deletions(-) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 0f96500294..cfd5132329 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -604,46 +604,6 @@ virCapabilitiesHostSecModelAddBaseLabel(virCapsHostSecModelPtr secmodel, return -1; } -static bool -virCapsDomainDataCompare(virCapsGuestPtr guest, - virCapsGuestDomainPtr domain, - virCapsGuestMachinePtr machine, - int ostype, - virArch arch, - virDomainVirtType domaintype, - const char *emulator, - const char *machinetype) -{ - const char *check_emulator = NULL; - - if (ostype != -1 && guest->ostype != ostype) - return false; - if ((arch != VIR_ARCH_NONE) && (guest->arch.id != arch)) - return false; - - if (domaintype != VIR_DOMAIN_VIRT_NONE && - (!domain || domain->type != domaintype)) - return false; - - if (emulator) { - if (domain) - check_emulator = domain->info.emulator; - if (!check_emulator) - check_emulator = guest->arch.defaultInfo.emulator; - if (STRNEQ_NULLABLE(check_emulator, emulator)) - return false; - } - - if (machinetype) { - if (!machine) - return false; - if (STRNEQ(machine->name, machinetype) && - (STRNEQ_NULLABLE(machine->canonical, machinetype))) - return false; - } - - return true; -} static virCapsDomainDataPtr virCapabilitiesDomainDataLookupInternal(virCapsPtr caps, @@ -659,13 +619,45 @@ virCapabilitiesDomainDataLookupInternal(virCapsPtr caps, virCapsDomainDataPtr ret = NULL; size_t i, j, k; + VIR_DEBUG("Lookup ostype=%d arch=%d domaintype=%d emulator=%s machine=%s", + ostype, arch, domaintype, NULLSTR(emulator), NULLSTR(machinetype)); for (i = 0; i < caps->nguests; i++) { virCapsGuestPtr guest = caps->guests[i]; + if (ostype != -1 && guest->ostype != ostype) { + VIR_DEBUG("Skip os type want=%d vs got=%d", ostype, guest->ostype); + continue; + } + VIR_DEBUG("Match os type %d", ostype); + + if ((arch != VIR_ARCH_NONE) && (guest->arch.id != arch)) { + VIR_DEBUG("Skip arch want=%d vs got=%d", arch, guest->arch.id); + continue; + } + VIR_DEBUG("Match arch %d", arch); + for (j = 0; j < guest->arch.ndomains; j++) { virCapsGuestDomainPtr domain = guest->arch.domains[j]; virCapsGuestMachinePtr *machinelist; int nmachines; + const char *check_emulator = NULL; + + if (domaintype != VIR_DOMAIN_VIRT_NONE && + (domain->type != domaintype)) { + VIR_DEBUG("Skip domain type want=%d vs got=%d", domaintype, domain->type); + continue; + } + VIR_DEBUG("Match domain type %d", domaintype); + + check_emulator = domain->info.emulator; + if (!check_emulator) + check_emulator = guest->arch.defaultInfo.emulator; + if (emulator && STRNEQ_NULLABLE(check_emulator, emulator)) { + VIR_DEBUG("Skip emulator got=%s vs want=%s", + emulator, NULLSTR(check_emulator)); + continue; + } + VIR_DEBUG("Match emulator %s", NULLSTR(emulator)); if (domain->info.nmachines) { nmachines = domain->info.nmachines; @@ -677,32 +669,29 @@ virCapabilitiesDomainDataLookupInternal(virCapsPtr caps, for (k = 0; k < nmachines; k++) { virCapsGuestMachinePtr machine = machinelist[k]; - if (!virCapsDomainDataCompare(guest, domain, machine, - ostype, arch, domaintype, - emulator, machinetype)) + + if (machinetype && + STRNEQ(machine->name, machinetype) && + STRNEQ_NULLABLE(machine->canonical, machinetype)) { + VIR_DEBUG("Skip machine type want=%s vs got=%s got=%s", + machinetype, machine->name, NULLSTR(machine->canonical)); continue; + } + VIR_DEBUG("Match machine type machine %s\n", NULLSTR(machinetype)); foundmachine = machine; break; } - if (!foundmachine) { - if (!virCapsDomainDataCompare(guest, domain, NULL, - ostype, arch, domaintype, - emulator, machinetype)) - continue; - } + if (!foundmachine && nmachines) + continue; founddomain = domain; break; } - if (!founddomain) { - if (!virCapsDomainDataCompare(guest, NULL, NULL, - ostype, arch, domaintype, - emulator, machinetype)) - continue; - } + if (!founddomain) + continue; foundguest = guest; break; @@ -731,6 +720,7 @@ virCapabilitiesDomainDataLookupInternal(virCapsPtr caps, goto error; } + VIR_DEBUG("No match %s", virBufferCurrentContent(&buf)); virReportError(VIR_ERR_INVALID_ARG, _("could not find capabilities for %s"), virBufferCurrentContent(&buf)); -- 2.17.1

2 2

[libvirt] [jenkins-ci PATCH] projects: Don't use ~/rpmbuild for osinfo-db
by Andrea Bolognani 09 Aug '18

09 Aug '18

Commit 15a19dbc0b73 made sure all explicit calls use the current directory instead of ~/rpmbuild as workspace, but osinfo-db wasn't affected by the change since its build recipe calls the custom 'make rpm' target and continued storing build artifacts in ~/rpmbuild. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- projects/osinfo-db.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/projects/osinfo-db.yaml b/projects/osinfo-db.yaml index 141a373..d154c98 100644 --- a/projects/osinfo-db.yaml +++ b/projects/osinfo-db.yaml @@ -19,7 +19,5 @@ parent_jobs: 'osinfo-db-master-check' machines: '{rpm_machines}' command: | - rm -f *.tar.{archive_format} - $MAKE osinfo-db.spec perl -i -p -e 's/BuildRequires: osinfo-db-tools.*//' osinfo-db.spec - $MAKE rpm + rpmbuild --clean --define "_topdir `pwd`/rpmbuild" --define "_sourcedir `pwd`" -ba osinfo-db.spec -- 2.17.1

2 1

[libvirt] [jenkins-ci PATCH] jobs: ensure rpmbuild purges $RPM-ROOT/BUILD/$PACKAGE
by Daniel P. Berrangé 09 Aug '18

09 Aug '18

When using 'rpmbuild --rebuild', $RPM-ROOT/BUILD/$PACKAGE is automatically deleted on completion, but when using 'rpmbuild --ta' it is not deleted. We need to pass --clean to get the desired behaviour. This was not a visible problem in the past because "git clean -fdx" would purge the directory, but since we use %autosetup now the directory will contain a git repo which causes "git clean" to skip deletion: $ su - jenkins $ cd libvirt-master $ git clean -fdx Skipping repository build/rpmbuild/BUILD/libvirt-4.7.0 Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- jobs/autotools.yaml | 2 +- jobs/perl-modulebuild.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jobs/autotools.yaml b/jobs/autotools.yaml index c1d0f27..f1ebf7b 100644 --- a/jobs/autotools.yaml +++ b/jobs/autotools.yaml @@ -172,7 +172,7 @@ sed -i -e 's/BuildRequires: pkgconfig(libvirt.*).*//' {name}.spec rm -f *.tar.{archive_format} $MAKE dist - rpmbuild --define "_topdir `pwd`/rpmbuild" -ta {name}-*.tar.{archive_format} + rpmbuild --clean --define "_topdir `pwd`/rpmbuild" -ta {name}-*.tar.{archive_format} publishers: - email: recipients: '{obj:spam}' diff --git a/jobs/perl-modulebuild.yaml b/jobs/perl-modulebuild.yaml index 934b216..3f3f537 100644 --- a/jobs/perl-modulebuild.yaml +++ b/jobs/perl-modulebuild.yaml @@ -126,7 +126,7 @@ sed -i -e 's/BuildRequires: *libvirt.*devel.*//' *.spec rm -f *.tar.{archive_format} perl Build dist - rpmbuild --define "_topdir `pwd`/rpmbuild" -ta *.tar.{archive_format} + rpmbuild --clean --define "_topdir `pwd`/rpmbuild" -ta *.tar.{archive_format} publishers: - email: recipients: '{obj:spam}' -- 2.17.1

2 1

[libvirt] [jenkins-ci PATCH 00/12] lcitool: Add 'build' action
by Andrea Bolognani 09 Aug '18

09 Aug '18

Also known as [secret feature redacted] :) This will be mostly useful for developers wanting to validate their changes locally before posting patches, but it will also allow CentOS CI maintainers to prime new guests before adding them to Jenkins, thus avoiding the usual dance of starting and cancelling several builds manually. We duplicate quite a bit of information to implement this: that's unfortunate, and I'll be looking into ways to get rid of such duplication down the line, but IMHO the feature is useful enough that it's better to have it out there in its current state rather than witholding it until a less verbose implementation has been figured out. Dependencies between projects are still missing, so if you want to build eg. libvirt-glib you'll have to take care of building libvirt first yourself or face a failure. The first few patches (1-5) tweak the Jenkins jobs and projects to bring them to a point where they can be translated into Ansible tasks almost verbatim; the remaining ones perform such translation and implement the necessary Python glue. Andrea Bolognani (12): projects: Add default machines for libvirt-dbus jobs: Rename git-url -> git_url jobs: Remove archive_format from defaults jobs: Move some parameters from jobs to defaults jobs: Declare empty values consistently guests: Add build jobs guests: Add build projects guests: Add build playbook lcitool: make playbook execution generic lcitool: Add 'build' action lcitool: Support building arbitrary branches lcitool: Document build action guests/README.markdown | 19 +++ guests/lcitool | 109 ++++++++++-------- .../build/jobs/autotools-build-job.yml | 15 +++ .../build/jobs/autotools-check-job.yml | 16 +++ .../build/jobs/autotools-rpm-job.yml | 17 +++ .../build/jobs/autotools-syntax-check-job.yml | 12 ++ guests/playbooks/build/jobs/defaults.yml | 33 ++++++ .../build/jobs/generic-build-job.yml | 11 ++ .../build/jobs/generic-check-job.yml | 11 ++ .../playbooks/build/jobs/generic-rpm-job.yml | 11 ++ .../build/jobs/generic-syntax-check-job.yml | 11 ++ guests/playbooks/build/jobs/go-build-job.yml | 11 ++ guests/playbooks/build/jobs/go-check-job.yml | 11 ++ .../build/jobs/perl-modulebuild-build-job.yml | 13 +++ .../build/jobs/perl-modulebuild-check-job.yml | 11 ++ .../build/jobs/perl-modulebuild-rpm-job.yml | 16 +++ guests/playbooks/build/jobs/prepare.yml | 19 +++ .../build/jobs/python-distutils-build-job.yml | 13 +++ .../build/jobs/python-distutils-check-job.yml | 11 ++ .../build/jobs/python-distutils-rpm-job.yml | 12 ++ guests/playbooks/build/main.yml | 16 +++ guests/playbooks/build/projects/libosinfo.yml | 36 ++++++ .../playbooks/build/projects/libvirt-cim.yml | 10 ++ .../playbooks/build/projects/libvirt-dbus.yml | 28 +++++ .../playbooks/build/projects/libvirt-glib.yml | 38 ++++++ .../build/projects/libvirt-go-xml.yml | 13 +++ .../playbooks/build/projects/libvirt-go.yml | 13 +++ .../playbooks/build/projects/libvirt-perl.yml | 19 +++ .../build/projects/libvirt-python.yml | 13 +++ .../build/projects/libvirt-sandbox.yml | 23 ++++ .../playbooks/build/projects/libvirt-tck.yml | 23 ++++ guests/playbooks/build/projects/libvirt.yml | 52 +++++++++ .../build/projects/osinfo-db-tools.yml | 36 ++++++ guests/playbooks/build/projects/osinfo-db.yml | 25 ++++ .../playbooks/build/projects/virt-manager.yml | 34 ++++++ .../playbooks/build/projects/virt-viewer.yml | 38 ++++++ jobs/autotools.yaml | 3 +- jobs/defaults.yaml | 8 +- jobs/generic.yaml | 3 +- jobs/go.yaml | 3 +- jobs/perl-modulebuild.yaml | 3 +- jobs/python-distutils.yaml | 3 +- projects/libosinfo.yaml | 3 +- projects/libvirt-cim.yaml | 3 +- projects/libvirt-dbus.yaml | 18 +-- projects/libvirt-glib.yaml | 3 +- projects/libvirt-go-xml.yaml | 3 +- projects/libvirt-go.yaml | 3 +- projects/libvirt-perl.yaml | 3 +- projects/libvirt-python.yaml | 3 +- projects/libvirt-sandbox.yaml | 3 +- projects/libvirt-tck.yaml | 3 +- projects/libvirt.yaml | 2 +- projects/osinfo-db-tools.yaml | 3 +- projects/osinfo-db.yaml | 2 +- projects/virt-manager.yaml | 3 +- projects/virt-viewer.yaml | 3 +- 57 files changed, 798 insertions(+), 82 deletions(-) create mode 100644 guests/playbooks/build/jobs/autotools-build-job.yml create mode 100644 guests/playbooks/build/jobs/autotools-check-job.yml create mode 100644 guests/playbooks/build/jobs/autotools-rpm-job.yml create mode 100644 guests/playbooks/build/jobs/autotools-syntax-check-job.yml create mode 100644 guests/playbooks/build/jobs/defaults.yml create mode 100644 guests/playbooks/build/jobs/generic-build-job.yml create mode 100644 guests/playbooks/build/jobs/generic-check-job.yml create mode 100644 guests/playbooks/build/jobs/generic-rpm-job.yml create mode 100644 guests/playbooks/build/jobs/generic-syntax-check-job.yml create mode 100644 guests/playbooks/build/jobs/go-build-job.yml create mode 100644 guests/playbooks/build/jobs/go-check-job.yml create mode 100644 guests/playbooks/build/jobs/perl-modulebuild-build-job.yml create mode 100644 guests/playbooks/build/jobs/perl-modulebuild-check-job.yml create mode 100644 guests/playbooks/build/jobs/perl-modulebuild-rpm-job.yml create mode 100644 guests/playbooks/build/jobs/prepare.yml create mode 100644 guests/playbooks/build/jobs/python-distutils-build-job.yml create mode 100644 guests/playbooks/build/jobs/python-distutils-check-job.yml create mode 100644 guests/playbooks/build/jobs/python-distutils-rpm-job.yml create mode 100644 guests/playbooks/build/main.yml create mode 100644 guests/playbooks/build/projects/libosinfo.yml create mode 100644 guests/playbooks/build/projects/libvirt-cim.yml create mode 100644 guests/playbooks/build/projects/libvirt-dbus.yml create mode 100644 guests/playbooks/build/projects/libvirt-glib.yml create mode 100644 guests/playbooks/build/projects/libvirt-go-xml.yml create mode 100644 guests/playbooks/build/projects/libvirt-go.yml create mode 100644 guests/playbooks/build/projects/libvirt-perl.yml create mode 100644 guests/playbooks/build/projects/libvirt-python.yml create mode 100644 guests/playbooks/build/projects/libvirt-sandbox.yml create mode 100644 guests/playbooks/build/projects/libvirt-tck.yml create mode 100644 guests/playbooks/build/projects/libvirt.yml create mode 100644 guests/playbooks/build/projects/osinfo-db-tools.yml create mode 100644 guests/playbooks/build/projects/osinfo-db.yml create mode 100644 guests/playbooks/build/projects/virt-manager.yml create mode 100644 guests/playbooks/build/projects/virt-viewer.yml -- 2.17.1

1 13

[libvirt] [PATCH libvirt-tck] Cleanup secret in disk encryption test
by Jim Fehlig 09 Aug '18

09 Aug '18

100-disk-encryption.t does not undefine the secret it defines for the test disk, causing subsequent runs of the test to fail not ok 1 - secret created Failed test 'secret created' at /usr/share/libvirt-tck/tests/qemu/100-disk-encryption.t line 65. died: Sys::Virt::Error (libvirt error code: 1, message: internal error: a secret with UUID 212c459b-b02c-41fc-8ae2-714cc31612c5 is already defined for use with /var/cache/libvirt-tck/300-disk-encryption/demo.qcow2 Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- scripts/qemu/100-disk-encryption.t | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/qemu/100-disk-encryption.t b/scripts/qemu/100-disk-encryption.t index 32e2adf..1a36650 100644 --- a/scripts/qemu/100-disk-encryption.t +++ b/scripts/qemu/100-disk-encryption.t @@ -118,3 +118,5 @@ $dom->undefine; ok_error(sub { $conn->get_domain_by_name("tck") }, "NO_DOMAIN error raised from missing domain", 42); } + +$secret->undefine; -- 2.18.0

2 1

[libvirt] [PATCH] storage: tweak error message when skipping file
by Daniel P. Berrangé 09 Aug '18

09 Aug '18

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/storage/storage_util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index 715d5c2f88..42a9b6abf0 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -3609,8 +3609,8 @@ virStorageBackendRefreshLocal(virStoragePoolObjPtr pool) int err; if (virStringHasControlChars(ent->d_name)) { - VIR_WARN("Ignoring file with control characters under '%s'", - def->target.path); + VIR_WARN("Ignoring file '%s' with control characters under '%s'", + ent->d_name, def->target.path); continue; } -- 2.17.1

2 1

[libvirt] [PATCH 0/9] iSCSI fixes and improvements
by Pavel Hrdina 08 Aug '18

08 Aug '18

Pavel Hrdina (9): docs: fix iscsi-direct XML example conf: properly translate iscsi-direct storage pool conf: rename and move virStoragePoolSourceInitiatorAttr util: introduce virStorageSourceInitiator functions conf: use virStorageSourceInitiator functions docs: move storage initiator def into storagecommon.rng conf: introduce initiator IQN support for domain disks tests: introduce qemu disk-network-iscsi-modern test cases qemu: add support for domain disk initiator IQN docs/formatdomain.html.in | 20 +++++ docs/schemas/domaincommon.rng | 3 + docs/schemas/storagecommon.rng | 11 +++ docs/schemas/storagepool.rng | 11 --- docs/storage.html.in | 6 +- src/conf/domain_conf.c | 71 +++++++++++++----- src/conf/storage_conf.c | 16 ++-- src/conf/storage_conf.h | 7 +- src/qemu/qemu_block.c | 2 + src/qemu/qemu_domain.c | 9 +++ src/util/virstoragefile.c | 39 ++++++++++ src/util/virstoragefile.h | 23 ++++++ .../disk-network-iscsi-modern.args | 58 ++++++++++++++ .../disk-network-iscsi-modern.xml | 75 +++++++++++++++++++ tests/qemuxml2argvtest.c | 4 + 15 files changed, 306 insertions(+), 49 deletions(-) create mode 100644 tests/qemuxml2argvdata/disk-network-iscsi-modern.args create mode 100644 tests/qemuxml2argvdata/disk-network-iscsi-modern.xml -- 2.17.1

3 19

[libvirt] [PATCH] qemu: ensure default machine types don't change if QEMU changes
by Daniel P. Berrangé 08 Aug '18

08 Aug '18

It is increasingly likely that some distro is going to change the default "x86" machine type in QEMU from "pc" to "q35". This will certainly break existing applications which write their XML on the assumption that it is using a "pc" machine by default. For example they'll lack a IDE CDROM and get PCIe instead of PCI which changes the topology radically. Libvirt promises to isolate applications from hypervisor changes that may cause incompatibilities, so we must ensure that we always use the "pc" machine type if it is available. Only use QEMU's own reported default machine type if "pc" does not exist. This issue is not x86-only, other arches are liable t change their default machine, while some arches don't report any default at all causing libvirt to pick the first machine in the list. Thus to guarantee stability to applications, declare a preferred default machine for all architectures we currently support with QEMU. Note this change assumes there will always be a "pc" alias as long as a versioned "pc-XXX" machine type exists. If QEMU were to ship a "pc-XXX" machine type but not provide the "pc" alias, it is too hard to decide which to default so. Versioned machine types are supposed to be considered opaque strings, so we can't apply any sensible ordering ourselves and QEMU isn't reporting the list of machines in any sensible ordering itself. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/qemu/qemu_capabilities.c | 79 ++++++++++++++++++++++++++++++++++-- 1 file changed, 76 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 0fb800589a..045e2bd489 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2233,6 +2233,61 @@ virQEMUCapsProbeQMPDevices(virQEMUCapsPtr qemuCaps, } +/* Historically QEMU x86 targets defaulted to 'pc' machine type but + * in future x86_64 might switch 'q35'. Such a change is considered + * an ABI break from libvirt's POV. Other QEMU targets may not declare + * a default macine at all, causing libvirt to use the first reported + * machinbe in the list. + * + * Here we record a preferred default machine for all arches, so + * that we're not vulnerable to changes in QEMU defaults or machine + * list ordering. + */ +static const char *preferredMachines[VIR_ARCH_LAST] = +{ + [VIR_ARCH_ALPHA] = "clipper", + [VIR_ARCH_ARMV6L] = NULL, /* No QEMU impl */ + [VIR_ARCH_ARMV7L] = "integratorcp", + [VIR_ARCH_ARMV7B] = "integratorcp", + + [VIR_ARCH_AARCH64] = "integratorcp", + [VIR_ARCH_CRIS] = "axis-dev88", + [VIR_ARCH_I686] = "pc", + [VIR_ARCH_ITANIUM] = NULL, /* doesn't exist in QEMU any more */ + [VIR_ARCH_LM32] = "lm32-evr", + + [VIR_ARCH_M68K] = "mcf5208evb", + [VIR_ARCH_MICROBLAZE] = "petalogix-s3adsp1800", + [VIR_ARCH_MICROBLAZEEL] = "petalogix-s3adsp1800", + [VIR_ARCH_MIPS] = "malta", + [VIR_ARCH_MIPSEL] = "malta", + + [VIR_ARCH_MIPS64] = "malta", + [VIR_ARCH_MIPS64EL] = "malta", + [VIR_ARCH_OR32] = "or1k-sim", + [VIR_ARCH_PARISC] = NULL, /* No QEMU impl */ + [VIR_ARCH_PARISC64] = NULL, /* No QEMU impl */ + + [VIR_ARCH_PPC] = "g3beige", + [VIR_ARCH_PPCLE] = "g3beige", + [VIR_ARCH_PPC64] = "pseries", + [VIR_ARCH_PPC64LE] = "pseries", + [VIR_ARCH_PPCEMB] = "bamboo", + + [VIR_ARCH_S390] = NULL, /* No QEMU impl*/ + [VIR_ARCH_S390X] = "s390-ccw-virtio", + [VIR_ARCH_SH4] = "shix", + [VIR_ARCH_SH4EB] = "shix", + [VIR_ARCH_SPARC] = "SS-5", + + [VIR_ARCH_SPARC64] = "sun4u", + [VIR_ARCH_UNICORE32] = "puv3", + [VIR_ARCH_X86_64] = "pc", + [VIR_ARCH_XTENSA] = "sim", + [VIR_ARCH_XTENSAEB] = "sim", + +}; + static int virQEMUCapsProbeQMPMachineTypes(virQEMUCapsPtr qemuCaps, qemuMonitorPtr mon) @@ -2241,7 +2296,9 @@ virQEMUCapsProbeQMPMachineTypes(virQEMUCapsPtr qemuCaps, int nmachines = 0; int ret = -1; size_t i; - size_t defIdx = 0; + ssize_t defIdx = -1; + ssize_t preferredIdx = -1; + const char *preferredMachine = preferredMachines[qemuCaps->arch]; if ((nmachines = qemuMonitorGetMachines(mon, &machines)) < 0) return -1; @@ -2263,12 +2320,28 @@ virQEMUCapsProbeQMPMachineTypes(virQEMUCapsPtr qemuCaps, mach->maxCpus = machines[i]->maxCpus; mach->hotplugCpus = machines[i]->hotplugCpus; + if (preferredMachine && + (STREQ_NULLABLE(mach->alias, preferredMachine) || + STREQ(mach->name, preferredMachine))) + preferredIdx = qemuCaps->nmachineTypes - 1; + if (machines[i]->isDefault) defIdx = qemuCaps->nmachineTypes - 1; } - if (defIdx) - virQEMUCapsSetDefaultMachine(qemuCaps, defIdx); + /* + * We'll prefer to use our own historical default machine + * to avoid mgmt apps seeing semantics changes when QEMU + * alters it defaults. + * + * Our preferred pmachine might have been compiled out of + * QEMU at build time though, so we still fallback to honouring + * QEMU's reported default in that case + */ + if (preferredIdx == -1) + preferredIdx = defIdx; + if (preferredIdx != -1) + virQEMUCapsSetDefaultMachine(qemuCaps, preferredIdx); ret = 0; -- 2.17.1

2 7

[libvirt] [PATCH v3] conf: virDomainDefValidateInternal prohibit some characters in shmem name
by Simon Kobyda 08 Aug '18

08 Aug '18

Validate that the provided XML shmem name is not directory specific "." or ".." names as well as ensuring that there is no path separator '/' in the name. https://bugzilla.redhat.com/show_bug.cgi?id=1192400 Signed-off-by: Simon Kobyda <skobyda(a)redhat.com> --- Changes in v3: - moved the functionality to virDomainDeviceDefValidateInternal - documented changes in docs/formatdomain.html.in docs/formatdomain.html.in | 4 +++- src/conf/domain_conf.c | 29 ++++++++++++++++++++++++++++- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index a3afe137bf..f18ca6fc64 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -8017,7 +8017,9 @@ qemu-kvm -net nic,model=? /dev/null <dt><code>shmem</code></dt> <dd> The <code>shmem</code> element has one mandatory attribute, - <code>name</code> to identify the shared memory. + <code>name</code> to identify the shared memory. This attribute cannot + be directory specific to <code>.</code> or <code>..</code> as well as + it cannot involve path separator <code>/</code>. </dd> <dt><code>model</code></dt> <dd> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 7ab2953d83..415c03c56f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5696,6 +5696,31 @@ virDomainVsockDefValidate(const virDomainVsockDef *vsock) } +static int +virDomainShmemDefValidate(const virDomainShmemDef *shmem) +{ + if (strchr(shmem->name, '/')) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("shmem name cannot include '/' character")); + return -1; + } + + if (STREQ(shmem->name, ".")) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("shmem name cannot be equal to '.'")); + return -1; + } + + if (STREQ(shmem->name, "..")) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("shmem name cannot be equal to '..'")); + return -1; + } + + return 0; +} + + static int virDomainDeviceDefValidateInternal(const virDomainDeviceDef *dev, const virDomainDef *def) @@ -5734,6 +5759,9 @@ virDomainDeviceDefValidateInternal(const virDomainDeviceDef *dev, case VIR_DOMAIN_DEVICE_VSOCK: return virDomainVsockDefValidate(dev->data.vsock); + case VIR_DOMAIN_DEVICE_SHMEM: + return virDomainShmemDefValidate(dev->data.shmem); + case VIR_DOMAIN_DEVICE_LEASE: case VIR_DOMAIN_DEVICE_FS: case VIR_DOMAIN_DEVICE_INPUT: @@ -5743,7 +5771,6 @@ virDomainDeviceDefValidateInternal(const virDomainDeviceDef *dev, case VIR_DOMAIN_DEVICE_HUB: case VIR_DOMAIN_DEVICE_MEMBALLOON: case VIR_DOMAIN_DEVICE_NVRAM: - case VIR_DOMAIN_DEVICE_SHMEM: case VIR_DOMAIN_DEVICE_TPM: case VIR_DOMAIN_DEVICE_PANIC: case VIR_DOMAIN_DEVICE_IOMMU: -- 2.17.1

2 1

[libvirt] [PATCH 0/2] Fix the non-linux platform build after recent VIR_AUTOPTR patches
by Erik Skultety 08 Aug '18

08 Aug '18

There were some complaints about an unused variable (patch 1) and unused static functions which are defined by the VIR_DEFINE_AUTOPTR_FUNC macro (patch 2). Successful Travis build: https://travis-ci.org/eskultety/libvirt/builds/413187470 MinGW wasn't affected by the recent VIR_AUTOPTR series: https://ci.centos.org/view/libvirt/job/libvirt-master-build-mingw64/330/ *NOT* pushing under the build breaker in case someone wants to have a look. Erik Skultety (2): util: virnetdevopenvswitch: Drop an unused variable @ovs_timeout Fix the build on non-linux platforms after VIR_AUTOPTR related changes src/util/virnetdev.c | 3 +-- src/util/virnetdevopenvswitch.c | 1 - src/util/virnetlink.c | 6 ++---- 3 files changed, 3 insertions(+), 7 deletions(-) -- 2.14.4

3 6

[libvirt] [PATCH v3 0/3] qemu: Support vhost-vsock-ccw
by Boris Fiuczynski 08 Aug '18

08 Aug '18

Support the vhost-vsock-ccw device on S390. Since v2 - instead of reusing CAPS_LATEST adding CAPS_ARCH_LATEST (Peter Krempa) Since v1 - adjusted vsock command line generation (Ján Tomko) - added CAPS_LATEST test coverage to s390 (Ján Tomko) - adjusted new vsock tests to use CAPS_LATEST Bjoern Walk (1): tests: qemuxml2argv: add CAPS_ARCH_LATEST macro Boris Fiuczynski (2): qemu: Add ccw support for vhost-vsock news: Update for vhost-vsock-ccw support docs/news.xml | 8 +++++ src/qemu/qemu_command.c | 8 +++-- src/qemu/qemu_domain.c | 10 ++++-- src/qemu/qemu_domain_address.c | 7 +++- .../vhost-vsock-ccw-auto.s390x-latest.args | 32 ++++++++++++++++++ .../qemuxml2argvdata/vhost-vsock-ccw-auto.xml | 25 ++++++++++++++ .../vhost-vsock-ccw.s390x-latest.args | 32 ++++++++++++++++++ tests/qemuxml2argvdata/vhost-vsock-ccw.xml | 32 ++++++++++++++++++ tests/qemuxml2argvtest.c | 33 ++++++++++++++----- .../vhost-vsock-ccw-auto.xml | 32 ++++++++++++++++++ tests/qemuxml2xmloutdata/vhost-vsock-ccw.xml | 1 + tests/qemuxml2xmltest.c | 5 +++ 12 files changed, 212 insertions(+), 13 deletions(-) create mode 100644 tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args create mode 100644 tests/qemuxml2argvdata/vhost-vsock-ccw-auto.xml create mode 100644 tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args create mode 100644 tests/qemuxml2argvdata/vhost-vsock-ccw.xml create mode 100644 tests/qemuxml2xmloutdata/vhost-vsock-ccw-auto.xml create mode 120000 tests/qemuxml2xmloutdata/vhost-vsock-ccw.xml -- 2.17.0

2 5

[libvirt] [PATCH v2 00/35] use GNU C's cleanup attribute in src/util (batch III)
by Sukrit Bhatnagar 08 Aug '18

08 Aug '18

This third series of patches also modifies a few files in src/util to use VIR_AUTOFREE and VIR_AUTOPTR for automatic freeing of memory and get rid of some VIR_FREE macro invocations and *Free function calls. Sukrit Bhatnagar (35): util: iscsi: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: iscsi: use VIR_AUTOPTR for aggregate types util: netlink: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: netlink: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: netlink: use VIR_AUTOPTR for aggregate types util: netdevbridge: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: netdevbridge: use VIR_AUTOPTR for aggregate types util: macaddr: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: netdev: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: netdev: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: netdev: use VIR_AUTOPTR for aggregate types util: socketaddr: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: socketaddr: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: socketaddr: use VIR_AUTOPTR for aggregate types util: netdevip: define virNetDevIPAddrFree for use with cleanup macros util: netdevip: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: netdevip: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: netdevip: use VIR_AUTOPTR for aggregate types util: netdevmacvlan: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: netdevmacvlan: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: netdevmacvlan: use VIR_AUTOPTR for aggregate types util: netdevopenvswitch: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: netdevopenvswitch: use VIR_AUTOPTR for aggregate types util: netdevtap: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: netdevveth: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: netdevveth: use VIR_AUTOPTR for aggregate types util: numa: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: numa: use VIR_AUTOPTR for aggregate types util: perf: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: perf: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: pidfile: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: process: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: process: use VIR_AUTOPTR for aggregate types util: qemu: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: qemu: use VIR_AUTOPTR for aggregate types src/util/viriscsi.c | 140 ++++------ src/util/virmacaddr.c | 6 + src/util/virmacaddr.h | 4 + src/util/virnetdev.c | 604 ++++++++++++++++------------------------ src/util/virnetdev.h | 4 + src/util/virnetdevbridge.c | 81 ++---- src/util/virnetdevip.c | 227 ++++++--------- src/util/virnetdevip.h | 5 + src/util/virnetdevmacvlan.c | 22 +- src/util/virnetdevopenvswitch.c | 98 +++---- src/util/virnetdevtap.c | 11 +- src/util/virnetdevveth.c | 32 +-- src/util/virnetlink.c | 118 ++++---- src/util/virnetlink.h | 5 + src/util/virnuma.c | 103 +++---- src/util/virperf.c | 20 +- src/util/virperf.h | 8 +- src/util/virpidfile.c | 186 ++++--------- src/util/virprocess.c | 58 ++-- src/util/virqemu.c | 31 +-- src/util/virsocketaddr.c | 113 ++++---- src/util/virsocketaddr.h | 9 +- 22 files changed, 730 insertions(+), 1155 deletions(-) -- 1.8.3.1

2 36

Re: [libvirt] [PATCH 0/3] sample: vfio mdev display devices.
by Alex Williamson 08 Aug '18

08 Aug '18

On Mon, 9 Apr 2018 12:35:10 +0200 Gerd Hoffmann <kraxel(a)redhat.com> wrote: > This little series adds three drivers, for demo-ing and testing vfio > display interface code. There is one mdev device for each interface > type (mdpy.ko for region and mbochs.ko for dmabuf). Erik Skultety brought up a good question today regarding how libvirt is meant to handle these different flavors of display interfaces and knowing whether a given mdev device has display support at all. It seems that we cannot simply use the default display=auto because libvirt needs to specifically configure gl support for a dmabuf type interface versus not having such a requirement for a region interface, perhaps even removing the emulated graphics in some cases (though I don't think we have boot graphics through either solution yet). Additionally, GVT-g seems to need the x-igd-opregion support enabled(?), which is a non-starter for libvirt as it's an experimental option! Currently the only way to determine display support is through the VFIO_DEVICE_QUERY_GFX_PLANE ioctl, but for libvirt to probe that on their own they'd need to get to the point where they could open the vfio device and perform the ioctl. That means opening a vfio container, adding the group, setting the iommu type, and getting the device. I was initially a bit appalled at asking libvirt to do that, but the alternative is to put this information in sysfs, but doing that we risk that we need to describe every nuance of the mdev device through sysfs and it becomes a dumping ground for every possible feature an mdev device might have. So I was ready to return and suggest that maybe libvirt should probe the device to know about these ancillary configuration details, but then I remembered that both mdev vGPU vendors had external dependencies to even allow probing the device. KVMGT will fail to open the device if it's not associated with an instance of KVM and NVIDIA vGPU, I believe, will fail if the vGPU manager process cannot find the QEMU instance to extract the VM UUID. (Both of these were bad ideas) Therefore, how can libvirt know if a given mdev device supports a display and which type of display it supports, and potentially which vendor specific options might be required to further enable that display (if they weren't experimental)? A terrible solution would be that libvirt hard codes that NVIDIA works with regions and Intel works with dmabufs, but even then there's a backwards and forwards compatibility problem, that libvirt needs to support older kernels and drivers where display support is not present and newer drivers where perhaps Intel is now doing regions and NVIDIA is supporting dmabuf, so it cannot simply be assumed based on the vendor. The only solution I see down that path would be identifying specific {vendor,type} pairs that support a predefined display type, but that's just absurd to think that vendors would rev their mdev types to expose this and that libvirt would keep a database mapping types to features. We also have the name and description attributes, but these are currently free form, so libvirt rightfully ignores them entirely. I don't know if we could create a defined feature string within those free form strings. Otherwise, it seems we have no choice but to dive into the pool of exposing such features via sysfs and we'll need to be vigilant of feature creep or vendor specific features (ex. we're not adding a feature to indicate an opregion requirement). How should we do this? Perhaps a bar we can set is that if a feature cannot be discovered through a standard vfio API, then it is not suitable for this sysfs API. Such things can be described via our existing mdev vendor specific attribute interface. We currently have this sysfs interface: mdev_supported_types/ |-- $VENDOR_TYPE | |-- available_instances | |-- create | |-- description | |-- device_api | |-- devices | `-- name ioctls for vfio devices which only provide information include: VFIO_DEVICE_GET_INFO VFIO_DEVICE_GET_REGION_INFO VFIO_DEVICE_GET_IRQ_INFO VFIO_DEVICE_GET_PCI_HOT_RESET_INFO VFIO_DEVICE_QUERY_GFX_PLANE We don't need to support all of these initially, but here's a starting idea for what this may look like in sysfs: $VENDOR_TYPE/ |-- available_instances |-- create |-- description |-- device_api |-- devices |-- name `-- vfio-pci `-- device |-- gfx_plane | |-- dmabuf | `-- region |-- irqs | |-- 0 | | |-- count | | `-- flags | `-- 1 | |-- count | `-- flags `-- regions |-- 0 | |-- flags | |-- offset | `-- size `-- 3 |-- flags |-- offset `-- size The existing device_api file reports "vfio-pci", so we base the device API info in a directory named vfio-pci. We're specifically exposing device information, so we have a device directory. We have a GFX_PLANE query ioctl, so we have a gfx_plane sub-directory. I imagine the dmabuf and region files here expose either Y/N or 1/0. I continue on the example with how we might expose irqs and regions, but even with regions we can bury down into how is sparse mmap exposed, how are device specific regions described, etc. Filling this in to completion without a specific userspace need to expose the information is just an exercise in bloating the kernel. That almost begins to look reasonable, but then we can only expose this for mdev devices, what if we were to hack a back door into a directly assigned GPU that tracks the location of active display in the framebuffer and implement the GFX_PLANE interface for that? We have no sysfs representation for either the template or the actual device for anything other than mdev. This inconsistency with physically assigned devices has been one of my arguments against enhancing mdev sysfs. Thanks to anyone still reading this. Ideas how we might help libvirt fill this information void so that they can actually configure a VM with a display device? Thanks, Alex

11 31

[libvirt] [PATCH] qemu: ensure "pc" machine is always used as default if available
by Daniel P. Berrangé 08 Aug '18

08 Aug '18

It is increasingly likely that some distro is going to change the default "x86" machine type in QEMU from "pc" to "q35". This will certainly break existing applications which write their XML on the assumption that its using a "pc" machine by default. For example they'll lack a IDE CDROM and get PCI-X instad of PCI which changes the topology radically. Libvirt promises to isolate applications from hypervisor changes that may cause incompatibilities, so we must ensure that we always use the "pc" machine type if it is available. Only use QEMU's own reported default machine type if "pc" does not exist. Note this change assumes there will always be a "pc" alias as long as a versioned "pc-XXX" machine type exists. If QEMU were to ship a "pc-XXX" machine type but not provide the "pc" alias, it is too hard to decide which to default so. Versioned machine types are supposed to be considered opaque strings, so we can't apply any sensible ordering ourselves and QEMU isn't reporting the list of machines in any sensible ordering itself. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/qemu/qemu_capabilities.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 0fb800589a..9eb58afef3 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2242,6 +2242,17 @@ virQEMUCapsProbeQMPMachineTypes(virQEMUCapsPtr qemuCaps, int ret = -1; size_t i; size_t defIdx = 0; + ssize_t preferredIdx = -1; + const char *preferredAlias = NULL; + + /* Historically QEMU defaulted to 'pc' machine type but in + * future might switch 'q35'. Such a change is considered + * an ABI break from lbivirt's POV, so we must be sure to + * keep 'pc' as default machine no matter what QEMU says. + */ + if (qemuCaps->arch == VIR_ARCH_X86_64 || + qemuCaps->arch == VIR_ARCH_I686) + preferredAlias = "pc"; if ((nmachines = qemuMonitorGetMachines(mon, &machines)) < 0) return -1; @@ -2263,12 +2274,16 @@ virQEMUCapsProbeQMPMachineTypes(virQEMUCapsPtr qemuCaps, mach->maxCpus = machines[i]->maxCpus; mach->hotplugCpus = machines[i]->hotplugCpus; + if (STREQ_NULLABLE(mach->alias, preferredAlias)) + preferredIdx = qemuCaps->nmachineTypes - 1; + if (machines[i]->isDefault) defIdx = qemuCaps->nmachineTypes - 1; } - if (defIdx) - virQEMUCapsSetDefaultMachine(qemuCaps, defIdx); + if (preferredIdx == -1) + preferredIdx = defIdx; + virQEMUCapsSetDefaultMachine(qemuCaps, preferredIdx); ret = 0; -- 2.17.1

4 12

[libvirt] [PATCH libvirt v2 0/9] Fix virConnectRegisterCloseCallback and get rid of global variables
by Marc Hartmayer 07 Aug '18

07 Aug '18

The first part of this patch series fixes the behavior of virConnectRegisterCloseCallback and converts the testDriver to virObjectLockable. The subsequent patches remove the need to have the global variables 'qemuProgram' and 'remoteProgram' in libvirtd.[ch]. They only work in combination with the fixed behavior of virConnectRegisterCloseCallback. Changelog: + v1->v2: - Removed accepted patches - Removed NACKed patches - Added r-b to patch 5 - Worked in comments - Rebased - Added patches 7-9 Marc Hartmayer (9): virConnectRegisterCloseCallback: Cleanup 'opaque' if there is no connectRegisterCloseCallback test: Convert testDriver to virObjectLockable remote: Add the information which program has to be used to daemonClientEventCallback remote: Use domainClientEventCallbacks for remoteReplayConnectionClosedEvent rpc: Introduce virNetServerGetProgramLocked helper function remote/rpc: Use virNetServerGetProgram() to determine the program rpc: use the return value of virObjectRef directly remote: remove ATTRIBUTE_UNUSED when attribute is actually used remote: shrink the critical sections src/libvirt-host.c | 10 +- src/libvirt_remote.syms | 1 + src/remote/remote_daemon.c | 4 +- src/remote/remote_daemon.h | 3 - src/remote/remote_daemon_dispatch.c | 264 +++++++++++++++++++++++------------- src/rpc/gendispatch.pl | 6 + src/rpc/virnetserver.c | 57 ++++++-- src/rpc/virnetserver.h | 2 + src/test/test_driver.c | 200 ++++++++++++--------------- 9 files changed, 328 insertions(+), 219 deletions(-) -- 2.13.4

4 34

[libvirt] [PATCH v1 00/32] use GNU C's cleanup attribute in src/util (batch III)
by Sukrit Bhatnagar 07 Aug '18

07 Aug '18

This third series of patches also modifies a few files in src/util to use VIR_AUTOFREE and VIR_AUTOPTR for automatic freeing of memory and get rid of some VIR_FREE macro invocations and *Free function calls. Sukrit Bhatnagar (32): util: iscsi: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: iscsi: use VIR_AUTOPTR for aggregate types util: netdevbridge: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: macaddr: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: netdev: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: netdev: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: netdev: use VIR_AUTOPTR for aggregate types util: socketaddr: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: socketaddr: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: socketaddr: use VIR_AUTOPTR for aggregate types util: netdevip: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: netdevip: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: netdevip: use VIR_AUTOPTR for aggregate types util: netdevmacvlan: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: netdevmacvlan: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: netdevmacvlan: use VIR_AUTOPTR for aggregate types util: netdevopenvswitch: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: netdevopenvswitch: use VIR_AUTOPTR for aggregate types util: netdevtap: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: netdevveth: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: netdevveth: use VIR_AUTOPTR for aggregate types util: netlink: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: netlink: use VIR_AUTOPTR for aggregate types util: numa: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: numa: use VIR_AUTOPTR for aggregate types util: perf: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: perf: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: pidfile: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: process: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: process: use VIR_AUTOPTR for aggregate types util: qemu: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: qemu: use VIR_AUTOPTR for aggregate types src/util/viriscsi.c | 99 ++++------ src/util/virmacaddr.c | 6 + src/util/virmacaddr.h | 4 + src/util/virnetdev.c | 412 +++++++++++++++------------------------- src/util/virnetdev.h | 4 + src/util/virnetdevbridge.c | 45 ++--- src/util/virnetdevip.c | 157 ++++++--------- src/util/virnetdevip.h | 4 + src/util/virnetdevmacvlan.c | 41 ++-- src/util/virnetdevopenvswitch.c | 131 +++++-------- src/util/virnetdevtap.c | 11 +- src/util/virnetdevveth.c | 33 ++-- src/util/virnetlink.c | 62 +++--- src/util/virnuma.c | 107 ++++------- src/util/virperf.c | 20 +- src/util/virperf.h | 8 +- src/util/virpidfile.c | 185 ++++++------------ src/util/virprocess.c | 68 +++---- src/util/virqemu.c | 50 ++--- src/util/virsocketaddr.c | 113 +++++------ src/util/virsocketaddr.h | 9 +- 21 files changed, 610 insertions(+), 959 deletions(-) -- 1.8.3.1

4 84

[libvirt] [PATCH 00/55] qemu: Add support for -blockdev
by Peter Krempa 07 Aug '18

07 Aug '18

In this version everything except blockjobs should work properly. Stats were fixed so that they are properly extracted from the new output in qemu. Additionally I've also fixed the disk resize API which I forgot last time. The blockjobs support is still missing so they either will not work or will mess up internal state. That means that the last patch still should not be pushed leaving this feature dormant until we achieve full feature parity. Peter Krempa (55): tests: qemumonitorjson: Simplify debugging of 'blockInfo' test qemu: Improve errors in qemuDomainBlockResize qemu: monitor: Remove unsupported function check for 'block_resize' qemu: monitor: Remove useless 'locked' property from struct qemuDomainDiskInfo tests: qemucapabilities: Update capability data for qemu 3.0.0 Revert "qemu: monitor: Add the 'query-nodes' argument for query-blockstats" qemu: monitor: Reuse qemuMonitorJSONQueryBlock in qemuMonitorJSONBlockIoThrottleInfo qemu: monitor: Allow using 'id' instead of 'device' for 'block_set_io_throttle' qemu: monitor: Allow using 'qdev' instead of 'device' for getting disk throttling qemu: monitor: Add 'nodename' argument for 'block_resize' tests: qemu: Drop disk from hostdev-mdev tests tests: qemuxml2argv: Fork CAPS_LATEST test cases for 'blockdev' tests: qemu: Add test data for backing chains and indexes qemu: hotplug: Don't generate alias when detaching disk util: virqemu: Simplify debugging if building QOM object with missing args qemu: caps: Add capability for using the blockdev infrastructure qemu: process: clear QEMU_CAPS_BLOCKDEV for VMs where we can't support it qemu: domain: Don't redetect backing chain when using -blockdev qemu: process: Don't detect nodenames when we support -blockdev conf: domain: Format out user provided backing chains in XML qemu: domain: Add infrastructure to generate block node names conf: Implement private data formatting and parsing for disks conf: Allow formatting and parsing of 'index' for disk source image qemu: Use proper backingIndex when reporting stats for backing chain qemu: Add field to store QDEV path of a disk in private data qemu: alias: Generate QDEV name of the block backend for disks qemu: domain: Add field for storing node name for copy-on-read qemu: proces: assign node names for user defined backing chains qemu: block: Add generator for the 'copy-on-read' blockdev driver qemu: domain: Prepare qemuDomainDiskGetBackendAlias for -blockdev qemu: command: format disk source commandline for -blockdev qemu: command: Add helper to check if disk throttling is enabled qemu: process: Setup disk io throttling for -blockdev qemu: driver: Use QOM backend name for disk IO throttling APIs qemu: driver: Prepare qemuDomainBlockResize for blockdev qemu: hotplug: Prepare for blockdev-add/blockdev-del with backing chains qemu: monitor: Add APIs for cdrom tray handling for -blockdev qemu: hotplug: Implement removable media change for -blockdev qemu: driver: Don't copy disk alias in qemuDomainBlocksStatsGather qemu: Explicitly find disks for stats totals qemu: monitor: Retrieve blockstats also by qdev and node-names qemu: monitor: Add APIs for refreshing disk capacity when using -blockdev qemu: driver: Don't pass 'virDomainDiskDefPtr' to qemuDomainGetStatsOneBlock qemu: monitor: Extract 'write-threshold' automatically for -blockdev qemu: Extract exporting of disk block statistics qemu: Extract exporting of the header for block stats qemu: Export stats relevant for the frontend separately qemu: Refactor control flow in qemuDomainGetStatsBlockExportDisk qemu: Report frontend stats only for the frontend entry qemu: Export stats relevant for the storage backend qemu: monitor: Report data also for 'qdev' entry in qemuMonitorJSONGetBlockInfo qemu: Use QOM path with query-block when using -blockdev qemu: driver: Allow using blockdev with qemuDomainBlocksStatsGather qemu: driver: Prepare qemuDomainGetStatsBlock (bulk disk stats) for -blockdev DO NOT APPLY: Enable QEMU_CAPS_BLOCKDEV if 'query-blockstats' works with -blockdev docs/formatdomain.html.in | 7 +- docs/schemas/domaincommon.rng | 19 + src/conf/domain_conf.c | 89 +++- src/conf/domain_conf.h | 7 + src/qemu/qemu_alias.c | 86 ++- src/qemu/qemu_alias.h | 3 +- src/qemu/qemu_block.c | 24 +- src/qemu/qemu_block.h | 2 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 94 +++- src/qemu/qemu_command.h | 3 + src/qemu/qemu_domain.c | 173 +++++- src/qemu/qemu_domain.h | 10 +- src/qemu/qemu_driver.c | 419 +++++++++++---- src/qemu/qemu_hotplug.c | 175 +++++- src/qemu/qemu_monitor.c | 98 +++- src/qemu/qemu_monitor.h | 33 +- src/qemu/qemu_monitor_json.c | 395 +++++++++++--- src/qemu/qemu_monitor_json.h | 33 +- src/qemu/qemu_process.c | 82 ++- src/util/virqemu.c | 5 +- .../qemucapabilitiesdata/caps_3.0.0.x86_64.replies | 591 +++------------------ tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 9 +- tests/qemumonitorjsontest.c | 34 +- tests/qemustatusxml2xmldata/modern-in.xml | 6 + tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args | 37 ++ tests/qemuxml2argvdata/disk-aio.x86_64-latest.args | 19 +- .../disk-backing-chains-index.x86_64-2.12.0.args | 1 + .../disk-backing-chains-index.x86_64-latest.args | 1 + .../qemuxml2argvdata/disk-backing-chains-index.xml | 145 +++++ .../disk-backing-chains-noindex.x86_64-2.12.0.args | 58 ++ .../disk-backing-chains-noindex.x86_64-latest.args | 163 ++++++ .../disk-backing-chains-noindex.xml | 145 +++++ .../qemuxml2argvdata/disk-cache.x86_64-2.12.0.args | 50 ++ .../qemuxml2argvdata/disk-cache.x86_64-latest.args | 50 +- .../disk-cdrom-network.x86_64-2.12.0.args | 41 ++ .../disk-cdrom-network.x86_64-latest.args | 32 +- .../disk-cdrom-tray.x86_64-2.12.0.args | 39 ++ .../disk-cdrom-tray.x86_64-latest.args | 24 +- .../qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args | 35 ++ .../qemuxml2argvdata/disk-cdrom.x86_64-latest.args | 17 +- .../disk-copy_on_read.x86_64-2.12.0.args | 41 ++ .../disk-copy_on_read.x86_64-latest.args | 19 +- .../disk-detect-zeroes.x86_64-2.12.0.args | 37 ++ .../disk-detect-zeroes.x86_64-latest.args | 17 +- .../disk-error-policy.x86_64-2.12.0.args | 41 ++ .../disk-error-policy.x86_64-latest.args | 30 +- .../disk-floppy.x86_64-2.12.0.args | 35 ++ .../disk-network-gluster.x86_64-2.12.0.args | 44 ++ .../disk-network-gluster.x86_64-latest.args | 32 +- .../disk-network-iscsi.x86_64-2.12.0.args | 63 +++ .../disk-network-iscsi.x86_64-latest.args | 58 +- .../disk-network-nbd.x86_64-2.12.0.args | 46 ++ .../disk-network-nbd.x86_64-latest.args | 41 +- .../disk-network-rbd.x86_64-2.12.0.args | 61 +++ .../disk-network-rbd.x86_64-latest.args | 67 ++- .../disk-network-sheepdog.x86_64-2.12.0.args | 35 ++ .../disk-network-sheepdog.x86_64-latest.args | 16 +- .../disk-network-source-auth.x86_64-2.12.0.args | 47 ++ .../disk-network-source-auth.x86_64-latest.args | 30 +- .../disk-network-tlsx509.x86_64-2.12.0.args | 59 ++ .../disk-network-tlsx509.x86_64-latest.args | 61 ++- .../disk-readonly-disk.x86_64-2.12.0.args | 34 ++ .../disk-readonly-disk.x86_64-latest.args | 14 +- .../disk-shared.x86_64-2.12.0.args | 37 ++ .../disk-shared.x86_64-latest.args | 18 +- ...isk-virtio-scsi-reservations.x86_64-2.12.0.args | 43 ++ ...isk-virtio-scsi-reservations.x86_64-latest.args | 20 +- .../floppy-drive-fat.x86_64-2.12.0.args | 33 ++ .../hostdev-mdev-display-missing-graphics.xml | 6 - ...v-display-spice-egl-headless.x86_64-latest.args | 2 - .../hostdev-mdev-display-spice-egl-headless.xml | 6 - ...ev-mdev-display-spice-opengl.x86_64-latest.args | 2 - .../hostdev-mdev-display-spice-opengl.xml | 6 - ...dev-display-vnc-egl-headless.x86_64-latest.args | 2 - .../hostdev-mdev-display-vnc-egl-headless.xml | 6 - .../hostdev-mdev-display-vnc.x86_64-latest.args | 2 - .../qemuxml2argvdata/hostdev-mdev-display-vnc.xml | 6 - tests/qemuxml2argvdata/hostdev-mdev-display.xml | 6 - .../hostdev-mdev-invalid-target-address.xml | 5 - .../qemuxml2argvdata/hostdev-mdev-precreated.args | 2 - tests/qemuxml2argvdata/hostdev-mdev-precreated.xml | 6 - .../hostdev-mdev-src-address-invalid.xml | 6 - tests/qemuxml2argvtest.c | 24 + .../disk-backing-chains-inactive.xml | 35 ++ .../disk-backing-chains-index-active.xml | 156 ++++++ .../disk-backing-chains-index-inactive.xml | 156 ++++++ .../disk-backing-chains-noindex-active.xml | 156 ++++++ .../disk-backing-chains-noindex-inactive.xml | 156 ++++++ tests/qemuxml2xmloutdata/disk-mirror-inactive.xml | 4 + .../disk-mirror-old-inactive.xml | 4 + tests/qemuxml2xmloutdata/hostdev-mdev-display.xml | 6 - .../qemuxml2xmloutdata/hostdev-mdev-precreated.xml | 6 - tests/qemuxml2xmltest.c | 2 + 95 files changed, 4017 insertions(+), 1087 deletions(-) create mode 100644 tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args create mode 120000 tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-2.12.0.args create mode 120000 tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-backing-chains-index.xml create mode 100644 tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-backing-chains-noindex.xml create mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-copy_on_read.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-error-policy.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-floppy.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-network-source-auth.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-readonly-disk.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/floppy-drive-fat.x86_64-2.12.0.args create mode 100644 tests/qemuxml2xmloutdata/disk-backing-chains-index-active.xml create mode 100644 tests/qemuxml2xmloutdata/disk-backing-chains-index-inactive.xml create mode 100644 tests/qemuxml2xmloutdata/disk-backing-chains-noindex-active.xml create mode 100644 tests/qemuxml2xmloutdata/disk-backing-chains-noindex-inactive.xml -- 2.16.2

1 55

[libvirt] [PATCH] qemu: Check sev capability pointer before using it
by Han Han 07 Aug '18

07 Aug '18

https://bugzilla.redhat.com/show_bug.cgi?id=1612009 Check sev capability pointer in function qemuGetSEVInfoToParams to avoid null pointer dereferences. Signed-off-by: Han Han <hhan(a)redhat.com> --- src/qemu/qemu_driver.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index fb0d4a8c7a..3daaef586f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -21452,6 +21452,12 @@ qemuGetSEVInfoToParams(virQEMUCapsPtr qemuCaps, virCheckFlags(VIR_TYPED_PARAM_STRING_OKAY, -1); + if (!sev) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("SEV is not supported in this guest")); + return -1; + } + if (virTypedParamsAddString(&sevParams, &n, &maxpar, VIR_NODE_SEV_PDH, sev->pdh) < 0) return -1; -- 2.18.0

3 2

[libvirt] [PATCH] docs: formatdomain: fix spacing before parentheses
by Ján Tomko 06 Aug '18

06 Aug '18

Multiple cputune elements specified microseconds as the unit without putting a space before the parenthesis. There were also other occurrences. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- Pushed as trivial. docs/formatdomain.html.in | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 19b73125e1..b63467bd91 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -820,7 +820,7 @@ <dt><code>period</code></dt> <dd> The optional <code>period</code> element specifies the enforcement - interval(unit: microseconds). Within <code>period</code>, each vCPU of + interval (unit: microseconds). Within <code>period</code>, each vCPU of the domain will not be allowed to consume more than <code>quota</code> worth of runtime. The value should be in range [1000, 1000000]. A period with value 0 means no value. @@ -830,7 +830,7 @@ <dt><code>quota</code></dt> <dd> The optional <code>quota</code> element specifies the maximum allowed - bandwidth(unit: microseconds). A domain with <code>quota</code> as any + bandwidth (unit: microseconds). A domain with <code>quota</code> as any negative value indicates that the domain has infinite bandwidth for vCPU threads, which means that it is not bandwidth controlled. The value should be in range [1000, 18446744073709551] or less than 0. A quota @@ -863,8 +863,8 @@ <dt><code>emulator_period</code></dt> <dd> The optional <code>emulator_period</code> element specifies the enforcement - interval(unit: microseconds). Within <code>emulator_period</code>, emulator - threads(those excluding vCPUs) of the domain will not be allowed to consume + interval (unit: microseconds). Within <code>emulator_period</code>, emulator + threads (those excluding vCPUs) of the domain will not be allowed to consume more than <code>emulator_quota</code> worth of runtime. The value should be in range [1000, 1000000]. A period with value 0 means no value. <span class="since">Only QEMU driver support since 0.10.0</span> @@ -872,7 +872,7 @@ <dt><code>emulator_quota</code></dt> <dd> The optional <code>emulator_quota</code> element specifies the maximum - allowed bandwidth(unit: microseconds) for domain's emulator threads(those + allowed bandwidth (unit: microseconds) for domain's emulator threads (those excluding vCPUs). A domain with <code>emulator_quota</code> as any negative value indicates that the domain has infinite bandwidth for emulator threads (those excluding vCPUs), which means that it is not bandwidth controlled. @@ -884,7 +884,7 @@ <dt><code>iothread_period</code></dt> <dd> The optional <code>iothread_period</code> element specifies the - enforcement interval(unit: microseconds) for IOThreads. Within + enforcement interval (unit: microseconds) for IOThreads. Within <code>iothread_period</code>, each IOThread of the domain will not be allowed to consume more than <code>iothread_quota</code> worth of runtime. The value should be in range [1000, 1000000]. @@ -894,7 +894,7 @@ <dt><code>iothread_quota</code></dt> <dd> The optional <code>iothread_quota</code> element specifies the maximum - allowed bandwidth(unit: microseconds) for IOThreads. A domain with + allowed bandwidth (unit: microseconds) for IOThreads. A domain with <code>iothread_quota</code> as any negative value indicates that the domain IOThreads have infinite bandwidth, which means that it is not bandwidth controlled. The value should be in range @@ -4385,8 +4385,8 @@ <p> USB, PCI and SCSI devices attached to the host can be passed through to the guest using the <code>hostdev</code> element. - <span class="since">since after 0.4.4 for USB, 0.6.0 for PCI(KVM only) - and 1.0.6 for SCSI(KVM only)</span>: + <span class="since">since after 0.4.4 for USB, 0.6.0 for PCI (KVM only) + and 1.0.6 for SCSI (KVM only)</span>: </p> <pre> -- 2.13.6

1 0

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

06 Aug '18

We need to first perform the checks for changed/missing elements and then we can overwrite the missing ones. Otherwise we might falsely report successfull update, because some elements got overwritten before the validity checks. https://bugzilla.redhat.com/show_bug.cgi?id=1599513 Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com> --- src/qemu/qemu_hotplug.c | 43 ++++++++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 1488f0a7c2..8d98c149e2 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3445,23 +3445,9 @@ qemuDomainChangeNet(virQEMUDriverPtr driver, goto cleanup; } - /* info: if newdev->info is empty, fill it in from olddev, - * otherwise verify that it matches - nothing is allowed to - * change. (There is no helper function to do this, so - * individually check the few feidls of virDomainDeviceInfo that - * are relevant in this case). + /* info: Nothing is allowed to change. First check for changes and + * then fill the missing newdev->info from olddev. */ - if (!virDomainDeviceAddressIsValid(&newdev->info, - VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) && - virDomainDeviceInfoCopy(&newdev->info, &olddev->info) < 0) { - goto cleanup; - } - if (!virPCIDeviceAddressEqual(&olddev->info.addr.pci, - &newdev->info.addr.pci)) { - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", - _("cannot modify network device guest PCI address")); - goto cleanup; - } /* grab alias from olddev if not set in newdev */ if (!newdev->info.alias && VIR_STRDUP(newdev->info.alias, olddev->info.alias) < 0) @@ -3469,26 +3455,51 @@ qemuDomainChangeNet(virQEMUDriverPtr driver, /* device alias is checked already in virDomainDefCompatibleDevice */ + if (newdev->info.rombar == VIR_TRISTATE_BOOL_ABSENT) + newdev->info.rombar = olddev->info.rombar; if (olddev->info.rombar != newdev->info.rombar) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("cannot modify network device rom bar setting")); goto cleanup; } + + if (!newdev->info.romfile && + VIR_STRDUP(newdev->info.romfile, olddev->info.romfile) < 0) + goto cleanup; if (STRNEQ_NULLABLE(olddev->info.romfile, newdev->info.romfile)) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("cannot modify network rom file")); goto cleanup; } + + if (newdev->info.bootIndex == 0) + newdev->info.bootIndex = olddev->info.bootIndex; if (olddev->info.bootIndex != newdev->info.bootIndex) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("cannot modify network device boot index setting")); goto cleanup; } + + if (newdev->info.romenabled == VIR_TRISTATE_BOOL_ABSENT) + newdev->info.romenabled = olddev->info.romenabled; if (olddev->info.romenabled != newdev->info.romenabled) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("cannot modify network device rom enabled setting")); goto cleanup; } + + /* if pci addr is missing or is invalid we overwrite all info struct */ + if (!virDomainDeviceAddressIsValid(&newdev->info, + VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) && + virDomainDeviceInfoCopy(&newdev->info, &olddev->info) < 0) { + goto cleanup; + } + if (!virPCIDeviceAddressEqual(&olddev->info.addr.pci, + &newdev->info.addr.pci)) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("cannot modify network device guest PCI address")); + goto cleanup; + } /* (end of device info checks) */ if (STRNEQ_NULLABLE(olddev->filter, newdev->filter) || -- 2.17.1

2 1

[libvirt] [PATCH] qemu: emit error when trying to update blkiotune group_name in qemuDomainChangeDiskLive
by Katerina Koukiou 06 Aug '18

06 Aug '18

All rest of blkiotune parameters are not updatable through UpdateDeviceFlags API. https://bugzilla.redhat.com/show_bug.cgi?id=1601677 Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com> --- The BZ was requesting to add support for updating the group_name for blkdeviotune here, though, all the rest of blkdeviotune elements are not updatable though UpdateDeviceFlags API. I think emmiting error and keeping all blkiodevtune parameters updatable in a consistent way is the right way to go. src/qemu/qemu_domain.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index de056272e8..0aa440e0b5 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -8791,6 +8791,9 @@ qemuDomainDiskChangeSupported(virDomainDiskDefPtr disk, CHECK_EQ(blkdeviotune.size_iops_sec, "blkdeviotune size_iops_sec", true); + CHECK_EQ(blkdeviotune.group_name, + "blkdeviotune group_name", + true); if (disk->serial && STRNEQ_NULLABLE(disk->serial, orig_disk->serial)) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, -- 2.17.1

2 1

[libvirt] [RFC v2 1/2] process: wait longer on kill per assigned Hostdev
by Christian Ehrhardt 06 Aug '18

06 Aug '18

It was found that in cases with host devices virProcessKillPainfully might be able to send signal zero to the target PID for quite a while with the process already being gone from /proc/<PID>. That is due to cleanup and reset of devices which might include a secondary bus reset that on top of the actions taken has a 1s delay to let the bus settle. Due to that guests with plenty of Host devices could easily exceed the default timeouts. To solve that, this adds an extra delay of 2s per hostdev that is associated to a VM. Signed-off-by: Christian Ehrhardt <christian.ehrhardt(a)canonical.com> --- src/qemu/qemu_process.c | 5 +++-- src/util/virprocess.c | 18 +++++++++++++++--- src/util/virprocess.h | 1 + 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index c4e33723d1..c20cc11e51 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -6814,8 +6814,9 @@ qemuProcessKill(virDomainObjPtr vm, unsigned int flags) return 0; } - ret = virProcessKillPainfully(vm->pid, - !!(flags & VIR_QEMU_PROCESS_KILL_FORCE)); + ret = virProcessKillPainfullyDelay(vm->pid, + !!(flags & VIR_QEMU_PROCESS_KILL_FORCE) + vm->def->nhostdevs * 2); return ret; } diff --git a/src/util/virprocess.c b/src/util/virprocess.c index f92b0dce37..aefe655771 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -344,15 +344,19 @@ int virProcessKill(pid_t pid, int sig) * Returns 0 if it was killed gracefully, 1 if it * was killed forcibly, -1 if it is still alive, * or another error occurred. + * + * Callers can proide an extra delay to wait longer + * than the default. */ int -virProcessKillPainfully(pid_t pid, bool force) +virProcessKillPainfullyDelay(pid_t pid, bool force, unsigned int extradelay) { size_t i; int ret = -1; + unsigned int delay = 75 + (extradelay*5); const char *signame = "TERM"; - VIR_DEBUG("vpid=%lld force=%d", (long long)pid, force); + VIR_DEBUG("vpid=%lld force=%d delay=%u", (long long)pid, force, pid); /* This loop sends SIGTERM, then waits a few iterations (10 seconds) * to see if it dies. If the process still hasn't exited, and @@ -360,9 +364,12 @@ virProcessKillPainfully(pid_t pid, bool force) * wait up to 5 seconds more for the process to exit before * returning. * + * An extra delay can be specified for cases that are expected to clean + * up slower than usual. + * * Note that setting @force could result in dataloss for the process. */ - for (i = 0; i < 75; i++) { + for (i = 0; i < delay; i++) { int signum; if (i == 0) { signum = SIGTERM; /* kindly suggest it should exit */ @@ -405,6 +412,11 @@ virProcessKillPainfully(pid_t pid, bool force) } +int virProcessKillPainfully(pid_t pid, bool force) +{ + return virProcessKillPainfullyDelay(pid, force, 0); +} + #if HAVE_SCHED_GETAFFINITY int virProcessSetAffinity(pid_t pid, virBitmapPtr map) diff --git a/src/util/virprocess.h b/src/util/virprocess.h index 3c5a882772..b72603ca8e 100644 --- a/src/util/virprocess.h +++ b/src/util/virprocess.h @@ -55,6 +55,7 @@ virProcessWait(pid_t pid, int *exitstatus, bool raw) int virProcessKill(pid_t pid, int sig); int virProcessKillPainfully(pid_t pid, bool force); +int virProcessKillPainfullyDelay(pid_t pid, bool force, unsigned int); int virProcessSetAffinity(pid_t pid, virBitmapPtr map); -- 2.17.1

1 1

[libvirt] [RFC 0/2] Fix detection of slow guest shutdown
by Christian Ehrhardt 06 Aug '18

06 Aug '18

Hi, I was recently looking into a case which essentially looked like this: 1. virsh shutdown guest 2. after <1 second the qemu process was gone from /proc/ 3. but libvirt spun in virProcessKillPainfully because the process was still reachable via signals 4. virProcessKillPainfully eventually fails after 15 seconds and the guest stays in "in shutdown" state forever This is not one of the common cases I've found for virProcessKillPainfully to break: - bad I/O e.g. NFS gets qemu stuck - CPU overload stalls things to death - qemu not being reaped (by init) All of the above would have the process still available in /proc/<pid> as Zombie or in uninterruptible sleep, but that is not true in my case. It turned out that the case was dependent on the amount of hostdev resources passed to the guest. Debugging showed that with 8 and more likely 16 GPUs passed it took ~18 seconds from SIGTERM to "no more be reachable with signal 0". I haven't conducted much more tests but stayed on the 16 GPU case, but I'm rather sure more devices might make it take even longer. Discussion with a few kernel folks revealed that the kill(2) man page on signal 0 has to be taken very literal "check for the existence of a process ID" - you can read this as "the PID exists, but the Process is no more". I'm unsure why the kernel would take that much time to clean up as I thought taking away /proc/<PID> would be almost the last step in the cleanup of a task. patch 2: I happened to find that there seems to be no much better way than signal-0 to check, but finding that this isn't reliable if the kernel can still accept for quite some time even with the pid gone from all other interfaces that I could find - so I wanted to suggest a fallback in virProcessKillPainfully that considers the absence of /proc/<pid> as a valid "the process is gone" as well on top of the ESRCH of signal-0. We could also use the open FDs we have e.g. to the qemu monitor to see if the remote end is dead, but that didn't seem more readable/reliable to me and would have to cross quite some code to know about the FDs. But maybe someone else here has the insight what exactly would take the time in the kernel that I see and that might bring us to totally different solutions (therefore RFC). patch 1: Finally after working through this code for a while I got the feeling that if we are in a bad/non-responsive case after 10 seconds upgrading to SIGKILL we should give it some more time to take effect. We reach this in stressful cases only anyway and only if force is set, so then waiting a bit more helps to resolve some of the other cases that I found on the mailing list about virProcessKillPainfully being stuck. If one has a personal interest in the 15 seconds we had before lets add a VIR_WARN on 15 seconds if that would be better, but overall wait a bit more. P.S. Afer a short discussion with Daniel on IRC I'm also adding Alex explicitly for passthrough experience. P.P.S.: For now this really is only meant as an RFC to kick off the discussion. I got taken away the system that I could trigger this case easily on before I could complete a final verification. But the case is interesting enough to start the discussion now. Christian Ehrhardt (2): process: wait longer 5->30s on hard shutdown process: accept the lack of /proc/<pid> as valid process removal src/util/virprocess.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) -- 2.17.1

4 7

[libvirt] [PATCH v3 0/4] iscsi-direct: first part
by clem＠lse.epita.fr 06 Aug '18

06 Aug '18

From: Clementine Hayat <clem(a)lse.epita.fr> Hello, This is the implementation of the iscsi-direct backend storage pool version 3. v1: https://www.redhat.com/archives/libvir-list/2018-July/msg00918.html v2: https://www.redhat.com/archives/libvir-list/2018-July/msg01528.html Best Regards, -- Clementine Hayat Clementine Hayat (4): configure: Introduce libiscsi in build system storage: Introduce iscsi_direct pool type storage: Implement iscsi_direct pool backend news: add storage pool iscsi-direct configure.ac | 9 +- docs/news.xml | 9 + docs/schemas/storagepool.rng | 35 ++ docs/storage.html.in | 30 ++ m4/virt-libiscsi.m4 | 30 ++ m4/virt-storage-iscsi-direct.m4 | 44 ++ src/conf/domain_conf.c | 1 + src/conf/storage_conf.c | 22 +- src/conf/storage_conf.h | 1 + src/conf/virstorageobj.c | 2 + src/storage/Makefile.inc.am | 24 + src/storage/storage_backend.c | 6 + src/storage/storage_backend_iscsi_direct.c | 452 ++++++++++++++++++ src/storage/storage_backend_iscsi_direct.h | 6 + src/storage/storage_driver.c | 1 + .../pool-iscsi-direct-auth.xml | 14 + .../pool-iscsi-direct.xml | 12 + .../pool-iscsi-direct-auth.xml | 17 + .../pool-iscsi-direct.xml | 14 + tests/storagepoolxml2xmltest.c | 2 + tools/virsh-pool.c | 3 + 21 files changed, 728 insertions(+), 6 deletions(-) create mode 100644 m4/virt-libiscsi.m4 create mode 100644 m4/virt-storage-iscsi-direct.m4 create mode 100644 src/storage/storage_backend_iscsi_direct.c create mode 100644 src/storage/storage_backend_iscsi_direct.h create mode 100644 tests/storagepoolxml2xmlin/pool-iscsi-direct-auth.xml create mode 100644 tests/storagepoolxml2xmlin/pool-iscsi-direct.xml create mode 100644 tests/storagepoolxml2xmlout/pool-iscsi-direct-auth.xml create mode 100644 tests/storagepoolxml2xmlout/pool-iscsi-direct.xml -- 2.18.0

4 8

[libvirt] [RFC] secdrivers remembering original labels
by Michal Privoznik 06 Aug '18

06 Aug '18

Dear list, we have this very old bug [1] that I just keep pushing in front of me. I made several attempts to fix it. However, none of them made into the tree. I guess it's time to have discussion what to do about it. IIRC, the algorithm that I implemented last was to keep original label in XATTRs (among with some ref counter) and the last one to restore the label will look there and find the original label. There was a problem with two libvirtds fighting over a file on shared FS. So I guess my question is can we come up with a design that would work? Or at least work to the extent that we're satisfied with? Personally, I like the XATTRs approach. And to resolve the NFS race we can invent yet another lockspace to guard labelling - I also have a bug for that [2] (although, I'm not that familiar with lockspaces). I guess doing disk metadata locking is not going to be trivial, is it? Michal 1: https://bugzilla.redhat.com/show_bug.cgi?id=547546 2: https://bugzilla.redhat.com/show_bug.cgi?id=1524792

3 7

[libvirt] Release of libvirt-4.6.0
by Daniel Veillard 06 Aug '18

06 Aug '18

Okay it took a bit longer than usual but the relrase is out, it's tagged in git and signed tarball and rpms have been pushed to the usual place, but there was quite a few bug fixes going in after RC2 was cut. ftp://libvirt.org/libvirt/ I also made libvirt-python 4.6.0 bindings release in a similar fashion available at : ftp://libvirt.org/libvirt/python/ So though the release note don't list any bug fixes we know there is a batch of those in, otherwise this is mainly features and improvement targetting QEmu and virsh users: New features: - qemu: Implement the HTM pSeries feature Users can now decide whether HTM (Hardware Transactional Memory) support should be available to the guest. - qemu: Enable VNC console for mediated devices Host devices now support a new atribute 'display' which can be used to turn on frame buffer rendering on a vgpu mediated device instead of on an emulated GPU, like QXL. Improvements: - qemu: Introduce a new video model of type 'none' Introduce a new video model type that disables the automatic addition of a video device to domains with 'graphics' specified in their XML. This can be useful with GPU mediated devices which can serve as the only rendering devices within the guest. - virsh: Add --alias to attach-disk and attach-interface commands Add option --alias to set customized device alias name when using attach-disk or attach-interface commands. - virsh: Support usb and sata address to attach-disk Usb or sata address could be used when attach-disk with --address. For example, use usb address as usb:<bus>.<port>, use sata address as <controller>.<bus>.<unit>. Thanks everybody for your help with this release, hopefully the next one beginning of Sept will be more timely ! Enjoy, Daniel -- Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/ veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH] Fix include for xattr.h
by Martin Kletzander 06 Aug '18

06 Aug '18

The proper file that should be included is `sys/xattr.h` as that comes from `glibc` and not `attr/xattr.h` which ships with the `attr` utility. We're most probably not the only ones because `attr/xattr.h` added a #warning to their include resulting in the following compilation errors: In file included from securityselinuxlabeltest.c:31:0: /usr/include/attr/xattr.h:5:2: error: #warning "Please change your <attr/xattr.h> includes to <sys/xattr.h>" [-Werror=cpp] #warning "Please change your <attr/xattr.h> includes to <sys/xattr.h>" ^~~~~~~ In file included from securityselinuxhelper.c:37:0: /usr/include/attr/xattr.h:5:2: error: #warning "Please change your <attr/xattr.h> includes to <sys/xattr.h>" [-Werror=cpp] #warning "Please change your <attr/xattr.h> includes to <sys/xattr.h>" ^~~~~~~ Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Not pushing as build-breaker because we are still in freeze and I'd still like someone with SELinux to check this patch. My VM with such system stopped working just now =( m4/virt-attr.m4 | 2 +- tests/securityselinuxhelper.c | 2 +- tests/securityselinuxlabeltest.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/m4/virt-attr.m4 b/m4/virt-attr.m4 index c55bd7dbd823..478549c17f12 100644 --- a/m4/virt-attr.m4 +++ b/m4/virt-attr.m4 @@ -5,7 +5,7 @@ AC_DEFUN([LIBVIRT_ARG_ATTR],[ ]) AC_DEFUN([LIBVIRT_CHECK_ATTR],[ - LIBVIRT_CHECK_LIB([ATTR], [attr], [getxattr], [attr/xattr.h]) + LIBVIRT_CHECK_LIB([ATTR], [attr], [getxattr], [sys/xattr.h]) ]) AC_DEFUN([LIBVIRT_RESULT_ATTR],[ diff --git a/tests/securityselinuxhelper.c b/tests/securityselinuxhelper.c index 22b6709554b4..fe6f2b5fd9b0 100644 --- a/tests/securityselinuxhelper.c +++ b/tests/securityselinuxhelper.c @@ -34,7 +34,7 @@ #include <string.h> #include <sys/vfs.h> #include <unistd.h> -#include <attr/xattr.h> +#include <sys/xattr.h> #ifndef NFS_SUPER_MAGIC # define NFS_SUPER_MAGIC 0x6969 diff --git a/tests/securityselinuxlabeltest.c b/tests/securityselinuxlabeltest.c index c684989fd26e..48fee7cd285b 100644 --- a/tests/securityselinuxlabeltest.c +++ b/tests/securityselinuxlabeltest.c @@ -28,7 +28,7 @@ #include <selinux/selinux.h> #include <selinux/context.h> -#include <attr/xattr.h> +#include <sys/xattr.h> #include "internal.h" #include "testutils.h" -- 2.18.0

2 1

[libvirt] [PATCH] virrandom: Avoid undefined behaviour in virRandomBits
by Michal Privoznik 06 Aug '18

06 Aug '18

If nbits is 64 (or greater) then shifting 1ULL left is undefined. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virrandom.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/util/virrandom.c b/src/util/virrandom.c index 3c011a8615..7915f6531e 100644 --- a/src/util/virrandom.c +++ b/src/util/virrandom.c @@ -68,7 +68,9 @@ uint64_t virRandomBits(int nbits) return 0; } - ret &= (1ULL << nbits) - 1; + if (nbits < 64) + ret &= (1ULL << nbits) - 1; + return ret; } -- 2.16.4

2 1

[libvirt] [PATCH] remote: daemon: Make sure that JSON symbols are properly loaded at startup
by Peter Krempa 06 Aug '18

06 Aug '18

Explicitly call virJSONInitialize at startup of the libvirt daemon so that we are sure that the symbols in the compat library are properly loaded. This will prevent any random failure from happening later on when the daemon would want to use the JSON parser. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/libvirt_private.syms | 4 ++++ src/remote/remote_daemon.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index fc386e1699..70dfcc5e29 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2135,6 +2135,10 @@ virJSONValueObjectStealObject; virJSONValueToString; +# util/virjsoncompat.h +virJSONInitialize; + + # util/virkeycode.h virKeycodeSetTypeFromString; virKeycodeSetTypeToString; diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c index 9f3a5f38ad..8bbc3818bb 100644 --- a/src/remote/remote_daemon.c +++ b/src/remote/remote_daemon.c @@ -59,6 +59,7 @@ #include "virutil.h" #include "virgettext.h" #include "util/virnetdevopenvswitch.h" +#include "virjsoncompat.h" #include "driver.h" @@ -1183,6 +1184,9 @@ int main(int argc, char **argv) { exit(EXIT_FAILURE); } + if (virJSONInitialize() < 0) + exit(EXIT_FAILURE); + daemonSetupNetDevOpenvswitch(config); if (daemonSetupAccessManager(config) < 0) { -- 2.16.2

2 1

[libvirt] [PATCH 0/3] conf: standardize naming
by Anya Harter 03 Aug '18

03 Aug '18

on vir*ObjListExport call stack Anya Harter (3): conf: rename structs used by Export function conf: rename Export Callback functions conf: rename Match functions src/conf/virinterfaceobj.c | 10 +++++----- src/conf/virnetworkobj.c | 16 ++++++++-------- src/conf/virnodedeviceobj.c | 4 ++-- src/conf/virsecretobj.c | 10 +++++----- src/conf/virstorageobj.c | 24 ++++++++++++------------ 5 files changed, 32 insertions(+), 32 deletions(-) -- 2.17.1

2 6

[libvirt] [PATCH] tests: Unify data structure for vircaps2xmltest
by Andrea Bolognani 03 Aug '18

03 Aug '18

If all we achieve is reducing the depth by one for a single test case, the additional complexity (not to mention breaking the principle of least surprise) is not worth it: let's use simpler, more predictable code instead. This basically reverts fec6e4c48c9c (with a few adjustments). Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- .../{ => system}/cpu/cpu0/topology/core_id | 0 .../cpu/cpu0/topology/core_siblings | 0 .../cpu/cpu0/topology/core_siblings_list | 0 .../cpu/cpu0/topology/physical_package_id | 0 .../cpu/cpu0/topology/thread_siblings | 0 .../cpu/cpu0/topology/thread_siblings_list | 0 .../{ => system}/cpu/cpu1/topology/core_id | 0 .../cpu/cpu1/topology/core_siblings | 0 .../cpu/cpu1/topology/core_siblings_list | 0 .../cpu/cpu1/topology/physical_package_id | 0 .../cpu/cpu1/topology/thread_siblings | 0 .../cpu/cpu1/topology/thread_siblings_list | 0 .../{ => system}/cpu/cpu10/topology/core_id | 0 .../cpu/cpu10/topology/core_siblings | 0 .../cpu/cpu10/topology/core_siblings_list | 0 .../cpu/cpu10/topology/physical_package_id | 0 .../cpu/cpu10/topology/thread_siblings | 0 .../cpu/cpu10/topology/thread_siblings_list | 0 .../{ => system}/cpu/cpu11/topology/core_id | 0 .../cpu/cpu11/topology/core_siblings | 0 .../cpu/cpu11/topology/core_siblings_list | 0 .../cpu/cpu11/topology/physical_package_id | 0 .../cpu/cpu11/topology/thread_siblings | 0 .../cpu/cpu11/topology/thread_siblings_list | 0 .../{ => system}/cpu/cpu12/topology/core_id | 0 .../cpu/cpu12/topology/core_siblings | 0 .../cpu/cpu12/topology/core_siblings_list | 0 .../cpu/cpu12/topology/physical_package_id | 0 .../cpu/cpu12/topology/thread_siblings | 0 .../cpu/cpu12/topology/thread_siblings_list | 0 .../{ => system}/cpu/cpu13/topology/core_id | 0 .../cpu/cpu13/topology/core_siblings | 0 .../cpu/cpu13/topology/core_siblings_list | 0 .../cpu/cpu13/topology/physical_package_id | 0 .../cpu/cpu13/topology/thread_siblings | 0 .../cpu/cpu13/topology/thread_siblings_list | 0 .../{ => system}/cpu/cpu14/topology/core_id | 0 .../cpu/cpu14/topology/core_siblings | 0 .../cpu/cpu14/topology/core_siblings_list | 0 .../cpu/cpu14/topology/physical_package_id | 0 .../cpu/cpu14/topology/thread_siblings | 0 .../cpu/cpu14/topology/thread_siblings_list | 0 .../{ => system}/cpu/cpu15/topology/core_id | 0 .../cpu/cpu15/topology/core_siblings | 0 .../cpu/cpu15/topology/core_siblings_list | 0 .../cpu/cpu15/topology/physical_package_id | 0 .../cpu/cpu15/topology/thread_siblings | 0 .../cpu/cpu15/topology/thread_siblings_list | 0 .../{ => system}/cpu/cpu2/topology/core_id | 0 .../cpu/cpu2/topology/core_siblings | 0 .../cpu/cpu2/topology/core_siblings_list | 0 .../cpu/cpu2/topology/physical_package_id | 0 .../cpu/cpu2/topology/thread_siblings | 0 .../cpu/cpu2/topology/thread_siblings_list | 0 .../{ => system}/cpu/cpu3/topology/core_id | 0 .../cpu/cpu3/topology/core_siblings | 0 .../cpu/cpu3/topology/core_siblings_list | 0 .../cpu/cpu3/topology/physical_package_id | 0 .../cpu/cpu3/topology/thread_siblings | 0 .../cpu/cpu3/topology/thread_siblings_list | 0 .../{ => system}/cpu/cpu4/topology/core_id | 0 .../cpu/cpu4/topology/core_siblings | 0 .../cpu/cpu4/topology/core_siblings_list | 0 .../cpu/cpu4/topology/physical_package_id | 0 .../cpu/cpu4/topology/thread_siblings | 0 .../cpu/cpu4/topology/thread_siblings_list | 0 .../{ => system}/cpu/cpu5/topology/core_id | 0 .../cpu/cpu5/topology/core_siblings | 0 .../cpu/cpu5/topology/core_siblings_list | 0 .../cpu/cpu5/topology/physical_package_id | 0 .../cpu/cpu5/topology/thread_siblings | 0 .../cpu/cpu5/topology/thread_siblings_list | 0 .../{ => system}/cpu/cpu6/topology/core_id | 0 .../cpu/cpu6/topology/core_siblings | 0 .../cpu/cpu6/topology/core_siblings_list | 0 .../cpu/cpu6/topology/physical_package_id | 0 .../cpu/cpu6/topology/thread_siblings | 0 .../cpu/cpu6/topology/thread_siblings_list | 0 .../{ => system}/cpu/cpu7/topology/core_id | 0 .../cpu/cpu7/topology/core_siblings | 0 .../cpu/cpu7/topology/core_siblings_list | 0 .../cpu/cpu7/topology/physical_package_id | 0 .../cpu/cpu7/topology/thread_siblings | 0 .../cpu/cpu7/topology/thread_siblings_list | 0 .../{ => system}/cpu/cpu8/topology/core_id | 0 .../cpu/cpu8/topology/core_siblings | 0 .../cpu/cpu8/topology/core_siblings_list | 0 .../cpu/cpu8/topology/physical_package_id | 0 .../cpu/cpu8/topology/thread_siblings | 0 .../cpu/cpu8/topology/thread_siblings_list | 0 .../{ => system}/cpu/cpu9/topology/core_id | 0 .../cpu/cpu9/topology/core_siblings | 0 .../cpu/cpu9/topology/core_siblings_list | 0 .../cpu/cpu9/topology/physical_package_id | 0 .../cpu/cpu9/topology/thread_siblings | 0 .../cpu/cpu9/topology/thread_siblings_list | 0 .../linux-basic/{ => system}/cpu/online | 0 .../linux-basic/{ => system}/cpu/present | 0 .../linux-basic/{ => system}/node/node0/cpu0 | 0 .../linux-basic/{ => system}/node/node0/cpu1 | 0 .../linux-basic/{ => system}/node/node0/cpu2 | 0 .../linux-basic/{ => system}/node/node0/cpu3 | 0 .../{ => system}/node/node0/cpulist | 0 .../linux-basic/{ => system}/node/node1/cpu4 | 0 .../linux-basic/{ => system}/node/node1/cpu5 | 0 .../linux-basic/{ => system}/node/node1/cpu6 | 0 .../linux-basic/{ => system}/node/node1/cpu7 | 0 .../{ => system}/node/node1/cpulist | 0 .../linux-basic/{ => system}/node/node2/cpu10 | 0 .../linux-basic/{ => system}/node/node2/cpu11 | 0 .../linux-basic/{ => system}/node/node2/cpu8 | 0 .../linux-basic/{ => system}/node/node2/cpu9 | 0 .../{ => system}/node/node2/cpulist | 0 .../linux-basic/{ => system}/node/node3/cpu12 | 0 .../linux-basic/{ => system}/node/node3/cpu13 | 0 .../linux-basic/{ => system}/node/node3/cpu14 | 0 .../linux-basic/{ => system}/node/node3/cpu15 | 0 .../{ => system}/node/node3/cpulist | 0 .../linux-basic/{ => system}/node/online | 0 .../linux-basic/{ => system}/node/possible | 0 tests/vircaps2xmltest.c | 37 +++++++------------ 121 files changed, 14 insertions(+), 23 deletions(-) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu0/topology/core_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu0/topology/core_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu0/topology/core_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu0/topology/physical_package_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu0/topology/thread_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu0/topology/thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu1/topology/core_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu1/topology/core_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu1/topology/core_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu1/topology/physical_package_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu1/topology/thread_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu1/topology/thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu10/topology/core_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu10/topology/core_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu10/topology/core_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu10/topology/physical_package_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu10/topology/thread_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu10/topology/thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu11/topology/core_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu11/topology/core_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu11/topology/core_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu11/topology/physical_package_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu11/topology/thread_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu11/topology/thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu12/topology/core_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu12/topology/core_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu12/topology/core_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu12/topology/physical_package_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu12/topology/thread_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu12/topology/thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu13/topology/core_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu13/topology/core_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu13/topology/core_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu13/topology/physical_package_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu13/topology/thread_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu13/topology/thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu14/topology/core_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu14/topology/core_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu14/topology/core_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu14/topology/physical_package_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu14/topology/thread_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu14/topology/thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu15/topology/core_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu15/topology/core_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu15/topology/core_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu15/topology/physical_package_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu15/topology/thread_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu15/topology/thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu2/topology/core_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu2/topology/core_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu2/topology/core_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu2/topology/physical_package_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu2/topology/thread_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu2/topology/thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu3/topology/core_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu3/topology/core_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu3/topology/core_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu3/topology/physical_package_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu3/topology/thread_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu3/topology/thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu4/topology/core_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu4/topology/core_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu4/topology/core_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu4/topology/physical_package_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu4/topology/thread_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu4/topology/thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu5/topology/core_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu5/topology/core_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu5/topology/core_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu5/topology/physical_package_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu5/topology/thread_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu5/topology/thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu6/topology/core_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu6/topology/core_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu6/topology/core_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu6/topology/physical_package_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu6/topology/thread_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu6/topology/thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu7/topology/core_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu7/topology/core_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu7/topology/core_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu7/topology/physical_package_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu7/topology/thread_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu7/topology/thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu8/topology/core_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu8/topology/core_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu8/topology/core_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu8/topology/physical_package_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu8/topology/thread_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu8/topology/thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu9/topology/core_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu9/topology/core_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu9/topology/core_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu9/topology/physical_package_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu9/topology/thread_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu9/topology/thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/online (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/present (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/node/node0/cpu0 (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/node/node0/cpu1 (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/node/node0/cpu2 (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/node/node0/cpu3 (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/node/node0/cpulist (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/node/node1/cpu4 (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/node/node1/cpu5 (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/node/node1/cpu6 (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/node/node1/cpu7 (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/node/node1/cpulist (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/node/node2/cpu10 (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/node/node2/cpu11 (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/node/node2/cpu8 (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/node/node2/cpu9 (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/node/node2/cpulist (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/node/node3/cpu12 (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/node/node3/cpu13 (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/node/node3/cpu14 (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/node/node3/cpu15 (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/node/node3/cpulist (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/node/online (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/node/possible (100%) diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu0/topology/core_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/core_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu0/topology/core_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/core_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu0/topology/core_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/core_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu0/topology/core_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/core_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu0/topology/core_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/core_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu0/topology/core_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/core_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu0/topology/physical_package_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/physical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu0/topology/physical_package_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/physical_package_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu0/topology/thread_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/thread_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu0/topology/thread_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/thread_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu0/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/thread_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu0/topology/thread_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/thread_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu1/topology/core_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu1/topology/core_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu1/topology/core_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu1/topology/core_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu1/topology/core_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu1/topology/core_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu1/topology/core_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu1/topology/core_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu1/topology/core_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu1/topology/core_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu1/topology/core_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu1/topology/core_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu1/topology/physical_package_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu1/topology/physical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu1/topology/physical_package_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu1/topology/physical_package_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu1/topology/thread_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu1/topology/thread_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu1/topology/thread_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu1/topology/thread_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu1/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu1/topology/thread_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu1/topology/thread_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu1/topology/thread_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu10/topology/core_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu10/topology/core_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu10/topology/core_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu10/topology/core_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu10/topology/core_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu10/topology/core_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu10/topology/core_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu10/topology/core_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu10/topology/core_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu10/topology/core_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu10/topology/core_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu10/topology/core_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu10/topology/physical_package_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu10/topology/physical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu10/topology/physical_package_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu10/topology/physical_package_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu10/topology/thread_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu10/topology/thread_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu10/topology/thread_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu10/topology/thread_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu10/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu10/topology/thread_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu10/topology/thread_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu10/topology/thread_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu11/topology/core_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu11/topology/core_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu11/topology/core_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu11/topology/core_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu11/topology/core_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu11/topology/core_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu11/topology/core_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu11/topology/core_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu11/topology/core_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu11/topology/core_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu11/topology/core_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu11/topology/core_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu11/topology/physical_package_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu11/topology/physical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu11/topology/physical_package_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu11/topology/physical_package_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu11/topology/thread_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu11/topology/thread_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu11/topology/thread_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu11/topology/thread_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu11/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu11/topology/thread_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu11/topology/thread_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu11/topology/thread_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu12/topology/core_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu12/topology/core_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu12/topology/core_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu12/topology/core_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu12/topology/core_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu12/topology/core_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu12/topology/core_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu12/topology/core_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu12/topology/core_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu12/topology/core_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu12/topology/core_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu12/topology/core_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu12/topology/physical_package_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu12/topology/physical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu12/topology/physical_package_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu12/topology/physical_package_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu12/topology/thread_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu12/topology/thread_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu12/topology/thread_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu12/topology/thread_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu12/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu12/topology/thread_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu12/topology/thread_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu12/topology/thread_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu13/topology/core_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu13/topology/core_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu13/topology/core_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu13/topology/core_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu13/topology/core_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu13/topology/core_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu13/topology/core_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu13/topology/core_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu13/topology/core_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu13/topology/core_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu13/topology/core_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu13/topology/core_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu13/topology/physical_package_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu13/topology/physical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu13/topology/physical_package_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu13/topology/physical_package_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu13/topology/thread_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu13/topology/thread_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu13/topology/thread_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu13/topology/thread_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu13/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu13/topology/thread_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu13/topology/thread_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu13/topology/thread_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu14/topology/core_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu14/topology/core_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu14/topology/core_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu14/topology/core_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu14/topology/core_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu14/topology/core_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu14/topology/core_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu14/topology/core_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu14/topology/core_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu14/topology/core_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu14/topology/core_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu14/topology/core_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu14/topology/physical_package_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu14/topology/physical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu14/topology/physical_package_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu14/topology/physical_package_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu14/topology/thread_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu14/topology/thread_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu14/topology/thread_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu14/topology/thread_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu14/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu14/topology/thread_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu14/topology/thread_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu14/topology/thread_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu15/topology/core_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu15/topology/core_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu15/topology/core_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu15/topology/core_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu15/topology/core_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu15/topology/core_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu15/topology/core_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu15/topology/core_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu15/topology/core_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu15/topology/core_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu15/topology/core_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu15/topology/core_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu15/topology/physical_package_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu15/topology/physical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu15/topology/physical_package_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu15/topology/physical_package_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu15/topology/thread_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu15/topology/thread_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu15/topology/thread_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu15/topology/thread_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu15/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu15/topology/thread_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu15/topology/thread_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu15/topology/thread_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu2/topology/core_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu2/topology/core_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu2/topology/core_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu2/topology/core_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu2/topology/core_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu2/topology/core_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu2/topology/core_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu2/topology/core_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu2/topology/core_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu2/topology/core_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu2/topology/core_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu2/topology/core_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu2/topology/physical_package_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu2/topology/physical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu2/topology/physical_package_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu2/topology/physical_package_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu2/topology/thread_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu2/topology/thread_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu2/topology/thread_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu2/topology/thread_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu2/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu2/topology/thread_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu2/topology/thread_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu2/topology/thread_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu3/topology/core_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu3/topology/core_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu3/topology/core_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu3/topology/core_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu3/topology/core_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu3/topology/core_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu3/topology/core_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu3/topology/core_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu3/topology/core_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu3/topology/core_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu3/topology/core_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu3/topology/core_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu3/topology/physical_package_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu3/topology/physical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu3/topology/physical_package_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu3/topology/physical_package_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu3/topology/thread_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu3/topology/thread_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu3/topology/thread_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu3/topology/thread_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu3/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu3/topology/thread_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu3/topology/thread_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu3/topology/thread_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu4/topology/core_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu4/topology/core_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu4/topology/core_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu4/topology/core_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu4/topology/core_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu4/topology/core_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu4/topology/core_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu4/topology/core_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu4/topology/core_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu4/topology/core_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu4/topology/core_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu4/topology/core_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu4/topology/physical_package_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu4/topology/physical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu4/topology/physical_package_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu4/topology/physical_package_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu4/topology/thread_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu4/topology/thread_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu4/topology/thread_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu4/topology/thread_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu4/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu4/topology/thread_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu4/topology/thread_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu4/topology/thread_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu5/topology/core_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu5/topology/core_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu5/topology/core_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu5/topology/core_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu5/topology/core_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu5/topology/core_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu5/topology/core_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu5/topology/core_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu5/topology/core_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu5/topology/core_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu5/topology/core_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu5/topology/core_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu5/topology/physical_package_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu5/topology/physical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu5/topology/physical_package_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu5/topology/physical_package_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu5/topology/thread_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu5/topology/thread_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu5/topology/thread_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu5/topology/thread_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu5/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu5/topology/thread_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu5/topology/thread_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu5/topology/thread_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu6/topology/core_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu6/topology/core_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu6/topology/core_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu6/topology/core_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu6/topology/core_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu6/topology/core_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu6/topology/core_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu6/topology/core_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu6/topology/core_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu6/topology/core_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu6/topology/core_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu6/topology/core_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu6/topology/physical_package_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu6/topology/physical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu6/topology/physical_package_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu6/topology/physical_package_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu6/topology/thread_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu6/topology/thread_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu6/topology/thread_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu6/topology/thread_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu6/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu6/topology/thread_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu6/topology/thread_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu6/topology/thread_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu7/topology/core_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu7/topology/core_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu7/topology/core_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu7/topology/core_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu7/topology/core_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu7/topology/core_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu7/topology/core_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu7/topology/core_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu7/topology/core_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu7/topology/core_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu7/topology/core_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu7/topology/core_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu7/topology/physical_package_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu7/topology/physical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu7/topology/physical_package_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu7/topology/physical_package_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu7/topology/thread_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu7/topology/thread_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu7/topology/thread_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu7/topology/thread_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu7/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu7/topology/thread_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu7/topology/thread_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu7/topology/thread_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu8/topology/core_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu8/topology/core_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu8/topology/core_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu8/topology/core_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu8/topology/core_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu8/topology/core_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu8/topology/core_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu8/topology/core_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu8/topology/core_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu8/topology/core_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu8/topology/core_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu8/topology/core_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu8/topology/physical_package_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu8/topology/physical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu8/topology/physical_package_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu8/topology/physical_package_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu8/topology/thread_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu8/topology/thread_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu8/topology/thread_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu8/topology/thread_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu8/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu8/topology/thread_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu8/topology/thread_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu8/topology/thread_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu9/topology/core_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu9/topology/core_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu9/topology/core_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu9/topology/core_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu9/topology/core_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu9/topology/core_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu9/topology/core_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu9/topology/core_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu9/topology/core_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu9/topology/core_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu9/topology/core_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu9/topology/core_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu9/topology/physical_package_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu9/topology/physical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu9/topology/physical_package_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu9/topology/physical_package_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu9/topology/thread_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu9/topology/thread_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu9/topology/thread_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu9/topology/thread_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu9/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu9/topology/thread_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu9/topology/thread_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu9/topology/thread_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/online b/tests/vircaps2xmldata/linux-basic/system/cpu/online similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/online rename to tests/vircaps2xmldata/linux-basic/system/cpu/online diff --git a/tests/vircaps2xmldata/linux-basic/cpu/present b/tests/vircaps2xmldata/linux-basic/system/cpu/present similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/present rename to tests/vircaps2xmldata/linux-basic/system/cpu/present diff --git a/tests/vircaps2xmldata/linux-basic/node/node0/cpu0 b/tests/vircaps2xmldata/linux-basic/system/node/node0/cpu0 similarity index 100% rename from tests/vircaps2xmldata/linux-basic/node/node0/cpu0 rename to tests/vircaps2xmldata/linux-basic/system/node/node0/cpu0 diff --git a/tests/vircaps2xmldata/linux-basic/node/node0/cpu1 b/tests/vircaps2xmldata/linux-basic/system/node/node0/cpu1 similarity index 100% rename from tests/vircaps2xmldata/linux-basic/node/node0/cpu1 rename to tests/vircaps2xmldata/linux-basic/system/node/node0/cpu1 diff --git a/tests/vircaps2xmldata/linux-basic/node/node0/cpu2 b/tests/vircaps2xmldata/linux-basic/system/node/node0/cpu2 similarity index 100% rename from tests/vircaps2xmldata/linux-basic/node/node0/cpu2 rename to tests/vircaps2xmldata/linux-basic/system/node/node0/cpu2 diff --git a/tests/vircaps2xmldata/linux-basic/node/node0/cpu3 b/tests/vircaps2xmldata/linux-basic/system/node/node0/cpu3 similarity index 100% rename from tests/vircaps2xmldata/linux-basic/node/node0/cpu3 rename to tests/vircaps2xmldata/linux-basic/system/node/node0/cpu3 diff --git a/tests/vircaps2xmldata/linux-basic/node/node0/cpulist b/tests/vircaps2xmldata/linux-basic/system/node/node0/cpulist similarity index 100% rename from tests/vircaps2xmldata/linux-basic/node/node0/cpulist rename to tests/vircaps2xmldata/linux-basic/system/node/node0/cpulist diff --git a/tests/vircaps2xmldata/linux-basic/node/node1/cpu4 b/tests/vircaps2xmldata/linux-basic/system/node/node1/cpu4 similarity index 100% rename from tests/vircaps2xmldata/linux-basic/node/node1/cpu4 rename to tests/vircaps2xmldata/linux-basic/system/node/node1/cpu4 diff --git a/tests/vircaps2xmldata/linux-basic/node/node1/cpu5 b/tests/vircaps2xmldata/linux-basic/system/node/node1/cpu5 similarity index 100% rename from tests/vircaps2xmldata/linux-basic/node/node1/cpu5 rename to tests/vircaps2xmldata/linux-basic/system/node/node1/cpu5 diff --git a/tests/vircaps2xmldata/linux-basic/node/node1/cpu6 b/tests/vircaps2xmldata/linux-basic/system/node/node1/cpu6 similarity index 100% rename from tests/vircaps2xmldata/linux-basic/node/node1/cpu6 rename to tests/vircaps2xmldata/linux-basic/system/node/node1/cpu6 diff --git a/tests/vircaps2xmldata/linux-basic/node/node1/cpu7 b/tests/vircaps2xmldata/linux-basic/system/node/node1/cpu7 similarity index 100% rename from tests/vircaps2xmldata/linux-basic/node/node1/cpu7 rename to tests/vircaps2xmldata/linux-basic/system/node/node1/cpu7 diff --git a/tests/vircaps2xmldata/linux-basic/node/node1/cpulist b/tests/vircaps2xmldata/linux-basic/system/node/node1/cpulist similarity index 100% rename from tests/vircaps2xmldata/linux-basic/node/node1/cpulist rename to tests/vircaps2xmldata/linux-basic/system/node/node1/cpulist diff --git a/tests/vircaps2xmldata/linux-basic/node/node2/cpu10 b/tests/vircaps2xmldata/linux-basic/system/node/node2/cpu10 similarity index 100% rename from tests/vircaps2xmldata/linux-basic/node/node2/cpu10 rename to tests/vircaps2xmldata/linux-basic/system/node/node2/cpu10 diff --git a/tests/vircaps2xmldata/linux-basic/node/node2/cpu11 b/tests/vircaps2xmldata/linux-basic/system/node/node2/cpu11 similarity index 100% rename from tests/vircaps2xmldata/linux-basic/node/node2/cpu11 rename to tests/vircaps2xmldata/linux-basic/system/node/node2/cpu11 diff --git a/tests/vircaps2xmldata/linux-basic/node/node2/cpu8 b/tests/vircaps2xmldata/linux-basic/system/node/node2/cpu8 similarity index 100% rename from tests/vircaps2xmldata/linux-basic/node/node2/cpu8 rename to tests/vircaps2xmldata/linux-basic/system/node/node2/cpu8 diff --git a/tests/vircaps2xmldata/linux-basic/node/node2/cpu9 b/tests/vircaps2xmldata/linux-basic/system/node/node2/cpu9 similarity index 100% rename from tests/vircaps2xmldata/linux-basic/node/node2/cpu9 rename to tests/vircaps2xmldata/linux-basic/system/node/node2/cpu9 diff --git a/tests/vircaps2xmldata/linux-basic/node/node2/cpulist b/tests/vircaps2xmldata/linux-basic/system/node/node2/cpulist similarity index 100% rename from tests/vircaps2xmldata/linux-basic/node/node2/cpulist rename to tests/vircaps2xmldata/linux-basic/system/node/node2/cpulist diff --git a/tests/vircaps2xmldata/linux-basic/node/node3/cpu12 b/tests/vircaps2xmldata/linux-basic/system/node/node3/cpu12 similarity index 100% rename from tests/vircaps2xmldata/linux-basic/node/node3/cpu12 rename to tests/vircaps2xmldata/linux-basic/system/node/node3/cpu12 diff --git a/tests/vircaps2xmldata/linux-basic/node/node3/cpu13 b/tests/vircaps2xmldata/linux-basic/system/node/node3/cpu13 similarity index 100% rename from tests/vircaps2xmldata/linux-basic/node/node3/cpu13 rename to tests/vircaps2xmldata/linux-basic/system/node/node3/cpu13 diff --git a/tests/vircaps2xmldata/linux-basic/node/node3/cpu14 b/tests/vircaps2xmldata/linux-basic/system/node/node3/cpu14 similarity index 100% rename from tests/vircaps2xmldata/linux-basic/node/node3/cpu14 rename to tests/vircaps2xmldata/linux-basic/system/node/node3/cpu14 diff --git a/tests/vircaps2xmldata/linux-basic/node/node3/cpu15 b/tests/vircaps2xmldata/linux-basic/system/node/node3/cpu15 similarity index 100% rename from tests/vircaps2xmldata/linux-basic/node/node3/cpu15 rename to tests/vircaps2xmldata/linux-basic/system/node/node3/cpu15 diff --git a/tests/vircaps2xmldata/linux-basic/node/node3/cpulist b/tests/vircaps2xmldata/linux-basic/system/node/node3/cpulist similarity index 100% rename from tests/vircaps2xmldata/linux-basic/node/node3/cpulist rename to tests/vircaps2xmldata/linux-basic/system/node/node3/cpulist diff --git a/tests/vircaps2xmldata/linux-basic/node/online b/tests/vircaps2xmldata/linux-basic/system/node/online similarity index 100% rename from tests/vircaps2xmldata/linux-basic/node/online rename to tests/vircaps2xmldata/linux-basic/system/node/online diff --git a/tests/vircaps2xmldata/linux-basic/node/possible b/tests/vircaps2xmldata/linux-basic/system/node/possible similarity index 100% rename from tests/vircaps2xmldata/linux-basic/node/possible rename to tests/vircaps2xmldata/linux-basic/system/node/possible diff --git a/tests/vircaps2xmltest.c b/tests/vircaps2xmltest.c index ede546825e..1fb8861d8a 100644 --- a/tests/vircaps2xmltest.c +++ b/tests/vircaps2xmltest.c @@ -35,7 +35,6 @@ struct virCapabilitiesData { virArch arch; bool offlineMigrate; bool liveMigrate; - bool resctrl; /* Whether both resctrl and system sysfs are used */ }; static int @@ -46,24 +45,19 @@ test_virCapabilities(const void *opaque) virCapsPtr caps = NULL; char *capsXML = NULL; char *path = NULL; - char *dir = NULL; + char *system = NULL; char *resctrl = NULL; int ret = -1; - /* - * We want to keep our directory structure clean, so if there's both resctrl - * and system used, we need to use slightly different path; a subdir. - */ - if (virAsprintf(&dir, "%s/vircaps2xmldata/linux-%s%s", - abs_srcdir, data->filename, - data->resctrl ? "/system" : "") < 0) + if (virAsprintf(&system, "%s/vircaps2xmldata/linux-%s/system", + abs_srcdir, data->filename) < 0) goto cleanup; if (virAsprintf(&resctrl, "%s/vircaps2xmldata/linux-%s/resctrl", abs_srcdir, data->filename) < 0) goto cleanup; - virFileWrapperAddPrefix("/sys/devices/system", dir); + virFileWrapperAddPrefix("/sys/devices/system", system); virFileWrapperAddPrefix("/sys/fs/resctrl", resctrl); caps = virCapabilitiesNew(data->arch, data->offlineMigrate, data->liveMigrate); @@ -89,7 +83,7 @@ test_virCapabilities(const void *opaque) ret = 0; cleanup: - VIR_FREE(dir); + VIR_FREE(system); VIR_FREE(resctrl); VIR_FREE(path); VIR_FREE(capsXML); @@ -102,27 +96,24 @@ mymain(void) { int ret = 0; -#define DO_TEST_FULL(filename, arch, offlineMigrate, liveMigrate, resctrl) \ +#define DO_TEST_FULL(filename, arch, offlineMigrate, liveMigrate) \ do { \ struct virCapabilitiesData data = {filename, arch, \ offlineMigrate, \ - liveMigrate, resctrl}; \ + liveMigrate}; \ if (virTestRun(filename, test_virCapabilities, &data) < 0) \ ret = -1; \ } while (0) - DO_TEST_FULL("basic", VIR_ARCH_X86_64, false, false, false); - DO_TEST_FULL("basic", VIR_ARCH_AARCH64, true, false, false); + DO_TEST_FULL("basic", VIR_ARCH_X86_64, false, false); + DO_TEST_FULL("basic", VIR_ARCH_AARCH64, true, false); - /* We say there is 'resctrl' even though there is none. This is special - * case because we want to use this test data for a negative tests for - * resctrl. */ - DO_TEST_FULL("caches", VIR_ARCH_X86_64, true, true, true); + DO_TEST_FULL("caches", VIR_ARCH_X86_64, true, true); - DO_TEST_FULL("resctrl", VIR_ARCH_X86_64, true, true, true); - DO_TEST_FULL("resctrl-cdp", VIR_ARCH_X86_64, true, true, true); - DO_TEST_FULL("resctrl-skx", VIR_ARCH_X86_64, true, true, true); - DO_TEST_FULL("resctrl-skx-twocaches", VIR_ARCH_X86_64, true, true, true); + DO_TEST_FULL("resctrl", VIR_ARCH_X86_64, true, true); + DO_TEST_FULL("resctrl-cdp", VIR_ARCH_X86_64, true, true); + DO_TEST_FULL("resctrl-skx", VIR_ARCH_X86_64, true, true); + DO_TEST_FULL("resctrl-skx-twocaches", VIR_ARCH_X86_64, true, true); return ret; } -- 2.17.1

2 1

[libvirt] [PATCH v2 0/2] ESX: Fixing SetAutoStart
by Marcos Paulo de Souza 03 Aug '18

03 Aug '18

This is a new version from the last patchset sent yesterday, but now using VIR_STRNDUP, instead of allocating memory manually. First version: https://www.redhat.com/archives/libvir-list/2018-August/msg00000.html Marcos Paulo de Souza (2): esx: Do not crash SetAutoStart by double free esx: Fix SetAutoStart invalid pointer free src/esx/esx_driver.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) -- 2.17.1

3 11

[libvirt] Entering freeze for libvirt-4.6.0
by Daniel Veillard 02 Aug '18

02 Aug '18

As suggested yesterday, I have just tagged the release candidate 1 in git, and pushed signed tarbal and rpms to the usual place: ftp://libvirt.org/libvirt/ seems to work fine with my limited testing, and https://ci.centos.org/view/libvirt/ is all green (except for virt-viewer-master-rpm ?) so things looks pretty good for me but please try it out on different systems and OSes. If everything goes well I will push rc2 on Tuesday targetting Thursday for the final release (or Friday if I get stuck in travels). thanks in advance for trying it out ! Daniel -- Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/ veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

11 31

[libvirt] [PATCH] tests: mock virRandomBits to make it endian stable
by Daniel P. Berrangé 02 Aug '18

02 Aug '18

virRandomBits is implemented in terms of virRandomBytes. Although we mock virRandomBytes to give a stable value, this is not sufficient to make virRandomBits give a stable value. The result of virRandomBits will vary depending on endianness. Thus we mock virRandomBits to return a stable value directly. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- tests/virrandommock.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/virrandommock.c b/tests/virrandommock.c index 99a55a576a..3079b8bacb 100644 --- a/tests/virrandommock.c +++ b/tests/virrandommock.c @@ -44,6 +44,14 @@ virRandomBytes(unsigned char *buf, return 0; } +uint64_t virRandomBits(int nbits) +{ + /* Chosen by a fair roll of a 2^64 sided dice */ + uint64_t ret = 0x0706050403020100; + if (nbits < 64) + ret &= ((1ULL << nbits) - 1); + return ret; +} int virRandomGenerateWWN(char **wwn, const char *virt_type ATTRIBUTE_UNUSED) -- 2.17.1

3 3

[libvirt] [PATCH] storage: add findPoolSources to iscsi_direct pool backend
by clem＠lse.epita.fr 02 Aug '18

02 Aug '18

From: Clementine Hayat <clem(a)lse.epita.fr> Change the SetContext function to be able to take the session type in argument. Took the function findPoolSources of iscsi backend and wired it to my function since the formatting is essentially the same. Signed-off-by: Clementine Hayat <clem(a)lse.epita.fr> --- src/storage/storage_backend_iscsi_direct.c | 179 ++++++++++++++++++++- 1 file changed, 171 insertions(+), 8 deletions(-) diff --git a/src/storage/storage_backend_iscsi_direct.c b/src/storage/storage_backend_iscsi_direct.c index ab192730fb..fc30f2dfac 100644 --- a/src/storage/storage_backend_iscsi_direct.c +++ b/src/storage/storage_backend_iscsi_direct.c @@ -131,7 +131,8 @@ virStorageBackendISCSIDirectSetAuth(struct iscsi_context *iscsi, static int virISCSIDirectSetContext(struct iscsi_context *iscsi, - const char *target_name) + const char *target_name, + enum iscsi_session_type session) { if (iscsi_init_transport(iscsi, TCP_TRANSPORT) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -139,13 +140,15 @@ virISCSIDirectSetContext(struct iscsi_context *iscsi, iscsi_get_error(iscsi)); return -1; } - if (iscsi_set_targetname(iscsi, target_name) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to set target name: %s"), - iscsi_get_error(iscsi)); - return -1; + if (session == ISCSI_SESSION_NORMAL) { + if (iscsi_set_targetname(iscsi, target_name) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to set target name: %s"), + iscsi_get_error(iscsi)); + return -1; + } } - if (iscsi_set_session_type(iscsi, ISCSI_SESSION_NORMAL) < 0) { + if (iscsi_set_session_type(iscsi, session) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to set session type: %s"), iscsi_get_error(iscsi)); @@ -400,6 +403,92 @@ virISCSIDirectDisconnect(struct iscsi_context *iscsi) return 0; } +static void +virFreeTargets(char **targets, size_t ntargets, char *target) +{ + size_t i; + + VIR_FREE(target); + for (i = 0; i < ntargets; i++) + VIR_FREE(targets[i]); + VIR_FREE(targets); +} + +static int +virISCSIDirectUpdateTargets(struct iscsi_context *iscsi, + size_t *ntargets, + char ***targets) +{ + int ret = -1; + struct iscsi_discovery_address *addr; + struct iscsi_discovery_address *tmp_addr; + size_t tmp_ntargets = 0; + char **tmp_targets = NULL; + + if (!(addr = iscsi_discovery_sync(iscsi))) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to discover session: %s"), + iscsi_get_error(iscsi)); + return ret; + } + *ntargets = 0; + for (tmp_addr = addr; tmp_addr; tmp_addr = tmp_addr->next) { + char *target = NULL; + if (VIR_STRDUP(target, tmp_addr->target_name) < 0) { + virFreeTargets(tmp_targets, tmp_ntargets, NULL); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to allocate memory for: %s"), + tmp_addr->target_name); + goto cleanup; + } + + if (VIR_APPEND_ELEMENT(tmp_targets, tmp_ntargets, target) < 0) { + virFreeTargets(tmp_targets, tmp_ntargets, target); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to append to the list element: %s"), + tmp_addr->target_name); + goto cleanup; + } + + } + + if (tmp_ntargets) { + *targets = tmp_targets; + *ntargets = tmp_ntargets; + } + + ret = 0; + cleanup: + iscsi_free_discovery_data(iscsi, addr); + return ret; +} + +static int +virISCSIDirectScanTargets(char *initiator_iqn, + char *portal, + size_t *ntargets, + char ***targets) +{ + struct iscsi_context *iscsi = NULL; + int ret = -1; + + if (!(iscsi = virISCSIDirectCreateContext(initiator_iqn))) + goto cleanup; + if (virISCSIDirectSetContext(iscsi, NULL, ISCSI_SESSION_DISCOVERY) < 0) + goto cleanup; + if (virISCSIDirectConnect(iscsi, portal) < 0) + goto cleanup; + if (virISCSIDirectUpdateTargets(iscsi, ntargets, targets) < 0) + goto disconnect; + + ret = 0; + disconnect: + virISCSIDirectDisconnect(iscsi); + cleanup: + iscsi_destroy_context(iscsi); + return ret; +} + static int virStorageBackendISCSIDirectCheckPool(virStoragePoolObjPtr pool, bool *isActive) @@ -408,6 +497,79 @@ virStorageBackendISCSIDirectCheckPool(virStoragePoolObjPtr pool, return 0; } +static char * +virStorageBackendISCSIDirectFindPoolSources(const char *srcSpec, + unsigned int flags) +{ + virStoragePoolSourcePtr source = NULL; + size_t ntargets = 0; + char **targets = NULL; + char *ret = NULL; + size_t i; + virStoragePoolSourceList list = { + .type = VIR_STORAGE_POOL_ISCSI_DIRECT, + .nsources = 0, + .sources = NULL + }; + char *portal = NULL; + + virCheckFlags(0, NULL); + + if (!srcSpec) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("hostname must be specified for iscsi sources")); + return NULL; + } + + if (!(source = virStoragePoolDefParseSourceString(srcSpec, list.type))) + return NULL; + + if (source->nhost != 1) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Expected exactly 1 host for the storage pool")); + goto cleanup; + } + + if (!(portal = virStorageBackendISCSIDirectPortal(source))) + goto cleanup; + + if (virISCSIDirectScanTargets(source->initiator.iqn, portal, &ntargets, &targets) < 0) + goto cleanup; + + if (VIR_ALLOC_N(list.sources, ntargets) < 0) + goto cleanup; + + for (i = 0; i < ntargets; i++) { + if (VIR_ALLOC_N(list.sources[i].devices, 1) < 0 || + VIR_ALLOC_N(list.sources[i].hosts, 1) < 0) + goto cleanup; + list.sources[i].nhost = 1; + list.sources[i].hosts[0] = source->hosts[0]; + list.sources[i].initiator = source->initiator; + list.sources[i].ndevice = 1; + list.sources[i].devices[0].path = targets[i]; + list.nsources++; + } + + if (!(ret = virStoragePoolSourceListFormat(&list))) + goto cleanup; + + cleanup: + if (list.sources) { + for (i = 0; i < ntargets; i++) { + VIR_FREE(list.sources[i].hosts); + VIR_FREE(list.sources[i].devices); + } + VIR_FREE(list.sources); + } + for (i = 0; i < ntargets; i++) + VIR_FREE(targets[i]); + VIR_FREE(targets); + VIR_FREE(portal); + virStoragePoolSourceFree(source); + return ret; +} + static int virStorageBackendISCSIDirectRefreshPool(virStoragePoolObjPtr pool) { @@ -422,7 +584,7 @@ virStorageBackendISCSIDirectRefreshPool(virStoragePoolObjPtr pool) goto cleanup; if (virStorageBackendISCSIDirectSetAuth(iscsi, &def->source) < 0) goto cleanup; - if (virISCSIDirectSetContext(iscsi, def->source.devices[0].path) < 0) + if (virISCSIDirectSetContext(iscsi, def->source.devices[0].path, ISCSI_SESSION_NORMAL) < 0) goto cleanup; if (virISCSIDirectConnect(iscsi, portal) < 0) goto cleanup; @@ -442,6 +604,7 @@ virStorageBackend virStorageBackendISCSIDirect = { .type = VIR_STORAGE_POOL_ISCSI_DIRECT, .checkPool = virStorageBackendISCSIDirectCheckPool, + .findPoolSources = virStorageBackendISCSIDirectFindPoolSources, .refreshPool = virStorageBackendISCSIDirectRefreshPool, }; -- 2.18.0

3 2

[libvirt] [PATCH] util: virrandom: make virRandomBits endian-safe
by Bjoern Walk 02 Aug '18

02 Aug '18

Make the generation of random bits in virRandomBits independent of the endianness of the running architecture. This also solves problems with the mocked random byte generation on big-endian machines. Suggested-by: Daniel P. Berrangé <berrange(a)redhat.com> Signed-off-by: Bjoern Walk <bwalk(a)linux.ibm.com> --- This goes on top of Michal's fix: https://www.redhat.com/archives/libvir-list/2018-August/msg00080.html src/util/virrandom.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/util/virrandom.c b/src/util/virrandom.c index 7915f653..26ff68f5 100644 --- a/src/util/virrandom.c +++ b/src/util/virrandom.c @@ -34,6 +34,7 @@ # include <gnutls/crypto.h> #endif +#include "virendian.h" #include "virrandom.h" #include "virthread.h" #include "count-one-bits.h" @@ -61,13 +62,16 @@ VIR_LOG_INIT("util.random"); uint64_t virRandomBits(int nbits) { uint64_t ret = 0; + uint8_t val[8]; - if (virRandomBytes((unsigned char *) &ret, sizeof(ret)) < 0) { + if (virRandomBytes((unsigned char *) &val, sizeof(val)) < 0) { /* You're already hosed, so this particular non-random value * isn't any worse. */ return 0; } + ret = virReadBufInt64LE(val); + if (nbits < 64) ret &= (1ULL << nbits) - 1; -- 2.17.0

3 5

[libvirt] [PATCH] tests: fix test segfault when libxl configuration setup fails.
by Julio Faracco 02 Aug '18

02 Aug '18

This commit fixes a segmentation fault caused by missing conditional to check if libxl configuration was properly created by the test. If the configuration was not properly created, libxlDriverConfigNew() function will return NULL and cause a segfault at cfg->caps = NULL during the cleanup. Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- tests/libxlxml2domconfigtest.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/libxlxml2domconfigtest.c b/tests/libxlxml2domconfigtest.c index 34a63e22b5..a9758c40cb 100644 --- a/tests/libxlxml2domconfigtest.c +++ b/tests/libxlxml2domconfigtest.c @@ -138,7 +138,8 @@ testCompareXMLToDomConfig(const char *xmlfile, libxl_domain_config_dispose(&actualconfig); libxl_domain_config_dispose(&expectconfig); xtl_logger_destroy(log); - cfg->caps = NULL; + if (cfg) + cfg->caps = NULL; virObjectUnref(cfg); return ret; } -- 2.17.1

2 2

[libvirt] [PATCH for-3.1] s390x: remove 's390-squash-mcss' option
by Cornelia Huck 02 Aug '18

02 Aug '18

This option has been deprecated for two releases; remove it. Signed-off-by: Cornelia Huck <cohuck(a)redhat.com> --- hw/s390x/3270-ccw.c | 2 +- hw/s390x/css-bridge.c | 1 - hw/s390x/css.c | 6 ++---- hw/s390x/s390-ccw.c | 2 +- hw/s390x/s390-virtio-ccw.c | 37 ++----------------------------------- hw/s390x/virtio-ccw.c | 2 +- include/hw/s390x/css-bridge.h | 1 - include/hw/s390x/css.h | 9 +++------ include/hw/s390x/s390-virtio-ccw.h | 1 - qemu-deprecated.texi | 8 -------- qemu-options.hx | 10 ---------- target/s390x/cpu.c | 10 ---------- target/s390x/cpu.h | 1 - 13 files changed, 10 insertions(+), 80 deletions(-) diff --git a/hw/s390x/3270-ccw.c b/hw/s390x/3270-ccw.c index 3af13ea027..cf58b81fc0 100644 --- a/hw/s390x/3270-ccw.c +++ b/hw/s390x/3270-ccw.c @@ -104,7 +104,7 @@ static void emulated_ccw_3270_realize(DeviceState *ds, Error **errp) SubchDev *sch; Error *err = NULL; - sch = css_create_sch(cdev->devno, cbus->squash_mcss, errp); + sch = css_create_sch(cdev->devno, errp); if (!sch) { return; } diff --git a/hw/s390x/css-bridge.c b/hw/s390x/css-bridge.c index a02d708239..1bd6c8b458 100644 --- a/hw/s390x/css-bridge.c +++ b/hw/s390x/css-bridge.c @@ -106,7 +106,6 @@ VirtualCssBus *virtual_css_bus_init(void) /* Create bus on bridge device */ bus = qbus_create(TYPE_VIRTUAL_CSS_BUS, dev, "virtual-css"); cbus = VIRTUAL_CSS_BUS(bus); - cbus->squash_mcss = s390_get_squash_mcss(); /* Enable hotplugging */ qbus_set_hotplug_handler(bus, dev, &error_abort); diff --git a/hw/s390x/css.c b/hw/s390x/css.c index 5424ea4562..5a9fe45ce8 100644 --- a/hw/s390x/css.c +++ b/hw/s390x/css.c @@ -2359,15 +2359,13 @@ const PropertyInfo css_devid_ro_propinfo = { .get = get_css_devid, }; -SubchDev *css_create_sch(CssDevId bus_id, bool squash_mcss, Error **errp) +SubchDev *css_create_sch(CssDevId bus_id, Error **errp) { uint16_t schid = 0; SubchDev *sch; if (bus_id.valid) { - if (squash_mcss) { - bus_id.cssid = channel_subsys.default_cssid; - } else if (!channel_subsys.css[bus_id.cssid]) { + if (!channel_subsys.css[bus_id.cssid]) { css_create_css_image(bus_id.cssid, false); } diff --git a/hw/s390x/s390-ccw.c b/hw/s390x/s390-ccw.c index 214c940593..d1280bf631 100644 --- a/hw/s390x/s390-ccw.c +++ b/hw/s390x/s390-ccw.c @@ -78,7 +78,7 @@ static void s390_ccw_realize(S390CCWDevice *cdev, char *sysfsdev, Error **errp) goto out_err_propagate; } - sch = css_create_sch(ccw_dev->devno, cbus->squash_mcss, &err); + sch = css_create_sch(ccw_dev->devno, &err); if (!sch) { goto out_mdevid_free; } diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 7983185d04..380a41d806 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -282,19 +282,8 @@ static void ccw_init(MachineState *machine) virtio_ccw_register_hcalls(); s390_enable_css_support(s390_cpu_addr2state(0)); - /* - * Non mcss-e enabled guests only see the devices from the default - * css, which is determined by the value of the squash_mcss property. - */ - if (css_bus->squash_mcss) { - ret = css_create_css_image(0, true); - } else { - ret = css_create_css_image(VIRTUAL_CSSID, true); - } - if (qemu_opt_get(qemu_get_machine_opts(), "s390-squash-mcss")) { - warn_report("The machine property 's390-squash-mcss' is deprecated" - " (obsoleted by lifting the cssid restrictions)."); - } + + ret = css_create_css_image(VIRTUAL_CSSID, true); assert(ret == 0); if (css_migration_enabled()) { @@ -575,21 +564,6 @@ static void machine_set_loadparm(Object *obj, const char *val, Error **errp) ms->loadparm[i] = ' '; /* pad right with spaces */ } } -static inline bool machine_get_squash_mcss(Object *obj, Error **errp) -{ - S390CcwMachineState *ms = S390_CCW_MACHINE(obj); - - return ms->s390_squash_mcss; -} - -static inline void machine_set_squash_mcss(Object *obj, bool value, - Error **errp) -{ - S390CcwMachineState *ms = S390_CCW_MACHINE(obj); - - ms->s390_squash_mcss = value; -} - static inline void s390_machine_initfn(Object *obj) { object_property_add_bool(obj, "aes-key-wrap", @@ -614,13 +588,6 @@ static inline void s390_machine_initfn(Object *obj) " to upper case) to pass to machine loader, boot manager," " and guest kernel", NULL); - object_property_add_bool(obj, "s390-squash-mcss", - machine_get_squash_mcss, - machine_set_squash_mcss, NULL); - object_property_set_description(obj, "s390-squash-mcss", "(deprecated) " - "enable/disable squashing subchannels into the default css", - NULL); - object_property_set_bool(obj, false, "s390-squash-mcss", NULL); } static const TypeInfo ccw_machine_info = { diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index 7ddb378d52..3156e8d6e1 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -700,7 +700,7 @@ static void virtio_ccw_device_realize(VirtioCcwDevice *dev, Error **errp) SubchDev *sch; Error *err = NULL; - sch = css_create_sch(ccw_dev->devno, cbus->squash_mcss, errp); + sch = css_create_sch(ccw_dev->devno, errp); if (!sch) { return; } diff --git a/include/hw/s390x/css-bridge.h b/include/hw/s390x/css-bridge.h index cf0860432a..5a0203be5f 100644 --- a/include/hw/s390x/css-bridge.h +++ b/include/hw/s390x/css-bridge.h @@ -28,7 +28,6 @@ typedef struct VirtualCssBridge { /* virtual css bus type */ typedef struct VirtualCssBus { BusState parent_obj; - bool squash_mcss; } VirtualCssBus; #define TYPE_VIRTUAL_CSS_BUS "virtual-css-bus" diff --git a/include/hw/s390x/css.h b/include/hw/s390x/css.h index 35facb47d2..9da5912921 100644 --- a/include/hw/s390x/css.h +++ b/include/hw/s390x/css.h @@ -266,11 +266,8 @@ extern const PropertyInfo css_devid_ro_propinfo; /** * Create a subchannel for the given bus id. * - * If @p bus_id is valid, and @p squash_mcss is true, verify that it is - * not already in use in the default css, and find a free devno from the - * default css image for it. - * If @p bus_id is valid, and @p squash_mcss is false, verify that it is - * not already in use, and find a free devno for it. + * If @p bus_id is valid, verify that it is not already in use, and find a + * free devno for it. * If @p bus_id is not valid find a free subchannel id and device number * across all subchannel sets and all css images starting from the default * css image. @@ -282,7 +279,7 @@ extern const PropertyInfo css_devid_ro_propinfo; * The caller becomes owner of the returned subchannel structure and * is responsible for unregistering and freeing it. */ -SubchDev *css_create_sch(CssDevId bus_id, bool squash_mcss, Error **errp); +SubchDev *css_create_sch(CssDevId bus_id, Error **errp); /** Turn on css migration */ void css_register_vmstate(void); diff --git a/include/hw/s390x/s390-virtio-ccw.h b/include/hw/s390x/s390-virtio-ccw.h index ab88d49d10..e9c4f4182b 100644 --- a/include/hw/s390x/s390-virtio-ccw.h +++ b/include/hw/s390x/s390-virtio-ccw.h @@ -29,7 +29,6 @@ typedef struct S390CcwMachineState { bool aes_key_wrap; bool dea_key_wrap; uint8_t loadparm[8]; - bool s390_squash_mcss; } S390CcwMachineState; typedef struct S390CcwMachineClass { diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index 9920a85adc..09f7b22fb1 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -126,14 +126,6 @@ The ``-nodefconfig`` argument is a synonym for ``-no-user-config``. The @option{--balloon virtio} argument has been superseded by @option{--device virtio-balloon}. -@subsection -machine s390-squash-mcss=on|off (since 2.12.0) - -The ``s390-squash-mcss=on`` property has been obsoleted by allowing the -cssid to be chosen freely. Instead of squashing subchannels into the -default channel subsystem image for guests that do not support multiple -channel subsystems, all devices can be put into the default channel -subsystem image. - @subsection -fsdev handle (since 2.12.0) The ``handle'' fsdev backend does not support symlinks and causes the 9p diff --git a/qemu-options.hx b/qemu-options.hx index b1bf0f485f..e57cec96a5 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -43,7 +43,6 @@ DEF("machine", HAS_ARG, QEMU_OPTION_machine, \ " suppress-vmdesc=on|off disables self-describing migration (default=off)\n" " nvdimm=on|off controls NVDIMM support (default=off)\n" " enforce-config-section=on|off enforce configuration section migration (default=off)\n" - " s390-squash-mcss=on|off (deprecated) controls support for squashing into default css (default=off)\n" " memory-encryption=@var{} memory encryption object to use (default=none)\n", QEMU_ARCH_ALL) STEXI @@ -96,15 +95,6 @@ controls whether DEA wrapping keys will be created to allow execution of DEA cryptographic functions. The default is on. @item nvdimm=on|off Enables or disables NVDIMM support. The default is off. -@item s390-squash-mcss=on|off -Enables or disables squashing subchannels into the default css. -The default is off. -NOTE: This property is deprecated and will be removed in future releases. -The ``s390-squash-mcss=on`` property has been obsoleted by allowing the -cssid to be chosen freely. Instead of squashing subchannels into the -default channel subsystem image for guests that do not support multiple -channel subsystems, all devices can be put into the default channel -subsystem image. @item enforce-config-section=on|off If @option{enforce-config-section} is set to @var{on}, force migration code to send configuration section even if the machine-type sets the diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c index 271c5ce652..8ed4823d6e 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -421,16 +421,6 @@ void s390_crypto_reset(void) } } -bool s390_get_squash_mcss(void) -{ - if (object_property_get_bool(OBJECT(qdev_get_machine()), "s390-squash-mcss", - NULL)) { - return true; - } - - return false; -} - void s390_enable_css_support(S390CPU *cpu) { if (kvm_enabled()) { diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h index 2c3dd2d189..86b66dfeac 100644 --- a/target/s390x/cpu.h +++ b/target/s390x/cpu.h @@ -713,7 +713,6 @@ static inline void s390_do_cpu_load_normal(CPUState *cs, run_on_cpu_data arg) /* cpu.c */ void s390_crypto_reset(void); -bool s390_get_squash_mcss(void); int s390_set_memory_limit(uint64_t new_limit, uint64_t *hw_limit); void s390_cmma_reset(void); void s390_enable_css_support(S390CPU *cpu); -- 2.14.4

6 14

[libvirt] [PATCH for v4.6.0 0/2] Fix some random problems
by Michal Privoznik 02 Aug '18

02 Aug '18

Bad pun. But while debugging the issue Bjoern raised [1] I've noticed these problems. https://www.redhat.com/archives/libvir-list/2018-July/msg02101.html Michal Prívozník (2): util: Don't overflow in virRandomBits viriscsi: Request more random bits for interface name src/util/viriscsi.c | 2 +- src/util/virrandom.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.16.4

5 15

[libvirt] [jenkins-ci PATCH 0/8] lcitool: Cleanups and improvements
by Andrea Bolognani 01 Aug '18

01 Aug '18

This series makes the guests/ directory less crowded by moving a bunch of files to subdirectories, enhances the lcitool script so that it works when called from any directory, and introduces the ability to skip installation of build dependencies for projects you don't care about. Some of these changes pave the way for introducing [secret feature redacted] later on. Andrea Bolognani (8): lcitool: Make the script location-independent lcitool: Use JSON to pass extra-vars lcitool: Pass base and playbook_base to Ansible guests: Move update playbook and related resources guests: Drop install_config from inventory guests: Move install configs lcitool: Allow installing a subset of build dependencies guests: Update documentation guests/README.markdown | 38 ++++++-- guests/{ => configs}/kickstart.cfg | 0 guests/{ => configs}/preseed.cfg | 0 guests/host_vars/libvirt-centos-7/install.yml | 1 - guests/host_vars/libvirt-debian-8/install.yml | 1 - guests/host_vars/libvirt-debian-9/install.yml | 1 - .../host_vars/libvirt-debian-sid/install.yml | 1 - .../host_vars/libvirt-fedora-27/install.yml | 1 - .../host_vars/libvirt-fedora-28/install.yml | 1 - .../libvirt-fedora-rawhide/install.yml | 1 - .../host_vars/libvirt-ubuntu-16/install.yml | 1 - .../host_vars/libvirt-ubuntu-18/install.yml | 1 - guests/lcitool | 96 ++++++++++++++----- .../{site.yml => playbooks/update/main.yml} | 30 +++--- guests/{ => playbooks/update}/tasks/base.yml | 6 +- .../update}/tasks/bootloader.yml | 0 .../update}/tasks/bootstrap.yml | 0 .../{ => playbooks/update}/tasks/jenkins.yml | 4 +- .../{ => playbooks/update}/tasks/kludges.yml | 0 .../{ => playbooks/update}/tasks/packages.yml | 2 +- guests/{ => playbooks/update}/tasks/paths.yml | 0 .../{ => playbooks/update}/tasks/services.yml | 0 guests/{ => playbooks/update}/tasks/users.yml | 4 +- .../update}/templates/bash_profile.j2 | 0 .../update}/templates/bashrc.j2 | 0 .../update}/templates/ccache.conf.j2 | 0 .../fedora-rawhide-kernel-nodebug.repo.j2 | 0 .../update}/templates/jenkins.service.j2 | 0 .../templates/jessie-backports.preferences.j2 | 0 .../templates/jessie-backports.sources.j2 | 0 30 files changed, 128 insertions(+), 61 deletions(-) rename guests/{ => configs}/kickstart.cfg (100%) rename guests/{ => configs}/preseed.cfg (100%) rename guests/{site.yml => playbooks/update/main.yml} (52%) rename guests/{ => playbooks/update}/tasks/base.yml (92%) rename guests/{ => playbooks/update}/tasks/bootloader.yml (100%) rename guests/{ => playbooks/update}/tasks/bootstrap.yml (100%) rename guests/{ => playbooks/update}/tasks/jenkins.yml (92%) rename guests/{ => playbooks/update}/tasks/kludges.yml (100%) rename guests/{ => playbooks/update}/tasks/packages.yml (96%) rename guests/{ => playbooks/update}/tasks/paths.yml (100%) rename guests/{ => playbooks/update}/tasks/services.yml (100%) rename guests/{ => playbooks/update}/tasks/users.yml (95%) rename guests/{ => playbooks/update}/templates/bash_profile.j2 (100%) rename guests/{ => playbooks/update}/templates/bashrc.j2 (100%) rename guests/{ => playbooks/update}/templates/ccache.conf.j2 (100%) rename guests/{ => playbooks/update}/templates/fedora-rawhide-kernel-nodebug.repo.j2 (100%) rename guests/{ => playbooks/update}/templates/jenkins.service.j2 (100%) rename guests/{ => playbooks/update}/templates/jessie-backports.preferences.j2 (100%) rename guests/{ => playbooks/update}/templates/jessie-backports.sources.j2 (100%) -- 2.17.1

2 17

[libvirt] [PATCH] tests: viriscsitest: make it work on big endian archs
by Pino Toscano 01 Aug '18

01 Aug '18

viriscsitest tries to ensure the interface IQN used is a specific one, checking later on that it is the same all during the whole test. Since the IQN generation involves random bytes, viriscsitest got a fake virRandomBytes from the virrandommock helper library, setting static values. virRandomBits(), called by virStorageBackendCreateIfaceIQN(), always requests 8 random bytes, chopping off the ones not requested by the caller -- this meant that on big endian machines it would chop bytes from the wrong size of the data buffer, and thus not returning the expected numbers. As a fix, do not rely on the mock virRandomBytes, but provide an own version of it: this version will fill the values in the expected order, depending on the endianness of the system. This way, the result of virStorageBackendCreateIfaceIQN() will be what the test actually expects. Signed-off-by: Pino Toscano <ptoscano(a)redhat.com> --- tests/viriscsitest.c | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/tests/viriscsitest.c b/tests/viriscsitest.c index 4fd7ff6e19..d43c0115d3 100644 --- a/tests/viriscsitest.c +++ b/tests/viriscsitest.c @@ -21,6 +21,7 @@ #include <config.h> #include "testutils.h" +#include "virrandom.h" #ifdef WIN32 int @@ -36,6 +37,32 @@ main(void) # define VIR_FROM_THIS VIR_FROM_NONE +bool isLittleEndian(void); +bool isLittleEndian(void) +{ + static int cache = -1; + if (cache < 0) { + int val = 1; + char *ptr = (char *)&val; + cache = *ptr ? 1 : 0; + } + return cache > 0; +} + + +int +virRandomBytes(unsigned char *buf, + size_t buflen) +{ + size_t i; + const bool isLE = isLittleEndian(); + + for (i = 0; i < buflen; i++) + buf[i] = isLE ? i : buflen - i - 1; + + return 0; +} + static const char *iscsiadmSessionOutput = "tcp: [1] 10.20.30.40:3260,1 iqn.2004-06.example:example1:iscsi.test\n" "tcp: [2] 10.20.30.41:3260,1 iqn.2005-05.example:example1:iscsi.hello\n" @@ -368,6 +395,5 @@ mymain(void) return EXIT_SUCCESS; } -VIR_TEST_MAIN_PRELOAD(mymain, - abs_builddir "/.libs/virrandommock.so") +VIR_TEST_MAIN(mymain) #endif /* WIN32 */ -- 2.17.1

3 3

Re: [libvirt] [PATCH v2] conf: virDomainDefValidateInternal prohibit some characters in shmem name
by skobyda＠redhat.com 01 Aug '18

01 Aug '18

On Fri, 2018-07-27 at 13:19 -0400, John Ferlan wrote: > You shouldn't drop libvir-list when you reply... Sorry, I dropped it by mistake. > > On 07/27/2018 06:35 AM, skobyda(a)redhat.com wrote: > > On Mon, 2018-07-23 at 17:32 -0400, John Ferlan wrote: > > > > > > On 07/12/2018 09:10 AM, Simon Kobyda wrote: > > > > XML shmem name will not include character '/', and will not be > > > > equal to strings > > > > "." or "..", as shmem name is used in a path. > > > > > > Validate that the provided XML shmem name is not directory > > > specific > > > "." > > > or ".." names as well as ensuring that there is no path separator > > > '/' > > > in > > > the name. > > > > https://bugzilla.redhat.com/show_bug.cgi?id=1192400 > > > > --- > > > > > > > > Changes in V2 > > > > - Added error reports > > > > - Error situation will happen only if shmem name is > > > > equal to > > > > "." or "..", however their occurence in a name > > > > compromised of > > > > more > > > > characters is allowed. > > > > > > > > src/conf/domain_conf.c | 22 ++++++++++++++++++++++ > > > > 1 file changed, 22 insertions(+) > > > > > > > > > > I believe this actually belongs in > > > virDomainDeviceDefValidateInternal > > > for case VIR_DOMAIN_DEVICE_SHMEM. > > > Also, should the docs/schemas/domaincommon.rng be modified? > > > Currently > > > it > > > has: > > > > > > <define name="shmem"> > > > <element name="shmem"> > > > <attribute name="name"> > > > <data type="string"> > > > <param name="pattern">[^/]*</param> > > > </data> > > > > > > > Is it a good idea? To create such regular expression, I believe it > > would make it unreadable for another person, ergo useless. I don't > > want > > it to end up as IPv6. I've benn told that actual parser can be, and > > sometimes is stricter than scheme. > > > > Well this is what I was hoping others would be able to chime in on. > Hence why you ask on list. I don't disagree that being stricter in > Parse > is fine. Doing regexes is like reading a foreign language to me at > times. Some just don't make sense. Yeah, that's why I don't want to try to insert complicated regex in docs/schemas/domaincommon.rng. > > I think that regex is indicating - any character except '/', but I'm > not > sure. If it is, it's ironic that we have to check for '/' > specifically > since it shouldn't be passing the xml validation test - OK at least > if > one was editing via virsh. > > John > You are right about what that regex does. But from what I heard, that functionality is rather new to libvirt, so users have option to bypass that verification. So I would like to also leave it in code in case users try to bypass that regex verification. Simon. > > > Consider how other names are limited in their scope. The > > > basictypes.rng > > > has a number of examples. > > > > > > Naturally, the problem with changing it is that someone somewhere > > > will > > > complain, but libvirt used to accept this other format. Right now > > > I > > > would think the scope a bit too broad. > > > > But then we cannot fix most of the bugs, since there could always > > be > > some user which relies on bug behavior. > > > > > > If we are to limit the name we should also document in > > > docs/formatdomain.html.in that the shmem name is "limited" in > > > name to > > > avoid the '/' character, ".", and "..". > > > > > > BTW: My regex isn't that good, but it would seem '/' is an > > > invalid > > > character by XML standards even though the code never checked for > > > it. > > > Using virt-xml-validate <file> <schema> would "validate" whether > > > someone > > > provides valid XML. > > > > > > > > > John > > > > > > > diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c > > > > index 7ab2953d83..6b34c17de4 100644 > > > > --- a/src/conf/domain_conf.c > > > > +++ b/src/conf/domain_conf.c > > > > @@ -6107,6 +6107,8 @@ virDomainDefLifecycleActionValidate(const > > > > virDomainDef *def) > > > > static int > > > > virDomainDefValidateInternal(const virDomainDef *def) > > > > { > > > > + size_t i; > > > > + > > > > if (virDomainDefCheckDuplicateDiskInfo(def) < 0) > > > > return -1; > > > > > > > > @@ -6136,6 +6138,26 @@ virDomainDefValidateInternal(const > > > > virDomainDef *def) > > > > return -1; > > > > } > > > > > > > > + for (i = 0; i < def->nshmems; i++) { > > > > + if (strchr(def->shmems[i]->name, '/')) { > > > > + virReportError(VIR_ERR_XML_ERROR, "%s", > > > > + _("shmem name cannot include '/' > > > > character")); > > > > + return -1; > > > > + } > > > > + > > > > + if (STREQ(def->shmems[i]->name, ".")) { > > > > + virReportError(VIR_ERR_XML_ERROR, "%s", > > > > + _("shmem name cannot be equal to > > > > '.'")); > > > > + return -1; > > > > + } > > > > + > > > > + if (STREQ(def->shmems[i]->name, "..")) { > > > > + virReportError(VIR_ERR_XML_ERROR, "%s", > > > > + _("shmem name cannot be equal to > > > > '..'")); > > > > + return -1; > > > > + } > > > > + } > > > > + > > > > if (virDomainDefLifecycleActionValidate(def) < 0) > > > > return -1; > > > > > > > >

2 1

[libvirt] [PATCH for 4.6.0] tests: qemucapsprobe: Fix output after swithching to jansson
by Peter Krempa 01 Aug '18

01 Aug '18

Jansson does not put a newline at the end of formatted JSON strings. This breaks the qemucapsprobe utility as we need to keep the spacing so that tests work. Add an explicit newline. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- tests/qemucapsprobemock.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/qemucapsprobemock.c b/tests/qemucapsprobemock.c index 5936975505..049b16273a 100644 --- a/tests/qemucapsprobemock.c +++ b/tests/qemucapsprobemock.c @@ -76,6 +76,7 @@ qemuMonitorSend(qemuMonitorPtr mon, printLineSkipEmpty("\n", stdout); printLineSkipEmpty(reformatted, stdout); + printLineSkipEmpty("\n", stdout); VIR_FREE(reformatted); return realQemuMonitorSend(mon, msg); @@ -116,6 +117,7 @@ qemuMonitorJSONIOProcessLine(qemuMonitorPtr mon, printLineSkipEmpty("\n", stdout); printLineSkipEmpty(json, stdout); + printLineSkipEmpty("\n", stdout); } cleanup: -- 2.16.2

4 5

[libvirt] [dockerfiles PATCH] Update OS when building images
by Andrea Bolognani 01 Aug '18

01 Aug '18

The corresponding libvirt-jenkins-ci commit is dcbad35f45fe. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed under the Dockerfile refresh rule. buildenv-centos-7.Dockerfile | 3 ++- buildenv-debian-8.Dockerfile | 1 + buildenv-debian-9.Dockerfile | 1 + buildenv-debian-sid.Dockerfile | 1 + buildenv-fedora-27.Dockerfile | 3 ++- buildenv-fedora-28.Dockerfile | 3 ++- buildenv-fedora-rawhide.Dockerfile | 3 ++- buildenv-ubuntu-16.Dockerfile | 1 + buildenv-ubuntu-18.Dockerfile | 1 + 9 files changed, 13 insertions(+), 4 deletions(-) diff --git a/buildenv-centos-7.Dockerfile b/buildenv-centos-7.Dockerfile index 2c4c26d..896bf68 100644 --- a/buildenv-centos-7.Dockerfile +++ b/buildenv-centos-7.Dockerfile @@ -65,6 +65,7 @@ ENV PACKAGES audit-libs-devel \ sudo \ systemtap-sdt-devel \ vim -RUN yum install -y ${PACKAGES} && \ +RUN yum update -y && \ + yum install -y ${PACKAGES} && \ yum autoremove -y && \ yum clean all -y diff --git a/buildenv-debian-8.Dockerfile b/buildenv-debian-8.Dockerfile index 8a8c3b0..8877528 100644 --- a/buildenv-debian-8.Dockerfile +++ b/buildenv-debian-8.Dockerfile @@ -71,6 +71,7 @@ ENV PACKAGES augeas-tools \ xsltproc \ zfs-fuse RUN apt-get update && \ + apt-get dist-upgrade -y && \ apt-get install -y ${PACKAGES} && \ apt-get autoremove -y && \ apt-get autoclean -y diff --git a/buildenv-debian-9.Dockerfile b/buildenv-debian-9.Dockerfile index c3af421..0592c97 100644 --- a/buildenv-debian-9.Dockerfile +++ b/buildenv-debian-9.Dockerfile @@ -73,6 +73,7 @@ ENV PACKAGES augeas-tools \ xsltproc \ zfs-fuse RUN apt-get update && \ + apt-get dist-upgrade -y && \ apt-get install -y ${PACKAGES} && \ apt-get autoremove -y && \ apt-get autoclean -y diff --git a/buildenv-debian-sid.Dockerfile b/buildenv-debian-sid.Dockerfile index a922457..2d0310d 100644 --- a/buildenv-debian-sid.Dockerfile +++ b/buildenv-debian-sid.Dockerfile @@ -73,6 +73,7 @@ ENV PACKAGES augeas-tools \ xsltproc \ zfs-fuse RUN apt-get update && \ + apt-get dist-upgrade -y && \ apt-get install -y ${PACKAGES} && \ apt-get autoremove -y && \ apt-get autoclean -y diff --git a/buildenv-fedora-27.Dockerfile b/buildenv-fedora-27.Dockerfile index 2f35a2e..09ec721 100644 --- a/buildenv-fedora-27.Dockerfile +++ b/buildenv-fedora-27.Dockerfile @@ -73,6 +73,7 @@ ENV PACKAGES audit-libs-devel \ wireshark-devel \ xen-devel \ zfs-fuse -RUN yum install -y ${PACKAGES} && \ +RUN yum update -y && \ + yum install -y ${PACKAGES} && \ yum autoremove -y && \ yum clean all -y diff --git a/buildenv-fedora-28.Dockerfile b/buildenv-fedora-28.Dockerfile index f4f7198..60afba5 100644 --- a/buildenv-fedora-28.Dockerfile +++ b/buildenv-fedora-28.Dockerfile @@ -73,6 +73,7 @@ ENV PACKAGES audit-libs-devel \ wireshark-devel \ xen-devel \ zfs-fuse -RUN yum install -y ${PACKAGES} && \ +RUN yum update -y && \ + yum install -y ${PACKAGES} && \ yum autoremove -y && \ yum clean all -y diff --git a/buildenv-fedora-rawhide.Dockerfile b/buildenv-fedora-rawhide.Dockerfile index 189ea59..33b47e1 100644 --- a/buildenv-fedora-rawhide.Dockerfile +++ b/buildenv-fedora-rawhide.Dockerfile @@ -97,6 +97,7 @@ ENV PACKAGES audit-libs-devel \ wireshark-devel \ xen-devel \ zfs-fuse -RUN yum install -y ${PACKAGES} && \ +RUN yum update -y && \ + yum install -y ${PACKAGES} && \ yum autoremove -y && \ yum clean all -y diff --git a/buildenv-ubuntu-16.Dockerfile b/buildenv-ubuntu-16.Dockerfile index bc387a1..c904c6e 100644 --- a/buildenv-ubuntu-16.Dockerfile +++ b/buildenv-ubuntu-16.Dockerfile @@ -74,6 +74,7 @@ ENV PACKAGES augeas-tools \ xsltproc \ zfs-fuse RUN apt-get update && \ + apt-get dist-upgrade -y && \ apt-get install -y ${PACKAGES} && \ apt-get autoremove -y && \ apt-get autoclean -y diff --git a/buildenv-ubuntu-18.Dockerfile b/buildenv-ubuntu-18.Dockerfile index 2a15f14..bbd32c1 100644 --- a/buildenv-ubuntu-18.Dockerfile +++ b/buildenv-ubuntu-18.Dockerfile @@ -74,6 +74,7 @@ ENV PACKAGES augeas-tools \ xsltproc \ zfs-fuse RUN apt-get update && \ + apt-get dist-upgrade -y && \ apt-get install -y ${PACKAGES} && \ apt-get autoremove -y && \ apt-get autoclean -y -- 2.17.1

1 0

[libvirt] [jenkins-ci PATCH] lcitool: Update OS when building Docker images
by Andrea Bolognani 01 Aug '18

01 Aug '18

The last build of the Fedora Rawhide Docker image failed with Transaction check error: file /usr/lib64/libgdbm_compat.so.4.0.0 from install of gdbm-libs-1:1.16-1.fc29.x86_64 conflicts with file from package gdbm-1:1.14.1-3.fc28.x86_64 caused by the gdbm package having recently been split. Especially with fast-moving distribution such as Fedora Rawhide and Debian Sid, we can't rely on the base OS not changing over time, so merely installing the packages we need on top of that is not enough. Additionally, updating the OS brings the Docker images closer to the guests running on CentOS CI, which are updated daily. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- guests/lcitool | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/guests/lcitool b/guests/lcitool index 22b08dd..33c1afe 100755 --- a/guests/lcitool +++ b/guests/lcitool @@ -478,13 +478,15 @@ class Application: if package_format == "deb": sys.stdout.write(textwrap.dedent(""" RUN apt-get update && \\ + apt-get dist-upgrade -y && \\ apt-get install -y ${PACKAGES} && \\ apt-get autoremove -y && \\ apt-get autoclean -y """)) elif package_format == "rpm": sys.stdout.write(textwrap.dedent(""" - RUN yum install -y ${PACKAGES} && \\ + RUN yum update -y && \\ + yum install -y ${PACKAGES} && \\ yum autoremove -y && \\ yum clean all -y """)) -- 2.17.1

3 3

[libvirt] [dbus PATCH] Install daemon under @sbindir@
by Andrea Bolognani 01 Aug '18

01 Aug '18

The libvirt-dbus daemon is not supposed to be invoked explicitly by the user, but rather to be spawned on-demand by the D-Bus daemon: as such, @sbindir@ is a more suitable location in which to install it. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- data/Makefile.am | 4 ++-- data/session/org.libvirt.service.in | 2 +- data/system/org.libvirt.service.in | 2 +- libvirt-dbus.spec.in | 2 +- src/Makefile.am | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/data/Makefile.am b/data/Makefile.am index 7b523da..660a100 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -62,12 +62,12 @@ CLEANFILES = \ session/org.libvirt.service: session/org.libvirt.service.in $(AM_V_GEN)$(MKDIR_P) session && \ - sed -e 's|[@]bindir[@]|$(bindir)|g' < $< > $@-t && \ + sed -e 's|[@]sbindir[@]|$(sbindir)|g' < $< > $@-t && \ mv $@-t $@ system/org.libvirt.service: system/org.libvirt.service.in $(AM_V_GEN)$(MKDIR_P) system && \ - sed -e 's|[@]bindir[@]|$(bindir)|g' \ + sed -e 's|[@]sbindir[@]|$(sbindir)|g' \ -e 's|[@]SYSTEM_USER[@]|$(SYSTEM_USER)|' \ < $< > $@-t && mv $@-t $@ diff --git a/data/session/org.libvirt.service.in b/data/session/org.libvirt.service.in index a8cb6a9..8a56b95 100644 --- a/data/session/org.libvirt.service.in +++ b/data/session/org.libvirt.service.in @@ -1,3 +1,3 @@ [D-BUS Service] Name=org.libvirt -Exec=@bindir@/libvirt-dbus --session +Exec=@sbindir@/libvirt-dbus --session diff --git a/data/system/org.libvirt.service.in b/data/system/org.libvirt.service.in index 0d3abdd..781a503 100644 --- a/data/system/org.libvirt.service.in +++ b/data/system/org.libvirt.service.in @@ -1,4 +1,4 @@ [D-BUS Service] Name=org.libvirt -Exec=@bindir@/libvirt-dbus --system +Exec=@sbindir@/libvirt-dbus --system User=@SYSTEM_USER@ diff --git a/libvirt-dbus.spec.in b/libvirt-dbus.spec.in index f99e041..626e2da 100644 --- a/libvirt-dbus.spec.in +++ b/libvirt-dbus.spec.in @@ -51,7 +51,7 @@ exit 0 %files %doc README.md HACKING.md AUTHORS NEWS %license COPYING -%{_bindir}/libvirt-dbus +%{_sbindir}/libvirt-dbus %{_datadir}/dbus-1/services/org.libvirt.service %{_datadir}/dbus-1/system-services/org.libvirt.service %{_datadir}/dbus-1/system.d/org.libvirt.conf diff --git a/src/Makefile.am b/src/Makefile.am index b5bf129..bc13feb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -28,7 +28,7 @@ libutil_la_SOURCES = \ util.h \ $(NULL) -bin_PROGRAMS = \ +sbin_PROGRAMS = \ libvirt-dbus \ $(NULL) -- 2.17.1

3 3

[libvirt] [PATCH] qemu: qemuDomainChangeNet: don't overwrite device info when pci addr is missing
by Katerina Koukiou 01 Aug '18

01 Aug '18

When trying to update an interface's rom settings with an device XML that is missing the PCI addr element, all new rom settings where not applied. https://bugzilla.redhat.com/show_bug.cgi?id=1599513 Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com> --- Not sure why we chose to overwrite the whole info before though, I hope that this doesn't cause side problems. src/qemu/qemu_hotplug.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 1488f0a7c2..f45192b1d3 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3445,17 +3445,14 @@ qemuDomainChangeNet(virQEMUDriverPtr driver, goto cleanup; } - /* info: if newdev->info is empty, fill it in from olddev, - * otherwise verify that it matches - nothing is allowed to - * change. (There is no helper function to do this, so - * individually check the few feidls of virDomainDeviceInfo that - * are relevant in this case). + /* info: if newdev->info.addr.pci is empty, fill it in from olddev, + * otherwise verify that it matches. */ if (!virDomainDeviceAddressIsValid(&newdev->info, - VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) && - virDomainDeviceInfoCopy(&newdev->info, &olddev->info) < 0) { - goto cleanup; + VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI)) { + newdev->info.addr.pci = olddev->info.addr.pci; } + if (!virPCIDeviceAddressEqual(&olddev->info.addr.pci, &newdev->info.addr.pci)) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", -- 2.17.1

2 4

[libvirt] [PATCH RFC 0/2] ESX: Fixing SetAutoStart
by Marcos Paulo de Souza 01 Aug '18

01 Aug '18

Hi guys, while doing some random tests using the ESX driver, I faced a crash, and these two patches are trying to solve. I don't know if there is a better way to solve it, since ESX driver *generated* code to alloc and free some *generated* structs, but, please let me know if you have a better idea. Thanks, Marcos Paulo de Souza (2): esx: Do not crash SetAutoStart by double free esx: Fix SetAutoStart invalid pointer free src/esx/esx_driver.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) -- 2.17.1

2 3

[libvirt] [PATCH] util: avoid symbol clash between json libraries
by Daniel P. Berrangé 01 Aug '18

01 Aug '18

The jansson and json-glib libraries both export symbols with a json_ name prefix and json_object_iter_next() clashes between them. Unfortunately json_glib is linked in by GTK, so any app using GTK and libvirt will get a clash, resulting in SEGV. This also affects the NSS module provided by libvirt Instead of directly linking to jansson, use dlopen() with the RTLD_LOCAL flag which allows us to hide the symbols from the application that loads libvirt or the NSS module. Some preprocessor black magic and wrapper functions are used to redirect calls into the dlopen resolved symbols. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- libvirt.spec.in | 2 + src/Makefile.am | 3 + src/util/Makefile.inc.am | 3 +- src/util/virjson.c | 9 +- src/util/virjsoncompat.c | 253 +++++++++++++++++++++++++++++++++++++++ src/util/virjsoncompat.h | 86 +++++++++++++ 6 files changed, 354 insertions(+), 2 deletions(-) create mode 100644 src/util/virjsoncompat.c create mode 100644 src/util/virjsoncompat.h diff --git a/libvirt.spec.in b/libvirt.spec.in index 4113579e47..cfe7ab8a09 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -898,6 +898,8 @@ Requires: ncurses Requires: gettext # Needed by virt-pki-validate script. Requires: gnutls-utils +# We dlopen() it so need an explicit dep +Requires: libjansson.so.4()(64bit) %if %{with_bash_completion} Requires: %{name}-bash-completion = %{version}-%{release} %endif diff --git a/src/Makefile.am b/src/Makefile.am index 83263e69e5..59ae7a2e79 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -690,6 +690,7 @@ libvirt_setuid_rpc_client_la_SOURCES = \ util/virhashcode.c \ util/virhostcpu.c \ util/virjson.c \ + util/virjsoncompat.c \ util/virlog.c \ util/virobject.c \ util/virpidfile.c \ @@ -961,6 +962,8 @@ libvirt_nss_la_SOURCES = \ util/virhashcode.h \ util/virjson.c \ util/virjson.h \ + util/virjsoncompat.c \ + util/virjsoncompat.h \ util/virkmod.c \ util/virkmod.h \ util/virlease.c \ diff --git a/src/util/Makefile.inc.am b/src/util/Makefile.inc.am index 71b2b93c2d..8ef9ee1dfa 100644 --- a/src/util/Makefile.inc.am +++ b/src/util/Makefile.inc.am @@ -86,6 +86,8 @@ UTIL_SOURCES = \ util/viriscsi.h \ util/virjson.c \ util/virjson.h \ + util/virjsoncompat.c \ + util/virjsoncompat.h \ util/virkeycode.c \ util/virkeycode.h \ util/virkeyfile.c \ @@ -264,7 +266,6 @@ libvirt_util_la_CFLAGS = \ $(NULL) libvirt_util_la_LIBADD = \ $(CAPNG_LIBS) \ - $(JANSSON_LIBS) \ $(LIBNL_LIBS) \ $(THREAD_LIBS) \ $(AUDIT_LIBS) \ diff --git a/src/util/virjson.c b/src/util/virjson.c index 01a387b2f7..5bab662cd3 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -1437,7 +1437,8 @@ virJSONValueCopy(const virJSONValue *in) #if WITH_JANSSON -# include <jansson.h> + +# include "virjsoncompat.h" static virJSONValuePtr virJSONValueFromJansson(json_t *json) @@ -1524,6 +1525,9 @@ virJSONValueFromString(const char *jsonstring) size_t flags = JSON_REJECT_DUPLICATES | JSON_DECODE_ANY; + if (virJSONInitialize() < 0) + return NULL; + if (!(json = json_loads(jsonstring, flags, &error))) { virReportError(VIR_ERR_INTERNAL_ERROR, _("failed to parse JSON %d:%d: %s"), @@ -1630,6 +1634,9 @@ virJSONValueToString(virJSONValuePtr object, json_t *json; char *str = NULL; + if (virJSONInitialize() < 0) + return NULL; + if (pretty) flags |= JSON_INDENT(2); else diff --git a/src/util/virjsoncompat.c b/src/util/virjsoncompat.c new file mode 100644 index 0000000000..c317e50c32 --- /dev/null +++ b/src/util/virjsoncompat.c @@ -0,0 +1,253 @@ +/* + * virjsoncompat.c: JSON object parsing/formatting + * + * Copyright (C) 2018 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + */ + +#include <config.h> + +#include "virthread.h" +#include "virerror.h" +#define VIR_JSON_COMPAT_IMPL +#include "virjsoncompat.h" + +#define VIR_FROM_THIS VIR_FROM_NONE + +#if WITH_JANSSON + +#include <dlfcn.h> + +json_t *(*json_array_ptr)(void); +int (*json_array_append_new_ptr)(json_t *array, json_t *value); +json_t *(*json_array_get_ptr)(const json_t *array, size_t index); +size_t (*json_array_size_ptr)(const json_t *array); +void (*json_delete_ptr)(json_t *json); +char *(*json_dumps_ptr)(const json_t *json, size_t flags); +json_t *(*json_false_ptr)(void); +json_t *(*json_integer_ptr)(json_int_t value); +json_int_t (*json_integer_value_ptr)(const json_t *integer); +json_t *(*json_loads_ptr)(const char *input, size_t flags, json_error_t *error); +json_t *(*json_null_ptr)(void); +json_t *(*json_object_ptr)(void); +void *(*json_object_iter_ptr)(json_t *object); +const char *(*json_object_iter_key_ptr)(void *iter); +void *(*json_object_iter_next_ptr)(json_t *object, void *iter); +json_t *(*json_object_iter_value_ptr)(void *iter); +void *(*json_object_key_to_iter_ptr)(const char *key); +int (*json_object_set_new_ptr)(json_t *object, const char *key, json_t *value); +json_t *(*json_real_ptr)(double value); +double (*json_real_value_ptr)(const json_t *real); +json_t *(*json_string_ptr)(const char *value); +const char *(*json_string_value_ptr)(const json_t *string); +json_t *(*json_true_ptr)(void); + + +static int virJSONJanssonOnceInit(void) +{ + void *handle = dlopen("libjansson.so.4", RTLD_LAZY|RTLD_LOCAL|RTLD_DEEPBIND|RTLD_NODELETE); + if (!handle) { + virReportError(VIR_ERR_NO_SUPPORT, + _("libjansson.so.4 JSON library not available: %s"), dlerror()); + return -1; + } + +#define LOAD(name) \ + do { \ + if (!(name ## _ptr = dlsym(handle, #name))) { \ + virReportError(VIR_ERR_NO_SUPPORT, \ + _("missing symbol '%s' in libjansson.so.4: %s"), #name, dlerror()); \ + goto error; \ + } \ + fprintf(stderr, "Resolve %s to %p\n", #name, name ## _ptr); \ + } while (0) + + LOAD(json_array); + LOAD(json_array_append_new); + LOAD(json_array_get); + LOAD(json_array_size); + LOAD(json_delete); + LOAD(json_dumps); + LOAD(json_false); + LOAD(json_integer); + LOAD(json_integer_value); + LOAD(json_loads); + LOAD(json_null); + LOAD(json_object); + LOAD(json_object_iter); + LOAD(json_object_iter_key); + LOAD(json_object_iter_next); + LOAD(json_object_iter_value); + LOAD(json_object_key_to_iter); + LOAD(json_object_set_new); + LOAD(json_real); + LOAD(json_real_value); + LOAD(json_string); + LOAD(json_string_value); + LOAD(json_true); + + return 0; + + error: + return -1; +} + +VIR_ONCE_GLOBAL_INIT(virJSONJansson); + +int virJSONInitialize(void) { + return virJSONJanssonInitialize(); +} + +json_t *json_array_impl(void) +{ + return json_array_ptr(); +} + + +int json_array_append_new_impl(json_t *array, json_t *value) +{ + return json_array_append_new_ptr(array, value); +} + + +json_t *json_array_get_impl(const json_t *array, size_t index) +{ + return json_array_get_ptr(array, index); +} + + +size_t json_array_size_impl(const json_t *array) +{ + return json_array_size_ptr(array); +} + + +void json_delete_impl(json_t *json) +{ + return json_delete_ptr(json); +} + + +char *json_dumps_impl(const json_t *json, size_t flags) +{ + return json_dumps_ptr(json, flags); +} + + +json_t *json_false_impl(void) +{ + return json_false_ptr(); +} + + +json_t *json_integer_impl(json_int_t value) +{ + return json_integer_ptr(value); +} + + +json_int_t json_integer_value_impl(const json_t *integer) +{ + return json_integer_value_ptr(integer); +} + + +json_t *json_loads_impl(const char *input, size_t flags, json_error_t *error) +{ + return json_loads_ptr(input, flags, error); +} + + +json_t *json_null_impl(void) +{ + return json_null_ptr(); +} + + +json_t *json_object_impl(void) +{ + return json_object_ptr(); +} + + +void *json_object_iter_impl(json_t *object) +{ + return json_object_iter_ptr(object); +} + + +const char *json_object_iter_key_impl(void *iter) +{ + return json_object_iter_key_ptr(iter); +} + + +void *json_object_iter_next_impl(json_t *object, void *iter) +{ + return json_object_iter_next_ptr(object, iter); +} + + +json_t *json_object_iter_value_impl(void *iter) +{ + return json_object_iter_value_ptr(iter); +} + + +void *json_object_key_to_iter_impl(const char *key) +{ + return json_object_key_to_iter_ptr(key); +} + + +int json_object_set_new_impl(json_t *object, const char *key, json_t *value) +{ + return json_object_set_new_ptr(object, key, value); +} + + +json_t *json_real_impl(double value) +{ + return json_real_ptr(value); +} + + +double json_real_value_impl(const json_t *real) +{ + return json_real_value_ptr(real); +} + + +json_t *json_string_impl(const char *value) +{ + return json_string_ptr(value); +} + + +const char *json_string_value_impl(const json_t *string) +{ + return json_string_value_ptr(string); +} + + +json_t *json_true_impl(void) +{ + return json_true_ptr(); +} + +#endif + diff --git a/src/util/virjsoncompat.h b/src/util/virjsoncompat.h new file mode 100644 index 0000000000..c3963a5259 --- /dev/null +++ b/src/util/virjsoncompat.h @@ -0,0 +1,86 @@ +/* + * virjson.h: JSON object parsing/formatting + * + * Copyright (C) 2018 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + */ + + +#ifndef __VIR_JSON_COMPAT_H_ +# define __VIR_JSON_COMPAT_H_ + +#ifndef VIR_JSON_COMPAT_IMPL + +#define json_array json_array_impl +#define json_array_append_new json_array_append_new_impl +#define json_array_get json_array_get_impl +#define json_array_size json_array_size_impl +#define json_delete json_delete_impl +#define json_dumps json_dumps_impl +#define json_false json_false_impl +#define json_integer json_integer_impl +#define json_integer_value json_integer_value_impl +#define json_loads json_loads_impl +#define json_null json_null_impl +#define json_object json_object_impl +#define json_object_iter json_object_iter_impl +#define json_object_iter_key json_object_iter_key_impl +#define json_object_iter_next json_object_iter_next_impl +#define json_object_iter_value json_object_iter_value_impl +#define json_object_key_to_iter json_object_key_to_iter_impl +#define json_object_set_new json_object_set_new_impl +#define json_real json_real_impl +#define json_real_value json_real_value_impl +#define json_string json_string_impl +#define json_string_value json_string_value_impl +#define json_true json_true_impl + +#include <jansson.h> + +#else + +#include <jansson.h> + +json_t *json_array_impl(void); +int json_array_append_new_impl(json_t *array, json_t *value); +json_t *json_array_get_impl(const json_t *array, size_t index); +size_t json_array_size_impl(const json_t *array); +void json_delete_impl(json_t *json); +char *json_dumps_impl(const json_t *json, size_t flags); +json_t *json_false_impl(void); +json_t *json_integer_impl(json_int_t value); +json_int_t json_integer_value_impl(const json_t *integer); +json_t *json_loads_impl(const char *input, size_t flags, json_error_t *error); +json_t *json_null_impl(void); +json_t *json_object_impl(void); +void *json_object_iter_impl(json_t *object); +const char *json_object_iter_key_impl(void *iter); +void *json_object_iter_next_impl(json_t *object, void *iter); +json_t *json_object_iter_value_impl(void *iter); +void *json_object_key_to_iter_impl(const char *key); +int json_object_set_new_impl(json_t *object, const char *key, json_t *value); +json_t *json_real_impl(double value); +double json_real_value_impl(const json_t *real); +json_t *json_string_impl(const char *value); +const char *json_string_value_impl(const json_t *string); +json_t *json_true_impl(void); + +#endif + +int virJSONInitialize(void); + +#endif -- 2.17.1

6 9

[libvirt] [PATCH v2 RESEND 00/12] PCI passthrough support on s390
by Yi Min Zhao 01 Aug '18

01 Aug '18

Abstract ======== The PCI representation in QEMU has recently been extended for S390 allowing configuration of zPCI attributes like uid (user-defined identifier) and fid (PCI function identifier). The details can be found here: https://lists.gnu.org/archive/html/qemu-devel/2016-06/msg07262.html To support the new zPCI feature of the S390 platform, two new XML attributes, @uid and @fid, are introduced for device addresses of type 'pci', i.e.: <hostdev mode='subsystem' type='pci'> <driver name='vfio'/> <source> <address domain='0x0001' bus='0x00' slot='0x00' function='0x0'/> </source> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0' uid='0x0003' fid='0x00000027'/> </hostdev> uid and fid are optional attributes. If they are defined by the user, unique values within the guest domain must be used. If they are not specified and the architecture requires them, they are automatically generated with non-conflicting values. Current implementation is the most seamless one for the user as it unites the address specific data of a PCI device on one XML element. It could accommodate both specifying our special parameters (uid and fid) and re-using standard statements (domain, bus, slot and function) for PCI devices. User can still specify bus/slot/function for the virtualized PCI devices in the XML. Thus uid/fid act as an extension to the PCI address and are stored in a new structure 'virZPCIDeviceAddress' which is a member of common PCI Address structure. Additionally, two hashtables are used for assignment and reservation of uid/fid. In support of extending the PCI address, a new PCI address extension flag is introduced. This extension flag allows is not only dedicated for the S390 platform but also other architectures needing certain extensions to PCI address space. Code Base ========= commit in master: 767f9e1449b1a36111532847f0c62dc758263c42 qemu: validate: Enforce compile time switch type checking for videos Change Log ========== v1->v2: 1. Separate test commit and merge testcases into corresponding commits that introduce the functionalities firstly. 2. Spare some checks for zpci device. 3. Add vsock and controller support. 4. Add uin32 type schema. 5. Rename zpciuid and zpcifid to zpci_uid and zpci_fid. 6. Always return multibus support on S390. Yi Min Zhao (12): conf: Add definitions for 'uid' and 'fid' PCI address attributes qemu: Introduce zPCI capability conf: Introduce a new PCI address extension flag qemu: Enable PCI multi bus for S390 guests qemu: Auto add pci-root for s390/s390x guests conf: Introduce address caching for PCI extensions conf: Introduce parser, formatter for uid and fid conf: Allocate/release 'uid' and 'fid' in PCI address qemu: Generate and use zPCI device in QEMU command line qemu: Add hotpluging support for PCI devices on S390 guests docs: Add 'uid' and 'fid' information news: Update news for PCI address extension attributes docs/formatdomain.html.in | 9 +- docs/news.xml | 11 + docs/schemas/basictypes.rng | 31 ++ docs/schemas/domaincommon.rng | 1 + src/conf/device_conf.c | 73 +++++ src/conf/device_conf.h | 1 + src/conf/domain_addr.c | 346 +++++++++++++++++++++ src/conf/domain_addr.h | 29 ++ src/conf/domain_conf.c | 6 + src/libvirt_private.syms | 4 + src/qemu/qemu_capabilities.c | 6 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 115 +++++++ src/qemu/qemu_command.h | 4 + src/qemu/qemu_domain.c | 1 + src/qemu/qemu_domain_address.c | 181 ++++++++++- src/qemu/qemu_hotplug.c | 182 ++++++++++- src/util/virpci.h | 13 + tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 + tests/qemuxml2argvdata/disk-virtio-s390-zpci.args | 27 ++ tests/qemuxml2argvdata/disk-virtio-s390-zpci.xml | 17 + .../hostdev-vfio-zpci-autogenerate.args | 26 ++ .../hostdev-vfio-zpci-autogenerate.xml | 18 ++ .../hostdev-vfio-zpci-boundaries.args | 30 ++ .../hostdev-vfio-zpci-boundaries.xml | 26 ++ .../hostdev-vfio-zpci-multidomain-many.args | 40 +++ .../hostdev-vfio-zpci-multidomain-many.xml | 67 ++++ tests/qemuxml2argvdata/hostdev-vfio-zpci.args | 26 ++ tests/qemuxml2argvdata/hostdev-vfio-zpci.xml | 19 ++ tests/qemuxml2argvtest.c | 14 + tests/qemuxml2xmloutdata/disk-virtio-s390-zpci.xml | 29 ++ tests/qemuxml2xmloutdata/hostdev-vfio-zpci.xml | 30 ++ tests/qemuxml2xmltest.c | 3 + 38 files changed, 1377 insertions(+), 15 deletions(-) create mode 100644 tests/qemuxml2argvdata/disk-virtio-s390-zpci.args create mode 100644 tests/qemuxml2argvdata/disk-virtio-s390-zpci.xml create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.xml create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.xml create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.xml create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci.args create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci.xml create mode 100644 tests/qemuxml2xmloutdata/disk-virtio-s390-zpci.xml create mode 100644 tests/qemuxml2xmloutdata/hostdev-vfio-zpci.xml -- Yi Min

7 52

[libvirt] [PATCH] qemu: monitor: Fix incrementing of 'nstats' in qemuMonitorJSONBlockStatsCollectData
by Peter Krempa 01 Aug '18

01 Aug '18

commit 8d9ca6cdb3a5 refactored qemuMonitorJSONBlockStatsCollectData so that the number of stats is passed back via a pointer. The commit failed to fix the macro which increments the number of stats to increment the actual pointee. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_monitor_json.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 9acf62e0bb..2921f110a9 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2299,7 +2299,7 @@ qemuMonitorJSONBlockStatsCollectData(virJSONValuePtr dev, #define QEMU_MONITOR_BLOCK_STAT_GET(NAME, VAR, MANDATORY) \ if (MANDATORY || virJSONValueObjectHasKey(stats, NAME)) { \ - nstats++; \ + (*nstats)++; \ if (virJSONValueObjectGetNumberLong(stats, NAME, &VAR) < 0) { \ virReportError(VIR_ERR_INTERNAL_ERROR, \ _("cannot read %s statistic"), NAME); \ -- 2.16.2

2 1

[libvirt] [PATCH v2] util: avoid symbol clash between json libraries
by Daniel P. Berrangé 31 Jul '18

31 Jul '18

The jansson and json-glib libraries both export symbols with a json_ name prefix and json_object_iter_next() clashes between them. Unfortunately json_glib is linked in by GTK, so any app using GTK and libvirt will get a clash, resulting in SEGV. This also affects the NSS module provided by libvirt Instead of directly linking to jansson, use dlopen() with the RTLD_LOCAL flag which allows us to hide the symbols from the application that loads libvirt or the NSS module. Some preprocessor black magic and wrapper functions are used to redirect calls into the dlopen resolved symbols. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- libvirt.spec.in | 2 + src/Makefile.am | 5 +- src/util/Makefile.inc.am | 3 +- src/util/virjson.c | 9 +- src/util/virjsoncompat.c | 274 +++++++++++++++++++++++++++++++++++++++ src/util/virjsoncompat.h | 88 +++++++++++++ 6 files changed, 377 insertions(+), 4 deletions(-) create mode 100644 src/util/virjsoncompat.c create mode 100644 src/util/virjsoncompat.h diff --git a/libvirt.spec.in b/libvirt.spec.in index 4113579e47..19ae55cdaf 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -898,6 +898,8 @@ Requires: ncurses Requires: gettext # Needed by virt-pki-validate script. Requires: gnutls-utils +# We dlopen(libjansson.so.4), so need an explicit dep +Requires: jansson %if %{with_bash_completion} Requires: %{name}-bash-completion = %{version}-%{release} %endif diff --git a/src/Makefile.am b/src/Makefile.am index 83263e69e5..4b6366bb4c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -552,7 +552,6 @@ libvirt_admin_la_CFLAGS += \ libvirt_admin_la_LIBADD += \ $(CAPNG_LIBS) \ - $(JANSSON_LIBS) \ $(DEVMAPPER_LIBS) \ $(LIBXML_LIBS) \ $(SSH2_LIBS) \ @@ -690,6 +689,7 @@ libvirt_setuid_rpc_client_la_SOURCES = \ util/virhashcode.c \ util/virhostcpu.c \ util/virjson.c \ + util/virjsoncompat.c \ util/virlog.c \ util/virobject.c \ util/virpidfile.c \ @@ -961,6 +961,8 @@ libvirt_nss_la_SOURCES = \ util/virhashcode.h \ util/virjson.c \ util/virjson.h \ + util/virjsoncompat.c \ + util/virjsoncompat.h \ util/virkmod.c \ util/virkmod.h \ util/virlease.c \ @@ -1001,7 +1003,6 @@ libvirt_nss_la_LDFLAGS = \ $(NULL) libvirt_nss_la_LIBADD = \ - $(JANSSON_LIBS) \ $(NULL) endif WITH_NSS diff --git a/src/util/Makefile.inc.am b/src/util/Makefile.inc.am index 71b2b93c2d..8ef9ee1dfa 100644 --- a/src/util/Makefile.inc.am +++ b/src/util/Makefile.inc.am @@ -86,6 +86,8 @@ UTIL_SOURCES = \ util/viriscsi.h \ util/virjson.c \ util/virjson.h \ + util/virjsoncompat.c \ + util/virjsoncompat.h \ util/virkeycode.c \ util/virkeycode.h \ util/virkeyfile.c \ @@ -264,7 +266,6 @@ libvirt_util_la_CFLAGS = \ $(NULL) libvirt_util_la_LIBADD = \ $(CAPNG_LIBS) \ - $(JANSSON_LIBS) \ $(LIBNL_LIBS) \ $(THREAD_LIBS) \ $(AUDIT_LIBS) \ diff --git a/src/util/virjson.c b/src/util/virjson.c index 01a387b2f7..5bab662cd3 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -1437,7 +1437,8 @@ virJSONValueCopy(const virJSONValue *in) #if WITH_JANSSON -# include <jansson.h> + +# include "virjsoncompat.h" static virJSONValuePtr virJSONValueFromJansson(json_t *json) @@ -1524,6 +1525,9 @@ virJSONValueFromString(const char *jsonstring) size_t flags = JSON_REJECT_DUPLICATES | JSON_DECODE_ANY; + if (virJSONInitialize() < 0) + return NULL; + if (!(json = json_loads(jsonstring, flags, &error))) { virReportError(VIR_ERR_INTERNAL_ERROR, _("failed to parse JSON %d:%d: %s"), @@ -1630,6 +1634,9 @@ virJSONValueToString(virJSONValuePtr object, json_t *json; char *str = NULL; + if (virJSONInitialize() < 0) + return NULL; + if (pretty) flags |= JSON_INDENT(2); else diff --git a/src/util/virjsoncompat.c b/src/util/virjsoncompat.c new file mode 100644 index 0000000000..6c853e9bb5 --- /dev/null +++ b/src/util/virjsoncompat.c @@ -0,0 +1,274 @@ +/* + * virjsoncompat.c: JSON object parsing/formatting + * + * Copyright (C) 2018 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + */ + +#include <config.h> + +#include "virthread.h" +#include "virerror.h" +#define VIR_JSON_COMPAT_IMPL +#include "virjsoncompat.h" + +#define VIR_FROM_THIS VIR_FROM_NONE + +#if WITH_JANSSON + +# include <dlfcn.h> + +json_t *(*json_array_ptr)(void); +int (*json_array_append_new_ptr)(json_t *array, json_t *value); +json_t *(*json_array_get_ptr)(const json_t *array, size_t index); +size_t (*json_array_size_ptr)(const json_t *array); +void (*json_delete_ptr)(json_t *json); +char *(*json_dumps_ptr)(const json_t *json, size_t flags); +json_t *(*json_false_ptr)(void); +json_t *(*json_integer_ptr)(json_int_t value); +json_int_t (*json_integer_value_ptr)(const json_t *integer); +json_t *(*json_loads_ptr)(const char *input, size_t flags, json_error_t *error); +json_t *(*json_null_ptr)(void); +json_t *(*json_object_ptr)(void); +void *(*json_object_iter_ptr)(json_t *object); +const char *(*json_object_iter_key_ptr)(void *iter); +void *(*json_object_iter_next_ptr)(json_t *object, void *iter); +json_t *(*json_object_iter_value_ptr)(void *iter); +void *(*json_object_key_to_iter_ptr)(const char *key); +int (*json_object_set_new_ptr)(json_t *object, const char *key, json_t *value); +json_t *(*json_real_ptr)(double value); +double (*json_real_value_ptr)(const json_t *real); +json_t *(*json_string_ptr)(const char *value); +const char *(*json_string_value_ptr)(const json_t *string); +json_t *(*json_true_ptr)(void); + + +static int +virJSONJanssonOnceInit(void) +{ + void *handle = dlopen("libjansson.so.4", RTLD_LAZY|RTLD_LOCAL|RTLD_NODELETE); + if (!handle) { + virReportError(VIR_ERR_NO_SUPPORT, + _("libjansson.so.4 JSON library not available: %s"), dlerror()); + return -1; + } + +# define LOAD(name) \ + do { \ + if (!(name ## _ptr = dlsym(handle, #name))) { \ + virReportError(VIR_ERR_NO_SUPPORT, \ + _("missing symbol '%s' in libjansson.so.4: %s"), #name, dlerror()); \ + return -1; \ + } \ + } while (0) + + LOAD(json_array); + LOAD(json_array_append_new); + LOAD(json_array_get); + LOAD(json_array_size); + LOAD(json_delete); + LOAD(json_dumps); + LOAD(json_false); + LOAD(json_integer); + LOAD(json_integer_value); + LOAD(json_loads); + LOAD(json_null); + LOAD(json_object); + LOAD(json_object_iter); + LOAD(json_object_iter_key); + LOAD(json_object_iter_next); + LOAD(json_object_iter_value); + LOAD(json_object_key_to_iter); + LOAD(json_object_set_new); + LOAD(json_real); + LOAD(json_real_value); + LOAD(json_string); + LOAD(json_string_value); + LOAD(json_true); + + return 0; +} + +VIR_ONCE_GLOBAL_INIT(virJSONJansson); + +int +virJSONInitialize(void) +{ + return virJSONJanssonInitialize(); +} + +json_t * +json_array_impl(void) +{ + return json_array_ptr(); +} + + +int +json_array_append_new_impl(json_t *array, json_t *value) +{ + return json_array_append_new_ptr(array, value); +} + + +json_t * +json_array_get_impl(const json_t *array, size_t index) +{ + return json_array_get_ptr(array, index); +} + + +size_t +json_array_size_impl(const json_t *array) +{ + return json_array_size_ptr(array); +} + + +void +json_delete_impl(json_t *json) +{ + return json_delete_ptr(json); +} + + +char * +json_dumps_impl(const json_t *json, size_t flags) +{ + return json_dumps_ptr(json, flags); +} + + +json_t * +json_false_impl(void) +{ + return json_false_ptr(); +} + + +json_t * +json_integer_impl(json_int_t value) +{ + return json_integer_ptr(value); +} + + +json_int_t +json_integer_value_impl(const json_t *integer) +{ + return json_integer_value_ptr(integer); +} + + +json_t * +json_loads_impl(const char *input, size_t flags, json_error_t *error) +{ + return json_loads_ptr(input, flags, error); +} + + +json_t * +json_null_impl(void) +{ + return json_null_ptr(); +} + + +json_t * +json_object_impl(void) +{ + return json_object_ptr(); +} + + +void * +json_object_iter_impl(json_t *object) +{ + return json_object_iter_ptr(object); +} + + +const char * +json_object_iter_key_impl(void *iter) +{ + return json_object_iter_key_ptr(iter); +} + + +void * +json_object_iter_next_impl(json_t *object, void *iter) +{ + return json_object_iter_next_ptr(object, iter); +} + + +json_t * +json_object_iter_value_impl(void *iter) +{ + return json_object_iter_value_ptr(iter); +} + + +void * +json_object_key_to_iter_impl(const char *key) +{ + return json_object_key_to_iter_ptr(key); +} + + +int +json_object_set_new_impl(json_t *object, const char *key, json_t *value) +{ + return json_object_set_new_ptr(object, key, value); +} + + +json_t * +json_real_impl(double value) +{ + return json_real_ptr(value); +} + + +double +json_real_value_impl(const json_t *real) +{ + return json_real_value_ptr(real); +} + + +json_t * +json_string_impl(const char *value) +{ + return json_string_ptr(value); +} + + +const char * +json_string_value_impl(const json_t *string) +{ + return json_string_value_ptr(string); +} + + +json_t * +json_true_impl(void) +{ + return json_true_ptr(); +} + +#endif /* WITH_JANSSON */ diff --git a/src/util/virjsoncompat.h b/src/util/virjsoncompat.h new file mode 100644 index 0000000000..d9b7765a37 --- /dev/null +++ b/src/util/virjsoncompat.h @@ -0,0 +1,88 @@ +/* + * virjsoncompat.h: JSON object parsing/formatting + * + * Copyright (C) 2018 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + */ + + +#ifndef __VIR_JSON_COMPAT_H_ +# define __VIR_JSON_COMPAT_H_ + +# if WITH_JANSSON +# ifndef VIR_JSON_COMPAT_IMPL + +# define json_array json_array_impl +# define json_array_append_new json_array_append_new_impl +# define json_array_get json_array_get_impl +# define json_array_size json_array_size_impl +# define json_delete json_delete_impl +# define json_dumps json_dumps_impl +# define json_false json_false_impl +# define json_integer json_integer_impl +# define json_integer_value json_integer_value_impl +# define json_loads json_loads_impl +# define json_null json_null_impl +# define json_object json_object_impl +# define json_object_iter json_object_iter_impl +# define json_object_iter_key json_object_iter_key_impl +# define json_object_iter_next json_object_iter_next_impl +# define json_object_iter_value json_object_iter_value_impl +# define json_object_key_to_iter json_object_key_to_iter_impl +# define json_object_set_new json_object_set_new_impl +# define json_real json_real_impl +# define json_real_value json_real_value_impl +# define json_string json_string_impl +# define json_string_value json_string_value_impl +# define json_true json_true_impl + +# endif /* ! VIR_JSON_COMPAT_IMPL */ + +# include <jansson.h> + +# ifdef VIR_JSON_COMPAT_IMPL + +json_t *json_array_impl(void); +int json_array_append_new_impl(json_t *array, json_t *value); +json_t *json_array_get_impl(const json_t *array, size_t index); +size_t json_array_size_impl(const json_t *array); +void json_delete_impl(json_t *json); +char *json_dumps_impl(const json_t *json, size_t flags); +json_t *json_false_impl(void); +json_t *json_integer_impl(json_int_t value); +json_int_t json_integer_value_impl(const json_t *integer); +json_t *json_loads_impl(const char *input, size_t flags, json_error_t *error); +json_t *json_null_impl(void); +json_t *json_object_impl(void); +void *json_object_iter_impl(json_t *object); +const char *json_object_iter_key_impl(void *iter); +void *json_object_iter_next_impl(json_t *object, void *iter); +json_t *json_object_iter_value_impl(void *iter); +void *json_object_key_to_iter_impl(const char *key); +int json_object_set_new_impl(json_t *object, const char *key, json_t *value); +json_t *json_real_impl(double value); +double json_real_value_impl(const json_t *real); +json_t *json_string_impl(const char *value); +const char *json_string_value_impl(const json_t *string); +json_t *json_true_impl(void); + +# endif /* VIR_JSON_COMPAT_IMPL */ +# endif /* WITH_JANSSON */ + +int virJSONInitialize(void); + +#endif /* __VIR_JSON_COMPAT_H_ */ -- 2.17.1

3 2

[libvirt] [RFC PATCH 00/10] Revert the switch to Jansson
by Ján Tomko 31 Jul '18

31 Jul '18

As reported by Andrea Bolognani (Thanks, Andrea!), since the switch to jansson applications using libvirt_nss crash due to a function name collision with json-glib: https://www.redhat.com/archives/libvir-list/2018-July/msg02044.html Revert the changes until we come up with a better solution. Ján Tomko (10): Revert "tests: also skip qemuagenttest with old jansson" Revert "m4: Introduce STABLE_ORDERING_JANSSON" Revert "build: require Jansson if QEMU driver is enabled" Revert "build: switch --with-qemu default from yes to check" Revert "Remove virJSONValueNewStringLen" Revert "build: remove references to WITH_YAJL for SETUID_RPC_CLIENT" Revert "Remove functions using yajl" Revert "Switch from yajl to Jansson" Revert "build: undef WITH_JANSSON for SETUID_RPC_CLIENT" Revert "build: add --with-jansson" config-post.h | 3 +- configure.ac | 3 - libvirt.spec.in | 4 +- m4/virt-driver-qemu.m4 | 9 +- m4/virt-jansson.m4 | 32 -- m4/virt-nss.m4 | 4 +- m4/virt-yajl.m4 | 27 +- src/Makefile.am | 8 +- src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 2 +- src/util/Makefile.inc.am | 4 +- src/util/virjson.c | 616 ++++++++++++++++++++++++------- src/util/virjson.h | 1 + tests/Makefile.am | 12 +- tests/cputest.c | 16 +- tests/libxlxml2domconfigtest.c | 4 +- tests/qemuagenttest.c | 4 +- tests/qemublocktest.c | 6 - tests/qemucapabilitiestest.c | 7 +- tests/qemucaps2xmltest.c | 2 +- tests/qemucommandutiltest.c | 7 +- tests/qemuhotplugtest.c | 7 +- tests/qemumigparamsdata/empty.json | 4 +- tests/qemumigparamsdata/unsupported.json | 4 +- tests/qemumigparamstest.c | 7 +- tests/qemumonitorjsontest.c | 7 +- tests/virjsontest.c | 5 - tests/virmacmaptest.c | 5 - tests/virmacmaptestdata/empty.json | 4 +- tests/virmocklibxl.c | 4 +- tests/virnetdaemontest.c | 7 +- tests/virstoragetest.c | 4 +- 32 files changed, 555 insertions(+), 275 deletions(-) delete mode 100644 m4/virt-jansson.m4 -- 2.16.1

1 10

[libvirt] [PATCH v4 0/4] iscsi-direct: first part
by clem＠lse.epita.fr 31 Jul '18

31 Jul '18

From: Clementine Hayat <clem(a)lse.epita.fr> Hello, This is the implementation of the iscsi-direct backend storage pool version 4. v1: https://www.redhat.com/archives/libvir-list/2018-July/msg00918.html v2: https://www.redhat.com/archives/libvir-list/2018-July/msg01528.html v3: https://www.redhat.com/archives/libvir-list/2018-July/msg02076.html Best Regards, -- Clementine Hayat Clementine Hayat (4): configure: Introduce libiscsi in build system storage: Introduce iscsi_direct pool type storage: Implement iscsi_direct pool backend news: add storage pool iscsi-direct configure.ac | 9 +- docs/news.xml | 9 + docs/schemas/storagepool.rng | 35 ++ docs/storage.html.in | 30 ++ m4/virt-libiscsi.m4 | 30 ++ m4/virt-storage-iscsi-direct.m4 | 44 ++ src/conf/domain_conf.c | 1 + src/conf/storage_conf.c | 22 +- src/conf/storage_conf.h | 1 + src/conf/virstorageobj.c | 2 + src/storage/Makefile.inc.am | 24 + src/storage/storage_backend.c | 6 + src/storage/storage_backend_iscsi_direct.c | 452 ++++++++++++++++++ src/storage/storage_backend_iscsi_direct.h | 6 + src/storage/storage_driver.c | 1 + .../pool-iscsi-direct-auth.xml | 14 + .../pool-iscsi-direct.xml | 11 + .../pool-iscsi-direct-auth.xml | 17 + .../pool-iscsi-direct.xml | 14 + tests/storagepoolxml2xmltest.c | 2 + tools/virsh-pool.c | 3 + 21 files changed, 727 insertions(+), 6 deletions(-) create mode 100644 m4/virt-libiscsi.m4 create mode 100644 m4/virt-storage-iscsi-direct.m4 create mode 100644 src/storage/storage_backend_iscsi_direct.c create mode 100644 src/storage/storage_backend_iscsi_direct.h create mode 100644 tests/storagepoolxml2xmlin/pool-iscsi-direct-auth.xml create mode 100644 tests/storagepoolxml2xmlin/pool-iscsi-direct.xml create mode 100644 tests/storagepoolxml2xmlout/pool-iscsi-direct-auth.xml create mode 100644 tests/storagepoolxml2xmlout/pool-iscsi-direct.xml -- 2.18.0

1 4

[libvirt] [PATCH 00/11] Add checks to ensure a name isn't all whitespace
by John Ferlan 31 Jul '18

31 Jul '18

https://bugzilla.redhat.com/show_bug.cgi?id=1107420 As unusual as the case may be, having a name of all white space has been allowed. This leads to the obvious problem of how a future usage would be able to "utilize" that resource since it's not "simple" to determine what combination of spaces and tabs are being used for the name. So add code to various drivers in order to inhibit this for those resources that would consider using a name for some sort of lookup type reference. For a majority of drivers, the schema validation also allowed the name; however, a couple (secrets and nwfilters) the virt-xml-validate would fail. Still this wouldn't necessarily stop someone - just slow them down. So for those the test xml file must use the *-invalid.xml type syntax to inhibit virschematest from looking at the schema. Similar validation for node devices and interfaces is not necessary since those are referencing system named elements which wouldn't have the oddly named resource. Also, while it could be checked, avoid the check for Storage Volumes as there's no way to "inhibit" in the parse logic algorithm. This is not for 4.6.0, but figured I'd get it on list for consideration for 4.7.0. Yes, it's quite unusual and one has to wonder who thinks up this type of situation, but still in the long run we should attempt to avoid it anyway. I've only added the extra checking for qemu and lxc domains, leaving others to those maintainers to choose to utilize. John Ferlan (11): conf: Add @flags to Storage Pool Def processing conf: Disallow new storage pools to use all white space as name conf: Add @flags to Network Def processing conf: Disallow new networks to use all white space as name conf: Disallow new qemu,lxc domains to use all white space as name conf: Split and rename secretXMLParseNode conf: Add @flags to Secret Def processing conf: Disallow new secrets to use all white space as usage id conf: Add @flags to NWFilter Def processing conf: Disallow new nwfilters to use all white space as name conf: Disallow new snapshots to use all white space as name src/conf/domain_conf.c | 11 ++- src/conf/domain_conf.h | 4 + src/conf/network_conf.c | 34 +++++--- src/conf/network_conf.h | 19 ++++- src/conf/nwfilter_conf.c | 32 +++++--- src/conf/nwfilter_conf.h | 16 +++- src/conf/secret_conf.c | 79 +++++++++++++------ src/conf/secret_conf.h | 16 +++- src/conf/snapshot_conf.c | 7 ++ src/conf/snapshot_conf.h | 1 + src/conf/storage_conf.c | 32 +++++--- src/conf/storage_conf.h | 19 ++++- src/conf/virnetworkobj.c | 4 +- src/conf/virnwfilterobj.c | 2 +- src/conf/virsecretobj.c | 2 +- src/conf/virstorageobj.c | 4 +- src/esx/esx_network_driver.c | 2 +- src/lxc/lxc_driver.c | 6 +- src/network/bridge_driver.c | 6 +- src/nwfilter/nwfilter_driver.c | 3 +- src/phyp/phyp_driver.c | 2 +- src/qemu/qemu_driver.c | 9 ++- src/qemu/qemu_process.c | 2 +- src/secret/secret_driver.c | 3 +- src/storage/storage_driver.c | 6 +- src/test/test_driver.c | 12 +-- src/vbox/vbox_network.c | 2 +- .../name_whitespace.xml | 3 + tests/domainsnapshotxml2xmltest.c | 38 ++++++--- tests/networkxml2conftest.c | 2 +- tests/networkxml2firewalltest.c | 2 +- .../network-whitespace-name.xml | 6 ++ tests/networkxml2xmltest.c | 4 +- tests/networkxml2xmlupdatetest.c | 2 +- tests/nwfilterxml2firewalltest.c | 2 +- .../name-whitespace-invalid.xml | 4 + tests/nwfilterxml2xmltest.c | 7 +- tests/qemuxml2argvdata/name-whitespace.xml | 29 +++++++ tests/qemuxml2argvtest.c | 5 +- .../usage-whitespace-invalid.xml | 7 ++ tests/secretxml2xmltest.c | 30 +++++-- tests/storagebackendsheepdogtest.c | 4 +- .../pool-dir-whitespace-name.xml | 18 +++++ tests/storagepoolxml2xmltest.c | 45 ++++++++--- tests/storagevolxml2argvtest.c | 4 +- tests/storagevolxml2xmltest.c | 2 +- 46 files changed, 418 insertions(+), 131 deletions(-) create mode 100644 tests/domainsnapshotxml2xmlin/name_whitespace.xml create mode 100644 tests/networkxml2xmlin/network-whitespace-name.xml create mode 100644 tests/nwfilterxml2xmlin/name-whitespace-invalid.xml create mode 100644 tests/qemuxml2argvdata/name-whitespace.xml create mode 100644 tests/secretxml2xmlin/usage-whitespace-invalid.xml create mode 100644 tests/storagepoolxml2xmlin/pool-dir-whitespace-name.xml -- 2.17.1

2 13

[libvirt] [PATCH RFC 00/39] qemu: Add support for -blockdev
by Peter Krempa 31 Jul '18

31 Jul '18

This series adds support for starting and hotplug of disks with -blockdev/blockdev-add. Blockjobs are not supported and thus the last patch should not be applied yet as some refactoring of the jobs is required. At the beginning of the series there are a few cleanup patches which may be pushed even at this point. The main reason this is in RFC state is that block stats reporting does not work. The following command: {"execute":"query-blockstats","arguments":{"query-nodes":true}} Returns no reasonable data: { "stats": { "flush_total_time_ns": 0, "wr_highest_offset": 0, "wr_total_time_ns": 0, "failed_wr_operations": 0, "failed_rd_operations": 0, "wr_merged": 0, "wr_bytes": 0, "timed_stats": [ ], "failed_flush_operations": 0, "account_invalid": false, "rd_total_time_ns": 0, "flush_operations": 0, "wr_operations": 0, "rd_merged": 0, "rd_bytes": 0, "invalid_flush_operations": 0, "account_failed": false, "rd_operations": 0, "invalid_wr_operations": 0, "invalid_rd_operations": 0 }, "node-name": "libvirt-7-storage" }, { "parent": { "stats": { "flush_total_time_ns": 0, "wr_highest_offset": 0, "wr_total_time_ns": 0, "failed_wr_operations": 0, "failed_rd_operations": 0, "wr_merged": 0, "wr_bytes": 0, "timed_stats": [ ], "failed_flush_operations": 0, "account_invalid": false, "rd_total_time_ns": 0, "flush_operations": 0, "wr_operations": 0, "rd_merged": 0, "rd_bytes": 0, "invalid_flush_operations": 0, "account_failed": false, "rd_operations": 0, "invalid_wr_operations": 0, "invalid_rd_operations": 0 }, "node-name": "libvirt-7-storage" }, "stats": { "flush_total_time_ns": 0, "wr_highest_offset": 0, "wr_total_time_ns": 0, "failed_wr_operations": 0, "failed_rd_operations": 0, "wr_merged": 0, "wr_bytes": 0, "timed_stats": [ ], "failed_flush_operations": 0, "account_invalid": false, "rd_total_time_ns": 0, "flush_operations": 0, "wr_operations": 0, "rd_merged": 0, "rd_bytes": 0, "invalid_flush_operations": 0, "account_failed": false, "rd_operations": 0, "invalid_wr_operations": 0, "invalid_rd_operations": 0 }, "node-name": "libvirt-7-format" }, the 'libvirt-7-storage' and 'libvirt-7-format' nodes represent the ISO backing the CDROM used to boot the VM so reads were executed. In the old approach when we use -drive and query-nodes is false the output looks like this: { "device": "drive-ide0-0-0", "parent": { "stats": { "flush_total_time_ns": 0, "wr_highest_offset": 0, "wr_total_time_ns": 0, "failed_wr_operations": 0, "failed_rd_operations": 0, "wr_merged": 0, "wr_bytes": 0, "timed_stats": [ ], "failed_flush_operations": 0, "account_invalid": false, "rd_total_time_ns": 0, "flush_operations": 0, "wr_operations": 0, "rd_merged": 0, "rd_bytes": 0, "invalid_flush_operations": 0, "account_failed": false, "rd_operations": 0, "invalid_wr_operations": 0, "invalid_rd_operations": 0 }, "node-name": "#block080" }, "stats": { "flush_total_time_ns": 0, "wr_highest_offset": 0, "wr_total_time_ns": 0, "failed_wr_operations": 0, "failed_rd_operations": 0, "wr_merged": 0, "wr_bytes": 0, "timed_stats": [ ], "failed_flush_operations": 0, "account_invalid": true, "rd_total_time_ns": 204236271, "flush_operations": 0, "wr_operations": 0, "rd_merged": 0, "rd_bytes": 30046628, "invalid_flush_operations": 0, "account_failed": true, "idle_time_ns": 18766797619, "rd_operations": 14680, "invalid_wr_operations": 0, "invalid_rd_operations": 0 }, "node-name": "#block152" }, I also get all zeroes when I use 'query-nodes' true on a machine started with -drive. Without the stats we'd not achieve feature parity unfortunately. Kevin, could you please have a look? Peter Krempa (39): qemu: monitor: Reuse qemuMonitorJSONQueryBlock in qemuMonitorJSONBlockIoThrottleInfo qemu: monitor: Allow using 'id' instead of 'device' for 'block_set_io_throttle' qemu: monitor: Allow using 'qdev' instead of 'device' for getting disk throttling tests: qemu: Drop disk from hostdev-mdev tests tests: qemuxml2argv: Fork CAPS_LATEST test cases for 'blockdev' tests: qemu: Add test data for backing chains and indexes qemu: hotplug: Don't generate alias when detaching disk util: virqemu: Simplify debugging if building QOM object with missing args qemu: caps: Add capability for using the blockdev infrastructure qemu: process: clear QEMU_CAPS_BLOCKDEV for VMs where we can't support it qemu: domain: Don't redetect backing chain when using -blockdev qemu: process: Don't detect nodenames when we support -blockdev conf: domain: Format out user provided backing chains in XML qemu: domain: Add infrastructure to generate block node names conf: Implement private data formatting and parsing for disks conf: Allow formatting and parsing of 'index' for disk source image qemu: Use proper backingIndex when reporting stats for backing chain qemu: Add field to store QDEV path of a disk in private data qemu: alias: Generate QDEV name of the block backend for disks qemu: domain: Add field for storing node name for copy-on-read qemu: proces: assign node names for user defined backing chains qemu: block: Add generator for the 'copy-on-read' blockdev driver qemu: domain: Prepare qemuDomainDiskGetBackendAlias for -blockdev qemu: command: format disk source commandline for -blockdev qemu: command: Add helper to check if disk throttling is enabled qemu: process: Setup disk io throttling for -blockdev qemu: driver: Use QOM backend name for disk IO throttling APIs qemu: hotplug: Prepare for blockdev-add/blockdev-del with backing chains qemu: monitor: Add APIs for cdrom tray handling for -blockdev qemu: hotplug: Implement removable media change for -blockdev qemu: monitor: Prepare query-block calls for dropping of -drive qemu: Use QOM path with query-block when using -blockdev qemu: monitor: Add API to retrieve blockstats by nodenames qemu: monitor: Add APIs for refreshing disk capacity when using -blockdev qemu: driver: Don't pass 'virDomainDiskDefPtr' to qemuDomainGetStatsOneBlock qemu: driver: Allow using blockdev with qemuDomainBlocksStatsGather qemu: monitor: Extract 'write-threshold' automatically for -blockdev qemu: driver: Prepare qemuDomainGetStatsBlock (bulk disk stats) for -blockdev DO NOT APPLY: Enable QEMU_CAPS_BLOCKDEV if 'copy-on-read' is supported docs/formatdomain.html.in | 7 +- docs/schemas/domaincommon.rng | 19 ++ src/conf/domain_conf.c | 89 +++++- src/conf/domain_conf.h | 7 + src/qemu/qemu_alias.c | 86 +++-- src/qemu/qemu_alias.h | 3 +- src/qemu/qemu_block.c | 22 ++ src/qemu/qemu_block.h | 2 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 94 +++++- src/qemu/qemu_command.h | 3 + src/qemu/qemu_domain.c | 173 ++++++++++- src/qemu/qemu_domain.h | 9 + src/qemu/qemu_driver.c | 244 ++++++++++----- src/qemu/qemu_hotplug.c | 175 +++++++++-- src/qemu/qemu_monitor.c | 108 ++++++- src/qemu/qemu_monitor.h | 36 ++- src/qemu/qemu_monitor_json.c | 346 ++++++++++++++++++--- src/qemu/qemu_monitor_json.h | 33 +- src/qemu/qemu_process.c | 84 ++++- src/util/virqemu.c | 5 +- tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 1 + tests/qemumonitorjsontest.c | 14 +- tests/qemustatusxml2xmldata/modern-in.xml | 6 + tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args | 37 +++ tests/qemuxml2argvdata/disk-aio.x86_64-latest.args | 19 +- .../disk-backing-chains-index.x86_64-2.12.0.args | 1 + .../disk-backing-chains-index.x86_64-latest.args | 1 + .../qemuxml2argvdata/disk-backing-chains-index.xml | 145 +++++++++ .../disk-backing-chains-noindex.x86_64-2.12.0.args | 58 ++++ .../disk-backing-chains-noindex.x86_64-latest.args | 163 ++++++++++ .../disk-backing-chains-noindex.xml | 145 +++++++++ .../qemuxml2argvdata/disk-cache.x86_64-2.12.0.args | 50 +++ .../qemuxml2argvdata/disk-cache.x86_64-latest.args | 50 ++- .../disk-cdrom-network.x86_64-2.12.0.args | 41 +++ .../disk-cdrom-network.x86_64-latest.args | 32 +- .../disk-cdrom-tray.x86_64-2.12.0.args | 39 +++ .../disk-cdrom-tray.x86_64-latest.args | 24 +- .../qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args | 35 +++ .../qemuxml2argvdata/disk-cdrom.x86_64-latest.args | 17 +- .../disk-copy_on_read.x86_64-2.12.0.args | 41 +++ .../disk-copy_on_read.x86_64-latest.args | 19 +- .../disk-detect-zeroes.x86_64-2.12.0.args | 37 +++ .../disk-detect-zeroes.x86_64-latest.args | 17 +- .../disk-error-policy.x86_64-2.12.0.args | 41 +++ .../disk-error-policy.x86_64-latest.args | 30 +- .../disk-floppy.x86_64-2.12.0.args | 35 +++ .../disk-network-gluster.x86_64-2.12.0.args | 44 +++ .../disk-network-gluster.x86_64-latest.args | 32 +- .../disk-network-iscsi.x86_64-2.12.0.args | 63 ++++ .../disk-network-iscsi.x86_64-latest.args | 58 ++-- .../disk-network-nbd.x86_64-2.12.0.args | 46 +++ .../disk-network-nbd.x86_64-latest.args | 41 ++- .../disk-network-rbd.x86_64-2.12.0.args | 61 ++++ .../disk-network-rbd.x86_64-latest.args | 67 ++-- .../disk-network-sheepdog.x86_64-2.12.0.args | 35 +++ .../disk-network-sheepdog.x86_64-latest.args | 16 +- .../disk-network-source-auth.x86_64-2.12.0.args | 47 +++ .../disk-network-source-auth.x86_64-latest.args | 30 +- .../disk-network-tlsx509.x86_64-2.12.0.args | 59 ++++ .../disk-network-tlsx509.x86_64-latest.args | 61 ++-- .../disk-readonly-disk.x86_64-2.12.0.args | 34 ++ .../disk-readonly-disk.x86_64-latest.args | 14 +- .../disk-shared.x86_64-2.12.0.args | 37 +++ .../disk-shared.x86_64-latest.args | 18 +- ...isk-virtio-scsi-reservations.x86_64-2.12.0.args | 43 +++ ...isk-virtio-scsi-reservations.x86_64-latest.args | 20 +- .../floppy-drive-fat.x86_64-2.12.0.args | 33 ++ .../hostdev-mdev-display-missing-graphics.xml | 6 - ...v-display-spice-egl-headless.x86_64-latest.args | 2 - .../hostdev-mdev-display-spice-egl-headless.xml | 6 - ...ev-mdev-display-spice-opengl.x86_64-latest.args | 2 - .../hostdev-mdev-display-spice-opengl.xml | 6 - ...dev-display-vnc-egl-headless.x86_64-latest.args | 2 - .../hostdev-mdev-display-vnc-egl-headless.xml | 6 - .../hostdev-mdev-display-vnc.x86_64-latest.args | 2 - .../qemuxml2argvdata/hostdev-mdev-display-vnc.xml | 6 - tests/qemuxml2argvdata/hostdev-mdev-display.xml | 6 - .../hostdev-mdev-invalid-target-address.xml | 5 - .../qemuxml2argvdata/hostdev-mdev-precreated.args | 2 - tests/qemuxml2argvdata/hostdev-mdev-precreated.xml | 6 - .../hostdev-mdev-src-address-invalid.xml | 6 - tests/qemuxml2argvtest.c | 24 ++ .../disk-backing-chains-inactive.xml | 35 +++ .../disk-backing-chains-index-active.xml | 156 ++++++++++ .../disk-backing-chains-index-inactive.xml | 156 ++++++++++ .../disk-backing-chains-noindex-active.xml | 156 ++++++++++ .../disk-backing-chains-noindex-inactive.xml | 156 ++++++++++ tests/qemuxml2xmloutdata/disk-mirror-inactive.xml | 4 + .../disk-mirror-old-inactive.xml | 4 + tests/qemuxml2xmloutdata/hostdev-mdev-display.xml | 6 - .../qemuxml2xmloutdata/hostdev-mdev-precreated.xml | 6 - tests/qemuxml2xmltest.c | 2 + 95 files changed, 3781 insertions(+), 493 deletions(-) create mode 100644 tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args create mode 120000 tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-2.12.0.args create mode 120000 tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-backing-chains-index.xml create mode 100644 tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-backing-chains-noindex.xml create mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-copy_on_read.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-error-policy.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-floppy.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-network-source-auth.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-readonly-disk.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-2.12.0.args create mode 100644 tests/qemuxml2argvdata/floppy-drive-fat.x86_64-2.12.0.args create mode 100644 tests/qemuxml2xmloutdata/disk-backing-chains-index-active.xml create mode 100644 tests/qemuxml2xmloutdata/disk-backing-chains-index-inactive.xml create mode 100644 tests/qemuxml2xmloutdata/disk-backing-chains-noindex-active.xml create mode 100644 tests/qemuxml2xmloutdata/disk-backing-chains-noindex-inactive.xml -- 2.16.2

4 57