- Devel - libvirt List Archives

[PATCH 00/10] Fix NSS plugin and net-dhcp-get-leases wrt to infinite leases
by Michal Privoznik 05 Jan '21

05 Jan '21

Some things are broken when using leases that don't expire. We don't store "expiry-time" in corresponding $brname.status file which sets off a spiral and we get errors from other places which expect it to be there always. These patches make sure that the attribute is always there. I've also implemented another approach, which puts "expiry-time" into the file only if not infinite and fixed the other places which expect it: https://gitlab.com/MichalPrivoznik/libvirt/-/commits/leases_docs/ but I like this version more. Michal Prívozník (10): docs: Document ability to configure lease time leaseshelper: Report errors on failure virlease: Rework virLeaseReadCustomLeaseFile() virlease: Use virTrimSpaces() instead of open coded alternative virlease: Allow infinite lease expiry time network: Drop @custom_lease_file_len variable from networkGetDHCPLeases() networkGetDHCPLeases: Use VIR_APPEND_ELEMENT() instead of VIR_INSERT_ELEMENT() network: Rework networkGetDHCPLeases() networkGetDHCPLeases: Handle leases with infinite expiry time nss: handle leases with infinite expiry time docs/formatnetwork.html.in | 21 ++++++++- src/network/bridge_driver.c | 79 +++++++++++++++++----------------- src/network/leaseshelper.c | 2 + src/util/virlease.c | 33 +++++++------- tests/nssdata/virbr0.status | 7 +++ tests/nsstest.c | 2 +- tools/nss/libvirt_nss_leases.c | 4 +- 7 files changed, 87 insertions(+), 61 deletions(-) -- 2.26.2

3 13

[libvirt PATCH v2 0/5] vmx: Don't error out on missing filename for cdrom
by Martin Kletzander 05 Jan '21

05 Jan '21

This is perfectly valid in VMWare and the VM just boots with an empty drive. We used to just skip the whole drive before, but since we changed how we parse empty cdrom drives this now results in an error and the user not being able to even dump the XML. Instead of erroring out, just keep the drive empty. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1903953 v2: - Do not report and reset an error, but handle it more nicely. v1: - https://www.redhat.com/archives/libvir-list/2020-December/msg00840.html Martin Kletzander (5): esx: Unindent unnecessary conditional branch tests: Use g_autofree in testParseVMXFileName vmx: Make virVMXParseFileName return an integer vmx: Allow missing cdrom image file in virVMXParseFileName vmx: Treat missing cdrom-image as empty drive src/esx/esx_driver.c | 160 ++++++++++-------- src/vmware/vmware_conf.c | 10 +- src/vmx/vmx.c | 25 +-- src/vmx/vmx.h | 5 +- .../vmx2xmldata/vmx2xml-cdrom-ide-missing.vmx | 6 + tests/vmx2xmltest.c | 36 ++-- 6 files changed, 136 insertions(+), 106 deletions(-) create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-ide-missing.vmx -- 2.29.2

3 8

[libvirt PATCH] docs: Fix dead link
by Tim Wiederhake 05 Jan '21

05 Jan '21

Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com> --- docs/coding-style.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/coding-style.rst b/docs/coding-style.rst index b3ac070fac..55dfa196a2 100644 --- a/docs/coding-style.rst +++ b/docs/coding-style.rst @@ -939,7 +939,7 @@ ok: Although libvirt does not encourage the Linux kernel wind/unwind style of multiple labels, there's a good general discussion of the issue archived at -`KernelTrap <http://kerneltrap.org/node/553/2131>`__ +`KernelTrap <https://web.archive.org/web/20130521051957/http://kerneltrap.org/node/553/2…>`__ When using goto, please use one of these standard labels if it makes sense: -- 2.26.2

3 2

[PATCH] update ci dockerfile from Leap 15.1 to 15.2
by Cho, Yu-Chen 05 Jan '21

05 Jan '21

Signed-off-by: Cho, Yu-Chen <acho(a)suse.com> --- .gitlab-ci.yml | 14 +++++++------- ...e-151.Dockerfile => ci-opensuse-152.Dockerfile} | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) rename ci/containers/{ci-opensuse-151.Dockerfile => ci-opensuse-152.Dockerfile} (98%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e2d5545f0f..30a0b23381 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -160,10 +160,10 @@ x64-fedora-rawhide-container: variables: NAME: fedora-rawhide -x64-opensuse-151-container: +x64-opensuse-152-container: <<: *container_job_definition variables: - NAME: opensuse-151 + NAME: opensuse-152 x64-ubuntu-1804-container: <<: *container_job_definition @@ -365,12 +365,12 @@ x64-fedora-rawhide-clang: CC: clang RPM: skip -x64-opensuse-151: +x64-opensuse-152: <<: *native_build_job_definition needs: - - x64-opensuse-151-container + - x64-opensuse-152-container variables: - NAME: opensuse-151 + NAME: opensuse-152 RPM: skip x64-ubuntu-1804: @@ -533,9 +533,9 @@ website: codestyle: stage: builds - image: $CI_REGISTRY_IMAGE/ci-opensuse-151:latest + image: $CI_REGISTRY_IMAGE/ci-opensuse-152:latest needs: - - x64-opensuse-151-container + - x64-opensuse-152-container before_script: - *script_variables script: diff --git a/ci/containers/ci-opensuse-151.Dockerfile b/ci/containers/ci-opensuse-152.Dockerfile similarity index 98% rename from ci/containers/ci-opensuse-151.Dockerfile rename to ci/containers/ci-opensuse-152.Dockerfile index 9458d2de0c..def45cbe3f 100644 --- a/ci/containers/ci-opensuse-151.Dockerfile +++ b/ci/containers/ci-opensuse-152.Dockerfile @@ -3,7 +3,7 @@ # $ lcitool dockerfile opensuse-151 libvirt # # https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c4… -FROM registry.opensuse.org/opensuse/leap:15.1 +FROM registry.opensuse.org/opensuse/leap:15.2 RUN zypper update -y && \ zypper install -y \ -- 2.29.2

2 1

[libvirt PATCH 0/2] rpm: minor swtpm fixes
by Daniel P. Berrangé 05 Jan '21

05 Jan '21

Originally reported at https://src.fedoraproject.org/rpms/libvirt/pull-request/9 Daniel P. Berrangé (2): rpm: ensure swtpm tools are installed with QEMU rpm: fix ownership of the swtpm log directory libvirt.spec.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -- 2.29.2

2 4

[PATCH] Enable VMware driver by default
by Michal Privoznik 05 Jan '21

05 Jan '21

During rewrite to meson it was mistakenly disabled. Originally, we had: LIBVIRT_ARG_WITH_FEATURE([VMWARE], [VMware], [yes]) which enabled the driver by default. But in meson we are checking whether the 'driver_vmware' option is enabled without anything enabling it automagically. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 3f3412975b..b5164f68ed 100644 --- a/meson.build +++ b/meson.build @@ -1790,7 +1790,7 @@ if not get_option('driver_vbox').disabled() and conf.has('WITH_LIBVIRTD') conf.set_quoted('VBOX_XPCOMC_DIR', get_option('vbox_xpcomc_dir')) endif -if get_option('driver_vmware').enabled() +if not get_option('driver_vmware').disabled() conf.set('WITH_VMWARE', 1) conf.set('WITH_VMX', 1) endif -- 2.26.2

2 1

[PATCH] Fix wrong use of path variable
by liyalei 05 Jan '21

05 Jan '21

From: liyalei <liyl43(a)chinatelecom.cn> --- src/util/virnetdevopenvswitch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c index d380b0cf22..7eabaa763d 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -494,7 +494,7 @@ virNetDevOpenvswitchGetVhostuserIfname(const char *path, if (server) { virCommandAddArgList(cmd, "--no-headings", "--columns=name", "find", "Interface", NULL); - virCommandAddArgPair(cmd, "options:vhost-server-path", "path"); + virCommandAddArgPair(cmd, "options:vhost-server-path", path); } else { const char *tmpIfname = NULL; -- 2.27.0

3 2

[PATCH 0/5] Fix qemuNodeGetSecurityModel() and some related cleanups
by Michal Privoznik 04 Jan '21

04 Jan '21

While I'd love to give more context, I can't - I've found these on a stale branch. However, they are still valid and worth of merging. Michal Prívozník (5): qemu: Use virStrcpy in qemuNodeGetSecurityModel() qemu: Obtain @caps only after ACL check in qemuNodeGetSecurityModel qemu: Fix retval if ACL check fails in qemuNodeGetSecurityModel domain_conf: Parse full length of some <seclabel/> attributes use more virStrcpy() and virStrcpyStatic() src/conf/domain_conf.c | 6 ++---- src/libvirt-lxc.c | 5 ++--- src/qemu/qemu_driver.c | 23 +++++++++-------------- src/remote/remote_driver.c | 12 ++++-------- src/security/security_selinux.c | 3 +-- 5 files changed, 18 insertions(+), 31 deletions(-) -- 2.26.2

2 6

Release of libvirt-6.5.0
by Daniel Veillard 04 Jan '21

04 Jan '21

Half a day late, but I pushed the 6.5.0 release out, it is as usual available as a signed tarball and source rpms from the server: https://libvirt.org/sources/ I also tagged and pushed the 6.5.0 python bindings that one can find at https://libvirt.org/sources/python/ This release includes a number of new features and some improvement, as well as a crash which had made its way in 6.4.0. It will also be my last release of libvirt after close to 15 years, so expect new releases to be signed by Jiri Denemark from now on. * New Features: - Allow firmware blobs configuration QEMU offers a way to tweak how firmware configures itself and/or provide new configuration blobs. New ``<sysinfo/>`` type is introduced that will hold these new blobs. It's possible to either specify new value as a string or provide a filename which contents then serve as the value. - nodedev: Add ability to create mediated devices Mediated devices can now be created with ``virNodeDeviceCreateXML()``. This functionality requires the ``mdevctl`` utility to be installed. The XML schema for node devices was expanded to support attributes for mediated devices. - QEMU: add TPM Proxy device support libvirt can now create guests using a new device type called "TPM Proxy". The TPM Proxy connects to a TPM Resource Manager present in the host, enabling the guest to run in secure virtual machine mode with the help of an Ultravisor. Adding a TPM Proxy to a pSeries guest brings no security benefits unless the guest is running on a PPC64 host that has Ultravisor and TPM Resource Manager support. Only one TPM Proxy is allowed per guest. A guest using a TPM Proxy device can instantiate another TPM device at the same time. This device is supported only for pSeries guests via the new 'spapr-tpm-proxy' model of the TPM 'passthrough' backend. - virhook: Support hooks placed in several files Running all scripts from directory /etc/libvirt/hooks/<driver>.d in alphabetical order. Hook script in old place will be executed as first for backward compatibility. - qemu: Add support for migratable host-passthrough CPU QEMU 2.12 made it possible for guests to use a migration-friendly version of the host-passthrough CPU. This feature is now exposed by libvirt. * Improvements: - network: Support NAT with IPv6 It's now possible to use ``<nat ipv6="yes"/>`` in a libvirt network. - qemu: Auto-fill NUMA information for incomplete topologies If the NUMA topology is not fully described in the guest XML, libvirt will complete it by putting all unspecified CPUs in the first NUMA node. This is only done in the QEMU binary itself supports disjointed CPU ranges for NUMA nodes. - qemu: Assign hostdev-backed interfaces to PCIe slots All SR-IOV capable devices are PCIe, so when their VFs are assigned to guests they should end up in PCIe slots rather than conventional PCI ones. * Bug fixes: - qemu: fixed crash in ``qemuDomainBlockCommit`` This release fixes a regression which was introduced in libvirt v6.4.0 where libvirtd always crashes when a block commit of a disk is requested. - qemu: fixed zPCI address auto generation on s390 Removes the correlation between the zPCI address attributes uid and fid. Fixes the validation and autogeneration of zPCI address attributes. - qemu: Skip pre-creation of NVMe disks during migration libvirt has no way to create NVMe devices on the target host, so it now just makes sure they exist and let the migration proceed in that case. Thanks everybody for the help on putting this release out, and the gazillion ones before :-) Enjoy and stay safe ! 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/

5 6

[PATCH] kbase: debuglogs: Fix typo in unprivileged libvirtd config path
by Tomáš Janoušek 04 Jan '21

04 Jan '21

Signed-off-by: Tomáš Janoušek <tomi(a)nomi.cz> --- docs/kbase/debuglogs.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/kbase/debuglogs.rst b/docs/kbase/debuglogs.rst index f3937bc337..3fb06bedc3 100644 --- a/docs/kbase/debuglogs.rst +++ b/docs/kbase/debuglogs.rst @@ -68,7 +68,7 @@ variable: However, when you are using the session mode ``qemu:///session`` or you run the ``libvirtd`` as unprivileged user you will find configuration file under -``$XDG_CONFIG_HOME/libvirt/libvirt.conf``. +``$XDG_CONFIG_HOME/libvirt/libvirtd.conf``. Runtime setting ^^^^^^^^^^^^^^^ -- Tomáš Janoušek, a.k.a. Pivník, a.k.a. Liskni_si, https://work.lisk.in/

2 1

[PATCH] qemu: Drop has_ccw_address from _qemuAgentDiskAddress
by Michal Privoznik 04 Jan '21

04 Jan '21

In recent patches new mambers to _qemuAgentDiskAddress struct were introduced to keep optional CCW address sent by the guest agent. These two members are a struct to store CCW address into and a boolean to keep track whether the CCW address is valid. Well, we can hold the same information with a pointer - instead of storing the CCW address structure let's keep just a pointer to it. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_agent.c | 18 ++++++++++++------ src/qemu/qemu_agent.h | 3 +-- src/qemu/qemu_driver.c | 9 +++------ 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index b155896e78..af0397e6e2 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -1824,6 +1824,7 @@ qemuAgentDiskAddressFree(qemuAgentDiskAddressPtr info) g_free(info->serial); g_free(info->bus_type); g_free(info->devnode); + g_free(info->ccw_addr); g_free(info); } @@ -1899,12 +1900,17 @@ qemuAgentGetDiskAddress(virJSONValuePtr json) GET_DISK_ADDR(pci, &addr->pci_controller.function, "function"); if ((ccw = virJSONValueObjectGet(json, "ccw-address"))) { - addr->has_ccw_address = true; - GET_DISK_ADDR(ccw, &addr->ccw_addr.cssid, "cssid"); - if (addr->ccw_addr.cssid == 0) /* Guest CSSID 0 is 0xfe on host */ - addr->ccw_addr.cssid = 0xfe; - GET_DISK_ADDR(ccw, &addr->ccw_addr.ssid, "ssid"); - GET_DISK_ADDR(ccw, &addr->ccw_addr.devno, "devno"); + g_autofree virDomainDeviceCCWAddressPtr ccw_addr = NULL; + + ccw_addr = g_new0(virDomainDeviceCCWAddress, 1); + + GET_DISK_ADDR(ccw, &ccw_addr->cssid, "cssid"); + if (ccw_addr->cssid == 0) /* Guest CSSID 0 is 0xfe on host */ + ccw_addr->cssid = 0xfe; + GET_DISK_ADDR(ccw, &ccw_addr->ssid, "ssid"); + GET_DISK_ADDR(ccw, &ccw_addr->devno, "devno"); + + addr->ccw_addr = g_steal_pointer(&ccw_addr); } #undef GET_DISK_ADDR diff --git a/src/qemu/qemu_agent.h b/src/qemu/qemu_agent.h index 4ea9b9dc1e..0d47230161 100644 --- a/src/qemu/qemu_agent.h +++ b/src/qemu/qemu_agent.h @@ -77,8 +77,7 @@ struct _qemuAgentDiskAddress { unsigned int target; unsigned int unit; char *devnode; - bool has_ccw_address; - virDomainDeviceCCWAddress ccw_addr; + virDomainDeviceCCWAddressPtr ccw_addr; }; void qemuAgentDiskAddressFree(qemuAgentDiskAddressPtr addr); G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuAgentDiskAddress, qemuAgentDiskAddressFree); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 62b0852c33..a376824854 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -18887,8 +18887,7 @@ qemuAgentFSInfoToPublic(qemuAgentFSInfoPtr agent, diskDef = virDomainDiskByAddress(vmdef, &agentdisk->pci_controller, - agentdisk->has_ccw_address ? - &agentdisk->ccw_addr : NULL, + agentdisk->ccw_addr, agentdisk->bus, agentdisk->target, agentdisk->unit); @@ -19931,8 +19930,7 @@ qemuAgentDiskInfoFormatParams(qemuAgentDiskInfoPtr *info, /* match the disk to the target in the vm definition */ diskdef = virDomainDiskByAddress(vmdef, &info[i]->address->pci_controller, - info[i]->address->has_ccw_address ? - &info[i]->address->ccw_addr : NULL, + info[i]->address->ccw_addr, info[i]->address->bus, info[i]->address->target, info[i]->address->unit); @@ -20017,8 +20015,7 @@ qemuAgentFSInfoFormatParams(qemuAgentFSInfoPtr *fsinfo, /* match the disk to the target in the vm definition */ diskdef = virDomainDiskByAddress(vmdef, &d->pci_controller, - d->has_ccw_address ? - &d->ccw_addr : NULL, + d->ccw_addr, d->bus, d->target, d->unit); -- 2.26.2

2 1

live migration is not using secondary interface
by Olaf Hering 04 Jan '21

04 Jan '21

A naive 'virsh migrate --live domU xen+tcp://cross-over-ip' uses the ordinary uplink instead of the requested IP address. According to the documentation an additional option has to be specified to really use the other network interface. However, neither 'tcp://cross-over-ip' nor 'xenmigr:cross-over-ip/' works, the migration does not start. 'xenmigr' was removed with 1dac5fbbbb06a0341e8087dc33af75c8352d77a4 and 7ed598438687feaddaf0a653d7cbb8a1c1ad4933, but the docs were not updated. This leaves 'tcp://ip'. What change needs to be done in the driver to support a secondary interface? Olaf

3 4

[RFC PATCH 0/3] Fix "virsh domfsinfo" on s390x (again)
by Thomas Huth 04 Jan '21

04 Jan '21

My previous attempts to fix "virsh domfsinfo" on s390x were unfortunately wrong due to some misunderstandings on my side. To correctly list the "Target" device in the output of "virsh domfsinfo", we need to search through the available devices using their CCW address on s390x. For this the QEMU guest agent will be enhanced to also send the CCW address of devices in the guest (see the following URL for details: https://lore.kernel.org/qemu-devel/20201125105417.380317-1-thuth@redhat.com/ ... but it has just been posted and will take some time to get merged, since QEMU is still in hard freeze, that's why I've labed this libvirt series here as RFC only). Using this CCW address, we then can look up the correct target devices on the libvirt side, too. See also https://bugzilla.redhat.com/show_bug.cgi?id=1858771 for some more information. Thomas Huth (3): qemu: agent: Store CCW address in qemuAgentDiskInfo if provided by the guest domain_conf: Allow to look up virtio-block devices by their CCW address domain_conf: Allow to look up scsi disks when controller uses a CCW address src/conf/domain_conf.c | 33 ++++++++++++++++++++++++++++++++- src/conf/domain_conf.h | 4 ++++ src/qemu/qemu_agent.c | 11 +++++++++++ src/qemu/qemu_agent.h | 2 ++ src/qemu/qemu_driver.c | 8 +++++--- 5 files changed, 54 insertions(+), 4 deletions(-) -- 2.18.4

3 12

[PATCH] virt-aa-helper: disallow graphics socket read permissions
by Simon Arlott 02 Jan '21

02 Jan '21

The VM does not need read permission for its own sockets to create(), bind(), accept() connections or to recv(), send(), etc. on connections. This was fixed in ab9569e5460d1e4737fe8b625c67687dc2204665 (virt-aa-helper: disallow VNC socket read permissions), but then b6465e1aa49397367a9cd0f27110b9c2280a7385 (graphics: introduce new listen type 'socket') and acc83afe333bfadd3f7f79091d38ca3d7da1eeb2 (acc83afe333bfadd3f7f79091d38ca3d7da1eeb2) reverted it. Unless the read permission is omitted, VMs can connect to each other's VNC/graphics sockets. Signed-off-by: Simon Arlott <libvirt(a)octiron.net> --- src/security/virt-aa-helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 6e6dd1b1db..fddbdafc41 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -1053,7 +1053,7 @@ get_files(vahControl * ctl) if (listenObj.type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET && listenObj.socket && - vah_add_file(&buf, listenObj.socket, "rw")) + vah_add_file(&buf, listenObj.socket, "w")) goto cleanup; } } -- 2.17.1 -- Simon Arlott

3 6

[PATCH] Deprecate pmem=on with non-DAX capable backend file
by Igor Mammedov 29 Dec '20

29 Dec '20

It is not safe to pretend that emulated NVDIMM supports persistence while backend actually failed to enable it and used non-persistent mapping as fall back. Instead of falling-back, QEMU should be more strict and error out with clear message that it's not supported. So if user asks for persistence (pmem=on), they should store backing file on NVDIMM. Signed-off-by: Igor Mammedov <imammedo(a)redhat.com> --- docs/system/deprecated.rst | 14 ++++++++++++++ util/mmap-alloc.c | 3 +++ 2 files changed, 17 insertions(+) diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index bacd76d7a5..ba4f6ed2fe 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -327,6 +327,20 @@ The Raspberry Pi machines come in various models (A, A+, B, B+). To be able to distinguish which model QEMU is implementing, the ``raspi2`` and ``raspi3`` machines have been renamed ``raspi2b`` and ``raspi3b``. +Backend options +--------------- + +Using non-persistent backing file with pmem=on (since 6.0) +'''''''''''''''''''''''''''''''''''''''''''''''''''''''''' + +This option is used when ``memory-backend-file`` is consumed by emulated NVDIMM +device. However enabling ``memory-backend-file.pmem`` option, when backing file +is not DAX capable or not on a filesystem that support direct mapping of persistent +memory, is not safe and may lead to data loss or corruption in case of host crash. +Using pmem=on option with such file will return error, instead of a warning. +Options are to move backing file to NVDIMM storage or modify VM configuration +to set ``pmem=off`` to continue using fake NVDIMM without persistence guaranties. + Device options -------------- diff --git a/util/mmap-alloc.c b/util/mmap-alloc.c index 27dcccd8ec..d226273a98 100644 --- a/util/mmap-alloc.c +++ b/util/mmap-alloc.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "qemu/mmap-alloc.h" #include "qemu/host-utils.h" +#include "qemu/error-report.h" #define HUGETLBFS_MAGIC 0x958458f6 @@ -166,6 +167,8 @@ void *qemu_ram_mmap(int fd, "crash.\n", file_name); g_free(proc_link); g_free(file_name); + warn_report("Deprecated using non DAX backing file with" + " pmem=on option"); } /* * if map failed with MAP_SHARED_VALIDATE | MAP_SYNC, -- 2.27.0

2 2

RFC PATCH: Issue 90 (Test Clarification)
by Ryan Gahagan 29 Dec '20

29 Dec '20

We addressed the feedback from our previous RFC patch for the most part. Under src/util/virstoragefile.c, we left a cast to an integer pointer that Peter mentioned because we were unable to provide a better solution. We've written some tests for our code but our testing environment is not working locally (meson doesn't even recognize the project as a meson build project) and so we can't regenerate output or test our tests. It's probably bad practice but the only solution we could think of that would allow us to check our tests was just to email you what we've got. Sorry if it's not up to standard, but please let us know if there's a better way to do it or if you spot any problems in these tests. Under tests/qemuxml2xmltest.c: DO_TEST_CAPS_LATEST("disk-network-nfs"); The same line would be in tests/qemuxml2argvtest.c We created the file tests/qemuxml2argvdata/disk-network-nfs.xml: <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-x86_64</emulator> <disk type='network' device='disk'> <driver name='qemu' type='raw' cache='none'/> <source protocol='nfs' name='/foo/bar/baz'> <host name='example.com' port='2049'/> <nfs user='nfs-user' group='nfs-group'/> </source> <target dev='vda' bus='virtio'/> <serial>eb90327c-8302-4725-9e1b-4e85ed4dc251</serial> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </disk> <controller type='usb' index='0'/> <controller type='pci' index='0' model='pci-root'/> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <memballoon model='none'/> </devices> </domain> We have under tests/qemublocktest.c: TEST_JSON_FORMAT_NET(“<source protocol=’nfs’ name=’/foo/bar/baz’>\n” “ <host name=’example.com’ port=’2049’/>\n” “ <nfs user=’USER’ group=’GROUP’/>\n” "</source>\n”); and TEST_IMAGE_CREATE(“network-nfs-qcow2”, NULL); And finally under tests/virstoragetest.c: TEST_BACKING_PARSE(“json:{\”file\”:{\”driver\”:\”nfs\”,” “\”user\”:\”USER\”,” “\”group\”:\”GROUP\”,” “\”server\”: { \”host\”:\”example.com\”,” “\”port\”:\”2049\”” ”}” “}” “}”, “<source protocol=’nfs’ name=’/foo/bar/baz’>\n” “ <host name=’example.com’ port=’2049’/>\n” “ <nfs user=’USER’ group=’GROUP’/>\n” “</source>\n”); Again, sorry if this looks awful. Please let us know if there's a more practical way to do this because submitting a commit with these tests would guarantee that the tests fail and the commit wouldn't be mergeable due to our environment issues, or if you see anything wrong with these tests.

3 18

Re: [RFC PATCH] conf: Add support for keeping TPM emulator state
by Stefan Berger 27 Dec '20

27 Dec '20

On 12/22/20 7:12 PM, Eiichi Tsukata wrote: > Currently, swtpm TPM state file is removed when the transient domain is > powered off or the domain is undefined. When we store TPM state on a > shared storage such as NFS and use transient domain, TPM states should > be kept as it is. > > Add per-TPM emulator option `persistent_sate` for keeping TPM state. > This option only works for the emulator type backend and looks as follows: > > <tpm model='tpm-tis'> > <backend type='emulator' persistent_state='yes'/> > </tpm> > > Signed-off-by: Eiichi Tsukata <eiichi.tsukata(a)nutanix.com> > --- > docs/formatdomain.rst | 7 ++++ > docs/schemas/domaincommon.rng | 12 ++++++ > src/conf/domain_conf.c | 21 ++++++++++ > src/conf/domain_conf.h | 1 + > src/qemu/qemu_tpm.c | 3 +- > ...pm-emulator-tpm2-pstate.x86_64-latest.args | 38 +++++++++++++++++++ > .../tpm-emulator-tpm2-pstate.xml | 30 +++++++++++++++ > tests/qemuxml2argvtest.c | 1 + > ...tpm-emulator-tpm2-pstate.x86_64-latest.xml | 37 ++++++++++++++++++ > tests/qemuxml2xmltest.c | 1 + > 10 files changed, 150 insertions(+), 1 deletion(-) > create mode 100644 tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.x86_64-latest.args > create mode 100644 tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.xml > create mode 100644 tests/qemuxml2xmloutdata/tpm-emulator-tpm2-pstate.x86_64-latest.xml > > diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst > index 512939679b..9e5f6340fb 100644 > --- a/docs/formatdomain.rst > +++ b/docs/formatdomain.rst > @@ -6986,6 +6986,13 @@ Example: usage of the TPM Emulator > - '1.2' : creates a TPM 1.2 > - '2.0' : creates a TPM 2.0 > > +``persistent_state`` > + The ``persistent_state`` attribute indicates whether 'swtpm' TPM state is > + kept or not when the transient domain is powered off or undefined. This Nit: the transient domain -> a transient domain > + option can be used for storing TPM state on shared storage. By default the Nit: storing -> preserving But this is not only related to shared storage, is it? Can we remove 'on shared storage'? > + value is ``no``. This attribute only works with the ``emulator`` backend. > + The accepted values are ``yes`` and ``no``. > + > ``encryption`` > The ``encryption`` element allows the state of a TPM emulator to be > encrypted. The ``secret`` must reference a secret object that holds the > diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng > index 795b654feb..d7cedc014c 100644 > --- a/docs/schemas/domaincommon.rng > +++ b/docs/schemas/domaincommon.rng > @@ -4780,6 +4780,18 @@ > </optional> > </group> > </choice> > + <choice> > + <group> > + <optional> > + <attribute name="persistent_state"> > + <choice> > + <value>yes</value> > + <value>no</value> > + </choice> > + </attribute> > + </optional> > + </group> > + </choice> > </element> > </define> > > diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c > index 23415b323c..82c3a68347 100644 > --- a/src/conf/domain_conf.c > +++ b/src/conf/domain_conf.c > @@ -13178,6 +13178,12 @@ virDomainSmartcardDefParseXML(virDomainXMLOptionPtr xmlopt, > * <encryption secret='32ee7e76-2178-47a1-ab7b-269e6e348015'/> > * </backend> > * </tpm> > + * > + * Emulator persistent_state is supported with the following: > + * > + * <tpm model='tpm-tis'> > + * <backend type='emulator' version='2.0' persistent_state='yes'> > + * </tpm> > */ > static virDomainTPMDefPtr > virDomainTPMDefParseXML(virDomainXMLOptionPtr xmlopt, > @@ -13193,6 +13199,7 @@ virDomainTPMDefParseXML(virDomainXMLOptionPtr xmlopt, > g_autofree char *backend = NULL; > g_autofree char *version = NULL; > g_autofree char *secretuuid = NULL; > + g_autofree char *persistent_state = NULL; > g_autofree xmlNodePtr *backends = NULL; > > def = g_new0(virDomainTPMDef, 1); > @@ -13265,6 +13272,18 @@ virDomainTPMDefParseXML(virDomainXMLOptionPtr xmlopt, > } > def->data.emulator.hassecretuuid = true; > } > + > + persistent_state = virXMLPropString(backends[0], "persistent_state"); > + if (persistent_state) { > + if (virStringParseYesNo(persistent_state, > + &def->data.emulator.persistent_state) < 0) { > + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", > + _("Invalid persistent_state value, either 'yes' or 'no'")); > + goto error; > + } > + } else { > + def->data.emulator.persistent_state = false; > + } > break; > case VIR_DOMAIN_TPM_TYPE_LAST: > goto error; > @@ -26952,6 +26971,8 @@ virDomainTPMDefFormat(virBufferPtr buf, > case VIR_DOMAIN_TPM_TYPE_EMULATOR: > virBufferAsprintf(buf, " version='%s'", > virDomainTPMVersionTypeToString(def->version)); > + if (def->data.emulator.persistent_state) > + virBufferAddLit(buf, " persistent_state='yes'"); > if (def->data.emulator.hassecretuuid) { > char uuidstr[VIR_UUID_STRING_BUFLEN]; > virBufferAddLit(buf, ">\n"); > diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h > index 72771c46b9..109625828a 100644 > --- a/src/conf/domain_conf.h > +++ b/src/conf/domain_conf.h > @@ -1362,6 +1362,7 @@ struct _virDomainTPMDef { > char *logfile; > unsigned char secretuuid[VIR_UUID_BUFLEN]; > bool hassecretuuid; > + bool persistent_state; > } emulator; > } data; > }; > diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c > index 872be16570..532e0912bd 100644 > --- a/src/qemu/qemu_tpm.c > +++ b/src/qemu/qemu_tpm.c > @@ -729,7 +729,8 @@ qemuExtTPMCleanupHost(virDomainDefPtr def) > if (def->tpms[i]->type != VIR_DOMAIN_TPM_TYPE_EMULATOR) > continue; > > - qemuTPMDeleteEmulatorStorage(def->tpms[i]); > + if (!def->tpms[i]->data.emulator.persistent_state) > + qemuTPMDeleteEmulatorStorage(def->tpms[i]); > } > } > > diff --git a/tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.x86_64-latest.args b/tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.x86_64-latest.args > new file mode 100644 > index 0000000000..90505c7a76 > --- /dev/null > +++ b/tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.x86_64-latest.args > @@ -0,0 +1,38 @@ > +LC_ALL=C \ > +PATH=/bin \ > +HOME=/tmp/lib/domain--1-TPM-VM \ > +USER=test \ > +LOGNAME=test \ > +XDG_DATA_HOME=/tmp/lib/domain--1-TPM-VM/.local/share \ > +XDG_CACHE_HOME=/tmp/lib/domain--1-TPM-VM/.cache \ > +XDG_CONFIG_HOME=/tmp/lib/domain--1-TPM-VM/.config \ > +QEMU_AUDIO_DRV=none \ > +/usr/bin/qemu-system-x86_64 \ > +-name guest=TPM-VM,debug-threads=on \ > +-S \ > +-object secret,id=masterKey0,format=raw,\ > +file=/tmp/lib/domain--1-TPM-VM/master-key.aes \ > +-machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off,\ > +memory-backend=pc.ram \ > +-cpu qemu64 \ > +-m 2048 \ > +-object memory-backend-ram,id=pc.ram,size=2147483648 \ > +-overcommit mem-lock=off \ > +-smp 1,sockets=1,cores=1,threads=1 \ > +-uuid 11d7cd22-da89-3094-6212-079a48a309a1 \ > +-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 \ > +-boot menu=on,strict=on \ > +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ > +-tpmdev emulator,id=tpm-tpm0,chardev=chrtpm \ > +-chardev socket,id=chrtpm,path=/dev/test \ > +-device tpm-tis,tpmdev=tpm-tpm0,id=tpm0 \ > +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ > +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ > +resourcecontrol=deny \ > +-msg timestamp=on > diff --git a/tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.xml b/tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.xml > new file mode 100644 > index 0000000000..45fc4c0e1a > --- /dev/null > +++ b/tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.xml > @@ -0,0 +1,30 @@ > +<domain type='qemu'> > + <name>TPM-VM</name> > + <uuid>11d7cd22-da89-3094-6212-079a48a309a1</uuid> > + <memory unit='KiB'>2097152</memory> > + <currentMemory unit='KiB'>512288</currentMemory> > + <vcpu placement='static'>1</vcpu> > + <os> > + <type arch='x86_64' machine='pc-i440fx-2.12'>hvm</type> > + <boot dev='hd'/> > + <bootmenu enable='yes'/> > + </os> > + <features> > + <acpi/> > + </features> > + <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='usb' index='0'/> > + <controller type='pci' index='0' model='pci-root'/> > + <input type='mouse' bus='ps2'/> > + <input type='keyboard' bus='ps2'/> > + <tpm model='tpm-tis'> > + <backend type='emulator' version='2.0' persistent_state='yes'/> > + </tpm> > + <memballoon model='virtio'/> > + </devices> > +</domain> > diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c > index 9b853c6d59..e96a51d18b 100644 > --- a/tests/qemuxml2argvtest.c > +++ b/tests/qemuxml2argvtest.c > @@ -2460,6 +2460,7 @@ mymain(void) > DO_TEST_CAPS_LATEST("tpm-emulator"); > DO_TEST_CAPS_LATEST("tpm-emulator-tpm2"); > DO_TEST_CAPS_LATEST("tpm-emulator-tpm2-enc"); > + DO_TEST_CAPS_LATEST("tpm-emulator-tpm2-pstate"); > DO_TEST_CAPS_LATEST_PPC64("tpm-emulator-spapr"); > > DO_TEST_PARSE_ERROR("pci-domain-invalid", NONE); > diff --git a/tests/qemuxml2xmloutdata/tpm-emulator-tpm2-pstate.x86_64-latest.xml b/tests/qemuxml2xmloutdata/tpm-emulator-tpm2-pstate.x86_64-latest.xml > new file mode 100644 > index 0000000000..08bc8d690c > --- /dev/null > +++ b/tests/qemuxml2xmloutdata/tpm-emulator-tpm2-pstate.x86_64-latest.xml > @@ -0,0 +1,37 @@ > +<domain type='qemu'> > + <name>TPM-VM</name> > + <uuid>11d7cd22-da89-3094-6212-079a48a309a1</uuid> > + <memory unit='KiB'>2097152</memory> > + <currentMemory unit='KiB'>512288</currentMemory> > + <vcpu placement='static'>1</vcpu> > + <os> > + <type arch='x86_64' machine='pc-i440fx-2.12'>hvm</type> > + <boot dev='hd'/> > + <bootmenu enable='yes'/> > + </os> > + <features> > + <acpi/> > + </features> > + <cpu mode='custom' match='exact' check='none'> > + <model fallback='forbid'>qemu64</model> > + </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-x86_64</emulator> > + <controller type='usb' index='0' model='piix3-uhci'> > + <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'/> > + <tpm model='tpm-tis'> > + <backend type='emulator' version='2.0' persistent_state='yes'/> > + </tpm> > + <memballoon model='virtio'> > + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> > + </memballoon> > + </devices> > +</domain> > diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c > index 1968be6782..f8bca9f559 100644 > --- a/tests/qemuxml2xmltest.c > +++ b/tests/qemuxml2xmltest.c > @@ -761,6 +761,7 @@ mymain(void) > DO_TEST_CAPS_LATEST("tpm-emulator"); > DO_TEST_CAPS_LATEST("tpm-emulator-tpm2"); > DO_TEST_CAPS_LATEST("tpm-emulator-tpm2-enc"); > + DO_TEST_CAPS_LATEST("tpm-emulator-tpm2-pstate"); > > DO_TEST("metadata", NONE); > DO_TEST("metadata-duplicate", NONE); Otherwise looks good to me. Reviewed-by: Stefan Berger <stefanb(a)linux.ibm.com>

2 1

Re: libvirt-lxc: Permission issue of /proc/net
by John Hurnett 24 Dec '20

24 Dec '20

Hi Daniel, My XML has an <interface> section. According to documentation https://libvirt.org/drvlxc.html#securenetworking I have also tried with and without <privnet/> parameter, but still files under /proc/net is owned by user: nobody. As might be expected there is no such problem in privileged containers, as root user is same as on host and files in /proc/net is then owned by root, but to follow best practices I would like to use unprivileged containers. I've used Fedora 33 as host and container. Could you check if this is reproducible on your setup? BR, John On Thu, Dec 24, 2020 at 12:21 PM Daniel P. Berrange <dan(a)berrange.com> wrote: > On Tue, Dec 22, 2020 at 07:14:23PM +0200, John Hurnett wrote: > > Hi, > > I've encountered a problem that some of /proc/net/ files can't be > accessed > > in unprivileged containers, because it is owned by nobody:nogroup (-1:-1) > > and have 440 permissions. > > This exact issue was solved in LXC project by unsharing netns: > > > https://github.com/lxc/lxc/commit/5b1e83cbc498cd3edeaf13afa987d530299a35a7 > > . Maybe it could be similarly fixed on libvirt-lxc? > > We already unshare netns when there is an <interface> in your XML > config for the container. Is that still leaving the permissions > issues ? If so maybe its an ordering issue for the unshare. > > Regards, > Daniel > -- > |: https://berrange.com -o- > https://www.flickr.com/photos/dberrange :| > |: https://libvirt.org -o- > https://fstop138.berrange.com :| > |: https://entangle-photo.org -o- > https://www.instagram.com/dberrange :| > >

1 0

[PATCH] docs/formatstorageencryption.html.in: support qcow2 format in luks encryption volume
by Meina Li 24 Dec '20

24 Dec '20

Signed-off-by: Meina Li <meili(a)redhat.com> --- docs/formatstorageencryption.html.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/formatstorageencryption.html.in b/docs/formatstorageencryption.html.in index ea80a87cfb..7215c307d7 100644 --- a/docs/formatstorageencryption.html.in +++ b/docs/formatstorageencryption.html.in @@ -128,7 +128,9 @@ <p> Here is an example specifying use of the <code>luks</code> format for - a specific cipher algorithm for volume creation: + a specific cipher algorithm for volume creation. + <span class="since">Since 6.10.0,</span> the <code>target</code> format + can also support <code>qcow2</code> type with <code>luks</code> encryption. </p> <pre> <volume> -- 2.27.0

2 1

[RFC 3/5] pci: introduce apci-index property for PCI device
by Igor Mammedov 23 Dec '20

23 Dec '20

In x86/ACPI world, since systemd v197, linux distros are using predictable network interface naming since systemd v197. Which on QEMU based VMs results into path based naming scheme, that names network interfaces based on PCI topology. With this one has to plug NIC in exacly the same bus/slot, which was used when disk image was first provisioned/configured or one risks to loose network configuration due to NIC being renamed to actually used topology. That also restricts freedom reshape PCI configuration of VM without need to reconfigure used guest image. systemd also offers "onboard" naming scheme which is preffered over PCI slot/topology one, provided that firmware implements: " PCI Firmware Specification 3.1 4.6.7. DSM for Naming a PCI or PCI Express Device Under Operating Systems " that allows to assign user defined index to PCI device, which systemd will use to name NIC. For example, using -device e1000,acpi-index=100 guest will rename NIC to 'eno100', where 'eno' is default prefix for "onboard" naming scheme. This doesn't reqiure any advance configuration on guest side. Hope is that 'acpi-index' will be easier to consume by mangment layer, compared to forcing specic PCI topology and/or having several disk image templates for different topologies and will help to simplify process of spawning VM from the same template without need to reconfigure guest network configuration. this patch adds, 'acpi-index'* property and wires up (abuses) unused pci hotplug registers to pass index value to AML code at runtime. Following patch will add corresponding _DSM code and wire it up to PCI devices described in ACPI. *) name comes from linux kernel terminology Signed-off-by: Igor Mammedov <imammedo(a)redhat.com> --- CC: libvir-list(a)redhat.com include/hw/acpi/pcihp.h | 7 ++++++- include/hw/pci/pci.h | 1 + hw/acpi/pci.c | 6 ++++++ hw/acpi/pcihp.c | 25 ++++++++++++++++++++++++- hw/i386/acpi-build.c | 10 ++++++++++ hw/pci/pci.c | 1 + 6 files changed, 48 insertions(+), 2 deletions(-) diff --git a/include/hw/acpi/pcihp.h b/include/hw/acpi/pcihp.h index dfd375820f..72d1773ca1 100644 --- a/include/hw/acpi/pcihp.h +++ b/include/hw/acpi/pcihp.h @@ -46,6 +46,7 @@ typedef struct AcpiPciHpPciStatus { typedef struct AcpiPciHpState { AcpiPciHpPciStatus acpi_pcihp_pci_status[ACPI_PCIHP_MAX_HOTPLUG_BUS]; uint32_t hotplug_select; + uint32_t acpi_index; PCIBus *root; MemoryRegion io; bool legacy_piix; @@ -71,6 +72,8 @@ void acpi_pcihp_reset(AcpiPciHpState *s, bool acpihp_root_off); extern const VMStateDescription vmstate_acpi_pcihp_pci_status; +bool vmstate_acpi_pcihp_use_acpi_index(void *opaque, int version_id); + #define VMSTATE_PCI_HOTPLUG(pcihp, state, test_pcihp) \ VMSTATE_UINT32_TEST(pcihp.hotplug_select, state, \ test_pcihp), \ @@ -78,6 +81,8 @@ extern const VMStateDescription vmstate_acpi_pcihp_pci_status; ACPI_PCIHP_MAX_HOTPLUG_BUS, \ test_pcihp, 1, \ vmstate_acpi_pcihp_pci_status, \ - AcpiPciHpPciStatus) + AcpiPciHpPciStatus), \ + VMSTATE_UINT32_TEST(pcihp.acpi_index, state, \ + vmstate_acpi_pcihp_use_acpi_index) #endif diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index 259f9c992d..e592532558 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -357,6 +357,7 @@ struct PCIDevice { /* ID of standby device in net_failover pair */ char *failover_pair_id; + uint32_t acpi_index; }; void pci_register_bar(PCIDevice *pci_dev, int region_num, diff --git a/hw/acpi/pci.c b/hw/acpi/pci.c index 9510597a19..07d5101d83 100644 --- a/hw/acpi/pci.c +++ b/hw/acpi/pci.c @@ -27,6 +27,7 @@ #include "hw/acpi/aml-build.h" #include "hw/acpi/pci.h" #include "hw/pci/pcie_host.h" +#include "hw/acpi/pcihp.h" void build_mcfg(GArray *table_data, BIOSLinker *linker, AcpiMcfgInfo *info) { @@ -59,3 +60,8 @@ void build_mcfg(GArray *table_data, BIOSLinker *linker, AcpiMcfgInfo *info) "MCFG", table_data->len - mcfg_start, 1, NULL, NULL); } +bool vmstate_acpi_pcihp_use_acpi_index(void *opaque, int version_id) +{ + AcpiPciHpState *s = opaque; + return s->acpi_index; +} diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c index 9dc4d3e2db..9634567e3a 100644 --- a/hw/acpi/pcihp.c +++ b/hw/acpi/pcihp.c @@ -347,7 +347,8 @@ static uint64_t pci_read(void *opaque, hwaddr addr, unsigned int size) trace_acpi_pci_down_read(val); break; case PCI_EJ_BASE: - /* No feature defined yet */ + val = s->acpi_index; + s->acpi_index = 0; trace_acpi_pci_features_read(val); break; case PCI_RMV_BASE: @@ -367,8 +368,30 @@ static uint64_t pci_read(void *opaque, hwaddr addr, unsigned int size) static void pci_write(void *opaque, hwaddr addr, uint64_t data, unsigned int size) { + int slot; + PCIBus *bus; + BusChild *kid, *next; AcpiPciHpState *s = opaque; + + s->acpi_index = 0; switch (addr) { + case PCI_UP_BASE: + slot = ctz32(data); + + if (s->hotplug_select >= ACPI_PCIHP_MAX_HOTPLUG_BUS) { + break; + } + + bus = acpi_pcihp_find_hotplug_bus(s, s->hotplug_select); + QTAILQ_FOREACH_SAFE(kid, &bus->qbus.children, sibling, next) { + Object *o = OBJECT(kid->child); + PCIDevice *dev = PCI_DEVICE(o); + if (PCI_SLOT(dev->devfn) == slot) { + s->acpi_index = object_property_get_uint(o, "acpi-index", NULL); + break; + } + } + break; case PCI_EJ_BASE: if (s->hotplug_select >= ACPI_PCIHP_MAX_HOTPLUG_BUS) { break; diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index f18b71dea9..27d2958e25 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1132,6 +1132,16 @@ static void build_piix4_pci_hotplug(Aml *table) aml_append(method, aml_return(aml_int(0))); aml_append(scope, method); + method = aml_method("AIDX", 2, AML_NOTSERIALIZED); + aml_append(method, aml_acquire(aml_name("BLCK"), 0xFFFF)); + aml_append(method, aml_store(aml_arg(0), aml_name("BNUM"))); + aml_append(method, + aml_store(aml_shiftleft(aml_int(1), aml_arg(1)), aml_name("PCIU"))); + aml_append(method, aml_store(aml_name("B0EJ"), aml_local(0))); + aml_append(method, aml_release(aml_name("BLCK"))); + aml_append(method, aml_return(aml_local(0))); + aml_append(scope, method); + aml_append(table, scope); } diff --git a/hw/pci/pci.c b/hw/pci/pci.c index d4349ea577..617f48ff3b 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -76,6 +76,7 @@ static Property pci_props[] = { QEMU_PCIE_EXTCAP_INIT_BITNR, true), DEFINE_PROP_STRING("failover_pair_id", PCIDevice, failover_pair_id), + DEFINE_PROP_UINT32("acpi-index", PCIDevice, acpi_index, -1), DEFINE_PROP_END_OF_LIST() }; -- 2.27.0

1 0

libvirt-lxc: Permission issue of /proc/net
by John Hurnett 22 Dec '20

22 Dec '20

Hi, I've encountered a problem that some of /proc/net/ files can't be accessed in unprivileged containers, because it is owned by nobody:nogroup (-1:-1) and have 440 permissions. This exact issue was solved in LXC project by unsharing netns: https://github.com/lxc/lxc/commit/5b1e83cbc498cd3edeaf13afa987d530299a35a7 . Maybe it could be similarly fixed on libvirt-lxc? BR, John H.

1 0

[libvirt PATCH] vmx: Don't error out on missing filename for cdrom
by Martin Kletzander 21 Dec '20

21 Dec '20

This is perfectly valid in VMWare and the VM just boots with an empty drive. We used to just skip the whole drive before, but since we changed how we parse empty cdrom drives this now results in an error and the user not being able to even dump the XML. Instead of erroring out, just keep the drive empty. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1903953 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/vmx/vmx.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index b86dbe9ca267..40e4ef962992 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -2447,10 +2447,18 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con goto cleanup; } + tmp = ctx->parseFileName(fileName, ctx->opaque); virDomainDiskSetType(*def, VIR_STORAGE_TYPE_FILE); - if (!(tmp = ctx->parseFileName(fileName, ctx->opaque))) - goto cleanup; - virDomainDiskSetSource(*def, tmp); + /* It is easily possible to have a cdrom with non-existing filename + * as the image and vmware just provides an empty cdrom. + * + * See: https://bugzilla.redhat.com/1903953 + */ + if (tmp) { + virDomainDiskSetSource(*def, tmp); + } else { + virResetLastError(); + } VIR_FREE(tmp); } else if (deviceType && STRCASEEQ(deviceType, "atapi-cdrom")) { virDomainDiskSetType(*def, VIR_STORAGE_TYPE_BLOCK); -- 2.29.2

3 3

libvirt-lxc: Permission issue of /proc/net
by John Hurnett 20 Dec '20

20 Dec '20

Hi, I've encountered a problem that some of /proc/net/ files can't be accessed in unprivileged containers, because it is owned by nobody:nogroup (-1:-1) and have 440 permissions. This exact issue was solved in LXC project by unsharing netns: https://github.com/lxc/lxc/commit/5b1e83cbc498cd3edeaf13afa987d530299a35a7 . Maybe it could be similarly fixed on libvirt-lxc? BR, John H.

1 0

Hotplugng disk not adding backing layers to apparmor profile
by Russell Cattelan 18 Dec '20

18 Dec '20

We have been working on a feature at IBM cloud around snapshots. One of the workflows is to add a snapshoted disk to a running virtual instance. This involves adding a disk that has at minimum 2 qcow2 files, one for the active overlay and one or more backing files. The problem we are running into is that they dynamic update of the apparmor profile appears to only add the first file in the chain to the profile. It based on some experiments it appears that this should be adding all the files to the security profile but this seems to only do the first (topmost) file. "disk->src" https://gitlab.com/libvirt/libvirt/-/blob/a7db0b757d210071d39e6d116e6a4bc76… I does not appear to loop over the disks where as qemuBlockStorageSourceChainAttach does https://gitlab.com/libvirt/libvirt/-/blob/a7db0b757d210071d39e6d116e6a4bc76… The attached disk then fails since apparmor will reject the backing files access. This is fairly easy to demonstrate when apparmor is active. <disk type='file' device='disk'> <driver name='qemu' type='qcow2'/> <source file='/mnt2/hotplug2.qcow2' index='1'/> <backingStore type='file' index='2'> <format type='qcow2'/> <source file='/mnt2/hotplug1.qcow2'/> <backingStore/> </backingStore> <target dev='vdc' bus='virtio'/> </disk> virsh attach-device test1 /mnt2/attach.xml [535657.524784] audit: type=1400 audit(1608242451.762:79): apparmor="DENIED" operation="open" profile="libvirt-a7fd0ca2-1429-4a60-9ab4-a545660666ce" name="/mnt2/hotplug1.qcow2" pid=11999 comm="qemu-system-x86" requested_mask="r" denied_mask="r" fsuid=64055 ouid=64055 -Russell Cattelan

1 0

Hotplugng disk not adding backing layers to apparmor profile
by Russell Cattelan 18 Dec '20

18 Dec '20

We have been working on a feature at IBM cloud around snapshots. One of the workflows is to add a snapshoted disk to a running virtual instance. This involves adding a disk that has at minimum 2 qcow2 files, one for the active overlay and one or more backing files. The problem we are running into is that they dynamic update of the apparmor profile appears to only add the first file in the chain to the profile. It based on some experiments it appears that this should be adding all the files to the security profile but this seems to only do the first (topmost) file. "disk->src" https://gitlab.com/libvirt/libvirt/-/blob/a7db0b757d210071d39e6d116e6a4bc76… I does not appear to loop over the disks where as qemuBlockStorageSourceChainAttach does https://gitlab.com/libvirt/libvirt/-/blob/a7db0b757d210071d39e6d116e6a4bc76… The attached disk then fails since apparmor will reject the backing files access. This is fairly easy to demonstrate when apparmor is active. <disk type='file' device='disk'> <driver name='qemu' type='qcow2'/> <source file='/mnt2/hotplug2.qcow2' index='1'/> <backingStore type='file' index='2'> <format type='qcow2'/> <source file='/mnt2/hotplug1.qcow2'/> <backingStore/> </backingStore> <target dev='vdc' bus='virtio'/> </disk> virsh attach-device test1 /mnt2/attach.xml [535657.524784] audit: type=1400 audit(1608242451.762:79): apparmor="DENIED" operation="open" profile="libvirt-a7fd0ca2-1429-4a60-9ab4-a545660666ce" name="/mnt2/hotplug1.qcow2" pid=11999 comm="qemu-system-x86" requested_mask="r" denied_mask="r" fsuid=64055 ouid=64055 -Russell Cattelan

1 0

[libvirt PATCH 00/29] Refactor scripts in tests/cputestdata
by Tim Wiederhake 18 Dec '20

18 Dec '20

This series refactors the various scripts found in tests/cputestdata and adds support for CORE_CAPABILITY MSR, as found on e.g. SnowRidge. Acquiring test data on a new system is a two step process. "cpu-gather.sh" gathers information on the target machine and has as few dependencies as possible. "cpu-parse.sh" processes this information but requires access to a libvirt source tree and has more dependencies, e.g. "xmltodict". This series merges three of the four involved scripts (cpu-gather.sh, cpu-parse.sh and cpu-reformat.py) into a single python3 script. python3 already was a dependency for cpu-gather.sh and care has been taken to not depend on modules that are not installed by default [1]. Merging the fourth script, cpu-cpuid.py, will come in a seperate series. Patches 1 to 14 transform cpu-gather into a python script, preserving the format of the output (except for consistent "\n" line endings; previously the tool would output a mix of "\n" and "\r\n"). Patches 15 to 23 merge cpu-parse into the script. In this process, the format of the intermediary data is changed to json. Patches 24 to 29 add support for "all in one" operation and extracting IA32_CORE_CAPABILITY_MSR, which can be found on e.g. SnowRidge CPUs. Old usage: ./cpu-gather.sh | ./cpu-parse.sh New: ./cpu-gather.py [--gather] | ./cpu-gather.py --parse Alternative on single machine: ./cpu-gather.py --gather --parse [1] https://docs.python.org/3/py-modindex.html Tim Wiederhake (29): cpu-cpuid: Shorten overly long line cpu-gather: Create python wrapper for shell script cpu-gather: Move model_name to new script cpu-gather: Allow overwriting model name cpu-gather: Move cpuid call to new script cpu-gather: Allow overwriting cpuid binary location cpu-gather: Move msr decoding to new script cpu-gather: Move qemu detection to new script cpu-gather: Move static model expansion to new script cpu-gather: Move static model extraction to new script cpu-gather: Move simple model extraction to new script cpu-gather: Move full model extraction to new script cpu-gather: Merge model gathering logic cpu-gather: Delete old script cpu-gather: Separate data input and output cpu-parse: Wrap with python script cpu-gather: Transport data as json cpu-parse: Move model name detection to new script cpu-parse: Move file name generation to new script cpu-parse: Move xml output to new script cpu-parse: Move json output to new script cpu-parse: Move call to cpu-cpuid.py to new script cpu-parse: Delete old script cpu-gather: Ignore empty responses from qemu cpu-gather: Ignore shutdown messages from qemu cpu-gather: Parse cpuid leaves early cpu-gather: Allow gathering and parsing data in one step. cpu-gather: Prepare gather_msr for reading multiple msr cpu-gather: Add IA32_CORE_CAPABILITY_MSR tests/cputestdata/cpu-cpuid.py | 5 +- tests/cputestdata/cpu-gather.py | 365 ++++++++++++++++++++++++++++++ tests/cputestdata/cpu-gather.sh | 103 --------- tests/cputestdata/cpu-parse.sh | 65 ------ tests/cputestdata/cpu-reformat.py | 9 - 5 files changed, 368 insertions(+), 179 deletions(-) create mode 100755 tests/cputestdata/cpu-gather.py delete mode 100755 tests/cputestdata/cpu-gather.sh delete mode 100755 tests/cputestdata/cpu-parse.sh delete mode 100755 tests/cputestdata/cpu-reformat.py -- 2.26.2

2 32

[libvirt PATCH 0/2] Schema fixes for virsh [hypervisor-]cpu-compare
by Tim Wiederhake 18 Dec '20

18 Dec '20

See individual commit messages for more details. Tim Wiederhake (2): schemas: Deduplicate cpuTopology in cputypes.rng schema: Allow counter element in host cpu definition docs/schemas/cputypes.rng | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) -- 2.26.2

2 3

[libvirt PATCH 0/3] Few fixes for migration over UNIX socket
by Martin Kletzander 17 Dec '20

17 Dec '20

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1638889 Martin Kletzander (3): qemu: Fix possible segfault when migrating disks docs: Slightly alter disks-uri description in virsh man qemu: Extra check for NBD URI being specified docs/manpages/virsh.rst | 22 +++++++++++----------- src/qemu/qemu_driver.c | 21 +++++++++++++++++++++ src/qemu/qemu_migration.c | 5 +++++ 3 files changed, 37 insertions(+), 11 deletions(-) -- 2.29.2

3 6

[libvirt][PATCH v1 0/3] introduce 'restrictive' mode in numatune
by Luyao Zhong 17 Dec '20

17 Dec '20

Before this patch set, numatune only has three memory modes: static, interleave and prefered. These memory policies are ultimately set by mbind() system call. Memory policy could be 'hard coded' into the kernel, but none of above policies fit our requirment under this case. mbind() support default memory policy, but it requires a NULL nodemask. So obviously setting allowed memory nodes is cgroups' mission under this case. So we introduce a new option for mode in numatune named 'restrictive'. <numatune> <memory mode="restrictive" nodeset="1-4,^3"/> <memnode cellid="0" mode="restrictive" nodeset="1"/> <memnode cellid="2" mode="restrictive" nodeset="2"/> </numatune> The config above means we only use cgroups to restrict the allowed memory nodes and not setting any specific memory policies explicitly. RFC discussion: https://www.redhat.com/archives/libvir-list/2020-November/msg01256.html Regards, Luyao Luyao Zhong (3): docs: add docs for 'restrictive' option for mode in numatune schema: add 'restrictive' config option for mode in numatune qemu: add parser and formatter for 'restrictive' mode in numatune docs/formatdomain.rst | 7 +++- docs/schemas/domaincommon.rng | 2 + include/libvirt/libvirt-domain.h | 1 + src/conf/numa_conf.c | 9 +++++ src/qemu/qemu_command.c | 6 ++- src/qemu/qemu_process.c | 27 +++++++++++++ src/util/virnuma.c | 3 ++ .../numatune-memnode-invalid-mode.err | 1 + .../numatune-memnode-invalid-mode.xml | 33 +++++++++++++++ ...emnode-restrictive-mode.x86_64-latest.args | 40 +++++++++++++++++++ .../numatune-memnode-restrictive-mode.xml | 33 +++++++++++++++ tests/qemuxml2argvtest.c | 2 + ...memnode-restrictive-mode.x86_64-latest.xml | 40 +++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 14 files changed, 202 insertions(+), 3 deletions(-) create mode 100644 tests/qemuxml2argvdata/numatune-memnode-invalid-mode.err create mode 100644 tests/qemuxml2argvdata/numatune-memnode-invalid-mode.xml create mode 100644 tests/qemuxml2argvdata/numatune-memnode-restrictive-mode.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/numatune-memnode-restrictive-mode.xml create mode 100644 tests/qemuxml2xmloutdata/numatune-memnode-restrictive-mode.x86_64-latest.xml -- 2.25.4

2 5

[PATCH 0/5] Followup to virNetDevGenerateName() patches
by Laine Stump 17 Dec '20

17 Dec '20

A few issues came up during review of this series that were better fixed in cleanups rather than requiring yet another round of review. (A couple of things I noticed after the other patches were already pushed). Laine Stump (5): util: fix tap device name auto-generation for FreeBSD bhyve: remove redundant code that adds "template" netdev name qemu: remove redundant code that adds "template" netdev name util: simplify virNetDevMacVLanCreateWithVPortProfile() util: minor comment/formatting changes to virNetDevTapCreate() src/bhyve/bhyve_command.c | 7 ---- src/qemu/qemu_interface.c | 18 +++-------- src/util/virnetdevmacvlan.c | 64 ++++++------------------------------- src/util/virnetdevtap.c | 46 +++++++------------------- 4 files changed, 25 insertions(+), 110 deletions(-) -- 2.28.0

3 12

[PATCH] util: Add phys_port_name support on virPCIGetNetName
by Dmytro Linkin 17 Dec '20

17 Dec '20

Current virPCIGetNetName() logic is to get net device name by checking it's phys_port_id, if caller provide it, or by it's index (eg, by it's position at sysfs net directory). This approach worked fine up until linux kernel version 5.8, where NVIDIA Mellanox driver implemented linking of VFs' representors to PCI device in switchdev mode. This mean that device's sysfs net directory will hold multiple net devices. Ex.: $ ls '/sys/bus/pci/devices/0000:82:00.0/net' ens1f0 eth0 eth1 Most switch devices support phys_port_name instead of phys_port_id, so virPCIGetNetName() will try to get PF name by it's index - 0. The problem here is that the PF nedev entry may not be the first. To fix that, for switch devices, we introduce a new logic to select the PF uplink netdev according to the content of phys_port_name. Extend virPCIGetNetName() with physPortNameRegex variable to get proper device by it's phys_port_name scheme, for ex., "p[0-9]+$" to get PF, "pf[0-9]+vf[0-9]+$" to get VF or "p1$" to get exact net device. So now virPCIGetNetName() logic work in following sequence: - filter by phys_port_id, if it's provided, or - filter by phys_port_name, if it's regex provided, or - get net device by it's index (position) in sysfs net directory. Also, make getting content of iface sysfs files more generic. Signed-off-by: Dmytro Linkin <dlinkin(a)nvidia.com> Reviewed-by: Adrian Chiris <adrianc(a)nvidia.com> --- src/hypervisor/virhostdev.c | 2 +- src/util/virnetdev.c | 74 ++++++++++++++++++++++++++++++++++++--------- src/util/virnetdev.h | 4 +++ src/util/virpci.c | 63 ++++++++++++++++++++++++++++++++++++-- src/util/virpci.h | 6 ++++ 5 files changed, 130 insertions(+), 19 deletions(-) diff --git a/src/hypervisor/virhostdev.c b/src/hypervisor/virhostdev.c index 69102b8..1f5c347 100644 --- a/src/hypervisor/virhostdev.c +++ b/src/hypervisor/virhostdev.c @@ -333,7 +333,7 @@ virHostdevNetDevice(virDomainHostdevDefPtr hostdev, * type='hostdev'>, and it is only those devices that should * end up calling this function. */ - if (virPCIGetNetName(sysfs_path, 0, NULL, linkdev) < 0) + if (virPCIGetNetName(sysfs_path, 0, NULL, NULL, linkdev) < 0) return -1; if (!(*linkdev)) { diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index b42fa86..99e3b35 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -1112,6 +1112,29 @@ virNetDevGetPCIDevice(const char *devName) } +/* A wrapper to get content of file from ifname SYSFS_NET_DIR + */ +static int +virNetDevGetSysfsFileValue(const char *ifname, + const char *fileName, + char **sysfsFileData) +{ + g_autofree char *sysfsFile = NULL; + + *sysfsFileData = NULL; + + if (virNetDevSysfsFile(&sysfsFile, ifname, fileName) < 0) + return -1; + + /* a failure to read just means the driver doesn't support + * <fileName>, so set success now and ignore the return from + * virFileReadAllQuiet(). + */ + + ignore_value(virFileReadAllQuiet(sysfsFile, 1024, sysfsFileData)); + return 0; +} + /** * virNetDevGetPhysPortID: * @@ -1130,20 +1153,29 @@ int virNetDevGetPhysPortID(const char *ifname, char **physPortID) { - g_autofree char *physPortIDFile = NULL; - - *physPortID = NULL; - - if (virNetDevSysfsFile(&physPortIDFile, ifname, "phys_port_id") < 0) - return -1; + return virNetDevGetSysfsFileValue(ifname, "phys_port_id", physPortID); +} - /* a failure to read just means the driver doesn't support - * phys_port_id, so set success now and ignore the return from - * virFileReadAllQuiet(). - */ - ignore_value(virFileReadAllQuiet(physPortIDFile, 1024, physPortID)); - return 0; +/** + * virNetDevGetPhysPortName: + * + * @ifname: name of a netdev + * + * @physPortName: pointer to char* that will receive @ifname's + * phys_port_name from sysfs (null terminated + * string). Could be NULL if @ifname's net driver doesn't + * support phys_port_name (most netdev drivers + * don't). Caller is responsible for freeing the string + * when finished. + * + * Returns 0 on success or -1 on failure. + */ +int +virNetDevGetPhysPortName(const char *ifname, + char **physPortName) +{ + return virNetDevGetSysfsFileValue(ifname, "phys_port_name", physPortName); } @@ -1200,7 +1232,7 @@ virNetDevGetVirtualFunctions(const char *pfname, } if (virPCIGetNetName(pci_sysfs_device_link, 0, - pfPhysPortID, &((*vfname)[i])) < 0) { + pfPhysPortID, NULL, &((*vfname)[i])) < 0) { goto cleanup; } @@ -1295,7 +1327,8 @@ virNetDevGetPhysicalFunction(const char *ifname, char **pfname) return -1; if (virPCIGetNetName(physfn_sysfs_path, 0, - vfPhysPortID, pfname) < 0) { + vfPhysPortID, + VIR_PF_PHYS_PORT_NAME_REGEX, pfname) < 0) { return -1; } @@ -1358,7 +1391,7 @@ virNetDevPFGetVF(const char *pfname, int vf, char **vfname) * isn't bound to a netdev driver, it won't have a netdev name, * and vfname will be NULL). */ - return virPCIGetNetName(virtfnSysfsPath, 0, pfPhysPortID, vfname); + return virPCIGetNetName(virtfnSysfsPath, 0, pfPhysPortID, NULL, vfname); } @@ -1403,6 +1436,17 @@ virNetDevGetPhysPortID(const char *ifname G_GNUC_UNUSED, } int +virNetDevGetPhysPortName(const char *ifname G_GNUC_UNUSED, + char **physPortName) +{ + /* this actually should never be called, and is just here to + * satisfy the linker. + */ + *physPortName = NULL; + return 0; +} + +int virNetDevGetVirtualFunctions(const char *pfname G_GNUC_UNUSED, char ***vfname G_GNUC_UNUSED, virPCIDeviceAddressPtr **virt_fns G_GNUC_UNUSED, diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h index 55e3948..712421d 100644 --- a/src/util/virnetdev.h +++ b/src/util/virnetdev.h @@ -229,6 +229,10 @@ int virNetDevGetPhysPortID(const char *ifname, char **physPortID) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; +int virNetDevGetPhysPortName(const char *ifname, + char **physPortName) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) + G_GNUC_WARN_UNUSED_RESULT; int virNetDevGetVirtualFunctions(const char *pfname, char ***vfname, diff --git a/src/util/virpci.c b/src/util/virpci.c index 47c671d..18b3f66 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -2409,8 +2409,10 @@ virPCIDeviceAddressGetSysfsFile(virPCIDeviceAddressPtr addr, * virPCIGetNetName: * @device_link_sysfs_path: sysfs path to the PCI device * @idx: used to choose which netdev when there are several - * (ignored if physPortID is set) + * (ignored if physPortID or physPortNameRegex is set) * @physPortID: match this string in the netdev's phys_port_id + * (or NULL to ignore and use phys_port_name or idx instead) + * @physPortNameRegex: match this regex with netdev's phys_port_name * (or NULL to ignore and use idx instead) * @netname: used to return the name of the netdev * (set to NULL (but returns success) if there is no netdev) @@ -2421,11 +2423,13 @@ int virPCIGetNetName(const char *device_link_sysfs_path, size_t idx, char *physPortID, + char *physPortNameRegex, char **netname) { g_autofree char *pcidev_sysfs_net_path = NULL; g_autofree char *firstEntryName = NULL; g_autofree char *thisPhysPortID = NULL; + g_autofree char *thisPhysPortName = NULL; int ret = -1; DIR *dir = NULL; struct dirent *entry = NULL; @@ -2466,6 +2470,41 @@ virPCIGetNetName(const char *device_link_sysfs_path, continue; } + } else if (physPortNameRegex) { + /* Most switch devices use phys_port_name instead of + * phys_port_id. + * NOTE: VFs' representors net devices can be linked to PF's PCI + * device, which mean that there'll be multiple net devices + * instances and to get a proper net device need to match on + * specific regex. + * To get PF netdev, for ex., used following regex: + * "(p[0-9]+$)|(p[0-9]+s[0-9]+$)" + * or to get exact VF's netdev next regex is used: + * "pf0vf1$" + */ + if (virNetDevGetPhysPortName(entry->d_name, &thisPhysPortName) < 0) + goto cleanup; + + if (thisPhysPortName) { + /* if this one doesn't match, keep looking */ + if (!virStringMatch(thisPhysPortName, physPortNameRegex)) { + VIR_FREE(thisPhysPortName); + /* Save the first entry we find to use as a failsafe + * in case we fail to match on regex. + */ + if (!firstEntryName) + firstEntryName = g_strdup(entry->d_name); + + continue; + } + } else { + /* Save the first entry we find to use as a failsafe in case + * phys_port_name is not supported. + */ + if (!firstEntryName) + firstEntryName = g_strdup(entry->d_name); + continue; + } } else { if (i++ < idx) continue; @@ -2494,6 +2533,22 @@ virPCIGetNetName(const char *device_link_sysfs_path, "phys_port_id '%s' under PCI device at %s"), physPortID, device_link_sysfs_path); } + } else if (physPortNameRegex) { + if (firstEntryName) { + /* We didn't match the provided phys_port_name regex, probably + * because kernel or NIC driver doesn't support it, so just + * return first netname we found. + */ + *netname = firstEntryName; + firstEntryName = NULL; + ret = 0; + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Could not find network device with " + "phys_port_name matching regex '%s' " + "under PCI device at %s"), + physPortNameRegex, device_link_sysfs_path); + } } else { ret = 0; /* no netdev at the given index is *not* an error */ } @@ -2539,7 +2594,7 @@ virPCIGetVirtualFunctionInfo(const char *vf_sysfs_device_path, * correct. */ if (pfNetDevIdx == -1) { - if (virPCIGetNetName(vf_sysfs_device_path, 0, NULL, &vfname) < 0) + if (virPCIGetNetName(vf_sysfs_device_path, 0, NULL, NULL, &vfname) < 0) goto cleanup; if (vfname) { @@ -2550,7 +2605,8 @@ virPCIGetVirtualFunctionInfo(const char *vf_sysfs_device_path, } if (virPCIGetNetName(pf_sysfs_device_path, - pfNetDevIdx, vfPhysPortID, pfname) < 0) { + pfNetDevIdx, vfPhysPortID, + VIR_PF_PHYS_PORT_NAME_REGEX, pfname) < 0) { goto cleanup; } @@ -2688,6 +2744,7 @@ int virPCIGetNetName(const char *device_link_sysfs_path G_GNUC_UNUSED, size_t idx G_GNUC_UNUSED, char *physPortID G_GNUC_UNUSED, + char *physPortNameScheme G_GNUC_UNUSED, char **netname G_GNUC_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported)); diff --git a/src/util/virpci.h b/src/util/virpci.h index b3322ba..6ea0873 100644 --- a/src/util/virpci.h +++ b/src/util/virpci.h @@ -55,6 +55,11 @@ struct _virZPCIDeviceAddress { #define VIR_PCI_DEVICE_ADDRESS_FMT "%04x:%02x:%02x.%d" +/* Represents format of PF's phys_port_name in switchdev mode: + * 'p%u' or 'p%us%u'. New line checked since value is readed from sysfs file. + */ +# define VIR_PF_PHYS_PORT_NAME_REGEX ((char *)"(p[0-9]+$)|(p[0-9]+s[0-9]+$)") + struct _virPCIDeviceAddress { unsigned int domain; unsigned int bus; @@ -232,6 +237,7 @@ int virPCIDeviceAddressGetSysfsFile(virPCIDeviceAddressPtr addr, int virPCIGetNetName(const char *device_link_sysfs_path, size_t idx, char *physPortID, + char *physPortNameRegex, char **netname); int virPCIGetSysfsFile(char *virPCIDeviceName, -- 1.8.3.1

3 7

[PATCH 0/4] lxc: Couple of improvements
by Michal Privoznik 17 Dec '20

17 Dec '20

I've noticed these thanks to question on the list: https://www.redhat.com/archives/libvir-list/2020-December/msg00699.html where I suggested to use namespace inheritance. Michal Prívozník (4): schema: Allow lxc:namepsace children to appear individually lxc: Allow NULL argument to lxcDomainDefNamespaceFree() lxc: Rework lxcDomainDefNamespaceParse() lxd_domain: Require that VIR_LXC_DOMAIN_NAMESPACE_SOURCE_NONE is zero docs/schemas/domaincommon.rng | 66 +++++++++++++++++++---------------- src/lxc/lxc_domain.c | 44 +++++++++++++---------- src/lxc/lxc_domain.h | 2 +- 3 files changed, 63 insertions(+), 49 deletions(-) -- 2.26.2

2 9

[PATCH 0/2] virnetdevopenvswitch: Fir virNetDevOpenvswitchGetVhostuserIfname()
by Michal Privoznik 17 Dec '20

17 Dec '20

The first patch is a true fix of a mess I made earlier. The second is an improvement that was found by QE when testing patches with openvswitch older than I wrote patches with. Michal Prívozník (2): virNetDevOpenvswitchGetVhostuserIfname: Actually use @path to lookup interface virnetdevopenvswitch: Try to unescape ovs-vsctl reply in one specific case src/libvirt_private.syms | 1 + src/util/virnetdevopenvswitch.c | 49 +++++++++++++++++++++++++++++- src/util/virnetdevopenvswitch.h | 4 +++ tests/virnetdevopenvswitchtest.c | 52 ++++++++++++++++++++++++++++++++ 4 files changed, 105 insertions(+), 1 deletion(-) -- 2.26.2

3 5

[PATCH libvirt v1] tests: add capabilities for QEMU 5.1.0 on s390x
by Shalini Chellathurai Saroja 16 Dec '20

16 Dec '20

Signed-off-by: Shalini Chellathurai Saroja <shalini(a)linux.ibm.com> --- The replies file is removed from this patch and is available in https://gitlab.com/shalinichellathurai/libvirt/-/commit/1c34c07c434560d7f44… tests/domaincapsdata/qemu_5.1.0.s390x.xml | 230 + .../caps_5.1.0.s390x.replies | 24617 ++++++++++++++++ .../qemucapabilitiesdata/caps_5.1.0.s390x.xml | 3278 ++ ...default-video-type-s390x.s390x-latest.args | 2 +- .../disk-error-policy-s390x.s390x-latest.args | 12 +- .../fs9p-ccw.s390x-latest.args | 4 +- ...othreads-virtio-scsi-ccw.s390x-latest.args | 2 +- ...t-cpu-kvm-ccw-virtio-4.2.s390x-latest.args | 2 +- .../s390x-ccw-graphics.s390x-latest.args | 4 +- .../s390x-ccw-headless.s390x-latest.args | 4 +- .../vhost-vsock-ccw-auto.s390x-latest.args | 4 +- .../vhost-vsock-ccw.s390x-latest.args | 4 +- 12 files changed, 28144 insertions(+), 19 deletions(-) create mode 100644 tests/domaincapsdata/qemu_5.1.0.s390x.xml create mode 100644 tests/qemucapabilitiesdata/caps_5.1.0.s390x.replies create mode 100644 tests/qemucapabilitiesdata/caps_5.1.0.s390x.xml diff --git a/tests/domaincapsdata/qemu_5.1.0.s390x.xml b/tests/domaincapsdata/qemu_5.1.0.s390x.xml new file mode 100644 index 00000000..42780349 --- /dev/null +++ b/tests/domaincapsdata/qemu_5.1.0.s390x.xml @@ -0,0 +1,230 @@ +<domainCapabilities> + <path>/usr/bin/qemu-system-s390x</path> + <domain>kvm</domain> + <machine>s390-ccw-virtio-5.1</machine> + <arch>s390x</arch> + <vcpu max='248'/> + <iothreads supported='yes'/> + <os supported='yes'> + <enum name='firmware'/> + <loader supported='yes'> + <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> + <value>/usr/share/AAVMF/AAVMF32_CODE.fd</value> + <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <enum name='type'> + <value>rom</value> + <value>pflash</value> + </enum> + <enum name='readonly'> + <value>yes</value> + <value>no</value> + </enum> + <enum name='secure'> + <value>no</value> + </enum> + </loader> + </os> + <cpu> + <mode name='host-passthrough' supported='yes'> + <enum name='hostPassthroughMigratable'> + <value>off</value> + </enum> + </mode> + <mode name='host-model' supported='yes'> + <model fallback='forbid'>gen15a-base</model> + <feature policy='require' name='aen'/> + <feature policy='require' name='cmmnt'/> + <feature policy='require' name='vxpdeh'/> + <feature policy='require' name='aefsi'/> + <feature policy='require' name='csske'/> + <feature policy='require' name='mepoch'/> + <feature policy='require' name='msa9'/> + <feature policy='require' name='msa8'/> + <feature policy='require' name='msa7'/> + <feature policy='require' name='msa6'/> + <feature policy='require' name='msa5'/> + <feature policy='require' name='msa4'/> + <feature policy='require' name='msa3'/> + <feature policy='require' name='msa2'/> + <feature policy='require' name='msa1'/> + <feature policy='require' name='sthyi'/> + <feature policy='require' name='edat'/> + <feature policy='require' name='ri'/> + <feature policy='require' name='deflate'/> + <feature policy='require' name='edat2'/> + <feature policy='require' name='etoken'/> + <feature policy='require' name='vx'/> + <feature policy='require' name='ipter'/> + <feature policy='require' name='mepochptff'/> + <feature policy='require' name='ap'/> + <feature policy='require' name='vxeh'/> + <feature policy='require' name='vxpd'/> + <feature policy='require' name='esop'/> + <feature policy='require' name='msa9_pckmo'/> + <feature policy='require' name='vxeh2'/> + <feature policy='require' name='esort'/> + <feature policy='require' name='apqi'/> + <feature policy='require' name='apft'/> + <feature policy='require' name='iep'/> + <feature policy='require' name='apqci'/> + <feature policy='require' name='cte'/> + <feature policy='require' name='ais'/> + <feature policy='require' name='bpb'/> + <feature policy='require' name='gs'/> + <feature policy='require' name='ppa15'/> + <feature policy='require' name='zpci'/> + <feature policy='require' name='sea_esop2'/> + <feature policy='require' name='te'/> + <feature policy='require' name='cmm'/> + </mode> + <mode name='custom' supported='yes'> + <model usable='yes'>z800-base</model> + <model usable='yes'>z890.2-base</model> + <model usable='yes'>z9EC.2</model> + <model usable='yes'>z13.2</model> + <model usable='yes'>z9BC-base</model> + <model usable='yes'>z990.5-base</model> + <model usable='yes'>z890.2</model> + <model usable='yes'>z890</model> + <model usable='yes'>z9BC</model> + <model usable='yes'>z13</model> + <model usable='yes'>z196</model> + <model usable='yes'>z13s</model> + <model usable='yes'>z990.3</model> + <model usable='yes'>z13s-base</model> + <model usable='yes'>z9EC</model> + <model usable='yes'>gen15a</model> + <model usable='yes'>z14ZR1-base</model> + <model usable='yes'>z14.2-base</model> + <model usable='yes'>z900.3-base</model> + <model usable='yes'>z13.2-base</model> + <model usable='yes'>z196.2-base</model> + <model usable='yes'>zBC12-base</model> + <model usable='yes'>z9BC.2-base</model> + <model usable='yes'>z900.2-base</model> + <model usable='yes'>z9EC.3</model> + <model usable='yes'>zEC12</model> + <model usable='yes'>z900</model> + <model usable='yes'>z114-base</model> + <model usable='yes'>zEC12-base</model> + <model usable='yes'>z10EC.2</model> + <model usable='yes'>z10EC-base</model> + <model usable='yes'>z900.3</model> + <model usable='yes'>z14ZR1</model> + <model usable='yes'>z10BC</model> + <model usable='yes'>z10BC.2-base</model> + <model usable='yes'>z9BC.2</model> + <model usable='yes'>z990.2</model> + <model usable='yes'>z990</model> + <model usable='yes'>z14</model> + <model usable='yes'>gen15b-base</model> + <model usable='yes'>z990.4</model> + <model usable='yes'>max</model> + <model usable='yes'>z10EC.2-base</model> + <model usable='yes'>gen15a-base</model> + <model usable='yes'>z800</model> + <model usable='yes'>z10EC</model> + <model usable='yes'>zEC12.2</model> + <model usable='yes'>z990.2-base</model> + <model usable='yes'>z900-base</model> + <model usable='yes'>z10BC.2</model> + <model usable='yes'>z9EC-base</model> + <model usable='yes'>z9EC.3-base</model> + <model usable='yes'>z114</model> + <model usable='yes'>z890.3</model> + <model usable='yes'>z196-base</model> + <model usable='yes'>z9EC.2-base</model> + <model usable='yes'>z196.2</model> + <model usable='yes'>z14.2</model> + <model usable='yes'>z990-base</model> + <model usable='yes'>z900.2</model> + <model usable='yes'>z890-base</model> + <model usable='yes'>z10EC.3</model> + <model usable='yes'>z14-base</model> + <model usable='yes'>z990.4-base</model> + <model usable='yes'>z10EC.3-base</model> + <model usable='yes'>z10BC-base</model> + <model usable='yes'>z13-base</model> + <model usable='yes'>z990.3-base</model> + <model usable='yes'>zEC12.2-base</model> + <model usable='yes'>zBC12</model> + <model usable='yes'>z890.3-base</model> + <model usable='yes'>z990.5</model> + <model usable='yes'>gen15b</model> + <model usable='yes'>qemu</model> + </mode> + </cpu> + <devices> + <disk supported='yes'> + <enum name='diskDevice'> + <value>disk</value> + <value>cdrom</value> + <value>floppy</value> + <value>lun</value> + </enum> + <enum name='bus'> + <value>fdc</value> + <value>scsi</value> + <value>virtio</value> + </enum> + <enum name='model'> + <value>virtio</value> + <value>virtio-transitional</value> + <value>virtio-non-transitional</value> + </enum> + </disk> + <graphics supported='yes'> + <enum name='type'> + <value>sdl</value> + <value>vnc</value> + <value>egl-headless</value> + </enum> + </graphics> + <video supported='yes'> + <enum name='modelType'> + <value>virtio</value> + <value>none</value> + </enum> + </video> + <hostdev supported='yes'> + <enum name='mode'> + <value>subsystem</value> + </enum> + <enum name='startupPolicy'> + <value>default</value> + <value>mandatory</value> + <value>requisite</value> + <value>optional</value> + </enum> + <enum name='subsysType'> + <value>pci</value> + <value>scsi</value> + </enum> + <enum name='capsType'/> + <enum name='pciBackend'> + <value>default</value> + <value>vfio</value> + </enum> + </hostdev> + <rng supported='yes'> + <enum name='model'> + <value>virtio</value> + <value>virtio-transitional</value> + <value>virtio-non-transitional</value> + </enum> + <enum name='backendModel'> + <value>random</value> + <value>egd</value> + <value>builtin</value> + </enum> + </rng> + </devices> + <features> + <gic supported='no'/> + <vmcoreinfo supported='no'/> + <genid supported='no'/> + <backingStoreInput supported='yes'/> + <backup supported='no'/> + <sev supported='no'/> + </features> +</domainCapabilities> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.s390x.replies b/tests/qemucapabilitiesdata/caps_5.1.0.s390x.replies new file mode 100644 index 00000000..ec3fd1f6 --- /dev/null +++ b/tests/qemucapabilitiesdata/caps_5.1.0.s390x.replies @@ -0,0 +1,24617 @@ [...] diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.1.0.s390x.xml new file mode 100644 index 00000000..af2647aa --- /dev/null +++ b/tests/qemucapabilitiesdata/caps_5.1.0.s390x.xml @@ -0,0 +1,3278 @@ +<qemuCaps> + <emulator>/usr/bin/qemu-system-s390x</emulator> + <qemuctime>0</qemuctime> + <selfctime>0</selfctime> + <selfvers>0</selfvers> + <flag name='kvm'/> + <flag name='virtio-tx-alg'/> + <flag name='virtio-blk-pci.ioeventfd'/> + <flag name='virtio-blk-pci.event_idx'/> + <flag name='virtio-net-pci.event_idx'/> + <flag name='virtio-blk-pci.scsi'/> + <flag name='scsi-disk.channel'/> + <flag name='scsi-block'/> + <flag name='dump-guest-memory'/> + <flag name='virtio-scsi-pci'/> + <flag name='blockio'/> + <flag name='scsi-disk.wwn'/> + <flag name='seccomp-sandbox'/> + <flag name='reboot-timeout'/> + <flag name='vnc'/> + <flag name='device-video-primary'/> + <flag name='s390-sclp'/> + <flag name='nbd-server'/> + <flag name='virtio-rng'/> + <flag name='rng-random'/> + <flag name='rng-egd'/> + <flag name='virtio-ccw'/> + <flag name='pci-bridge'/> + <flag name='vfio-pci'/> + <flag name='mem-merge'/> + <flag name='drive-discard'/> + <flag name='boot-strict'/> + <flag name='enable-fips'/> + <flag name='msg-timestamp'/> + <flag name='active-commit'/> + <flag name='change-backing-file'/> + <flag name='memory-backend-ram'/> + <flag name='numa'/> + <flag name='memory-backend-file'/> + <flag name='splash-timeout'/> + <flag name='iothread'/> + <flag name='migrate-rdma'/> + <flag name='drive-iotune-max'/> + <flag name='machine-vmport-opt'/> + <flag name='aes-key-wrap'/> + <flag name='dea-key-wrap'/> + <flag name='vhost-user-multiqueue'/> + <flag name='migration-event'/> + <flag name='virtio-net'/> + <flag name='gic-version'/> + <flag name='incoming-defer'/> + <flag name='virtio-gpu'/> + <flag name='virtio-gpu.virgl'/> + <flag name='virtio-keyboard'/> + <flag name='virtio-mouse'/> + <flag name='virtio-tablet'/> + <flag name='virtio-input-host'/> + <flag name='chardev-file-append'/> + <flag name='vserport-change-event'/> + <flag name='virtio-balloon-pci.deflate-on-oom'/> + <flag name='chardev-logfile'/> + <flag name='debug-threads'/> + <flag name='secret'/> + <flag name='virtio-scsi-pci.iothread'/> + <flag name='name-guest'/> + <flag name='drive-detect-zeroes'/> + <flag name='tls-creds-x509'/> + <flag name='smm'/> + <flag name='virtio-pci-disable-legacy'/> + <flag name='query-hotpluggable-cpus'/> + <flag name='virtio-net.rx_queue_size'/> + <flag name='drive-iotune-max-length'/> + <flag name='query-qmp-schema'/> + <flag name='gluster.debug_level'/> + <flag name='vhost-scsi'/> + <flag name='drive-iotune-group'/> + <flag name='query-cpu-model-expansion'/> + <flag name='virtio-net.host_mtu'/> + <flag name='query-cpu-definitions'/> + <flag name='block-write-threshold'/> + <flag name='query-named-block-nodes'/> + <flag name='kernel-irqchip'/> + <flag name='kernel-irqchip.split'/> + <flag name='virtio.iommu_platform'/> + <flag name='virtio.ats'/> + <flag name='loadparm'/> + <flag name='vnc-multi-servers'/> + <flag name='virtio-net.tx_queue_size'/> + <flag name='chardev-reconnect'/> + <flag name='virtio-gpu.max_outputs'/> + <flag name='virtio-blk.num-queues'/> + <flag name='sclplmconsole'/> + <flag name='numa.dist'/> + <flag name='disk-share-rw'/> + <flag name='iscsi.password-secret'/> + <flag name='dump-completed'/> + <flag name='virtio-gpu-ccw'/> + <flag name='virtio-keyboard-ccw'/> + <flag name='virtio-mouse-ccw'/> + <flag name='virtio-tablet-ccw'/> + <flag name='qcow2-luks'/> + <flag name='seccomp-blacklist'/> + <flag name='query-cpus-fast'/> + <flag name='disk-write-cache'/> + <flag name='nbd-tls'/> + <flag name='pr-manager-helper'/> + <flag name='qom-list-properties'/> + <flag name='memory-backend-file.discard-data'/> + <flag name='virtual-css-bridge'/> + <flag name='virtual-css-bridge.cssid-unrestricted'/> + <flag name='vfio-ccw'/> + <flag name='sdl-gl'/> + <flag name='screendump_device'/> + <flag name='blockdev-del'/> + <flag name='vhost-vsock'/> + <flag name='chardev-fd-pass'/> + <flag name='egl-headless'/> + <flag name='vfio-pci.display'/> + <flag name='blockdev'/> + <flag name='vfio-ap'/> + <flag name='zpci'/> + <flag name='memory-backend-memfd'/> + <flag name='memory-backend-memfd.hugetlb'/> + <flag name='iothread.poll-max-ns'/> + <flag name='egl-headless.rendernode'/> + <flag name='memory-backend-file.align'/> + <flag name='memory-backend-file.pmem'/> + <flag name='scsi-disk.device_id'/> + <flag name='virtio-pci-non-transitional'/> + <flag name='overcommit'/> + <flag name='query-current-machine'/> + <flag name='bitmap-merge'/> + <flag name='nbd-bitmap'/> + <flag name='migration-file-drop-cache'/> + <flag name='dbus-vmstate'/> + <flag name='vhost-user-gpu'/> + <flag name='query-cpu-model-baseline'/> + <flag name='query-cpu-model-comparison'/> + <flag name='blockdev-file-dynamic-auto-read-only'/> + <flag name='savevm-monitor-nodes'/> + <flag name='drive-nvme'/> + <flag name='smp-dies'/> + <flag name='rng-builtin'/> + <flag name='virtio-net.failover'/> + <flag name='vhost-user-fs'/> + <flag name='query-named-block-nodes.flat'/> + <flag name='blockdev-snapshot.allow-write-only-overlay'/> + <flag name='storage.werror'/> + <flag name='fsdev.multidevs'/> + <flag name='virtio.packed'/> + <flag name='aio.io_uring'/> + <flag name='tcg'/> + <flag name='virtio-blk-pci.scsi.default.disabled'/> + <flag name='fw_cfg'/> + <flag name='migration-param.bandwidth'/> + <flag name='migration-param.downtime'/> + <flag name='migration-param.xbzrle-cache-size'/> + <flag name='numa.hmat'/> + <flag name='blockdev-hostdev-scsi'/> + <flag name='virtio-balloon.free-page-reporting'/> + <flag name='netdev.vhost-vdpa'/> + <flag name='fsdev.createmode'/> + <version>5001000</version> + <kvmVersion>0</kvmVersion> + <microcodeVersion>39100242</microcodeVersion> + <package>qemu-5.1.0-20201029.0.64aaebe0ca.fc32</package> + <arch>s390x</arch> + <hostCPU type='kvm' model='gen15a-base' migratability='no'> + <property name='aen' type='boolean' value='true'/> + <property name='cmmnt' type='boolean' value='true'/> + <property name='vxpdeh' type='boolean' value='true'/> + <property name='aefsi' type='boolean' value='true'/> + <property name='csske' type='boolean' value='true'/> + <property name='mepoch' type='boolean' value='true'/> + <property name='msa9' type='boolean' value='true'/> + <property name='msa8' type='boolean' value='true'/> + <property name='msa7' type='boolean' value='true'/> + <property name='msa6' type='boolean' value='true'/> + <property name='msa5' type='boolean' value='true'/> + <property name='msa4' type='boolean' value='true'/> + <property name='msa3' type='boolean' value='true'/> + <property name='msa2' type='boolean' value='true'/> + <property name='msa1' type='boolean' value='true'/> + <property name='sthyi' type='boolean' value='true'/> + <property name='edat' type='boolean' value='true'/> + <property name='ri' type='boolean' value='true'/> + <property name='deflate' type='boolean' value='true'/> + <property name='edat2' type='boolean' value='true'/> + <property name='etoken' type='boolean' value='true'/> + <property name='vx' type='boolean' value='true'/> + <property name='ipter' type='boolean' value='true'/> + <property name='mepochptff' type='boolean' value='true'/> + <property name='ap' type='boolean' value='true'/> + <property name='vxeh' type='boolean' value='true'/> + <property name='vxpd' type='boolean' value='true'/> + <property name='esop' type='boolean' value='true'/> + <property name='msa9_pckmo' type='boolean' value='true'/> + <property name='vxeh2' type='boolean' value='true'/> + <property name='esort' type='boolean' value='true'/> + <property name='apqi' type='boolean' value='true'/> + <property name='apft' type='boolean' value='true'/> + <property name='iep' type='boolean' value='true'/> + <property name='apqci' type='boolean' value='true'/> + <property name='cte' type='boolean' value='true'/> + <property name='ais' type='boolean' value='true'/> + <property name='bpb' type='boolean' value='true'/> + <property name='gs' type='boolean' value='true'/> + <property name='ppa15' type='boolean' value='true'/> + <property name='zpci' type='boolean' value='true'/> + <property name='sea_esop2' type='boolean' value='true'/> + <property name='te' type='boolean' value='true'/> + <property name='cmm' type='boolean' value='true'/> + </hostCPU> + <cpu type='kvm' name='z800-base' typename='z800-base-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z890.2-base' typename='z890.2-base-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z9EC.2' typename='z9EC.2-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z13.2' typename='z13.2-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z9BC-base' typename='z9BC-base-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z990.5-base' typename='z990.5-base-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z890.2' typename='z890.2-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z890' typename='z890-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z9BC' typename='z9BC-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z13' typename='z13-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z196' typename='z196-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z13s' typename='z13s-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='host' typename='host-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z990.3' typename='z990.3-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z13s-base' typename='z13s-base-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z9EC' typename='z9EC-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='gen15a' typename='gen15a-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z14ZR1-base' typename='z14ZR1-base-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z14.2-base' typename='z14.2-base-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z900.3-base' typename='z900.3-base-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z13.2-base' typename='z13.2-base-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z196.2-base' typename='z196.2-base-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='zBC12-base' typename='zBC12-base-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z9BC.2-base' typename='z9BC.2-base-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z900.2-base' typename='z900.2-base-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z9EC.3' typename='z9EC.3-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='zEC12' typename='zEC12-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z900' typename='z900-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z114-base' typename='z114-base-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='zEC12-base' typename='zEC12-base-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z10EC.2' typename='z10EC.2-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z10EC-base' typename='z10EC-base-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z900.3' typename='z900.3-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z14ZR1' typename='z14ZR1-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z10BC' typename='z10BC-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z10BC.2-base' typename='z10BC.2-base-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z9BC.2' typename='z9BC.2-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z990.2' typename='z990.2-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z990' typename='z990-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z14' typename='z14-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='gen15b-base' typename='gen15b-base-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z990.4' typename='z990.4-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='max' typename='max-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z10EC.2-base' typename='z10EC.2-base-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='gen15a-base' typename='gen15a-base-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z800' typename='z800-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z10EC' typename='z10EC-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='zEC12.2' typename='zEC12.2-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z990.2-base' typename='z990.2-base-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z900-base' typename='z900-base-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z10BC.2' typename='z10BC.2-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z9EC-base' typename='z9EC-base-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z9EC.3-base' typename='z9EC.3-base-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z114' typename='z114-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z890.3' typename='z890.3-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z196-base' typename='z196-base-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z9EC.2-base' typename='z9EC.2-base-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z196.2' typename='z196.2-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z14.2' typename='z14.2-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z990-base' typename='z990-base-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z900.2' typename='z900.2-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z890-base' typename='z890-base-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z10EC.3' typename='z10EC.3-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z14-base' typename='z14-base-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z990.4-base' typename='z990.4-base-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z10EC.3-base' typename='z10EC.3-base-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z10BC-base' typename='z10BC-base-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z13-base' typename='z13-base-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z990.3-base' typename='z990.3-base-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='zEC12.2-base' typename='zEC12.2-base-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='zBC12' typename='zBC12-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z890.3-base' typename='z890.3-base-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='z990.5' typename='z990.5-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='gen15b' typename='gen15b-s390x-cpu' usable='yes'/> + <cpu type='kvm' name='qemu' typename='qemu-s390x-cpu' usable='yes'/> + <machine type='kvm' name='s390-ccw-virtio-5.1' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes' defaultCPU='host-s390x-cpu'/> + <machine type='kvm' name='s390-ccw-virtio-4.0' hotplugCpus='yes' maxCpus='248' defaultCPU='host-s390x-cpu'/> + <machine type='kvm' name='s390-ccw-virtio-3.1' hotplugCpus='yes' maxCpus='248' defaultCPU='host-s390x-cpu'/> + <machine type='kvm' name='s390-ccw-virtio-2.6' hotplugCpus='yes' maxCpus='248' defaultCPU='host-s390x-cpu'/> + <machine type='kvm' name='s390-ccw-virtio-2.12' hotplugCpus='yes' maxCpus='248' defaultCPU='host-s390x-cpu'/> + <machine type='kvm' name='s390-ccw-virtio-2.9' hotplugCpus='yes' maxCpus='248' defaultCPU='host-s390x-cpu'/> + <machine type='kvm' name='s390-ccw-virtio-3.0' hotplugCpus='yes' maxCpus='248' defaultCPU='host-s390x-cpu'/> + <machine type='kvm' name='s390-ccw-virtio-4.2' hotplugCpus='yes' maxCpus='248' defaultCPU='host-s390x-cpu'/> + <machine type='kvm' name='s390-ccw-virtio-2.5' hotplugCpus='yes' maxCpus='248' defaultCPU='host-s390x-cpu'/> + <machine type='kvm' name='s390-ccw-virtio-2.11' hotplugCpus='yes' maxCpus='248' defaultCPU='host-s390x-cpu'/> + <machine type='kvm' name='s390-ccw-virtio-2.8' hotplugCpus='yes' maxCpus='248' defaultCPU='host-s390x-cpu'/> + <machine type='kvm' name='s390-ccw-virtio-5.0' hotplugCpus='yes' maxCpus='248' defaultCPU='host-s390x-cpu'/> + <machine type='kvm' name='s390-ccw-virtio-4.1' hotplugCpus='yes' maxCpus='248' defaultCPU='host-s390x-cpu'/> + <machine type='kvm' name='s390-ccw-virtio-2.4' hotplugCpus='yes' maxCpus='248' defaultCPU='host-s390x-cpu'/> + <machine type='kvm' name='s390-ccw-virtio-2.10' hotplugCpus='yes' maxCpus='248' defaultCPU='host-s390x-cpu'/> + <machine type='kvm' name='s390-ccw-virtio-2.7' hotplugCpus='yes' maxCpus='248' defaultCPU='host-s390x-cpu'/> + <hostCPU type='tcg' model='z13.2-base' migratability='no'> + <property name='dateh2' type='boolean' value='false'/> + <property name='aen' type='boolean' value='true'/> + <property name='gen13ptff' type='boolean' value='false'/> + <property name='kmac-tdea-192' type='boolean' value='false'/> + <property name='kmc-tdea-192' type='boolean' value='false'/> + <property name='parseh' type='boolean' value='false'/> + <property name='aefsi' type='boolean' value='true'/> + <property name='csske' type='boolean' value='false'/> + <property name='hfpm' type='boolean' value='false'/> + <property name='hfpue' type='boolean' value='false'/> + <property name='dfp' type='boolean' value='false'/> + <property name='km-dea' type='boolean' value='false'/> + <property name='vx' type='boolean' value='true'/> + <property name='emon' type='boolean' value='false'/> + <property name='kimd-sha-1' type='boolean' value='false'/> + <property name='cmpsceh' type='boolean' value='false'/> + <property name='dfppc' type='boolean' value='false'/> + <property name='dfpzc' type='boolean' value='false'/> + <property name='dfphp' type='boolean' value='false'/> + <property name='kmc-dea' type='boolean' value='false'/> + <property name='klmd-sha-1' type='boolean' value='false'/> + <property name='asnlxr' type='boolean' value='false'/> + <property name='esop' type='boolean' value='true'/> + <property name='km-tdea-192' type='boolean' value='false'/> + <property name='km-tdea-128' type='boolean' value='false'/> + <property name='kmac-dea' type='boolean' value='false'/> + <property name='iep' type='boolean' value='true'/> + <property name='kmc-tdea-128' type='boolean' value='false'/> + <property name='ais' type='boolean' value='true'/> + <property name='kmac-tdea-128' type='boolean' value='false'/> + <property name='zpci' type='boolean' value='true'/> + <property name='nonqks' type='boolean' value='false'/> + <property name='sea_esop2' type='boolean' value='true'/> + <property name='pfpo' type='boolean' value='false'/> + <property name='msa4-base' type='boolean' value='true'/> + <property name='msa3-base' type='boolean' value='true'/> + <property name='msa5-base' type='boolean' value='true'/> + <property name='tods' type='boolean' value='false'/> + </hostCPU> + <cpu type='tcg' name='z800-base' typename='z800-base-s390x-cpu' usable='yes'/> + <cpu type='tcg' name='z890.2-base' typename='z890.2-base-s390x-cpu' usable='no'> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='hfpm'/> + </cpu> + <cpu type='tcg' name='z9EC.2' typename='z9EC.2-s390x-cpu' usable='no'> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='cmm'/> + <blocker name='dateh2'/> + <blocker name='sthyi'/> + <blocker name='hfpue'/> + <blocker name='hfpm'/> + <blocker name='asnlxr'/> + <blocker name='msa1'/> + <blocker name='tods'/> + </cpu> + <cpu type='tcg' name='z13.2' typename='z13.2-s390x-cpu' usable='no'> + <blocker name='ppno-sha-512-drng'/> + <blocker name='pcc-xts-eaes-256'/> + <blocker name='pcc-xts-eaes-128'/> + <blocker name='pcc-xts-aes-256'/> + <blocker name='pcc-xts-aes-128'/> + <blocker name='pcc-cmac-eaes-256'/> + <blocker name='pcc-cmac-eaes-192'/> + <blocker name='pcc-cmac-eaes-128'/> + <blocker name='pcc-cmac-aes-256'/> + <blocker name='pcc-cmac-aes-192'/> + <blocker name='pcc-cmac-aes-128'/> + <blocker name='pcc-cmac-etdea-192'/> + <blocker name='pcc-cmac-etdea-128'/> + <blocker name='pcc-cmac-edea'/> + <blocker name='pcc-cmac-tdea-192'/> + <blocker name='pcc-cmac-tdea-128'/> + <blocker name='pcc-cmac-dea'/> + <blocker name='kmo-eaes-256'/> + <blocker name='kmo-eaes-192'/> + <blocker name='kmo-eaes-128'/> + <blocker name='kmo-aes-256'/> + <blocker name='kmo-aes-192'/> + <blocker name='kmo-aes-128'/> + <blocker name='kmo-etdea-192'/> + <blocker name='kmo-etdea-128'/> + <blocker name='kmo-edea'/> + <blocker name='kmo-tdea-192'/> + <blocker name='kmo-tdea-128'/> + <blocker name='kmo-dea'/> + <blocker name='kmf-eaes-256'/> + <blocker name='kmf-eaes-192'/> + <blocker name='kmf-eaes-128'/> + <blocker name='kmf-aes-256'/> + <blocker name='kmf-aes-192'/> + <blocker name='kmf-aes-128'/> + <blocker name='kmf-etdea-192'/> + <blocker name='kmf-etdea-128'/> + <blocker name='kmf-edea'/> + <blocker name='kmf-tdea-192'/> + <blocker name='kmf-tdea-128'/> + <blocker name='kmf-dea'/> + <blocker name='kmctr-eaes-256'/> + <blocker name='kmctr-eaes-192'/> + <blocker name='kmctr-eaes-128'/> + <blocker name='kmctr-aes-256'/> + <blocker name='kmctr-aes-192'/> + <blocker name='kmctr-aes-128'/> + <blocker name='kmctr-etdea-192'/> + <blocker name='kmctr-etdea-128'/> + <blocker name='kmctr-edea'/> + <blocker name='kmctr-tdea-192'/> + <blocker name='kmctr-tdea-128'/> + <blocker name='kmctr-dea'/> + <blocker name='pckmo-aes-256'/> + <blocker name='pckmo-aes-192'/> + <blocker name='pckmo-aes-128'/> + <blocker name='pckmo-etdea-192'/> + <blocker name='pckmo-etdea-128'/> + <blocker name='pckmo-edea'/> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-ghash'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-xts-eaes-256'/> + <blocker name='km-xts-eaes-128'/> + <blocker name='km-xts-aes-256'/> + <blocker name='km-xts-aes-128'/> + <blocker name='km-eaes-256'/> + <blocker name='km-eaes-192'/> + <blocker name='km-eaes-128'/> + <blocker name='km-etdea-192'/> + <blocker name='km-etdea-128'/> + <blocker name='km-edea'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-eaes-256'/> + <blocker name='kmc-eaes-192'/> + <blocker name='kmc-eaes-128'/> + <blocker name='kmc-etdea-192'/> + <blocker name='kmc-etdea-128'/> + <blocker name='kmc-edea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-eaes-256'/> + <blocker name='kmac-eaes-192'/> + <blocker name='kmac-eaes-128'/> + <blocker name='kmac-aes-256'/> + <blocker name='kmac-aes-192'/> + <blocker name='kmac-aes-128'/> + <blocker name='kmac-etdea-192'/> + <blocker name='kmac-etdea-128'/> + <blocker name='kmac-edea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='cmm'/> + <blocker name='dateh2'/> + <blocker name='bpb'/> + <blocker name='ppa15'/> + <blocker name='dfppc'/> + <blocker name='edat2'/> + <blocker name='sthyi'/> + <blocker name='te'/> + <blocker name='ri'/> + <blocker name='cte'/> + <blocker name='dfpzc'/> + <blocker name='cmpsceh'/> + <blocker name='pfpo'/> + <blocker name='dfphp'/> + <blocker name='dfp'/> + <blocker name='emon'/> + <blocker name='parseh'/> + <blocker name='hfpue'/> + <blocker name='hfpm'/> + <blocker name='nonqks'/> + <blocker name='ipter'/> + <blocker name='csske'/> + <blocker name='edat'/> + <blocker name='asnlxr'/> + <blocker name='msa2'/> + <blocker name='msa1'/> + <blocker name='gen13ptff'/> + <blocker name='tods'/> + </cpu> + <cpu type='tcg' name='z9BC-base' typename='z9BC-base-s390x-cpu' usable='no'> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='dateh2'/> + <blocker name='hfpue'/> + <blocker name='hfpm'/> + <blocker name='asnlxr'/> + <blocker name='tods'/> + </cpu> + <cpu type='tcg' name='z990.5-base' typename='z990.5-base-s390x-cpu' usable='no'> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='hfpm'/> + </cpu> + <cpu type='tcg' name='z890.2' typename='z890.2-s390x-cpu' usable='no'> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='hfpm'/> + </cpu> + <cpu type='tcg' name='z890' typename='z890-s390x-cpu' usable='no'> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='hfpm'/> + </cpu> + <cpu type='tcg' name='z9BC' typename='z9BC-s390x-cpu' usable='no'> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='cmm'/> + <blocker name='dateh2'/> + <blocker name='sthyi'/> + <blocker name='hfpue'/> + <blocker name='hfpm'/> + <blocker name='asnlxr'/> + <blocker name='msa1'/> + <blocker name='tods'/> + </cpu> + <cpu type='tcg' name='z13' typename='z13-s390x-cpu' usable='no'> + <blocker name='ppno-sha-512-drng'/> + <blocker name='pcc-xts-eaes-256'/> + <blocker name='pcc-xts-eaes-128'/> + <blocker name='pcc-xts-aes-256'/> + <blocker name='pcc-xts-aes-128'/> + <blocker name='pcc-cmac-eaes-256'/> + <blocker name='pcc-cmac-eaes-192'/> + <blocker name='pcc-cmac-eaes-128'/> + <blocker name='pcc-cmac-aes-256'/> + <blocker name='pcc-cmac-aes-192'/> + <blocker name='pcc-cmac-aes-128'/> + <blocker name='pcc-cmac-etdea-192'/> + <blocker name='pcc-cmac-etdea-128'/> + <blocker name='pcc-cmac-edea'/> + <blocker name='pcc-cmac-tdea-192'/> + <blocker name='pcc-cmac-tdea-128'/> + <blocker name='pcc-cmac-dea'/> + <blocker name='kmo-eaes-256'/> + <blocker name='kmo-eaes-192'/> + <blocker name='kmo-eaes-128'/> + <blocker name='kmo-aes-256'/> + <blocker name='kmo-aes-192'/> + <blocker name='kmo-aes-128'/> + <blocker name='kmo-etdea-192'/> + <blocker name='kmo-etdea-128'/> + <blocker name='kmo-edea'/> + <blocker name='kmo-tdea-192'/> + <blocker name='kmo-tdea-128'/> + <blocker name='kmo-dea'/> + <blocker name='kmf-eaes-256'/> + <blocker name='kmf-eaes-192'/> + <blocker name='kmf-eaes-128'/> + <blocker name='kmf-aes-256'/> + <blocker name='kmf-aes-192'/> + <blocker name='kmf-aes-128'/> + <blocker name='kmf-etdea-192'/> + <blocker name='kmf-etdea-128'/> + <blocker name='kmf-edea'/> + <blocker name='kmf-tdea-192'/> + <blocker name='kmf-tdea-128'/> + <blocker name='kmf-dea'/> + <blocker name='kmctr-eaes-256'/> + <blocker name='kmctr-eaes-192'/> + <blocker name='kmctr-eaes-128'/> + <blocker name='kmctr-aes-256'/> + <blocker name='kmctr-aes-192'/> + <blocker name='kmctr-aes-128'/> + <blocker name='kmctr-etdea-192'/> + <blocker name='kmctr-etdea-128'/> + <blocker name='kmctr-edea'/> + <blocker name='kmctr-tdea-192'/> + <blocker name='kmctr-tdea-128'/> + <blocker name='kmctr-dea'/> + <blocker name='pckmo-aes-256'/> + <blocker name='pckmo-aes-192'/> + <blocker name='pckmo-aes-128'/> + <blocker name='pckmo-etdea-192'/> + <blocker name='pckmo-etdea-128'/> + <blocker name='pckmo-edea'/> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-ghash'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-xts-eaes-256'/> + <blocker name='km-xts-eaes-128'/> + <blocker name='km-xts-aes-256'/> + <blocker name='km-xts-aes-128'/> + <blocker name='km-eaes-256'/> + <blocker name='km-eaes-192'/> + <blocker name='km-eaes-128'/> + <blocker name='km-etdea-192'/> + <blocker name='km-etdea-128'/> + <blocker name='km-edea'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-eaes-256'/> + <blocker name='kmc-eaes-192'/> + <blocker name='kmc-eaes-128'/> + <blocker name='kmc-etdea-192'/> + <blocker name='kmc-etdea-128'/> + <blocker name='kmc-edea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-eaes-256'/> + <blocker name='kmac-eaes-192'/> + <blocker name='kmac-eaes-128'/> + <blocker name='kmac-aes-256'/> + <blocker name='kmac-aes-192'/> + <blocker name='kmac-aes-128'/> + <blocker name='kmac-etdea-192'/> + <blocker name='kmac-etdea-128'/> + <blocker name='kmac-edea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='cmm'/> + <blocker name='dateh2'/> + <blocker name='bpb'/> + <blocker name='ppa15'/> + <blocker name='dfppc'/> + <blocker name='edat2'/> + <blocker name='sthyi'/> + <blocker name='te'/> + <blocker name='ri'/> + <blocker name='cte'/> + <blocker name='dfpzc'/> + <blocker name='cmpsceh'/> + <blocker name='pfpo'/> + <blocker name='dfphp'/> + <blocker name='dfp'/> + <blocker name='emon'/> + <blocker name='parseh'/> + <blocker name='hfpue'/> + <blocker name='hfpm'/> + <blocker name='nonqks'/> + <blocker name='ipter'/> + <blocker name='csske'/> + <blocker name='edat'/> + <blocker name='asnlxr'/> + <blocker name='msa2'/> + <blocker name='msa1'/> + <blocker name='gen13ptff'/> + <blocker name='tods'/> + </cpu> + <cpu type='tcg' name='z196' typename='z196-s390x-cpu' usable='no'> + <blocker name='pcc-xts-eaes-256'/> + <blocker name='pcc-xts-eaes-128'/> + <blocker name='pcc-xts-aes-256'/> + <blocker name='pcc-xts-aes-128'/> + <blocker name='pcc-cmac-eaes-256'/> + <blocker name='pcc-cmac-eaes-192'/> + <blocker name='pcc-cmac-eaes-128'/> + <blocker name='pcc-cmac-aes-256'/> + <blocker name='pcc-cmac-aes-192'/> + <blocker name='pcc-cmac-aes-128'/> + <blocker name='pcc-cmac-etdea-192'/> + <blocker name='pcc-cmac-etdea-128'/> + <blocker name='pcc-cmac-edea'/> + <blocker name='pcc-cmac-tdea-192'/> + <blocker name='pcc-cmac-tdea-128'/> + <blocker name='pcc-cmac-dea'/> + <blocker name='kmo-eaes-256'/> + <blocker name='kmo-eaes-192'/> + <blocker name='kmo-eaes-128'/> + <blocker name='kmo-aes-256'/> + <blocker name='kmo-aes-192'/> + <blocker name='kmo-aes-128'/> + <blocker name='kmo-etdea-192'/> + <blocker name='kmo-etdea-128'/> + <blocker name='kmo-edea'/> + <blocker name='kmo-tdea-192'/> + <blocker name='kmo-tdea-128'/> + <blocker name='kmo-dea'/> + <blocker name='kmf-eaes-256'/> + <blocker name='kmf-eaes-192'/> + <blocker name='kmf-eaes-128'/> + <blocker name='kmf-aes-256'/> + <blocker name='kmf-aes-192'/> + <blocker name='kmf-aes-128'/> + <blocker name='kmf-etdea-192'/> + <blocker name='kmf-etdea-128'/> + <blocker name='kmf-edea'/> + <blocker name='kmf-tdea-192'/> + <blocker name='kmf-tdea-128'/> + <blocker name='kmf-dea'/> + <blocker name='kmctr-eaes-256'/> + <blocker name='kmctr-eaes-192'/> + <blocker name='kmctr-eaes-128'/> + <blocker name='kmctr-aes-256'/> + <blocker name='kmctr-aes-192'/> + <blocker name='kmctr-aes-128'/> + <blocker name='kmctr-etdea-192'/> + <blocker name='kmctr-etdea-128'/> + <blocker name='kmctr-edea'/> + <blocker name='kmctr-tdea-192'/> + <blocker name='kmctr-tdea-128'/> + <blocker name='kmctr-dea'/> + <blocker name='pckmo-aes-256'/> + <blocker name='pckmo-aes-192'/> + <blocker name='pckmo-aes-128'/> + <blocker name='pckmo-etdea-192'/> + <blocker name='pckmo-etdea-128'/> + <blocker name='pckmo-edea'/> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-ghash'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-xts-eaes-256'/> + <blocker name='km-xts-eaes-128'/> + <blocker name='km-xts-aes-256'/> + <blocker name='km-xts-aes-128'/> + <blocker name='km-eaes-256'/> + <blocker name='km-eaes-192'/> + <blocker name='km-eaes-128'/> + <blocker name='km-etdea-192'/> + <blocker name='km-etdea-128'/> + <blocker name='km-edea'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-eaes-256'/> + <blocker name='kmc-eaes-192'/> + <blocker name='kmc-eaes-128'/> + <blocker name='kmc-etdea-192'/> + <blocker name='kmc-etdea-128'/> + <blocker name='kmc-edea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-eaes-256'/> + <blocker name='kmac-eaes-192'/> + <blocker name='kmac-eaes-128'/> + <blocker name='kmac-aes-256'/> + <blocker name='kmac-aes-192'/> + <blocker name='kmac-aes-128'/> + <blocker name='kmac-etdea-192'/> + <blocker name='kmac-etdea-128'/> + <blocker name='kmac-edea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='cmm'/> + <blocker name='dateh2'/> + <blocker name='bpb'/> + <blocker name='ppa15'/> + <blocker name='sthyi'/> + <blocker name='cmpsceh'/> + <blocker name='pfpo'/> + <blocker name='dfphp'/> + <blocker name='dfp'/> + <blocker name='emon'/> + <blocker name='parseh'/> + <blocker name='hfpue'/> + <blocker name='hfpm'/> + <blocker name='nonqks'/> + <blocker name='ipter'/> + <blocker name='csske'/> + <blocker name='edat'/> + <blocker name='asnlxr'/> + <blocker name='msa2'/> + <blocker name='msa1'/> + <blocker name='tods'/> + </cpu> + <cpu type='tcg' name='z13s' typename='z13s-s390x-cpu' usable='no'> + <blocker name='ppno-sha-512-drng'/> + <blocker name='pcc-xts-eaes-256'/> + <blocker name='pcc-xts-eaes-128'/> + <blocker name='pcc-xts-aes-256'/> + <blocker name='pcc-xts-aes-128'/> + <blocker name='pcc-cmac-eaes-256'/> + <blocker name='pcc-cmac-eaes-192'/> + <blocker name='pcc-cmac-eaes-128'/> + <blocker name='pcc-cmac-aes-256'/> + <blocker name='pcc-cmac-aes-192'/> + <blocker name='pcc-cmac-aes-128'/> + <blocker name='pcc-cmac-etdea-192'/> + <blocker name='pcc-cmac-etdea-128'/> + <blocker name='pcc-cmac-edea'/> + <blocker name='pcc-cmac-tdea-192'/> + <blocker name='pcc-cmac-tdea-128'/> + <blocker name='pcc-cmac-dea'/> + <blocker name='kmo-eaes-256'/> + <blocker name='kmo-eaes-192'/> + <blocker name='kmo-eaes-128'/> + <blocker name='kmo-aes-256'/> + <blocker name='kmo-aes-192'/> + <blocker name='kmo-aes-128'/> + <blocker name='kmo-etdea-192'/> + <blocker name='kmo-etdea-128'/> + <blocker name='kmo-edea'/> + <blocker name='kmo-tdea-192'/> + <blocker name='kmo-tdea-128'/> + <blocker name='kmo-dea'/> + <blocker name='kmf-eaes-256'/> + <blocker name='kmf-eaes-192'/> + <blocker name='kmf-eaes-128'/> + <blocker name='kmf-aes-256'/> + <blocker name='kmf-aes-192'/> + <blocker name='kmf-aes-128'/> + <blocker name='kmf-etdea-192'/> + <blocker name='kmf-etdea-128'/> + <blocker name='kmf-edea'/> + <blocker name='kmf-tdea-192'/> + <blocker name='kmf-tdea-128'/> + <blocker name='kmf-dea'/> + <blocker name='kmctr-eaes-256'/> + <blocker name='kmctr-eaes-192'/> + <blocker name='kmctr-eaes-128'/> + <blocker name='kmctr-aes-256'/> + <blocker name='kmctr-aes-192'/> + <blocker name='kmctr-aes-128'/> + <blocker name='kmctr-etdea-192'/> + <blocker name='kmctr-etdea-128'/> + <blocker name='kmctr-edea'/> + <blocker name='kmctr-tdea-192'/> + <blocker name='kmctr-tdea-128'/> + <blocker name='kmctr-dea'/> + <blocker name='pckmo-aes-256'/> + <blocker name='pckmo-aes-192'/> + <blocker name='pckmo-aes-128'/> + <blocker name='pckmo-etdea-192'/> + <blocker name='pckmo-etdea-128'/> + <blocker name='pckmo-edea'/> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-ghash'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-xts-eaes-256'/> + <blocker name='km-xts-eaes-128'/> + <blocker name='km-xts-aes-256'/> + <blocker name='km-xts-aes-128'/> + <blocker name='km-eaes-256'/> + <blocker name='km-eaes-192'/> + <blocker name='km-eaes-128'/> + <blocker name='km-etdea-192'/> + <blocker name='km-etdea-128'/> + <blocker name='km-edea'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-eaes-256'/> + <blocker name='kmc-eaes-192'/> + <blocker name='kmc-eaes-128'/> + <blocker name='kmc-etdea-192'/> + <blocker name='kmc-etdea-128'/> + <blocker name='kmc-edea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-eaes-256'/> + <blocker name='kmac-eaes-192'/> + <blocker name='kmac-eaes-128'/> + <blocker name='kmac-aes-256'/> + <blocker name='kmac-aes-192'/> + <blocker name='kmac-aes-128'/> + <blocker name='kmac-etdea-192'/> + <blocker name='kmac-etdea-128'/> + <blocker name='kmac-edea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='cmm'/> + <blocker name='dateh2'/> + <blocker name='bpb'/> + <blocker name='ppa15'/> + <blocker name='dfppc'/> + <blocker name='edat2'/> + <blocker name='sthyi'/> + <blocker name='te'/> + <blocker name='ri'/> + <blocker name='cte'/> + <blocker name='dfpzc'/> + <blocker name='cmpsceh'/> + <blocker name='pfpo'/> + <blocker name='dfphp'/> + <blocker name='dfp'/> + <blocker name='emon'/> + <blocker name='parseh'/> + <blocker name='hfpue'/> + <blocker name='hfpm'/> + <blocker name='nonqks'/> + <blocker name='ipter'/> + <blocker name='csske'/> + <blocker name='edat'/> + <blocker name='asnlxr'/> + <blocker name='msa2'/> + <blocker name='msa1'/> + <blocker name='gen13ptff'/> + <blocker name='tods'/> + </cpu> + <cpu type='tcg' name='host' typename='host-s390x-cpu' usable='yes'/> + <cpu type='tcg' name='z990.3' typename='z990.3-s390x-cpu' usable='no'> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='hfpm'/> + </cpu> + <cpu type='tcg' name='z13s-base' typename='z13s-base-s390x-cpu' usable='no'> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='dateh2'/> + <blocker name='dfppc'/> + <blocker name='dfpzc'/> + <blocker name='cmpsceh'/> + <blocker name='pfpo'/> + <blocker name='dfphp'/> + <blocker name='dfp'/> + <blocker name='emon'/> + <blocker name='parseh'/> + <blocker name='hfpue'/> + <blocker name='hfpm'/> + <blocker name='nonqks'/> + <blocker name='csske'/> + <blocker name='asnlxr'/> + <blocker name='gen13ptff'/> + <blocker name='tods'/> + </cpu> + <cpu type='tcg' name='z9EC' typename='z9EC-s390x-cpu' usable='no'> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='cmm'/> + <blocker name='dateh2'/> + <blocker name='sthyi'/> + <blocker name='hfpue'/> + <blocker name='hfpm'/> + <blocker name='asnlxr'/> + <blocker name='msa1'/> + <blocker name='tods'/> + </cpu> + <cpu type='tcg' name='gen15a' typename='gen15a-s390x-cpu' usable='no'> + <blocker name='ppno-sha-512-drng'/> + <blocker name='pcc-xts-eaes-256'/> + <blocker name='pcc-xts-eaes-128'/> + <blocker name='pcc-xts-aes-256'/> + <blocker name='pcc-xts-aes-128'/> + <blocker name='pcc-cmac-eaes-256'/> + <blocker name='pcc-cmac-eaes-192'/> + <blocker name='pcc-cmac-eaes-128'/> + <blocker name='pcc-cmac-aes-256'/> + <blocker name='pcc-cmac-aes-192'/> + <blocker name='pcc-cmac-aes-128'/> + <blocker name='pcc-cmac-etdea-192'/> + <blocker name='pcc-cmac-etdea-128'/> + <blocker name='pcc-cmac-edea'/> + <blocker name='pcc-cmac-tdea-192'/> + <blocker name='pcc-cmac-tdea-128'/> + <blocker name='pcc-cmac-dea'/> + <blocker name='kmo-eaes-256'/> + <blocker name='kmo-eaes-192'/> + <blocker name='kmo-eaes-128'/> + <blocker name='kmo-aes-256'/> + <blocker name='kmo-aes-192'/> + <blocker name='kmo-aes-128'/> + <blocker name='kmo-etdea-192'/> + <blocker name='kmo-etdea-128'/> + <blocker name='kmo-edea'/> + <blocker name='kmo-tdea-192'/> + <blocker name='kmo-tdea-128'/> + <blocker name='kmo-dea'/> + <blocker name='kmf-eaes-256'/> + <blocker name='kmf-eaes-192'/> + <blocker name='kmf-eaes-128'/> + <blocker name='kmf-aes-256'/> + <blocker name='kmf-aes-192'/> + <blocker name='kmf-aes-128'/> + <blocker name='kmf-etdea-192'/> + <blocker name='kmf-etdea-128'/> + <blocker name='kmf-edea'/> + <blocker name='kmf-tdea-192'/> + <blocker name='kmf-tdea-128'/> + <blocker name='kmf-dea'/> + <blocker name='kmctr-eaes-256'/> + <blocker name='kmctr-eaes-192'/> + <blocker name='kmctr-eaes-128'/> + <blocker name='kmctr-aes-256'/> + <blocker name='kmctr-aes-192'/> + <blocker name='kmctr-aes-128'/> + <blocker name='kmctr-etdea-192'/> + <blocker name='kmctr-etdea-128'/> + <blocker name='kmctr-edea'/> + <blocker name='kmctr-tdea-192'/> + <blocker name='kmctr-tdea-128'/> + <blocker name='kmctr-dea'/> + <blocker name='pckmo-aes-256'/> + <blocker name='pckmo-aes-192'/> + <blocker name='pckmo-aes-128'/> + <blocker name='pckmo-etdea-192'/> + <blocker name='pckmo-etdea-128'/> + <blocker name='pckmo-edea'/> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-ghash'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-xts-eaes-256'/> + <blocker name='km-xts-eaes-128'/> + <blocker name='km-xts-aes-256'/> + <blocker name='km-xts-aes-128'/> + <blocker name='km-eaes-256'/> + <blocker name='km-eaes-192'/> + <blocker name='km-eaes-128'/> + <blocker name='km-etdea-192'/> + <blocker name='km-etdea-128'/> + <blocker name='km-edea'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-eaes-256'/> + <blocker name='kmc-eaes-192'/> + <blocker name='kmc-eaes-128'/> + <blocker name='kmc-etdea-192'/> + <blocker name='kmc-etdea-128'/> + <blocker name='kmc-edea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-eaes-256'/> + <blocker name='kmac-eaes-192'/> + <blocker name='kmac-eaes-128'/> + <blocker name='kmac-aes-256'/> + <blocker name='kmac-aes-192'/> + <blocker name='kmac-aes-128'/> + <blocker name='kmac-etdea-192'/> + <blocker name='kmac-etdea-128'/> + <blocker name='kmac-edea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='cmm'/> + <blocker name='dateh2'/> + <blocker name='etoken'/> + <blocker name='vxpdeh'/> + <blocker name='vxeh2'/> + <blocker name='mepoch'/> + <blocker name='vxeh'/> + <blocker name='vxpd'/> + <blocker name='gs'/> + <blocker name='ppa15'/> + <blocker name='dfppc'/> + <blocker name='edat2'/> + <blocker name='sthyi'/> + <blocker name='te'/> + <blocker name='ri'/> + <blocker name='minste3'/> + <blocker name='tsi'/> + <blocker name='sema'/> + <blocker name='minste2'/> + <blocker name='eec'/> + <blocker name='cte'/> + <blocker name='dfpzc'/> + <blocker name='cmpsceh'/> + <blocker name='pfpo'/> + <blocker name='dfphp'/> + <blocker name='dfp'/> + <blocker name='opc'/> + <blocker name='emon'/> + <blocker name='parseh'/> + <blocker name='hfpue'/> + <blocker name='hfpm'/> + <blocker name='nonqks'/> + <blocker name='ipter'/> + <blocker name='edat'/> + <blocker name='asnlxr'/> + <blocker name='deflate'/> + <blocker name='mepochptff'/> + <blocker name='msa9_pckmo'/> + <blocker name='msa9'/> + <blocker name='msa8'/> + <blocker name='msa7'/> + <blocker name='msa6'/> + <blocker name='msa2'/> + <blocker name='msa1'/> + <blocker name='gen13ptff'/> + <blocker name='tods'/> + <blocker name='type'/> + </cpu> + <cpu type='tcg' name='z14ZR1-base' typename='z14ZR1-base-s390x-cpu' usable='no'> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='dateh2'/> + <blocker name='dfppc'/> + <blocker name='tsi'/> + <blocker name='sema'/> + <blocker name='minste2'/> + <blocker name='eec'/> + <blocker name='dfpzc'/> + <blocker name='cmpsceh'/> + <blocker name='pfpo'/> + <blocker name='dfphp'/> + <blocker name='dfp'/> + <blocker name='opc'/> + <blocker name='emon'/> + <blocker name='parseh'/> + <blocker name='hfpue'/> + <blocker name='hfpm'/> + <blocker name='nonqks'/> + <blocker name='csske'/> + <blocker name='asnlxr'/> + <blocker name='gen13ptff'/> + <blocker name='tods'/> + <blocker name='type'/> + </cpu> + <cpu type='tcg' name='z14.2-base' typename='z14.2-base-s390x-cpu' usable='no'> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='dateh2'/> + <blocker name='dfppc'/> + <blocker name='tsi'/> + <blocker name='sema'/> + <blocker name='minste2'/> + <blocker name='eec'/> + <blocker name='dfpzc'/> + <blocker name='cmpsceh'/> + <blocker name='pfpo'/> + <blocker name='dfphp'/> + <blocker name='dfp'/> + <blocker name='opc'/> + <blocker name='emon'/> + <blocker name='parseh'/> + <blocker name='hfpue'/> + <blocker name='hfpm'/> + <blocker name='nonqks'/> + <blocker name='csske'/> + <blocker name='asnlxr'/> + <blocker name='gen13ptff'/> + <blocker name='tods'/> + <blocker name='type'/> + </cpu> + <cpu type='tcg' name='z900.3-base' typename='z900.3-base-s390x-cpu' usable='yes'/> + <cpu type='tcg' name='z13.2-base' typename='z13.2-base-s390x-cpu' usable='no'> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='dateh2'/> + <blocker name='dfppc'/> + <blocker name='dfpzc'/> + <blocker name='cmpsceh'/> + <blocker name='pfpo'/> + <blocker name='dfphp'/> + <blocker name='dfp'/> + <blocker name='emon'/> + <blocker name='parseh'/> + <blocker name='hfpue'/> + <blocker name='hfpm'/> + <blocker name='nonqks'/> + <blocker name='csske'/> + <blocker name='asnlxr'/> + <blocker name='gen13ptff'/> + <blocker name='tods'/> + </cpu> + <cpu type='tcg' name='z196.2-base' typename='z196.2-base-s390x-cpu' usable='no'> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='dateh2'/> + <blocker name='cmpsceh'/> + <blocker name='pfpo'/> + <blocker name='dfphp'/> + <blocker name='dfp'/> + <blocker name='emon'/> + <blocker name='parseh'/> + <blocker name='hfpue'/> + <blocker name='hfpm'/> + <blocker name='nonqks'/> + <blocker name='csske'/> + <blocker name='asnlxr'/> + <blocker name='tods'/> + </cpu> + <cpu type='tcg' name='zBC12-base' typename='zBC12-base-s390x-cpu' usable='no'> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='dateh2'/> + <blocker name='dfpzc'/> + <blocker name='cmpsceh'/> + <blocker name='pfpo'/> + <blocker name='dfphp'/> + <blocker name='dfp'/> + <blocker name='emon'/> + <blocker name='parseh'/> + <blocker name='hfpue'/> + <blocker name='hfpm'/> + <blocker name='nonqks'/> + <blocker name='csske'/> + <blocker name='asnlxr'/> + <blocker name='tods'/> + </cpu> + <cpu type='tcg' name='z9BC.2-base' typename='z9BC.2-base-s390x-cpu' usable='no'> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='dateh2'/> + <blocker name='hfpue'/> + <blocker name='hfpm'/> + <blocker name='asnlxr'/> + <blocker name='tods'/> + </cpu> + <cpu type='tcg' name='z900.2-base' typename='z900.2-base-s390x-cpu' usable='yes'/> + <cpu type='tcg' name='z9EC.3' typename='z9EC.3-s390x-cpu' usable='no'> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='cmm'/> + <blocker name='dateh2'/> + <blocker name='sthyi'/> + <blocker name='hfpue'/> + <blocker name='hfpm'/> + <blocker name='asnlxr'/> + <blocker name='msa1'/> + <blocker name='tods'/> + </cpu> + <cpu type='tcg' name='zEC12' typename='zEC12-s390x-cpu' usable='no'> + <blocker name='pcc-xts-eaes-256'/> + <blocker name='pcc-xts-eaes-128'/> + <blocker name='pcc-xts-aes-256'/> + <blocker name='pcc-xts-aes-128'/> + <blocker name='pcc-cmac-eaes-256'/> + <blocker name='pcc-cmac-eaes-192'/> + <blocker name='pcc-cmac-eaes-128'/> + <blocker name='pcc-cmac-aes-256'/> + <blocker name='pcc-cmac-aes-192'/> + <blocker name='pcc-cmac-aes-128'/> + <blocker name='pcc-cmac-etdea-192'/> + <blocker name='pcc-cmac-etdea-128'/> + <blocker name='pcc-cmac-edea'/> + <blocker name='pcc-cmac-tdea-192'/> + <blocker name='pcc-cmac-tdea-128'/> + <blocker name='pcc-cmac-dea'/> + <blocker name='kmo-eaes-256'/> + <blocker name='kmo-eaes-192'/> + <blocker name='kmo-eaes-128'/> + <blocker name='kmo-aes-256'/> + <blocker name='kmo-aes-192'/> + <blocker name='kmo-aes-128'/> + <blocker name='kmo-etdea-192'/> + <blocker name='kmo-etdea-128'/> + <blocker name='kmo-edea'/> + <blocker name='kmo-tdea-192'/> + <blocker name='kmo-tdea-128'/> + <blocker name='kmo-dea'/> + <blocker name='kmf-eaes-256'/> + <blocker name='kmf-eaes-192'/> + <blocker name='kmf-eaes-128'/> + <blocker name='kmf-aes-256'/> + <blocker name='kmf-aes-192'/> + <blocker name='kmf-aes-128'/> + <blocker name='kmf-etdea-192'/> + <blocker name='kmf-etdea-128'/> + <blocker name='kmf-edea'/> + <blocker name='kmf-tdea-192'/> + <blocker name='kmf-tdea-128'/> + <blocker name='kmf-dea'/> + <blocker name='kmctr-eaes-256'/> + <blocker name='kmctr-eaes-192'/> + <blocker name='kmctr-eaes-128'/> + <blocker name='kmctr-aes-256'/> + <blocker name='kmctr-aes-192'/> + <blocker name='kmctr-aes-128'/> + <blocker name='kmctr-etdea-192'/> + <blocker name='kmctr-etdea-128'/> + <blocker name='kmctr-edea'/> + <blocker name='kmctr-tdea-192'/> + <blocker name='kmctr-tdea-128'/> + <blocker name='kmctr-dea'/> + <blocker name='pckmo-aes-256'/> + <blocker name='pckmo-aes-192'/> + <blocker name='pckmo-aes-128'/> + <blocker name='pckmo-etdea-192'/> + <blocker name='pckmo-etdea-128'/> + <blocker name='pckmo-edea'/> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-ghash'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-xts-eaes-256'/> + <blocker name='km-xts-eaes-128'/> + <blocker name='km-xts-aes-256'/> + <blocker name='km-xts-aes-128'/> + <blocker name='km-eaes-256'/> + <blocker name='km-eaes-192'/> + <blocker name='km-eaes-128'/> + <blocker name='km-etdea-192'/> + <blocker name='km-etdea-128'/> + <blocker name='km-edea'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-eaes-256'/> + <blocker name='kmc-eaes-192'/> + <blocker name='kmc-eaes-128'/> + <blocker name='kmc-etdea-192'/> + <blocker name='kmc-etdea-128'/> + <blocker name='kmc-edea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-eaes-256'/> + <blocker name='kmac-eaes-192'/> + <blocker name='kmac-eaes-128'/> + <blocker name='kmac-aes-256'/> + <blocker name='kmac-aes-192'/> + <blocker name='kmac-aes-128'/> + <blocker name='kmac-etdea-192'/> + <blocker name='kmac-etdea-128'/> + <blocker name='kmac-edea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='cmm'/> + <blocker name='dateh2'/> + <blocker name='bpb'/> + <blocker name='ppa15'/> + <blocker name='edat2'/> + <blocker name='sthyi'/> + <blocker name='te'/> + <blocker name='ri'/> + <blocker name='cte'/> + <blocker name='dfpzc'/> + <blocker name='cmpsceh'/> + <blocker name='pfpo'/> + <blocker name='dfphp'/> + <blocker name='dfp'/> + <blocker name='emon'/> + <blocker name='parseh'/> + <blocker name='hfpue'/> + <blocker name='hfpm'/> + <blocker name='nonqks'/> + <blocker name='ipter'/> + <blocker name='csske'/> + <blocker name='edat'/> + <blocker name='asnlxr'/> + <blocker name='msa2'/> + <blocker name='msa1'/> + <blocker name='tods'/> + </cpu> + <cpu type='tcg' name='z900' typename='z900-s390x-cpu' usable='yes'/> + <cpu type='tcg' name='z114-base' typename='z114-base-s390x-cpu' usable='no'> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='dateh2'/> + <blocker name='cmpsceh'/> + <blocker name='pfpo'/> + <blocker name='dfphp'/> + <blocker name='dfp'/> + <blocker name='emon'/> + <blocker name='parseh'/> + <blocker name='hfpue'/> + <blocker name='hfpm'/> + <blocker name='nonqks'/> + <blocker name='csske'/> + <blocker name='asnlxr'/> + <blocker name='tods'/> + </cpu> + <cpu type='tcg' name='zEC12-base' typename='zEC12-base-s390x-cpu' usable='no'> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='dateh2'/> + <blocker name='dfpzc'/> + <blocker name='cmpsceh'/> + <blocker name='pfpo'/> + <blocker name='dfphp'/> + <blocker name='dfp'/> + <blocker name='emon'/> + <blocker name='parseh'/> + <blocker name='hfpue'/> + <blocker name='hfpm'/> + <blocker name='nonqks'/> + <blocker name='csske'/> + <blocker name='asnlxr'/> + <blocker name='tods'/> + </cpu> + <cpu type='tcg' name='z10EC.2' typename='z10EC.2-s390x-cpu' usable='no'> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='cmm'/> + <blocker name='dateh2'/> + <blocker name='sthyi'/> + <blocker name='pfpo'/> + <blocker name='dfphp'/> + <blocker name='dfp'/> + <blocker name='parseh'/> + <blocker name='hfpue'/> + <blocker name='hfpm'/> + <blocker name='csske'/> + <blocker name='edat'/> + <blocker name='asnlxr'/> + <blocker name='msa2'/> + <blocker name='msa1'/> + <blocker name='tods'/> + </cpu> + <cpu type='tcg' name='z10EC-base' typename='z10EC-base-s390x-cpu' usable='no'> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='dateh2'/> + <blocker name='pfpo'/> + <blocker name='dfphp'/> + <blocker name='dfp'/> + <blocker name='parseh'/> + <blocker name='hfpue'/> + <blocker name='hfpm'/> + <blocker name='csske'/> + <blocker name='asnlxr'/> + <blocker name='tods'/> + </cpu> + <cpu type='tcg' name='z900.3' typename='z900.3-s390x-cpu' usable='yes'/> + <cpu type='tcg' name='z14ZR1' typename='z14ZR1-s390x-cpu' usable='no'> + <blocker name='ppno-sha-512-drng'/> + <blocker name='pcc-xts-eaes-256'/> + <blocker name='pcc-xts-eaes-128'/> + <blocker name='pcc-xts-aes-256'/> + <blocker name='pcc-xts-aes-128'/> + <blocker name='pcc-cmac-eaes-256'/> + <blocker name='pcc-cmac-eaes-192'/> + <blocker name='pcc-cmac-eaes-128'/> + <blocker name='pcc-cmac-aes-256'/> + <blocker name='pcc-cmac-aes-192'/> + <blocker name='pcc-cmac-aes-128'/> + <blocker name='pcc-cmac-etdea-192'/> + <blocker name='pcc-cmac-etdea-128'/> + <blocker name='pcc-cmac-edea'/> + <blocker name='pcc-cmac-tdea-192'/> + <blocker name='pcc-cmac-tdea-128'/> + <blocker name='pcc-cmac-dea'/> + <blocker name='kmo-eaes-256'/> + <blocker name='kmo-eaes-192'/> + <blocker name='kmo-eaes-128'/> + <blocker name='kmo-aes-256'/> + <blocker name='kmo-aes-192'/> + <blocker name='kmo-aes-128'/> + <blocker name='kmo-etdea-192'/> + <blocker name='kmo-etdea-128'/> + <blocker name='kmo-edea'/> + <blocker name='kmo-tdea-192'/> + <blocker name='kmo-tdea-128'/> + <blocker name='kmo-dea'/> + <blocker name='kmf-eaes-256'/> + <blocker name='kmf-eaes-192'/> + <blocker name='kmf-eaes-128'/> + <blocker name='kmf-aes-256'/> + <blocker name='kmf-aes-192'/> + <blocker name='kmf-aes-128'/> + <blocker name='kmf-etdea-192'/> + <blocker name='kmf-etdea-128'/> + <blocker name='kmf-edea'/> + <blocker name='kmf-tdea-192'/> + <blocker name='kmf-tdea-128'/> + <blocker name='kmf-dea'/> + <blocker name='kmctr-eaes-256'/> + <blocker name='kmctr-eaes-192'/> + <blocker name='kmctr-eaes-128'/> + <blocker name='kmctr-aes-256'/> + <blocker name='kmctr-aes-192'/> + <blocker name='kmctr-aes-128'/> + <blocker name='kmctr-etdea-192'/> + <blocker name='kmctr-etdea-128'/> + <blocker name='kmctr-edea'/> + <blocker name='kmctr-tdea-192'/> + <blocker name='kmctr-tdea-128'/> + <blocker name='kmctr-dea'/> + <blocker name='pckmo-aes-256'/> + <blocker name='pckmo-aes-192'/> + <blocker name='pckmo-aes-128'/> + <blocker name='pckmo-etdea-192'/> + <blocker name='pckmo-etdea-128'/> + <blocker name='pckmo-edea'/> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-ghash'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-xts-eaes-256'/> + <blocker name='km-xts-eaes-128'/> + <blocker name='km-xts-aes-256'/> + <blocker name='km-xts-aes-128'/> + <blocker name='km-eaes-256'/> + <blocker name='km-eaes-192'/> + <blocker name='km-eaes-128'/> + <blocker name='km-etdea-192'/> + <blocker name='km-etdea-128'/> + <blocker name='km-edea'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-eaes-256'/> + <blocker name='kmc-eaes-192'/> + <blocker name='kmc-eaes-128'/> + <blocker name='kmc-etdea-192'/> + <blocker name='kmc-etdea-128'/> + <blocker name='kmc-edea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-eaes-256'/> + <blocker name='kmac-eaes-192'/> + <blocker name='kmac-eaes-128'/> + <blocker name='kmac-aes-256'/> + <blocker name='kmac-aes-192'/> + <blocker name='kmac-aes-128'/> + <blocker name='kmac-etdea-192'/> + <blocker name='kmac-etdea-128'/> + <blocker name='kmac-edea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='cmm'/> + <blocker name='dateh2'/> + <blocker name='mepoch'/> + <blocker name='vxeh'/> + <blocker name='vxpd'/> + <blocker name='gs'/> + <blocker name='bpb'/> + <blocker name='ppa15'/> + <blocker name='dfppc'/> + <blocker name='edat2'/> + <blocker name='sthyi'/> + <blocker name='te'/> + <blocker name='ri'/> + <blocker name='tsi'/> + <blocker name='sema'/> + <blocker name='minste2'/> + <blocker name='eec'/> + <blocker name='cte'/> + <blocker name='dfpzc'/> + <blocker name='cmpsceh'/> + <blocker name='pfpo'/> + <blocker name='dfphp'/> + <blocker name='dfp'/> + <blocker name='opc'/> + <blocker name='emon'/> + <blocker name='parseh'/> + <blocker name='hfpue'/> + <blocker name='hfpm'/> + <blocker name='nonqks'/> + <blocker name='ipter'/> + <blocker name='csske'/> + <blocker name='edat'/> + <blocker name='asnlxr'/> + <blocker name='mepochptff'/> + <blocker name='msa8'/> + <blocker name='msa7'/> + <blocker name='msa6'/> + <blocker name='msa2'/> + <blocker name='msa1'/> + <blocker name='gen13ptff'/> + <blocker name='tods'/> + <blocker name='type'/> + </cpu> + <cpu type='tcg' name='z10BC' typename='z10BC-s390x-cpu' usable='no'> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='cmm'/> + <blocker name='dateh2'/> + <blocker name='sthyi'/> + <blocker name='pfpo'/> + <blocker name='dfphp'/> + <blocker name='dfp'/> + <blocker name='parseh'/> + <blocker name='hfpue'/> + <blocker name='hfpm'/> + <blocker name='csske'/> + <blocker name='edat'/> + <blocker name='asnlxr'/> + <blocker name='msa2'/> + <blocker name='msa1'/> + <blocker name='tods'/> + </cpu> + <cpu type='tcg' name='z10BC.2-base' typename='z10BC.2-base-s390x-cpu' usable='no'> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='dateh2'/> + <blocker name='pfpo'/> + <blocker name='dfphp'/> + <blocker name='dfp'/> + <blocker name='parseh'/> + <blocker name='hfpue'/> + <blocker name='hfpm'/> + <blocker name='csske'/> + <blocker name='asnlxr'/> + <blocker name='tods'/> + </cpu> + <cpu type='tcg' name='z9BC.2' typename='z9BC.2-s390x-cpu' usable='no'> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='cmm'/> + <blocker name='dateh2'/> + <blocker name='sthyi'/> + <blocker name='hfpue'/> + <blocker name='hfpm'/> + <blocker name='asnlxr'/> + <blocker name='msa1'/> + <blocker name='tods'/> + </cpu> + <cpu type='tcg' name='z990.2' typename='z990.2-s390x-cpu' usable='no'> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='hfpm'/> + </cpu> + <cpu type='tcg' name='z990' typename='z990-s390x-cpu' usable='no'> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='hfpm'/> + </cpu> + <cpu type='tcg' name='z14' typename='z14-s390x-cpu' usable='no'> + <blocker name='ppno-sha-512-drng'/> + <blocker name='pcc-xts-eaes-256'/> + <blocker name='pcc-xts-eaes-128'/> + <blocker name='pcc-xts-aes-256'/> + <blocker name='pcc-xts-aes-128'/> + <blocker name='pcc-cmac-eaes-256'/> + <blocker name='pcc-cmac-eaes-192'/> + <blocker name='pcc-cmac-eaes-128'/> + <blocker name='pcc-cmac-aes-256'/> + <blocker name='pcc-cmac-aes-192'/> + <blocker name='pcc-cmac-aes-128'/> + <blocker name='pcc-cmac-etdea-192'/> + <blocker name='pcc-cmac-etdea-128'/> + <blocker name='pcc-cmac-edea'/> + <blocker name='pcc-cmac-tdea-192'/> + <blocker name='pcc-cmac-tdea-128'/> + <blocker name='pcc-cmac-dea'/> + <blocker name='kmo-eaes-256'/> + <blocker name='kmo-eaes-192'/> + <blocker name='kmo-eaes-128'/> + <blocker name='kmo-aes-256'/> + <blocker name='kmo-aes-192'/> + <blocker name='kmo-aes-128'/> + <blocker name='kmo-etdea-192'/> + <blocker name='kmo-etdea-128'/> + <blocker name='kmo-edea'/> + <blocker name='kmo-tdea-192'/> + <blocker name='kmo-tdea-128'/> + <blocker name='kmo-dea'/> + <blocker name='kmf-eaes-256'/> + <blocker name='kmf-eaes-192'/> + <blocker name='kmf-eaes-128'/> + <blocker name='kmf-aes-256'/> + <blocker name='kmf-aes-192'/> + <blocker name='kmf-aes-128'/> + <blocker name='kmf-etdea-192'/> + <blocker name='kmf-etdea-128'/> + <blocker name='kmf-edea'/> + <blocker name='kmf-tdea-192'/> + <blocker name='kmf-tdea-128'/> + <blocker name='kmf-dea'/> + <blocker name='kmctr-eaes-256'/> + <blocker name='kmctr-eaes-192'/> + <blocker name='kmctr-eaes-128'/> + <blocker name='kmctr-aes-256'/> + <blocker name='kmctr-aes-192'/> + <blocker name='kmctr-aes-128'/> + <blocker name='kmctr-etdea-192'/> + <blocker name='kmctr-etdea-128'/> + <blocker name='kmctr-edea'/> + <blocker name='kmctr-tdea-192'/> + <blocker name='kmctr-tdea-128'/> + <blocker name='kmctr-dea'/> + <blocker name='pckmo-aes-256'/> + <blocker name='pckmo-aes-192'/> + <blocker name='pckmo-aes-128'/> + <blocker name='pckmo-etdea-192'/> + <blocker name='pckmo-etdea-128'/> + <blocker name='pckmo-edea'/> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-ghash'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-xts-eaes-256'/> + <blocker name='km-xts-eaes-128'/> + <blocker name='km-xts-aes-256'/> + <blocker name='km-xts-aes-128'/> + <blocker name='km-eaes-256'/> + <blocker name='km-eaes-192'/> + <blocker name='km-eaes-128'/> + <blocker name='km-etdea-192'/> + <blocker name='km-etdea-128'/> + <blocker name='km-edea'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-eaes-256'/> + <blocker name='kmc-eaes-192'/> + <blocker name='kmc-eaes-128'/> + <blocker name='kmc-etdea-192'/> + <blocker name='kmc-etdea-128'/> + <blocker name='kmc-edea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-eaes-256'/> + <blocker name='kmac-eaes-192'/> + <blocker name='kmac-eaes-128'/> + <blocker name='kmac-aes-256'/> + <blocker name='kmac-aes-192'/> + <blocker name='kmac-aes-128'/> + <blocker name='kmac-etdea-192'/> + <blocker name='kmac-etdea-128'/> + <blocker name='kmac-edea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='cmm'/> + <blocker name='dateh2'/> + <blocker name='mepoch'/> + <blocker name='vxeh'/> + <blocker name='vxpd'/> + <blocker name='gs'/> + <blocker name='bpb'/> + <blocker name='ppa15'/> + <blocker name='dfppc'/> + <blocker name='edat2'/> + <blocker name='sthyi'/> + <blocker name='te'/> + <blocker name='ri'/> + <blocker name='tsi'/> + <blocker name='sema'/> + <blocker name='minste2'/> + <blocker name='eec'/> + <blocker name='cte'/> + <blocker name='dfpzc'/> + <blocker name='cmpsceh'/> + <blocker name='pfpo'/> + <blocker name='dfphp'/> + <blocker name='dfp'/> + <blocker name='opc'/> + <blocker name='emon'/> + <blocker name='parseh'/> + <blocker name='hfpue'/> + <blocker name='hfpm'/> + <blocker name='nonqks'/> + <blocker name='ipter'/> + <blocker name='csske'/> + <blocker name='edat'/> + <blocker name='asnlxr'/> + <blocker name='mepochptff'/> + <blocker name='msa8'/> + <blocker name='msa7'/> + <blocker name='msa6'/> + <blocker name='msa2'/> + <blocker name='msa1'/> + <blocker name='gen13ptff'/> + <blocker name='tods'/> + <blocker name='type'/> + </cpu> + <cpu type='tcg' name='gen15b-base' typename='gen15b-base-s390x-cpu' usable='no'> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='dateh2'/> + <blocker name='dfppc'/> + <blocker name='minste3'/> + <blocker name='tsi'/> + <blocker name='sema'/> + <blocker name='minste2'/> + <blocker name='eec'/> + <blocker name='dfpzc'/> + <blocker name='cmpsceh'/> + <blocker name='pfpo'/> + <blocker name='dfphp'/> + <blocker name='dfp'/> + <blocker name='opc'/> + <blocker name='emon'/> + <blocker name='parseh'/> + <blocker name='hfpue'/> + <blocker name='hfpm'/> + <blocker name='nonqks'/> + <blocker name='asnlxr'/> + <blocker name='gen13ptff'/> + <blocker name='tods'/> + <blocker name='type'/> + </cpu> + <cpu type='tcg' name='z990.4' typename='z990.4-s390x-cpu' usable='no'> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='hfpm'/> + </cpu> + <cpu type='tcg' name='max' typename='max-s390x-cpu' usable='yes'/> + <cpu type='tcg' name='z10EC.2-base' typename='z10EC.2-base-s390x-cpu' usable='no'> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='dateh2'/> + <blocker name='pfpo'/> + <blocker name='dfphp'/> + <blocker name='dfp'/> + <blocker name='parseh'/> + <blocker name='hfpue'/> + <blocker name='hfpm'/> + <blocker name='csske'/> + <blocker name='asnlxr'/> + <blocker name='tods'/> + </cpu> + <cpu type='tcg' name='gen15a-base' typename='gen15a-base-s390x-cpu' usable='no'> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='dateh2'/> + <blocker name='dfppc'/> + <blocker name='minste3'/> + <blocker name='tsi'/> + <blocker name='sema'/> + <blocker name='minste2'/> + <blocker name='eec'/> + <blocker name='dfpzc'/> + <blocker name='cmpsceh'/> + <blocker name='pfpo'/> + <blocker name='dfphp'/> + <blocker name='dfp'/> + <blocker name='opc'/> + <blocker name='emon'/> + <blocker name='parseh'/> + <blocker name='hfpue'/> + <blocker name='hfpm'/> + <blocker name='nonqks'/> + <blocker name='asnlxr'/> + <blocker name='gen13ptff'/> + <blocker name='tods'/> + <blocker name='type'/> + </cpu> + <cpu type='tcg' name='z800' typename='z800-s390x-cpu' usable='yes'/> + <cpu type='tcg' name='z10EC' typename='z10EC-s390x-cpu' usable='no'> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='cmm'/> + <blocker name='dateh2'/> + <blocker name='sthyi'/> + <blocker name='pfpo'/> + <blocker name='dfphp'/> + <blocker name='dfp'/> + <blocker name='parseh'/> + <blocker name='hfpue'/> + <blocker name='hfpm'/> + <blocker name='csske'/> + <blocker name='edat'/> + <blocker name='asnlxr'/> + <blocker name='msa2'/> + <blocker name='msa1'/> + <blocker name='tods'/> + </cpu> + <cpu type='tcg' name='zEC12.2' typename='zEC12.2-s390x-cpu' usable='no'> + <blocker name='pcc-xts-eaes-256'/> + <blocker name='pcc-xts-eaes-128'/> + <blocker name='pcc-xts-aes-256'/> + <blocker name='pcc-xts-aes-128'/> + <blocker name='pcc-cmac-eaes-256'/> + <blocker name='pcc-cmac-eaes-192'/> + <blocker name='pcc-cmac-eaes-128'/> + <blocker name='pcc-cmac-aes-256'/> + <blocker name='pcc-cmac-aes-192'/> + <blocker name='pcc-cmac-aes-128'/> + <blocker name='pcc-cmac-etdea-192'/> + <blocker name='pcc-cmac-etdea-128'/> + <blocker name='pcc-cmac-edea'/> + <blocker name='pcc-cmac-tdea-192'/> + <blocker name='pcc-cmac-tdea-128'/> + <blocker name='pcc-cmac-dea'/> + <blocker name='kmo-eaes-256'/> + <blocker name='kmo-eaes-192'/> + <blocker name='kmo-eaes-128'/> + <blocker name='kmo-aes-256'/> + <blocker name='kmo-aes-192'/> + <blocker name='kmo-aes-128'/> + <blocker name='kmo-etdea-192'/> + <blocker name='kmo-etdea-128'/> + <blocker name='kmo-edea'/> + <blocker name='kmo-tdea-192'/> + <blocker name='kmo-tdea-128'/> + <blocker name='kmo-dea'/> + <blocker name='kmf-eaes-256'/> + <blocker name='kmf-eaes-192'/> + <blocker name='kmf-eaes-128'/> + <blocker name='kmf-aes-256'/> + <blocker name='kmf-aes-192'/> + <blocker name='kmf-aes-128'/> + <blocker name='kmf-etdea-192'/> + <blocker name='kmf-etdea-128'/> + <blocker name='kmf-edea'/> + <blocker name='kmf-tdea-192'/> + <blocker name='kmf-tdea-128'/> + <blocker name='kmf-dea'/> + <blocker name='kmctr-eaes-256'/> + <blocker name='kmctr-eaes-192'/> + <blocker name='kmctr-eaes-128'/> + <blocker name='kmctr-aes-256'/> + <blocker name='kmctr-aes-192'/> + <blocker name='kmctr-aes-128'/> + <blocker name='kmctr-etdea-192'/> + <blocker name='kmctr-etdea-128'/> + <blocker name='kmctr-edea'/> + <blocker name='kmctr-tdea-192'/> + <blocker name='kmctr-tdea-128'/> + <blocker name='kmctr-dea'/> + <blocker name='pckmo-aes-256'/> + <blocker name='pckmo-aes-192'/> + <blocker name='pckmo-aes-128'/> + <blocker name='pckmo-etdea-192'/> + <blocker name='pckmo-etdea-128'/> + <blocker name='pckmo-edea'/> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-ghash'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-xts-eaes-256'/> + <blocker name='km-xts-eaes-128'/> + <blocker name='km-xts-aes-256'/> + <blocker name='km-xts-aes-128'/> + <blocker name='km-eaes-256'/> + <blocker name='km-eaes-192'/> + <blocker name='km-eaes-128'/> + <blocker name='km-etdea-192'/> + <blocker name='km-etdea-128'/> + <blocker name='km-edea'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-eaes-256'/> + <blocker name='kmc-eaes-192'/> + <blocker name='kmc-eaes-128'/> + <blocker name='kmc-etdea-192'/> + <blocker name='kmc-etdea-128'/> + <blocker name='kmc-edea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-eaes-256'/> + <blocker name='kmac-eaes-192'/> + <blocker name='kmac-eaes-128'/> + <blocker name='kmac-aes-256'/> + <blocker name='kmac-aes-192'/> + <blocker name='kmac-aes-128'/> + <blocker name='kmac-etdea-192'/> + <blocker name='kmac-etdea-128'/> + <blocker name='kmac-edea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='cmm'/> + <blocker name='dateh2'/> + <blocker name='bpb'/> + <blocker name='ppa15'/> + <blocker name='edat2'/> + <blocker name='sthyi'/> + <blocker name='te'/> + <blocker name='ri'/> + <blocker name='cte'/> + <blocker name='dfpzc'/> + <blocker name='cmpsceh'/> + <blocker name='pfpo'/> + <blocker name='dfphp'/> + <blocker name='dfp'/> + <blocker name='emon'/> + <blocker name='parseh'/> + <blocker name='hfpue'/> + <blocker name='hfpm'/> + <blocker name='nonqks'/> + <blocker name='ipter'/> + <blocker name='csske'/> + <blocker name='edat'/> + <blocker name='asnlxr'/> + <blocker name='msa2'/> + <blocker name='msa1'/> + <blocker name='tods'/> + </cpu> + <cpu type='tcg' name='z990.2-base' typename='z990.2-base-s390x-cpu' usable='no'> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='hfpm'/> + </cpu> + <cpu type='tcg' name='z900-base' typename='z900-base-s390x-cpu' usable='yes'/> + <cpu type='tcg' name='z10BC.2' typename='z10BC.2-s390x-cpu' usable='no'> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='cmm'/> + <blocker name='dateh2'/> + <blocker name='sthyi'/> + <blocker name='pfpo'/> + <blocker name='dfphp'/> + <blocker name='dfp'/> + <blocker name='parseh'/> + <blocker name='hfpue'/> + <blocker name='hfpm'/> + <blocker name='csske'/> + <blocker name='edat'/> + <blocker name='asnlxr'/> + <blocker name='msa2'/> + <blocker name='msa1'/> + <blocker name='tods'/> + </cpu> + <cpu type='tcg' name='z9EC-base' typename='z9EC-base-s390x-cpu' usable='no'> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='dateh2'/> + <blocker name='hfpue'/> + <blocker name='hfpm'/> + <blocker name='asnlxr'/> + <blocker name='tods'/> + </cpu> + <cpu type='tcg' name='z9EC.3-base' typename='z9EC.3-base-s390x-cpu' usable='no'> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='dateh2'/> + <blocker name='hfpue'/> + <blocker name='hfpm'/> + <blocker name='asnlxr'/> + <blocker name='tods'/> + </cpu> + <cpu type='tcg' name='z114' typename='z114-s390x-cpu' usable='no'> + <blocker name='pcc-xts-eaes-256'/> + <blocker name='pcc-xts-eaes-128'/> + <blocker name='pcc-xts-aes-256'/> + <blocker name='pcc-xts-aes-128'/> + <blocker name='pcc-cmac-eaes-256'/> + <blocker name='pcc-cmac-eaes-192'/> + <blocker name='pcc-cmac-eaes-128'/> + <blocker name='pcc-cmac-aes-256'/> + <blocker name='pcc-cmac-aes-192'/> + <blocker name='pcc-cmac-aes-128'/> + <blocker name='pcc-cmac-etdea-192'/> + <blocker name='pcc-cmac-etdea-128'/> + <blocker name='pcc-cmac-edea'/> + <blocker name='pcc-cmac-tdea-192'/> + <blocker name='pcc-cmac-tdea-128'/> + <blocker name='pcc-cmac-dea'/> + <blocker name='kmo-eaes-256'/> + <blocker name='kmo-eaes-192'/> + <blocker name='kmo-eaes-128'/> + <blocker name='kmo-aes-256'/> + <blocker name='kmo-aes-192'/> + <blocker name='kmo-aes-128'/> + <blocker name='kmo-etdea-192'/> + <blocker name='kmo-etdea-128'/> + <blocker name='kmo-edea'/> + <blocker name='kmo-tdea-192'/> + <blocker name='kmo-tdea-128'/> + <blocker name='kmo-dea'/> + <blocker name='kmf-eaes-256'/> + <blocker name='kmf-eaes-192'/> + <blocker name='kmf-eaes-128'/> + <blocker name='kmf-aes-256'/> + <blocker name='kmf-aes-192'/> + <blocker name='kmf-aes-128'/> + <blocker name='kmf-etdea-192'/> + <blocker name='kmf-etdea-128'/> + <blocker name='kmf-edea'/> + <blocker name='kmf-tdea-192'/> + <blocker name='kmf-tdea-128'/> + <blocker name='kmf-dea'/> + <blocker name='kmctr-eaes-256'/> + <blocker name='kmctr-eaes-192'/> + <blocker name='kmctr-eaes-128'/> + <blocker name='kmctr-aes-256'/> + <blocker name='kmctr-aes-192'/> + <blocker name='kmctr-aes-128'/> + <blocker name='kmctr-etdea-192'/> + <blocker name='kmctr-etdea-128'/> + <blocker name='kmctr-edea'/> + <blocker name='kmctr-tdea-192'/> + <blocker name='kmctr-tdea-128'/> + <blocker name='kmctr-dea'/> + <blocker name='pckmo-aes-256'/> + <blocker name='pckmo-aes-192'/> + <blocker name='pckmo-aes-128'/> + <blocker name='pckmo-etdea-192'/> + <blocker name='pckmo-etdea-128'/> + <blocker name='pckmo-edea'/> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-ghash'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-xts-eaes-256'/> + <blocker name='km-xts-eaes-128'/> + <blocker name='km-xts-aes-256'/> + <blocker name='km-xts-aes-128'/> + <blocker name='km-eaes-256'/> + <blocker name='km-eaes-192'/> + <blocker name='km-eaes-128'/> + <blocker name='km-etdea-192'/> + <blocker name='km-etdea-128'/> + <blocker name='km-edea'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-eaes-256'/> + <blocker name='kmc-eaes-192'/> + <blocker name='kmc-eaes-128'/> + <blocker name='kmc-etdea-192'/> + <blocker name='kmc-etdea-128'/> + <blocker name='kmc-edea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-eaes-256'/> + <blocker name='kmac-eaes-192'/> + <blocker name='kmac-eaes-128'/> + <blocker name='kmac-aes-256'/> + <blocker name='kmac-aes-192'/> + <blocker name='kmac-aes-128'/> + <blocker name='kmac-etdea-192'/> + <blocker name='kmac-etdea-128'/> + <blocker name='kmac-edea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='cmm'/> + <blocker name='dateh2'/> + <blocker name='bpb'/> + <blocker name='ppa15'/> + <blocker name='sthyi'/> + <blocker name='cmpsceh'/> + <blocker name='pfpo'/> + <blocker name='dfphp'/> + <blocker name='dfp'/> + <blocker name='emon'/> + <blocker name='parseh'/> + <blocker name='hfpue'/> + <blocker name='hfpm'/> + <blocker name='nonqks'/> + <blocker name='ipter'/> + <blocker name='csske'/> + <blocker name='edat'/> + <blocker name='asnlxr'/> + <blocker name='msa2'/> + <blocker name='msa1'/> + <blocker name='tods'/> + </cpu> + <cpu type='tcg' name='z890.3' typename='z890.3-s390x-cpu' usable='no'> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='hfpm'/> + </cpu> + <cpu type='tcg' name='z196-base' typename='z196-base-s390x-cpu' usable='no'> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='dateh2'/> + <blocker name='cmpsceh'/> + <blocker name='pfpo'/> + <blocker name='dfphp'/> + <blocker name='dfp'/> + <blocker name='emon'/> + <blocker name='parseh'/> + <blocker name='hfpue'/> + <blocker name='hfpm'/> + <blocker name='nonqks'/> + <blocker name='csske'/> + <blocker name='asnlxr'/> + <blocker name='tods'/> + </cpu> + <cpu type='tcg' name='z9EC.2-base' typename='z9EC.2-base-s390x-cpu' usable='no'> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='dateh2'/> + <blocker name='hfpue'/> + <blocker name='hfpm'/> + <blocker name='asnlxr'/> + <blocker name='tods'/> + </cpu> + <cpu type='tcg' name='z196.2' typename='z196.2-s390x-cpu' usable='no'> + <blocker name='pcc-xts-eaes-256'/> + <blocker name='pcc-xts-eaes-128'/> + <blocker name='pcc-xts-aes-256'/> + <blocker name='pcc-xts-aes-128'/> + <blocker name='pcc-cmac-eaes-256'/> + <blocker name='pcc-cmac-eaes-192'/> + <blocker name='pcc-cmac-eaes-128'/> + <blocker name='pcc-cmac-aes-256'/> + <blocker name='pcc-cmac-aes-192'/> + <blocker name='pcc-cmac-aes-128'/> + <blocker name='pcc-cmac-etdea-192'/> + <blocker name='pcc-cmac-etdea-128'/> + <blocker name='pcc-cmac-edea'/> + <blocker name='pcc-cmac-tdea-192'/> + <blocker name='pcc-cmac-tdea-128'/> + <blocker name='pcc-cmac-dea'/> + <blocker name='kmo-eaes-256'/> + <blocker name='kmo-eaes-192'/> + <blocker name='kmo-eaes-128'/> + <blocker name='kmo-aes-256'/> + <blocker name='kmo-aes-192'/> + <blocker name='kmo-aes-128'/> + <blocker name='kmo-etdea-192'/> + <blocker name='kmo-etdea-128'/> + <blocker name='kmo-edea'/> + <blocker name='kmo-tdea-192'/> + <blocker name='kmo-tdea-128'/> + <blocker name='kmo-dea'/> + <blocker name='kmf-eaes-256'/> + <blocker name='kmf-eaes-192'/> + <blocker name='kmf-eaes-128'/> + <blocker name='kmf-aes-256'/> + <blocker name='kmf-aes-192'/> + <blocker name='kmf-aes-128'/> + <blocker name='kmf-etdea-192'/> + <blocker name='kmf-etdea-128'/> + <blocker name='kmf-edea'/> + <blocker name='kmf-tdea-192'/> + <blocker name='kmf-tdea-128'/> + <blocker name='kmf-dea'/> + <blocker name='kmctr-eaes-256'/> + <blocker name='kmctr-eaes-192'/> + <blocker name='kmctr-eaes-128'/> + <blocker name='kmctr-aes-256'/> + <blocker name='kmctr-aes-192'/> + <blocker name='kmctr-aes-128'/> + <blocker name='kmctr-etdea-192'/> + <blocker name='kmctr-etdea-128'/> + <blocker name='kmctr-edea'/> + <blocker name='kmctr-tdea-192'/> + <blocker name='kmctr-tdea-128'/> + <blocker name='kmctr-dea'/> + <blocker name='pckmo-aes-256'/> + <blocker name='pckmo-aes-192'/> + <blocker name='pckmo-aes-128'/> + <blocker name='pckmo-etdea-192'/> + <blocker name='pckmo-etdea-128'/> + <blocker name='pckmo-edea'/> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-ghash'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-xts-eaes-256'/> + <blocker name='km-xts-eaes-128'/> + <blocker name='km-xts-aes-256'/> + <blocker name='km-xts-aes-128'/> + <blocker name='km-eaes-256'/> + <blocker name='km-eaes-192'/> + <blocker name='km-eaes-128'/> + <blocker name='km-etdea-192'/> + <blocker name='km-etdea-128'/> + <blocker name='km-edea'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-eaes-256'/> + <blocker name='kmc-eaes-192'/> + <blocker name='kmc-eaes-128'/> + <blocker name='kmc-etdea-192'/> + <blocker name='kmc-etdea-128'/> + <blocker name='kmc-edea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-eaes-256'/> + <blocker name='kmac-eaes-192'/> + <blocker name='kmac-eaes-128'/> + <blocker name='kmac-aes-256'/> + <blocker name='kmac-aes-192'/> + <blocker name='kmac-aes-128'/> + <blocker name='kmac-etdea-192'/> + <blocker name='kmac-etdea-128'/> + <blocker name='kmac-edea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='cmm'/> + <blocker name='dateh2'/> + <blocker name='bpb'/> + <blocker name='ppa15'/> + <blocker name='sthyi'/> + <blocker name='cmpsceh'/> + <blocker name='pfpo'/> + <blocker name='dfphp'/> + <blocker name='dfp'/> + <blocker name='emon'/> + <blocker name='parseh'/> + <blocker name='hfpue'/> + <blocker name='hfpm'/> + <blocker name='nonqks'/> + <blocker name='ipter'/> + <blocker name='csske'/> + <blocker name='edat'/> + <blocker name='asnlxr'/> + <blocker name='msa2'/> + <blocker name='msa1'/> + <blocker name='tods'/> + </cpu> + <cpu type='tcg' name='z14.2' typename='z14.2-s390x-cpu' usable='no'> + <blocker name='ppno-sha-512-drng'/> + <blocker name='pcc-xts-eaes-256'/> + <blocker name='pcc-xts-eaes-128'/> + <blocker name='pcc-xts-aes-256'/> + <blocker name='pcc-xts-aes-128'/> + <blocker name='pcc-cmac-eaes-256'/> + <blocker name='pcc-cmac-eaes-192'/> + <blocker name='pcc-cmac-eaes-128'/> + <blocker name='pcc-cmac-aes-256'/> + <blocker name='pcc-cmac-aes-192'/> + <blocker name='pcc-cmac-aes-128'/> + <blocker name='pcc-cmac-etdea-192'/> + <blocker name='pcc-cmac-etdea-128'/> + <blocker name='pcc-cmac-edea'/> + <blocker name='pcc-cmac-tdea-192'/> + <blocker name='pcc-cmac-tdea-128'/> + <blocker name='pcc-cmac-dea'/> + <blocker name='kmo-eaes-256'/> + <blocker name='kmo-eaes-192'/> + <blocker name='kmo-eaes-128'/> + <blocker name='kmo-aes-256'/> + <blocker name='kmo-aes-192'/> + <blocker name='kmo-aes-128'/> + <blocker name='kmo-etdea-192'/> + <blocker name='kmo-etdea-128'/> + <blocker name='kmo-edea'/> + <blocker name='kmo-tdea-192'/> + <blocker name='kmo-tdea-128'/> + <blocker name='kmo-dea'/> + <blocker name='kmf-eaes-256'/> + <blocker name='kmf-eaes-192'/> + <blocker name='kmf-eaes-128'/> + <blocker name='kmf-aes-256'/> + <blocker name='kmf-aes-192'/> + <blocker name='kmf-aes-128'/> + <blocker name='kmf-etdea-192'/> + <blocker name='kmf-etdea-128'/> + <blocker name='kmf-edea'/> + <blocker name='kmf-tdea-192'/> + <blocker name='kmf-tdea-128'/> + <blocker name='kmf-dea'/> + <blocker name='kmctr-eaes-256'/> + <blocker name='kmctr-eaes-192'/> + <blocker name='kmctr-eaes-128'/> + <blocker name='kmctr-aes-256'/> + <blocker name='kmctr-aes-192'/> + <blocker name='kmctr-aes-128'/> + <blocker name='kmctr-etdea-192'/> + <blocker name='kmctr-etdea-128'/> + <blocker name='kmctr-edea'/> + <blocker name='kmctr-tdea-192'/> + <blocker name='kmctr-tdea-128'/> + <blocker name='kmctr-dea'/> + <blocker name='pckmo-aes-256'/> + <blocker name='pckmo-aes-192'/> + <blocker name='pckmo-aes-128'/> + <blocker name='pckmo-etdea-192'/> + <blocker name='pckmo-etdea-128'/> + <blocker name='pckmo-edea'/> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-ghash'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-xts-eaes-256'/> + <blocker name='km-xts-eaes-128'/> + <blocker name='km-xts-aes-256'/> + <blocker name='km-xts-aes-128'/> + <blocker name='km-eaes-256'/> + <blocker name='km-eaes-192'/> + <blocker name='km-eaes-128'/> + <blocker name='km-etdea-192'/> + <blocker name='km-etdea-128'/> + <blocker name='km-edea'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-eaes-256'/> + <blocker name='kmc-eaes-192'/> + <blocker name='kmc-eaes-128'/> + <blocker name='kmc-etdea-192'/> + <blocker name='kmc-etdea-128'/> + <blocker name='kmc-edea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-eaes-256'/> + <blocker name='kmac-eaes-192'/> + <blocker name='kmac-eaes-128'/> + <blocker name='kmac-aes-256'/> + <blocker name='kmac-aes-192'/> + <blocker name='kmac-aes-128'/> + <blocker name='kmac-etdea-192'/> + <blocker name='kmac-etdea-128'/> + <blocker name='kmac-edea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='cmm'/> + <blocker name='dateh2'/> + <blocker name='mepoch'/> + <blocker name='vxeh'/> + <blocker name='vxpd'/> + <blocker name='gs'/> + <blocker name='bpb'/> + <blocker name='ppa15'/> + <blocker name='dfppc'/> + <blocker name='edat2'/> + <blocker name='sthyi'/> + <blocker name='te'/> + <blocker name='ri'/> + <blocker name='tsi'/> + <blocker name='sema'/> + <blocker name='minste2'/> + <blocker name='eec'/> + <blocker name='cte'/> + <blocker name='dfpzc'/> + <blocker name='cmpsceh'/> + <blocker name='pfpo'/> + <blocker name='dfphp'/> + <blocker name='dfp'/> + <blocker name='opc'/> + <blocker name='emon'/> + <blocker name='parseh'/> + <blocker name='hfpue'/> + <blocker name='hfpm'/> + <blocker name='nonqks'/> + <blocker name='ipter'/> + <blocker name='csske'/> + <blocker name='edat'/> + <blocker name='asnlxr'/> + <blocker name='mepochptff'/> + <blocker name='msa8'/> + <blocker name='msa7'/> + <blocker name='msa6'/> + <blocker name='msa2'/> + <blocker name='msa1'/> + <blocker name='gen13ptff'/> + <blocker name='tods'/> + <blocker name='type'/> + </cpu> + <cpu type='tcg' name='z990-base' typename='z990-base-s390x-cpu' usable='no'> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='hfpm'/> + </cpu> + <cpu type='tcg' name='z900.2' typename='z900.2-s390x-cpu' usable='yes'/> + <cpu type='tcg' name='z890-base' typename='z890-base-s390x-cpu' usable='no'> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='hfpm'/> + </cpu> + <cpu type='tcg' name='z10EC.3' typename='z10EC.3-s390x-cpu' usable='no'> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='cmm'/> + <blocker name='dateh2'/> + <blocker name='sthyi'/> + <blocker name='pfpo'/> + <blocker name='dfphp'/> + <blocker name='dfp'/> + <blocker name='parseh'/> + <blocker name='hfpue'/> + <blocker name='hfpm'/> + <blocker name='csske'/> + <blocker name='edat'/> + <blocker name='asnlxr'/> + <blocker name='msa2'/> + <blocker name='msa1'/> + <blocker name='tods'/> + </cpu> + <cpu type='tcg' name='z14-base' typename='z14-base-s390x-cpu' usable='no'> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='dateh2'/> + <blocker name='dfppc'/> + <blocker name='tsi'/> + <blocker name='sema'/> + <blocker name='minste2'/> + <blocker name='eec'/> + <blocker name='dfpzc'/> + <blocker name='cmpsceh'/> + <blocker name='pfpo'/> + <blocker name='dfphp'/> + <blocker name='dfp'/> + <blocker name='opc'/> + <blocker name='emon'/> + <blocker name='parseh'/> + <blocker name='hfpue'/> + <blocker name='hfpm'/> + <blocker name='nonqks'/> + <blocker name='csske'/> + <blocker name='asnlxr'/> + <blocker name='gen13ptff'/> + <blocker name='tods'/> + <blocker name='type'/> + </cpu> + <cpu type='tcg' name='z990.4-base' typename='z990.4-base-s390x-cpu' usable='no'> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='hfpm'/> + </cpu> + <cpu type='tcg' name='z10EC.3-base' typename='z10EC.3-base-s390x-cpu' usable='no'> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='dateh2'/> + <blocker name='pfpo'/> + <blocker name='dfphp'/> + <blocker name='dfp'/> + <blocker name='parseh'/> + <blocker name='hfpue'/> + <blocker name='hfpm'/> + <blocker name='csske'/> + <blocker name='asnlxr'/> + <blocker name='tods'/> + </cpu> + <cpu type='tcg' name='z10BC-base' typename='z10BC-base-s390x-cpu' usable='no'> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='dateh2'/> + <blocker name='pfpo'/> + <blocker name='dfphp'/> + <blocker name='dfp'/> + <blocker name='parseh'/> + <blocker name='hfpue'/> + <blocker name='hfpm'/> + <blocker name='csske'/> + <blocker name='asnlxr'/> + <blocker name='tods'/> + </cpu> + <cpu type='tcg' name='z13-base' typename='z13-base-s390x-cpu' usable='no'> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='dateh2'/> + <blocker name='dfppc'/> + <blocker name='dfpzc'/> + <blocker name='cmpsceh'/> + <blocker name='pfpo'/> + <blocker name='dfphp'/> + <blocker name='dfp'/> + <blocker name='emon'/> + <blocker name='parseh'/> + <blocker name='hfpue'/> + <blocker name='hfpm'/> + <blocker name='nonqks'/> + <blocker name='csske'/> + <blocker name='asnlxr'/> + <blocker name='gen13ptff'/> + <blocker name='tods'/> + </cpu> + <cpu type='tcg' name='z990.3-base' typename='z990.3-base-s390x-cpu' usable='no'> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='hfpm'/> + </cpu> + <cpu type='tcg' name='zEC12.2-base' typename='zEC12.2-base-s390x-cpu' usable='no'> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='dateh2'/> + <blocker name='dfpzc'/> + <blocker name='cmpsceh'/> + <blocker name='pfpo'/> + <blocker name='dfphp'/> + <blocker name='dfp'/> + <blocker name='emon'/> + <blocker name='parseh'/> + <blocker name='hfpue'/> + <blocker name='hfpm'/> + <blocker name='nonqks'/> + <blocker name='csske'/> + <blocker name='asnlxr'/> + <blocker name='tods'/> + </cpu> + <cpu type='tcg' name='zBC12' typename='zBC12-s390x-cpu' usable='no'> + <blocker name='pcc-xts-eaes-256'/> + <blocker name='pcc-xts-eaes-128'/> + <blocker name='pcc-xts-aes-256'/> + <blocker name='pcc-xts-aes-128'/> + <blocker name='pcc-cmac-eaes-256'/> + <blocker name='pcc-cmac-eaes-192'/> + <blocker name='pcc-cmac-eaes-128'/> + <blocker name='pcc-cmac-aes-256'/> + <blocker name='pcc-cmac-aes-192'/> + <blocker name='pcc-cmac-aes-128'/> + <blocker name='pcc-cmac-etdea-192'/> + <blocker name='pcc-cmac-etdea-128'/> + <blocker name='pcc-cmac-edea'/> + <blocker name='pcc-cmac-tdea-192'/> + <blocker name='pcc-cmac-tdea-128'/> + <blocker name='pcc-cmac-dea'/> + <blocker name='kmo-eaes-256'/> + <blocker name='kmo-eaes-192'/> + <blocker name='kmo-eaes-128'/> + <blocker name='kmo-aes-256'/> + <blocker name='kmo-aes-192'/> + <blocker name='kmo-aes-128'/> + <blocker name='kmo-etdea-192'/> + <blocker name='kmo-etdea-128'/> + <blocker name='kmo-edea'/> + <blocker name='kmo-tdea-192'/> + <blocker name='kmo-tdea-128'/> + <blocker name='kmo-dea'/> + <blocker name='kmf-eaes-256'/> + <blocker name='kmf-eaes-192'/> + <blocker name='kmf-eaes-128'/> + <blocker name='kmf-aes-256'/> + <blocker name='kmf-aes-192'/> + <blocker name='kmf-aes-128'/> + <blocker name='kmf-etdea-192'/> + <blocker name='kmf-etdea-128'/> + <blocker name='kmf-edea'/> + <blocker name='kmf-tdea-192'/> + <blocker name='kmf-tdea-128'/> + <blocker name='kmf-dea'/> + <blocker name='kmctr-eaes-256'/> + <blocker name='kmctr-eaes-192'/> + <blocker name='kmctr-eaes-128'/> + <blocker name='kmctr-aes-256'/> + <blocker name='kmctr-aes-192'/> + <blocker name='kmctr-aes-128'/> + <blocker name='kmctr-etdea-192'/> + <blocker name='kmctr-etdea-128'/> + <blocker name='kmctr-edea'/> + <blocker name='kmctr-tdea-192'/> + <blocker name='kmctr-tdea-128'/> + <blocker name='kmctr-dea'/> + <blocker name='pckmo-aes-256'/> + <blocker name='pckmo-aes-192'/> + <blocker name='pckmo-aes-128'/> + <blocker name='pckmo-etdea-192'/> + <blocker name='pckmo-etdea-128'/> + <blocker name='pckmo-edea'/> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-ghash'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-xts-eaes-256'/> + <blocker name='km-xts-eaes-128'/> + <blocker name='km-xts-aes-256'/> + <blocker name='km-xts-aes-128'/> + <blocker name='km-eaes-256'/> + <blocker name='km-eaes-192'/> + <blocker name='km-eaes-128'/> + <blocker name='km-etdea-192'/> + <blocker name='km-etdea-128'/> + <blocker name='km-edea'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-eaes-256'/> + <blocker name='kmc-eaes-192'/> + <blocker name='kmc-eaes-128'/> + <blocker name='kmc-etdea-192'/> + <blocker name='kmc-etdea-128'/> + <blocker name='kmc-edea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-eaes-256'/> + <blocker name='kmac-eaes-192'/> + <blocker name='kmac-eaes-128'/> + <blocker name='kmac-aes-256'/> + <blocker name='kmac-aes-192'/> + <blocker name='kmac-aes-128'/> + <blocker name='kmac-etdea-192'/> + <blocker name='kmac-etdea-128'/> + <blocker name='kmac-edea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='cmm'/> + <blocker name='dateh2'/> + <blocker name='bpb'/> + <blocker name='ppa15'/> + <blocker name='edat2'/> + <blocker name='sthyi'/> + <blocker name='te'/> + <blocker name='ri'/> + <blocker name='cte'/> + <blocker name='dfpzc'/> + <blocker name='cmpsceh'/> + <blocker name='pfpo'/> + <blocker name='dfphp'/> + <blocker name='dfp'/> + <blocker name='emon'/> + <blocker name='parseh'/> + <blocker name='hfpue'/> + <blocker name='hfpm'/> + <blocker name='nonqks'/> + <blocker name='ipter'/> + <blocker name='csske'/> + <blocker name='edat'/> + <blocker name='asnlxr'/> + <blocker name='msa2'/> + <blocker name='msa1'/> + <blocker name='tods'/> + </cpu> + <cpu type='tcg' name='z890.3-base' typename='z890.3-base-s390x-cpu' usable='no'> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='hfpm'/> + </cpu> + <cpu type='tcg' name='z990.5' typename='z990.5-s390x-cpu' usable='no'> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='hfpm'/> + </cpu> + <cpu type='tcg' name='gen15b' typename='gen15b-s390x-cpu' usable='no'> + <blocker name='ppno-sha-512-drng'/> + <blocker name='pcc-xts-eaes-256'/> + <blocker name='pcc-xts-eaes-128'/> + <blocker name='pcc-xts-aes-256'/> + <blocker name='pcc-xts-aes-128'/> + <blocker name='pcc-cmac-eaes-256'/> + <blocker name='pcc-cmac-eaes-192'/> + <blocker name='pcc-cmac-eaes-128'/> + <blocker name='pcc-cmac-aes-256'/> + <blocker name='pcc-cmac-aes-192'/> + <blocker name='pcc-cmac-aes-128'/> + <blocker name='pcc-cmac-etdea-192'/> + <blocker name='pcc-cmac-etdea-128'/> + <blocker name='pcc-cmac-edea'/> + <blocker name='pcc-cmac-tdea-192'/> + <blocker name='pcc-cmac-tdea-128'/> + <blocker name='pcc-cmac-dea'/> + <blocker name='kmo-eaes-256'/> + <blocker name='kmo-eaes-192'/> + <blocker name='kmo-eaes-128'/> + <blocker name='kmo-aes-256'/> + <blocker name='kmo-aes-192'/> + <blocker name='kmo-aes-128'/> + <blocker name='kmo-etdea-192'/> + <blocker name='kmo-etdea-128'/> + <blocker name='kmo-edea'/> + <blocker name='kmo-tdea-192'/> + <blocker name='kmo-tdea-128'/> + <blocker name='kmo-dea'/> + <blocker name='kmf-eaes-256'/> + <blocker name='kmf-eaes-192'/> + <blocker name='kmf-eaes-128'/> + <blocker name='kmf-aes-256'/> + <blocker name='kmf-aes-192'/> + <blocker name='kmf-aes-128'/> + <blocker name='kmf-etdea-192'/> + <blocker name='kmf-etdea-128'/> + <blocker name='kmf-edea'/> + <blocker name='kmf-tdea-192'/> + <blocker name='kmf-tdea-128'/> + <blocker name='kmf-dea'/> + <blocker name='kmctr-eaes-256'/> + <blocker name='kmctr-eaes-192'/> + <blocker name='kmctr-eaes-128'/> + <blocker name='kmctr-aes-256'/> + <blocker name='kmctr-aes-192'/> + <blocker name='kmctr-aes-128'/> + <blocker name='kmctr-etdea-192'/> + <blocker name='kmctr-etdea-128'/> + <blocker name='kmctr-edea'/> + <blocker name='kmctr-tdea-192'/> + <blocker name='kmctr-tdea-128'/> + <blocker name='kmctr-dea'/> + <blocker name='pckmo-aes-256'/> + <blocker name='pckmo-aes-192'/> + <blocker name='pckmo-aes-128'/> + <blocker name='pckmo-etdea-192'/> + <blocker name='pckmo-etdea-128'/> + <blocker name='pckmo-edea'/> + <blocker name='klmd-sha-1'/> + <blocker name='kimd-ghash'/> + <blocker name='kimd-sha-1'/> + <blocker name='km-xts-eaes-256'/> + <blocker name='km-xts-eaes-128'/> + <blocker name='km-xts-aes-256'/> + <blocker name='km-xts-aes-128'/> + <blocker name='km-eaes-256'/> + <blocker name='km-eaes-192'/> + <blocker name='km-eaes-128'/> + <blocker name='km-etdea-192'/> + <blocker name='km-etdea-128'/> + <blocker name='km-edea'/> + <blocker name='km-tdea-192'/> + <blocker name='km-tdea-128'/> + <blocker name='km-dea'/> + <blocker name='kmc-eaes-256'/> + <blocker name='kmc-eaes-192'/> + <blocker name='kmc-eaes-128'/> + <blocker name='kmc-etdea-192'/> + <blocker name='kmc-etdea-128'/> + <blocker name='kmc-edea'/> + <blocker name='kmc-tdea-192'/> + <blocker name='kmc-tdea-128'/> + <blocker name='kmc-dea'/> + <blocker name='kmac-eaes-256'/> + <blocker name='kmac-eaes-192'/> + <blocker name='kmac-eaes-128'/> + <blocker name='kmac-aes-256'/> + <blocker name='kmac-aes-192'/> + <blocker name='kmac-aes-128'/> + <blocker name='kmac-etdea-192'/> + <blocker name='kmac-etdea-128'/> + <blocker name='kmac-edea'/> + <blocker name='kmac-tdea-192'/> + <blocker name='kmac-tdea-128'/> + <blocker name='kmac-dea'/> + <blocker name='cmm'/> + <blocker name='dateh2'/> + <blocker name='etoken'/> + <blocker name='vxpdeh'/> + <blocker name='vxeh2'/> + <blocker name='mepoch'/> + <blocker name='vxeh'/> + <blocker name='vxpd'/> + <blocker name='gs'/> + <blocker name='ppa15'/> + <blocker name='dfppc'/> + <blocker name='edat2'/> + <blocker name='sthyi'/> + <blocker name='te'/> + <blocker name='ri'/> + <blocker name='minste3'/> + <blocker name='tsi'/> + <blocker name='sema'/> + <blocker name='minste2'/> + <blocker name='eec'/> + <blocker name='cte'/> + <blocker name='dfpzc'/> + <blocker name='cmpsceh'/> + <blocker name='pfpo'/> + <blocker name='dfphp'/> + <blocker name='dfp'/> + <blocker name='opc'/> + <blocker name='emon'/> + <blocker name='parseh'/> + <blocker name='hfpue'/> + <blocker name='hfpm'/> + <blocker name='nonqks'/> + <blocker name='ipter'/> + <blocker name='edat'/> + <blocker name='asnlxr'/> + <blocker name='deflate'/> + <blocker name='mepochptff'/> + <blocker name='msa9_pckmo'/> + <blocker name='msa9'/> + <blocker name='msa8'/> + <blocker name='msa7'/> + <blocker name='msa6'/> + <blocker name='msa2'/> + <blocker name='msa1'/> + <blocker name='gen13ptff'/> + <blocker name='tods'/> + <blocker name='type'/> + </cpu> + <cpu type='tcg' name='qemu' typename='qemu-s390x-cpu' usable='yes'/> + <machine type='tcg' name='s390-ccw-virtio-5.1' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes' defaultCPU='qemu-s390x-cpu'/> + <machine type='tcg' name='s390-ccw-virtio-4.0' hotplugCpus='yes' maxCpus='248' defaultCPU='qemu-s390x-cpu'/> + <machine type='tcg' name='s390-ccw-virtio-3.1' hotplugCpus='yes' maxCpus='248' defaultCPU='qemu-s390x-cpu'/> + <machine type='tcg' name='s390-ccw-virtio-2.6' hotplugCpus='yes' maxCpus='248' defaultCPU='qemu-s390x-cpu'/> + <machine type='tcg' name='s390-ccw-virtio-2.12' hotplugCpus='yes' maxCpus='248' defaultCPU='qemu-s390x-cpu'/> + <machine type='tcg' name='s390-ccw-virtio-2.9' hotplugCpus='yes' maxCpus='248' defaultCPU='qemu-s390x-cpu'/> + <machine type='tcg' name='s390-ccw-virtio-3.0' hotplugCpus='yes' maxCpus='248' defaultCPU='qemu-s390x-cpu'/> + <machine type='tcg' name='s390-ccw-virtio-4.2' hotplugCpus='yes' maxCpus='248' defaultCPU='qemu-s390x-cpu'/> + <machine type='tcg' name='s390-ccw-virtio-2.5' hotplugCpus='yes' maxCpus='248' defaultCPU='qemu-s390x-cpu'/> + <machine type='tcg' name='s390-ccw-virtio-2.11' hotplugCpus='yes' maxCpus='248' defaultCPU='qemu-s390x-cpu'/> + <machine type='tcg' name='s390-ccw-virtio-2.8' hotplugCpus='yes' maxCpus='248' defaultCPU='qemu-s390x-cpu'/> + <machine type='tcg' name='s390-ccw-virtio-5.0' hotplugCpus='yes' maxCpus='248' defaultCPU='qemu-s390x-cpu'/> + <machine type='tcg' name='s390-ccw-virtio-4.1' hotplugCpus='yes' maxCpus='248' defaultCPU='qemu-s390x-cpu'/> + <machine type='tcg' name='s390-ccw-virtio-2.4' hotplugCpus='yes' maxCpus='248' defaultCPU='qemu-s390x-cpu'/> + <machine type='tcg' name='s390-ccw-virtio-2.10' hotplugCpus='yes' maxCpus='248' defaultCPU='qemu-s390x-cpu'/> + <machine type='tcg' name='s390-ccw-virtio-2.7' hotplugCpus='yes' maxCpus='248' defaultCPU='qemu-s390x-cpu'/> +</qemuCaps> diff --git a/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args b/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args index 47818085..fa81a7aa 100644 --- a/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args +++ b/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args @@ -17,7 +17,7 @@ file=/tmp/lib/domain--1-default-video-type-s/master-key.aes \ msa8=on,msa7=on,msa6=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,sthyi=on,\ edat=on,ri=on,deflate=on,edat2=on,etoken=on,vx=on,ipter=on,mepochptff=on,ap=on,\ vxeh=on,vxpd=on,esop=on,msa9_pckmo=on,vxeh2=on,esort=on,apqi=on,apft=on,iep=on,\ -apqci=on,cte=on,bpb=on,gs=on,ppa15=on,zpci=on,sea_esop2=on,te=on,cmm=on \ +apqci=on,cte=on,ais=on,bpb=on,gs=on,ppa15=on,zpci=on,sea_esop2=on,te=on,cmm=on \ -m 1024 \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args b/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args index 414ffdba..ee0a08e8 100644 --- a/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args +++ b/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args @@ -32,24 +32,24 @@ file=/tmp/lib/domain--1-guest/master-key.aes \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,\ "cache":{"direct":true,"no-flush":false},"driver":"qcow2",\ "file":"libvirt-3-storage"}' \ --device virtio-blk-ccw,scsi=off,devno=fe.0.0000,drive=libvirt-3-format,\ -id=virtio-disk0,bootindex=1,write-cache=on,werror=stop,rerror=stop \ +-device virtio-blk-ccw,devno=fe.0.0000,drive=libvirt-3-format,id=virtio-disk0,\ +bootindex=1,write-cache=on,werror=stop,rerror=stop \ -blockdev '{"driver":"file","filename":"/var/images/image2",\ "node-name":"libvirt-2-storage","cache":{"direct":true,"no-flush":false},\ "auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,\ "cache":{"direct":true,"no-flush":false},"driver":"qcow2",\ "file":"libvirt-2-storage"}' \ --device virtio-blk-ccw,scsi=off,devno=fe.0.0001,drive=libvirt-2-format,\ -id=virtio-disk1,write-cache=on,werror=enospc \ +-device virtio-blk-ccw,devno=fe.0.0001,drive=libvirt-2-format,id=virtio-disk1,\ +write-cache=on,werror=enospc \ -blockdev '{"driver":"file","filename":"/var/images/image3",\ "node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},\ "auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,\ "cache":{"direct":true,"no-flush":false},"driver":"qcow2",\ "file":"libvirt-1-storage"}' \ --device virtio-blk-ccw,scsi=off,devno=fe.0.0002,drive=libvirt-1-format,\ -id=virtio-disk2,write-cache=on,werror=report,rerror=ignore \ +-device virtio-blk-ccw,devno=fe.0.0002,drive=libvirt-1-format,id=virtio-disk2,\ +write-cache=on,werror=report,rerror=ignore \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args b/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args index 50d4bc42..500cc0ad 100644 --- a/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args +++ b/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args @@ -30,8 +30,8 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw",\ "file":"libvirt-1-storage"}' \ --device virtio-blk-ccw,scsi=off,devno=fe.0.0000,drive=libvirt-1-format,\ -id=virtio-disk0,bootindex=1 \ +-device virtio-blk-ccw,devno=fe.0.0000,drive=libvirt-1-format,id=virtio-disk0,\ +bootindex=1 \ -fsdev local,security_model=passthrough,id=fsdev-fs0,path=/export/to/guest \ -device virtio-9p-ccw,id=fs0,fsdev=fsdev-fs0,mount_tag=/import/from/host,\ devno=fe.0.0001 \ diff --git a/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args b/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args index 20288f2a..ca343cbe 100644 --- a/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args +++ b/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args @@ -33,7 +33,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ "node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw",\ "file":"libvirt-2-storage"}' \ --device virtio-blk-ccw,iothread=iothread1,scsi=off,devno=fe.0.0000,\ +-device virtio-blk-ccw,iothread=iothread1,devno=fe.0.0000,\ drive=libvirt-2-format,id=virtio-disk0,bootindex=1 \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2",\ "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args b/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args index 35093d4f..6da68d44 100644 --- a/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args +++ b/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args @@ -17,7 +17,7 @@ file=/tmp/lib/domain--1-test/master-key.aes \ msa8=on,msa7=on,msa6=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,sthyi=on,\ edat=on,ri=on,deflate=on,edat2=on,etoken=on,vx=on,ipter=on,mepochptff=on,ap=on,\ vxeh=on,vxpd=on,esop=on,msa9_pckmo=on,vxeh2=on,esort=on,apqi=on,apft=on,iep=on,\ -apqci=on,cte=on,bpb=on,gs=on,ppa15=on,zpci=on,sea_esop2=on,te=on,cmm=on \ +apqci=on,cte=on,ais=on,bpb=on,gs=on,ppa15=on,zpci=on,sea_esop2=on,te=on,cmm=on \ -m 256 \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args b/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args index 5850b265..529beddc 100644 --- a/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args +++ b/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args @@ -30,8 +30,8 @@ file=/tmp/lib/domain--1-guest/master-key.aes \ "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2",\ "file":"libvirt-1-storage"}' \ --device virtio-blk-ccw,scsi=off,devno=fe.0.0000,drive=libvirt-1-format,\ -id=virtio-disk0,bootindex=1 \ +-device virtio-blk-ccw,devno=fe.0.0000,drive=libvirt-1-format,id=virtio-disk0,\ +bootindex=1 \ -netdev user,id=hostnet0 \ -device virtio-net-ccw,netdev=hostnet0,id=net0,mac=52:54:00:09:1a:29,\ devno=fe.0.0001 \ diff --git a/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args b/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args index 211cc24b..71282403 100644 --- a/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args +++ b/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args @@ -31,8 +31,8 @@ file=/tmp/lib/domain--1-guest/master-key.aes \ "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2",\ "file":"libvirt-1-storage"}' \ --device virtio-blk-ccw,scsi=off,devno=fe.0.0000,drive=libvirt-1-format,\ -id=virtio-disk0,bootindex=1 \ +-device virtio-blk-ccw,devno=fe.0.0000,drive=libvirt-1-format,id=virtio-disk0,\ +bootindex=1 \ -netdev user,id=hostnet0 \ -device virtio-net-ccw,netdev=hostnet0,id=net0,mac=52:54:00:09:a4:37,\ devno=fe.0.0001 \ diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args b/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args index 4c5542d8..e8956037 100644 --- a/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args +++ b/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args @@ -30,8 +30,8 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw",\ "file":"libvirt-1-storage"}' \ --device virtio-blk-ccw,scsi=off,devno=fe.0.0000,drive=libvirt-1-format,\ -id=virtio-disk0,bootindex=1 \ +-device virtio-blk-ccw,devno=fe.0.0000,drive=libvirt-1-format,id=virtio-disk0,\ +bootindex=1 \ -device virtio-balloon-ccw,id=balloon0,devno=fe.0.0001 \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ resourcecontrol=deny \ diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args b/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args index de229bd0..7199416d 100644 --- a/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args +++ b/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args @@ -30,8 +30,8 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw",\ "file":"libvirt-1-storage"}' \ --device virtio-blk-ccw,scsi=off,devno=fe.0.0000,drive=libvirt-1-format,\ -id=virtio-disk0,bootindex=1 \ +-device virtio-blk-ccw,devno=fe.0.0000,drive=libvirt-1-format,id=virtio-disk0,\ +bootindex=1 \ -device virtio-balloon-ccw,id=balloon0,devno=fe.0.0001 \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ resourcecontrol=deny \ -- 2.26.2

2 3

[PATCHv3 0/5] netdev: Extract GenerateName/ReserveName as common functions
by Shi Lei 16 Dec '20

16 Dec '20

V2 here: https://www.redhat.com/archives/libvir-list/2020-December/msg00563.html Since V2: * Fix libxl driver for missing changing virNetDevMacVLanReserveName V1 here: https://www.redhat.com/archives/libvir-list/2020-December/msg00308.html Since V1: (1) Remove virNetDev[Lock|Unlock]GenName. Only *lastID* needs to be protected. Now we lock *lastID* inside virNetDevReserveName and virNetDevGenerateName, then lock and unlock functions are no longer needed. (2) Shorten the locking range for generating names for tap and macvlan. Since virNetDevReserveName and virNetDevGenerateName are now with lock, we can call them directly rather than adding lock outside. (3) Rename *_GEN_NAME_TAP to *_GEN_NAME_VNET. (4) Now veth and tap share the same prefix "vnet". (5) Use name rather than type as the argument of virNetDevReserveName. Just follow the style of virNetDev[Tap|MacVlan]ReserveName. (6) Remove those in-between functions for tap and macvlan. (7) Remove useless ENUM_[DECL|IMPL] for enum virNetDevGenNameType. (8) Remove the *_NONE item for enum virNetDevGenNameType. (9) Remove useless <math.h> in virnetdevtap. (10) When @ifname of virNetDevGenerateName is NOT a template or NULL, just leave it unchanged. (11) Take advantage of the "g_strdup_printf(*ifname, id)" in virNetDevGenerateName, prevent the functions that call virNetDevTapCreate() from adding in "vnet%d" when ifname is empty. (12) Use VIR_NETDEV_MACVLAN_CREATE_WITH_TAP to distinguish macvtap and macvlan and remove those useless macros. Shi Lei (5): netdev: Introduce several helper functions for generating unique netdev name netdevtap: Use common helper function to create unique tap name netdevmacvlan: Use helper function to create unique macvlan/macvtap name netdevveth: Simplify virNetDevVethCreate by using virNetDevGenerateName netdev: Prevent functions that call virNetDevTapCreate from adding 'vnet%d' into ifname src/bhyve/bhyve_command.c | 3 +- src/conf/domain_conf.c | 4 +- src/interface/interface_backend_udev.c | 2 +- src/libvirt_private.syms | 4 +- src/libxl/libxl_driver.c | 2 +- src/lxc/lxc_process.c | 5 +- src/qemu/qemu_interface.c | 16 +-- src/qemu/qemu_process.c | 4 +- src/util/virnetdev.c | 116 ++++++++++++++++ src/util/virnetdev.h | 27 +++- src/util/virnetdevmacvlan.c | 177 +++---------------------- src/util/virnetdevmacvlan.h | 14 +- src/util/virnetdevtap.c | 100 +------------- src/util/virnetdevtap.h | 4 - src/util/virnetdevveth.c | 140 +++++-------------- 15 files changed, 218 insertions(+), 400 deletions(-) -- 2.25.1

3 11

RFC PATCH: Issue 90
by Ryan Gahagan 15 Dec '20

15 Dec '20

This is a request for comments on our patch for Issue 90. We didn't add in the test yet because we've had a ton of trouble getting the testing suite to work with our new test files, so they've omitted for now. We also did not add any logic to the attach-disk method yet because we wanted to focus on this set of changes first.

5 21

Libvirt-lxc: iptables not working in containers
by John Hurnett 15 Dec '20

15 Dec '20

Hi, I can't get iptables to work in libvirt-lxc containers. "iptables -L" command shows empty chains. However I tested the same scenario with pure lxc and iptables works as it should. Has anyone experienced that? It seems like a bug, but maybe there is some libvirt xml parameter I am missing? BR

2 1

[PATCH] lxc: don't try to reserve macvtap name for LXC domains
by Laine Stump 15 Dec '20

15 Dec '20

Commit 729a06c41 added code to the LXC driver (patterned after similar code in the QEMU driver) that called virNetDevMacVlanReserveName(net->ifname) for all type='direct' interfaces during a libvirtd restart, to prevent other domains from attempting to use a macvtap device name that was already in use by a domain. But, unlike a QEMU domain, when an LXC domain creates a macvtap device, that device is almost immediately moved into the namespace of the container (and it's then renamed, but that part isn't important). Because of this, the LXC driver doesn't keep track (in net->ifname) of the name used to create the device (as the QEMU driver does). The result of this is that if libvirtd is restarted while there is an active LXC domain that has <interface type='direct'>, libvirtd will segfault (since virNetDevMacVLanReserveName() doesn't check for a NULL pointer). The fix is to just not call that function in the case of the LXC driver, since it is pointless anyway. Signed-off-by: Laine Stump <laine(a)redhat.com> --- src/lxc/lxc_process.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 0f818e2ee0..79d84617d1 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -1635,13 +1635,6 @@ virLXCProcessReconnectNotifyNets(virDomainDefPtr def) for (i = 0; i < def->nnets; i++) { virDomainNetDefPtr net = def->nets[i]; - /* keep others from trying to use the macvtap device name, but - * don't return error if this happens, since that causes the - * domain to be unceremoniously killed, which would be *very* - * impolite. - */ - if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_DIRECT) - virNetDevMacVLanReserveName(net->ifname); if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK) { if (!conn && !(conn = virGetConnectNetwork())) -- 2.28.0

2 1

[libvirt PATCH] ci: containers: Refresh the Dockerfiles
by Erik Skultety 15 Dec '20

15 Dec '20

Contains changes utilizing "nosync" and "eatmydata" for speedup as well as fixes for CentOS-8 repoid regression. ci-commit: b098ec6631a85880f818f2dd25c437d509e53680 Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- Pipeline on my private fork: https://gitlab.com/eskultety/libvirt/-/pipelines/229588144 If you want to ACK this patch, feel free to push this for me too as I won't respond much during my PTO and I'd like the pipeline to become green again. ci/containers/ci-centos-7.Dockerfile | 13 ++++++-- ci/containers/ci-centos-8.Dockerfile | 14 +++++--- ci/containers/ci-centos-stream.Dockerfile | 12 +++++-- .../ci-debian-10-cross-aarch64.Dockerfile | 30 ++++++++++------- .../ci-debian-10-cross-armv6l.Dockerfile | 30 ++++++++++------- .../ci-debian-10-cross-armv7l.Dockerfile | 30 ++++++++++------- .../ci-debian-10-cross-i686.Dockerfile | 30 ++++++++++------- .../ci-debian-10-cross-mips.Dockerfile | 30 ++++++++++------- .../ci-debian-10-cross-mips64el.Dockerfile | 30 ++++++++++------- .../ci-debian-10-cross-mipsel.Dockerfile | 30 ++++++++++------- .../ci-debian-10-cross-ppc64le.Dockerfile | 30 ++++++++++------- .../ci-debian-10-cross-s390x.Dockerfile | 30 ++++++++++------- ci/containers/ci-debian-10.Dockerfile | 17 +++++++--- .../ci-debian-sid-cross-aarch64.Dockerfile | 30 ++++++++++------- .../ci-debian-sid-cross-armv6l.Dockerfile | 30 ++++++++++------- .../ci-debian-sid-cross-armv7l.Dockerfile | 30 ++++++++++------- .../ci-debian-sid-cross-i686.Dockerfile | 30 ++++++++++------- .../ci-debian-sid-cross-mips64el.Dockerfile | 30 ++++++++++------- .../ci-debian-sid-cross-mipsel.Dockerfile | 30 ++++++++++------- .../ci-debian-sid-cross-ppc64le.Dockerfile | 30 ++++++++++------- .../ci-debian-sid-cross-s390x.Dockerfile | 30 ++++++++++------- ci/containers/ci-debian-sid.Dockerfile | 17 +++++++--- ci/containers/ci-fedora-32.Dockerfile | 24 +++++++++++--- ci/containers/ci-fedora-33.Dockerfile | 24 +++++++++++--- ...ci-fedora-rawhide-cross-mingw32.Dockerfile | 33 +++++++++++++------ ...ci-fedora-rawhide-cross-mingw64.Dockerfile | 33 +++++++++++++------ ci/containers/ci-fedora-rawhide.Dockerfile | 26 ++++++++++++--- ci/containers/ci-opensuse-151.Dockerfile | 6 ++++ ci/containers/ci-ubuntu-1804.Dockerfile | 15 ++++++--- ci/containers/ci-ubuntu-2004.Dockerfile | 15 ++++++--- 30 files changed, 495 insertions(+), 264 deletions(-) diff --git a/ci/containers/ci-centos-7.Dockerfile b/ci/containers/ci-centos-7.Dockerfile index d94f335c9d..39ec95ca55 100644 --- a/ci/containers/ci-centos-7.Dockerfile +++ b/ci/containers/ci-centos-7.Dockerfile @@ -1,6 +1,13 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile centos-7 libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c4… FROM registry.centos.org/centos:7 -RUN echo -e '[openvz]\n\ +RUN yum update -y && \ + echo 'skip_missing_names_on_install=0' >> /etc/yum.conf && \ + echo -e '[openvz]\n\ name=OpenVZ addons\n\ baseurl=https://download.openvz.org/virtuozzo/releases/openvz-7.0.11-235/x8… enabled=1\n\ @@ -31,7 +38,7 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\ -----END PGP PUBLIC KEY BLOCK-----' > /etc/pki/rpm-gpg/RPM-GPG-KEY-OpenVZ && \ rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-OpenVZ && \ yum install -y epel-release && \ - yum update -y && \ + yum install -y centos-release-xen-48 && \ yum install -y \ audit-libs-devel \ augeas \ @@ -105,10 +112,12 @@ WEiJKtQrZDJloqtyi/mmRa1VsV7RYR0VPJjhK/R8EQ7Ysshy\n\ scrub \ systemtap-sdt-devel \ wireshark-devel \ + xen-devel \ xfsprogs-devel \ yajl-devel && \ yum autoremove -y && \ yum clean all -y && \ + rpm -qa | sort > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) diff --git a/ci/containers/ci-centos-8.Dockerfile b/ci/containers/ci-centos-8.Dockerfile index 568e23af76..8f240d2a33 100644 --- a/ci/containers/ci-centos-8.Dockerfile +++ b/ci/containers/ci-centos-8.Dockerfile @@ -1,10 +1,15 @@ -FROM registry.centos.org/centos:8 +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile centos-8 libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c4… +FROM docker.io/library/centos:8 -RUN dnf install 'dnf-command(config-manager)' -y && \ - dnf config-manager --set-enabled -y PowerTools && \ +RUN dnf update -y && \ + dnf install 'dnf-command(config-manager)' -y && \ + dnf config-manager --set-enabled -y powertools && \ dnf install -y centos-release-advanced-virtualization && \ dnf install -y epel-release && \ - dnf update -y && \ dnf install -y \ audit-libs-devel \ augeas \ @@ -84,6 +89,7 @@ RUN dnf install 'dnf-command(config-manager)' -y && \ yajl-devel && \ dnf autoremove -y && \ dnf clean all -y && \ + rpm -qa | sort > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) diff --git a/ci/containers/ci-centos-stream.Dockerfile b/ci/containers/ci-centos-stream.Dockerfile index f1ecab837a..141b378438 100644 --- a/ci/containers/ci-centos-stream.Dockerfile +++ b/ci/containers/ci-centos-stream.Dockerfile @@ -1,11 +1,16 @@ -FROM registry.centos.org/centos:8 +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile centos-stream libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c4… +FROM docker.io/library/centos:8 -RUN dnf install -y centos-release-stream && \ +RUN dnf update -y && \ + dnf install -y centos-release-stream && \ dnf install 'dnf-command(config-manager)' -y && \ dnf config-manager --set-enabled -y Stream-PowerTools && \ dnf install -y centos-release-advanced-virtualization && \ dnf install -y epel-release && \ - dnf update -y && \ dnf install -y \ audit-libs-devel \ augeas \ @@ -85,6 +90,7 @@ RUN dnf install -y centos-release-stream && \ yajl-devel && \ dnf autoremove -y && \ dnf clean all -y && \ + rpm -qa | sort > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) diff --git a/ci/containers/ci-debian-10-cross-aarch64.Dockerfile b/ci/containers/ci-debian-10-cross-aarch64.Dockerfile index 1c755908f2..a8ec0ad135 100644 --- a/ci/containers/ci-debian-10-cross-aarch64.Dockerfile +++ b/ci/containers/ci-debian-10-cross-aarch64.Dockerfile @@ -1,9 +1,15 @@ -FROM docker.io/library/debian:10 +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile --cross aarch64 debian-10 libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c4… +FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ bash-completion \ @@ -43,20 +49,21 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ scrub \ xsltproc \ zfs-fuse && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture arm64 && \ - apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y dpkg-dev && \ - apt-get install --no-install-recommends -y \ + eatmydata apt-get update && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ + eatmydata apt-get install --no-install-recommends -y \ gcc-aarch64-linux-gnu \ libacl1-dev:arm64 \ libapparmor-dev:arm64 \ @@ -93,8 +100,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libxml2-dev:arm64 \ libyajl-dev:arm64 \ xfslibs-dev:arm64 && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ echo "[binaries]\n\ c = '/usr/bin/aarch64-linux-gnu-gcc'\n\ @@ -118,5 +125,4 @@ ENV PYTHON "/usr/bin/python3" ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV ABI "aarch64-linux-gnu" -ENV CONFIGURE_OPTS "--host=aarch64-linux-gnu" ENV MESON_OPTS "--cross-file=aarch64-linux-gnu" diff --git a/ci/containers/ci-debian-10-cross-armv6l.Dockerfile b/ci/containers/ci-debian-10-cross-armv6l.Dockerfile index 327b4f7e7e..cfb1a61585 100644 --- a/ci/containers/ci-debian-10-cross-armv6l.Dockerfile +++ b/ci/containers/ci-debian-10-cross-armv6l.Dockerfile @@ -1,9 +1,15 @@ -FROM docker.io/library/debian:10 +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile --cross armv6l debian-10 libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c4… +FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ bash-completion \ @@ -43,20 +49,21 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ scrub \ xsltproc \ zfs-fuse && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture armel && \ - apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y dpkg-dev && \ - apt-get install --no-install-recommends -y \ + eatmydata apt-get update && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ + eatmydata apt-get install --no-install-recommends -y \ gcc-arm-linux-gnueabi \ libacl1-dev:armel \ libapparmor-dev:armel \ @@ -92,8 +99,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libxml2-dev:armel \ libyajl-dev:armel \ xfslibs-dev:armel && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ echo "[binaries]\n\ c = '/usr/bin/arm-linux-gnueabi-gcc'\n\ @@ -117,5 +124,4 @@ ENV PYTHON "/usr/bin/python3" ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV ABI "arm-linux-gnueabi" -ENV CONFIGURE_OPTS "--host=arm-linux-gnueabi" ENV MESON_OPTS "--cross-file=arm-linux-gnueabi" diff --git a/ci/containers/ci-debian-10-cross-armv7l.Dockerfile b/ci/containers/ci-debian-10-cross-armv7l.Dockerfile index d73de0d4d2..06e2472498 100644 --- a/ci/containers/ci-debian-10-cross-armv7l.Dockerfile +++ b/ci/containers/ci-debian-10-cross-armv7l.Dockerfile @@ -1,9 +1,15 @@ -FROM docker.io/library/debian:10 +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile --cross armv7l debian-10 libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c4… +FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ bash-completion \ @@ -43,20 +49,21 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ scrub \ xsltproc \ zfs-fuse && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture armhf && \ - apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y dpkg-dev && \ - apt-get install --no-install-recommends -y \ + eatmydata apt-get update && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ + eatmydata apt-get install --no-install-recommends -y \ gcc-arm-linux-gnueabihf \ libacl1-dev:armhf \ libapparmor-dev:armhf \ @@ -93,8 +100,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libxml2-dev:armhf \ libyajl-dev:armhf \ xfslibs-dev:armhf && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ echo "[binaries]\n\ c = '/usr/bin/arm-linux-gnueabihf-gcc'\n\ @@ -118,5 +125,4 @@ ENV PYTHON "/usr/bin/python3" ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV ABI "arm-linux-gnueabihf" -ENV CONFIGURE_OPTS "--host=arm-linux-gnueabihf" ENV MESON_OPTS "--cross-file=arm-linux-gnueabihf" diff --git a/ci/containers/ci-debian-10-cross-i686.Dockerfile b/ci/containers/ci-debian-10-cross-i686.Dockerfile index 41922b7582..27dbc1ba97 100644 --- a/ci/containers/ci-debian-10-cross-i686.Dockerfile +++ b/ci/containers/ci-debian-10-cross-i686.Dockerfile @@ -1,9 +1,15 @@ -FROM docker.io/library/debian:10 +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile --cross i686 debian-10 libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c4… +FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ bash-completion \ @@ -43,20 +49,21 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ scrub \ xsltproc \ zfs-fuse && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture i386 && \ - apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y dpkg-dev && \ - apt-get install --no-install-recommends -y \ + eatmydata apt-get update && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ + eatmydata apt-get install --no-install-recommends -y \ gcc-i686-linux-gnu \ libacl1-dev:i386 \ libapparmor-dev:i386 \ @@ -92,8 +99,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libxml2-dev:i386 \ libyajl-dev:i386 \ xfslibs-dev:i386 && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ echo "[binaries]\n\ c = '/usr/bin/i686-linux-gnu-gcc'\n\ @@ -117,5 +124,4 @@ ENV PYTHON "/usr/bin/python3" ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV ABI "i686-linux-gnu" -ENV CONFIGURE_OPTS "--host=i686-linux-gnu" ENV MESON_OPTS "--cross-file=i686-linux-gnu" diff --git a/ci/containers/ci-debian-10-cross-mips.Dockerfile b/ci/containers/ci-debian-10-cross-mips.Dockerfile index 369a8a7e42..596a1f9d6b 100644 --- a/ci/containers/ci-debian-10-cross-mips.Dockerfile +++ b/ci/containers/ci-debian-10-cross-mips.Dockerfile @@ -1,9 +1,15 @@ -FROM docker.io/library/debian:10 +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile --cross mips debian-10 libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c4… +FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ bash-completion \ @@ -43,20 +49,21 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ scrub \ xsltproc \ zfs-fuse && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips-linux-gnu-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips-linux-gnu-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture mips && \ - apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y dpkg-dev && \ - apt-get install --no-install-recommends -y \ + eatmydata apt-get update && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ + eatmydata apt-get install --no-install-recommends -y \ gcc-mips-linux-gnu \ libacl1-dev:mips \ libapparmor-dev:mips \ @@ -92,8 +99,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libxml2-dev:mips \ libyajl-dev:mips \ xfslibs-dev:mips && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ echo "[binaries]\n\ c = '/usr/bin/mips-linux-gnu-gcc'\n\ @@ -117,5 +124,4 @@ ENV PYTHON "/usr/bin/python3" ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV ABI "mips-linux-gnu" -ENV CONFIGURE_OPTS "--host=mips-linux-gnu" ENV MESON_OPTS "--cross-file=mips-linux-gnu" diff --git a/ci/containers/ci-debian-10-cross-mips64el.Dockerfile b/ci/containers/ci-debian-10-cross-mips64el.Dockerfile index c8f6bd818f..b71619811f 100644 --- a/ci/containers/ci-debian-10-cross-mips64el.Dockerfile +++ b/ci/containers/ci-debian-10-cross-mips64el.Dockerfile @@ -1,9 +1,15 @@ -FROM docker.io/library/debian:10 +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile --cross mips64el debian-10 libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c4… +FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ bash-completion \ @@ -43,20 +49,21 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ scrub \ xsltproc \ zfs-fuse && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture mips64el && \ - apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y dpkg-dev && \ - apt-get install --no-install-recommends -y \ + eatmydata apt-get update && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ + eatmydata apt-get install --no-install-recommends -y \ gcc-mips64el-linux-gnuabi64 \ libacl1-dev:mips64el \ libapparmor-dev:mips64el \ @@ -92,8 +99,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libxml2-dev:mips64el \ libyajl-dev:mips64el \ xfslibs-dev:mips64el && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ echo "[binaries]\n\ c = '/usr/bin/mips64el-linux-gnuabi64-gcc'\n\ @@ -117,5 +124,4 @@ ENV PYTHON "/usr/bin/python3" ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV ABI "mips64el-linux-gnuabi64" -ENV CONFIGURE_OPTS "--host=mips64el-linux-gnuabi64" ENV MESON_OPTS "--cross-file=mips64el-linux-gnuabi64" diff --git a/ci/containers/ci-debian-10-cross-mipsel.Dockerfile b/ci/containers/ci-debian-10-cross-mipsel.Dockerfile index 81de62b44b..b45112f3bc 100644 --- a/ci/containers/ci-debian-10-cross-mipsel.Dockerfile +++ b/ci/containers/ci-debian-10-cross-mipsel.Dockerfile @@ -1,9 +1,15 @@ -FROM docker.io/library/debian:10 +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile --cross mipsel debian-10 libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c4… +FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ bash-completion \ @@ -43,20 +49,21 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ scrub \ xsltproc \ zfs-fuse && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture mipsel && \ - apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y dpkg-dev && \ - apt-get install --no-install-recommends -y \ + eatmydata apt-get update && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ + eatmydata apt-get install --no-install-recommends -y \ gcc-mipsel-linux-gnu \ libacl1-dev:mipsel \ libapparmor-dev:mipsel \ @@ -92,8 +99,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libxml2-dev:mipsel \ libyajl-dev:mipsel \ xfslibs-dev:mipsel && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ echo "[binaries]\n\ c = '/usr/bin/mipsel-linux-gnu-gcc'\n\ @@ -117,5 +124,4 @@ ENV PYTHON "/usr/bin/python3" ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV ABI "mipsel-linux-gnu" -ENV CONFIGURE_OPTS "--host=mipsel-linux-gnu" ENV MESON_OPTS "--cross-file=mipsel-linux-gnu" diff --git a/ci/containers/ci-debian-10-cross-ppc64le.Dockerfile b/ci/containers/ci-debian-10-cross-ppc64le.Dockerfile index c4dcd63431..9b833fdd4d 100644 --- a/ci/containers/ci-debian-10-cross-ppc64le.Dockerfile +++ b/ci/containers/ci-debian-10-cross-ppc64le.Dockerfile @@ -1,9 +1,15 @@ -FROM docker.io/library/debian:10 +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile --cross ppc64le debian-10 libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c4… +FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ bash-completion \ @@ -43,20 +49,21 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ scrub \ xsltproc \ zfs-fuse && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture ppc64el && \ - apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y dpkg-dev && \ - apt-get install --no-install-recommends -y \ + eatmydata apt-get update && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ + eatmydata apt-get install --no-install-recommends -y \ gcc-powerpc64le-linux-gnu \ libacl1-dev:ppc64el \ libapparmor-dev:ppc64el \ @@ -92,8 +99,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libxml2-dev:ppc64el \ libyajl-dev:ppc64el \ xfslibs-dev:ppc64el && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ echo "[binaries]\n\ c = '/usr/bin/powerpc64le-linux-gnu-gcc'\n\ @@ -117,5 +124,4 @@ ENV PYTHON "/usr/bin/python3" ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV ABI "powerpc64le-linux-gnu" -ENV CONFIGURE_OPTS "--host=powerpc64le-linux-gnu" ENV MESON_OPTS "--cross-file=powerpc64le-linux-gnu" diff --git a/ci/containers/ci-debian-10-cross-s390x.Dockerfile b/ci/containers/ci-debian-10-cross-s390x.Dockerfile index 9a5f8edbe5..1a324e7e08 100644 --- a/ci/containers/ci-debian-10-cross-s390x.Dockerfile +++ b/ci/containers/ci-debian-10-cross-s390x.Dockerfile @@ -1,9 +1,15 @@ -FROM docker.io/library/debian:10 +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile --cross s390x debian-10 libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c4… +FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ bash-completion \ @@ -43,20 +49,21 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ scrub \ xsltproc \ zfs-fuse && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture s390x && \ - apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y dpkg-dev && \ - apt-get install --no-install-recommends -y \ + eatmydata apt-get update && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ + eatmydata apt-get install --no-install-recommends -y \ gcc-s390x-linux-gnu \ libacl1-dev:s390x \ libapparmor-dev:s390x \ @@ -92,8 +99,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libxml2-dev:s390x \ libyajl-dev:s390x \ xfslibs-dev:s390x && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ echo "[binaries]\n\ c = '/usr/bin/s390x-linux-gnu-gcc'\n\ @@ -117,5 +124,4 @@ ENV PYTHON "/usr/bin/python3" ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV ABI "s390x-linux-gnu" -ENV CONFIGURE_OPTS "--host=s390x-linux-gnu" ENV MESON_OPTS "--cross-file=s390x-linux-gnu" diff --git a/ci/containers/ci-debian-10.Dockerfile b/ci/containers/ci-debian-10.Dockerfile index 9858584b03..ac8a35e175 100644 --- a/ci/containers/ci-debian-10.Dockerfile +++ b/ci/containers/ci-debian-10.Dockerfile @@ -1,9 +1,15 @@ -FROM docker.io/library/debian:10 +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile debian-10 libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c4… +FROM docker.io/library/debian:10-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ bash-completion \ @@ -81,10 +87,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ xfslibs-dev \ xsltproc \ zfs-fuse && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) diff --git a/ci/containers/ci-debian-sid-cross-aarch64.Dockerfile b/ci/containers/ci-debian-sid-cross-aarch64.Dockerfile index dff7cb620e..c46012b5af 100644 --- a/ci/containers/ci-debian-sid-cross-aarch64.Dockerfile +++ b/ci/containers/ci-debian-sid-cross-aarch64.Dockerfile @@ -1,9 +1,15 @@ -FROM docker.io/library/debian:sid +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile --cross aarch64 debian-sid libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c4… +FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ bash-completion \ @@ -41,20 +47,21 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ scrub \ xsltproc \ zfs-fuse && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture arm64 && \ - apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y dpkg-dev && \ - apt-get install --no-install-recommends -y \ + eatmydata apt-get update && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ + eatmydata apt-get install --no-install-recommends -y \ gcc-aarch64-linux-gnu \ libacl1-dev:arm64 \ libapparmor-dev:arm64 \ @@ -91,8 +98,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libxml2-dev:arm64 \ libyajl-dev:arm64 \ xfslibs-dev:arm64 && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ echo "[binaries]\n\ c = '/usr/bin/aarch64-linux-gnu-gcc'\n\ @@ -113,5 +120,4 @@ ENV PYTHON "/usr/bin/python3" ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV ABI "aarch64-linux-gnu" -ENV CONFIGURE_OPTS "--host=aarch64-linux-gnu" ENV MESON_OPTS "--cross-file=aarch64-linux-gnu" diff --git a/ci/containers/ci-debian-sid-cross-armv6l.Dockerfile b/ci/containers/ci-debian-sid-cross-armv6l.Dockerfile index f3a168be3b..f61bfc5009 100644 --- a/ci/containers/ci-debian-sid-cross-armv6l.Dockerfile +++ b/ci/containers/ci-debian-sid-cross-armv6l.Dockerfile @@ -1,9 +1,15 @@ -FROM docker.io/library/debian:sid +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile --cross armv6l debian-sid libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c4… +FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ bash-completion \ @@ -41,20 +47,21 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ scrub \ xsltproc \ zfs-fuse && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture armel && \ - apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y dpkg-dev && \ - apt-get install --no-install-recommends -y \ + eatmydata apt-get update && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ + eatmydata apt-get install --no-install-recommends -y \ gcc-arm-linux-gnueabi \ libacl1-dev:armel \ libapparmor-dev:armel \ @@ -90,8 +97,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libxml2-dev:armel \ libyajl-dev:armel \ xfslibs-dev:armel && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ echo "[binaries]\n\ c = '/usr/bin/arm-linux-gnueabi-gcc'\n\ @@ -112,5 +119,4 @@ ENV PYTHON "/usr/bin/python3" ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV ABI "arm-linux-gnueabi" -ENV CONFIGURE_OPTS "--host=arm-linux-gnueabi" ENV MESON_OPTS "--cross-file=arm-linux-gnueabi" diff --git a/ci/containers/ci-debian-sid-cross-armv7l.Dockerfile b/ci/containers/ci-debian-sid-cross-armv7l.Dockerfile index 88f1033ed5..89e62f1ab3 100644 --- a/ci/containers/ci-debian-sid-cross-armv7l.Dockerfile +++ b/ci/containers/ci-debian-sid-cross-armv7l.Dockerfile @@ -1,9 +1,15 @@ -FROM docker.io/library/debian:sid +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile --cross armv7l debian-sid libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c4… +FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ bash-completion \ @@ -41,20 +47,21 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ scrub \ xsltproc \ zfs-fuse && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture armhf && \ - apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y dpkg-dev && \ - apt-get install --no-install-recommends -y \ + eatmydata apt-get update && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ + eatmydata apt-get install --no-install-recommends -y \ gcc-arm-linux-gnueabihf \ libacl1-dev:armhf \ libapparmor-dev:armhf \ @@ -91,8 +98,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libxml2-dev:armhf \ libyajl-dev:armhf \ xfslibs-dev:armhf && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ echo "[binaries]\n\ c = '/usr/bin/arm-linux-gnueabihf-gcc'\n\ @@ -113,5 +120,4 @@ ENV PYTHON "/usr/bin/python3" ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV ABI "arm-linux-gnueabihf" -ENV CONFIGURE_OPTS "--host=arm-linux-gnueabihf" ENV MESON_OPTS "--cross-file=arm-linux-gnueabihf" diff --git a/ci/containers/ci-debian-sid-cross-i686.Dockerfile b/ci/containers/ci-debian-sid-cross-i686.Dockerfile index e34c8074d9..f3c3a75119 100644 --- a/ci/containers/ci-debian-sid-cross-i686.Dockerfile +++ b/ci/containers/ci-debian-sid-cross-i686.Dockerfile @@ -1,9 +1,15 @@ -FROM docker.io/library/debian:sid +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile --cross i686 debian-sid libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c4… +FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ bash-completion \ @@ -41,20 +47,21 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ scrub \ xsltproc \ zfs-fuse && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture i386 && \ - apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y dpkg-dev && \ - apt-get install --no-install-recommends -y \ + eatmydata apt-get update && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ + eatmydata apt-get install --no-install-recommends -y \ gcc-i686-linux-gnu \ libacl1-dev:i386 \ libapparmor-dev:i386 \ @@ -90,8 +97,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libxml2-dev:i386 \ libyajl-dev:i386 \ xfslibs-dev:i386 && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ echo "[binaries]\n\ c = '/usr/bin/i686-linux-gnu-gcc'\n\ @@ -112,5 +119,4 @@ ENV PYTHON "/usr/bin/python3" ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV ABI "i686-linux-gnu" -ENV CONFIGURE_OPTS "--host=i686-linux-gnu" ENV MESON_OPTS "--cross-file=i686-linux-gnu" diff --git a/ci/containers/ci-debian-sid-cross-mips64el.Dockerfile b/ci/containers/ci-debian-sid-cross-mips64el.Dockerfile index eaf1bf5641..95682c748c 100644 --- a/ci/containers/ci-debian-sid-cross-mips64el.Dockerfile +++ b/ci/containers/ci-debian-sid-cross-mips64el.Dockerfile @@ -1,9 +1,15 @@ -FROM docker.io/library/debian:sid +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile --cross mips64el debian-sid libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c4… +FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ bash-completion \ @@ -41,20 +47,21 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ scrub \ xsltproc \ zfs-fuse && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture mips64el && \ - apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y dpkg-dev && \ - apt-get install --no-install-recommends -y \ + eatmydata apt-get update && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ + eatmydata apt-get install --no-install-recommends -y \ gcc-mips64el-linux-gnuabi64 \ libacl1-dev:mips64el \ libapparmor-dev:mips64el \ @@ -90,8 +97,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libxml2-dev:mips64el \ libyajl-dev:mips64el \ xfslibs-dev:mips64el && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ echo "[binaries]\n\ c = '/usr/bin/mips64el-linux-gnuabi64-gcc'\n\ @@ -112,5 +119,4 @@ ENV PYTHON "/usr/bin/python3" ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV ABI "mips64el-linux-gnuabi64" -ENV CONFIGURE_OPTS "--host=mips64el-linux-gnuabi64" ENV MESON_OPTS "--cross-file=mips64el-linux-gnuabi64" diff --git a/ci/containers/ci-debian-sid-cross-mipsel.Dockerfile b/ci/containers/ci-debian-sid-cross-mipsel.Dockerfile index 424f97315d..0ea3f0ac89 100644 --- a/ci/containers/ci-debian-sid-cross-mipsel.Dockerfile +++ b/ci/containers/ci-debian-sid-cross-mipsel.Dockerfile @@ -1,9 +1,15 @@ -FROM docker.io/library/debian:sid +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile --cross mipsel debian-sid libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c4… +FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ bash-completion \ @@ -41,20 +47,21 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ scrub \ xsltproc \ zfs-fuse && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture mipsel && \ - apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y dpkg-dev && \ - apt-get install --no-install-recommends -y \ + eatmydata apt-get update && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ + eatmydata apt-get install --no-install-recommends -y \ gcc-mipsel-linux-gnu \ libacl1-dev:mipsel \ libapparmor-dev:mipsel \ @@ -90,8 +97,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libxml2-dev:mipsel \ libyajl-dev:mipsel \ xfslibs-dev:mipsel && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ echo "[binaries]\n\ c = '/usr/bin/mipsel-linux-gnu-gcc'\n\ @@ -112,5 +119,4 @@ ENV PYTHON "/usr/bin/python3" ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV ABI "mipsel-linux-gnu" -ENV CONFIGURE_OPTS "--host=mipsel-linux-gnu" ENV MESON_OPTS "--cross-file=mipsel-linux-gnu" diff --git a/ci/containers/ci-debian-sid-cross-ppc64le.Dockerfile b/ci/containers/ci-debian-sid-cross-ppc64le.Dockerfile index 311106e337..8dc93482b3 100644 --- a/ci/containers/ci-debian-sid-cross-ppc64le.Dockerfile +++ b/ci/containers/ci-debian-sid-cross-ppc64le.Dockerfile @@ -1,9 +1,15 @@ -FROM docker.io/library/debian:sid +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile --cross ppc64le debian-sid libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c4… +FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ bash-completion \ @@ -41,20 +47,21 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ scrub \ xsltproc \ zfs-fuse && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture ppc64el && \ - apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y dpkg-dev && \ - apt-get install --no-install-recommends -y \ + eatmydata apt-get update && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ + eatmydata apt-get install --no-install-recommends -y \ gcc-powerpc64le-linux-gnu \ libacl1-dev:ppc64el \ libapparmor-dev:ppc64el \ @@ -90,8 +97,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libxml2-dev:ppc64el \ libyajl-dev:ppc64el \ xfslibs-dev:ppc64el && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ echo "[binaries]\n\ c = '/usr/bin/powerpc64le-linux-gnu-gcc'\n\ @@ -112,5 +119,4 @@ ENV PYTHON "/usr/bin/python3" ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV ABI "powerpc64le-linux-gnu" -ENV CONFIGURE_OPTS "--host=powerpc64le-linux-gnu" ENV MESON_OPTS "--cross-file=powerpc64le-linux-gnu" diff --git a/ci/containers/ci-debian-sid-cross-s390x.Dockerfile b/ci/containers/ci-debian-sid-cross-s390x.Dockerfile index ee188c0a20..d99f55e896 100644 --- a/ci/containers/ci-debian-sid-cross-s390x.Dockerfile +++ b/ci/containers/ci-debian-sid-cross-s390x.Dockerfile @@ -1,9 +1,15 @@ -FROM docker.io/library/debian:sid +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile --cross s390x debian-sid libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c4… +FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ bash-completion \ @@ -41,20 +47,21 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ scrub \ xsltproc \ zfs-fuse && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-$(basename /usr/bin/gcc) RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture s390x && \ - apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y dpkg-dev && \ - apt-get install --no-install-recommends -y \ + eatmydata apt-get update && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ + eatmydata apt-get install --no-install-recommends -y \ gcc-s390x-linux-gnu \ libacl1-dev:s390x \ libapparmor-dev:s390x \ @@ -90,8 +97,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libxml2-dev:s390x \ libyajl-dev:s390x \ xfslibs-dev:s390x && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ mkdir -p /usr/local/share/meson/cross && \ echo "[binaries]\n\ c = '/usr/bin/s390x-linux-gnu-gcc'\n\ @@ -112,5 +119,4 @@ ENV PYTHON "/usr/bin/python3" ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV ABI "s390x-linux-gnu" -ENV CONFIGURE_OPTS "--host=s390x-linux-gnu" ENV MESON_OPTS "--cross-file=s390x-linux-gnu" diff --git a/ci/containers/ci-debian-sid.Dockerfile b/ci/containers/ci-debian-sid.Dockerfile index d914d5d6c2..e2bef48135 100644 --- a/ci/containers/ci-debian-sid.Dockerfile +++ b/ci/containers/ci-debian-sid.Dockerfile @@ -1,9 +1,15 @@ -FROM docker.io/library/debian:sid +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile debian-sid libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c4… +FROM docker.io/library/debian:sid-slim RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ bash-completion \ @@ -79,10 +85,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ xfslibs-dev \ xsltproc \ zfs-fuse && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) diff --git a/ci/containers/ci-fedora-32.Dockerfile b/ci/containers/ci-fedora-32.Dockerfile index 8be1754ac5..94bc3e1f92 100644 --- a/ci/containers/ci-fedora-32.Dockerfile +++ b/ci/containers/ci-fedora-32.Dockerfile @@ -1,7 +1,22 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile fedora-32 libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c4… FROM registry.fedoraproject.org/fedora:32 -RUN dnf update -y && \ - dnf install -y \ +RUN dnf install -y nosync && \ + echo -e '#!/bin/sh\n\ +if test -d /usr/lib64\n\ +then\n\ + export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\ +else\n\ + export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\ +fi\n\ +exec "$@"' > /usr/bin/nosync && \ + chmod +x /usr/bin/nosync && \ + nosync dnf update -y && \ + nosync dnf install -y \ audit-libs-devel \ augeas \ avahi-devel \ @@ -80,8 +95,9 @@ RUN dnf update -y && \ xfsprogs-devel \ yajl-devel \ zfs-fuse && \ - dnf autoremove -y && \ - dnf clean all -y && \ + nosync dnf autoremove -y && \ + nosync dnf clean all -y && \ + rpm -qa | sort > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) diff --git a/ci/containers/ci-fedora-33.Dockerfile b/ci/containers/ci-fedora-33.Dockerfile index ef32628069..370996cd2f 100644 --- a/ci/containers/ci-fedora-33.Dockerfile +++ b/ci/containers/ci-fedora-33.Dockerfile @@ -1,7 +1,22 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile fedora-33 libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c4… FROM registry.fedoraproject.org/fedora:33 -RUN dnf update -y && \ - dnf install -y \ +RUN dnf install -y nosync && \ + echo -e '#!/bin/sh\n\ +if test -d /usr/lib64\n\ +then\n\ + export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\ +else\n\ + export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\ +fi\n\ +exec "$@"' > /usr/bin/nosync && \ + chmod +x /usr/bin/nosync && \ + nosync dnf update -y && \ + nosync dnf install -y \ audit-libs-devel \ augeas \ avahi-devel \ @@ -80,8 +95,9 @@ RUN dnf update -y && \ xfsprogs-devel \ yajl-devel \ zfs-fuse && \ - dnf autoremove -y && \ - dnf clean all -y && \ + nosync dnf autoremove -y && \ + nosync dnf clean all -y && \ + rpm -qa | sort > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) diff --git a/ci/containers/ci-fedora-rawhide-cross-mingw32.Dockerfile b/ci/containers/ci-fedora-rawhide-cross-mingw32.Dockerfile index 32527e8e56..1e8a51faab 100644 --- a/ci/containers/ci-fedora-rawhide-cross-mingw32.Dockerfile +++ b/ci/containers/ci-fedora-rawhide-cross-mingw32.Dockerfile @@ -1,20 +1,33 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile --cross mingw32 fedora-rawhide libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c4… FROM registry.fedoraproject.org/fedora:rawhide -RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ - dnf update -y && \ - dnf install -y \ +RUN dnf install -y nosync && \ + echo -e '#!/bin/sh\n\ +if test -d /usr/lib64\n\ +then\n\ + export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\ +else\n\ + export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\ +fi\n\ +exec "$@"' > /usr/bin/nosync && \ + chmod +x /usr/bin/nosync && \ + nosync dnf update -y --nogpgcheck fedora-gpg-keys && \ + nosync dnf update -y && \ + nosync dnf install -y \ augeas \ bash-completion \ ca-certificates \ ccache \ - clang \ cppi \ diffutils \ dnsmasq \ dwarves \ ebtables \ firewalld-filesystem \ - gcc \ git \ glibc-langpack-en \ iproute \ @@ -43,13 +56,14 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ scrub \ sheepdog \ zfs-fuse && \ - dnf autoremove -y && \ - dnf clean all -y && \ + nosync dnf autoremove -y && \ + nosync dnf clean all -y && \ + rpm -qa | sort > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-$(basename /usr/bin/gcc) -RUN dnf install -y \ +RUN nosync dnf install -y \ mingw32-curl \ mingw32-dbus \ mingw32-dlfcn \ @@ -63,7 +77,7 @@ RUN dnf install -y \ mingw32-pkg-config \ mingw32-portablexdr \ mingw32-readline && \ - dnf clean all -y + nosync dnf clean all -y ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" @@ -72,5 +86,4 @@ ENV PYTHON "/usr/bin/python3" ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV ABI "i686-w64-mingw32" -ENV CONFIGURE_OPTS "--host=i686-w64-mingw32" ENV MESON_OPTS "--cross-file=/usr/share/mingw/toolchain-mingw32.meson" diff --git a/ci/containers/ci-fedora-rawhide-cross-mingw64.Dockerfile b/ci/containers/ci-fedora-rawhide-cross-mingw64.Dockerfile index e82de31df9..ff7fb77a04 100644 --- a/ci/containers/ci-fedora-rawhide-cross-mingw64.Dockerfile +++ b/ci/containers/ci-fedora-rawhide-cross-mingw64.Dockerfile @@ -1,20 +1,33 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile --cross mingw64 fedora-rawhide libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c4… FROM registry.fedoraproject.org/fedora:rawhide -RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ - dnf update -y && \ - dnf install -y \ +RUN dnf install -y nosync && \ + echo -e '#!/bin/sh\n\ +if test -d /usr/lib64\n\ +then\n\ + export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\ +else\n\ + export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\ +fi\n\ +exec "$@"' > /usr/bin/nosync && \ + chmod +x /usr/bin/nosync && \ + nosync dnf update -y --nogpgcheck fedora-gpg-keys && \ + nosync dnf update -y && \ + nosync dnf install -y \ augeas \ bash-completion \ ca-certificates \ ccache \ - clang \ cppi \ diffutils \ dnsmasq \ dwarves \ ebtables \ firewalld-filesystem \ - gcc \ git \ glibc-langpack-en \ iproute \ @@ -43,13 +56,14 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ scrub \ sheepdog \ zfs-fuse && \ - dnf autoremove -y && \ - dnf clean all -y && \ + nosync dnf autoremove -y && \ + nosync dnf clean all -y && \ + rpm -qa | sort > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-$(basename /usr/bin/gcc) -RUN dnf install -y \ +RUN nosync dnf install -y \ mingw64-curl \ mingw64-dbus \ mingw64-dlfcn \ @@ -63,7 +77,7 @@ RUN dnf install -y \ mingw64-pkg-config \ mingw64-portablexdr \ mingw64-readline && \ - dnf clean all -y + nosync dnf clean all -y ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" @@ -72,5 +86,4 @@ ENV PYTHON "/usr/bin/python3" ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV ABI "x86_64-w64-mingw32" -ENV CONFIGURE_OPTS "--host=x86_64-w64-mingw32" ENV MESON_OPTS "--cross-file=/usr/share/mingw/toolchain-mingw64.meson" diff --git a/ci/containers/ci-fedora-rawhide.Dockerfile b/ci/containers/ci-fedora-rawhide.Dockerfile index ee2f0fcfc1..539ee0a7c7 100644 --- a/ci/containers/ci-fedora-rawhide.Dockerfile +++ b/ci/containers/ci-fedora-rawhide.Dockerfile @@ -1,8 +1,23 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile fedora-rawhide libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c4… FROM registry.fedoraproject.org/fedora:rawhide -RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ - dnf update -y && \ - dnf install -y \ +RUN dnf install -y nosync && \ + echo -e '#!/bin/sh\n\ +if test -d /usr/lib64\n\ +then\n\ + export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\ +else\n\ + export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\ +fi\n\ +exec "$@"' > /usr/bin/nosync && \ + chmod +x /usr/bin/nosync && \ + nosync dnf update -y --nogpgcheck fedora-gpg-keys && \ + nosync dnf update -y && \ + nosync dnf install -y \ audit-libs-devel \ augeas \ avahi-devel \ @@ -81,8 +96,9 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ xfsprogs-devel \ yajl-devel \ zfs-fuse && \ - dnf autoremove -y && \ - dnf clean all -y && \ + nosync dnf autoremove -y && \ + nosync dnf clean all -y && \ + rpm -qa | sort > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) diff --git a/ci/containers/ci-opensuse-151.Dockerfile b/ci/containers/ci-opensuse-151.Dockerfile index c2d088f004..9458d2de0c 100644 --- a/ci/containers/ci-opensuse-151.Dockerfile +++ b/ci/containers/ci-opensuse-151.Dockerfile @@ -1,3 +1,8 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile opensuse-151 libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c4… FROM registry.opensuse.org/opensuse/leap:15.1 RUN zypper update -y && \ @@ -80,6 +85,7 @@ RUN zypper update -y && \ xen-devel \ xfsprogs-devel && \ zypper clean --all && \ + rpm -qa | sort > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) diff --git a/ci/containers/ci-ubuntu-1804.Dockerfile b/ci/containers/ci-ubuntu-1804.Dockerfile index 3a5362e128..842412b651 100644 --- a/ci/containers/ci-ubuntu-1804.Dockerfile +++ b/ci/containers/ci-ubuntu-1804.Dockerfile @@ -1,9 +1,15 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile ubuntu-1804 libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c4… FROM docker.io/library/ubuntu:18.04 RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ bash-completion \ @@ -83,10 +89,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ xfslibs-dev \ xsltproc \ zfs-fuse && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) diff --git a/ci/containers/ci-ubuntu-2004.Dockerfile b/ci/containers/ci-ubuntu-2004.Dockerfile index 41a3f5995e..de7e63b4a7 100644 --- a/ci/containers/ci-ubuntu-2004.Dockerfile +++ b/ci/containers/ci-ubuntu-2004.Dockerfile @@ -1,9 +1,15 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile ubuntu-2004 libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c4… FROM docker.io/library/ubuntu:20.04 RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ augeas-lenses \ augeas-tools \ bash-completion \ @@ -82,10 +88,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ xfslibs-dev \ xsltproc \ zfs-fuse && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) -- 2.26.2

2 1

[PATCH] qemu: Relax memory pre-allocation rules
by Michal Privoznik 14 Dec '20

14 Dec '20

Currently, we configure QEMU to prealloc memory almost by default. Well, by default for NVDIMMs, hugepages and if user asked us to (via memoryBacking <allocation mode="immediate"/>). However, there are two cases where this approach is not the best: 1) in case when guest's NVDIMM is backed by real life NVDIMM. In this case users should put <pmem/> into the <memory/> device <source/>, like this: <memory model='nvdimm' access='shared'> <source> <path>/dev/pmem0</path> <pmem/> </source> </memory> Instructing QEMU to do prealloc in this case means that each page of the NVDIMM is "touched" (the first byte is read and written back - see QEMU commit v2.9.0-rc1~26^2) which cripples device wear. 2) if free-page-reporting is turned on. While the free-page-reporting feature might not have a catchy or obvious name, when enabled it instructs KVM and subsequently QEMU to free pages no longer used by guest resulting in smaller memory footprint. And preallocating whole memory goes against this. The BZ comment 11 mentions another, third case 'virtio-mem' but that is not implemented in libvirt, yet. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1894053 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_command.c | 11 +++++++++-- .../memory-hotplug-nvdimm-pmem.x86_64-latest.args | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 479bcc0b0c..3df8b5ac76 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2977,7 +2977,11 @@ qemuBuildMemoryBackendProps(virJSONValuePtr *backendProps, if (discard == VIR_TRISTATE_BOOL_ABSENT) discard = def->mem.discard; - if (def->mem.allocation == VIR_DOMAIN_MEMORY_ALLOCATION_IMMEDIATE) + /* The whole point of free_page_reporting is that as soon as guest frees + * any memory it is freed in the host too. Prealloc doesn't make much sense + * then. */ + if (def->mem.allocation == VIR_DOMAIN_MEMORY_ALLOCATION_IMMEDIATE && + def->memballoon->free_page_reporting != VIR_TRISTATE_SWITCH_ON) prealloc = true; if (virDomainNumatuneGetMode(def->numa, mem->targetNode, &mode) < 0 && @@ -3064,7 +3068,10 @@ qemuBuildMemoryBackendProps(virJSONValuePtr *backendProps, if (mem->nvdimmPath) { memPath = g_strdup(mem->nvdimmPath); - prealloc = true; + /* If the NVDIMM is a real device then there's nothing to prealloc. + * If anyhing, we would be only wearing off the device. */ + if (!mem->nvdimmPmem) + prealloc = true; } else if (useHugepage) { if (qemuGetDomainHupageMemPath(priv->driver, def, pagesize, &memPath) < 0) return -1; diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args index cac02a6f6d..fb4ae4b518 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args @@ -20,7 +20,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -object memory-backend-ram,id=ram-node0,size=224395264 \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ -object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,share=no,\ -prealloc=yes,size=536870912,pmem=yes \ +size=536870912,pmem=yes \ -device nvdimm,node=0,memdev=memnvdimm0,id=nvdimm0,slot=0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -- 2.26.2

4 7

[PATCH 00/12] move validations from domain_conf.c to
by Daniel Henrique Barboza 14 Dec '20

14 Dec '20

Hi, This is a continuation of what we started in [1]. The changes are all trivial, but done in parts to make the review less annoying. domain_conf.c is still a huge beast, but here we're putting it on a diet, losing ~1k lines. [1] https://www.redhat.com/archives/libvir-list/2020-December/msg00509.html Daniel Henrique Barboza (12): domain_conf: move duplicate check functions to domain_validate.c domain_conf.c: rename virDomainDeviceInfoIterateInternal() domain_conf: move address validation functions to domain_validate.c domain_conf: move all virDomainDefValidateInternal() helpers to domain_validate.c domain_conf.c: move virDomainDeviceDefValidate() to domain_validate.c domain_validate.c: make local functions static domain_conf: move net device validation to domain_validate.c domain_conf: move all DeviceDefValidateInternal() helpers to domain_validate domain_conf.c: move virDomainDeviceDefValidate() to domain_validate.c domain_validate.c: make virDomainDeviceDefValidateInternal() helpers static domain_validate.c: put IOMMU validation into a new function domain_validate.c: use VIR_ERR_CONFIG_UNSUPPORTED in validate functions src/conf/domain_conf.c | 1040 ++---------------------------------- src/conf/domain_conf.h | 58 +- src/conf/domain_validate.c | 966 ++++++++++++++++++++++++++++++++- src/conf/domain_validate.h | 31 +- src/libvirt_private.syms | 9 +- src/libxl/libxl_domain.c | 1 + src/libxl/libxl_driver.c | 1 + src/lxc/lxc_driver.c | 1 + src/lxc/lxc_process.c | 1 + src/qemu/qemu_domain.c | 1 + src/qemu/qemu_driver.c | 1 + src/qemu/qemu_process.c | 1 + 12 files changed, 1066 insertions(+), 1045 deletions(-) -- 2.26.2

2 16

[PATCH] qemu: Relax validation for mem->access if guest has no NUMA
by Michal Privoznik 14 Dec '20

14 Dec '20

In v6.8.0-27-g88957116c9 and friends I've switched the way the default RAM is specified for QEMU (from plain -m to memory-backend-*). This means, that even if a guest doesn't have any NUMA nodes configured we can use memory-backend-* attributes to translate user config requests. For instance, we can allow memory to be shared (<access mode='shared'/> under <memoryBacking/>). But what my original commits are missing is allowing such configuration in our validator. Fixes: 88957116c9d3cb4705380c3702c9d4315fb500bb Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1839034#c12 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_validate.c | 10 +++-- .../hugepages-memaccess3.x86_64-latest.args | 39 +++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + 3 files changed, 47 insertions(+), 3 deletions(-) create mode 100644 tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index bf8127a575..eadf3af8b3 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -754,6 +754,9 @@ static int qemuValidateDomainDefMemory(const virDomainDef *def, virQEMUCapsPtr qemuCaps) { + const char *defaultRAMid = virQEMUCapsGetMachineDefaultRAMid(qemuCaps, + def->virtType, + def->os.machine); const long system_page_size = virGetSystemPageSizeKB(); const virDomainMemtune *mem = &def->mem; @@ -781,9 +784,10 @@ qemuValidateDomainDefMemory(const virDomainDef *def, return -1; } - /* We can't guarantee any other mem.access - * if no guest NUMA nodes are defined. */ - if (mem->hugepages[0].size != system_page_size && + /* We can't guarantee any other mem.access if no guest NUMA + * nodes are defined, unless defaultRAMid is provided. */ + if (!defaultRAMid && + mem->hugepages[0].size != system_page_size && virDomainNumaGetNodeCount(def->numa) == 0 && mem->access != VIR_DOMAIN_MEMORY_ACCESS_DEFAULT && mem->access != VIR_DOMAIN_MEMORY_ACCESS_PRIVATE) { diff --git a/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args b/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args new file mode 100644 index 0000000000..6033950eab --- /dev/null +++ b/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args @@ -0,0 +1,39 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/tmp/lib/domain--1-fedora \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/tmp/lib/domain--1-fedora/.local/share \ +XDG_CACHE_HOME=/tmp/lib/domain--1-fedora/.cache \ +XDG_CONFIG_HOME=/tmp/lib/domain--1-fedora/.config \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-x86_64 \ +-name guest=fedora,debug-threads=on \ +-S \ +-object secret,id=masterKey0,format=raw,\ +file=/tmp/lib/domain--1-fedora/master-key.aes \ +-machine pc-i440fx-2.9,accel=kvm,usb=off,dump-guest-core=off,\ +memory-backend=pc.ram \ +-cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,\ +arch-capabilities=on,ssbd=on,xsaves=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,\ +rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on \ +-m 4096 \ +-object memory-backend-file,id=pc.ram,\ +mem-path=/dev/hugepages2M/libvirt/qemu/-1-fedora,share=yes,prealloc=yes,\ +size=4294967296 \ +-overcommit mem-lock=off \ +-smp 4,sockets=4,cores=1,threads=1 \ +-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \ +-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 menu=on,strict=on \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ +resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 9b853c6d59..96a2b95331 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1145,6 +1145,7 @@ mymain(void) DO_TEST_PARSE_ERROR("hugepages-memaccess3", QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_OBJECT_MEMORY_FILE); + DO_TEST_CAPS_LATEST("hugepages-memaccess3"); DO_TEST_CAPS_LATEST("hugepages-nvdimm"); DO_TEST("nosharepages", QEMU_CAPS_MEM_MERGE); DO_TEST("disk-cdrom", NONE); -- 2.26.2

2 1

[PATCH] node_device: pacify grumpy coverity due to addr override
by Boris Fiuczynski 14 Dec '20

14 Dec '20

With commit 09364608b4 node_device: refactor address retrieval of node device "if-else if" was replaced by "switch". The contained break statement now is no longer in context of the for loop but instead of the switch causing the legitimate grumpiness of coverity. Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com> Suggested-by: John Ferlan <jferlan(a)redhat.com> --- src/node_device/node_device_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index e254b49244..da1bc8a545 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -637,7 +637,7 @@ nodeDeviceFindAddressByName(const char *name) } def = virNodeDeviceObjGetDef(dev); - for (caps = def->caps; caps != NULL; caps = caps->next) { + for (caps = def->caps; caps != NULL && addr == NULL; caps = caps->next) { switch (caps->data.type) { case VIR_NODE_DEV_CAP_PCI_DEV: { virPCIDeviceAddress pci_addr = { -- 2.26.2

2 5

[PATCHv2 0/5] netdev: Extract GenerateName/ReserveName as common functions
by Shi Lei 14 Dec '20

14 Dec '20

V1 here: https://www.redhat.com/archives/libvir-list/2020-December/msg00308.html Since V1: (1) Remove virNetDev[Lock|Unlock]GenName. Only *lastID* needs to be protected. Now we lock *lastID* inside virNetDevReserveName and virNetDevGenerateName, then lock and unlock functions are no longer needed. (2) Shorten the locking range for generating names for tap and macvlan. Since virNetDevReserveName and virNetDevGenerateName are now with lock, we can call them directly rather than adding lock outside. (3) Rename *_GEN_NAME_TAP to *_GEN_NAME_VNET. (4) Now veth and tap share the same prefix "vnet". (5) Use name rather than type as the argument of virNetDevReserveName. Just follow the style of virNetDev[Tap|MacVlan]ReserveName. (6) Remove those in-between functions for tap and macvlan. (7) Remove useless ENUM_[DECL|IMPL] for enum virNetDevGenNameType. (8) Remove the *_NONE item for enum virNetDevGenNameType. (9) Remove useless <math.h> in virnetdevtap. (10) When @ifname of virNetDevGenerateName is NOT a template or NULL, just leave it unchanged. (11) Take advantage of the "g_strdup_printf(*ifname, id)" in virNetDevGenerateName, prevent the functions that call virNetDevTapCreate() from adding in "vnet%d" when ifname is empty. (12) Use VIR_NETDEV_MACVLAN_CREATE_WITH_TAP to distinguish macvtap and macvlan and remove those useless macros. Shi Lei (5): netdev: Introduce several helper functions for generating unique netdev name netdevtap: Use common helper function to create unique tap name netdevmacvlan: Use helper function to create unique macvlan/macvtap name netdevveth: Simplify virNetDevVethCreate by using virNetDevGenerateName netdev: Prevent functions that call virNetDevTapCreate from adding 'vnet%d' into ifname src/bhyve/bhyve_command.c | 3 +- src/conf/domain_conf.c | 4 +- src/interface/interface_backend_udev.c | 2 +- src/libvirt_private.syms | 4 +- src/lxc/lxc_process.c | 5 +- src/qemu/qemu_interface.c | 16 +-- src/qemu/qemu_process.c | 4 +- src/util/virnetdev.c | 116 ++++++++++++++++ src/util/virnetdev.h | 27 +++- src/util/virnetdevmacvlan.c | 177 +++---------------------- src/util/virnetdevmacvlan.h | 14 +- src/util/virnetdevtap.c | 100 +------------- src/util/virnetdevtap.h | 4 - src/util/virnetdevveth.c | 140 +++++-------------- 14 files changed, 217 insertions(+), 399 deletions(-) -- 2.25.1

2 10

[libvirt PATCH v2 0/7] fix PCI vs PCIe detection when running libvirtd as root, but unprivileged
by Laine Stump 11 Dec '20

11 Dec '20

danpb had asked for some documentation on the changes to the APIs of internal functions in V1. I've added some standard function header docs in patches 5 & 6. Everything else is completely unchanged (and already reviewed by mprivozn). Laine Stump (7): qemu: use g_autoptr for a virPCIDevice util: simplify calling of virPCIDeviceDetectFunctionLevelReset() util: simplify call to virPCIDeviceDetectPowerManagementReset() util: make read error of PCI config file more detailed util: change call sequence for virPCIDeviceFindCapabilityOffset() util: make virPCIDeviceIsPCIExpress() more intelligent qemu: remove now-redundant check for file length when determining PCIe vs. PCI src/qemu/qemu_domain_address.c | 43 +-------- src/util/virpci.c | 166 +++++++++++++++++++++++++++------ 2 files changed, 141 insertions(+), 68 deletions(-) -- 2.28.0

2 8

[libvirt PATCH 0/3] tests: Add capabilities for QEMU 5.2
by Andrea Bolognani 11 Dec '20

11 Dec '20

As usual, this is an abridged version of the changes. For the full version, run $ git fetch https://gitlab.com/abologna/libvirt.git caps-5.2 or browse https://gitlab.com/abologna/libvirt/-/commits/caps-5.2 Andrea Bolognani (3): tests: Add capabilities for QEMU 5.2 on aarch64 tests: Add capabilities for QEMU 5.2 on ppc64 tests: Add capabilities for QEMU 5.2 on riscv64 .../qemu_5.2.0-virt.aarch64.xml | 161 + tests/domaincapsdata/qemu_5.2.0.aarch64.xml | 155 + tests/domaincapsdata/qemu_5.2.0.ppc64.xml | 120 + .../caps_5.2.0.aarch64.replies | 25361 ++++++++++++++ .../caps_5.2.0.aarch64.xml | 509 + .../caps_5.2.0.ppc64.replies | 28789 ++++++++++++++++ .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1169 + .../caps_5.2.0.riscv64.replies | 21075 +++++++++++ .../caps_5.2.0.riscv64.xml | 214 + ...fault-cpu-kvm-virt-4.2.aarch64-latest.args | 4 +- ...fault-cpu-tcg-virt-4.2.aarch64-latest.args | 4 +- .../aarch64-features-sve.aarch64-latest.args | 4 +- ...arch64-os-firmware-efi.aarch64-latest.args | 4 +- .../aarch64-virt-graphics.aarch64-latest.args | 4 +- .../aarch64-virt-headless.aarch64-latest.args | 4 +- .../clock-timer-armvtimer.aarch64-latest.args | 4 +- ...ult-video-type-aarch64.aarch64-latest.args | 4 +- ...default-video-type-ppc64.ppc64-latest.args | 4 +- .../disk-arm-virtio-sd.aarch64-latest.args | 4 +- .../iommu-smmuv3.aarch64-latest.args | 4 +- ...ault-cpu-kvm-pseries-2.7.ppc64-latest.args | 4 +- ...ault-cpu-kvm-pseries-3.1.ppc64-latest.args | 4 +- ...ault-cpu-kvm-pseries-4.2.ppc64-latest.args | 4 +- ...ault-cpu-tcg-pseries-2.7.ppc64-latest.args | 4 +- ...ault-cpu-tcg-pseries-3.1.ppc64-latest.args | 4 +- ...ault-cpu-tcg-pseries-4.2.ppc64-latest.args | 4 +- .../ppc64-pseries-graphics.ppc64-latest.args | 4 +- .../ppc64-pseries-headless.ppc64-latest.args | 4 +- .../ppc64-tpmproxy-single.ppc64-latest.args | 4 +- .../ppc64-tpmproxy-with-tpm.ppc64-latest.args | 4 +- .../tpm-emulator-spapr.ppc64-latest.args | 4 +- 31 files changed, 77619 insertions(+), 22 deletions(-) create mode 100644 tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml create mode 100644 tests/domaincapsdata/qemu_5.2.0.aarch64.xml create mode 100644 tests/domaincapsdata/qemu_5.2.0.ppc64.xml create mode 100644 tests/qemucapabilitiesdata/caps_5.2.0.aarch64.replies create mode 100644 tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml create mode 100644 tests/qemucapabilitiesdata/caps_5.2.0.ppc64.replies create mode 100644 tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml create mode 100644 tests/qemucapabilitiesdata/caps_5.2.0.riscv64.replies create mode 100644 tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml -- 2.26.2

2 5

RFC: don't store backing filename in qcow2 image
by Vladimir Sementsov-Ogievskiy 11 Dec '20

11 Dec '20

Hi all! I have an idea, that not storing backing filename in qcow2 image at all may be a good thing. I'll give some reasons and want to know what do you think about it. 1. Libvirt has to manage and keep in mind backing chains anyway. This means, that storing this information in qcow2 header is a source of bugs when we update it in one place but failed/forget to update in another. Of course, Libvirt is not the only user of qemu.. But we are moving to "blockdev" anyway, when management tool should control all node-names at least. It would be strange to not control the relations between images in the same time. 2. backing file name specified in qcow2 metadata doesn't relate to any other thing, and nothing rely on it. 3. calculating and updating backing file name in Qemu is a headache: - with some options specified or with filters we risk to write json filenames into qcow2 metadata, which is almost never what user wants. Also, json may exceed the qcow2 limitation of backing_file_size to be <= 1023 - updating it in transactional way for read-only image during reopen, when another transactional permission update is ongoing is difficult (who know, how to do it?) (remember recent d669ed6ab02849 "block: make bdrv_drop_intermediate() less wrong") 4. Moving qcow2 files to another directory is a problem: you should care to update backing file names in all dependent qcow2 images. So, what about moving libvirt (at least) to not rely on backing file name stored in qcow2 image? Backing chain then should be in xml? Is it hard or not? Finally, will it make the code simpler, or more difficult? Then, if the idea is good in general, what to do on Qemu part? If we want to finally get rid of problem code (see [3.]) we should deprecate something.. Just deprecate support for qcow2 images with backing file specified, requiring user always specify backing chain by hand? I don't see anything that should be changed in qcow2 format itself: no reason to add some kind of restricted bits, etc.. -- Best regards, Vladimir

2 2

[PATCH libvirt v4 00/12] Support AP card, AP queues and AP matrix
by Shalini Chellathurai Saroja 10 Dec '20

10 Dec '20

Add support for AP card devices, AP queues and AP matrix devices in libvirt node device driver. --- v4: - Added virNodeDevAPAdapterParseXML function to extract the adapter parsing logic. - Modified according to review comments. - New patch to mention support for AP devices in NEWS.rst. v3: - Modify schema definition of ap-adapter to support hex values alone. - Modify schema definition of ap-domain to support hex values alone. - Verify domain value of AP queue device to be within the supported range during parsing. - Re-organized patches 6 and 10 according to review comment. - Minor changes according to review comments. v2: - The tests included in the patches to detect the node devices (AP card, AP queues and AP matrix) are moved to separate patches. These patches are not divided further due to the following reasons: - The previous patches that add support for node devices in libvirt are not divided further into smaller patches (eg: 53aec799fa31711ffaeacc7ec17ec6d3c2e3cadf). - It would be easier to identify the patches relevant to support AP node devices. - The number of lines in each of these patches are around 125, which is not too much. - Modified according to review comments. - New patch to detect mdev_types capabilty of AP matrix device is added to this patch series. Boris Fiuczynski (1): node_device: detecting mdev_types capability on ap_matrix device Farhan Ali (1): virsh: nodedev: Filter by AP card and AP queue capabilities Shalini Chellathurai Saroja (10): nodedev: detect AP card device tests: AP card node device nodedev: detect AP queues tests: AP queue node device nodedev: detect AP matrix device tests: AP matrix node device virsh: nodedev: filter by AP Matrix capability node_device: refactor address retrieval of node device node_device: mdev matrix support NEWS: mention node device driver support for AP devices NEWS.rst | 6 + docs/formatnode.html.in | 48 +++- docs/manpages/virsh.rst | 2 +- docs/schemas/nodedev.rng | 46 ++++ include/libvirt/libvirt-nodedev.h | 3 + src/conf/node_device_conf.c | 213 ++++++++++++++++++ src/conf/node_device_conf.h | 41 +++- src/conf/virnodedeviceobj.c | 13 +- src/libvirt-nodedev.c | 3 + src/libvirt_private.syms | 1 + src/node_device/node_device_driver.c | 33 ++- src/node_device/node_device_udev.c | 80 +++++++ tests/nodedevschemadata/ap_07_0038.xml | 9 + tests/nodedevschemadata/ap_card07.xml | 8 + tests/nodedevschemadata/ap_matrix.xml | 7 + .../ap_matrix_mdev_types.xml | 14 ++ ...v_ee0b88c4_f554_4dc1_809d_b2a01e8e48ad.xml | 9 + tests/nodedevxml2xmltest.c | 5 + tools/virsh-nodedev.c | 9 + 19 files changed, 544 insertions(+), 6 deletions(-) create mode 100644 tests/nodedevschemadata/ap_07_0038.xml create mode 100644 tests/nodedevschemadata/ap_card07.xml create mode 100644 tests/nodedevschemadata/ap_matrix.xml create mode 100644 tests/nodedevschemadata/ap_matrix_mdev_types.xml create mode 100644 tests/nodedevschemadata/mdev_ee0b88c4_f554_4dc1_809d_b2a01e8e48ad.xml -- 2.26.2

5 23

[PATCH v2] accel/tcg: Remove deprecated '-tb-size' option
by Philippe Mathieu-Daudé 10 Dec '20

10 Dec '20

The '-tb-size' option (replaced by '-accel tcg,tb-size') is deprecated since 5.0 (commit fe174132478). Remove it. Reviewed-by: Thomas Huth <thuth(a)redhat.com> Reviewed-by: Ján Tomko <jtomko(a)redhat.com> Signed-off-by: Philippe Mathieu-Daudé <philmd(a)redhat.com> --- v2: fixed "Title underline too short." (Thomas) --- docs/system/deprecated.rst | 12 +++++------- accel/tcg/translate-all.c | 2 +- softmmu/vl.c | 8 -------- qemu-options.hx | 8 -------- 4 files changed, 6 insertions(+), 24 deletions(-) diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index 565389697e8..14326063e9a 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -100,13 +100,6 @@ QEMU 5.1 has three options: to the user to load all the images they need. 3. ``-bios <file>`` - Tells QEMU to load the specified file as the firmwrae. -``-tb-size`` option (since 5.0) -''''''''''''''''''''''''''''''' - -QEMU 5.0 introduced an alternative syntax to specify the size of the translation -block cache, ``-accel tcg,tb-size=``. The new syntax deprecates the -previously available ``-tb-size`` option. - ``-show-cursor`` option (since 5.0) ''''''''''''''''''''''''''''''''''' @@ -523,6 +516,11 @@ for the ``id`` parameter, which should now be used instead. The ``-no-kvm`` argument was a synonym for setting ``-machine accel=tcg``. +``-tb-size`` option (removed in 6.0) +'''''''''''''''''''''''''''''''''''' + +QEMU 5.0 introduced an alternative syntax to specify the size of the translation +block cache, ``-accel tcg,tb-size=``. QEMU Machine Protocol (QMP) commands ------------------------------------ diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index 4572b4901fb..b7d50a73d44 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -2379,7 +2379,7 @@ void dump_exec_info(void) qemu_printf("Translation buffer state:\n"); /* * Report total code size including the padding and TB structs; - * otherwise users might think "-tb-size" is not honoured. + * otherwise users might think "-accel tcg,tb-size" is not honoured. * For avg host size we use the precise numbers from tb_tree_stats though. */ qemu_printf("gen code size %zu/%zu\n", diff --git a/softmmu/vl.c b/softmmu/vl.c index e6e0ad5a925..3f052849d8c 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -3639,14 +3639,6 @@ void qemu_init(int argc, char **argv, char **envp) exit(1); } break; - case QEMU_OPTION_tb_size: -#ifndef CONFIG_TCG - error_report("TCG is disabled"); - exit(1); -#endif - warn_report("The -tb-size option is deprecated, use -accel tcg,tb-size instead"); - object_register_sugar_prop(ACCEL_CLASS_NAME("tcg"), "tb-size", optarg); - break; case QEMU_OPTION_icount: icount_opts = qemu_opts_parse_noisily(qemu_find_opts("icount"), optarg, true); diff --git a/qemu-options.hx b/qemu-options.hx index 104632ea343..7ce06290b68 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4080,14 +4080,6 @@ SRST Show cursor. ERST -DEF("tb-size", HAS_ARG, QEMU_OPTION_tb_size, \ - "-tb-size n set TB size\n", QEMU_ARCH_ALL) -SRST -``-tb-size n`` - Set TCG translation block cache size. Deprecated, use - '\ ``-accel tcg,tb-size=n``\ ' instead. -ERST - DEF("incoming", HAS_ARG, QEMU_OPTION_incoming, \ "-incoming tcp:[host]:port[,to=maxport][,ipv4][,ipv6]\n" \ "-incoming rdma:host:port[,ipv4][,ipv6]\n" \ -- 2.26.2

1 0

[PATCH 0/4] Remove deprecated CLI parameters
by Thomas Huth 10 Dec '20

10 Dec '20

Remove some simple CLI parameters that have been deprecated since at least two releass already. Philippe Mathieu-Daudé (1): accel/tcg: Remove deprecated '-tb-size' option Thomas Huth (3): docs/system: Move the list of removed features to a separate file Remove the deprecated -realtime option Remove the deprecated -show-cursor option accel/tcg/translate-all.c | 2 +- docs/system/deprecated.rst | 246 ---------------------------- docs/system/removed-features.rst | 243 +++++++++++++++++++++++++++ qemu-options.hx | 29 +--- softmmu/vl.c | 45 +---- tests/migration/guestperf/engine.py | 2 +- 6 files changed, 247 insertions(+), 320 deletions(-) create mode 100644 docs/system/removed-features.rst -- 2.27.0

2 6

[PATCH] accel/tcg: Remove deprecated '-tb-size' option
by Philippe Mathieu-Daudé 10 Dec '20

10 Dec '20

The '-tb-size' option (replaced by '-accel tcg,tb-size') is deprecated since 5.0 (commit fe174132478). Remove it. Signed-off-by: Philippe Mathieu-Daudé <philmd(a)redhat.com> --- docs/system/deprecated.rst | 12 +++++------- accel/tcg/translate-all.c | 2 +- softmmu/vl.c | 8 -------- qemu-options.hx | 8 -------- 4 files changed, 6 insertions(+), 24 deletions(-) diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index 565389697e8..70bdb62a6d6 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -100,13 +100,6 @@ QEMU 5.1 has three options: to the user to load all the images they need. 3. ``-bios <file>`` - Tells QEMU to load the specified file as the firmwrae. -``-tb-size`` option (since 5.0) -''''''''''''''''''''''''''''''' - -QEMU 5.0 introduced an alternative syntax to specify the size of the translation -block cache, ``-accel tcg,tb-size=``. The new syntax deprecates the -previously available ``-tb-size`` option. - ``-show-cursor`` option (since 5.0) ''''''''''''''''''''''''''''''''''' @@ -523,6 +516,11 @@ for the ``id`` parameter, which should now be used instead. The ``-no-kvm`` argument was a synonym for setting ``-machine accel=tcg``. +``-tb-size`` option (removed in 6.0) +''''''''''''''''''''''''''''''' + +QEMU 5.0 introduced an alternative syntax to specify the size of the translation +block cache, ``-accel tcg,tb-size=``. QEMU Machine Protocol (QMP) commands ------------------------------------ diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index 4572b4901fb..b7d50a73d44 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -2379,7 +2379,7 @@ void dump_exec_info(void) qemu_printf("Translation buffer state:\n"); /* * Report total code size including the padding and TB structs; - * otherwise users might think "-tb-size" is not honoured. + * otherwise users might think "-accel tcg,tb-size" is not honoured. * For avg host size we use the precise numbers from tb_tree_stats though. */ qemu_printf("gen code size %zu/%zu\n", diff --git a/softmmu/vl.c b/softmmu/vl.c index e6e0ad5a925..3f052849d8c 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -3639,14 +3639,6 @@ void qemu_init(int argc, char **argv, char **envp) exit(1); } break; - case QEMU_OPTION_tb_size: -#ifndef CONFIG_TCG - error_report("TCG is disabled"); - exit(1); -#endif - warn_report("The -tb-size option is deprecated, use -accel tcg,tb-size instead"); - object_register_sugar_prop(ACCEL_CLASS_NAME("tcg"), "tb-size", optarg); - break; case QEMU_OPTION_icount: icount_opts = qemu_opts_parse_noisily(qemu_find_opts("icount"), optarg, true); diff --git a/qemu-options.hx b/qemu-options.hx index 104632ea343..7ce06290b68 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4080,14 +4080,6 @@ SRST Show cursor. ERST -DEF("tb-size", HAS_ARG, QEMU_OPTION_tb_size, \ - "-tb-size n set TB size\n", QEMU_ARCH_ALL) -SRST -``-tb-size n`` - Set TCG translation block cache size. Deprecated, use - '\ ``-accel tcg,tb-size=n``\ ' instead. -ERST - DEF("incoming", HAS_ARG, QEMU_OPTION_incoming, \ "-incoming tcp:[host]:port[,to=maxport][,ipv4][,ipv6]\n" \ "-incoming rdma:host:port[,ipv4][,ipv6]\n" \ -- 2.26.2

3 3

[PATCH v3] spec: don't touch existing nwfilters on update
by Nikolay Shirokovskiy 10 Dec '20

10 Dec '20

Nwfilter can be edited by the user and we don't want to overwrite the editings. Also the filters in %{datadir} does not have UUIDs and these are generated on libvirtd start. Thus this patch also fixes regeneration of UUIDs on libvirtd update. Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com> Reviewed-by: Michal Privoznik <mprivozn(a)redhat.com> --- It is a successor to PATCH v2[1]. Diff to v2: - Misc changes according to Andrea's review [1] PATCH v2 https://www.redhat.com/archives/libvir-list/2020-December/msg00399.html libvirt.spec.in | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 880051b..f20a1c7 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1439,9 +1439,13 @@ fi rm -rf %{_localstatedir}/lib/rpm-state/libvirt || : %post daemon-config-nwfilter -cp %{_datadir}/libvirt/nwfilter/*.xml %{_sysconfdir}/libvirt/nwfilter/ -# libvirt saves these files with mode 600 -chmod 600 %{_sysconfdir}/libvirt/nwfilter/*.xml +for datadir_file in %{_datadir}/libvirt/nwfilter/*.xml; do + sysconfdir_file=%{_sysconfdir}/libvirt/nwfilter/$(basename "$datadir_file") + if [ ! -f "$sysconfdir_file" ]; then + # libvirt saves these files with mode 600 + install -m 0600 "$datadir_file" "$sysconfdir_file" + fi +done # Make sure libvirt picks up the new nwfilter defininitons mkdir -p %{_localstatedir}/lib/rpm-state/libvirt || : touch %{_localstatedir}/lib/rpm-state/libvirt/restart || : -- 1.8.3.1

2 1

[libvirt PATCH 0/3] coverity diaries
by Ján Tomko 10 Dec '20

10 Dec '20

Ján Tomko (3): virsh: virshAddressParse: check for malformed address qemuBuildMemoryDeviceStr: check return of qemuBuildDeviceAddressStr hyperv: remove duplicit addr check src/hyperv/hyperv_driver.c | 3 --- src/qemu/qemu_command.c | 3 ++- tools/virsh-domain.c | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) -- 2.26.2

3 6

[PATCH 0/7] fix PCI vs PCIe detection when running libvirtd as root, but unprivileged
by Laine Stump 09 Dec '20

09 Dec '20

I think there's an adequate description in patch 6 (and maybe in the bugzilla record: https://bugzilla.redhat.com/1901685) I already typed a long description once, and git send-email failed due to network problems and threw away everything I typed. I don't feel like typing it again. Laine Stump (7): qemu: use g_autoptr for a virPCIDevice util: simplify calling of virPCIDeviceDetectFunctionLevelReset() util: simplify call to virPCIDeviceDetectPowerManagementReset() util: make read error of PCI config file more detailed util: change call sequence for virPCIDeviceFindCapabilityOffset() util: make virPCIDeviceIsPCIExpress() more intelligent qemu: remove now-redundant check for file length when determining PCIe vs. PCI src/qemu/qemu_domain_address.c | 43 ++----------- src/util/virpci.c | 107 ++++++++++++++++++++++++--------- 2 files changed, 82 insertions(+), 68 deletions(-) -- 2.28.0

3 10

[PATCH] tests: qemucapabilities: Update capabilities for qemu-5.2 release (x86_64)
by Peter Krempa 09 Dec '20

09 Dec '20

qemu-5.2 is out! Let's update the capabilities for the final version. Note that the 'enable-fips' feature vanishing in this update is expected as the removal was tied to a version check (see commit 7b1ed1cd733a0 ). Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- .../caps_5.2.0.x86_64.replies | 505 +++++++++--------- .../caps_5.2.0.x86_64.xml | 5 +- .../fips-enabled.x86_64-latest.args | 1 - 3 files changed, 262 insertions(+), 249 deletions(-) diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies index 140a3312a5..6988ae010f 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies @@ -17,11 +17,11 @@ { "return": { "qemu": { - "micro": 91, - "minor": 1, + "micro": 0, + "minor": 2, "major": 5 }, - "package": "v5.2.0-rc1" + "package": "v5.2.0" }, "id": "libvirt-2" } @@ -1154,8 +1154,8 @@ "parent": "sys-bus-device" }, { - "name": "pc-q35-2.8-machine", - "parent": "generic-pc-machine" + "name": "i82557a", + "parent": "pci-device" }, { "name": "vhost-user-scsi-pci-non-transitional", @@ -1170,12 +1170,12 @@ "parent": "chardev" }, { - "name": "generic-sdhci", - "parent": "sys-bus-device" + "name": "pc-q35-2.8-machine", + "parent": "generic-pc-machine" }, { - "name": "i82557a", - "parent": "pci-device" + "name": "generic-sdhci", + "parent": "sys-bus-device" }, { "name": "virtio-scsi-pci-non-transitional", @@ -1310,12 +1310,12 @@ "parent": "ide-device" }, { - "name": "tcg-accel", - "parent": "accel" + "name": "EPYC-v1-x86_64-cpu", + "parent": "x86_64-cpu" }, { - "name": "piix4-ide", - "parent": "pci-ide" + "name": "tcg-accel", + "parent": "accel" }, { "name": "virtio-balloon-pci", @@ -1350,24 +1350,24 @@ "parent": "pci-device" }, { - "name": "i82551", - "parent": "pci-device" - }, - { - "name": "EPYC-v1-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "pc-i440fx-2.6-machine", + "parent": "generic-pc-machine" }, { "name": "isa-ipmi-kcs", "parent": "isa-device" }, + { + "name": "i82551", + "parent": "pci-device" + }, { "name": "Icelake-Server-noTSX-x86_64-cpu", "parent": "x86_64-cpu" }, { - "name": "pc-i440fx-2.6-machine", - "parent": "generic-pc-machine" + "name": "piix4-ide", + "parent": "pci-ide" }, { "name": "SandyBridge-x86_64-cpu", @@ -1405,14 +1405,14 @@ "name": "kvm-apic", "parent": "apic-common" }, - { - "name": "kvm64-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "isa-pit", "parent": "pit-common" }, + { + "name": "kvm64-x86_64-cpu", + "parent": "x86_64-cpu" + }, { "name": "Broadwell-v4-x86_64-cpu", "parent": "x86_64-cpu" @@ -1461,14 +1461,14 @@ "name": "ati-vga", "parent": "pci-device" }, - { - "name": "pentium3-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "kvm-i8259", "parent": "pic-common" }, + { + "name": "pentium3-x86_64-cpu", + "parent": "x86_64-cpu" + }, { "name": "isa-serial", "parent": "isa-device" @@ -1485,6 +1485,10 @@ "name": "vhost-user-blk-pci-non-transitional", "parent": "vhost-user-blk-pci-base" }, + { + "name": "virtio-rng-pci-non-transitional", + "parent": "virtio-rng-pci-base" + }, { "name": "cirrus-vga", "parent": "pci-device" @@ -1501,17 +1505,13 @@ "name": "pc-i440fx-2.1-machine", "parent": "generic-pc-machine" }, - { - "name": "virtio-serial-pci", - "parent": "virtio-serial-pci-base" - }, { "name": "i82559er", "parent": "pci-device" }, { - "name": "virtio-rng-pci-non-transitional", - "parent": "virtio-rng-pci-base" + "name": "virtio-serial-pci", + "parent": "virtio-serial-pci-base" }, { "name": "Skylake-Client-x86_64-cpu", @@ -1750,11 +1750,11 @@ "parent": "base-sysbus-fdc" }, { - "name": "AMDVI-PCI", + "name": "i82559c", "parent": "pci-device" }, { - "name": "i82559c", + "name": "AMDVI-PCI", "parent": "pci-device" }, { @@ -1989,14 +1989,14 @@ "name": "usb-ehci", "parent": "pci-ehci-usb" }, - { - "name": "pc-i440fx-2.11-machine", - "parent": "generic-pc-machine" - }, { "name": "pxb", "parent": "pci-device" }, + { + "name": "pc-i440fx-2.11-machine", + "parent": "generic-pc-machine" + }, { "name": "AC97", "parent": "pci-device" @@ -2026,8 +2026,8 @@ "parent": "isa-device" }, { - "name": "virtio-iommu-pci-non-transitional", - "parent": "virtio-iommu-device-base" + "name": "hyperv-testdev", + "parent": "isa-device" }, { "name": "scsi-hd", @@ -2074,28 +2074,28 @@ "parent": "x86_64-cpu" }, { - "name": "hyperv-testdev", - "parent": "isa-device" + "name": "virtio-iommu-pci-non-transitional", + "parent": "virtio-iommu-device-base" }, { "name": "s3c-sdhci", "parent": "generic-sdhci" }, { - "name": "Westmere-v2-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "tpm-tis", + "parent": "isa-device" }, { "name": "fw_cfg_mem", "parent": "fw_cfg" }, { - "name": "ccid-card-emulated", - "parent": "ccid-card" + "name": "Westmere-v2-x86_64-cpu", + "parent": "x86_64-cpu" }, { - "name": "tpm-tis", - "parent": "isa-device" + "name": "ccid-card-emulated", + "parent": "ccid-card" }, { "name": "pc-q35-5.1-machine", @@ -2517,14 +2517,14 @@ "name": "vhost-user-gpu", "parent": "virtio-gpu-base" }, - { - "name": "hda-duplex", - "parent": "hda-audio" - }, { "name": "pentium-v1-x86_64-cpu", "parent": "x86_64-cpu" }, + { + "name": "hda-duplex", + "parent": "hda-audio" + }, { "name": "amd-iommu-iommu-memory-region", "parent": "qemu:iommu-memory-region" @@ -2533,10 +2533,6 @@ "name": "can-bus", "parent": "object" }, - { - "name": "virtio-balloon-device", - "parent": "virtio-device" - }, { "name": "Cooperlake-v1-x86_64-cpu", "parent": "x86_64-cpu" @@ -2545,14 +2541,18 @@ "name": "Cascadelake-Server-v3-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "Nehalem-IBRS-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "cfi.pflash01", "parent": "sys-bus-device" }, + { + "name": "virtio-balloon-device", + "parent": "virtio-device" + }, + { + "name": "Nehalem-IBRS-x86_64-cpu", + "parent": "x86_64-cpu" + }, { "name": "pc-q35-2.7-machine", "parent": "generic-pc-machine" @@ -2782,8 +2782,8 @@ "parent": "x86_64-cpu" }, { - "name": "kvm64-v1-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "pcie-root-port", + "parent": "pcie-root-port-base" }, { "name": "IDE", @@ -2793,10 +2793,6 @@ "name": "486-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "pcie-root-port", - "parent": "pcie-root-port-base" - }, { "name": "mptsas1068", "parent": "pci-device" @@ -2805,6 +2801,10 @@ "name": "scsi-block", "parent": "scsi-disk-base" }, + { + "name": "kvm64-v1-x86_64-cpu", + "parent": "x86_64-cpu" + }, { "name": "Snowridge-v1-x86_64-cpu", "parent": "x86_64-cpu" @@ -4006,11 +4006,6 @@ "name": "x-no-kvm-msix", "type": "bool" }, - { - "default-value": false, - "name": "x-no-mmap", - "type": "bool" - }, { "default-value": 0, "name": "yres", @@ -4022,6 +4017,17 @@ "description": "on/off", "type": "bool" }, + { + "default-value": "on", + "name": "x-pre-copy-dirty-page-tracking", + "description": "on/off/auto", + "type": "OnOffAuto" + }, + { + "name": "x-nv-gpudirect-clique", + "description": "NVIDIA GPUDirect Clique ID (0 - 15)", + "type": "uint4" + }, { "default-value": "off", "name": "x-msix-relocation", @@ -4057,6 +4063,11 @@ "name": "x-pci-sub-vendor-id", "type": "uint32" }, + { + "default-value": false, + "name": "x-enable-migration", + "type": "bool" + }, { "default-value": false, "name": "x-no-geforce-quirks", @@ -4106,9 +4117,9 @@ "type": "bool" }, { - "name": "x-nv-gpudirect-clique", - "description": "NVIDIA GPUDirect Clique ID (0 - 15)", - "type": "uint4" + "default-value": 4294967295, + "name": "x-pci-vendor-id", + "type": "uint32" }, { "default-value": 0, @@ -4116,9 +4127,9 @@ "type": "uint32" }, { - "default-value": 4294967295, - "name": "x-pci-vendor-id", - "type": "uint32" + "default-value": false, + "name": "x-no-mmap", + "type": "bool" }, { "default-value": false, @@ -4809,7 +4820,6 @@ { "default-value": false, "name": "removable", - "description": "on/off", "type": "bool" }, { @@ -4834,6 +4844,11 @@ "name": "opt_io_size", "type": "size" }, + { + "default-value": false, + "name": "commandlog", + "type": "bool" + }, { "name": "drive", "description": "Node name or ID of a block device to use as a backend", @@ -10724,6 +10739,170 @@ ], "option": "vnc" }, + { + "parameters": [ + { + "name": "resourcecontrol", + "type": "string" + }, + { + "name": "spawn", + "type": "string" + }, + { + "name": "elevateprivileges", + "type": "string" + }, + { + "name": "obsolete", + "type": "string" + }, + { + "name": "enable", + "type": "boolean" + } + ], + "option": "sandbox" + }, + { + "parameters": [ + ], + "option": "smbios" + }, + { + "parameters": [ + { + "name": "rendernode", + "type": "string" + }, + { + "name": "gl", + "type": "boolean" + }, + { + "name": "head", + "type": "number" + }, + { + "name": "display", + "type": "string" + }, + { + "name": "seamless-migration", + "type": "boolean" + }, + { + "name": "playback-compression", + "type": "boolean" + }, + { + "name": "agent-mouse", + "type": "boolean" + }, + { + "name": "streaming-video", + "type": "string" + }, + { + "name": "zlib-glz-wan-compression", + "type": "string" + }, + { + "name": "jpeg-wan-compression", + "type": "string" + }, + { + "name": "image-compression", + "type": "string" + }, + { + "name": "plaintext-channel", + "type": "string" + }, + { + "name": "tls-channel", + "type": "string" + }, + { + "name": "tls-ciphers", + "type": "string" + }, + { + "name": "x509-dh-key-file", + "type": "string" + }, + { + "name": "x509-cacert-file", + "type": "string" + }, + { + "name": "x509-cert-file", + "type": "string" + }, + { + "name": "x509-key-password", + "type": "string" + }, + { + "name": "x509-key-file", + "type": "string" + }, + { + "name": "x509-dir", + "type": "string" + }, + { + "name": "sasl", + "type": "boolean" + }, + { + "name": "disable-agent-file-xfer", + "type": "boolean" + }, + { + "name": "disable-copy-paste", + "type": "boolean" + }, + { + "name": "disable-ticketing", + "type": "boolean" + }, + { + "name": "password", + "type": "string" + }, + { + "name": "unix", + "type": "boolean" + }, + { + "name": "ipv6", + "type": "boolean" + }, + { + "name": "ipv4", + "type": "boolean" + }, + { + "name": "addr", + "type": "string" + }, + { + "name": "tls-port", + "type": "number" + }, + { + "name": "port", + "type": "number" + } + ], + "option": "spice" + }, + { + "parameters": [ + ], + "option": "acpi" + }, { "parameters": [ { @@ -10913,170 +11092,6 @@ ], "option": "fsdev" }, - { - "parameters": [ - { - "name": "rendernode", - "type": "string" - }, - { - "name": "gl", - "type": "boolean" - }, - { - "name": "head", - "type": "number" - }, - { - "name": "display", - "type": "string" - }, - { - "name": "seamless-migration", - "type": "boolean" - }, - { - "name": "playback-compression", - "type": "boolean" - }, - { - "name": "agent-mouse", - "type": "boolean" - }, - { - "name": "streaming-video", - "type": "string" - }, - { - "name": "zlib-glz-wan-compression", - "type": "string" - }, - { - "name": "jpeg-wan-compression", - "type": "string" - }, - { - "name": "image-compression", - "type": "string" - }, - { - "name": "plaintext-channel", - "type": "string" - }, - { - "name": "tls-channel", - "type": "string" - }, - { - "name": "tls-ciphers", - "type": "string" - }, - { - "name": "x509-dh-key-file", - "type": "string" - }, - { - "name": "x509-cacert-file", - "type": "string" - }, - { - "name": "x509-cert-file", - "type": "string" - }, - { - "name": "x509-key-password", - "type": "string" - }, - { - "name": "x509-key-file", - "type": "string" - }, - { - "name": "x509-dir", - "type": "string" - }, - { - "name": "sasl", - "type": "boolean" - }, - { - "name": "disable-agent-file-xfer", - "type": "boolean" - }, - { - "name": "disable-copy-paste", - "type": "boolean" - }, - { - "name": "disable-ticketing", - "type": "boolean" - }, - { - "name": "password", - "type": "string" - }, - { - "name": "unix", - "type": "boolean" - }, - { - "name": "ipv6", - "type": "boolean" - }, - { - "name": "ipv4", - "type": "boolean" - }, - { - "name": "addr", - "type": "string" - }, - { - "name": "tls-port", - "type": "number" - }, - { - "name": "port", - "type": "number" - } - ], - "option": "spice" - }, - { - "parameters": [ - { - "name": "resourcecontrol", - "type": "string" - }, - { - "name": "spawn", - "type": "string" - }, - { - "name": "elevateprivileges", - "type": "string" - }, - { - "name": "obsolete", - "type": "string" - }, - { - "name": "enable", - "type": "boolean" - } - ], - "option": "sandbox" - }, - { - "parameters": [ - ], - "option": "acpi" - }, - { - "parameters": [ - ], - "option": "smbios" - }, { "parameters": [ { diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml index 5e9fa8575a..cebacc249d 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -68,7 +68,6 @@ <flag name='kvm-pit-lost-tick-policy'/> <flag name='boot-strict'/> <flag name='pvpanic'/> - <flag name='enable-fips'/> <flag name='spice-file-xfer-disable'/> <flag name='usb-kbd'/> <flag name='msg-timestamp'/> @@ -251,10 +250,10 @@ <flag name='fsdev.createmode'/> <flag name='dc390'/> <flag name='am53c974'/> - <version>5001091</version> + <version>5002000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100243</microcodeVersion> - <package>v5.2.0-rc1</package> + <package>v5.2.0</package> <arch>x86_64</arch> <hostCPU type='kvm' model='base' migratability='yes'> <property name='vmx-entry-load-rtit-ctl' type='boolean' value='false'/> diff --git a/tests/qemuxml2argvdata/fips-enabled.x86_64-latest.args b/tests/qemuxml2argvdata/fips-enabled.x86_64-latest.args index c06046c398..4740e52499 100644 --- a/tests/qemuxml2argvdata/fips-enabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/fips-enabled.x86_64-latest.args @@ -12,7 +12,6 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --enable-fips \ -machine pc,accel=tcg,usb=off,dump-guest-core=off,memory-backend=pc.ram \ -cpu qemu64 \ -m 214 \ -- 2.29.2

2 1

[libvirt PATCH v3 00/10] Add missing feature detection to sync tool in cpu_map
by Tim Wiederhake 09 Dec '20

09 Dec '20

sync_qemu_i386.py in src/cpu_map is a tool to sync CPU models from qemu with libvirt. It currently has no provisions for detecting new features that are not implemented in libvirt yet. This series changes that. Currently missing x86 CPU models: * "Denverton" * "KnightsMill" * "Snowridge" Currently missing x86 CPU features: * "core-capability" * "fsrm" * "split-lock-detect" This series adds "core-capability", "fsrm", "split-lock-detect" and the CPU model for "Snowridge". V1: https://www.redhat.com/archives/libvir-list/2020-November/msg01002.html V2: https://www.redhat.com/archives/libvir-list/2020-November/msg01023.html Tim Wiederhake (10): cpu_map: sync_qemu_cpu_i386: Factor out translation of vendors cpu_map: sync_qemu_cpu_i386: Factor out translation of features cpu_map: sync_qemu_cpu_i386: Translate features in model versions cpu_map: sync_qemu_cpu_i386: Simplify ignore features cpu_map: sync_qemu_cpu_i386: Add missing features to translation table cpu_map: sync_qemu_cpu_i386: Detect features missing in libvirt cpu_map: Add support for fsrm CPU feature cpu_map: Add support for core-capability CPU feature cpu_map: Add support for split-lock-detect CPU feature cpu_map: Define and enable Snowridge model src/cpu_map/index.xml | 1 + src/cpu_map/meson.build | 1 + src/cpu_map/sync_qemu_i386.py | 340 ++++++++++-------- src/cpu_map/x86_Snowridge.xml | 71 ++++ src/cpu_map/x86_features.xml | 11 + .../x86_64-cpuid-Ice-Lake-Server-guest.xml | 1 + .../x86_64-cpuid-Ice-Lake-Server-host.xml | 1 + .../domaincapsdata/qemu_4.1.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_4.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_4.1.0.x86_64.xml | 1 + .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 1 + .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 1 + .../domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 1 + .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 1 + 22 files changed, 294 insertions(+), 147 deletions(-) create mode 100644 src/cpu_map/x86_Snowridge.xml -- 2.26.2

2 23

[PATCH 0/2] qemuDomainCheckpointLoad: Two fixes
by Peter Krempa 09 Dec '20

09 Dec '20

Peter Krempa (2): qemuDomainCheckpointLoad: Don't align disks when restoring config from disk qemuDomainCheckpointLoad: Remove stale comment src/qemu/qemu_driver.c | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) -- 2.29.2

2 3

[PATCH v3 00/14] move checks from parse to validate callbacks
by Daniel Henrique Barboza 09 Dec '20

09 Dec '20

This is the v3 of https://www.redhat.com/archives/libvir-list/2020-December/msg00419.html Michal mentioned in his v2 review that we should move these validations out of domain_conf.c to a new file. Let's create a new file called domain_validate.c and start move the validations done in v2 into it, instead of pushing the already reviewed v2 series just to have more stuff to be moved later on. A follow up series will push more validations from domain_conf.c to domain_validate.c. Michal's R-bs were kept in all patches but patch 01. Daniel Henrique Barboza (14): domain_conf: move boot timeouts check to domain_validate.c domain_conf.c: move primary video check to validate callback domain_conf.c: move virDomainVideoDefValidate() to domain_validate.c domain_conf.c: move QXL attributes check to virDomainVideoDefValidate() domain_conf: move virDomainDiskDefValidate() to domain_validate.c domain_conf: move vendor, product and tray checks to domain_validate.c domain_validate.c: rename virSecurityDeviceLabelDefValidateXML() domain_conf: move all ChrSource checks to domain_validate.c domain_conf.c: move smartcard address check to domain_validate.c domain_conf.c: move blkio path check to domain_validate.c domain_conf.c: move virDomainControllerDefValidate() to domain_validate.c domain_conf: move virDomainPCIControllerOpts checks to domain_validate.c domain_conf: move pci-root/pcie-root address check to domain_validate.c domain_conf.c: move idmapEntry checks to domain_validate.c po/POTFILES.in | 1 + src/conf/domain_conf.c | 562 +-------------- src/conf/domain_validate.c | 637 ++++++++++++++++++ src/conf/domain_validate.h | 47 ++ src/conf/meson.build | 1 + tests/qemuxml2argvdata/pci-root-address.err | 2 +- .../pseries-default-phb-numa-node.err | 2 +- .../video-multiple-primaries.err | 1 + .../video-multiple-primaries.xml | 32 + tests/qemuxml2argvtest.c | 14 +- 10 files changed, 756 insertions(+), 543 deletions(-) create mode 100644 src/conf/domain_validate.c create mode 100644 src/conf/domain_validate.h create mode 100644 tests/qemuxml2argvdata/video-multiple-primaries.err create mode 100644 tests/qemuxml2argvdata/video-multiple-primaries.xml -- 2.26.2

3 20

[PATCH v2] spec: don't touch existing nwfilters on update
by Nikolay Shirokovskiy 09 Dec '20

09 Dec '20

Nwfilter can be edited by the user and we don't want to overwrite the editings. Also the filters in %{datadir} does not have UUIDs and these are generated on libvirtd start. Thus this patch also fixes regeneration of UUIDs on libvirtd update. Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com> --- It is a successor to original version of the patch [1]. The discussion can be found in [2]. Diff to v1: - just keep existing nwfilters untouched instead of bringing new version of nwfilter while keeping UUID [1] https://www.redhat.com/archives/libvir-list/2020-October/msg01357.html [2] https://www.redhat.com/archives/libvir-list/2020-December/msg00260.html libvirt.spec.in | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 880051b..98914ce 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1439,12 +1439,21 @@ fi rm -rf %{_localstatedir}/lib/rpm-state/libvirt || : %post daemon-config-nwfilter -cp %{_datadir}/libvirt/nwfilter/*.xml %{_sysconfdir}/libvirt/nwfilter/ -# libvirt saves these files with mode 600 -chmod 600 %{_sysconfdir}/libvirt/nwfilter/*.xml +restart_daemon=0 +for dfile in %{_datadir}/libvirt/nwfilter/*.xml; do + sfile=%{_sysconfdir}/libvirt/nwfilter/`basename $dfile` + if [ ! -f "$sfile" ]; then + cp "$dfile" "$sfile" + # libvirt saves these files with mode 600 + chmod 600 "$sfile" + restart_daemon=1 + fi +done # Make sure libvirt picks up the new nwfilter defininitons -mkdir -p %{_localstatedir}/lib/rpm-state/libvirt || : -touch %{_localstatedir}/lib/rpm-state/libvirt/restart || : +if [ $restart_daemon -eq 1 ]; then + mkdir -p %{_localstatedir}/lib/rpm-state/libvirt || : + touch %{_localstatedir}/lib/rpm-state/libvirt/restart || : +fi %posttrans daemon-config-nwfilter if [ -f %{_localstatedir}/lib/rpm-state/libvirt/restart ]; then -- 1.8.3.1

3 2

[libvirt PATCH] qemu: Simplify size check for ppc64 NVDIMMs
by Andrea Bolognani 09 Dec '20

09 Dec '20

We already calculated the guest area, which is what is subject to minimum size requirements, a few lines earlier. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/qemu/qemu_domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index f14a15d3b4..4d007bc4a0 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5363,7 +5363,7 @@ qemuDomainNVDimmAlignSizePseries(virDomainMemoryDefPtr mem) /* Align down guest_area. 256MiB is the minimum size. Error * out if target_size is smaller than 256MiB + label_size, * since aligning it up will cause QEMU errors. */ - if (mem->size < (ppc64AlignSize + mem->labelsize)) { + if (guestArea < ppc64AlignSize) { virReportError(VIR_ERR_XML_ERROR, "%s", _("minimum target size for the NVDIMM " "must be 256MB plus the label size")); -- 2.26.2

2 2

[PATCH] qemu: Fix logic bug in inactive snapshot deletion
by Peter Krempa 09 Dec '20

09 Dec '20

Commit 926563dc3a6 which refactored the function call deleting the snapshot's on disk state introduced a logic bug, which skips over the deletion of libvirt metadata after the disk state deletion is done. To fix it we must not return early. Resolves: https://gitlab.com/libvirt/libvirt/-/issues/109 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_domain.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index d6fded9dd1..1af1e4dac8 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6667,7 +6667,8 @@ qemuDomainSnapshotDiscard(virQEMUDriverPtr driver, if (!def) def = vm->def; - return qemuDomainSnapshotForEachQcow2(driver, def, snap, "-d", true); + if (qemuDomainSnapshotForEachQcow2(driver, def, snap, "-d", true) < 0) + return -1; } else { priv = vm->privateData; qemuDomainObjEnterMonitor(driver, vm); -- 2.29.2

2 1

[PATCH v2 0/9] move checks from parse to validate callbacks
by Daniel Henrique Barboza 08 Dec '20

08 Dec '20

Hi, This is the respin of [1] after the reviews from Michal. Although we're pushing code to validate callbacks instead of post parse functions, the idea and motivation is still in line with [2]. [1] https://www.redhat.com/archives/libvir-list/2020-November/msg01409.html [2] https://gitlab.com/libvirt/libvirt/-/issues/7 Daniel Henrique Barboza (9): domain_conf.c: move boot related timeouts check to validate callback domain_conf.c: move primary video check to validate callback domain_conf.c: move QXL attributes check to virDomainVideoDefValidate() domain_conf.c: move vendor, product and tray checks to validate callback domain_conf.c: move smartcard address check to validate callback domain_conf.c: move blkio path check to validate callback domain_conf.c: move virDomainPCIControllerOpts checks to validate callback domain_conf.c: move pci-root/pcie-root address check to validateCB domain_conf.c: move idmapEntry checks to validate callback src/conf/domain_conf.c | 353 +++++++++++------- tests/qemuxml2argvdata/pci-root-address.err | 2 +- .../pseries-default-phb-numa-node.err | 2 +- .../video-multiple-primaries.err | 1 + .../video-multiple-primaries.xml | 32 ++ tests/qemuxml2argvtest.c | 14 +- 6 files changed, 268 insertions(+), 136 deletions(-) create mode 100644 tests/qemuxml2argvdata/video-multiple-primaries.err create mode 100644 tests/qemuxml2argvdata/video-multiple-primaries.xml -- 2.26.2

2 13

[libvirt PATCH 0/3] gitlab: refresh containers
by Daniel P. Berrangé 08 Dec '20

08 Dec '20

This syncs with latest state of libvirt-ci.git Daniel P. Berrang=C3=A9 (3): gitlab: re-generate container images from lcitool gitlab: refresh containers with lcitool for fully minimized base ci: replace "libvirt-" prefix with "ci-" in dockerfiles .gitlab-ci.yml | 22 +++++++-------- ...os-7.Dockerfile =3D> ci-centos-7.Dockerfile} | 21 ++------------ ...os-8.Dockerfile =3D> ci-centos-8.Dockerfile} | 22 ++------------- ...Dockerfile =3D> ci-centos-stream.Dockerfile} | 22 ++------------- ... =3D> ci-debian-10-cross-aarch64.Dockerfile} | 22 ++------------- ...e =3D> ci-debian-10-cross-armv6l.Dockerfile} | 22 ++------------- ...e =3D> ci-debian-10-cross-armv7l.Dockerfile} | 22 ++------------- ...ile =3D> ci-debian-10-cross-i686.Dockerfile} | 22 ++------------- ...ile =3D> ci-debian-10-cross-mips.Dockerfile} | 22 ++------------- ...=3D> ci-debian-10-cross-mips64el.Dockerfile} | 22 ++------------- ...e =3D> ci-debian-10-cross-mipsel.Dockerfile} | 22 ++------------- ... =3D> ci-debian-10-cross-ppc64le.Dockerfile} | 22 ++------------- ...le =3D> ci-debian-10-cross-s390x.Dockerfile} | 22 ++------------- ...-10.Dockerfile =3D> ci-debian-10.Dockerfile} | 22 ++------------- ...=3D> ci-debian-sid-cross-aarch64.Dockerfile} | 25 ++--------------- ... =3D> ci-debian-sid-cross-armv6l.Dockerfile} | 25 ++--------------- ... =3D> ci-debian-sid-cross-armv7l.Dockerfile} | 25 ++--------------- ...le =3D> ci-debian-sid-cross-i686.Dockerfile} | 25 ++--------------- ...> ci-debian-sid-cross-mips64el.Dockerfile} | 25 ++--------------- ... =3D> ci-debian-sid-cross-mipsel.Dockerfile} | 25 ++--------------- ...=3D> ci-debian-sid-cross-ppc64le.Dockerfile} | 25 ++--------------- ...e =3D> ci-debian-sid-cross-s390x.Dockerfile} | 25 ++--------------- ...id.Dockerfile =3D> ci-debian-sid.Dockerfile} | 25 ++--------------- ...-32.Dockerfile =3D> ci-fedora-32.Dockerfile} | 24 ++-------------- ...-31.Dockerfile =3D> ci-fedora-33.Dockerfile} | 28 ++----------------- ...i-fedora-rawhide-cross-mingw32.Dockerfile} | 24 ++-------------- ...i-fedora-rawhide-cross-mingw64.Dockerfile} | 24 ++-------------- ...ockerfile =3D> ci-fedora-rawhide.Dockerfile} | 24 ++-------------- ....Dockerfile =3D> ci-opensuse-151.Dockerfile} | 23 ++------------- ...4.Dockerfile =3D> ci-ubuntu-1804.Dockerfile} | 22 ++------------- ...4.Dockerfile =3D> ci-ubuntu-2004.Dockerfile} | 22 ++------------- ci/containers/refresh | 14 +++++----- 32 files changed, 82 insertions(+), 655 deletions(-) rename ci/containers/{libvirt-centos-7.Dockerfile =3D> ci-centos-7.Dockerfil= e} (92%) rename ci/containers/{libvirt-centos-8.Dockerfile =3D> ci-centos-8.Dockerfil= e} (88%) rename ci/containers/{libvirt-centos-stream.Dockerfile =3D> ci-centos-stream= .Dockerfile} (88%) rename ci/containers/{libvirt-debian-10-cross-aarch64.Dockerfile =3D> ci-deb= ian-10-cross-aarch64.Dockerfile} (90%) rename ci/containers/{libvirt-debian-10-cross-armv6l.Dockerfile =3D> ci-debi= an-10-cross-armv6l.Dockerfile} (90%) rename ci/containers/{libvirt-debian-10-cross-armv7l.Dockerfile =3D> ci-debi= an-10-cross-armv7l.Dockerfile} (90%) rename ci/containers/{libvirt-debian-10-cross-i686.Dockerfile =3D> ci-debian= -10-cross-i686.Dockerfile} (90%) rename ci/containers/{libvirt-debian-10-cross-mips.Dockerfile =3D> ci-debian= -10-cross-mips.Dockerfile} (90%) rename ci/containers/{libvirt-debian-10-cross-mips64el.Dockerfile =3D> ci-de= bian-10-cross-mips64el.Dockerfile} (91%) rename ci/containers/{libvirt-debian-10-cross-mipsel.Dockerfile =3D> ci-debi= an-10-cross-mipsel.Dockerfile} (90%) rename ci/containers/{libvirt-debian-10-cross-ppc64le.Dockerfile =3D> ci-deb= ian-10-cross-ppc64le.Dockerfile} (90%) rename ci/containers/{libvirt-debian-10-cross-s390x.Dockerfile =3D> ci-debia= n-10-cross-s390x.Dockerfile} (90%) rename ci/containers/{libvirt-debian-10.Dockerfile =3D> ci-debian-10.Dockerf= ile} (87%) rename ci/containers/{libvirt-debian-sid-cross-aarch64.Dockerfile =3D> ci-de= bian-sid-cross-aarch64.Dockerfile} (88%) rename ci/containers/{libvirt-debian-sid-cross-armv6l.Dockerfile =3D> ci-deb= ian-sid-cross-armv6l.Dockerfile} (88%) rename ci/containers/{libvirt-debian-sid-cross-armv7l.Dockerfile =3D> ci-deb= ian-sid-cross-armv7l.Dockerfile} (88%) rename ci/containers/{libvirt-debian-sid-cross-i686.Dockerfile =3D> ci-debia= n-sid-cross-i686.Dockerfile} (88%) rename ci/containers/{libvirt-debian-sid-cross-mips64el.Dockerfile =3D> ci-d= ebian-sid-cross-mips64el.Dockerfile} (88%) rename ci/containers/{libvirt-debian-sid-cross-mipsel.Dockerfile =3D> ci-deb= ian-sid-cross-mipsel.Dockerfile} (88%) rename ci/containers/{libvirt-debian-sid-cross-ppc64le.Dockerfile =3D> ci-de= bian-sid-cross-ppc64le.Dockerfile} (88%) rename ci/containers/{libvirt-debian-sid-cross-s390x.Dockerfile =3D> ci-debi= an-sid-cross-s390x.Dockerfile} (88%) rename ci/containers/{libvirt-debian-sid.Dockerfile =3D> ci-debian-sid.Docke= rfile} (84%) rename ci/containers/{libvirt-fedora-32.Dockerfile =3D> ci-fedora-32.Dockerf= ile} (85%) rename ci/containers/{libvirt-fedora-31.Dockerfile =3D> ci-fedora-33.Dockerf= ile} (83%) rename ci/containers/{libvirt-fedora-rawhide-cross-mingw32.Dockerfile =3D> c= i-fedora-rawhide-cross-mingw32.Dockerfile} (82%) rename ci/containers/{libvirt-fedora-rawhide-cross-mingw64.Dockerfile =3D> c= i-fedora-rawhide-cross-mingw64.Dockerfile} (82%) rename ci/containers/{libvirt-fedora-rawhide.Dockerfile =3D> ci-fedora-rawhi= de.Dockerfile} (85%) rename ci/containers/{libvirt-opensuse-151.Dockerfile =3D> ci-opensuse-151.D= ockerfile} (85%) rename ci/containers/{libvirt-ubuntu-1804.Dockerfile =3D> ci-ubuntu-1804.Doc= kerfile} (87%) rename ci/containers/{libvirt-ubuntu-2004.Dockerfile =3D> ci-ubuntu-2004.Doc= kerfile} (87%) --=20 2.28.0

2 4

[PATCH 0/4] qemu: Don't use updated qemuCaps in validation code
by Peter Krempa 08 Dec '20

08 Dec '20

See patch 4/4 for the justification. CI run: https://gitlab.com/pipo.sk/libvirt/-/pipelines/226815271 since the series is modifying stuff I don't compile usually. Peter Krempa (4): virDomainDefValidate: Add per-run 'opaque' data qemu: validate: Don't check that qemuCaps is non-NULL qemuValidateDomainDeviceDefFS: Fix block indentation qemu: validate: Prefer existing qemuCaps src/bhyve/bhyve_domain.c | 3 +- src/conf/domain_conf.c | 21 +++--- src/conf/domain_conf.h | 9 ++- src/qemu/qemu_process.c | 2 +- src/qemu/qemu_validate.c | 138 ++++++++++++++++++++------------------- src/qemu/qemu_validate.h | 7 +- src/vz/vz_driver.c | 6 +- 7 files changed, 103 insertions(+), 83 deletions(-) -- 2.28.0

3 8

[PATCHv2 0/2] Use netlink to create veth device pair when netlink is supported
by Shi Lei 08 Dec '20

08 Dec '20

V1 here: https://www.redhat.com/archives/libvir-list/2020-November/msg00898.html Since V1: * Include <linux/veth.h> rather than introducing enum VETH_INFO_* * Have complete functions within an #ifdefs rather than putting #ifdefs in function Shi Lei (2): util:netlink: Enable virNetlinkNewLink to support veth util:veth: Create veth device pair by netlink src/util/virnetdevveth.c | 85 ++++++++++++++++++++++++++-------------- src/util/virnetlink.c | 14 +++++++ src/util/virnetlink.h | 1 + 3 files changed, 71 insertions(+), 29 deletions(-) -- 2.25.1

3 7

[PATCH 0/2] virsh: Fix set-user-sshkeys command
by Michal Privoznik 08 Dec '20

08 Dec '20

The first patch is a bug fix, the second is an improvement. Michal Prívozník (2): virsh: Fix logical error in cmdSetUserSSHKeys() virsh: cmdSetUserSSHKeys: Error early if the file doesn't contain any keys tools/virsh-domain.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) -- 2.26.2

2 3

[PATCH 0/8] qemu: Improve nodename lookup and format index for backup disks
by Peter Krempa 08 Dec '20

08 Dec '20

Peter Krempa (8): qemuDomainDiskLookupByNodename: Simplify node name lookup qemuDomainGetStorageSourceByDevstr: Use virDomainDiskByTarget qemuDomainGetStorageSourceByDevstr: Avoid logged errors backup: Move file format check from parser to qemu driver virDomainBackupDiskDefParseXML: Use virDomainStorageSourceParseBase qemuDomainDiskLookupByNodename: Lookup also backup 'store' nodenames qemuDomainGetStorageSourceByDevstr: Lookup also backup 'store' nodenames conf: backup: Format index of 'store' docs/formatbackup.rst | 4 + src/conf/backup_conf.c | 46 ++++------- src/qemu/qemu_backup.c | 10 ++- src/qemu/qemu_domain.c | 78 ++++++++++++------- src/qemu/qemu_domain.h | 4 +- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_process.c | 7 +- .../qemustatusxml2xmldata/backup-pull-in.xml | 2 +- 8 files changed, 89 insertions(+), 64 deletions(-) -- 2.28.0

2 9

[PATCH] qemuxml2argvtest: Add 'nvme' disks into the 'disk-slices' case
by Peter Krempa 08 Dec '20

08 Dec '20

Test slices on top of nvme-backed disks. Note that the changes in seemingly irrelevant parts of the output are due to re-naming the nodenames. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- .../disk-slices.x86_64-latest.args | 63 ++++++++++++------- tests/qemuxml2argvdata/disk-slices.xml | 25 ++++++++ .../disk-slices.x86_64-latest.xml | 25 ++++++++ 3 files changed, 92 insertions(+), 21 deletions(-) diff --git a/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args b/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args index c4e1384f4d..a24b3395e2 100644 --- a/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args @@ -30,37 +30,58 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -boot strict=on \ -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/raw.img",\ -"node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw",\ -"offset":1234,"size":321,"file":"libvirt-4-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0x2,drive=libvirt-4-format,\ +"node-name":"libvirt-6-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-6-format","read-only":false,"driver":"raw",\ +"offset":1234,"size":321,"file":"libvirt-6-storage"}' \ +-device virtio-blk-pci,bus=pci.0,addr=0x2,drive=libvirt-6-format,\ id=virtio-disk0,bootindex=1 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/raw.img",\ -"node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"driver":"raw","node-name":"libvirt-3-slice-sto","offset":9876,\ -"size":123456789,"file":"libvirt-3-storage","auto-read-only":true,\ +"node-name":"libvirt-5-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"driver":"raw","node-name":"libvirt-5-slice-sto","offset":9876,\ +"size":123456789,"file":"libvirt-5-storage","auto-read-only":true,\ "discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-3-format","read-only":true,"driver":"qcow2",\ -"file":"libvirt-3-slice-sto","backing":null}' \ +-blockdev '{"node-name":"libvirt-5-format","read-only":true,"driver":"qcow2",\ +"file":"libvirt-5-slice-sto","backing":null}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/overlay.qcow2",\ -"node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"qcow2",\ -"file":"libvirt-2-storage","backing":"libvirt-3-format"}' \ --device virtio-blk-pci,bus=pci.0,addr=0x3,drive=libvirt-2-format,\ +"node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"qcow2",\ +"file":"libvirt-4-storage","backing":"libvirt-5-format"}' \ +-device virtio-blk-pci,bus=pci.0,addr=0x3,drive=libvirt-4-format,\ id=virtio-disk1 \ --object secret,id=libvirt-1-format-encryption-secret0,\ +-object secret,id=libvirt-3-format-encryption-secret0,\ data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/luks.img",\ -"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"driver":"raw","node-name":"libvirt-1-slice-sto","offset":1234,\ -"size":321,"file":"libvirt-1-storage","auto-read-only":true,\ +"node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"driver":"raw","node-name":"libvirt-3-slice-sto","offset":1234,\ +"size":321,"file":"libvirt-3-storage","auto-read-only":true,\ "discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"luks",\ -"key-secret":"libvirt-1-format-encryption-secret0",\ -"file":"libvirt-1-slice-sto"}' \ --device virtio-blk-pci,bus=pci.0,addr=0x4,drive=libvirt-1-format,\ +-blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"luks",\ +"key-secret":"libvirt-3-format-encryption-secret0",\ +"file":"libvirt-3-slice-sto"}' \ +-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=libvirt-3-format,\ id=virtio-disk2 \ +-blockdev '{"driver":"nvme","device":"0000:02:00.0","namespace":1,\ +"node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw",\ +"offset":1234,"size":321,"file":"libvirt-2-storage"}' \ +-device virtio-blk-pci,bus=pci.0,addr=0x6,drive=libvirt-2-format,\ +id=virtio-disk3 \ +-object secret,id=libvirt-1-format-encryption-secret0,\ +data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\ +keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \ +-blockdev '{"driver":"nvme","device":"0001:02:00.0","namespace":2,\ +"node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},\ +"auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"driver":"raw","node-name":"libvirt-1-slice-sto","offset":1234,\ +"size":321,"file":"libvirt-1-storage","auto-read-only":true,"discard":"unmap",\ +"cache":{"direct":true,"no-flush":false}}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,\ +"cache":{"direct":true,"no-flush":false},"driver":"qcow2",\ +"encrypt":{"format":"luks","key-secret":"libvirt-1-format-encryption-secret0"},\ +"file":"libvirt-1-slice-sto"}' \ +-device virtio-blk-pci,bus=pci.0,addr=0x7,drive=libvirt-1-format,\ +id=virtio-disk4,write-cache=on \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ resourcecontrol=deny \ diff --git a/tests/qemuxml2argvdata/disk-slices.xml b/tests/qemuxml2argvdata/disk-slices.xml index 5c6f29d154..1675766a46 100644 --- a/tests/qemuxml2argvdata/disk-slices.xml +++ b/tests/qemuxml2argvdata/disk-slices.xml @@ -51,6 +51,31 @@ <backingStore/> <target dev='vdc' bus='virtio'/> </disk> + <disk type='nvme' device='disk'> + <driver name='qemu' type='raw'/> + <source type='pci' managed='no' namespace='1'> + <address domain='0x0000' bus='0x02' slot='0x00' function='0x0'/> + <slices> + <slice type='storage' offset='1234' size='321'/> + </slices> + </source> + <target dev='vdd' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> + </disk> + <disk type='nvme' device='disk'> + <driver name='qemu' type='qcow2' cache='none'/> + <source type='pci' managed='no' namespace='2'> + <address domain='0x0001' bus='0x02' slot='0x00' function='0x0'/> + <slices> + <slice type='storage' offset='1234' size='321'/> + </slices> + <encryption format='luks'> + <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/> + </encryption> + </source> + <target dev='vde' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> + </disk> <controller type='usb'/> <controller type='pci' model='pci-root'/> <memballoon model='virtio'/> diff --git a/tests/qemuxml2xmloutdata/disk-slices.x86_64-latest.xml b/tests/qemuxml2xmloutdata/disk-slices.x86_64-latest.xml index 4f4abcda1f..a02820a104 100644 --- a/tests/qemuxml2xmloutdata/disk-slices.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/disk-slices.x86_64-latest.xml @@ -57,6 +57,31 @@ <target dev='vdc' bus='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </disk> + <disk type='nvme' device='disk'> + <driver name='qemu' type='raw'/> + <source type='pci' managed='no' namespace='1'> + <address domain='0x0000' bus='0x02' slot='0x00' function='0x0'/> + <slices> + <slice type='storage' offset='1234' size='321'/> + </slices> + </source> + <target dev='vdd' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> + </disk> + <disk type='nvme' device='disk'> + <driver name='qemu' type='qcow2' cache='none'/> + <source type='pci' managed='no' namespace='2'> + <address domain='0x0001' bus='0x02' slot='0x00' function='0x0'/> + <slices> + <slice type='storage' offset='1234' size='321'/> + </slices> + <encryption format='luks'> + <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/> + </encryption> + </source> + <target dev='vde' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> + </disk> <controller type='usb' index='0' model='piix3-uhci'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> -- 2.28.0

2 1

[PATCH] qemuBlockJobInfoTranslate: Take job type from qemuBlockJobDataPtr
by Peter Krempa 08 Dec '20

08 Dec '20

Commit f5e8715a8b4 added logic which adds some fake job info when qemu didn't return anything but in such case the job type would not be set. Since we already have the proper job type recorded in qemuBlockJobDataPtr which the caller fetched, we can use this it and also remove the lookup from the disk which was necessary prior to the conversion to qemuBlockJobDataPtr. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- I've wanted to fix it before pushing what would become commit f5e8715a8b4 but Michal accidentally pushed it with one of his patches. src/qemu/qemu_driver.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d8478945d6..5d4697103d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -14638,9 +14638,11 @@ qemuDomainBlockJobAbort(virDomainPtr dom, static int qemuBlockJobInfoTranslate(qemuMonitorBlockJobInfoPtr rawInfo, virDomainBlockJobInfoPtr info, - virDomainDiskDefPtr disk, + qemuBlockJobDataPtr job, bool reportBytes) { + info->type = job->type; + /* If the job data is no longer present this means that the job already * disappeared in qemu (pre-blockdev) but libvirt didn't process the * finishing yet. Fake a incomplete job. */ @@ -14674,11 +14676,6 @@ qemuBlockJobInfoTranslate(qemuMonitorBlockJobInfoPtr rawInfo, info->cur > 0) info->cur -= 1; - info->type = rawInfo->type; - if (info->type == VIR_DOMAIN_BLOCK_JOB_TYPE_COMMIT && - disk->mirrorJob == VIR_DOMAIN_BLOCK_JOB_TYPE_ACTIVE_COMMIT) - info->type = disk->mirrorJob; - if (rawInfo->bandwidth && !reportBytes) rawInfo->bandwidth = VIR_DIV_UP(rawInfo->bandwidth, 1024 * 1024); info->bandwidth = rawInfo->bandwidth; @@ -14737,7 +14734,7 @@ qemuDomainGetBlockJobInfo(virDomainPtr dom, rawInfo = g_hash_table_lookup(blockjobstats, job->name); - if (qemuBlockJobInfoTranslate(rawInfo, info, disk, + if (qemuBlockJobInfoTranslate(rawInfo, info, job, flags & VIR_DOMAIN_BLOCK_JOB_INFO_BANDWIDTH_BYTES) < 0) goto endjob; -- 2.28.0

2 1

[libvirt PATCH] util: add missing FSF copyright statement
by Daniel P. Berrangé 08 Dec '20

08 Dec '20

We previous added code for passing FDs which was explicitly derived from gnulib's passfd code: commit 17460825f3c78e1635f2beb0165c5a19e3b09f7d Author: Daniel P. Berrangé <berrange(a)redhat.com> Date: Fri Jan 17 11:57:17 2020 +0000 src: implement APIs for passing FDs over UNIX sockets This is a simplified variant of gnulib's passfd module without the portability code that we do not require. while the license was unchanged, we mistakenly failed to copy the FSF copyright header which is required by the license terms. Reported-by: Bruno Haible <bruno(a)clisp.org> Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as a trivial fix src/util/virsocket.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/util/virsocket.c b/src/util/virsocket.c index 9aa29f1eb6..c8435a1087 100644 --- a/src/util/virsocket.c +++ b/src/util/virsocket.c @@ -1,5 +1,6 @@ /* * Copyright (C) 2020 Red Hat, Inc. + * Copyright (C) 2011-2020 Free Software Foundation, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public -- 2.28.0

1 0

[PATCH for-6.0] accel: Wire accel to /machine
by Roman Bolshakov 08 Dec '20

08 Dec '20

There's no generic way to query current accel and its properties via QOM because there's no link between an accel and current machine. The change adds the link, i.e. if HVF is enabled the following will be available in QOM: (qemu) qom-get /machine/accel type "hvf-accel" Suggested-by: Markus Armbruster <armbru(a)redhat.com> Suggested-by: Paolo Bonzini <pbonzini(a)redhat.com> Signed-off-by: Roman Bolshakov <r.bolshakov(a)yadro.com> --- Hi, this is a follow up patch that deprecates earlier series [1]. An outstanding issue is whether management applications can rely on the value of /machine/accel/type and output of qom-list-types command [2][3] to get current and present accels? i.e. would it be ok if libvirt assumes that everything up to the first dash in the accel type is the name of the accel (as specified via -M accel=ACCEL flag) when it performs QEMU probing? Also, Eduardo and Claudio earlier had ideas to provide cpu-specific accel subclasses [4][5]. 1. https://lists.gnu.org/archive/html/qemu-devel/2020-11/msg03944.html 2. https://lists.gnu.org/archive/html/qemu-devel/2020-11/msg04212.html 3. https://lists.gnu.org/archive/html/qemu-devel/2020-11/msg07062.html 4. https://lists.gnu.org/archive/html/qemu-devel/2020-11/msg06513.html 5. https://lists.gnu.org/archive/html/qemu-devel/2020-11/msg06741.html Thanks, Roman accel/accel.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/accel/accel.c b/accel/accel.c index cb555e3b06..45c5bf87b1 100644 --- a/accel/accel.c +++ b/accel/accel.c @@ -56,10 +56,11 @@ int accel_init_machine(AccelState *accel, MachineState *ms) if (ret < 0) { ms->accelerator = NULL; *(acc->allowed) = false; - object_unref(OBJECT(accel)); } else { object_set_accelerator_compat_props(acc->compat_props); + object_property_add_child(OBJECT(ms), "accel", OBJECT(accel)); } + object_unref(OBJECT(accel)); return ret; } -- 2.29.2

4 7

[PATCH 0/5] netdev: Extract GenerateName/ReserveName as common functions
by Shi Lei 08 Dec '20

08 Dec '20

Extract ReserveName/GenerateName from netdevtap and netdevmacvlan as common functions. Along with them, export Lock/Unlock functions to protect these processes. So tap, macvlan and veth can reuse them to simplify their implementations. Shi Lei (5): netdev: Introduce several helper functions for generating unique netdev name netdevtap: Use common helper function to create unique tap name netdevmacvlan: Use helper function to create unique macvlan/macvtap name netdev: Enable virNetDevGenerateName to support veth netdevveth: Simplify virNetDevVethCreate by using virNetDevGenerateName src/libvirt_private.syms | 4 + src/lxc/lxc_process.c | 3 + src/util/virnetdev.c | 142 +++++++++++++++++++++++++++++++++++ src/util/virnetdev.h | 36 +++++++++ src/util/virnetdevmacvlan.c | 107 ++++++-------------------- src/util/virnetdevmacvlan.h | 6 -- src/util/virnetdevtap.c | 58 +------------- src/util/virnetdevveth.c | 146 ++++++++++-------------------------- 8 files changed, 251 insertions(+), 251 deletions(-) -- 2.25.1

3 17

[PATCH v2] xen: recognize device_model_override
by Olaf Hering 07 Dec '20

07 Dec '20

Since Xen 4.2 libxl expects device_model_override="/path" instead of device_model="/path". Adjust the code to parse this as <emulator>. While libxl also recognizes device_model_version="", this knob is not required for libvirt. A runtime detection exists in libvirt to select either "qemu-xen" or "qemu-xen-traditional". Since qemu-xen-traditional is marked as supported just for stubdoms there is no need to handle it. The tests were adjusted with this script: for i in tests/xlconfigdata/*.cfg tests/xmconfigdata/*.cfg do case "$i" in *basic-hvm*) continue ;; *cpu-shares-hvm*) continue ;; *max-eventchannels-hvm*) continue ;; *max-gntframes-hvm*) continue ;; *moredevs-hvm*) continue ;; *variable-clock-hvm*) continue ;; *vnuma-hvm*) continue ;; esac sed -i ' s@^device_model[[:blank:]]@device_model_override @ ' "$i" done for i in tests/libxlxml2domconfigdata/*.json do case "$i" in *basic-hvm*) continue ;; *cpu-shares-hvm*) continue ;; *max-eventchannels-hvm*) continue ;; *max-gntframes-hvm*) continue ;; *moredevs-hvm*) continue ;; *variable-clock-hvm*) continue ;; *vnuma-hvm*) continue ;; esac sed -i ' s@"device_model"@"device_model_override"@ ' "$i" done Signed-off-by: Olaf Hering <olaf(a)aepfle.de> --- src/libxl/xen_common.c | 4 ++-- tests/xlconfigdata/test-disk-positional-parms-full.cfg | 2 +- tests/xlconfigdata/test-disk-positional-parms-partial.cfg | 2 +- tests/xlconfigdata/test-disk-qed.cfg | 2 +- tests/xlconfigdata/test-fullvirt-acpi-slic.cfg | 2 +- tests/xlconfigdata/test-fullvirt-cpuid.cfg | 2 +- .../test-fullvirt-direct-kernel-boot-bogus-extra.cfg | 2 +- tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.cfg | 2 +- tests/xlconfigdata/test-fullvirt-direct-kernel-boot.cfg | 2 +- tests/xlconfigdata/test-fullvirt-hpet-timer.cfg | 2 +- tests/xlconfigdata/test-fullvirt-hypervisor-features.cfg | 2 +- tests/xlconfigdata/test-fullvirt-multi-timer.cfg | 2 +- tests/xlconfigdata/test-fullvirt-multiserial.cfg | 2 +- tests/xlconfigdata/test-fullvirt-multiusb.cfg | 2 +- tests/xlconfigdata/test-fullvirt-nestedhvm-disabled.cfg | 2 +- tests/xlconfigdata/test-fullvirt-nestedhvm.cfg | 2 +- tests/xlconfigdata/test-fullvirt-nohap.cfg | 2 +- tests/xlconfigdata/test-fullvirt-ovmf.cfg | 2 +- tests/xlconfigdata/test-fullvirt-ovswitch-tagged.cfg | 2 +- tests/xlconfigdata/test-fullvirt-ovswitch-trunked.cfg | 2 +- tests/xlconfigdata/test-fullvirt-pci.cfg | 2 +- tests/xlconfigdata/test-fullvirt-tsc-timer.cfg | 2 +- tests/xlconfigdata/test-fullvirt-type.cfg | 2 +- tests/xlconfigdata/test-fullvirt-vnuma-autocomplete.cfg | 2 +- tests/xlconfigdata/test-fullvirt-vnuma-nodistances.cfg | 2 +- tests/xlconfigdata/test-fullvirt-vnuma-partialdist.cfg | 2 +- tests/xlconfigdata/test-fullvirt-vnuma.cfg | 2 +- tests/xlconfigdata/test-net-fakemodel.cfg | 2 +- tests/xlconfigdata/test-new-disk.cfg | 2 +- tests/xlconfigdata/test-qemu-passthrough.cfg | 2 +- tests/xlconfigdata/test-rbd-multihost-noauth.cfg | 2 +- tests/xlconfigdata/test-spice-features.cfg | 2 +- tests/xlconfigdata/test-spice.cfg | 2 +- tests/xlconfigdata/test-vif-multi-ip.cfg | 2 +- tests/xlconfigdata/test-vif-rate.cfg | 2 +- tests/xlconfigdata/test-vif-typename.cfg | 2 +- tests/xmconfigdata/test-escape-paths.cfg | 2 +- tests/xmconfigdata/test-fullvirt-default-feature.cfg | 2 +- tests/xmconfigdata/test-fullvirt-force-hpet.cfg | 2 +- tests/xmconfigdata/test-fullvirt-force-nohpet.cfg | 2 +- tests/xmconfigdata/test-fullvirt-localtime.cfg | 2 +- tests/xmconfigdata/test-fullvirt-net-netfront.cfg | 2 +- tests/xmconfigdata/test-fullvirt-new-cdrom.cfg | 2 +- tests/xmconfigdata/test-fullvirt-nohap.cfg | 2 +- tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg | 2 +- tests/xmconfigdata/test-fullvirt-serial-file.cfg | 2 +- tests/xmconfigdata/test-fullvirt-serial-null.cfg | 2 +- tests/xmconfigdata/test-fullvirt-serial-pipe.cfg | 2 +- tests/xmconfigdata/test-fullvirt-serial-pty.cfg | 2 +- tests/xmconfigdata/test-fullvirt-serial-stdio.cfg | 2 +- tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg | 2 +- tests/xmconfigdata/test-fullvirt-serial-tcp.cfg | 2 +- tests/xmconfigdata/test-fullvirt-serial-udp.cfg | 2 +- tests/xmconfigdata/test-fullvirt-serial-unix.cfg | 2 +- tests/xmconfigdata/test-fullvirt-sound.cfg | 2 +- tests/xmconfigdata/test-fullvirt-usbmouse.cfg | 2 +- tests/xmconfigdata/test-fullvirt-usbtablet.cfg | 2 +- tests/xmconfigdata/test-fullvirt-utc.cfg | 2 +- tests/xmconfigdata/test-no-source-cdrom.cfg | 2 +- tests/xmconfigdata/test-pci-dev-syntax.cfg | 2 +- tests/xmconfigdata/test-pci-devs.cfg | 2 +- 61 files changed, 62 insertions(+), 62 deletions(-) diff --git a/src/libxl/xen_common.c b/src/libxl/xen_common.c index c82e487d80..88a784ed04 100644 --- a/src/libxl/xen_common.c +++ b/src/libxl/xen_common.c @@ -1508,7 +1508,7 @@ xenParseConfigCommon(virConfPtr conf, if (xenParseTimeOffset(conf, def) < 0) return -1; - if (xenConfigCopyStringOpt(conf, "device_model", &def->emulator) < 0) + if (xenConfigCopyStringOpt(conf, "device_model_override", &def->emulator) < 0) return -1; if (STREQ(nativeFormat, XEN_CONFIG_FORMAT_XL)) { @@ -2242,7 +2242,7 @@ static int xenFormatEmulator(virConfPtr conf, virDomainDefPtr def) { if (def->emulator && - xenConfigSetString(conf, "device_model", def->emulator) < 0) + xenConfigSetString(conf, "device_model_override", def->emulator) < 0) return -1; return 0; diff --git a/tests/xlconfigdata/test-disk-positional-parms-full.cfg b/tests/xlconfigdata/test-disk-positional-parms-full.cfg index 217d4dccf3..b5965945e1 100644 --- a/tests/xlconfigdata/test-disk-positional-parms-full.cfg +++ b/tests/xlconfigdata/test-disk-positional-parms-full.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-disk-positional-parms-partial.cfg b/tests/xlconfigdata/test-disk-positional-parms-partial.cfg index 940304e7b2..be5e23e39e 100644 --- a/tests/xlconfigdata/test-disk-positional-parms-partial.cfg +++ b/tests/xlconfigdata/test-disk-positional-parms-partial.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-disk-qed.cfg b/tests/xlconfigdata/test-disk-qed.cfg index 78421767de..5ae93f4d8a 100644 --- a/tests/xlconfigdata/test-disk-qed.cfg +++ b/tests/xlconfigdata/test-disk-qed.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-fullvirt-acpi-slic.cfg b/tests/xlconfigdata/test-fullvirt-acpi-slic.cfg index 99b1726343..b5bd9c9790 100644 --- a/tests/xlconfigdata/test-fullvirt-acpi-slic.cfg +++ b/tests/xlconfigdata/test-fullvirt-acpi-slic.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-fullvirt-cpuid.cfg b/tests/xlconfigdata/test-fullvirt-cpuid.cfg index bb7b9c7b32..e71a87dfe8 100644 --- a/tests/xlconfigdata/test-fullvirt-cpuid.cfg +++ b/tests/xlconfigdata/test-fullvirt-cpuid.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.cfg b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.cfg index 8012737c88..455ae0cee3 100644 --- a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.cfg +++ b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.cfg b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.cfg index 4ed5a90e18..10e64b0876 100644 --- a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.cfg +++ b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.cfg b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.cfg index 110f0a0cd1..f52c33dd3e 100644 --- a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.cfg +++ b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-fullvirt-hpet-timer.cfg b/tests/xlconfigdata/test-fullvirt-hpet-timer.cfg index a566bd75a3..b73ebf330c 100644 --- a/tests/xlconfigdata/test-fullvirt-hpet-timer.cfg +++ b/tests/xlconfigdata/test-fullvirt-hpet-timer.cfg @@ -14,7 +14,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-fullvirt-hypervisor-features.cfg b/tests/xlconfigdata/test-fullvirt-hypervisor-features.cfg index 88f018c823..87156cc2db 100644 --- a/tests/xlconfigdata/test-fullvirt-hypervisor-features.cfg +++ b/tests/xlconfigdata/test-fullvirt-hypervisor-features.cfg @@ -13,7 +13,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-fullvirt-multi-timer.cfg b/tests/xlconfigdata/test-fullvirt-multi-timer.cfg index 5a78585821..c897b2a161 100644 --- a/tests/xlconfigdata/test-fullvirt-multi-timer.cfg +++ b/tests/xlconfigdata/test-fullvirt-multi-timer.cfg @@ -15,7 +15,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-fullvirt-multiserial.cfg b/tests/xlconfigdata/test-fullvirt-multiserial.cfg index 1fd765b087..25bc4506e7 100644 --- a/tests/xlconfigdata/test-fullvirt-multiserial.cfg +++ b/tests/xlconfigdata/test-fullvirt-multiserial.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-fullvirt-multiusb.cfg b/tests/xlconfigdata/test-fullvirt-multiusb.cfg index 6d456deb21..afb041d53c 100644 --- a/tests/xlconfigdata/test-fullvirt-multiusb.cfg +++ b/tests/xlconfigdata/test-fullvirt-multiusb.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-fullvirt-nestedhvm-disabled.cfg b/tests/xlconfigdata/test-fullvirt-nestedhvm-disabled.cfg index d4b9f452de..bdf94e79e2 100644 --- a/tests/xlconfigdata/test-fullvirt-nestedhvm-disabled.cfg +++ b/tests/xlconfigdata/test-fullvirt-nestedhvm-disabled.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-fullvirt-nestedhvm.cfg b/tests/xlconfigdata/test-fullvirt-nestedhvm.cfg index 281f1268a5..5882bfee9f 100644 --- a/tests/xlconfigdata/test-fullvirt-nestedhvm.cfg +++ b/tests/xlconfigdata/test-fullvirt-nestedhvm.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-fullvirt-nohap.cfg b/tests/xlconfigdata/test-fullvirt-nohap.cfg index e7e933df6e..4235909f07 100644 --- a/tests/xlconfigdata/test-fullvirt-nohap.cfg +++ b/tests/xlconfigdata/test-fullvirt-nohap.cfg @@ -13,7 +13,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-fullvirt-ovmf.cfg b/tests/xlconfigdata/test-fullvirt-ovmf.cfg index b08e7fd98a..4d31a81108 100644 --- a/tests/xlconfigdata/test-fullvirt-ovmf.cfg +++ b/tests/xlconfigdata/test-fullvirt-ovmf.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-fullvirt-ovswitch-tagged.cfg b/tests/xlconfigdata/test-fullvirt-ovswitch-tagged.cfg index 6a3dc3cfeb..5ba84ad22a 100644 --- a/tests/xlconfigdata/test-fullvirt-ovswitch-tagged.cfg +++ b/tests/xlconfigdata/test-fullvirt-ovswitch-tagged.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-fullvirt-ovswitch-trunked.cfg b/tests/xlconfigdata/test-fullvirt-ovswitch-trunked.cfg index 29e9d38ae8..edd53c9a08 100644 --- a/tests/xlconfigdata/test-fullvirt-ovswitch-trunked.cfg +++ b/tests/xlconfigdata/test-fullvirt-ovswitch-trunked.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-fullvirt-pci.cfg b/tests/xlconfigdata/test-fullvirt-pci.cfg index 5a3f572e25..e639cf9c83 100644 --- a/tests/xlconfigdata/test-fullvirt-pci.cfg +++ b/tests/xlconfigdata/test-fullvirt-pci.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-fullvirt-tsc-timer.cfg b/tests/xlconfigdata/test-fullvirt-tsc-timer.cfg index 587d3461f8..a30052dbf7 100644 --- a/tests/xlconfigdata/test-fullvirt-tsc-timer.cfg +++ b/tests/xlconfigdata/test-fullvirt-tsc-timer.cfg @@ -14,7 +14,7 @@ localtime = 1 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-fullvirt-type.cfg b/tests/xlconfigdata/test-fullvirt-type.cfg index f8ecc2e190..9a9854ef38 100644 --- a/tests/xlconfigdata/test-fullvirt-type.cfg +++ b/tests/xlconfigdata/test-fullvirt-type.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 0 parallel = "none" diff --git a/tests/xlconfigdata/test-fullvirt-vnuma-autocomplete.cfg b/tests/xlconfigdata/test-fullvirt-vnuma-autocomplete.cfg index edba69a172..98b7ca7f4f 100644 --- a/tests/xlconfigdata/test-fullvirt-vnuma-autocomplete.cfg +++ b/tests/xlconfigdata/test-fullvirt-vnuma-autocomplete.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-fullvirt-vnuma-nodistances.cfg b/tests/xlconfigdata/test-fullvirt-vnuma-nodistances.cfg index 8186edfee0..88f1c03fcb 100644 --- a/tests/xlconfigdata/test-fullvirt-vnuma-nodistances.cfg +++ b/tests/xlconfigdata/test-fullvirt-vnuma-nodistances.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-fullvirt-vnuma-partialdist.cfg b/tests/xlconfigdata/test-fullvirt-vnuma-partialdist.cfg index 861a50e76b..e117794086 100644 --- a/tests/xlconfigdata/test-fullvirt-vnuma-partialdist.cfg +++ b/tests/xlconfigdata/test-fullvirt-vnuma-partialdist.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-fullvirt-vnuma.cfg b/tests/xlconfigdata/test-fullvirt-vnuma.cfg index 91e233ac27..2220159ba4 100644 --- a/tests/xlconfigdata/test-fullvirt-vnuma.cfg +++ b/tests/xlconfigdata/test-fullvirt-vnuma.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-net-fakemodel.cfg b/tests/xlconfigdata/test-net-fakemodel.cfg index 70bd922ac0..6df0a0dc41 100644 --- a/tests/xlconfigdata/test-net-fakemodel.cfg +++ b/tests/xlconfigdata/test-net-fakemodel.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-new-disk.cfg b/tests/xlconfigdata/test-new-disk.cfg index 4fe76b257f..20dca0c257 100644 --- a/tests/xlconfigdata/test-new-disk.cfg +++ b/tests/xlconfigdata/test-new-disk.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-qemu-passthrough.cfg b/tests/xlconfigdata/test-qemu-passthrough.cfg index 42aad92205..79347d0ac8 100644 --- a/tests/xlconfigdata/test-qemu-passthrough.cfg +++ b/tests/xlconfigdata/test-qemu-passthrough.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-rbd-multihost-noauth.cfg b/tests/xlconfigdata/test-rbd-multihost-noauth.cfg index 01c15d59a1..5906865047 100644 --- a/tests/xlconfigdata/test-rbd-multihost-noauth.cfg +++ b/tests/xlconfigdata/test-rbd-multihost-noauth.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-spice-features.cfg b/tests/xlconfigdata/test-spice-features.cfg index f8a25e497a..944c653d70 100644 --- a/tests/xlconfigdata/test-spice-features.cfg +++ b/tests/xlconfigdata/test-spice-features.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ] parallel = "none" serial = "none" diff --git a/tests/xlconfigdata/test-spice.cfg b/tests/xlconfigdata/test-spice.cfg index abdf63dd25..976c166e04 100644 --- a/tests/xlconfigdata/test-spice.cfg +++ b/tests/xlconfigdata/test-spice.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ] parallel = "none" serial = "none" diff --git a/tests/xlconfigdata/test-vif-multi-ip.cfg b/tests/xlconfigdata/test-vif-multi-ip.cfg index 4a5d37f960..b082b9b22b 100644 --- a/tests/xlconfigdata/test-vif-multi-ip.cfg +++ b/tests/xlconfigdata/test-vif-multi-ip.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-vif-rate.cfg b/tests/xlconfigdata/test-vif-rate.cfg index 34a19a29b6..f6270c2d1e 100644 --- a/tests/xlconfigdata/test-vif-rate.cfg +++ b/tests/xlconfigdata/test-vif-rate.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xlconfigdata/test-vif-typename.cfg b/tests/xlconfigdata/test-vif-typename.cfg index fb5d94c27a..b2f1157438 100644 --- a/tests/xlconfigdata/test-vif-typename.cfg +++ b/tests/xlconfigdata/test-vif-typename.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-escape-paths.cfg b/tests/xmconfigdata/test-escape-paths.cfg index d3e410ffd2..03abf8d568 100644 --- a/tests/xmconfigdata/test-escape-paths.cfg +++ b/tests/xmconfigdata/test-escape-paths.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386&test" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386&test" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-default-feature.cfg b/tests/xmconfigdata/test-fullvirt-default-feature.cfg index b01e290239..86d1d809c0 100644 --- a/tests/xmconfigdata/test-fullvirt-default-feature.cfg +++ b/tests/xmconfigdata/test-fullvirt-default-feature.cfg @@ -13,7 +13,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-force-hpet.cfg b/tests/xmconfigdata/test-fullvirt-force-hpet.cfg index 16fe985946..1cf6fbd333 100644 --- a/tests/xmconfigdata/test-fullvirt-force-hpet.cfg +++ b/tests/xmconfigdata/test-fullvirt-force-hpet.cfg @@ -13,7 +13,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-force-nohpet.cfg b/tests/xmconfigdata/test-fullvirt-force-nohpet.cfg index eb118427cc..bf8c4134c0 100644 --- a/tests/xmconfigdata/test-fullvirt-force-nohpet.cfg +++ b/tests/xmconfigdata/test-fullvirt-force-nohpet.cfg @@ -13,7 +13,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-localtime.cfg b/tests/xmconfigdata/test-fullvirt-localtime.cfg index 2f8514d5e4..bc7ed271e3 100644 --- a/tests/xmconfigdata/test-fullvirt-localtime.cfg +++ b/tests/xmconfigdata/test-fullvirt-localtime.cfg @@ -12,7 +12,7 @@ localtime = 1 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-net-netfront.cfg b/tests/xmconfigdata/test-fullvirt-net-netfront.cfg index b744b2184e..901f620eff 100644 --- a/tests/xmconfigdata/test-fullvirt-net-netfront.cfg +++ b/tests/xmconfigdata/test-fullvirt-net-netfront.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-new-cdrom.cfg b/tests/xmconfigdata/test-fullvirt-new-cdrom.cfg index f9fce015e0..6fc9283a4c 100644 --- a/tests/xmconfigdata/test-fullvirt-new-cdrom.cfg +++ b/tests/xmconfigdata/test-fullvirt-new-cdrom.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-nohap.cfg b/tests/xmconfigdata/test-fullvirt-nohap.cfg index e5375dfdb6..6bd4eb4c29 100644 --- a/tests/xmconfigdata/test-fullvirt-nohap.cfg +++ b/tests/xmconfigdata/test-fullvirt-nohap.cfg @@ -13,7 +13,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg b/tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg index 94c52d975b..62e18c1af3 100644 --- a/tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg +++ b/tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-serial-file.cfg b/tests/xmconfigdata/test-fullvirt-serial-file.cfg index 9193cc8717..0574f97ccc 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-file.cfg +++ b/tests/xmconfigdata/test-fullvirt-serial-file.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-serial-null.cfg b/tests/xmconfigdata/test-fullvirt-serial-null.cfg index 9ef60b4bd5..839818b228 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-null.cfg +++ b/tests/xmconfigdata/test-fullvirt-serial-null.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-serial-pipe.cfg b/tests/xmconfigdata/test-fullvirt-serial-pipe.cfg index 60e41ab556..bdbfe30d1c 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-pipe.cfg +++ b/tests/xmconfigdata/test-fullvirt-serial-pipe.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-serial-pty.cfg b/tests/xmconfigdata/test-fullvirt-serial-pty.cfg index d4e0763d15..3007e96efa 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-pty.cfg +++ b/tests/xmconfigdata/test-fullvirt-serial-pty.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-serial-stdio.cfg b/tests/xmconfigdata/test-fullvirt-serial-stdio.cfg index efefe109b9..9af628c457 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-stdio.cfg +++ b/tests/xmconfigdata/test-fullvirt-serial-stdio.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg index 224f5274e1..cbbb30a42e 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg +++ b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp.cfg b/tests/xmconfigdata/test-fullvirt-serial-tcp.cfg index e70ab847ec..d2b65b5c2d 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-tcp.cfg +++ b/tests/xmconfigdata/test-fullvirt-serial-tcp.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-serial-udp.cfg b/tests/xmconfigdata/test-fullvirt-serial-udp.cfg index 9e7acdf0c4..8d44b053a8 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-udp.cfg +++ b/tests/xmconfigdata/test-fullvirt-serial-udp.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-serial-unix.cfg b/tests/xmconfigdata/test-fullvirt-serial-unix.cfg index 964beba4fe..a6cc4a4cd9 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-unix.cfg +++ b/tests/xmconfigdata/test-fullvirt-serial-unix.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-sound.cfg b/tests/xmconfigdata/test-fullvirt-sound.cfg index 501463f54c..5a71618f83 100644 --- a/tests/xmconfigdata/test-fullvirt-sound.cfg +++ b/tests/xmconfigdata/test-fullvirt-sound.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-usbmouse.cfg b/tests/xmconfigdata/test-fullvirt-usbmouse.cfg index 660f18e776..07d49573d0 100644 --- a/tests/xmconfigdata/test-fullvirt-usbmouse.cfg +++ b/tests/xmconfigdata/test-fullvirt-usbmouse.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-usbtablet.cfg b/tests/xmconfigdata/test-fullvirt-usbtablet.cfg index 90428882cc..45364b1a57 100644 --- a/tests/xmconfigdata/test-fullvirt-usbtablet.cfg +++ b/tests/xmconfigdata/test-fullvirt-usbtablet.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-fullvirt-utc.cfg b/tests/xmconfigdata/test-fullvirt-utc.cfg index f9fce015e0..6fc9283a4c 100644 --- a/tests/xmconfigdata/test-fullvirt-utc.cfg +++ b/tests/xmconfigdata/test-fullvirt-utc.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-no-source-cdrom.cfg b/tests/xmconfigdata/test-no-source-cdrom.cfg index 8439961215..a6045244e5 100644 --- a/tests/xmconfigdata/test-no-source-cdrom.cfg +++ b/tests/xmconfigdata/test-no-source-cdrom.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "destroy" on_crash = "destroy" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-pci-dev-syntax.cfg b/tests/xmconfigdata/test-pci-dev-syntax.cfg index e0f00d9bd7..c3add42e56 100644 --- a/tests/xmconfigdata/test-pci-dev-syntax.cfg +++ b/tests/xmconfigdata/test-pci-dev-syntax.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "destroy" on_crash = "destroy" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1 diff --git a/tests/xmconfigdata/test-pci-devs.cfg b/tests/xmconfigdata/test-pci-devs.cfg index 188227e187..9c6d3311a8 100644 --- a/tests/xmconfigdata/test-pci-devs.cfg +++ b/tests/xmconfigdata/test-pci-devs.cfg @@ -12,7 +12,7 @@ localtime = 0 on_poweroff = "destroy" on_reboot = "destroy" on_crash = "destroy" -device_model = "/usr/lib/xen/bin/qemu-system-i386" +device_model_override = "/usr/lib/xen/bin/qemu-system-i386" sdl = 0 vnc = 1 vncunused = 1

2 3

[PATCH] lxc: Set default security model in XML parser config
by Jim Fehlig 07 Dec '20

07 Dec '20

Attempting to create a lxc domain with <seclabel type='none'/> fails virsh --connect lxc:/// create distro_nosec.xml error: Failed to create domain from distro_nosec.xml error: unsupported configuration: Security driver model '(null)' is not available The lxc driver does not set a default security driver model in the XML parser config, causing seclabels of type='none' to have a null model. The lxc driver's security manager is initialized in lxcStateInitialize() by calling lxcSecurityInit(). Use the model of this manager as the default in the XML parser config. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- Kind'a, sort'a a V2 of https://www.redhat.com/archives/libvir-list/2020-December/msg00186.html It's quite a different approach to solving the problem than that patch. src/lxc/lxc_conf.c | 3 ++- src/lxc/lxc_conf.h | 3 ++- src/lxc/lxc_controller.c | 2 +- src/lxc/lxc_driver.c | 5 ++++- tests/testutilslxc.c | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/lxc/lxc_conf.c b/src/lxc/lxc_conf.c index 13da6c4586..e6ad91205e 100644 --- a/src/lxc/lxc_conf.c +++ b/src/lxc/lxc_conf.c @@ -209,9 +209,10 @@ virCapsPtr virLXCDriverGetCapabilities(virLXCDriverPtr driver, virDomainXMLOptionPtr -lxcDomainXMLConfInit(virLXCDriverPtr driver) +lxcDomainXMLConfInit(virLXCDriverPtr driver, const char *defsecmodel) { virLXCDriverDomainDefParserConfig.priv = driver; + virLXCDriverDomainDefParserConfig.defSecModel = defsecmodel; return virDomainXMLOptionNew(&virLXCDriverDomainDefParserConfig, &virLXCDriverPrivateDataCallbacks, &virLXCDriverDomainXMLNamespace, diff --git a/src/lxc/lxc_conf.h b/src/lxc/lxc_conf.h index f2f0e0a570..664bafc7b9 100644 --- a/src/lxc/lxc_conf.h +++ b/src/lxc/lxc_conf.h @@ -112,7 +112,8 @@ int virLXCLoadDriverConfig(virLXCDriverConfigPtr cfg, virCapsPtr virLXCDriverCapsInit(virLXCDriverPtr driver); virCapsPtr virLXCDriverGetCapabilities(virLXCDriverPtr driver, bool refresh); -virDomainXMLOptionPtr lxcDomainXMLConfInit(virLXCDriverPtr driver); +virDomainXMLOptionPtr lxcDomainXMLConfInit(virLXCDriverPtr driver, + const char *defsecmodel); static inline void lxcDriverLock(virLXCDriverPtr driver) { diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 97de0408b6..67e5e63d00 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -169,7 +169,7 @@ virLXCControllerDriverNew(void) } driver->caps = virLXCDriverCapsInit(NULL); - driver->xmlopt = lxcDomainXMLConfInit(driver); + driver->xmlopt = lxcDomainXMLConfInit(driver, NULL); return driver; } diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index d0503ef2ea..9d94c703ea 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1470,6 +1470,7 @@ static int lxcStateInitialize(bool privileged, { virLXCDriverConfigPtr cfg = NULL; bool autostart = true; + const char *defsecmodel; if (root != NULL) { virReportError(VIR_ERR_INVALID_ARG, "%s", @@ -1525,7 +1526,9 @@ static int lxcStateInitialize(bool privileged, if (!(lxc_driver->hostdevMgr = virHostdevManagerGetDefault())) goto cleanup; - if (!(lxc_driver->xmlopt = lxcDomainXMLConfInit(lxc_driver))) + defsecmodel = virSecurityManagerGetModel(lxc_driver->securityManager); + + if (!(lxc_driver->xmlopt = lxcDomainXMLConfInit(lxc_driver, defsecmodel))) goto cleanup; if (!(lxc_driver->closeCallbacks = virCloseCallbacksNew())) diff --git a/tests/testutilslxc.c b/tests/testutilslxc.c index b5e2f542e7..e15ea2bd32 100644 --- a/tests/testutilslxc.c +++ b/tests/testutilslxc.c @@ -71,7 +71,7 @@ testLXCDriverInit(void) } driver->caps = testLXCCapsInit(); - driver->xmlopt = lxcDomainXMLConfInit(driver); + driver->xmlopt = lxcDomainXMLConfInit(driver, NULL); return driver; } -- 2.29.2

3 7

[PATCH RESEND v1] xen: recognize device_model_override
by Olaf Hering 07 Dec '20

07 Dec '20

Since Xen 4.2 libxl expects device_model_override="/path" instead of device_model="/path". Adjust the code to parse this as <emulator>. While libxl also recognizes device_model_version="", this knob is not supported by libvirt. A runtime detection exists to select either "qemu-xen" or "qemu-xen-traditional". Signed-off-by: Olaf Hering <olaf(a)aepfle.de> --- src/libxl/xen_common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libxl/xen_common.c b/src/libxl/xen_common.c index c82e487d80..88a784ed04 100644 --- a/src/libxl/xen_common.c +++ b/src/libxl/xen_common.c @@ -1508,7 +1508,7 @@ xenParseConfigCommon(virConfPtr conf, if (xenParseTimeOffset(conf, def) < 0) return -1; - if (xenConfigCopyStringOpt(conf, "device_model", &def->emulator) < 0) + if (xenConfigCopyStringOpt(conf, "device_model_override", &def->emulator) < 0) return -1; if (STREQ(nativeFormat, XEN_CONFIG_FORMAT_XL)) { @@ -2242,7 +2242,7 @@ static int xenFormatEmulator(virConfPtr conf, virDomainDefPtr def) { if (def->emulator && - xenConfigSetString(conf, "device_model", def->emulator) < 0) + xenConfigSetString(conf, "device_model_override", def->emulator) < 0) return -1; return 0;

2 6

[PATCH 0/7] qemu: Add workaround for apps polling virDomainGetBlockJobInfo with pre-blockdev qemu
by Peter Krempa 07 Dec '20

07 Dec '20

This is a workaround for the issue that Nikolay tries to fix in: https://www.redhat.com/archives/libvir-list/2020-November/msg00669.html This one is a far more focused hack for apps which don't bother to update to events for block job completion checking. Peter Krempa (7): virDomainGetBlockJobInfo: Discourage polling for block job completion detection virDomainGetBlockJobInfo: Reword docs for fallback values qemuMonitorBlockJobInfo: Store 'ready' and 'ready_present' separately qemuBlockJobInfoTranslate: Use explicit comparison against 0 qemuDomainGetBlockJobInfo: Use qemuMonitorGetAllBlockJobInfo qemu: monitor: Remove unused qemuMonitorGetBlockJobInfo qemuDomainGetBlockJobInfo: Work stats for unfinished pre-blockdev blockjob src/libvirt-domain.c | 23 +++++++++++++++------ src/qemu/qemu_driver.c | 39 +++++++++++++++++++++++------------- src/qemu/qemu_monitor.c | 29 --------------------------- src/qemu/qemu_monitor.h | 7 ++----- src/qemu/qemu_monitor_json.c | 8 ++------ src/qemu/qemu_process.c | 4 ++-- 6 files changed, 48 insertions(+), 62 deletions(-) -- 2.28.0

2 10

[RFCv2 00/46] RFC: Generate parsexml/formatbuf functions based on directives
by Shi Lei 07 Dec '20

07 Dec '20

V1 here: [https://www.redhat.com/archives/libvir-list/2020-June/msg00357.html] Differ from V1: * Move the generator into scripts/xmlgen and rename it 'xmlgen'. * Declare virXMLChildNode and virXMLChildNodeSet in libvirt_private.syms. * Replace VIR_FREE with g_free and VIR_ALLOC[_N] with g_new0. * Adjust virReportError to avoid unnecessary translation. * Remove the macro VIR_USED and use G_GNUC_UNUSED to declare arguments. * When parsing string member, assign value to it directly instead of using middle variable. * Don't set libclang_path. Just use python-clang's default setting. * Use virEscapeString for escaping xml characters. * Enable directive 'genformat' with a parameter to support separation mode. * Add directive 'xmlswitch' and 'xmlgroup' to support discriminated unions. * Allow directive 'array' and 'specified' to carry with a parameter, which specifies its counterpart explicitly. * Enable directive 'xmlattr' with path. * Add directive 'formatflag' and 'formathook'. For those new and changed directives, illustrate them by an example: struct _virDomainGraphicsAuthDef { /* genparse, genformat:separate */ char *passwd; /* xmlattr, formatflag:VIR_DOMAIN_DEF_FORMAT_SECURE */ bool expires; time_t validTo; /* xmlattr:passwdValidTo, specified:expires */ virDomainGraphicsAuthConnectedType connected; /* xmlattr */ }; struct _virDomainGraphicsListenDef { /* genparse:withhook, genformat */ virDomainGraphicsListenType type; /* xmlattr */ char *address; /* xmlattr, formathook */ char *network; /* xmlattr, formatflag:VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK */ char *socket; /* xmlattr, formathook */ int fromConfig; /* xmlattr, formatflag:%VIR_DOMAIN_DEF_FORMAT_STATUS */ bool autoGenerated; /* xmlattr, formatflag:%VIR_DOMAIN_DEF_FORMAT_STATUS */ }; struct _virDomainGraphicsSDLDef { /* genparse, genformat:separate */ char *display; /* xmlattr */ char *xauth; /* xmlattr */ bool fullscreen; /* xmlattr */ virTristateBool gl; /* xmlattr:gl/enable */ }; struct _virDomainGraphicsDef { /* genparse:concisehook, genformat */ virObjectPtr privateData; virDomainGraphicsType type; /* xmlattr */ size_t nListens; virDomainGraphicsListenDefPtr listens; /* xmlelem, array:nListens */ union { virDomainGraphicsSDLDef sdl; /* xmlgroup */ virDomainGraphicsVNCDef vnc; /* xmlgroup */ virDomainGraphicsRDPDef rdp; /* xmlgroup */ virDomainGraphicsDesktopDef desktop; /* xmlgroup */ virDomainGraphicsSpiceDef spice; /* xmlgroup */ virDomainGraphicsEGLHeadlessDef egl_headless; /* xmlgroup */ } data; /* xmlswitch:type */ }; Explanation for these directives: - genformat[:separate|onlyattrs|onlyelems] Only work on a struct. Generate formatbuf function for this struct only if 'genformat' is specified. The function name is based on struct-name and suffixed with 'FormatBuf'. When 'genformat:separate' is specified, generate two formatbuf functions rather than a single full-mode formatbuf function. One for formatting attributes and another for formatting elements. These function names are based on struct-name and suffixed with 'FormatAttr' and 'FormatElem' respectively. The 'onlyattrs' and 'onlyelems' are just like 'separate', but only generate one of those two functions according to its denotation. - xmlattr[:[parentname/]thename] Parse/Format the field as an XML attribute or attribute wrapped by an XML element. If only 'thename' is specified, use it as the XML attribute name; or use the filed name. The 'parentname' is the name of the attribute's parent element. If 'parentname/thename' is specified, the corresponding form is <parentname thename='..' />. - xmlgroup The field is a struct, but its corresponding form in XML is a group rather than an element. - xmlswitch:thename Only for discriminated union. 'thename' is the name of its relative enum. The name of each union member should match a shortname of the enum. - array[:countername] Parse/Format the field as an array. Each array field must have an related counter field, which name is specified by 'countername'. If 'countername' is omitted, follow the pattern: n + 'field_name'. - specified[:thename] This field has an related field to indicate its existence, and 'thename' specifies the name of this related field. When 'thename' is omitted, follow the pattern: 'field_name' + '_specified'. - formatflag:[!|%]flag This field will be formatted and written out to XML only if the 'flag' hits a target flagset. The target flagset is passed into the formatbuf function through the argument 'opaque'. Adding a '!' before 'flag' means NOT hitting. Adding a '%' before 'flag' means that flag hitting-check is the unique condition for formatting this field. For example, for 'passwd' in 'virDomainGraphicsAuthDef', the directive is: formatflag:VIR_DOMAIN_DEF_FORMAT_SECURE then the generated code: if (def->passwd && (virXMLFlag(opaque) & VIR_DOMAIN_DEF_FORMAT_SECURE)) virBufferEscapeString(buf, " passwd='%s'", def->passwd); If '%' is inserted like this: formatflag:%VIR_DOMAIN_DEF_FORMAT_SECURE then the generated code: if ((virXMLFlag(opaque) & VIR_DOMAIN_DEF_FORMAT_SECURE)) virBufferEscapeString(buf, " passwd='%s'", def->passwd); - formathook Introduce hooks to handle the field if xmlgen can't deal with it now. E.g., virDomainGraphicsListenDef have two fields with 'formathook', which are 'address' and 'socket'. The xmlgen will generate the declaration of some hooks for formatting these fields and developers should implement them. 1) Check the declaration of hook by a commandline. # ./scripts/xmlgen/go show virDomainGraphicsListenDef -kf int virDomainGraphicsListenDefFormatHook(const virDomainGraphicsListenDef *def, const void *parent, const void *opaque, virBufferPtr addressBuf, virBufferPtr socketBuf); bool virDomainGraphicsListenDefCheckHook(const virDomainGraphicsListenDef *def, const void *parent, void *opaque, bool result); 2) Implement these two hooks in src/conf/domain_conf.c. 2.1) virXXXFormatHook It is the hook for formatting field 'address' and 'socket'. The 'addressBuf' and 'socketBuf' are used for output destinations respectively. 2.2) virXXXCheckHook For structs, the xmlgen generates virXXXCheck function to come with the virXXXFormatBuf. The virXXXCheck reports whether the corresponding XML element is null. The virXXXCheckHook intercepts the 'result' of virXXXCheck. It changes 'result' or just forwards it according to those fields with 'formathook'. Thanks! Shi Lei (46): scripts: Add a tool to generate xml parse/format functions maint: Check python3-clang maint: Call xmlgen automatically when c-head-files change util: Add some xml-helper-functions to cooperate with xmlgen util: Add helper functions for 'bool' and 'time_t' and cooperate with xmlgen util: Add parsexml/formatbuf helper functions for virSocketAddr conf: Extract error-checking code from virNetworkDNSTxtDefParseXML conf: Replace virNetworkDNSTxtDefParseXML(hardcoded) with namesake(generated) conf: Generate virNetworkDNSTxtDefFormatBuf conf: Extract error-checking code from virNetworkDNSSrvDefParseXML conf: Replace virNetworkDNSSrvDefParseXML(hardcoded) with namesake(generated) conf: Generate virNetworkDNSSrvDefFormatBuf conf: Extract error-checking code from virNetworkDNSHostDefParseXML conf: Replace virNetworkDNSHostDefParseXML(hardcoded) with namesake(generated) conf: Generate virNetworkDNSHostDefFormatBuf conf: Extract virNetworkDNSForwarderParseXML from virNetworkDNSParseXML conf: Replace virNetworkDNSForwarderParseXML(hardcoded) with namesake(generated) conf: Generate virNetworkDNSForwarderFormatBuf conf: Extract error-checking code from virNetworkDNSDefParseXML conf: Replace virNetworkDNSDefParseXML(hardcoded) with namesake(generated) conf: Generate virNetworkDNSDefFormatBuf conf: Extract embedded structs from virDomainGraphicsDef as standalone structs conf: Replace virDomainGraphicsDefParseXMLSDL(hardcoded) with virDomainGraphicsSDLDefParseXML(generated) conf: Generate format functions for virDomainGraphicsSDLDef conf: Replace virDomainGraphicsAuthDefParseXML(hardcoded) with namesake(generated) conf: Generate format functions for virDomainGraphicsAuthDef conf: Extract error-checking code from virDomainGraphicsDefParseXMLVNC conf: Replace virDomainGraphicsDefParseXMLVNC(hardcoded) with virDomainGraphicsVNCDefParseXML(generated) conf: Generate virDomainGraphicsVNCDefFormatAttr conf: Extract error-checking code from virDomainGraphicsDefParseXMLRDP conf: Replace virDomainGraphicsDefParseXMLRDP(hardcoded) with virDomainGraphicsRDPDefParseXML(generated) conf: Generate virDomainGraphicsRDPDefFormatAttr conf: Replace virDomainGraphicsDefParseXMLDesktop(hardcoded) with virDomainGraphicsDesktopDefParseXML(generated) conf: Generate virDomainGraphicsDesktopDefFormatAttr conf: Add virSpiceChannelDef to help to parse the member 'channels' of virDomainGraphicsSpiceDef conf: Extract error-checking code from virDomainGraphicsDefParseXMLSpice conf: Replace virDomainGraphicsDefParseXMLSpice(hardcoded) with virDomainGraphicsSpiceDefParseXML(generated) conf: Generate virDomainGraphicsSpiceDefFormatElem and virDomainGraphicsSpiceDefFormatAttr conf: Replace virDomainGraphicsDefParseXMLEGLHeadless(hardcoded) with virDomainGraphicsEGLHeadlessDefParseXML(generated) conf: Generate virDomainGraphicsEGLHeadlessDefFormatElem conf: Extract error-checking code from virDomainGraphicsListenDefParseXML conf: Replace virDomainGraphicsListenDefParseXML(hardcoded) with namesake(generated) conf: Generate virDomainGraphicsListenDefFormatBuf conf: Extract error-checking code from virDomainGraphicsDefParseXML conf: Replace virDomainGraphicsDefParseXML(hardcoded) with namesake(generated) conf: Replace virDomainGraphicsDefFormat(hardcoded) with virDomainGraphicsDefFormatBuf(generated) meson.build | 5 + po/POTFILES.in | 3 + scripts/meson.build | 8 + scripts/xmlgen/directive.py | 1115 ++++++++++++++++++++ scripts/xmlgen/go | 7 + scripts/xmlgen/main.py | 439 ++++++++ scripts/xmlgen/utils.py | 121 +++ src/conf/domain_conf.c | 1650 +++++++++--------------------- src/conf/domain_conf.h | 179 ++-- src/conf/meson.build | 41 + src/conf/network_conf.c | 467 ++------- src/conf/network_conf.h | 54 +- src/conf/virconftypes.h | 18 + src/libvirt_private.syms | 9 + src/meson.build | 6 + src/qemu/qemu_command.c | 4 + src/qemu/qemu_driver.c | 2 + src/qemu/qemu_hotplug.c | 2 + src/qemu/qemu_migration_cookie.c | 1 + src/qemu/qemu_process.c | 5 + src/qemu/qemu_validate.c | 2 + src/util/virsocketaddr.c | 42 + src/util/virsocketaddr.h | 26 +- src/util/virstring.c | 57 ++ src/util/virstring.h | 9 + src/util/virxml.c | 105 ++ src/util/virxml.h | 6 + src/vmx/vmx.c | 1 + tests/meson.build | 1 + tools/meson.build | 2 + 30 files changed, 2738 insertions(+), 1649 deletions(-) create mode 100644 scripts/xmlgen/directive.py create mode 100755 scripts/xmlgen/go create mode 100755 scripts/xmlgen/main.py create mode 100644 scripts/xmlgen/utils.py -- 2.25.1

3 63

[libvirt PATCH] rpm: convert mingw spec to meson
by Daniel P. Berrangé 07 Dec '20

07 Dec '20

The meson build system is configured to only ever build shared libraries, so we delete the -static sub-RPMs. The few driver conditionals are deleted as there was never any scenario in which their value changed. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- mingw-libvirt.spec.in | 205 +++++++++++++++++------------------------- 1 file changed, 81 insertions(+), 124 deletions(-) diff --git a/mingw-libvirt.spec.in b/mingw-libvirt.spec.in index 06bb9dfe7f..0686cbaf78 100644 --- a/mingw-libvirt.spec.in +++ b/mingw-libvirt.spec.in @@ -11,26 +11,6 @@ %define supported_platform 0 %endif -# Default to skipping autoreconf. Distros can change just this one line -# (or provide a command-line override) if they backport any patches that -# touch configure.ac or Makefile.am. -%{!?enable_autotools:%define enable_autotools 0} - -# The mingw build is client only. Set up defaults for hypervisor drivers -# that talk via a native remote protocol, and for which prereq mingw -# libraries exist. -%define with_esx 0%{!?_without_esx:1} -# missing libwsman, so can't build hyper-v -%define with_hyperv 0%{!?_without_hyperv:0} -%define with_xenapi 0%{!?_without_xenapi:1} -%define with_vz 0%{!?_without_vz:0} - -# RHEL ships ESX but not PowerHypervisor, HyperV, or libxenserver (xenapi) -%if 0%{?rhel} - %define with_xenapi 0 - %define with_hyperv 0 -%endif - Name: mingw-libvirt Version: @VERSION@ Release: 1%{?dist} @@ -74,20 +54,15 @@ BuildRequires: libxslt BuildRequires: python3 BuildRequires: perl-interpreter BuildRequires: perl(Getopt::Long) -%if 0%{?enable_autotools} -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: gettext-devel -BuildRequires: libtool -%endif +BuildRequires: make +BuildRequires: meson +BuildRequires: ninja-build BuildRequires: python3-docutils BuildRequires: mingw32-libssh2 BuildRequires: mingw64-libssh2 -%if %{with_esx} BuildRequires: mingw32-curl BuildRequires: mingw64-curl -%endif BuildRequires: cpp %if 0%{?fedora} || 0%{?rhel} > 7 BuildRequires: rpcgen @@ -101,31 +76,19 @@ MinGW Windows libvirt virtualization library. # Mingw32 %package -n mingw32-libvirt Summary: %{summary} +Obsoletes: mingw32-libvirt < 7.0.0 %description -n mingw32-libvirt MinGW Windows libvirt virtualization library. -%package -n mingw32-libvirt-static -Summary: %{summary} -Requires: mingw32-libvirt = %{version}-%{release} - -%description -n mingw32-libvirt-static -MinGW Windows libvirt virtualization library, static version. - # Mingw64 %package -n mingw64-libvirt Summary: %{summary} +Obsoletes: mingw64-libvirt < 7.0.0 %description -n mingw64-libvirt MinGW Windows libvirt virtualization library. -%package -n mingw64-libvirt-static -Summary: %{summary} -Requires: mingw64-libvirt = %{version}-%{release} - -%description -n mingw64-libvirt-static -MinGW Windows libvirt virtualization library, static version. - %{?mingw_debug_package} @@ -138,55 +101,82 @@ echo "This RPM requires Fedora >= %{min_fedora}" exit 1 %endif -%if ! %{with_esx} - %define _without_esx --without-esx -%endif - -%if ! %{with_hyperv} - %define _without_hyperv --without-hyperv -%endif - -%if ! %{with_xenapi} - %define _without_xenapi --without-xenapi -%endif - -%if ! %{with_vz} - %define _without_vz --without-vz -%endif - -%if 0%{?enable_autotools} -autoreconf -if -%endif - -# XXX enable SASL in future -%mingw_configure \ - --enable-static \ - --without-xen \ - --without-qemu \ - --without-openvz \ - --without-lxc \ - --without-vbox \ - %{?_without_xenapi} \ - --without-sasl \ - --without-polkit \ - --without-libvirtd \ - %{?_without_esx} \ - %{?_without_hyperv} \ - --without-vmware \ - --without-parallels \ - --without-netcf \ - --without-audit \ - --without-dtrace \ - --enable-expensive-tests - -%mingw_make %{?_smp_mflags} - +%mingw_meson \ + --auto-features=enabled \ + -Ddriver_remote=enabled \ + -Ddriver_esx=enabled \ + -Dcurl=enabled \ + -Ddocs=enabled \ + -Dapparmor=disabled \ + -Dattr=disabled \ + -Daudit=disabled \ + -Dbash_completion=disabled \ + -Dblkid=disabled \ + -Dcapng=disabled \ + -Ddriver_bhyve=disabled \ + -Ddriver_hyperv=disabled \ + -Ddriver_interface=disabled \ + -Ddriver_libvirtd=disabled \ + -Ddriver_libxl=disabled \ + -Ddriver_lxc=disabled \ + -Ddriver_network=disabled \ + -Ddriver_openvz=disabled \ + -Ddriver_qemu=disabled \ + -Ddriver_secrets=disabled \ + -Ddriver_vbox=disabled \ + -Ddriver_vmware=disabled \ + -Ddriver_vz=disabled \ + -Ddtrace=disabled \ + -Dexpensive_tests=enabled \ + -Dfirewalld=disabled \ + -Dfirewalld_zone=disabled \ + -Dfuse=disabled \ + -Dglusterfs=disabled \ + -Dhost_validate=disabled \ + -Dlibiscsi=disabled \ + -Dlibnl=disabled \ + -Dlibpcap=disabled \ + -Dlibssh2=disabled \ + -Dlibssh=disabled \ + -Dlogin_shell=disabled \ + -Dnetcf=disabled \ + -Dnls=disabled \ + -Dnss=disabled \ + -Dnumactl=disabled \ + -Dnumad=disabled \ + -Dopenwsman=disabled \ + -Dpciaccess=disabled \ + -Dpm_utils=disabled \ + -Dpolkit=disabled \ + -Dreadline=disabled \ + -Drpath=disabled \ + -Dsanlock=disabled \ + -Dsasl=disabled \ + -Dsecdriver_apparmor=disabled \ + -Dsecdriver_selinux=disabled \ + -Dselinux=disabled \ + -Dstorage_dir=disabled \ + -Dstorage_disk=disabled \ + -Dstorage_fs=disabled \ + -Dstorage_gluster=disabled \ + -Dstorage_iscsi_direct=disabled \ + -Dstorage_iscsi=disabled \ + -Dstorage_lvm=disabled \ + -Dstorage_mpath=disabled \ + -Dstorage_rbd=disabled \ + -Dstorage_scsi=disabled \ + -Dstorage_sheepdog=disabled \ + -Dstorage_vstorage=disabled \ + -Dstorage_zfs=disabled \ + -Dsysctl_config=disabled \ + -Dtests=disabled \ + -Dudev=disabled \ + -Dwireshark_dissector=disabled \ + -Dyajl=disabled +%mingw_ninja %install -%mingw_make_install "DESTDIR=$RPM_BUILD_ROOT" - -# Libtool files don't need to be bundled -find $RPM_BUILD_ROOT -name "*.la" -delete +%mingw_ninja_install rm -rf $RPM_BUILD_ROOT%{mingw32_sysconfdir}/libvirt/nwfilter rm -rf $RPM_BUILD_ROOT%{mingw64_sysconfdir}/libvirt/nwfilter @@ -267,12 +257,6 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh %{mingw32_mandir}/man1/virt-pki-validate.1* %{mingw32_mandir}/man7/virkey*.7* -%files -n mingw32-libvirt-static -%{mingw32_libdir}/libvirt.a -%{mingw32_libdir}/libvirt-lxc.a -%{mingw32_libdir}/libvirt-qemu.a -%{mingw32_libdir}/libvirt-admin.a - # Mingw64 %files -n mingw64-libvirt %dir %{mingw64_sysconfdir}/libvirt/ @@ -299,28 +283,8 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh %dir %{mingw64_datadir}/libvirt/ %dir %{mingw64_datadir}/libvirt/schemas/ -%{mingw64_datadir}/libvirt/schemas/basictypes.rng -%{mingw64_datadir}/libvirt/schemas/capability.rng -%{mingw64_datadir}/libvirt/schemas/cputypes.rng -%{mingw64_datadir}/libvirt/schemas/domain.rng -%{mingw64_datadir}/libvirt/schemas/domainbackup.rng -%{mingw64_datadir}/libvirt/schemas/domaincaps.rng -%{mingw64_datadir}/libvirt/schemas/domaincheckpoint.rng -%{mingw64_datadir}/libvirt/schemas/domaincommon.rng -%{mingw64_datadir}/libvirt/schemas/domainsnapshot.rng -%{mingw64_datadir}/libvirt/schemas/interface.rng -%{mingw64_datadir}/libvirt/schemas/network.rng -%{mingw64_datadir}/libvirt/schemas/networkcommon.rng -%{mingw64_datadir}/libvirt/schemas/networkport.rng -%{mingw64_datadir}/libvirt/schemas/nodedev.rng -%{mingw64_datadir}/libvirt/schemas/nwfilter.rng -%{mingw64_datadir}/libvirt/schemas/nwfilter_params.rng -%{mingw64_datadir}/libvirt/schemas/nwfilterbinding.rng -%{mingw64_datadir}/libvirt/schemas/secret.rng -%{mingw64_datadir}/libvirt/schemas/storagecommon.rng -%{mingw64_datadir}/libvirt/schemas/storagepool.rng -%{mingw64_datadir}/libvirt/schemas/storagepoolcaps.rng -%{mingw64_datadir}/libvirt/schemas/storagevol.rng +%{mingw64_datadir}/libvirt/schemas/*.rng + %dir %{mingw64_datadir}/libvirt/api/ %{mingw64_datadir}/libvirt/api/libvirt-api.xml %{mingw64_datadir}/libvirt/api/libvirt-lxc-api.xml @@ -359,11 +323,4 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh %{mingw64_mandir}/man1/virt-pki-validate.1* %{mingw64_mandir}/man7/virkey*.7* -%files -n mingw64-libvirt-static -%{mingw64_libdir}/libvirt.a -%{mingw64_libdir}/libvirt-lxc.a -%{mingw64_libdir}/libvirt-qemu.a -%{mingw64_libdir}/libvirt-admin.a - - %changelog -- 2.28.0

2 1

[libvirt PATCH] libvirt-guests: Remove obsolete Windows comment
by Daniel P. Berrangé 07 Dec '20

07 Dec '20

From: Kevin Locke <kevin(a)kevinlocke.name> The comment that > For instance, qemu-ga doesn't support guest time synchronization on > Windows guests, but Linux ones. Was correct at the time, but has since been addressed by qemu/qemu@105fad6bb22, which added support for set-time without a time argument, as used by `virsh domtime --sync` by libvirt-guests.sh. I can confirm that `virsh domtime --sync` works correctly on a Windows 10 guest, as does `SYNC_TIME=1`. (Note that there can be a significant delay between when the command completes and when the guest time finishes synchronizing due to QEMU GA calling `w32tm` with `/nowait`, which complicates testing.) Signed-off-by: Kevin Locke <kevin(a)kevinlocke.name> --- Merged this trivial docs patch from a gitlab MR. tools/libvirt-guests.sysconf | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/libvirt-guests.sysconf b/tools/libvirt-guests.sysconf index 0765efec21..4f83edab90 100644 --- a/tools/libvirt-guests.sysconf +++ b/tools/libvirt-guests.sysconf @@ -46,7 +46,5 @@ # If non-zero, try to sync guest time on domain resume. Be aware, that # this requires guest agent with support for time synchronization -# running in the guest. For instance, qemu-ga doesn't support guest time -# synchronization on Windows guests, but Linux ones. By default, this -# functionality is turned off. +# running in the guest. By default, this functionality is turned off. #SYNC_TIME=1 -- 2.28.0

1 0

[PATCH v2 00/27] Introduce virtio memory support
by Michal Privoznik 07 Dec '20

07 Dec '20

v2 of: https://www.redhat.com/archives/libvir-list/2020-November/msg01525.html diff to v1: - I've made change to 23/26 which now updates <currentMemory/> on MEMORY_DEVICE_SIZE_CHANGE event - virsh manpage was written in 25/26 - 26/26 is new, it's NEWS.rst addition Original patchset was: Reviewed-by: Daniel Henrique Barboza <danielhb413(a)gmail.com> Tested-by: Daniel Henrique Barboza <danielhb413(a)gmail.com> Tested-by: Han Han <hhan(a)redhat.com> and I will add those tags before pushing. However, I'd like have review for this new version, because of the changes I made. Michal Prívozník (27): viruuid: Rework virUUIDIsValid() internal.h: Introduce VIR_IS_POW2() docs: Fix nvdimm example wrt to <uuid/> domain_conf: Check NVDIMM UUID in ABI stability qemu_domain_address: Reformat qemuDomainAssignS390Addresses() conf: Require nvdimm path in validate step domain_conf: Fix virDomainMemoryModel type virDomainMemorySourceDefFormat: Utilize virXMLFormatElement() virDomainMemoryTargetDefFormat: Utilize virXMLFormatElement() qemu: Move mem validation into post parse validator conf: Move some of virDomainMemoryDef members into a union conf: Introduce virtio-pmem <memory/> model qemu_capabilities: Introduce QEMU_CAPS_DEVICE_VIRTIO_{P}MEM_PCI qemu_validate: Require virtio-mem device for mem model virtio security: Relabel virtio mem qemu: Allow virtio-pmem in CGroups qemu: Create virtio-pmem in domain namespace qemu_command: Move dimm into qemuBuildDeviceAddressStr() qemu: Build command line for virtio-pmem conf: Introduce virtio-mem <memory/> model qemu: Build command line for virtio-mem qemu: Wire up <memory/> live update qemu: Wire up MEMORY_DEVICE_SIZE_CHANGE event qemu: Refresh the actual size of virtio-mem on monitor reconnect virsh: Simplify @flags handing in cmdSetmem() and cmdSetmaxmem() virsh: Introduce --virtio to setmem news: document recent virtio memory addition NEWS.rst | 9 + docs/formatdomain.rst | 70 +++- docs/manpages/virsh.rst | 6 + docs/schemas/domaincommon.rng | 16 + src/conf/domain_conf.c | 372 ++++++++++++++---- src/conf/domain_conf.h | 38 +- src/internal.h | 10 + src/libvirt_private.syms | 2 + src/qemu/qemu_alias.c | 59 ++- src/qemu/qemu_capabilities.c | 4 + src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_cgroup.c | 43 +- src/qemu/qemu_command.c | 172 +++++--- src/qemu/qemu_command.h | 5 +- src/qemu/qemu_domain.c | 99 +++-- src/qemu/qemu_domain.h | 1 + src/qemu/qemu_domain_address.c | 98 +++-- src/qemu/qemu_domain_address.h | 3 +- src/qemu/qemu_driver.c | 201 +++++++++- src/qemu/qemu_hotplug.c | 22 +- src/qemu/qemu_hotplug.h | 5 + src/qemu/qemu_monitor.c | 37 ++ src/qemu/qemu_monitor.h | 27 ++ src/qemu/qemu_monitor_json.c | 94 +++-- src/qemu/qemu_monitor_json.h | 5 + src/qemu/qemu_namespace.c | 19 +- src/qemu/qemu_process.c | 107 ++++- src/qemu/qemu_validate.c | 78 ++-- src/security/security_apparmor.c | 35 +- src/security/security_dac.c | 48 ++- src/security/security_selinux.c | 48 ++- src/security/virt-aa-helper.c | 22 +- src/util/virrandom.c | 2 +- src/util/viruuid.c | 17 +- src/util/viruuid.h | 2 +- .../caps_4.1.0.x86_64.xml | 1 + .../caps_4.2.0.x86_64.xml | 1 + .../caps_5.0.0.x86_64.xml | 1 + .../caps_5.1.0.x86_64.xml | 2 + .../caps_5.2.0.x86_64.xml | 2 + ...mory-hotplug-virtio-mem.x86_64-latest.args | 53 +++ .../memory-hotplug-virtio-mem.xml | 78 ++++ ...ory-hotplug-virtio-pmem.x86_64-latest.args | 45 +++ .../memory-hotplug-virtio-pmem.xml | 54 +++ tests/qemuxml2argvtest.c | 2 + ...emory-hotplug-virtio-mem.x86_64-latest.xml | 1 + ...mory-hotplug-virtio-pmem.x86_64-latest.xml | 1 + tests/qemuxml2xmltest.c | 3 + tools/virsh-domain.c | 138 ++++++- 49 files changed, 1766 insertions(+), 394 deletions(-) create mode 100644 tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/memory-hotplug-virtio-mem.xml create mode 100644 tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.xml create mode 120000 tests/qemuxml2xmloutdata/memory-hotplug-virtio-mem.x86_64-latest.xml create mode 120000 tests/qemuxml2xmloutdata/memory-hotplug-virtio-pmem.x86_64-latest.xml -- 2.26.2

4 57

[PATCH] qemu_monitor_json: Don't leak "option" in qemuMonitorJSONGetCommandLineOptions()
by Michal Privoznik 07 Dec '20

07 Dec '20

In recent commit of bf8bd93df0 (and friends) we switched the way we process queried command line arguments: from string lists to virJSONValue stored in a hash table. To achieve this qemuMonitorJSONGetCommandLineOptions() helper was introduced which executes the "query-command-line-options" monitor command and then calls virJSONValueArrayForeachSteal() to process the output. The array process function is also given qemuMonitorJSONGetCommandLineOptionsWorker() as the callback which is called over each item of the returned array. This callback then steals "parameters" attribute of each array iteam storing it in the hash table, but it leaves behind "option" attribute (because it's g_strdup()-ed). After all of this, the callback returns 0 which is a signal to the array processing function that the callback took ownership of the array item. But this is not true. While it removed "parameters" it did not take the rest ("option" for instance). And therefore, it leads to a memory leak: 5,347 (1,656 direct, 3,691 indirect) bytes in 69 blocks are definitely lost in loss record 2,752 of 2,794 at 0x483BEC5: calloc (vg_replace_malloc.c:760) by 0x4E25A10: g_malloc0 (in /usr/lib64/libglib-2.0.so.0.6400.5) by 0x4943317: virJSONValueNewObject (virjson.c:569) by 0x4945692: virJSONParserHandleStartMap (virjson.c:1768) by 0x5825A86: yajl_do_parse (in /usr/lib64/libyajl.so.2.1.0) by 0x4945BFA: virJSONValueFromString (virjson.c:1896) by 0xAF5C115: qemuMonitorJSONIOProcessLine (qemu_monitor_json.c:224) by 0xAF5C45E: qemuMonitorJSONIOProcess (qemu_monitor_json.c:279) by 0xAF4BB6C: qemuMonitorIOProcess (qemu_monitor.c:342) by 0xAF4C444: qemuMonitorIO (qemu_monitor.c:574) by 0x4FEF846: socket_source_dispatch (in /usr/lib64/libgio-2.0.so.0.6400.5) by 0x4E1F727: g_main_context_dispatch (in /usr/lib64/libglib-2.0.so.0.6400.5) The callback must return 1 so that the array item is properly freed. Fixes: ebeff6cd57d07c89d42e191ed0085a9dd89835c5 Signed-off-by: Michal Privoznik <mprivozn(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 4db00e284a..8480338f46 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -6357,7 +6357,7 @@ qemuMonitorJSONGetCommandLineOptionsWorker(size_t pos G_GNUC_UNUSED, g_hash_table_insert(options, g_strdup(name), parameters); parameters = NULL; - return 0; + return 1; } -- 2.26.2

2 1

Default issue template for libvirt.git
by Peter Krempa 07 Dec '20

07 Dec '20

Hi, we've recently added templates for issues for the libvirt repo [1]. Unfortunately gitlab made a weird design decision, where the default template is not actually picked from the templates comitted to the repository, but needs to be added in the repo config in the web-ui into a separate textarea. This unfortunately creates a gap where the repo-comitted stuff can actually diverge from the default. I've asked Pavel to copy the 'bug.md' template into the "default" one so even if users don't select any they will see the bug one by default. My reasoning despite being vulnerable to diverging from the in-repo state is that we've added templates so that we prevent too-little information being filled. Having to select a template requires additional steps and also asks for more than the reporter might have reported normally, so it may be ofputting for them to select it manually. Thus we rather want to force a default. Alternatively we can add another comment on top asking them to switch to a different template for enhancement such as:  Peter [1] https://www.redhat.com/archives/libvir-list/2020-December/msg00003.html

1 0

[PATCH] spec: keep existing nwfilters uuid on update
by Nikolay Shirokovskiy 06 Dec '20

06 Dec '20

Now on every nwfilter config package update we overwrite existing filters entirely. It is desired to bring new version of filters on update but we'd better keep their uuids I guess. Actually patch primarily address noise in logs on update. If both libvirtd and firewalld are running and libvirt is using firewalld backend then on firewalld restart we reload all nwfilters. So if node is updated and we have update for both firewalld and libvirt then in the process of update first new nwfilters of libvirt package are copied to /etc/libvirt/nwfilters then firewalld is restarted and then libvirtd is restarted. In this process firewalld restart cause log messages like [1]. The issue is libvirt brings nwfilters without <uuid> in definition and on handling firewalld restart libvirt generates missing uuid and then fail to update filter definition because it is already present in filters list with different uuid. [1] virNWFilterObjListAssignDef:337 : operation failed: filter 'no-ip-spoofing' already exists with uuid c302edf9-8a48-40d8-a652-f70b2c563ad1 Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com> --- libvirt.spec.in | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 2a4324b..6a31440 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1438,7 +1438,18 @@ fi rm -rf %{_localstatedir}/lib/rpm-state/libvirt || : %post daemon-config-nwfilter -cp %{_datadir}/libvirt/nwfilter/*.xml %{_sysconfdir}/libvirt/nwfilter/ +# keep existing filters uuid on update +for dfile in %{_datadir}/libvirt/nwfilter/*.xml; do + sfile=%{_sysconfdir}/libvirt/nwfilter/`basename $dfile` + if [ -f "$sfile" ]; then + uuidstr=`sed -n '/<uuid>.*<\/uuid>/p' "$sfile"` + if [ ! -z "$uuidstr" ]; then + sed -e "s,<filter .*>,&\n$uuidstr," "$dfile" > "$sfile" + continue + fi + fi + cp "$dfile" "$sfile" +done # libvirt saves these files with mode 600 chmod 600 %{_sysconfdir}/libvirt/nwfilter/*.xml # Make sure libvirt picks up the new nwfilter defininitons -- 1.8.3.1

4 5

[PATCH v2 00/10] qemu: add option to process offloaded legacy blockjob event ealier
by Nikolay Shirokovskiy 04 Dec '20

04 Dec '20

This is successor to [1] but I changed the subject as in the review the patch 'qemu: sync backing chain update in virDomainGetBlockJobInfo' was not considered good one from design POV. However I think the basic patch is helpful to address similar issues. Look at [*] for example, there it allows to sync backing chains during query block stats. In discussion of [1] I stated that first patch will also allow to get rid of stale block job events on reconnection to qemu. But this will require additional work actually so with this patch series stale events are still present. And in the discussion it was also mentioned by Peter that stale events are not harmful for legacy blockjobs code. I also removed previous attempts to eliminate some of stale events. I still keep patch for virDomainGetBlockJobInfo. May be in comparsion to [*] the approach the patch takes will look not so bad :) [1] First version of the patch series https://www.redhat.com/archives/libvir-list/2020-October/msg01133.html Nikolay Shirokovskiy (10): qemu: add option to process offloaded legacy blockjob event ealier qemu: reconnect: precreate legacy blockjobs qemu: remove extra block job finalize on reconnect qemu: remove stale cleanup in qemuProcessRefreshLegacyBlockjob qemu: add note for outdated legacy block job events qemu: use autoptr in qemuProcessRefreshLegacyBlockjobs qemu: refresh backing chain after block job reconnection qemu: move code that depends on backing chain appropriately qemu: fix race on legacy block completion and quering stats [*] qemu: sync backing chain update in virDomainGetBlockJobInfo src/qemu/qemu_blockjob.c | 2 +- src/qemu/qemu_blockjob.h | 7 +++ src/qemu/qemu_driver.c | 50 +++++++++++----- src/qemu/qemu_process.c | 149 ++++++++++++++++++++++++++++------------------- 4 files changed, 132 insertions(+), 76 deletions(-) -- 1.8.3.1

2 20

[PATCH v3 0/5] add post parse pSeries mem align, when ABI_UPDATE
by Daniel Henrique Barboza 04 Dec '20

04 Dec '20

Hi, This is the v3 of https://www.redhat.com/archives/libvir-list/2020-November/msg01057.html Some patches were already pushed. This series contains the remaining ones that got feedback from Andrea. Michal, I added your Reviewed-by tag in all my patches because I considered that the changes made weren't worth making you review them again. Changes in v3: - former patches 1, 2 and 4: already pushed. - patches 1 and 2: these are Andrea's patches from [1]. The other patches were rebased upon them. They're being sent in this series because they're not pushed upstream in the moment of this posting. - patch 3: reverted an extra commit that was made deprecated after reverting the post parse code, as suggested by Andrea. - patch 4 and 5 (former 5 and 6): these were taken from Andrea's local branch in [2], with the test changes suggested by Andrea. [1] https://www.redhat.com/archives/libvir-list/2020-December/msg00244.html [2] https://gitlab.com/abologna/libvirt/-/tree/ppc64-memalign Andrea Bolognani (2): tests: Sync some ppc64 tests tests: Simplify some ppc64 tests Daniel Henrique Barboza (3): domain_conf.c: revert auto-alignment of pSeries NVDIMM in post parse qemu_domain.c: post parse pSeries NVDIMM align with PARSE_ABI_UPDATE qemu_domain.c: align all pSeries mem modules when PARSE_ABI_UPDATE src/conf/domain_conf.c | 59 +------------- src/conf/domain_conf.h | 3 - src/libvirt_private.syms | 1 - src/qemu/qemu_domain.c | 80 ++++++++++++++++++- ...mory-hotplug-nvdimm-ppc64-abi-update.args} | 20 ++--- ...memory-hotplug-nvdimm-ppc64-abi-update.xml | 1 + .../memory-hotplug-nvdimm-ppc64.args | 6 +- .../memory-hotplug-nvdimm-ppc64.xml | 8 +- ...emory-hotplug-ppc64-nonuma-abi-update.args | 29 +++++++ ...memory-hotplug-ppc64-nonuma-abi-update.xml | 1 + .../memory-hotplug-ppc64-nonuma.args | 7 +- .../memory-hotplug-ppc64-nonuma.xml | 14 +++- tests/qemuxml2argvtest.c | 18 ++++- ...memory-hotplug-nvdimm-ppc64-abi-update.xml | 46 +++++++++++ .../memory-hotplug-nvdimm-ppc64.xml | 10 +-- ...memory-hotplug-ppc64-nonuma-abi-update.xml | 38 +++++++++ .../memory-hotplug-ppc64-nonuma.xml | 1 + tests/qemuxml2xmltest.c | 19 +++++ 18 files changed, 254 insertions(+), 107 deletions(-) rename tests/qemuxml2argvdata/{memory-hotplug-nvdimm-ppc64.ppc64-latest.args => memory-hotplug-nvdimm-ppc64-abi-update.args} (62%) create mode 120000 tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.xml create mode 100644 tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.args create mode 120000 tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.xml create mode 100644 tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64-abi-update.xml create mode 100644 tests/qemuxml2xmloutdata/memory-hotplug-ppc64-nonuma-abi-update.xml create mode 120000 tests/qemuxml2xmloutdata/memory-hotplug-ppc64-nonuma.xml -- 2.26.2

2 12

[PATCH v2 RESEND] lxc: Cleanup after failed startup
by Michal Privoznik 04 Dec '20

04 Dec '20

If starting an container fails, the virLXCProcessStop() is called. But since vm->def->id is not set until libvirt_lxc is spawned (the domain's ID is PID of that process), virLXCProcessStop() returns early as virDomainObjIsActive() returns false. But doing so leaves behind resources reserved for the containers during the startup process. Most notably, hostdevs are not re-attached to the host, the domain's transient XML is not removed, etc. To resolve this, virLXCProcessCleanup() is called in this case. However, it is modified to accept @flags which allows caller to run only specific cleanups (depending how far in container creation the failure occurred). There is plenty of cleanups which don't need this guard because either they detect a NULL pointer or try to release an unique resource. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- This is just a resend of this patch: https://www.redhat.com/archives/libvir-list/2020-November/msg00525.html src/lxc/lxc_process.c | 52 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 41 insertions(+), 11 deletions(-) diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 7e07f49f9a..0f818e2ee0 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -145,18 +145,27 @@ lxcProcessRemoveDomainStatus(virLXCDriverConfigPtr cfg, } +typedef enum { + VIR_LXC_PROCESS_CLEANUP_RELEASE_SECLABEL = (1 << 0), + VIR_LXC_PROCESS_CLEANUP_RESTORE_SECLABEL = (1 << 1), + VIR_LXC_PROCESS_CLEANUP_REMOVE_TRANSIENT = (1 << 2), +} virLXCProcessCleanupFlags; + /** * virLXCProcessCleanup: * @driver: pointer to driver structure * @vm: pointer to VM to clean up * @reason: reason for switching the VM to shutoff state + * @flags: allows to run selective cleanups only * - * Cleanout resources associated with the now dead VM - * + * Clean out resources associated with the now dead VM. + * If @flags is zero then whole cleanup process is done, + * otherwise only selected sections are run. */ static void virLXCProcessCleanup(virLXCDriverPtr driver, virDomainObjPtr vm, - virDomainShutoffReason reason) + virDomainShutoffReason reason, + unsigned int flags) { size_t i; virLXCDomainObjPrivatePtr priv = vm->privateData; @@ -164,8 +173,11 @@ static void virLXCProcessCleanup(virLXCDriverPtr driver, virLXCDriverConfigPtr cfg = virLXCDriverGetConfig(driver); virConnectPtr conn = NULL; - VIR_DEBUG("Cleanup VM name=%s pid=%d reason=%d", - vm->def->name, (int)vm->pid, (int)reason); + VIR_DEBUG("Cleanup VM name=%s pid=%d reason=%d flags=0x%x", + vm->def->name, (int)vm->pid, (int)reason, flags); + + if (flags == 0) + flags = ~0; /* now that we know it's stopped call the hook if present */ if (virHookPresent(VIR_HOOK_DRIVER_LXC)) { @@ -177,9 +189,15 @@ static void virLXCProcessCleanup(virLXCDriverPtr driver, NULL, xml, NULL); } - virSecurityManagerRestoreAllLabel(driver->securityManager, - vm->def, false, false); - virSecurityManagerReleaseLabel(driver->securityManager, vm->def); + if (flags & VIR_LXC_PROCESS_CLEANUP_RESTORE_SECLABEL) { + virSecurityManagerRestoreAllLabel(driver->securityManager, + vm->def, false, false); + } + + if (flags & VIR_LXC_PROCESS_CLEANUP_RELEASE_SECLABEL) { + virSecurityManagerReleaseLabel(driver->securityManager, vm->def); + } + /* Clear out dynamically assigned labels */ if (vm->def->nseclabels && vm->def->seclabels[0]->type == VIR_DOMAIN_SECLABEL_DYNAMIC) { @@ -258,7 +276,9 @@ static void virLXCProcessCleanup(virLXCDriverPtr driver, NULL, xml, NULL); } - virDomainObjRemoveTransientDef(vm); + if (flags & VIR_LXC_PROCESS_CLEANUP_REMOVE_TRANSIENT) + virDomainObjRemoveTransientDef(vm); + virObjectUnref(cfg); virObjectUnref(conn); } @@ -904,7 +924,7 @@ int virLXCProcessStop(virLXCDriverPtr driver, } cleanup: - virLXCProcessCleanup(driver, vm, reason); + virLXCProcessCleanup(driver, vm, reason, 0); return 0; } @@ -1198,6 +1218,7 @@ int virLXCProcessStart(virConnectPtr conn, g_autoptr(virCgroup) selfcgroup = NULL; int status; g_autofree char *pidfile = NULL; + unsigned int stopFlags = 0; if (virCgroupNewSelf(&selfcgroup) < 0) return -1; @@ -1265,6 +1286,7 @@ int virLXCProcessStart(virConnectPtr conn, VIR_DEBUG("Setting current domain def as transient"); if (virDomainObjSetDefTransient(driver->xmlopt, vm, NULL) < 0) goto cleanup; + stopFlags |= VIR_LXC_PROCESS_CLEANUP_REMOVE_TRANSIENT; /* Run an early hook to set-up missing devices */ if (virHookPresent(VIR_HOOK_DRIVER_LXC)) { @@ -1312,11 +1334,13 @@ int virLXCProcessStart(virConnectPtr conn, goto cleanup; } virDomainAuditSecurityLabel(vm, true); + stopFlags |= VIR_LXC_PROCESS_CLEANUP_RELEASE_SECLABEL; VIR_DEBUG("Setting domain security labels"); if (virSecurityManagerSetAllLabel(driver->securityManager, vm->def, NULL, false, false) < 0) goto cleanup; + stopFlags |= VIR_LXC_PROCESS_CLEANUP_RESTORE_SECLABEL; VIR_DEBUG("Setting up consoles"); for (i = 0; i < vm->def->nconsoles; i++) { @@ -1525,7 +1549,13 @@ int virLXCProcessStart(virConnectPtr conn, } if (rc != 0) { virErrorPreserveLast(&err); - virLXCProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED); + if (virDomainObjIsActive(vm)) { + virLXCProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED); + } else { + /* virLXCProcessStop() is NOP if the container is not active. + * If there was a failure whilst creating it, cleanup manually. */ + virLXCProcessCleanup(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED, stopFlags); + } } virCommandFree(cmd); for (i = 0; i < nttyFDs; i++) -- 2.26.2

2 1

[PATCH] qemu: Drop @qemuCaps argument from qemuDomainDefValidateMemoryHotplug()
by Michal Privoznik 04 Dec '20

04 Dec '20

After previous cleanup the @qemuCaps argument in qemuDomainDefValidateMemoryHotplug() is unused and thus doesn't need to be passed. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_domain.c | 2 -- src/qemu/qemu_domain.h | 1 - src/qemu/qemu_hotplug.c | 2 +- src/qemu/qemu_validate.c | 2 +- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index e705e8d8d5..5b58ccbf0e 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -8532,7 +8532,6 @@ qemuDomainDefValidateMemoryHotplugDevice(const virDomainMemoryDef *mem, /** * qemuDomainDefValidateMemoryHotplug: * @def: domain definition - * @qemuCaps: qemu capabilities object * @mem: definition of memory device that is to be added to @def with hotplug, * NULL in case of regular VM startup * @@ -8544,7 +8543,6 @@ qemuDomainDefValidateMemoryHotplugDevice(const virDomainMemoryDef *mem, */ int qemuDomainDefValidateMemoryHotplug(const virDomainDef *def, - virQEMUCapsPtr qemuCaps G_GNUC_UNUSED, const virDomainMemoryDef *mem) { unsigned int nmems = def->nmems; diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 010bae285d..9e870ff1e2 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -795,7 +795,6 @@ int qemuDomainAdjustMaxMemLockHostdev(virDomainObjPtr vm, virDomainHostdevDefPtr hostdev); int qemuDomainDefValidateMemoryHotplug(const virDomainDef *def, - virQEMUCapsPtr qemuCaps, const virDomainMemoryDef *mem); bool qemuDomainSupportsNewVcpuHotplug(virDomainObjPtr vm); diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 29a30c6812..9b93f256e8 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2399,7 +2399,7 @@ qemuDomainAttachMemory(virQEMUDriverPtr driver, if (qemuDomainMemoryDeviceAlignSize(vm->def, mem) < 0) goto cleanup; - if (qemuDomainDefValidateMemoryHotplug(vm->def, priv->qemuCaps, mem) < 0) + if (qemuDomainDefValidateMemoryHotplug(vm->def, mem) < 0) goto cleanup; if (qemuDomainAssignMemoryDeviceSlot(vm->def, mem) < 0) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 8ceea022d7..52d15defed 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -1156,7 +1156,7 @@ qemuValidateDomainDef(const virDomainDef *def, if (qemuValidateDomainDefCpu(driver, def, qemuCaps) < 0) return -1; - if (qemuDomainDefValidateMemoryHotplug(def, qemuCaps, NULL) < 0) + if (qemuDomainDefValidateMemoryHotplug(def, NULL) < 0) return -1; if (qemuValidateDomainDefClockTimers(def, qemuCaps) < 0) -- 2.26.2

2 1

[PATCH] apparmor: Drop needless check in AppArmorSetMemoryLabel()
by Michal Privoznik 04 Dec '20

04 Dec '20

The AppArmorSetMemoryLabel() is a callback that is called from qemuSecuritySetMemoryLabel() which never passes NULL as @mem. Therefore, there is no need to check whether @mem is NULL. Also, no other driver does that and just dereference it immediately. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/security/security_apparmor.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c index eed66e460f..1b035cce2f 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -681,9 +681,6 @@ AppArmorSetMemoryLabel(virSecurityManagerPtr mgr, virDomainDefPtr def, virDomainMemoryDefPtr mem) { - if (mem == NULL) - return 0; - switch (mem->model) { case VIR_DOMAIN_MEMORY_MODEL_NVDIMM: if (!virFileExists(mem->nvdimmPath)) { -- 2.26.2

2 1

[PATCH v2 0/6] add post parse pSeries mem align, when ABI_UPDATE
by Daniel Henrique Barboza 04 Dec '20

04 Dec '20

Hi, This is a follow up of [1] after really comprehending what I was messing with and what I couldn't do. This version has a shorter scope, only pSeries guests are being taken care of. I can send a follow up to handle x86 as well depending on the popularity of this work. Patches 1 and 2 moves the existing qemuDomainAlignMemorySizes() from qemu_command.c to qemuProcessPrepareDomain(). They are not related/tied to everything else done here and can be pushed independently if needed. Patches 3, 4 and 5 are reworking the existing code to be consistent to our prerrogative of not aligning memory when migrating or 'snapshotting'. No significant behavioral change is done. Patch 6 is where the bacon is. For new ppc64 guests, without ABI breakage, the mem alignment that are overshooting the intended initial memory is fixed. Test cases were added to help me diagnose and assert what I was changing and what would remain untouched. [1] https://www.redhat.com/archives/libvir-list/2020-November/msg00544.html Daniel Henrique Barboza (6): qemu_process.c: check migrateURI when setting VIR_QEMU_PROCESS_START_NEW qemu: move memory size align to qemuProcessPrepareDomain() Revert "domain_conf.c: auto-align pSeries NVDIMM in virDomainMemoryDefPostParse()" qemuxml2xmltest.c: honor ARG_PARSEFLAGS qemu_domain.c: post parse pSeries NVDIMM align with PARSE_ABI_UPDATE qemu_domain.c: align all pSeries mem modules when PARSE_ABI_UPDATE src/conf/domain_conf.c | 23 +-------- src/qemu/qemu_command.c | 3 -- src/qemu/qemu_domain.c | 39 ++++++++++++++- src/qemu/qemu_process.c | 11 +++- ...memory-hotplug-nvdimm-ppc64-abi-update.xml | 50 +++++++++++++++++++ ...emory-hotplug-ppc64-nonuma-abi-update.args | 34 +++++++++++++ ...memory-hotplug-ppc64-nonuma-abi-update.xml | 32 ++++++++++++ tests/qemuxml2argvtest.c | 7 +++ ...memory-hotplug-nvdimm-ppc64-abi-update.xml | 50 +++++++++++++++++++ .../memory-hotplug-nvdimm-ppc64.xml | 2 +- ...memory-hotplug-ppc64-nonuma-abi-update.xml | 45 +++++++++++++++++ tests/qemuxml2xmltest.c | 20 +++++++- 12 files changed, 286 insertions(+), 30 deletions(-) create mode 100644 tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.xml create mode 100644 tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.args create mode 100644 tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.xml create mode 100644 tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64-abi-update.xml create mode 100644 tests/qemuxml2xmloutdata/memory-hotplug-ppc64-nonuma-abi-update.xml -- 2.26.2

3 19

[PATCH 0/5] qemu: checkpoint: Don't require <domain> when redefining a checkpoint
by Peter Krempa 04 Dec '20

04 Dec '20

I've got a request from the oVirt devs integrating incremental backup whether there's a simpler way to redefine checkpoints since they need to support cases when the VM isn't running. Since we don't really use the def we can stop requiring it. Peter Krempa (5): virDomainCheckpointDefParse: Don't extract unused domain type virDomainCheckpointDefParse: Use 'unsigned int' for flags virDomainCheckpointRedefineCommit: Don't check ABI of definition in checkpoint conf: checkpoint: Prepare internals for missing domain definition conf: checkpoint: Don't require <domain> when redefining checkpoints docs/formatcheckpoint.rst | 12 +++-- src/conf/checkpoint_conf.c | 60 ++++++++++--------------- src/conf/checkpoint_conf.h | 3 +- src/qemu/qemu_checkpoint.c | 7 ++- src/test/test_driver.c | 2 +- tests/qemudomaincheckpointxml2xmltest.c | 5 --- 6 files changed, 37 insertions(+), 52 deletions(-) -- 2.28.0

2 10

[libvirt PATCH] cpu_map: Fix Icelake Server model number
by Tim Wiederhake 04 Dec '20

04 Dec '20

See arch/x86/include/asm/intel-family.h in the Kernel: #define INTEL_FAM6_ICELAKE_X 0x6A Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com> --- src/cpu_map/x86_Icelake-Server-noTSX.xml | 2 +- src/cpu_map/x86_Icelake-Server.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cpu_map/x86_Icelake-Server-noTSX.xml b/src/cpu_map/x86_Icelake-Server-noTSX.xml index 2fd6906406..34a0f7c18c 100644 --- a/src/cpu_map/x86_Icelake-Server-noTSX.xml +++ b/src/cpu_map/x86_Icelake-Server-noTSX.xml @@ -1,7 +1,7 @@ <cpus> <model name='Icelake-Server-noTSX'> <decode host='on' guest='off'/> - <signature family='6' model='134'/>  + <signature family='6' model='106'/>  <vendor name='Intel'/> <feature name='3dnowprefetch'/> <feature name='abm'/> diff --git a/src/cpu_map/x86_Icelake-Server.xml b/src/cpu_map/x86_Icelake-Server.xml index 367ade7240..1ee4ea9cd4 100644 --- a/src/cpu_map/x86_Icelake-Server.xml +++ b/src/cpu_map/x86_Icelake-Server.xml @@ -1,7 +1,7 @@ <cpus> <model name='Icelake-Server'> <decode host='on' guest='on'/> - <signature family='6' model='134'/>  + <signature family='6' model='106'/>  <vendor name='Intel'/> <feature name='3dnowprefetch'/> <feature name='abm'/> -- 2.26.2

2 1

Issue 90 Further Clarifications
by Dustan B Helm 04 Dec '20

04 Dec '20

[image: Dustan Helm] <https://gitlab.com/dustan.helm> Dustan Helm <https://gitlab.com/dustan.helm> @dustan.helm <https://gitlab.com/dustan.helm> · just now <https://gitlab.com/libvirt/libvirt/-/issues/90#note_451306432> <https://gitlab.com/libvirt/libvirt/-/issues/90#> Before we start making changes and solidifying our XML parameter choices, we have a few clarifying questions about the issue we'd like to get out of the way. 1. In src/qemu/qemu_capabilities.h, we found the string "/* -drive file.driver=vxhs via query-qmp-schema */" after the QEMU_CAPS_VXHS declaration. What is the purpose of these strings, and how do we modify them to make sense for nfs? Would we simply mirror what is done for VXHS, adding nfs as the protocol instead? 2. Where is domain XML parsed and formatted? Is that what is referred to by the schema formats in domaincommon.rng? 3. In src/qemu/qemu_block.c, the json object arguments currently present in qemuBlockStorageSourceGetVxHSProps(...) are not the same ones listed in the example commit. What is the reason for this change, and how should we take it into account when implementing a new protocol type? Additionally, we were hoping we could get some clarification on the proper way to handle submitting patches with multiple commits. If we receive feedback for only part of a patch, for example, how would we be meant to update it? Would we simply amend the particular commit that needed updates, and if so, how do we amend a commit other than the most recent commit? Should we send in our patches for review one at a time, or try to get all of them made and then send them in all at once?

4 12

[PATCH 0/2] security: A couple of fixes
by Jim Fehlig 04 Dec '20

04 Dec '20

I finally got around to investigating some apparmor-related test failures. The first patch is apparmor specific. The second patch fixes a bug that should affect all security drivers. Jim Fehlig (2): apparmor: Allow lxc processes to receive signals from libvirt security: Avoid calling virSecurityManagerCheckModel with NULL model src/security/apparmor/libvirt-lxc | 4 ++++ src/security/security_manager.c | 3 +++ 2 files changed, 7 insertions(+) -- 2.29.2

3 5

[PATCH 00/18] qapi/qom: QAPIfy object-add
by Kevin Wolf 03 Dec '20

03 Dec '20

This series adds a QAPI type for the properties of all user creatable QOM types and finally makes QMP object-add use the new ObjectOptions union so that QAPI introspection can be used for user creatable objects. If you are in the CC list and didn't expect this series, it's probably because you're the maintainer of one of the objects for which I'm adding a QAPI schema description. Please just have a look at the specific patch for your object and check whether the schema and its documentation make sense to you. You can ignore all other patches. After this series, there is least one obvious next step that needs to be done: Change HMP and all of the command line parser to use ObjectOptions, too, so that the QAPI schema is consistently enforced in all external interfaces. I am planning to send another series to address this. In a third step, we can try to start deduplicating and integrating things better between QAPI and the QOM implementation, e.g. by generating parts of the QOM boilerplate from the QAPI schema. Kevin Wolf (18): qapi/qom: Add ObjectOptions for iothread qapi/qom: Add ObjectOptions for authz-* qapi/qom: Add ObjectOptions for cryptodev-* qapi/qom: Add ObjectOptions for dbus-vmstate qapi/qom: Add ObjectOptions for memory-backend-* qapi/qom: Add ObjectOptions for rng-*, deprecate 'opened' qapi/qom: Add ObjectOptions for throttle-group qapi/qom: Add ObjectOptions for secret*, deprecate 'loaded' qapi/qom: Add ObjectOptions for tls-*, deprecate 'loaded' qapi/qom: Add ObjectOptions for can-* qapi/qom: Add ObjectOptions for colo-compare qapi/qom: Add ObjectOptions for filter-* qapi/qom: Add ObjectOptions for pr-manager-helper qapi/qom: Add ObjectOptions for sev-guest qapi/qom: Add ObjectOptions for input-* tests: Drop 'props' from object-add calls qapi/qom: Drop deprecated 'props' from object-add qapi/qom: QAPIfy object-add qapi/authz.json | 62 +++ qapi/block-core.json | 12 + qapi/common.json | 52 +++ qapi/crypto.json | 159 +++++++ qapi/machine.json | 22 +- qapi/net.json | 20 - qapi/qom.json | 609 ++++++++++++++++++++++++++- qapi/ui.json | 13 +- docs/system/deprecated.rst | 29 +- include/qom/object_interfaces.h | 7 - hw/block/xen-block.c | 16 +- monitor/misc.c | 2 - qom/qom-qmp-cmds.c | 44 +- tests/qtest/qmp-cmd-test.c | 16 +- tests/qtest/test-netfilter.c | 54 ++- storage-daemon/qapi/qapi-schema.json | 1 + tests/qemu-iotests/087 | 8 +- tests/qemu-iotests/184 | 18 +- tests/qemu-iotests/218 | 2 +- tests/qemu-iotests/235 | 2 +- tests/qemu-iotests/245 | 4 +- tests/qemu-iotests/258 | 6 +- tests/qemu-iotests/258.out | 4 +- tests/qemu-iotests/295 | 2 +- tests/qemu-iotests/296 | 2 +- 25 files changed, 993 insertions(+), 173 deletions(-) -- 2.28.0

7 59

[PATCH libvirt v2 00/11] Support AP card, AP queues and AP matrix
by Shalini Chellathurai Saroja 03 Dec '20

03 Dec '20

Add support for AP card devices, AP queues and AP matrix devices in libvirt node device driver. --- v2: - The tests included in the patches to detect the node devices (AP card, AP queues and AP matrix) are moved to separate patches. These patches are not divided further due to the following reasons: - The previous patches that add support for node devices in libvirt are not divided further into smaller patches (eg: 53aec799fa31711ffaeacc7ec17ec6d3c2e3cadf). - It would be easier to identify the patches relevant to support AP node devices. - The number of lines in each of these patches are around 125, which is not too much. - Modified according to review comments. - New patch to detect mdev_types capabilty of AP matrix device is added to this patch series. Boris Fiuczynski (1): node_device: detecting mdev_types capability on ap_matrix device Farhan Ali (1): virsh: nodedev: Filter by AP card and AP queue capabilities Shalini Chellathurai Saroja (9): nodedev: detect AP card device tests: AP card node device nodedev: detect AP queues tests: AP queue node device nodedev: detect AP matrix device tests: AP matrix node device virsh: nodedev: filter by AP Matrix capability node_device: refactor address retrieval of node device node_device: mdev matrix support docs/formatnode.html.in | 44 +++- docs/manpages/virsh.rst | 2 +- docs/schemas/nodedev.rng | 70 +++++- include/libvirt/libvirt-nodedev.h | 3 + src/conf/node_device_conf.c | 213 +++++++++++++++++- src/conf/node_device_conf.h | 41 +++- src/conf/virnodedeviceobj.c | 13 +- src/libvirt-nodedev.c | 3 + src/libvirt_private.syms | 1 + src/node_device/node_device_driver.c | 33 ++- src/node_device/node_device_udev.c | 83 +++++++ tests/nodedevschemadata/ap_07_0038.xml | 9 + tests/nodedevschemadata/ap_card07.xml | 8 + tests/nodedevschemadata/ap_matrix.xml | 7 + .../ap_matrix_mdev_types.xml | 14 ++ ...v_ee0b88c4_f554_4dc1_809d_b2a01e8e48ad.xml | 9 + tests/nodedevxml2xmltest.c | 5 + tools/virsh-nodedev.c | 9 + 18 files changed, 554 insertions(+), 13 deletions(-) create mode 100644 tests/nodedevschemadata/ap_07_0038.xml create mode 100644 tests/nodedevschemadata/ap_card07.xml create mode 100644 tests/nodedevschemadata/ap_matrix.xml create mode 100644 tests/nodedevschemadata/ap_matrix_mdev_types.xml create mode 100644 tests/nodedevschemadata/mdev_ee0b88c4_f554_4dc1_809d_b2a01e8e48ad.xml -- 2.26.2

5 28

[libvirt PATCH 0/2] tests: Sync and simplify some ppc64 tests
by Andrea Bolognani 03 Dec '20

03 Dec '20

Inspired by https://www.redhat.com/archives/libvir-list/2020-November/msg01057.html Andrea Bolognani (2): tests: Sync some ppc64 tests tests: Simplify some ppc64 tests .../memory-hotplug-nvdimm-ppc64.args | 6 +-- ...ory-hotplug-nvdimm-ppc64.ppc64-latest.args | 38 ------------------- .../memory-hotplug-nvdimm-ppc64.xml | 8 +--- .../memory-hotplug-ppc64-nonuma.args | 7 +--- .../memory-hotplug-ppc64-nonuma.xml | 14 +++++-- tests/qemuxml2argvtest.c | 4 +- .../memory-hotplug-nvdimm-ppc64.xml | 8 +--- .../memory-hotplug-ppc64-nonuma.xml | 1 + tests/qemuxml2xmltest.c | 5 +++ 9 files changed, 26 insertions(+), 65 deletions(-) delete mode 100644 tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.ppc64-= latest.args create mode 120000 tests/qemuxml2xmloutdata/memory-hotplug-ppc64-nonuma.xml --=20 2.26.2

3 7

[libvirt PATCH] conf: Fix segfault when parsing mdev types
by Jonathon Jongsma 03 Dec '20

03 Dec '20

Commit f1b0890 introduced a potential crash due to incorrect operator precedence when accessing an element from a pointer to an array. Backtrace below: #0 virNodeDeviceGetMdevTypesCaps (sysfspath=0x7fff801661e0 "/sys/devices/pci0000:00/0000:00:02.0", mdev_types=0x7fff801c9b40, nmdev_types=0x7fff801c9b48) at ../src/conf/node_device_conf.c:2676 #1 0x00007ffff7caf53d in virNodeDeviceGetPCIDynamicCaps (sysfsPath=0x7fff801661e0 "/sys/devices/pci0000:00/0000:00:02.0", pci_dev=0x7fff801c9ac8) at ../src/conf/node_device_conf.c:2705 #2 0x00007ffff7cae38f in virNodeDeviceUpdateCaps (def=0x7fff80168a10) at ../src/conf/node_device_conf.c:2342 #3 0x00007ffff7cb11c0 in virNodeDeviceObjMatch (obj=0x7fff84002e50, flags=0) at ../src/conf/virnodedeviceobj.c:850 #4 0x00007ffff7cb153d in virNodeDeviceObjListExportCallback (payload=0x7fff84002e50, name=0x7fff801cbc20 "pci_0000_00_02_0", opaque=0x7fffe2ffc6a0) at ../src/conf/virnodedeviceobj.c:909 #5 0x00007ffff7b69146 in virHashForEach (table=0x7fff9814b700 = {...}, iter=0x7ffff7cb149e <virNodeDeviceObjListExportCallback>, opaque=0x7fffe2ffc6a0) at ../src/util/virhash.c:394 #6 0x00007ffff7cb1694 in virNodeDeviceObjListExport (conn=0x7fff98013170, devs=0x7fff98154430, devices=0x7fffe2ffc798, filter=0x7ffff7cf47a1 <virConnectListAllNodeDevicesCheckACL>, flags=0) at ../src/conf/virnodedeviceobj.c:943 #7 0x00007fffe00694b2 in nodeConnectListAllNodeDevices (conn=0x7fff98013170, devices=0x7fffe2ffc798, flags=0) at ../src/node_device/node_device_driver.c:228 #8 0x00007ffff7e703aa in virConnectListAllNodeDevices (conn=0x7fff98013170, devices=0x7fffe2ffc798, flags=0) at ../src/libvirt-nodedev.c:130 #9 0x000055555557f796 in remoteDispatchConnectListAllNodeDevices (server=0x555555627080, client=0x5555556bf050, msg=0x5555556c0000, rerr=0x7fffe2ffc8a0, args=0x7fffd4008470, ret=0x7fffd40084e0) at src/remote/remote_daemon_dispatch_stubs.h:1613 #10 0x000055555557f6f9 in remoteDispatchConnectListAllNodeDevicesHelper (server=0x555555627080, client=0x5555556bf050, msg=0x5555556c0000, rerr=0x7fffe2ffc8a0, args=0x7fffd4008470, ret=0x7fffd40084e0) at src/remote/remote_daemon_dispatch_stubs.h:1591 #11 0x00007ffff7ce9542 in virNetServerProgramDispatchCall (prog=0x555555690c10, server=0x555555627080, client=0x5555556bf050, msg=0x5555556c0000) at ../src/rpc/virnetserverprogram.c:428 #12 0x00007ffff7ce90bd in virNetServerProgramDispatch (prog=0x555555690c10, server=0x555555627080, client=0x5555556bf050, msg=0x5555556c0000) at ../src/rpc/virnetserverprogram.c:302 #13 0x00007ffff7cf042b in virNetServerProcessMsg (srv=0x555555627080, client=0x5555556bf050, prog=0x555555690c10, msg=0x5555556c0000) at ../src/rpc/virnetserver.c:137 #14 0x00007ffff7cf04eb in virNetServerHandleJob (jobOpaque=0x5555556b66b0, opaque=0x555555627080) at ../src/rpc/virnetserver.c:154 #15 0x00007ffff7bd912f in virThreadPoolWorker (opaque=0x55555562bc70) at ../src/util/virthreadpool.c:163 #16 0x00007ffff7bd8645 in virThreadHelper (data=0x55555562bc90) at ../src/util/virthread.c:233 #17 0x00007ffff6d90432 in start_thread () at /lib64/libpthread.so.0 #18 0x00007ffff75c5913 in clone () at /lib64/libc.so.6 Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- src/conf/node_device_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 4e2837c1cd..cac4243b50 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -2673,7 +2673,7 @@ virNodeDeviceGetMdevTypesCaps(const char *sysfspath, /* this could be a refresh, so clear out the old data */ for (i = 0; i < *nmdev_types; i++) - virMediatedDeviceTypeFree(*mdev_types[i]); + virMediatedDeviceTypeFree((*mdev_types)[i]); VIR_FREE(*mdev_types); *nmdev_types = 0; -- 2.26.2

3 2

[PATCH libvirt v3 00/11] Support AP card, AP queues and AP matrix
by Shalini Chellathurai Saroja 03 Dec '20

03 Dec '20

Add support for AP card devices, AP queues and AP matrix devices in libvirt node device driver. --- v3: - Modify schema definition of ap-adapter to support hex values alone. - Modify schema definition of ap-domain to support hex values alone. - Verify domain value of AP queue device to be within the supported range during parsing. - Re-organized patches 6 and 10 according to review comment. - Minor changes according to review comments. v2: - The tests included in the patches to detect the node devices (AP card, AP queues and AP matrix) are moved to separate patches. These patches are not divided further due to the following reasons: - The previous patches that add support for node devices in libvirt are not divided further into smaller patches (eg: 53aec799fa31711ffaeacc7ec17ec6d3c2e3cadf). - It would be easier to identify the patches relevant to support AP node devices. - The number of lines in each of these patches are around 125, which is not too much. - Modified according to review comments. - New patch to detect mdev_types capabilty of AP matrix device is added to this patch series. Boris Fiuczynski (1): node_device: detecting mdev_types capability on ap_matrix device Farhan Ali (1): virsh: nodedev: Filter by AP card and AP queue capabilities Shalini Chellathurai Saroja (9): nodedev: detect AP card device tests: AP card node device nodedev: detect AP queues tests: AP queue node device nodedev: detect AP matrix device tests: AP matrix node device virsh: nodedev: filter by AP Matrix capability node_device: refactor address retrieval of node device node_device: mdev matrix support docs/formatnode.html.in | 48 +++- docs/manpages/virsh.rst | 2 +- docs/schemas/nodedev.rng | 46 ++++ include/libvirt/libvirt-nodedev.h | 3 + src/conf/node_device_conf.c | 218 ++++++++++++++++++ src/conf/node_device_conf.h | 41 +++- src/conf/virnodedeviceobj.c | 13 +- src/libvirt-nodedev.c | 3 + src/libvirt_private.syms | 1 + src/node_device/node_device_driver.c | 33 ++- src/node_device/node_device_udev.c | 86 +++++++ tests/nodedevschemadata/ap_07_0038.xml | 9 + tests/nodedevschemadata/ap_card07.xml | 8 + tests/nodedevschemadata/ap_matrix.xml | 7 + .../ap_matrix_mdev_types.xml | 14 ++ ...v_ee0b88c4_f554_4dc1_809d_b2a01e8e48ad.xml | 9 + tests/nodedevxml2xmltest.c | 5 + tools/virsh-nodedev.c | 9 + 18 files changed, 549 insertions(+), 6 deletions(-) create mode 100644 tests/nodedevschemadata/ap_07_0038.xml create mode 100644 tests/nodedevschemadata/ap_card07.xml create mode 100644 tests/nodedevschemadata/ap_matrix.xml create mode 100644 tests/nodedevschemadata/ap_matrix_mdev_types.xml create mode 100644 tests/nodedevschemadata/mdev_ee0b88c4_f554_4dc1_809d_b2a01e8e48ad.xml -- 2.26.2

3 18

[PATCH 0/4] libvirt_recover_xattrs: Improve usability for libvirt development
by Peter Krempa 03 Dec '20

03 Dec '20

I run into scenarios where I forget to destroy a VM which has a new WIP qemu capability. Starting a libvirtd which doesn't support it yet makes the libvirt vanish, thus after manually killing it libvirtd doesn't clear the xattrs, making it impossible to start the VM. libvirt_recover_xattrs fixes this, but is unusable unless you want to turn off all VMs. Peter Krempa (4): libvirt_recover_xattrs: Avoid backticks for subshell libvirt_recover_xattrs: Use only the correct xattr prefix libvirt_recover_xattrs: Add unsafe operation mode libvirt_recover_xattrs: Allow fixing multiple PATHs tools/libvirt_recover_xattrs.sh | 64 ++++++++++++++++++++++----------- 1 file changed, 43 insertions(+), 21 deletions(-) -- 2.28.0

2 5

[PATCH v2] qemu: Pass / fill niothreads for qemuMonitorGetIOThreads
by John Ferlan 03 Dec '20

03 Dec '20

Let's pass along / fill @niothreads rather than trying to make dual use as a return value and thread count. This resolves a Coverity issue detected in qemuDomainGetIOThreadsMon where if qemuDomainObjExitMonitor failed, then a -1 was returned and overwrite @niothreads causing a memory leak. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Since v1, updated the logic to pass @niothreads around rather than rely on the dual meaning. Took the full plunge. src/qemu/qemu_driver.c | 23 +++++++++++------------ src/qemu/qemu_monitor.c | 8 +++++--- src/qemu/qemu_monitor.h | 3 ++- src/qemu/qemu_monitor_json.c | 6 ++++-- src/qemu/qemu_monitor_json.h | 3 ++- src/qemu/qemu_process.c | 4 ++-- tests/qemumonitorjsontest.c | 4 ++-- 7 files changed, 28 insertions(+), 23 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index bca1c84630..65725b2ef2 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4972,17 +4972,18 @@ qemuDomainGetMaxVcpus(virDomainPtr dom) static int qemuDomainGetIOThreadsMon(virQEMUDriverPtr driver, virDomainObjPtr vm, - qemuMonitorIOThreadInfoPtr **iothreads) + qemuMonitorIOThreadInfoPtr **iothreads, + int *niothreads) { qemuDomainObjPrivatePtr priv = vm->privateData; - int niothreads = 0; + int ret = -1; qemuDomainObjEnterMonitor(driver, vm); - niothreads = qemuMonitorGetIOThreads(priv->mon, iothreads); - if (qemuDomainObjExitMonitor(driver, vm) < 0 || niothreads < 0) + ret = qemuMonitorGetIOThreads(priv->mon, iothreads, niothreads); + if (qemuDomainObjExitMonitor(driver, vm) < 0) return -1; - return niothreads; + return ret; } @@ -5014,7 +5015,7 @@ qemuDomainGetIOThreadsLive(virQEMUDriverPtr driver, goto endjob; } - if ((niothreads = qemuDomainGetIOThreadsMon(driver, vm, &iothreads)) < 0) + if ((ret = qemuDomainGetIOThreadsMon(driver, vm, &iothreads, &niothreads)) < 0) goto endjob; /* Nothing to do */ @@ -5314,8 +5315,7 @@ qemuDomainHotplugAddIOThread(virQEMUDriverPtr driver, * IOThreads thread_id's, adjust the cgroups, thread affinity, * and add the thread_id to the vm->def->iothreadids list. */ - if ((new_niothreads = qemuMonitorGetIOThreads(priv->mon, - &new_iothreads)) < 0) + if (qemuMonitorGetIOThreads(priv->mon, &new_iothreads, &new_niothreads) < 0) goto exit_monitor; if (qemuDomainObjExitMonitor(driver, vm) < 0) @@ -5425,8 +5425,7 @@ qemuDomainHotplugDelIOThread(virQEMUDriverPtr driver, if (rc < 0) goto exit_monitor; - if ((new_niothreads = qemuMonitorGetIOThreads(priv->mon, - &new_iothreads)) < 0) + if (qemuMonitorGetIOThreads(priv->mon, &new_iothreads, &new_niothreads) < 0) goto exit_monitor; if (qemuDomainObjExitMonitor(driver, vm) < 0) @@ -18507,7 +18506,7 @@ qemuDomainGetStatsIOThread(virQEMUDriverPtr driver, qemuDomainObjPrivatePtr priv = dom->privateData; size_t i; qemuMonitorIOThreadInfoPtr *iothreads = NULL; - int niothreads; + int niothreads = 0; int ret = -1; if (!HAVE_JOB(privflags) || !virDomainObjIsActive(dom)) @@ -18516,7 +18515,7 @@ qemuDomainGetStatsIOThread(virQEMUDriverPtr driver, if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_OBJECT_IOTHREAD)) return 0; - if ((niothreads = qemuDomainGetIOThreadsMon(driver, dom, &iothreads)) < 0) + if (qemuDomainGetIOThreadsMon(driver, dom, &iothreads, &niothreads) < 0) return -1; /* qemuDomainGetIOThreadsMon returns a NULL-terminated list, so we must free diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index ce1a06c4c8..551b65e778 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -4211,22 +4211,24 @@ qemuMonitorRTCResetReinjection(qemuMonitorPtr mon) * qemuMonitorGetIOThreads: * @mon: Pointer to the monitor * @iothreads: Location to return array of IOThreadInfo data + * @niothreads: Count of the number of IOThreads in the array * * Issue query-iothreads command. * Retrieve the list of iothreads defined/running for the machine * - * Returns count of IOThreadInfo structures on success + * Returns 0 on success * -1 on error. */ int qemuMonitorGetIOThreads(qemuMonitorPtr mon, - qemuMonitorIOThreadInfoPtr **iothreads) + qemuMonitorIOThreadInfoPtr **iothreads, + int *niothreads) { VIR_DEBUG("iothreads=%p", iothreads); QEMU_CHECK_MONITOR(mon); - return qemuMonitorJSONGetIOThreads(mon, iothreads); + return qemuMonitorJSONGetIOThreads(mon, iothreads, niothreads); } diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 8bc092870b..49be2d5412 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -1365,7 +1365,8 @@ struct _qemuMonitorIOThreadInfo { bool set_poll_shrink; }; int qemuMonitorGetIOThreads(qemuMonitorPtr mon, - qemuMonitorIOThreadInfoPtr **iothreads); + qemuMonitorIOThreadInfoPtr **iothreads, + int *niothreads); int qemuMonitorSetIOThread(qemuMonitorPtr mon, qemuMonitorIOThreadInfoPtr iothreadInfo); diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 5acc1a10aa..f70490d9b0 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -8072,7 +8072,8 @@ qemuMonitorJSONRTCResetReinjection(qemuMonitorPtr mon) */ int qemuMonitorJSONGetIOThreads(qemuMonitorPtr mon, - qemuMonitorIOThreadInfoPtr **iothreads) + qemuMonitorIOThreadInfoPtr **iothreads, + int *niothreads) { int ret = -1; virJSONValuePtr cmd; @@ -8149,9 +8150,10 @@ qemuMonitorJSONGetIOThreads(qemuMonitorPtr mon, info->poll_valid = true; } - ret = n; + *niothreads = n; *iothreads = infolist; infolist = NULL; + ret = 0; cleanup: if (infolist) { diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index d2928b0ffc..4eb0f667a2 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -550,7 +550,8 @@ int qemuMonitorJSONGetGuestCPU(qemuMonitorPtr mon, int qemuMonitorJSONRTCResetReinjection(qemuMonitorPtr mon); int qemuMonitorJSONGetIOThreads(qemuMonitorPtr mon, - qemuMonitorIOThreadInfoPtr **iothreads) + qemuMonitorIOThreadInfoPtr **iothreads, + int *niothreads) ATTRIBUTE_NONNULL(2); int qemuMonitorJSONSetIOThread(qemuMonitorPtr mon, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 20e90026e1..01afe66ec9 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2498,10 +2498,10 @@ qemuProcessDetectIOThreadPIDs(virQEMUDriverPtr driver, /* Get the list of IOThreads from qemu */ if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) goto cleanup; - niothreads = qemuMonitorGetIOThreads(priv->mon, &iothreads); + ret = qemuMonitorGetIOThreads(priv->mon, &iothreads, &niothreads); if (qemuDomainObjExitMonitor(driver, vm) < 0) goto cleanup; - if (niothreads < 0) + if (ret < 0) goto cleanup; if (niothreads != vm->def->niothreadids) { diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index 79ef2a545e..d0c37967d5 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -2377,8 +2377,8 @@ testQemuMonitorJSONGetIOThreads(const void *opaque) "}") < 0) goto cleanup; - if ((ninfo = qemuMonitorGetIOThreads(qemuMonitorTestGetMonitor(test), - &info)) < 0) + if (qemuMonitorGetIOThreads(qemuMonitorTestGetMonitor(test), + &info, &ninfo) < 0) goto cleanup; if (ninfo != 2) { -- 2.28.0

2 1