- Devel - libvirt List Archives

[libvirt] [PATCH 0/3] qemu: Report better error on dump/migrate failure
by Andrea Bolognani 05 Feb '19

05 Feb '19

A detailed explanation of why this is needed can be found at https://bugzilla.redhat.com/show_bug.cgi?id=1578741#c8 Andrea Bolognani (3): vircommand: Ensure buffers are NULL-terminated virfile: Report error in virFileWrapperFdFree() iohelper: Don't include newlines in error messages src/util/iohelper.c | 2 +- src/util/vircommand.c | 2 ++ src/util/virfile.c | 6 +++++- 3 files changed, 8 insertions(+), 2 deletions(-) -- 2.20.1

2 5

[libvirt] [PATCH 00/10] snapshot: misc fixes
by Nikolay Shirokovskiy 05 Feb '19

05 Feb '19

The patch series aims to uniformly handle snapshot attribute for disks from multiple places - snapshot definitions, domain definitions, snapshot operation and defaults which is done in [1] utimately. Patch [2] makes a step towards this goal. Other patches are fixes along the way that disables some invalid cases on conversely enable previously disable valid cases. The patches with most reasoning ([2] and [3]) are effectively revert Eric's patch f9670bf thus I hope Eric will take a look. Nikolay Shirokovskiy (10): conf: snapshot: fix comment in _virDomainSnapshotDef conf: snapshot: don't pass flags from different family conf: snapshot: check disk with path on parse conf: snapshot: align exernal/internal snapshot the same way [2] conf: snapshot: remove snapshot mode checking from disk align [3] conf: virDomainSnapshotAlignDisks: use convinient variable qemu: disable internal snapshot of readonly disk qemu: snapshot: fix for case of disk with empty source qemu: snapshot: align disks consistently [1] conf: snapshot: make disk aligns same on redefinition src/conf/domain_conf.c | 6 +-- src/conf/snapshot_conf.c | 103 ++++++++++++++++++++++------------------------- src/conf/snapshot_conf.h | 5 +-- src/qemu/qemu_driver.c | 27 ++++++++++--- src/test/test_driver.c | 5 +-- 5 files changed, 74 insertions(+), 72 deletions(-) -- 1.8.3.1

2 12

[libvirt] [PULL 1/8] qemu-nbd: Deprecate qemu-nbd --partition
by Eric Blake 05 Feb '19

05 Feb '19

The existing qemu-nbd --partition code claims to handle logical partitions up to 8, since its introduction in 2008 (commit 7a5ca86). However, the implementation is bogus (actual MBR logical partitions form a sort of linked list, with one partition per extended table entry, rather than four logical partitions in a single extended table), making the code unlikely to work for anything beyond -P5 on actual guest images. What's more, the code does not support GPT partitions, which are becoming more popular, and maintaining device subsetting in both NBD and the raw device is unnecessary duplication of effort (even if it is not too difficult). Note that obtaining the offsets of a partition (MBR or GPT) can be learned by using 'qemu-nbd -c /dev/nbd0 file.qcow2 && sfdisk --dump /dev/nbd0', but by the time you've done that, you might as well just mount /dev/nbd0p1 that the kernel creates for you instead of bothering with qemu exporting a subset. Or, keeping to just user-space code, use nbdkit's partition filter, which has already known both GPT and primary MBR partitions for a while, and was just recently enhanced to support arbitrary logical MBR parititions. Start the clock on the deprecation cycle, with examples of how to accomplish device subsetting without using -P. Signed-off-by: Eric Blake <eblake(a)redhat.com> Message-Id: <20190125234837.2272-1-eblake(a)redhat.com> Reviewed-by: Richard W.M. Jones <rjones(a)redhat.com> Reviewed-by: Stefano Garzarella <sgarzare(a)redhat.com> --- qemu-deprecated.texi | 33 +++++++++++++++++++++++++++++++++ qemu-nbd.texi | 6 ++++-- qemu-nbd.c | 2 ++ 3 files changed, 39 insertions(+), 2 deletions(-) diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index 9cc20b365c5..8a6174df0c1 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -160,3 +160,36 @@ Example of legacy encoding: The above, converted to the current supported format: @code{json:@{"file.driver":"rbd", "file.pool":"rbd", "file.image":"name"@}} + +@section Related binaries + +@subsection qemu-nbd --partition (since 4.0.0) + +The ``qemu-nbd --partition $digit'' code (also spelled @option{-P}) +can only handle MBR partitions, and has never correctly handled +logical partitions beyond partition 5. If you know the offset and +length of the partition (perhaps by using @code{sfdisk} within the +guest), you can achieve the effect of exporting just that subset of +the disk by use of the @option{--image-opts} option with a raw +blockdev using the @code{offset} and @code{size} parameters layered on +top of any other existing blockdev. For example, if partition 1 is +100MiB long starting at 1MiB, the old command: + +@code{qemu-nbd -t -P 1 -f qcow2 file.qcow2} + +can be rewritten as: + +@code{qemu-nbd -t --image-opts driver=raw,offset=1M,size=100M,file.driver=qcow2,file.backing.driver=file,file.backing.filename=file.qcow2} + +Alternatively, the @code{nbdkit} project provides a more powerful +partition filter on top of its nbd plugin, which can be used to select +an arbitrary MBR or GPT partition on top of any other full-image NBD +export. Using this to rewrite the above example results in: + +@code{qemu-nbd -t -k /tmp/sock -f qcow2 file.qcow2 &} +@code{nbdkit -f --filter=partition nbd socket=/tmp/sock partition=1} + +Note that if you are exposing the export via /dev/nbd0, it is easier +to just export the entire image and then mount only /dev/nbd0p1 than +it is to reinvoke @command{qemu-nbd -c /dev/nbd0} limited to just a +subset of the image. diff --git a/qemu-nbd.texi b/qemu-nbd.texi index 386bece4680..d0c51828149 100644 --- a/qemu-nbd.texi +++ b/qemu-nbd.texi @@ -56,8 +56,10 @@ auto-detecting. @item -r, --read-only Export the disk as read-only. @item -P, --partition=@var{num} -Only expose MBR partition @var{num}. Understands physical partitions -1-4 and logical partitions 5-8. +Deprecated: Only expose MBR partition @var{num}. Understands physical +partitions 1-4 and logical partition 5. New code should instead use +@option{--image-opts} with the raw driver wrapping a subset of the +original image. @item -B, --bitmap=@var{name} If @var{filename} has a qcow2 persistent bitmap @var{name}, expose that bitmap via the ``qemu:dirty-bitmap:@var{name}'' context diff --git a/qemu-nbd.c b/qemu-nbd.c index 1f7b2a03f5d..00c07fd27ea 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -787,6 +787,8 @@ int main(int argc, char **argv) flags &= ~BDRV_O_RDWR; break; case 'P': + warn_report("The '-P' option is deprecated; use --image-opts with " + "a raw device wrapper for subset exports instead"); if (qemu_strtoi(optarg, NULL, 0, &partition) < 0 || partition < 1 || partition > 8) { error_report("Invalid partition '%s'", optarg); -- 2.20.1

1 0

[libvirt] [PATCH RFC] qemu: caps: Don't try to ask for CAP_DAC_OVERRIDE if non-root
by Peter Krempa 04 Feb '19

04 Feb '19

It will not work. This breaks qemu capabilities probing as a user. --- src/qemu/qemu_capabilities.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 7ed5f94803..81ef0357e7 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -4524,7 +4524,8 @@ virQEMUCapsInitQMPCommandRun(virQEMUCapsInitQMPCommandPtr cmd, #if WITH_CAPNG /* QEMU might run into permission issues, e.g. /dev/sev (0600), override * them just for the purpose of probing */ - virCommandAllowCap(cmd->cmd, CAP_DAC_OVERRIDE); + if (geteuid() == 0) + virCommandAllowCap(cmd->cmd, CAP_DAC_OVERRIDE); #endif virCommandSetGID(cmd->cmd, cmd->runGid); -- 2.20.1

3 3

[libvirt] [PATCH] qemu: Refresh state before starting the VCPUs
by Marc Hartmayer 04 Feb '19

04 Feb '19

For normal starts (no incoming migration) the refresh of the QEMU state must be done before the VCPUs getting started since otherwise there might be a race condition between a possible shutdown of the guest OS and the QEMU monitor queries. This fixes "qemu: migration: Refresh device information after transferring state" (93db7eea1b864). Signed-off-by: Marc Hartmayer <mhartmay(a)linux.ibm.com> --- src/qemu/qemu_process.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index dace5aaca102..2a3763f40d49 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -6929,10 +6929,17 @@ qemuProcessStart(virConnectPtr conn, } relabel = true; - if (incoming && - incoming->deferredURI && - qemuMigrationDstRun(driver, vm, incoming->deferredURI, asyncJob) < 0) - goto stop; + if (incoming) { + if (incoming->deferredURI && + qemuMigrationDstRun(driver, vm, incoming->deferredURI, asyncJob) < 0) + goto stop; + } else { + /* Refresh state of devices from QEMU. During migration this + * needs to happen after the state information is fully + * transferred. */ + if (qemuProcessRefreshState(driver, vm, asyncJob) < 0) + goto stop; + } if (qemuProcessFinishStartup(driver, vm, asyncJob, !(flags & VIR_QEMU_PROCESS_START_PAUSED), @@ -6945,11 +6952,6 @@ qemuProcessStart(virConnectPtr conn, /* Keep watching qemu log for errors during incoming migration, otherwise * unset reporting errors from qemu log. */ qemuMonitorSetDomainLog(priv->mon, NULL, NULL, NULL); - - /* Refresh state of devices from qemu. During migration this needs to - * happen after the state information is fully transferred. */ - if (qemuProcessRefreshState(driver, vm, asyncJob) < 0) - goto stop; } ret = 0; -- 2.17.0

3 6

[libvirt] [jenkins-ci PATCH 0/2] guests: Install isoinfo for virt-manager
by Andrea Bolognani 04 Feb '19

04 Feb '19

Andrea Bolognani (2): guests: Add mapping for isoinfo guests: Install isoinfo for virt-manager guests/vars/mappings.yml | 4 ++++ guests/vars/projects/virt-manager.yml | 1 + 2 files changed, 5 insertions(+) -- 2.20.1

2 3

[libvirt] [PATCH v2] qemu: Assume migration with a network disk migration is safe
by Michal Privoznik 04 Feb '19

04 Feb '19

If a domain has a disk that is type='network' we require specific cache mode to allow migration with it (either 'directsync' or 'none'). This doesn't make much sense since network disks are supposed to be safe to migrate by default. At the same time, we should be checking for the actual source type, not apparent type set in the domain XML. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- v2 of: https://www.redhat.com/archives/libvir-list/2019-January/msg01070.html diff to v1: - Allow just every network disk - Check for actual disk type not the apparent one src/qemu/qemu_migration.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 52aa665640..1433b2c2f3 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1236,7 +1236,7 @@ qemuMigrationSrcIsSafe(virDomainDefPtr def, continue; /* However, disks on local FS (e.g. ext4) are not safe. */ - if (virDomainDiskGetType(disk) == VIR_STORAGE_TYPE_FILE) { + if (virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_FILE) { if ((rc = virFileIsSharedFS(src)) < 0) { return false; } else if (rc == 0) { @@ -1248,8 +1248,8 @@ qemuMigrationSrcIsSafe(virDomainDefPtr def, return false; else if (rc == 1) continue; - } else if (disk->src->type == VIR_STORAGE_TYPE_NETWORK && - disk->src->protocol == VIR_STORAGE_NET_PROTOCOL_RBD) { + } else if (virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_NETWORK) { + /* But network disks are safe again. */ continue; } -- 2.19.2

2 1

[libvirt] [PATCH 0/3] scsi-disk: Device Identification fixes
by Kevin Wolf 04 Feb '19

04 Feb '19

The vendor specific designator in the Device Identification VPD page has two problems: 1. It defaults to the BlockBackend name (-drive id=...), which everyone expected to be a host detail that the guest never sees 2. With -blockdev based setups it defaults to an empty string; if this default is used with more than one disk, the guest OS will interpret this as a single multipath disk. We can address problem 2 immediately, and start running the deprecation clock for problem 1. Related bug reports: https://bugzilla.redhat.com/show_bug.cgi?id=1669446 https://bugzilla.redhat.com/show_bug.cgi?id=1668248 Kevin Wolf (3): scsi-disk: Don't use empty string as device id scsi-disk: Add device_id property scsi-disk: Deprecate device_id fallback to BlockBackend name hw/scsi/scsi-disk.c | 41 ++++++++++++++++++++++++++++------------- qemu-deprecated.texi | 22 +++++++++++++++++++++- 2 files changed, 49 insertions(+), 14 deletions(-) -- 2.20.1

6 19

[libvirt] [PATCH] tests: Unify qemucaps2xml output files
by Andrea Bolognani 04 Feb '19

04 Feb '19

Turns out different versions of QEMU on the same architecture produce the same output, so we can have a single output file per architecture instead of duplicating the same data over and over again. Spotted-by: Ján Tomko <jtomko(a)redhat.com> Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- ...ps_2.10.0.aarch64.xml => caps.aarch64.xml} | 0 .../{caps_2.10.0.ppc64.xml => caps.ppc64.xml} | 0 ...aps_3.0.0.riscv32.xml => caps.riscv32.xml} | 0 ...aps_3.0.0.riscv64.xml => caps.riscv64.xml} | 0 .../{caps_2.10.0.s390x.xml => caps.s390x.xml} | 0 ...{caps_1.5.3.x86_64.xml => caps.x86_64.xml} | 0 .../qemucaps2xmloutdata/caps_1.6.0.x86_64.xml | 28 ------------------- .../qemucaps2xmloutdata/caps_1.7.0.x86_64.xml | 28 ------------------- .../qemucaps2xmloutdata/caps_2.1.1.x86_64.xml | 28 ------------------- .../caps_2.10.0.x86_64.xml | 28 ------------------- .../qemucaps2xmloutdata/caps_2.11.0.s390x.xml | 26 ----------------- .../caps_2.11.0.x86_64.xml | 28 ------------------- .../caps_2.12.0.aarch64.xml | 27 ------------------ .../qemucaps2xmloutdata/caps_2.12.0.ppc64.xml | 26 ----------------- .../qemucaps2xmloutdata/caps_2.12.0.s390x.xml | 26 ----------------- .../caps_2.12.0.x86_64.xml | 28 ------------------- .../qemucaps2xmloutdata/caps_2.4.0.x86_64.xml | 28 ------------------- .../qemucaps2xmloutdata/caps_2.5.0.x86_64.xml | 28 ------------------- .../caps_2.6.0.aarch64.xml | 27 ------------------ .../qemucaps2xmloutdata/caps_2.6.0.ppc64.xml | 26 ----------------- .../qemucaps2xmloutdata/caps_2.6.0.x86_64.xml | 28 ------------------- .../qemucaps2xmloutdata/caps_2.7.0.s390x.xml | 26 ----------------- .../qemucaps2xmloutdata/caps_2.7.0.x86_64.xml | 28 ------------------- .../qemucaps2xmloutdata/caps_2.8.0.s390x.xml | 26 ----------------- .../qemucaps2xmloutdata/caps_2.8.0.x86_64.xml | 28 ------------------- .../qemucaps2xmloutdata/caps_2.9.0.ppc64.xml | 26 ----------------- .../qemucaps2xmloutdata/caps_2.9.0.s390x.xml | 26 ----------------- .../qemucaps2xmloutdata/caps_2.9.0.x86_64.xml | 28 ------------------- .../qemucaps2xmloutdata/caps_3.0.0.ppc64.xml | 26 ----------------- .../qemucaps2xmloutdata/caps_3.0.0.s390x.xml | 26 ----------------- .../qemucaps2xmloutdata/caps_3.0.0.x86_64.xml | 28 ------------------- .../qemucaps2xmloutdata/caps_3.1.0.ppc64.xml | 26 ----------------- .../qemucaps2xmloutdata/caps_3.1.0.x86_64.xml | 28 ------------------- .../caps_4.0.0.riscv32.xml | 25 ----------------- .../caps_4.0.0.riscv64.xml | 25 ----------------- .../qemucaps2xmloutdata/caps_4.0.0.x86_64.xml | 28 ------------------- tests/qemucaps2xmltest.c | 4 +-- 37 files changed, 2 insertions(+), 812 deletions(-) rename tests/qemucaps2xmloutdata/{caps_2.10.0.aarch64.xml => caps.aarch64.xml} (100%) rename tests/qemucaps2xmloutdata/{caps_2.10.0.ppc64.xml => caps.ppc64.xml} (100%) rename tests/qemucaps2xmloutdata/{caps_3.0.0.riscv32.xml => caps.riscv32.xml} (100%) rename tests/qemucaps2xmloutdata/{caps_3.0.0.riscv64.xml => caps.riscv64.xml} (100%) rename tests/qemucaps2xmloutdata/{caps_2.10.0.s390x.xml => caps.s390x.xml} (100%) rename tests/qemucaps2xmloutdata/{caps_1.5.3.x86_64.xml => caps.x86_64.xml} (100%) delete mode 100644 tests/qemucaps2xmloutdata/caps_1.6.0.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_1.7.0.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.1.1.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.10.0.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.11.0.s390x.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.11.0.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.12.0.aarch64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.12.0.ppc64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.12.0.s390x.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.12.0.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.4.0.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.5.0.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.6.0.aarch64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.6.0.ppc64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.6.0.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.7.0.s390x.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.7.0.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.8.0.s390x.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.8.0.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.9.0.ppc64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.9.0.s390x.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.9.0.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_3.0.0.ppc64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_3.0.0.s390x.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_3.0.0.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_3.1.0.ppc64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_3.1.0.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_4.0.0.riscv32.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_4.0.0.riscv64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_4.0.0.x86_64.xml diff --git a/tests/qemucaps2xmloutdata/caps_2.10.0.aarch64.xml b/tests/qemucaps2xmloutdata/caps.aarch64.xml similarity index 100% rename from tests/qemucaps2xmloutdata/caps_2.10.0.aarch64.xml rename to tests/qemucaps2xmloutdata/caps.aarch64.xml diff --git a/tests/qemucaps2xmloutdata/caps_2.10.0.ppc64.xml b/tests/qemucaps2xmloutdata/caps.ppc64.xml similarity index 100% rename from tests/qemucaps2xmloutdata/caps_2.10.0.ppc64.xml rename to tests/qemucaps2xmloutdata/caps.ppc64.xml diff --git a/tests/qemucaps2xmloutdata/caps_3.0.0.riscv32.xml b/tests/qemucaps2xmloutdata/caps.riscv32.xml similarity index 100% rename from tests/qemucaps2xmloutdata/caps_3.0.0.riscv32.xml rename to tests/qemucaps2xmloutdata/caps.riscv32.xml diff --git a/tests/qemucaps2xmloutdata/caps_3.0.0.riscv64.xml b/tests/qemucaps2xmloutdata/caps.riscv64.xml similarity index 100% rename from tests/qemucaps2xmloutdata/caps_3.0.0.riscv64.xml rename to tests/qemucaps2xmloutdata/caps.riscv64.xml diff --git a/tests/qemucaps2xmloutdata/caps_2.10.0.s390x.xml b/tests/qemucaps2xmloutdata/caps.s390x.xml similarity index 100% rename from tests/qemucaps2xmloutdata/caps_2.10.0.s390x.xml rename to tests/qemucaps2xmloutdata/caps.s390x.xml diff --git a/tests/qemucaps2xmloutdata/caps_1.5.3.x86_64.xml b/tests/qemucaps2xmloutdata/caps.x86_64.xml similarity index 100% rename from tests/qemucaps2xmloutdata/caps_1.5.3.x86_64.xml rename to tests/qemucaps2xmloutdata/caps.x86_64.xml diff --git a/tests/qemucaps2xmloutdata/caps_1.6.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_1.6.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_1.6.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>x86_64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='x86_64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - <acpi default='on' toggle='yes'/> - <apic default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_1.7.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_1.7.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_1.7.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>x86_64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='x86_64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - <acpi default='on' toggle='yes'/> - <apic default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.1.1.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.1.1.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.1.1.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>x86_64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='x86_64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - <acpi default='on' toggle='yes'/> - <apic default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.10.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.10.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.10.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>x86_64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='x86_64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - <acpi default='on' toggle='yes'/> - <apic default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.11.0.s390x.xml b/tests/qemucaps2xmloutdata/caps_2.11.0.s390x.xml deleted file mode 100644 index bb82a15040..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.11.0.s390x.xml +++ /dev/null @@ -1,26 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>s390x</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='s390x'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-s390x</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.11.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.11.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.11.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>x86_64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='x86_64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - <acpi default='on' toggle='yes'/> - <apic default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.12.0.aarch64.xml b/tests/qemucaps2xmloutdata/caps_2.12.0.aarch64.xml deleted file mode 100644 index f6572c8ecd..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.12.0.aarch64.xml +++ /dev/null @@ -1,27 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>aarch64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='aarch64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-aarch64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - <acpi default='on' toggle='yes'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.12.0.ppc64.xml b/tests/qemucaps2xmloutdata/caps_2.12.0.ppc64.xml deleted file mode 100644 index 85623f3980..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.12.0.ppc64.xml +++ /dev/null @@ -1,26 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>ppc64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='ppc64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-ppc64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.12.0.s390x.xml b/tests/qemucaps2xmloutdata/caps_2.12.0.s390x.xml deleted file mode 100644 index bb82a15040..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.12.0.s390x.xml +++ /dev/null @@ -1,26 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>s390x</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='s390x'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-s390x</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.12.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.12.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.12.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>x86_64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='x86_64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - <acpi default='on' toggle='yes'/> - <apic default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.4.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.4.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.4.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>x86_64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='x86_64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - <acpi default='on' toggle='yes'/> - <apic default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.5.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.5.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.5.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>x86_64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='x86_64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - <acpi default='on' toggle='yes'/> - <apic default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.6.0.aarch64.xml b/tests/qemucaps2xmloutdata/caps_2.6.0.aarch64.xml deleted file mode 100644 index f6572c8ecd..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.6.0.aarch64.xml +++ /dev/null @@ -1,27 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>aarch64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='aarch64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-aarch64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - <acpi default='on' toggle='yes'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.6.0.ppc64.xml b/tests/qemucaps2xmloutdata/caps_2.6.0.ppc64.xml deleted file mode 100644 index 85623f3980..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.6.0.ppc64.xml +++ /dev/null @@ -1,26 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>ppc64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='ppc64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-ppc64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.6.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.6.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.6.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>x86_64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='x86_64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - <acpi default='on' toggle='yes'/> - <apic default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.7.0.s390x.xml b/tests/qemucaps2xmloutdata/caps_2.7.0.s390x.xml deleted file mode 100644 index bb82a15040..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.7.0.s390x.xml +++ /dev/null @@ -1,26 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>s390x</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='s390x'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-s390x</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.7.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.7.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.7.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>x86_64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='x86_64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - <acpi default='on' toggle='yes'/> - <apic default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.8.0.s390x.xml b/tests/qemucaps2xmloutdata/caps_2.8.0.s390x.xml deleted file mode 100644 index bb82a15040..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.8.0.s390x.xml +++ /dev/null @@ -1,26 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>s390x</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='s390x'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-s390x</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.8.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.8.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.8.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>x86_64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='x86_64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - <acpi default='on' toggle='yes'/> - <apic default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.9.0.ppc64.xml b/tests/qemucaps2xmloutdata/caps_2.9.0.ppc64.xml deleted file mode 100644 index 85623f3980..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.9.0.ppc64.xml +++ /dev/null @@ -1,26 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>ppc64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='ppc64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-ppc64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.9.0.s390x.xml b/tests/qemucaps2xmloutdata/caps_2.9.0.s390x.xml deleted file mode 100644 index bb82a15040..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.9.0.s390x.xml +++ /dev/null @@ -1,26 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>s390x</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='s390x'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-s390x</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.9.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.9.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.9.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>x86_64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='x86_64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - <acpi default='on' toggle='yes'/> - <apic default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_3.0.0.ppc64.xml b/tests/qemucaps2xmloutdata/caps_3.0.0.ppc64.xml deleted file mode 100644 index 85623f3980..0000000000 --- a/tests/qemucaps2xmloutdata/caps_3.0.0.ppc64.xml +++ /dev/null @@ -1,26 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>ppc64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='ppc64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-ppc64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_3.0.0.s390x.xml b/tests/qemucaps2xmloutdata/caps_3.0.0.s390x.xml deleted file mode 100644 index bb82a15040..0000000000 --- a/tests/qemucaps2xmloutdata/caps_3.0.0.s390x.xml +++ /dev/null @@ -1,26 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>s390x</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='s390x'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-s390x</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_3.0.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_3.0.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_3.0.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>x86_64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='x86_64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - <acpi default='on' toggle='yes'/> - <apic default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_3.1.0.ppc64.xml b/tests/qemucaps2xmloutdata/caps_3.1.0.ppc64.xml deleted file mode 100644 index 85623f3980..0000000000 --- a/tests/qemucaps2xmloutdata/caps_3.1.0.ppc64.xml +++ /dev/null @@ -1,26 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>ppc64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='ppc64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-ppc64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_3.1.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_3.1.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_3.1.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>x86_64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='x86_64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - <acpi default='on' toggle='yes'/> - <apic default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_4.0.0.riscv32.xml b/tests/qemucaps2xmloutdata/caps_4.0.0.riscv32.xml deleted file mode 100644 index 63c374da7f..0000000000 --- a/tests/qemucaps2xmloutdata/caps_4.0.0.riscv32.xml +++ /dev/null @@ -1,25 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>riscv32</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='riscv32'> - <wordsize>32</wordsize> - <emulator>/usr/bin/qemu-system-riscv32</emulator> - <domain type='qemu'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_4.0.0.riscv64.xml b/tests/qemucaps2xmloutdata/caps_4.0.0.riscv64.xml deleted file mode 100644 index 09b7eb7f2f..0000000000 --- a/tests/qemucaps2xmloutdata/caps_4.0.0.riscv64.xml +++ /dev/null @@ -1,25 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>riscv64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='riscv64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-riscv64</emulator> - <domain type='qemu'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_4.0.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_4.0.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_4.0.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>x86_64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='x86_64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - <acpi default='on' toggle='yes'/> - <apic default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c index ec9d16e8dd..0d9b4e679a 100644 --- a/tests/qemucaps2xmltest.c +++ b/tests/qemucaps2xmltest.c @@ -128,8 +128,8 @@ testQemuCapsXML(const void *opaque) char *capsXml = NULL; virCapsPtr capsProvided = NULL; - if (virAsprintf(&xmlFile, "%s/qemucaps2xmloutdata/%s.%s.xml", - abs_srcdir, data->base, data->archName) < 0) + if (virAsprintf(&xmlFile, "%s/qemucaps2xmloutdata/caps.%s.xml", + abs_srcdir, data->archName) < 0) goto cleanup; if (virAsprintf(&capsFile, "%s/qemucapabilitiesdata/%s.%s.xml", -- 2.20.1

2 1

[libvirt] [PATCH] news: Fix typo
by Andrea Bolognani 04 Feb '19

04 Feb '19

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. docs/news.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/news.xml b/docs/news.xml index a443af013b..8d6d58ae6a 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -70,7 +70,7 @@ <description> By default, libvirt runs the QEMU process as <code>qemu:qemu</code> which could cause issues during probing as some features like AMD SEV - might be inaccesible to QEMU because of file system permissions. + might be inaccessible to QEMU because of file system permissions. Therefore, <code>CAP_DAC_OVERRIDE</code> is granted to overcome these for the purposes of probing. </description> -- 2.20.1

1 0

[libvirt] [PATCH 0/9] Add semicolon to macro calls
by Cole Robinson 03 Feb '19

03 Feb '19

Recently I was experimenting with the vim-ale plugin for basic code validation on file write. For C the simplest option seemed to be using cppcheck. However cppcheck when trivially invoked on many files in our codebase will error if a macro call is missing an ending semicolon. Example: $ cppcheck -q src/qemu/qemu_command.c [src/qemu/qemu_command.c:109]: (error) There is an unknown macro here somewhere. Configuration is required. If VIR_ENUM_DECL is a macro then please configure it. Googling around it sounds like it's generally considered good practice to end macro calls with a semicolon, and we have mixed usage throughout the code. So let's standardize on adding semicolon to a few macro calls. The first 4 patches add semicolons to all VIR_ENUM_DECL, VIR_ENUM_IMPL, VIR_LOG_INIT, VIR_ONCE_GLOBAL INIT calls The next 4 patches rework the macro definitions slightly so that the compiler will _require_ callers to specify use a semicolon. I don't know if this is controversial or not so I kept the patches separate, but they can be squashed together if desired. The only one that's kinda suspect is adding a dummy struct to eat the semicolon in VIR_ONCE_GLOBAL_INIT, maybe someone has a better suggestion. The last patch is a bit of a detour but if we are interested in doing it now is as good a time as we will get: it changes VIR_ENUM_IMPL to add a newline after the last entry. This means diffs extending the enum value list only generate one line diff instead of two. An example is in the patch description. If people agree with the idea, it could be squashed into patch #2 to reduce 'git blame' pollution Thanks, Cole Cole Robinson (9): Add semicolon to VIR_ENUM_DECL calls Add semicolon to VIR_ENUM_IMPL calls Add semicolon to VIR_LOG_INIT calls Add semicolon to VIR_ONCE_GLOBAL_INIT calls Require a semicolon for VIR_ENUM_DECL calls Require a semicolon for VIR_ENUM_IMPL calls Require a semicolon for VIR_LOG_INIT calls Require a semicolon for VIR_ONCE_GLOBAL_INIT calls Add newline after last entry in VIR_ENUM_IMPL calls src/access/viraccessperm.c | 30 ++- src/bhyve/bhyve_conf.c | 2 +- src/conf/capabilities.c | 9 +- src/conf/cpu_conf.c | 21 +- src/conf/cpu_conf.h | 12 +- src/conf/domain_capabilities.c | 5 +- src/conf/domain_conf.c | 313 ++++++++++++++++-------- src/conf/domain_conf.h | 220 ++++++++--------- src/conf/domain_event.c | 2 +- src/conf/interface_conf.c | 3 +- src/conf/interface_conf.h | 2 +- src/conf/netdev_vlan_conf.c | 3 +- src/conf/network_conf.c | 17 +- src/conf/network_conf.h | 8 +- src/conf/network_event.c | 2 +- src/conf/node_device_conf.c | 12 +- src/conf/node_device_conf.h | 8 +- src/conf/node_device_event.c | 2 +- src/conf/numa_conf.c | 9 +- src/conf/numa_conf.h | 6 +- src/conf/nwfilter_conf.c | 21 +- src/conf/object_event.c | 2 +- src/conf/secret_event.c | 2 +- src/conf/snapshot_conf.c | 6 +- src/conf/snapshot_conf.h | 4 +- src/conf/storage_adapter_conf.c | 3 +- src/conf/storage_adapter_conf.h | 2 +- src/conf/storage_conf.c | 24 +- src/conf/storage_conf.h | 16 +- src/conf/storage_event.c | 2 +- src/conf/virdomainobjlist.c | 2 +- src/conf/virinterfaceobj.c | 2 +- src/conf/virnetworkobj.c | 2 +- src/conf/virnodedeviceobj.c | 2 +- src/conf/virnwfilterbindingobj.c | 2 +- src/conf/virnwfilterbindingobjlist.c | 2 +- src/conf/virsecretobj.c | 2 +- src/conf/virstorageobj.c | 4 +- src/datatypes.c | 2 +- src/interface/interface_backend_netcf.c | 2 +- src/libxl/libxl_conf.c | 2 +- src/libxl/libxl_domain.c | 2 +- src/libxl/libxl_domain.h | 2 +- src/libxl/libxl_migration.c | 2 +- src/locking/lock_daemon.c | 5 +- src/logging/log_daemon.c | 5 +- src/logging/log_handler.c | 2 +- src/lxc/lxc_conf.c | 2 +- src/lxc/lxc_domain.c | 6 +- src/lxc/lxc_domain.h | 6 +- src/lxc/lxc_monitor.c | 2 +- src/network/leaseshelper.c | 3 +- src/node_device/node_device_udev.c | 2 +- src/qemu/qemu_agent.c | 8 +- src/qemu/qemu_blockjob.c | 2 +- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_command.c | 43 ++-- src/qemu/qemu_command.h | 2 +- src/qemu/qemu_conf.c | 2 +- src/qemu/qemu_domain.c | 14 +- src/qemu/qemu_domain.h | 8 +- src/qemu/qemu_driver.c | 10 +- src/qemu/qemu_extdevice.c | 2 +- src/qemu/qemu_migration.h | 2 +- src/qemu/qemu_migration_cookie.c | 3 +- src/qemu/qemu_migration_params.c | 4 +- src/qemu/qemu_migration_params.h | 2 +- src/qemu/qemu_monitor.c | 16 +- src/qemu/qemu_monitor.h | 8 +- src/qemu/qemu_monitor_json.c | 18 +- src/qemu/qemu_tpm.c | 2 +- src/remote/remote_daemon.c | 5 +- src/rpc/virkeepalive.c | 2 +- src/rpc/virnetclient.c | 2 +- src/rpc/virnetclientprogram.c | 2 +- src/rpc/virnetclientstream.c | 2 +- src/rpc/virnetdaemon.c | 2 +- src/rpc/virnetsaslcontext.c | 2 +- src/rpc/virnetserver.c | 2 +- src/rpc/virnetserverclient.c | 2 +- src/rpc/virnetserverprogram.c | 2 +- src/rpc/virnetserverservice.c | 2 +- src/rpc/virnetsocket.c | 2 +- src/rpc/virnettlscontext.c | 2 +- src/test/test_driver.c | 2 +- src/util/vircgroup.c | 3 +- src/util/vircgroupbackend.c | 3 +- src/util/vircgroupv1.c | 3 +- src/util/vircgroupv2.c | 3 +- src/util/virclosecallbacks.c | 2 +- src/util/virconf.c | 3 +- src/util/virconf.h | 2 +- src/util/virdevmapper.c | 2 +- src/util/virdnsmasq.c | 2 +- src/util/virerror.c | 4 +- src/util/virfdstream.c | 2 +- src/util/virfilecache.c | 4 +- src/util/virfirewall.c | 12 +- src/util/virgic.c | 2 +- src/util/virhash.c | 2 +- src/util/virhook.c | 35 +-- src/util/virhostdev.c | 2 +- src/util/viridentity.c | 2 +- src/util/virkeycode.c | 2 +- src/util/virlog.c | 5 +- src/util/virlog.h | 2 +- src/util/virmdev.c | 5 +- src/util/virmdev.h | 2 +- src/util/virnetdev.c | 9 +- src/util/virnetdev.h | 6 +- src/util/virnetdevmacvlan.c | 3 +- src/util/virnetdevmacvlan.h | 2 +- src/util/virnetdevvlan.h | 2 +- src/util/virnetdevvportprofile.c | 6 +- src/util/virnetdevvportprofile.h | 4 +- src/util/virpci.c | 9 +- src/util/virpci.h | 4 +- src/util/virperf.c | 3 +- src/util/virportallocator.c | 2 +- src/util/virprocess.c | 3 +- src/util/virresctrl.c | 18 +- src/util/virscsi.c | 2 +- src/util/virscsivhost.c | 2 +- src/util/virsecret.c | 3 +- src/util/virsecret.h | 2 +- src/util/virstorageencryption.c | 7 +- src/util/virstorageencryption.h | 4 +- src/util/virstoragefile.c | 20 +- src/util/virstoragefile.h | 10 +- src/util/virstoragefilebackend.c | 2 +- src/util/virsysinfo.c | 3 +- src/util/virsysinfo.h | 2 +- src/util/virthread.h | 5 +- src/util/virthreadjob.c | 2 +- src/util/virtypedparam.c | 3 +- src/util/virtypedparam.h | 2 +- src/util/virusb.c | 2 +- src/util/virutil.c | 6 +- src/util/virutil.h | 10 +- src/vmware/vmware_conf.c | 3 +- src/vmware/vmware_conf.h | 2 +- src/vmx/vmx.c | 2 +- src/vz/vz_driver.c | 2 +- tests/virfilecachetest.c | 2 +- tools/virsh-domain-monitor.c | 60 +++-- tools/virsh-domain.c | 102 ++++---- tools/virsh-network.c | 12 +- tools/virsh-nodedev.c | 4 +- tools/virsh-pool.c | 8 +- tools/virsh-secret.c | 4 +- tools/virsh-volume.c | 6 +- tools/virt-admin.c | 4 +- 152 files changed, 861 insertions(+), 622 deletions(-) -- 2.20.1

3 13

[libvirt] ANNOUNCE: virt-manager 2.1.0 released
by Cole Robinson 03 Feb '19

03 Feb '19

I'm happy to announce the release of virt-manager 2.1.0! The release can be downloaded from: http://virt-manager.org/download/ This release includes: - Bash autocompletion support (Lin Ma, Cole Robinson) - UI and command line --vsock support (Slavomir Kaslev) - virt-xml: Add --os-variant option (Andrea Bolognani) - virt-install: use libosinfo cpu, mem, disk size defaults (Fabiano Fidencio) - virt-install: Better usage of libosinfo -unknown distro IDs (Fabiano Fidencio) - virt-install: More usage of libosinfo for ISO --location detection - virt-install: Add --location LOCATION,kernel=X,initrd=Y for pointing to kernel/initrd in media that virt-install/libosinfo fails to detect - Various bug fixes and improvements Thanks to everyone who has contributed to this release through testing, bug reporting, submitting patches, and otherwise sending in feedback! Thanks, Cole

1 0

[libvirt] [PULL 0/5] Ui 20190201 patches
by Gerd Hoffmann 03 Feb '19

03 Feb '19

The following changes since commit e8977901b79fb678f288dd372261b640bbeccd0d: Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-pull-request' into staging (2019-01-31 15:40:39 +0000) are available in the git repository at: git://git.kraxel.org/qemu tags/ui-20190201-pull-request for you to fetch changes up to 0015ca5cbabe0b31d31610ddfaafd90a9e5911a4: ui: remove support for SDL1.2 in favour of SDL2 (2019-02-01 11:59:12 +0100) ---------------------------------------------------------------- ui: fix build with SDL disabled, drop SDL1 support. ---------------------------------------------------------------- Daniel P. Berrangé (1): ui: remove support for SDL1.2 in favour of SDL2 Philippe Mathieu-Daudé (4): hw/display: Move Milkymist specific hardware out of common-obj list configure: LM32 Milkymist Texture Mapping Unit (tmu2) also depends of X11 hw/display/milkymist-tmu2: Explicit the dependency to both X11 / OpenGL hw/display/milkymist-tmu2: Move inlined code from header to source configure | 70 +-- hw/lm32/milkymist-hw.h | 63 --- include/hw/display/milkymist_tmu2.h | 41 ++ ui/sdl_zoom.h | 25 - ui/sdl_zoom_template.h | 219 -------- hw/display/milkymist-tmu2.c | 49 ++ hw/lm32/milkymist.c | 1 + ui/sdl.c | 1027 ----------------------------------- ui/sdl_zoom.c | 93 ---- MAINTAINERS | 1 + default-configs/lm32-softmmu.mak | 2 +- hw/display/Makefile.objs | 8 +- qemu-deprecated.texi | 9 - ui/Makefile.objs | 5 - 14 files changed, 114 insertions(+), 1499 deletions(-) create mode 100644 include/hw/display/milkymist_tmu2.h delete mode 100644 ui/sdl_zoom.h delete mode 100644 ui/sdl_zoom_template.h delete mode 100644 ui/sdl.c delete mode 100644 ui/sdl_zoom.c -- 2.9.3

3 7

[libvirt] [PATCH] util: remove test code accidentally committed to virFirewallDZoneExists
by Laine Stump 03 Feb '19

03 Feb '19

Just before pushing the series containing commit 3bba4825 I had added a "return true" to the top of virFirewallDZoneExists() to measure the impact of calling that function once per network during startup. I found that the effect was minimal, but forgot to remove the "return true" before pushing. This unfortunately causes a failure to start networks on systems that have a firewalld version that doesn't support our libvirt zone file (i.e. pretty much everyone). This patch removes the unintended line. Signed-off-by: Laine Stump <laine(a)laine.org> --- Pushed as trivial / buildbreaker. src/util/virfirewalld.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/util/virfirewalld.c b/src/util/virfirewalld.c index ca03020f74..47bacdcf4a 100644 --- a/src/util/virfirewalld.c +++ b/src/util/virfirewalld.c @@ -235,8 +235,6 @@ virFirewallDZoneExists(const char *match) char **zones = NULL; bool result = false; - return true; - if (virFirewallDGetZones(&zones, &nzones) < 0) goto cleanup; -- 2.20.1

1 0

[libvirt] [PATCH 0/3] bhyve: bhyve:commandline followup fixes
by Roman Bogorodskiy 01 Feb '19

01 Feb '19

Roman Bogorodskiy (3): bhyve: bhyveDomainDefNamespaceFormatXML cleanup bhyve: emit warning when using bhyve:commandline docs: bhyve: warn about bhyve:commandline risks docs/drvbhyve.html.in | 5 +++++ src/bhyve/bhyve_command.c | 4 ++++ src/bhyve/bhyve_domain.c | 4 ++-- 3 files changed, 11 insertions(+), 2 deletions(-) -- 2.20.1

2 5

[libvirt] [PATCH v2] qemu-nbd: Deprecate qemu-nbd --partition
by Eric Blake 01 Feb '19

01 Feb '19

The existing qemu-nbd --partition code claims to handle logical partitions up to 8, since its introduction in 2008 (commit 7a5ca86). However, the implementation is bogus (actual MBR logical partitions form a sort of linked list, with one partition per extended table entry, rather than four logical partitions in a single extended table), making the code unlikely to work for anything beyond -P5 on actual guest images. What's more, the code does not support GPT partitions, which are becoming more popular, and maintaining device subsetting in both NBD and the raw device is unnecessary duplication of effort (even if it is not too difficult). Note that obtaining the offsets of a partition (MBR or GPT) can be learned by using 'qemu-nbd -c /dev/nbd0 file.qcow2 && sfdisk --dump /dev/nbd0', but by the time you've done that, you might as well just mount /dev/nbd0p1 that the kernel creates for you instead of bothering with qemu exporting a subset. Or, keeping to just user-space code, use nbdkit's partition filter, which has already known both GPT and primary MBR partitions for a while, and was just recently enhanced to support arbitrary logical MBR parititions. Start the clock on the deprecation cycle, with examples of how to write device subsetting without using -P. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- v2: actual nbdkit example [Rich], improved doc wording --- qemu-deprecated.texi | 33 +++++++++++++++++++++++++++++++++ qemu-nbd.texi | 6 ++++-- qemu-nbd.c | 2 ++ 3 files changed, 39 insertions(+), 2 deletions(-) diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index 219206a836f..d35e78c81ff 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -175,3 +175,36 @@ The above, converted to the current supported format: @subsubsection "irq": "" (since 3.0.0) The ``irq'' property is obsoleted. + +@section Related binaries + +@subsection qemu-nbd --partition (since 4.0.0) + +The ``qemu-nbd --partition $digit'' code (also spelled @option{-P}) +can only handle MBR partitions, and has never correctly handled +logical partitions beyond partition 5. If you know the offset and +length of the partition (perhaps by using @code{sfdisk} within the +guest), you can achieve the effect of exporting just that subset of +the disk by use of the @option{--image-opts} option with a raw +blockdev using the @code{offset} and @code{size} parameters layered on +top of any other existing blockdev. For example, if partition 1 is +100MiB long starting at 1MiB, the old command: + +@code{qemu-nbd -t -P 1 -f qcow2 file.qcow2} + +can be rewritten as: + +@code{qemu-nbd -t --image-opts driver=raw,offset=1M,size=100M,file.driver=qcow2,file.backing.driver=file,file.backing.filename=file.qcow2} + +Alternatively, the @code{nbdkit} project provides a more powerful +partition filter on top of its nbd plugin, which can be used to select +an arbitrary MBR or GPT partition on top of any other full-image NBD +export. Using this to rewrite the above example results in: + +@code{qemu-nbd -t -k /tmp/sock -f qcow2 file.qcow2 &} +@code{nbdkit -f --filter=partition nbd socket=/tmp/sock partition=1} + +Note that if you are exposing the export via /dev/nbd0, it is easier +to just export the entire image and then mount only /dev/nbd0p1 than +it is to reinvoke @command{qemu-nbd -c /dev/nbd0} limited to just a +subset of the image. diff --git a/qemu-nbd.texi b/qemu-nbd.texi index 386bece4680..d0c51828149 100644 --- a/qemu-nbd.texi +++ b/qemu-nbd.texi @@ -56,8 +56,10 @@ auto-detecting. @item -r, --read-only Export the disk as read-only. @item -P, --partition=@var{num} -Only expose MBR partition @var{num}. Understands physical partitions -1-4 and logical partitions 5-8. +Deprecated: Only expose MBR partition @var{num}. Understands physical +partitions 1-4 and logical partition 5. New code should instead use +@option{--image-opts} with the raw driver wrapping a subset of the +original image. @item -B, --bitmap=@var{name} If @var{filename} has a qcow2 persistent bitmap @var{name}, expose that bitmap via the ``qemu:dirty-bitmap:@var{name}'' context diff --git a/qemu-nbd.c b/qemu-nbd.c index 1f7b2a03f5d..00c07fd27ea 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -787,6 +787,8 @@ int main(int argc, char **argv) flags &= ~BDRV_O_RDWR; break; case 'P': + warn_report("The '-P' option is deprecated; use --image-opts with " + "a raw device wrapper for subset exports instead"); if (qemu_strtoi(optarg, NULL, 0, &partition) < 0 || partition < 1 || partition > 8) { error_report("Invalid partition '%s'", optarg); -- 2.20.1

3 3

[libvirt] [PATCH] qemu: command: Don't skip 'readonly' and throttling info for empty drive
by Peter Krempa 01 Feb '19

01 Feb '19

In commit f80eae8c2ae I was too agresive in removing properties of -drive for empty drives. It turns out that qemu actually persists the state of 'readonly' and the throttling information even for the empty drive. Removing 'readonly' thus made qemu open any subsequent images added via the 'change' command as RW which was forbidden by selinux thanks to the restrictive sVirt label for readonly media. Fix this by formating the property again and bump the tests and leave a note detailing why the rest of the properties needs to be skipped. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_command.c | 18 +++++++++++++----- tests/qemuxml2argvdata/disk-cdrom.args | 4 ++-- .../disk-cdrom.x86_64-2.12.0.args | 4 ++-- .../disk-cdrom.x86_64-latest.args | 4 ++-- 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index a59583fb75..6d3aa69569 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1764,10 +1764,18 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, } } + if (disk->src->readonly) + virBufferAddLit(&opt, ",readonly=on"); + + /* qemu rejects some parameters for an empty -drive, so we need to skip + * them in that case: + * cache: modifies properties of the format driver which is not present + * copy_on_read: really only works for floppies + * discard: modifies properties of format driver + * detect_zeroes: works but really depends on discard so it's useless + * iomode: setting it to 'native' requires a specific cache mode + */ if (!virStorageSourceIsEmpty(disk->src)) { - if (disk->src->readonly) - virBufferAddLit(&opt, ",readonly=on"); - if (disk->cachemode) { virBufferAsprintf(&opt, ",cache=%s", qemuDiskCacheV2TypeToString(disk->cachemode)); @@ -1792,10 +1800,10 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, virBufferAsprintf(&opt, ",aio=%s", virDomainDiskIoTypeToString(disk->iomode)); } - - qemuBuildDiskThrottling(disk, &opt); } + qemuBuildDiskThrottling(disk, &opt); + if (virBufferCheckError(&opt) < 0) goto error; diff --git a/tests/qemuxml2argvdata/disk-cdrom.args b/tests/qemuxml2argvdata/disk-cdrom.args index a9f60aa477..4823ae82de 100644 --- a/tests/qemuxml2argvdata/disk-cdrom.args +++ b/tests/qemuxml2argvdata/disk-cdrom.args @@ -27,7 +27,7 @@ bootindex=1 \ -drive file=/root/boot.iso,format=raw,if=none,id=drive-ide0-0-1,media=cdrom,\ readonly=on \ -device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ --drive if=none,id=drive-ide0-1-0,media=cdrom \ +-drive if=none,id=drive-ide0-1-0,media=cdrom,readonly=on \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ --drive if=none,id=drive-ide0-1-1,media=cdrom \ +-drive if=none,id=drive-ide0-1-1,media=cdrom,readonly=on \ -device ide-drive,bus=ide.1,unit=1,drive=drive-ide0-1-1,id=ide0-1-1 diff --git a/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args index a39d920f67..2fe84177b8 100644 --- a/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args @@ -28,10 +28,10 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -drive file=/root/boot.iso,format=raw,if=none,id=drive-ide0-0-1,readonly=on \ -device ide-cd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ --drive if=none,id=drive-ide0-1-0 \ +-drive if=none,id=drive-ide0-1-0,readonly=on \ -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,\ write-cache=on \ --drive if=none,id=drive-ide0-1-1 \ +-drive if=none,id=drive-ide0-1-1,readonly=on \ -device ide-cd,bus=ide.1,unit=1,drive=drive-ide0-1-1,id=ide0-1-1 \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ resourcecontrol=deny \ diff --git a/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args b/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args index 029ae23dfa..9b9451f435 100644 --- a/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args @@ -28,10 +28,10 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -drive file=/root/boot.iso,format=raw,if=none,id=drive-ide0-0-1,readonly=on \ -device ide-cd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ --drive if=none,id=drive-ide0-1-0 \ +-drive if=none,id=drive-ide0-1-0,readonly=on \ -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,\ write-cache=on \ --drive if=none,id=drive-ide0-1-1 \ +-drive if=none,id=drive-ide0-1-1,readonly=on \ -device ide-cd,bus=ide.1,unit=1,drive=drive-ide0-1-1,id=ide0-1-1 \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ resourcecontrol=deny \ -- 2.20.1

2 1

[libvirt] [PATCH] util: Fix build issue with virStorageFileGetNPIVKey
by John Ferlan 01 Feb '19

01 Feb '19

Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- pushed as build breaker <sigh>... src/util/virstoragefile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index d83d84fcf5..6df0885669 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1564,7 +1564,7 @@ virStorageFileGetNPIVKey(const char *path, return ret; } #else -int virStorageFileGetNPIVKey(const char *path, +int virStorageFileGetNPIVKey(const char *path ATTRIBUTE_UNUSED, char **key ATTRIBUTE_UNUSED) { return -1; -- 2.20.1

1 0

[libvirt] [PATCH 0/3] qemu: Improve handling of format for 'network' and 'volume' disks (blockdev-add saga)
by Peter Krempa 01 Feb '19

01 Feb '19

Peter Krempa (3): tests: qemu: Test network disks without format specified explicitly qemu: domain: Assume 'raw' default storage format also for network storage qemu: domain: Treat 'volume' disks as 'raw' if neiter user nor pool provided format src/qemu/qemu_domain.c | 8 ++++++-- tests/qemuxml2argvdata/disk-network-gluster.xml | 2 +- tests/qemuxml2argvdata/disk-network-iscsi.xml | 2 +- tests/qemuxml2argvdata/disk-network-nbd.xml | 2 +- tests/qemuxml2argvdata/disk-source-pool-mode.args | 6 +++--- tests/qemuxml2argvdata/disk-source-pool.args | 4 ++-- 6 files changed, 14 insertions(+), 10 deletions(-) -- 2.20.1

3 5

[libvirt] [PATCH] docs: news: Update the release notes with the SEV permission fix
by Erik Skultety 01 Feb '19

01 Feb '19

Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- docs/news.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index 55d6a3926b..fcc42698b3 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -50,6 +50,18 @@ <section title="Improvements"> </section> <section title="Bug fixes"> + <change> + <summary> + qemu: Use CAP_DAC_OVERRIDE during QEMU capabilities probing + </summary> + <description> + By default, libvirt runs the QEMU process as qemu:qemu which could + cause issues during probing as some features (like AMD SEV) might be + inaccesible to QEMU because of file system permissions. Therefore, + CAP_DAC_OVERRIDE is granted to overcome these for the purposes of + probing. + </description> + </change> <change> <summary> storage: Add default mount options for fs/netfs storage pools -- 2.20.1

2 2

[libvirt] [PATCH v2 0/7] network: fix networking for firewalld+nftables
by Laine Stump 01 Feb '19

01 Feb '19

Resolves: https://bugzilla.redhat.com/1638342 Creates-and-Resolves: https://bugzilla.redhat.com/1650320 V1: https://www.redhat.com/archives/libvir-list/2019-January/msg00227.html The detailed explanation of this is in Patch 4/7 and 5/7. Basically, when firewalld enables their new nftables backend, libvirt virtual networks lose all ability to forward packets from guests out to the physical network, and can only communicate with the host itself as much as firewalld's "public" zone will allow (which isn't much, and doesn't include DHCP or DNS). I *think* I've addressed everything in Daniel and John's review comments. In particular, I've made installation of the libvirt zone file optional, and if the libvirt zone is missing, I only log an error if the firewalld backend is set to nftables. Laine Stump (7): configure: change HAVE_FIREWALLD to WITH_FIREWALLD util: move all firewalld-specific stuff into its own files util: new virFirewallD APIs + docs configure: selectively install a firewalld 'libvirt' zone network: set firewalld zone of bridges to "libvirt" zone when appropriate network: allow configuring firewalld zone for virtual network bridge device docs: update news.xml for firewalld zone changes configure.ac | 3 + docs/firewall.html.in | 38 +++ docs/formatnetwork.html.in | 17 + docs/news.xml | 40 +++ docs/schemas/basictypes.rng | 6 + docs/schemas/network.rng | 6 + include/libvirt/virterror.h | 1 + libvirt.spec.in | 31 ++ m4/virt-firewalld-zone.m4 | 45 +++ m4/virt-firewalld.m4 | 4 +- src/conf/network_conf.c | 14 +- src/conf/network_conf.h | 1 + src/libvirt_private.syms | 10 + src/network/Makefile.inc.am | 10 +- src/network/bridge_driver.c | 6 +- src/network/bridge_driver_linux.c | 67 ++++ src/network/libvirt.zone | 23 ++ src/nwfilter/nwfilter_driver.c | 6 +- src/util/Makefile.inc.am | 3 + src/util/virerror.c | 3 +- src/util/virfirewall.c | 86 +---- src/util/virfirewalld.c | 373 +++++++++++++++++++++ src/util/virfirewalld.h | 46 +++ src/util/virfirewalldpriv.h | 30 ++ src/util/virfirewallpriv.h | 2 - tests/networkxml2xmlin/routed-network.xml | 2 +- tests/networkxml2xmlout/routed-network.xml | 2 +- tests/virfirewalltest.c | 2 + 28 files changed, 779 insertions(+), 98 deletions(-) create mode 100644 m4/virt-firewalld-zone.m4 create mode 100644 src/network/libvirt.zone create mode 100644 src/util/virfirewalld.c create mode 100644 src/util/virfirewalld.h create mode 100644 src/util/virfirewalldpriv.h -- 2.20.1

3 23

[libvirt] [PATCH v2 0/4] storage: More uniquely identify NPIV LUNs
by John Ferlan 01 Feb '19

01 Feb '19

v1: https://www.redhat.com/archives/libvir-list/2018-December/msg00562.html but no review until January, see: https://www.redhat.com/archives/libvir-list/2019-January/msg00079.html Changes since v1: * Rework code to have virStorageBackendSCSISerial use the existing virStorageFileGetSCSIKey * Then introduce and use virStorageFileGetNPIVKey in order to get a more unique key for NPIV LUNs. Follows same fallback policy as SCSI LUNs if the called *Key function either doesn't exist or fails to return a valid value. John Ferlan (4): util: Modify virStorageFileGetSCSIKey return storage: Rework virStorageBackendSCSISerial util: Introduce virStorageFileGetNPIVKey storage: Fetch a unique key for vHBA/NPIV LUNs src/libvirt_private.syms | 1 + src/storage/storage_util.c | 45 +++++++---------- src/util/virstoragefile.c | 101 +++++++++++++++++++++++++++++++++++-- src/util/virstoragefile.h | 2 + 4 files changed, 118 insertions(+), 31 deletions(-) -- 2.20.1

3 14

[libvirt] [PATCH] tests: Update qemucaps2xml for QEMU 4.0.0 on x86_64
by Andrea Bolognani 01 Feb '19

01 Feb '19

Commit fb0d0d6c5492 added capabilities data and updated qemucapabilitiestest but forgot to update qemucaps2xmltest at the same time. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- *cough* and of course the reviewer didn't notice *cough* .../qemucaps2xmloutdata/caps_4.0.0.x86_64.xml | 28 +++++++++++++++++++ tests/qemucaps2xmltest.c | 1 + 2 files changed, 29 insertions(+) create mode 100644 tests/qemucaps2xmloutdata/caps_4.0.0.x86_64.xml diff --git a/tests/qemucaps2xmloutdata/caps_4.0.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_4.0.0.x86_64.xml new file mode 100644 index 0000000000..d41693a001 --- /dev/null +++ b/tests/qemucaps2xmloutdata/caps_4.0.0.x86_64.xml @@ -0,0 +1,28 @@ +<capabilities> + + <host> + <cpu> + <arch>x86_64</arch> + </cpu> + <power_management/> + <iommu support='no'/> + </host> + + <guest> + <os_type>hvm</os_type> + <arch name='x86_64'> + <wordsize>64</wordsize> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <domain type='qemu'/> + <domain type='kvm'/> + </arch> + <features> + <cpuselection/> + <deviceboot/> + <disksnapshot default='on' toggle='no'/> + <acpi default='on' toggle='yes'/> + <apic default='on' toggle='no'/> + </features> + </guest> + +</capabilities> diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c index dd9fc6917a..9d6b6f474c 100644 --- a/tests/qemucaps2xmltest.c +++ b/tests/qemucaps2xmltest.c @@ -198,6 +198,7 @@ mymain(void) DO_TEST("x86_64", "caps_2.12.0"); DO_TEST("x86_64", "caps_3.0.0"); DO_TEST("x86_64", "caps_3.1.0"); + DO_TEST("x86_64", "caps_4.0.0"); DO_TEST("aarch64", "caps_2.6.0"); DO_TEST("aarch64", "caps_2.10.0"); DO_TEST("aarch64", "caps_2.12.0"); -- 2.20.1

2 2

[libvirt] [PATCH 0/5] Override the permissions on /dev/sev when probing
by Erik Skultety 01 Feb '19

01 Feb '19

The problem with /dev/sev's default permissions (0600 root:root) is that we can't make it more permissive at the moment otherwise we'd weaken the security of SEV and potentially open the door for a DOS attack. Therefore, the alternative approach is to set CAP_DAC_OVERRIDE capability for the probing QEMU process (and *only* when probing) so that libvirt truly works with SEV. As a necessary side job, this series also makes /dev/sev only available to machines that need it, thus mitigating the possible attack surface even more. Erik Skultety (5): qemu: conf: Remove /dev/sev from the default cgroup device acl list qemu: cgroup: Expose /dev/sev/ only to domains that require SEV qemu: domain: Add /dev/sev into the domain mount namespace selectively security: dac: Relabel /dev/sev in the namespace qemu: caps: Use CAP_DAC_OVERRIDE for probing to avoid permission issues docs/drvqemu.html.in | 2 +- src/qemu/qemu.conf | 2 +- src/qemu/qemu_capabilities.c | 11 +++++++ src/qemu/qemu_cgroup.c | 21 +++++++++++- src/qemu/qemu_domain.c | 24 ++++++++++++++ src/qemu/test_libvirtd_qemu.aug.in | 1 - src/security/security_dac.c | 51 ++++++++++++++++++++++++++++++ src/util/virutil.c | 31 ++++++++++++++++-- 8 files changed, 137 insertions(+), 6 deletions(-) -- 2.20.1

2 12

[libvirt] [PATCH v2] qemu: Rework setting process affinity
by Michal Privoznik 01 Feb '19

01 Feb '19

https://bugzilla.redhat.com/show_bug.cgi?id=1503284 The way we currently start qemu from CPU affinity POV is as follows: 1) the child process is set affinity to all online CPUs (unless some vcpu pinning was given in the domain XML) 2) Once qemu is running, cpuset cgroup is configured taking memory pinning into account Problem is that we let qemu allocate its memory just anywhere in 1) and then rely in 2) to be able to move the memory to configured NUMA nodes. This might not be always possible (e.g. qemu might lock some parts of its memory) and is very suboptimal (copying large memory between NUMA nodes takes significant amount of time). The solution is to set affinity to one of (in priority order): - The CPUs associated with NUMA memory affinity mask - The CPUs associated with emulator pinning - All online host CPUs Later (once QEMU has allocated its memory) we then change this again to (again in priority order): - The CPUs associated with emulator pinning - The CPUs returned by numad - The CPUs associated with vCPU pinning - All online host CPUs Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- diff to v1 (both points suggested by Dan): - Expanded the commit message - fixed qemuProcessGetAllCpuAffinity so that it returns online CPU map only src/qemu/qemu_process.c | 132 +++++++++++++++++++--------------------- 1 file changed, 63 insertions(+), 69 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 7592c98b74..dace5aaca1 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2435,6 +2435,21 @@ qemuProcessDetectIOThreadPIDs(virQEMUDriverPtr driver, } +static int +qemuProcessGetAllCpuAffinity(virBitmapPtr *cpumapRet) +{ + *cpumapRet = NULL; + + if (!virHostCPUHasBitmap()) + return 0; + + if (!(*cpumapRet = virHostCPUGetOnlineBitmap())) + return -1; + + return 0; +} + + /* * To be run between fork/exec of QEMU only */ @@ -2443,9 +2458,9 @@ static int qemuProcessInitCpuAffinity(virDomainObjPtr vm) { int ret = -1; - virBitmapPtr cpumap = NULL; virBitmapPtr cpumapToSet = NULL; - virBitmapPtr hostcpumap = NULL; + VIR_AUTOPTR(virBitmap) hostcpumap = NULL; + virDomainNumatuneMemMode mem_mode; qemuDomainObjPrivatePtr priv = vm->privateData; if (!vm->pid) { @@ -2454,59 +2469,39 @@ qemuProcessInitCpuAffinity(virDomainObjPtr vm) return -1; } - if (vm->def->placement_mode == VIR_DOMAIN_CPU_PLACEMENT_MODE_AUTO) { - VIR_DEBUG("Set CPU affinity with advisory nodeset from numad"); - cpumapToSet = priv->autoCpuset; + /* Here is the deal, we can't set cpuset.mems before qemu is + * started as it clashes with KVM allocation. Therefore, we + * used to let qemu allocate its memory anywhere as we would + * then move the memory to desired NUMA node via CGroups. + * However, that might not be always possible because qemu + * might lock some parts of its memory (e.g. due to VFIO). + * Even if it possible, memory has to be copied between NUMA + * nodes which is suboptimal. + * Solution is to set affinity that matches the best what we + * would have set in CGroups and then fix it later, once qemu + * is already running. */ + if (virDomainNumaGetNodeCount(vm->def->numa) <= 1 && + virDomainNumatuneGetMode(vm->def->numa, -1, &mem_mode) == 0 && + mem_mode == VIR_DOMAIN_NUMATUNE_MEM_STRICT) { + if (virDomainNumatuneMaybeGetNodeset(vm->def->numa, + priv->autoNodeset, + &cpumapToSet, + -1) < 0) + goto cleanup; + } else if (vm->def->cputune.emulatorpin) { + cpumapToSet = vm->def->cputune.emulatorpin; } else { - VIR_DEBUG("Set CPU affinity with specified cpuset"); - if (vm->def->cpumask) { - cpumapToSet = vm->def->cpumask; - } else { - /* You may think this is redundant, but we can't assume libvirtd - * itself is running on all pCPUs, so we need to explicitly set - * the spawned QEMU instance to all pCPUs if no map is given in - * its config file */ - int hostcpus; - - if (virHostCPUHasBitmap()) { - hostcpumap = virHostCPUGetOnlineBitmap(); - cpumap = virProcessGetAffinity(vm->pid); - } - - if (hostcpumap && cpumap && virBitmapEqual(hostcpumap, cpumap)) { - /* we're using all available CPUs, no reason to set - * mask. If libvirtd is running without explicit - * affinity, we can use hotplugged CPUs for this VM */ - ret = 0; - goto cleanup; - } else { - /* setaffinity fails if you set bits for CPUs which - * aren't present, so we have to limit ourselves */ - if ((hostcpus = virHostCPUGetCount()) < 0) - goto cleanup; - - if (hostcpus > QEMUD_CPUMASK_LEN) - hostcpus = QEMUD_CPUMASK_LEN; - - virBitmapFree(cpumap); - if (!(cpumap = virBitmapNew(hostcpus))) - goto cleanup; - - virBitmapSetAll(cpumap); - - cpumapToSet = cpumap; - } - } + if (qemuProcessGetAllCpuAffinity(&hostcpumap) < 0) + goto cleanup; + cpumapToSet = hostcpumap; } - if (virProcessSetAffinity(vm->pid, cpumapToSet) < 0) + if (cpumapToSet && + virProcessSetAffinity(vm->pid, cpumapToSet) < 0) goto cleanup; ret = 0; - cleanup: - virBitmapFree(cpumap); - virBitmapFree(hostcpumap); return ret; } #else /* !defined(HAVE_SCHED_GETAFFINITY) && !defined(HAVE_BSD_CPU_AFFINITY) */ @@ -2586,7 +2581,8 @@ qemuProcessSetupPid(virDomainObjPtr vm, qemuDomainObjPrivatePtr priv = vm->privateData; virDomainNumatuneMemMode mem_mode; virCgroupPtr cgroup = NULL; - virBitmapPtr use_cpumask; + virBitmapPtr use_cpumask = NULL; + VIR_AUTOPTR(virBitmap) hostcpumap = NULL; char *mem_mask = NULL; int ret = -1; @@ -2598,12 +2594,21 @@ qemuProcessSetupPid(virDomainObjPtr vm, } /* Infer which cpumask shall be used. */ - if (cpumask) + if (cpumask) { use_cpumask = cpumask; - else if (vm->def->placement_mode == VIR_DOMAIN_CPU_PLACEMENT_MODE_AUTO) + } else if (vm->def->placement_mode == VIR_DOMAIN_CPU_PLACEMENT_MODE_AUTO) { use_cpumask = priv->autoCpuset; - else + } else if (vm->def->cpumask) { use_cpumask = vm->def->cpumask; + } else { + /* You may think this is redundant, but we can't assume libvirtd + * itself is running on all pCPUs, so we need to explicitly set + * the spawned QEMU instance to all pCPUs if no map is given in + * its config file */ + if (qemuProcessGetAllCpuAffinity(&hostcpumap) < 0) + goto cleanup; + use_cpumask = hostcpumap; + } /* * If CPU cgroup controller is not initialized here, then we need @@ -2628,13 +2633,7 @@ qemuProcessSetupPid(virDomainObjPtr vm, qemuSetupCgroupCpusetCpus(cgroup, use_cpumask) < 0) goto cleanup; - /* - * Don't setup cpuset.mems for the emulator, they need to - * be set up after initialization in order for kvm - * allocations to succeed. - */ - if (nameval != VIR_CGROUP_THREAD_EMULATOR && - mem_mask && virCgroupSetCpusetMems(cgroup, mem_mask) < 0) + if (mem_mask && virCgroupSetCpusetMems(cgroup, mem_mask) < 0) goto cleanup; } @@ -6634,12 +6633,7 @@ qemuProcessLaunch(virConnectPtr conn, /* This must be done after cgroup placement to avoid resetting CPU * affinity */ - if (!vm->def->cputune.emulatorpin && - qemuProcessInitCpuAffinity(vm) < 0) - goto cleanup; - - VIR_DEBUG("Setting emulator tuning/settings"); - if (qemuProcessSetupEmulator(vm) < 0) + if (qemuProcessInitCpuAffinity(vm) < 0) goto cleanup; VIR_DEBUG("Setting cgroup for external devices (if required)"); @@ -6708,10 +6702,6 @@ qemuProcessLaunch(virConnectPtr conn, if (qemuProcessUpdateAndVerifyCPU(driver, vm, asyncJob) < 0) goto cleanup; - VIR_DEBUG("Setting up post-init cgroup restrictions"); - if (qemuSetupCpusetMems(vm) < 0) - goto cleanup; - VIR_DEBUG("setting up hotpluggable cpus"); if (qemuDomainHasHotpluggableStartupVcpus(vm->def)) { if (qemuDomainRefreshVcpuInfo(driver, vm, asyncJob, false) < 0) @@ -6737,6 +6727,10 @@ qemuProcessLaunch(virConnectPtr conn, if (qemuProcessDetectIOThreadPIDs(driver, vm, asyncJob) < 0) goto cleanup; + VIR_DEBUG("Setting emulator tuning/settings"); + if (qemuProcessSetupEmulator(vm) < 0) + goto cleanup; + VIR_DEBUG("Setting global CPU cgroup (if required)"); if (qemuSetupGlobalCpuCgroup(vm) < 0) goto cleanup; -- 2.19.2

2 1