- Devel - libvirt List Archives

[PATCH v4 0/8] Support for launchSecurity type s390-pv
by Boris Fiuczynski 08 Jul '21

08 Jul '21

This patch series introduces the launch security type s390-pv. Specifying s390-pv as launch security type in an s390 domain prepares for running the guest in protected virtualization secure mode, also known as IBM Secure Execution. diff to v3: - moved virDomainSEVDef into a union - improved XML formating for launchSecurity - use a shared id on the qemu cmd line for confidential-guest-support - added check for s390-pv host support into XML validation - changed from ignoring to failing if launchSecuroty child elements are provided for s390-pv - reduced test to a single failing test - add availability of s390-pv in domain capabilities diff to v2: - Broke up previous patch one into three patches diff to v1: - Rebased to current master - Added verification check for confidential-guest-support capability Boris Fiuczynski (8): schemas: Make SEV policy on launch security optional conf: rework SEV XML parse and format methods qemu: make KVMSupportsSecureGuest capability available conf: refactor launch security to allow more types qemu: add s390-pv-guest capability conf: add availability of s390-pv in domain capabilities qemu: use common id lsec0 for launchSecurity docs: add s390-pv documentation docs/formatdomain.rst | 7 + docs/kbase/s390_protected_virt.rst | 55 ++++++- docs/schemas/domaincaps.rng | 9 ++ docs/schemas/domaincommon.rng | 13 +- src/conf/domain_capabilities.c | 1 + src/conf/domain_capabilities.h | 1 + src/conf/domain_conf.c | 143 +++++++++++++----- src/conf/domain_conf.h | 17 ++- src/conf/virconftypes.h | 2 + src/qemu/qemu_capabilities.c | 24 +++ src/qemu/qemu_capabilities.h | 4 + src/qemu/qemu_cgroup.c | 4 +- src/qemu/qemu_command.c | 75 +++++++-- src/qemu/qemu_driver.c | 3 +- src/qemu/qemu_firmware.c | 33 ++-- src/qemu/qemu_namespace.c | 21 ++- src/qemu/qemu_process.c | 35 ++++- src/qemu/qemu_validate.c | 32 +++- src/security/security_dac.c | 6 +- tests/domaincapsdata/qemu_2.11.0.s390x.xml | 1 + tests/domaincapsdata/qemu_2.12.0.s390x.xml | 1 + tests/domaincapsdata/qemu_3.0.0.s390x.xml | 1 + tests/domaincapsdata/qemu_4.0.0.s390x.xml | 1 + tests/domaincapsdata/qemu_4.2.0.s390x.xml | 1 + tests/domaincapsdata/qemu_5.2.0.s390x.xml | 1 + tests/domaincapsdata/qemu_6.0.0.s390x.xml | 1 + tests/domaincapsmock.c | 17 +++ .../launch-security-s390-pv.xml | 18 +++ tests/genericxml2xmltest.c | 1 + .../qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 + ...nch-security-s390-pv-fail.s390x-latest.err | 1 + .../launch-security-s390-pv-fail.xml | 33 ++++ .../launch-security-s390-pv.s390x-latest.args | 35 +++++ .../launch-security-s390-pv.xml | 30 ++++ ...v-missing-platform-info.x86_64-2.12.0.args | 4 +- ...urity-sev-missing-policy.x86_64-2.12.0.err | 1 + .../launch-security-sev-missing-policy.xml | 34 +++++ .../launch-security-sev.x86_64-2.12.0.args | 4 +- .../launch-security-sev.x86_64-6.0.0.args | 4 +- tests/qemuxml2argvmock.c | 16 ++ tests/qemuxml2argvtest.c | 4 + 41 files changed, 588 insertions(+), 107 deletions(-) create mode 100644 tests/genericxml2xmlindata/launch-security-s390-pv.xml create mode 100644 tests/qemuxml2argvdata/launch-security-s390-pv-fail.s390x-latest.err create mode 100644 tests/qemuxml2argvdata/launch-security-s390-pv-fail.xml create mode 100644 tests/qemuxml2argvdata/launch-security-s390-pv.s390x-latest.args create mode 100644 tests/qemuxml2argvdata/launch-security-s390-pv.xml create mode 100644 tests/qemuxml2argvdata/launch-security-sev-missing-policy.x86_64-2.12.0.err create mode 100644 tests/qemuxml2argvdata/launch-security-sev-missing-policy.xml -- 2.31.1

1 8

[PATCH] vircgroup: Improve virCgroupControllerAvailable wrt to CGroupsV2
by Michal Privoznik 08 Jul '21

08 Jul '21

It all started as a simple bug: trying to move domain memory between NUMA nodes (e.g. via virsh numatune) did not work. I've traced the problem to qemuProcessHook() because that's where we decide whether to rely on CGroups or use numactl APIs to satisfy <numatune/>. The problem was that virCgroupControllerAvailable() was telling us that cpuset controller is unavailable. This is CGroupsV2, and pretty weird because CGroupsV2 definitely do support cpuset controller and I had them mounted in a standard way. What I found out (with Pavel's help) was that virCgroupNewSelf() was looking into the following path to detect supported controllers: /sys/fs/cgroup/system.slice/cgroup.controllers However, if there's no other VM running then the system.slice only has 'memory' and 'pids' controllers. Therefore, we saw 'cpuset' as not available. The fix is to look at the top most path, which has the full set of controllers: /sys/fs/cgroup/cgroup.controllers Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1976690 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/vircgroup.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 65a81e8d6f..1b3b28342e 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -2996,7 +2996,10 @@ virCgroupControllerAvailable(int controller) { g_autoptr(virCgroup) cgroup = NULL; - if (virCgroupNewSelf(&cgroup) < 0) + /* Don't use virCgroupNewSelf() - we might be running in a slice that + * doesn't have @controller but the domain (for which we will later use + * virCgroupHasController()) might have it. */ + if (virCgroupNew("/", -1, &cgroup) < 0) return false; return virCgroupHasController(cgroup, controller); -- 2.31.1

2 1

Add SELinux policy for Virt
by Nikola Knazekova 08 Jul '21

08 Jul '21

Hi, I created SELinux policy for Libvirt drivers, as part of Decentralized SELinux Policy (DSP) project. DSP guidelines is available: https://fedoraproject.org/wiki/SELinux/IndependentPolicy Discussion about the first version of SELinux policy for Libvirt is available on gitlab: https://gitlab.com/libvirt/libvirt/-/merge_requests/65 SELinux policy was created for: Hypervisor drivers: - virtqemud (QEMU/KVM) - virtlxcd (LXC) - virtvboxd (VirtualBox) Secondary drivers: - virtstoraged (host storage mgmt) - virtnetworkd (virtual network mgmt) - virtinterface (network interface mgmt) - virtnodedevd (physical device mgmt) - virtsecretd (security credential mgmt) - virtnwfilterd (ip[6]tables/ebtables mgmt) - virtproxyd (proxy daemon) SELinux policy for virtvxz and virtxend has not been created yet, because I wasn't able to reproduce AVC messages. These drivers run in unconfined_domain until the AVC messages are reproduced internally and policy for these drivers is made. Can you please look at it? Thanks Nikola

5 45

[PATCH] schemas: Allow cache attribute for bandwidth element for HMAT
by Michal Privoznik 08 Jul '21

08 Jul '21

Turns out, when introducing HMAT support in v6.6.0-rc1~249 I've forgot to allow "cache" attribute for <bandwidth/> element in RNG. It's parsed and formatted, but schema does not allow it. Fixes: a89bbbac86383a10be0cec5a93feb7ed820871eb Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1980162 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- docs/schemas/cputypes.rng | 5 +++++ tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args | 1 + tests/qemuxml2argvdata/numatune-hmat.xml | 1 + 3 files changed, 7 insertions(+) diff --git a/docs/schemas/cputypes.rng b/docs/schemas/cputypes.rng index 77c8fa783b..056e66e1b4 100644 --- a/docs/schemas/cputypes.rng +++ b/docs/schemas/cputypes.rng @@ -250,6 +250,11 @@ <attribute name="target"> <ref name="unsignedInt"/> </attribute> + <optional> + <attribute name="cache"> + <ref name="unsignedInt"/> + </attribute> + </optional> <attribute name="type"> <choice> <value>access</value> diff --git a/tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args b/tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args index 1ec2e15095..54ab91b09c 100644 --- a/tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args +++ b/tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args @@ -30,6 +30,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest/.config \ -numa hmat-lb,initiator=0,target=0,hierarchy=memory,data-type=access-latency,latency=5 \ -numa hmat-lb,initiator=0,target=0,hierarchy=first-level,data-type=access-latency,latency=10 \ -numa hmat-lb,initiator=0,target=0,hierarchy=memory,data-type=access-bandwidth,bandwidth=204800K \ +-numa hmat-lb,initiator=0,target=0,hierarchy=first-level,data-type=access-bandwidth,bandwidth=208896K \ -numa hmat-cache,node-id=0,size=10K,level=1,associativity=direct,policy=write-back,line=8 \ -uuid c7a5fdb2-cdaf-9455-926a-d65c16db1809 \ -display none \ diff --git a/tests/qemuxml2argvdata/numatune-hmat.xml b/tests/qemuxml2argvdata/numatune-hmat.xml index 51ff3c3425..a64d2ef3e2 100644 --- a/tests/qemuxml2argvdata/numatune-hmat.xml +++ b/tests/qemuxml2argvdata/numatune-hmat.xml @@ -30,6 +30,7 @@ <latency initiator='0' target='0' type='access' value='5'/> <latency initiator='0' target='0' cache='1' type='access' value='10'/> <bandwidth initiator='0' target='0' type='access' value='204800' unit='KiB'/> + <bandwidth initiator='0' target='0' cache='1' type='access' value='208896' unit='KiB'/> </interconnects> </numa> </cpu> -- 2.31.1

2 1

[PATCH 2/2] qemu-img: Require -F with -b backing image
by Eric Blake 08 Jul '21

08 Jul '21

Back in commit d9f059aa6c (qemu-img: Deprecate use of -b without -F), we deprecated the ability to create a file with a backing image that requires qemu to perform format probing. Qemu can still probe older files for backwards compatibility, but it is time to finish off the ability to create such images, due to the potential security risk they present. Update a couple of iotests affected by the change. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- docs/system/deprecated.rst | 20 ----------------- docs/system/removed-features.rst | 19 ++++++++++++++++ block.c | 37 ++++++++++---------------------- qemu-img.c | 6 ++++-- tests/qemu-iotests/114 | 18 ++++++++-------- tests/qemu-iotests/114.out | 11 ++++------ tests/qemu-iotests/301 | 4 +--- tests/qemu-iotests/301.out | 16 ++------------ 8 files changed, 50 insertions(+), 81 deletions(-) diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index 9ec1a9d0e03e..aa6f7d84e583 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -315,26 +315,6 @@ this CPU is also deprecated. Related binaries ---------------- -qemu-img backing file without format (since 5.1) -'''''''''''''''''''''''''''''''''''''''''''''''' - -The use of ``qemu-img create``, ``qemu-img rebase``, or ``qemu-img -convert`` to create or modify an image that depends on a backing file -now recommends that an explicit backing format be provided. This is -for safety: if QEMU probes a different format than what you thought, -the data presented to the guest will be corrupt; similarly, presenting -a raw image to a guest allows a potential security exploit if a future -probe sees a non-raw image based on guest writes. - -To avoid the warning message, or even future refusal to create an -unsafe image, you must pass ``-o backing_fmt=`` (or the shorthand -``-F`` during create) to specify the intended backing format. You may -use ``qemu-img rebase -u`` to retroactively add a backing format to an -existing image. However, be aware that there are already potential -security risks to blindly using ``qemu-img info`` to probe the format -of an untrusted backing image, when deciding what format to add into -an existing image. - Backwards compatibility ----------------------- diff --git a/docs/system/removed-features.rst b/docs/system/removed-features.rst index 28b5df757d35..1928d8a483c0 100644 --- a/docs/system/removed-features.rst +++ b/docs/system/removed-features.rst @@ -466,6 +466,25 @@ backing chain should be performed with ``qemu-img rebase -u`` either before or after the remaining changes being performed by amend, as appropriate. +qemu-img backing file without format (removed in 6.1) +''''''''''''''''''''''''''''''''''''''''''''''''''''' + +The use of ``qemu-img create``, ``qemu-img rebase``, or ``qemu-img +convert`` to create or modify an image that depends on a backing file +now requires that an explicit backing format be provided. This is +for safety: if QEMU probes a different format than what you thought, +the data presented to the guest will be corrupt; similarly, presenting +a raw image to a guest allows a potential security exploit if a future +probe sees a non-raw image based on guest writes. + +To avoid creating unsafe backing chains, you must pass ``-o +backing_fmt=`` (or the shorthand ``-F`` during create) to specify the +intended backing format. You may use ``qemu-img rebase -u`` to +retroactively add a backing format to an existing image. However, be +aware that there are already potential security risks to blindly using +``qemu-img info`` to probe the format of an untrusted backing image, +when deciding what format to add into an existing image. + Block devices ------------- diff --git a/block.c b/block.c index 874c22c43e3d..931e37a8499b 100644 --- a/block.c +++ b/block.c @@ -5033,7 +5033,7 @@ int coroutine_fn bdrv_co_check(BlockDriverState *bs, * -ENOTSUP - format driver doesn't support changing the backing file */ int bdrv_change_backing_file(BlockDriverState *bs, const char *backing_file, - const char *backing_fmt, bool warn) + const char *backing_fmt, bool require) { BlockDriver *drv = bs->drv; int ret; @@ -5047,10 +5047,8 @@ int bdrv_change_backing_file(BlockDriverState *bs, const char *backing_file, return -EINVAL; } - if (warn && backing_file && !backing_fmt) { - warn_report("Deprecated use of backing file without explicit " - "backing format, use of this image requires " - "potentially unsafe format probing"); + if (require && backing_file && !backing_fmt) { + return -EINVAL; } if (drv->bdrv_change_backing_file != NULL) { @@ -6556,24 +6554,11 @@ void bdrv_img_create(const char *filename, const char *fmt, goto out; } else { if (!backing_fmt) { - warn_report("Deprecated use of backing file without explicit " - "backing format (detected format of %s)", - bs->drv->format_name); - if (bs->drv != &bdrv_raw) { - /* - * A probe of raw deserves the most attention: - * leaving the backing format out of the image - * will ensure bs->probed is set (ensuring we - * don't accidentally commit into the backing - * file), and allow more spots to warn the users - * to fix their toolchain when opening this image - * later. For other images, we can safely record - * the format that we probed. - */ - backing_fmt = bs->drv->format_name; - qemu_opt_set(opts, BLOCK_OPT_BACKING_FMT, backing_fmt, - NULL); - } + error_setg(&local_err, + "Backing file specified without backing format"); + error_append_hint(&local_err, "Detected format of %s.", + bs->drv->format_name); + goto out; } if (size == -1) { /* Opened BS, have no size */ @@ -6590,9 +6575,9 @@ void bdrv_img_create(const char *filename, const char *fmt, } /* (backing_file && !(flags & BDRV_O_NO_BACKING)) */ } else if (backing_file && !backing_fmt) { - warn_report("Deprecated use of unopened backing file without " - "explicit backing format, use of this image requires " - "potentially unsafe format probing"); + error_setg(&local_err, + "Backing file specified without backing format"); + goto out; } if (size == -1) { diff --git a/qemu-img.c b/qemu-img.c index a5993682aad4..3cdfcaa23f6b 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -2505,8 +2505,10 @@ static int img_convert(int argc, char **argv) if (out_baseimg_param) { if (!qemu_opt_get(opts, BLOCK_OPT_BACKING_FMT)) { - warn_report("Deprecated use of backing file without explicit " - "backing format"); + error_report("Use of backing file requires explicit " + "backing format"); + ret = -1; + goto out; } } diff --git a/tests/qemu-iotests/114 b/tests/qemu-iotests/114 index 43cb0bc6c344..3e30b402bc4c 100755 --- a/tests/qemu-iotests/114 +++ b/tests/qemu-iotests/114 @@ -44,16 +44,16 @@ _supported_os Linux # qcow2.py does not work too well with external data files _unsupported_imgopts data_file -# Intentionally specify backing file without backing format; demonstrate -# the difference in warning messages when backing file could be probed. -# Note that only a non-raw probe result will affect the resulting image. +# Older qemu-img could set up backing file without backing format; modern +# qemu can't but we can use qcow2.py to simulate older files. truncate -s $((64 * 1024 * 1024)) "$TEST_IMG.orig" -_make_test_img -b "$TEST_IMG.orig" 64M +_make_test_img -b "$TEST_IMG.orig" -F raw 64M +$PYTHON qcow2.py "$TEST_IMG" del-header-ext 0xE2792ACA TEST_IMG="$TEST_IMG.base" _make_test_img 64M $QEMU_IMG convert -O qcow2 -B "$TEST_IMG.orig" "$TEST_IMG.orig" "$TEST_IMG" -_make_test_img -b "$TEST_IMG.base" 64M -_make_test_img -u -b "$TEST_IMG.base" 64M +_make_test_img -b "$TEST_IMG.base" -F $IMGFMT 64M +_make_test_img -u -b "$TEST_IMG.base" -F $IMGFMT 64M # Set an invalid backing file format $PYTHON qcow2.py "$TEST_IMG" add-header-ext 0xE2792ACA "foo" @@ -64,9 +64,9 @@ _img_info $QEMU_IO -c "open $TEST_IMG" -c "read 0 4k" 2>&1 | _filter_qemu_io | _filter_testdir $QEMU_IO -c "open -o backing.driver=$IMGFMT $TEST_IMG" -c "read 0 4k" | _filter_qemu_io -# Rebase the image, to show that omitting backing format triggers a warning, -# but probing now lets us use the backing file. -$QEMU_IMG rebase -u -b "$TEST_IMG.base" "$TEST_IMG" +# Rebase the image, to show that backing format is required. +$QEMU_IMG rebase -u -b "$TEST_IMG.base" "$TEST_IMG" && echo "unexpected pass" +$QEMU_IMG rebase -u -b "$TEST_IMG.base" -F $IMGFMT "$TEST_IMG" $QEMU_IO -c "open $TEST_IMG" -c "read 0 4k" 2>&1 | _filter_qemu_io | _filter_testdir # success, all done diff --git a/tests/qemu-iotests/114.out b/tests/qemu-iotests/114.out index 0a37d20c82a9..172454401257 100644 --- a/tests/qemu-iotests/114.out +++ b/tests/qemu-iotests/114.out @@ -1,12 +1,9 @@ QA output created by 114 -qemu-img: warning: Deprecated use of backing file without explicit backing format (detected format of raw) -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=TEST_DIR/t.IMGFMT.orig +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=TEST_DIR/t.IMGFMT.orig backing_fmt=raw Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=67108864 -qemu-img: warning: Deprecated use of backing file without explicit backing format -qemu-img: warning: Deprecated use of backing file without explicit backing format (detected format of IMGFMT) +qemu-img: Use of backing file requires explicit backing format +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=TEST_DIR/t.IMGFMT.base backing_fmt=IMGFMT Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=TEST_DIR/t.IMGFMT.base backing_fmt=IMGFMT -qemu-img: warning: Deprecated use of unopened backing file without explicit backing format, use of this image requires potentially unsafe format probing -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=TEST_DIR/t.IMGFMT.base image: TEST_DIR/t.IMGFMT file format: IMGFMT virtual size: 64 MiB (67108864 bytes) @@ -17,7 +14,7 @@ qemu-io: can't open device TEST_DIR/t.qcow2: Could not open backing file: Unknow no file open, try 'help open' read 4096/4096 bytes at offset 0 4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -qemu-img: warning: Deprecated use of backing file without explicit backing format, use of this image requires potentially unsafe format probing +qemu-img: Could not change the backing file to '/home/eblake/qemu/build/tests/qemu-iotests/scratch/t.qcow2.base': Invalid argument read 4096/4096 bytes at offset 0 4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) *** done diff --git a/tests/qemu-iotests/301 b/tests/qemu-iotests/301 index 9f943cadbe24..220de1043fa5 100755 --- a/tests/qemu-iotests/301 +++ b/tests/qemu-iotests/301 @@ -3,7 +3,7 @@ # # Test qcow backing file warnings # -# Copyright (C) 2020 Red Hat, Inc. +# Copyright (C) 2020-2021 Red Hat, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -46,7 +46,6 @@ echo "== qcow backed by qcow ==" TEST_IMG="$TEST_IMG.base" _make_test_img $size _make_test_img -b "$TEST_IMG.base" $size -_img_info _make_test_img -b "$TEST_IMG.base" -F $IMGFMT $size _img_info @@ -71,7 +70,6 @@ echo "== qcow backed by raw ==" rm "$TEST_IMG.base" truncate --size=$size "$TEST_IMG.base" _make_test_img -b "$TEST_IMG.base" $size -_img_info _make_test_img -b "$TEST_IMG.base" -F raw $size _img_info diff --git a/tests/qemu-iotests/301.out b/tests/qemu-iotests/301.out index 9004dad6392f..e280658191e1 100644 --- a/tests/qemu-iotests/301.out +++ b/tests/qemu-iotests/301.out @@ -2,13 +2,7 @@ QA output created by 301 == qcow backed by qcow == Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=33554432 -qemu-img: warning: Deprecated use of backing file without explicit backing format (detected format of IMGFMT) -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=33554432 backing_file=TEST_DIR/t.IMGFMT.base backing_fmt=IMGFMT -image: TEST_DIR/t.IMGFMT -file format: IMGFMT -virtual size: 32 MiB (33554432 bytes) -cluster_size: 512 -backing file: TEST_DIR/t.IMGFMT.base +qemu-img: TEST_DIR/t.IMGFMT: Backing file specified without backing format Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=33554432 backing_file=TEST_DIR/t.IMGFMT.base backing_fmt=IMGFMT image: TEST_DIR/t.IMGFMT file format: IMGFMT @@ -36,13 +30,7 @@ cluster_size: 512 backing file: TEST_DIR/t.IMGFMT.base == qcow backed by raw == -qemu-img: warning: Deprecated use of backing file without explicit backing format (detected format of raw) -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=33554432 backing_file=TEST_DIR/t.IMGFMT.base -image: TEST_DIR/t.IMGFMT -file format: IMGFMT -virtual size: 32 MiB (33554432 bytes) -cluster_size: 512 -backing file: TEST_DIR/t.IMGFMT.base +qemu-img: TEST_DIR/t.IMGFMT: Backing file specified without backing format Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=33554432 backing_file=TEST_DIR/t.IMGFMT.base backing_fmt=raw image: TEST_DIR/t.IMGFMT file format: IMGFMT -- 2.31.1

2 4

Re: [PATCH 0/2] Remove deprecated qemu-img backing file without format
by Eric Blake 08 Jul '21

08 Jul '21

On Mon, May 03, 2021 at 04:35:58PM -0500, Eric Blake wrote: > We've gone enough release cycles without noticeable pushback on our > intentions, so time to make it harder to create images that can form a > security hole due to a need for format probing rather than an explicit > format. > > Eric Blake (2): > qcow2: Prohibit backing file changes in 'qemu-img amend' > qemu-img: Require -F with -b backing image Ping. -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org

2 1

Re: [PATCH 4/4] x86/tsx: Add cmdline tsx=fake to not clear CPUID bits RTM and HLE
by Eduardo Habkost 08 Jul '21

08 Jul '21

CCing libvir-list, Jiri Denemark, Michal Privoznik, so they are aware that the definition of "supported CPU features" will probably become a bit more complex in the future. On Tue, Jul 6, 2021 at 5:58 PM Paolo Bonzini <pbonzini(a)redhat.com> wrote: > > On 06/07/21 23:33, Eduardo Habkost wrote: > > On Tue, Jul 6, 2021 at 5:05 PM Paolo Bonzini <pbonzini(a)redhat.com> wrote: > >> It's a bit tricky, because HLE and RTM won't really behave well. An old > >> guest that sees RTM=1 might end up retrying and aborting transactions > >> too much. So I'm not sure that a QEMU "-cpu host" guest should have HLE > >> and RTM enabled. > > > > Is the purpose of GET_SUPPORTED_CPUID to return what is supported by > > KVM, or to return what "-cpu host" should enable by default? They are > > conflicting requirements in this case. > > In theory there is GET_EMULATED_CPUID for the former, so it should be > the latter. In practice neither QEMU nor Libvirt use it; maybe now we > have a good reason to add it, but note that userspace could also check > host RTM_ALWAYS_ABORT. > > > Returning HLE=1,RTM=1 in GET_SUPPORTED_CPUID makes existing userspace > > take bad decisions until it's updated. > > > > Returning HLE=0,RTM=0 in GET_SUPPORTED_CPUID prevents existing > > userspace from resuming existing VMs (despite being technically > > possible). > > > > The first option has an easy workaround that doesn't require a > > software update (disabling HLE/RTM in the VM configuration). The > > second option doesn't have a workaround. I'm inclined towards the > > first option. > > The default has already been tsx=off for a while though, so checking > either GET_EMULATED_CPUID or host RTM_ALWAYS_ABORT in userspace might > also be feasible for those that are still on tsx=on. This sounds like a perfect use case for GET_EMULATED_CPUID. My only concern is breaking existing userspace. But if this was already broken for a few kernel releases due to tsx=off being the default, maybe GET_EMULATED_CPUID will be a reasonable approach. -- Eduardo

3 5

[PATCH] virresctrl: Fix updating the mask for a cache resource
by Vinayak Kale 07 Jul '21

07 Jul '21

In 'virResctrlAllocUpdateMask', mask is updated only if 'previous mask' is NULL. By default, the bitmask for a cache resource for a VM is initialized with 'default-resctrl-group' bitmask. So the 'previous mask' would not be NULL and mask won't get updated if cachetune is configured for a VM. This causes libvirt to use same bitmask as 'default-resctrl-group' bitmask for a cache resource for a VM. This patch fixes the issue. Fixes: d8a354954aba9cd45ab0317915a0a2be27c04767 Signed-off-by: Vinayak Kale <vkale(a)nvidia.com> --- src/util/virresctrl.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c index 35e92022db..a7d36f492c 100644 --- a/src/util/virresctrl.c +++ b/src/util/virresctrl.c @@ -1104,8 +1104,10 @@ virResctrlAllocUpdateMask(virResctrlAlloc *alloc, VIR_EXPAND_N(a_type->masks, a_type->nmasks, cache - a_type->nmasks + 1); - if (!a_type->masks[cache]) - a_type->masks[cache] = virBitmapNewCopy(mask); + if (a_type->masks[cache]) + virBitmapFree(a_type->masks[cache]); + + a_type->masks[cache] = virBitmapNewCopy(mask); return 0; } -- 2.17.1

3 3

vfio-user in libvirt
by John Levon 07 Jul '21

07 Jul '21

Hi, has anyone considered support for vfio-user devices in libvirt? I was thinking of something like: <controller type='vfio-user' index='0'> <socket type="path">/path/to/vfio-user.sock</socket> <address type='pci' domain='0x0000' bus='0x00' slot='0x0a' function='0x0'/> </controller> The main reason why this is useful is to get a PCI slot assigned for PCI-based vfio-user. Thoughts? thanks john

1 0

[PATCH 0/6] libxl: Misc cleanups and improvements
by Jim Fehlig 07 Jul '21

07 Jul '21

My main objective with this series was to decompose libxlDomainStart a bit, as it had become quite unwieldy. Along the way I made a few other small improvements to the code. Jim Fehlig (6): libxl: Drop unused 'cfg' parameter from libxlDomainSaveImageOpen libxl: Move managed save logic to libxlDomainStartNew libxl: Add a helper function to unprepare network devices libxl: Introduce libxlDomainStartPrepare libxl: Introduce libxlDomainStartPerform libxl: Add helper function for running the hook script src/libxl/libxl_domain.c | 384 ++++++++++++++++++------------------ src/libxl/libxl_domain.h | 11 +- src/libxl/libxl_driver.c | 30 +-- src/libxl/libxl_migration.c | 15 +- 4 files changed, 218 insertions(+), 222 deletions(-) -- 2.31.1

2 8

[PATCH 0/2] qemu: fix migration with non-shared storage (incremental)
by Peter Krempa 07 Jul '21

07 Jul '21

See patch 1/2. Peter Krempa (2): qemu: migration: Use correct flag constant for enabling storage migration NEWS: Mention implications of the bug in migration code NEWS.rst | 7 +++++++ src/qemu/qemu_migration.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) -- 2.31.1

2 4

[PATCH] qemu: Don't use memory-backend-memfd for NVDIMMs
by Michal Privoznik 07 Jul '21

07 Jul '21

If guest is configured to use memfd then the function that build memory-backend-* part of command line will put memory-backend-memfd, always. Even for NVDIMMs. This is not correct, because NVDIMMs need a backing path (usually to a real host NVDIMM device). Therefore, regardless of memfd being requested, we have to stick with memory-backend-file. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_command.c | 3 ++- .../memfd-memory-numa.x86_64-latest.args | 6 ++++-- tests/qemuxml2argvdata/memfd-memory-numa.xml | 11 +++++++++++ tests/qemuxml2xmltest.c | 3 ++- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ea513693f7..0473e7deaa 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3052,7 +3052,8 @@ qemuBuildMemoryBackendProps(virJSONValue **backendProps, props = virJSONValueNewObject(); - if (def->mem.source == VIR_DOMAIN_MEMORY_SOURCE_MEMFD) { + if (!mem->nvdimmPath && + def->mem.source == VIR_DOMAIN_MEMORY_SOURCE_MEMFD) { backendType = "memory-backend-memfd"; if (useHugepage) { diff --git a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args b/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args index 5e54908666..3b33db3c55 100644 --- a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args @@ -10,13 +10,15 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-instance-00000092/.config \ -name guest=instance-00000092,debug-threads=on \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-instance-00000092/master-key.aes"}' \ --machine pc-i440fx-2.3,accel=kvm,usb=off,dump-guest-core=off \ +-machine pc-i440fx-2.3,accel=kvm,usb=off,dump-guest-core=off,nvdimm=on \ -cpu qemu64 \ --m 14336 \ +-m size=14680064k,slots=16,maxmem=1099511627776k \ -overcommit mem-lock=off \ -smp 8,sockets=1,dies=1,cores=8,threads=1 \ -object '{"qom-type":"memory-backend-memfd","id":"ram-node0","hugetlb":true,"hugetlbsize":2097152,"share":true,"prealloc":true,"size":15032385536,"host-nodes":[3],"policy":"preferred"}' \ -numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \ +-object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/tmp/nvdimm","share":true,"prealloc":true,"size":536870912,"host-nodes":[3],"policy":"preferred"}' \ +-device nvdimm,node=0,memdev=memnvdimm0,id=nvdimm0,slot=0 \ -uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/memfd-memory-numa.xml b/tests/qemuxml2argvdata/memfd-memory-numa.xml index 3f448790a6..d9e1a9f564 100644 --- a/tests/qemuxml2argvdata/memfd-memory-numa.xml +++ b/tests/qemuxml2argvdata/memfd-memory-numa.xml @@ -1,6 +1,7 @@ <domain type='kvm'> <name>instance-00000092</name> <uuid>126f2720-6f8e-45ab-a886-ec9277079a67</uuid> + <maxMemory slots='16' unit='KiB'>1099511627776</maxMemory> <memory unit='KiB'>14680064</memory> <currentMemory unit='KiB'>14680064</currentMemory> <memoryBacking> @@ -41,5 +42,15 @@ <memballoon model='virtio'> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </memballoon> + <memory model='nvdimm'> + <source> + <path>/tmp/nvdimm</path> + </source> + <target> + <size unit='KiB'>523264</size> + <node>0</node> + </target> + <address type='dimm' slot='0'/> + </memory> </devices> </domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 40e027aaa4..c5005d41a0 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1305,7 +1305,8 @@ mymain(void) DO_TEST("memfd-memory-numa", QEMU_CAPS_OBJECT_MEMORY_MEMFD, QEMU_CAPS_OBJECT_MEMORY_MEMFD_HUGETLB, - QEMU_CAPS_OBJECT_MEMORY_FILE); + QEMU_CAPS_OBJECT_MEMORY_FILE, + QEMU_CAPS_DEVICE_NVDIMM); DO_TEST("memfd-memory-default-hugepage", QEMU_CAPS_OBJECT_MEMORY_MEMFD, QEMU_CAPS_OBJECT_MEMORY_MEMFD_HUGETLB, -- 2.31.1

2 1

[PATCH] virtlockd: Don't report error if lockspace exists
by Jim Fehlig 07 Jul '21

07 Jul '21

When the qemu or libxl driver is configured to use lockd and file_lockspace_dir is set, virtlockd emits an error when libvirtd is retarted May 25 15:44:31 virt81 virtlockd[7723]: Requested operation is not valid: Lockspace for path /data/libvirtd/lockspace already exists There is really no need to fail when the lockspace already exists, paricularly since the user is expected to create the lockspace specified in file_lockspace_dir. Failure to do so will prevent starting any domains virsh start test error: Failed to start domain 'test' error: Unable to open/create resource /data/libvirtd/lockspace/de22c4bf931e7c48b49e8ca64b477d44e78a51543e534df488b05ccd08ec5caa: No such file or directory Also, virLockManagerLockDaemonSetupLockspace already has logic to ignore the error. Since callers are not interested in the error, change virtlockd to not report or return an error when the specified lockspace already exists. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- In response to my earlier query about this problem https://listman.redhat.com/archives/libvir-list/2021-May/msg00872.html src/locking/lock_daemon_dispatch.c | 5 ++--- src/locking/lock_driver_lockd.c | 11 ++--------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/locking/lock_daemon_dispatch.c b/src/locking/lock_daemon_dispatch.c index e8b9832453..13e688f2e2 100644 --- a/src/locking/lock_daemon_dispatch.c +++ b/src/locking/lock_daemon_dispatch.c @@ -405,9 +405,8 @@ virLockSpaceProtocolDispatchCreateLockSpace(virNetServer *server G_GNUC_UNUSED, } if (virLockDaemonFindLockSpace(lockDaemon, args->path) != NULL) { - virReportError(VIR_ERR_OPERATION_INVALID, - _("Lockspace for path %s already exists"), - args->path); + VIR_DEBUG("Lockspace for path %s already exists", args->path); + rv = 0; goto cleanup; } diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lockd.c index 3a7386af30..87afdbfb78 100644 --- a/src/locking/lock_driver_lockd.c +++ b/src/locking/lock_driver_lockd.c @@ -281,15 +281,8 @@ static int virLockManagerLockDaemonSetupLockspace(const char *path) VIR_LOCK_SPACE_PROTOCOL_PROC_CREATE_LOCKSPACE, 0, NULL, NULL, NULL, (xdrproc_t)xdr_virLockSpaceProtocolCreateLockSpaceArgs, (char*)&args, - (xdrproc_t)xdr_void, NULL) < 0) { - if (virGetLastErrorCode() == VIR_ERR_OPERATION_INVALID) { - /* The lockspace already exists */ - virResetLastError(); - rv = 0; - } else { - goto cleanup; - } - } + (xdrproc_t)xdr_void, NULL) < 0) + goto cleanup; rv = 0; -- 2.31.1

2 1

[libvirt PATCH] meson: check for `XDR` and `driver_remote` early
by Pavel Hrdina 07 Jul '21

07 Jul '21

We have several other options that depend on result of `driver_remote` option check so we need to do it early to have the result available. Fixes: https://gitlab.com/libvirt/libvirt/-/issues/185 Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- meson.build | 65 ++++++++++++++++++++++++++++------------------------- 1 file changed, 34 insertions(+), 31 deletions(-) diff --git a/meson.build b/meson.build index c95c7f7444..ca4291e37a 100644 --- a/meson.build +++ b/meson.build @@ -848,6 +848,37 @@ foreach name : optional_programs endforeach +# early checks where lot of other packages depend on the result + +# On MinGW portablexdr provides XDR functions, on linux they are +# provided by libtirpc and on FreeBSD/macOS there is no need to +# use extra library as it's provided by libc directly. +if host_machine.system() == 'windows' + xdr_dep = cc.find_library('portablexdr', required: false) +elif host_machine.system() == 'linux' + xdr_dep = dependency('libtirpc', required: false) +elif host_machine.system() in [ 'freebsd', 'darwin' ] + xdr_dep = cc.find_library('c', required: false) +else + xdr_dep = dependency('', required: false) +endif + +if not get_option('driver_remote').disabled() + use_remote = true + + if not xdr_dep.found() + use_remote = false + if get_option('driver_remote').enabled() + error('XDR is required for remote driver') + endif + endif + + if use_remote + conf.set('WITH_REMOTE', 1) + endif +endif + + # generic build dependencies # FIXME rewrite to use dependency() @@ -1005,7 +1036,7 @@ else endif libssh_version = '0.7' -if not get_option('driver_remote').disabled() +if conf.has('WITH_REMOTE') libssh_dep = dependency('libssh', version: '>=' + libssh_version, required: get_option('libssh')) if libssh_dep.found() conf.set('WITH_LIBSSH', 1) @@ -1028,7 +1059,7 @@ else endif libssh2_version = '1.3' -if not get_option('driver_remote').disabled() +if conf.has('WITH_REMOTE') libssh2_dep = dependency('libssh2', version: '>=' + libssh2_version, required: get_option('libssh2')) if libssh2_dep.found() conf.set('WITH_SSH2', 1) @@ -1172,7 +1203,7 @@ if not get_option('sanlock').disabled() endif sasl_version = '2.1.26' -if get_option('driver_remote').enabled() +if conf.has('WITH_REMOTE') sasl_dep = dependency('libsasl2', version: '>=' + sasl_version, required: get_option('sasl')) if sasl_dep.found() conf.set('WITH_SASL', 1) @@ -1280,19 +1311,6 @@ if wireshark_dep.found() endif endif -# On MinGW portablexdr provides XDR functions, on linux they are -# provided by libtirpc and on FreeBSD/macOS there is no need to -# use extra library as it's provided by libc directly. -if host_machine.system() == 'windows' - xdr_dep = cc.find_library('portablexdr', required: false) -elif host_machine.system() == 'linux' - xdr_dep = dependency('libtirpc', required: false) -elif host_machine.system() in [ 'freebsd', 'darwin' ] - xdr_dep = cc.find_library('c', required: false) -else - xdr_dep = dependency('', required: false) -endif - yajl_version = '2.0.3' yajl_dep = dependency('yajl', version: '>=' + yajl_version, required: get_option('yajl')) if yajl_dep.found() @@ -1406,21 +1424,6 @@ endif # build driver options -if not get_option('driver_remote').disabled() - use_remote = true - - if not xdr_dep.found() - use_remote = false - if get_option('driver_remote').enabled() - error('XDR is required for remote driver') - endif - endif - - if use_remote - conf.set('WITH_REMOTE', 1) - endif -endif - remote_default_mode = get_option('remote_default_mode') if remote_default_mode == 'direct' conf.set('REMOTE_DRIVER_AUTOSTART_DIRECT', '1') -- 2.31.1

2 1

[PATCH] virDomainMachineNameAppendValid: Handle special characters better
by Michal Privoznik 07 Jul '21

07 Jul '21

When constructing guest name for machined we have to be very cautious as machined expects a name that's basically a valid URI. Therefore, if there's a dot it has to be followed by a letter or a number. And if there's a sequence of two or more dashes they should be joined into a single dash. These rules are implemented in virDomainMachineNameAppendValid(). There's the @skip variable which is supposed to track whether it is safe to append a dot or a dash into name. However, the variable is set to false (meaning it is safe to append a dot or a dash) even if the current character we are processing is not in the set of allowed characters (and thus skipped over). Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1948433 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/hypervisor/domain_driver.c | 8 ++++---- tests/virsystemdtest.c | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/hypervisor/domain_driver.c b/src/hypervisor/domain_driver.c index f7d49bc38a..29e11c0447 100644 --- a/src/hypervisor/domain_driver.c +++ b/src/hypervisor/domain_driver.c @@ -63,18 +63,18 @@ virDomainMachineNameAppendValid(virBuffer *buf, break; if (*name == '.' || *name == '-') { - if (!skip) + if (!skip) { virBufferAddChar(buf, *name); - skip = true; + skip = true; + } continue; } - skip = false; - if (!strchr(HOSTNAME_CHARS, *name)) continue; virBufferAddChar(buf, *name); + skip = false; } /* trailing dashes or dots are not allowed */ diff --git a/tests/virsystemdtest.c b/tests/virsystemdtest.c index f1c9a4ee5f..a09b428a8a 100644 --- a/tests/virsystemdtest.c +++ b/tests/virsystemdtest.c @@ -736,6 +736,9 @@ mymain(void) TEST_MACHINE("demo.-.test.", NULL, 11, "qemu-11-demo.test"); TEST_MACHINE("demo", "/tmp/root1", 1, "qemu-embed-0991f456-1-demo"); TEST_MACHINE("demo", "/tmp/root2", 1, "qemu-embed-95d47ff5-1-demo"); + TEST_MACHINE("|.-m", NULL, 1, "qemu-1-m"); + TEST_MACHINE("Auto-esx7.0-rhel7.9-special-characters~!@#$%^&*_=+,?><:;|.\"[]()`\\-m", + NULL, 1, "qemu-1-Auto-esx7.0-rhel7.9-special-characters.m"); # define TESTS_PM_SUPPORT_HELPER(name, function) \ do { \ -- 2.31.1

2 1

[PATCH v3 0/6] Support for launchSecurity type s390-pv
by Boris Fiuczynski 07 Jul '21

07 Jul '21

This patch series introduces the launch security type s390-pv. Specifying s390-pv as launch security type in an s390 domain prepares for running the guest in protected virtualization secure mode, also known as IBM Secure Execution. diff to v2: - Broke up previous patch one into three patches diff to v1: - Rebased to current master - Added verification check for confidential-guest-support capability Boris Fiuczynski (6): schemas: Make SEV policy on launch security optional conf: modernize SEV XML parse and format methods conf: refactor launch security to allow more types qemu: add s390-pv-guest capability conf: add s390-pv as launch security type docs: add s390-pv documentation docs/formatdomain.rst | 7 + docs/kbase/s390_protected_virt.rst | 55 ++++++- docs/schemas/domaincommon.rng | 13 +- src/conf/domain_conf.c | 155 +++++++++++------- src/conf/domain_conf.h | 14 +- src/conf/virconftypes.h | 2 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_cgroup.c | 4 +- src/qemu/qemu_command.c | 70 +++++++- src/qemu/qemu_driver.c | 3 +- src/qemu/qemu_firmware.c | 34 ++-- src/qemu/qemu_namespace.c | 21 ++- src/qemu/qemu_process.c | 34 +++- src/qemu/qemu_validate.c | 31 +++- src/security/security_dac.c | 6 +- .../launch-security-s390-pv-ignore-policy.xml | 24 +++ .../launch-security-s390-pv.xml | 18 ++ .../launch-security-s390-pv-ignore-policy.xml | 1 + tests/genericxml2xmltest.c | 2 + .../qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 + ...ty-s390-pv-ignore-policy.s390x-latest.args | 35 ++++ .../launch-security-s390-pv-ignore-policy.xml | 33 ++++ .../launch-security-s390-pv.s390x-latest.args | 35 ++++ .../launch-security-s390-pv.xml | 30 ++++ ...urity-sev-missing-policy.x86_64-2.12.0.err | 1 + .../launch-security-sev-missing-policy.xml | 34 ++++ tests/qemuxml2argvtest.c | 4 + 28 files changed, 562 insertions(+), 108 deletions(-) create mode 100644 tests/genericxml2xmlindata/launch-security-s390-pv-ignore-policy.xml create mode 100644 tests/genericxml2xmlindata/launch-security-s390-pv.xml create mode 120000 tests/genericxml2xmloutdata/launch-security-s390-pv-ignore-policy.xml create mode 100644 tests/qemuxml2argvdata/launch-security-s390-pv-ignore-policy.s390x-latest.args create mode 100644 tests/qemuxml2argvdata/launch-security-s390-pv-ignore-policy.xml create mode 100644 tests/qemuxml2argvdata/launch-security-s390-pv.s390x-latest.args create mode 100644 tests/qemuxml2argvdata/launch-security-s390-pv.xml create mode 100644 tests/qemuxml2argvdata/launch-security-sev-missing-policy.x86_64-2.12.0.err create mode 100644 tests/qemuxml2argvdata/launch-security-sev-missing-policy.xml -- 2.30.2

4 23

[PATCH 0/5] Implement some IOThread related APIs for test driver
by Luke Yue 06 Jul '21

06 Jul '21

- Implement virDomainAddIOThread - Implement virDomainDelIOThread - Implement virDomainGetIOThreadInfo - Add tests for these APIs Luke Yue (5): conf: domain: Introduce and use virDomainAddIOThreadCheck() test_driver: Implement virDomainAddIOThread and virDomainDelIOThread conf: domain: Introduce and use virDomainGetIOThreadsConfig() test_driver: Implement virDomainGetIOThreadInfo tests: Test IOThread related functions for test driver examples/xml/test/testdomfc4.xml | 4 + src/conf/domain_conf.c | 126 +++++++++++++++++++++ src/conf/domain_conf.h | 12 ++ src/libvirt_private.syms | 3 + src/qemu/qemu_driver.c | 113 +------------------ src/test/test_driver.c | 186 +++++++++++++++++++++++++++++++ tests/virshtest.c | 40 +++++++ 7 files changed, 376 insertions(+), 108 deletions(-) -- 2.32.0

1 5

[libvirt PATCH 00/10] virHashNew refactorings
by Tim Wiederhake 05 Jul '21

05 Jul '21

"virHashNew" cannot return NULL, yet we check for NULL in various places. This series is the first of several that remove these checks. Where applicable, the functions are refactored to use automatic memory management by means of g_autoptr etc. as well. Tim Wiederhake (10): qemuMonitorGetAllBlockStatsInfo: Clean up line break qemuMonitorGetAllBlockStatsInfo: Remove superfluous variable initialization qemuMonitorGetAllBlockStatsInfo: Assign hash table only on success qemuMonitorGetAllBlockStatsInfo: Use automatic memory management qemuMonitorGetBlockInfo: Remove superfluous variable "ret" qemuMonitorGetBlockInfo: Use automatic memory management qemuMonitorGetBlockInfo: `virHashNew` cannot return NULL qemuMonitorGetChardevInfo: Remove superfluous variable "ret" qemuMonitorGetChardevInfo: Use automatic memory management qemuMonitorGetChardevInfo: `virHashNew` cannot return NULL src/qemu/qemu_monitor.c | 54 ++++++++++++----------------------------- 1 file changed, 16 insertions(+), 38 deletions(-) -- 2.31.1

2 12

crash in virQEMUCapsProbeQMPTPM
by Olaf Hering 05 Jul '21

05 Jul '21

I got a couple of "g_strv_contains: assertion 'strv != NULL' failed" in the past days. It seems qemuMonitorGetTPMModels can write NULL into "models" in "virQEMUCapsProbeQMPTPM()". As a result g_strv_contains will crash with G_DEBUG=fatal-warnings This is libvirt.git#15073504db and qemu.git#13d5f87cc3 Olaf

2 1

[PATCHv2 0/4] Add qemu support setting qos via ovs on ovs interface
by zhangjl02 02 Jul '21

02 Jul '21

--- diff to v1: - move qemuDomainDefIsOvsport from src/qemu/qemu_domain.c to src/conf/domain_conf.c - call virCommandFree(cmd)free cmd before reusing it. - add g_autofree to variables. - reduce usage of virReportError(), and coupled it with return -1. - fix remove port qos error. - optimise code structure. Thanks to Michal Privoznik for helping reviewing these patches. Now libvirt use tc rules to manage interface's qos. But when an interface is created by ovs, there is no qos setting result in ovs database. Therefore, qos of ovs port should be set via ovs management command. We add a function to tell whether a port definition is an ovs managed virtual port. Change default qdisc rules, which return 0 directly if the port is ovs managed(When the ovs port is set noqueue, qos config on this port will not work). Add ovs management function of setting and cleaning qos. Then check if the port is an ovs managed port during its life cycle, and call the ovs management function to set or clean qos settings. zhangjl02 (4): virDomain: interface: add virDomainNetDefIsOvsport virDomain: interface: add virNetDevOpenvswitchInterfaceSetQos and virNetDevOpenvswitchInterfaceClearQos qemu: interface: remove setting noqueue for ovs port qemu: interface: check and use ovs command to set qos of ovs managed port src/conf/domain_conf.c | 8 + src/conf/domain_conf.h | 2 + src/libvirt_private.syms | 3 + src/qemu/qemu_command.c | 10 +- src/qemu/qemu_domain.c | 3 +- src/qemu/qemu_driver.c | 22 ++- src/qemu/qemu_hotplug.c | 39 +++-- src/qemu/qemu_process.c | 10 +- src/util/virnetdevopenvswitch.c | 271 ++++++++++++++++++++++++++++++++ src/util/virnetdevopenvswitch.h | 11 ++ 10 files changed, 362 insertions(+), 17 deletions(-) -- 2.30.2.windows.1

2 9

[libvirt PATCH 0/2] docs: fix imports of new go modules
by Daniel P. Berrangé 02 Jul '21

02 Jul '21

Daniel P. Berrangé (2): docs: point go imports to gitlab.com repos docs: add go-import meta tags for new go modules docs/page.xsl | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) -- 2.31.1

3 5

[libvirt PATCH] docs: Add go-import directive for module-aware packages
by Andrea Bolognani 02 Jul '21

02 Jul '21

This is how Go figures out the location of the git repository containing the actual code for the package. Addresses the following error message: go: libvirt.org/go/libvirt@v1.7005.0: unrecognized import path "libvirt.org/go/libvirt": parse https://libvirt.org/go/libvirt?go-get=1: no go-import meta tags () Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- docs/page.xsl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/page.xsl b/docs/page.xsl index 5cb4322fdc..1786feb51f 100644 --- a/docs/page.xsl +++ b/docs/page.xsl @@ -105,6 +105,12 @@ <xsl:if test="$pagesrc = 'docs/libvirt-go-xml.rst'"> <meta name="go-import" content="libvirt.org/libvirt-go-xml git https://libvirt.org/git/libvirt-go-xml.git"/> </xsl:if> + <xsl:if test="$pagesrc = 'docs/go/libvirt.rst'"> + <meta name="go-import" content="libvirt.org/go/libvirt git https://libvirt.org/git/libvirt-go-module.git"/> + </xsl:if> + <xsl:if test="$pagesrc = 'docs/go/libvirtxml.rst'"> + <meta name="go-import" content="libvirt.org/go/libvirtxml git https://libvirt.org/git/libvirt-go-xml-module.git"/> + </xsl:if> <xsl:apply-templates select="/html:html/html:head/html:script" mode="content"/> <script type="text/javascript" src="{$href_base}js/main.js"> -- 2.31.1

2 2

[PATCH] domstats:add haltpolling time statistic interface
by Yang Fei 02 Jul '21

02 Jul '21

This patch add the ability to statistic the halt polling time when VM execute HLT(arm is WFI). In actual services, the execution of the HLT instruction by the guest is an important cause of virtualization overhead. The halt polling feature is introduced to solve this problem. When a guest idle VM exit occurs, the host continues polling for a period of time to reduce the guest service delay. This mechanism may cause the CPU usage to be 100% when the physical CPU is idle. If the guest service model is woken up at an interval to process a small amount of traffic, and the interval is shorter than kvm halt_poll_ns. The host polls the block time of the entire VM and the CPU usage increases to 100%. The kernel provides the capability of collecting statistics on the halt polling time after v5.8, Introduced by commit <cb953129bfe5c0f2da835a0469930873fb7e71df>. It is rendered in debugfs. Therefore, we can use this kernel feature to provide the halt poll time to the user to obtain a more accurate CPU usage as required. Signed-off-by: Yang Fei <yangfei85(a)huawei.com> --- src/libvirt_private.syms | 2 + src/qemu/qemu_driver.c | 29 +++++++++++++ src/util/virutil.c | 89 ++++++++++++++++++++++++++++++++++++++++ src/util/virutil.h | 9 ++++ 4 files changed, 129 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 68e4b6aab8..f92213b8c2 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -3479,6 +3479,8 @@ virDoesUserExist; virDoubleToStr; virFormatIntDecimal; virFormatIntPretty; +virGetCpuHaltPollTime; +virGetDebugFsKvmValue; virGetDeviceID; virGetDeviceUnprivSGIO; virGetGroupID; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 235f575901..3a2b530ecf 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -17812,6 +17812,32 @@ qemuDomainGetStatsCpuCache(virQEMUDriver *driver, return ret; } +#ifdef __linux__ +static int +qemuDomainGetStatsCpuHaltPollTime(virDomainObj *dom, + virTypedParamList *params) +{ + unsigned long long haltPollSuccess = 0; + unsigned long long haltPollFail = 0; + pid_t pid = dom->pid; + + if (virGetCpuHaltPollTime(pid, &haltPollSuccess, &haltPollFail) != 0) + return -1; + if (virTypedParamListAddULLong(params, haltPollSuccess, "haltpollsuccess.time") < 0) + return -1; + if (virTypedParamListAddULLong(params, haltPollFail, "haltpollfail.time") < 0) + return -1; + + return 0; +} +#else +static int +qemuDomainGetStatsCpuHaltPollTime(virDomainObj *dom, + virTypedParamList *params) +{ + return -1; +} +#endif static int qemuDomainGetStatsCpuCgroup(virDomainObj *dom, @@ -17852,6 +17878,9 @@ qemuDomainGetStatsCpu(virQEMUDriver *driver, if (qemuDomainGetStatsCpuCache(driver, dom, params) < 0) return -1; + if (qemuDomainGetStatsCpuHaltPollTime(dom, params) < 0) + return -1; + return 0; } diff --git a/src/util/virutil.c b/src/util/virutil.c index 311cbbf93a..8715deaca5 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -1936,3 +1936,92 @@ virPipeNonBlock(int fds[2]) { return virPipeImpl(fds, true, true); } + +int +virGetDebugFsKvmValue(struct dirent *ent, + const char *path, + const char *filename, + unsigned long long *value) +{ + g_autofree char *valToStr = NULL; + g_autofree char *valPath = NULL; + int rc = -1; + int ret = -1; + + valPath = g_strdup_printf("%s/%s/%s", path, ent->d_name, filename); + + if ((rc = virFileReadAll(valPath, 16, &valToStr)) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unable to read from '%s'"), valPath); + goto cleanup; + } + + /* Terminated with '\n' has sometimes harmful effects to the caller */ + if (rc > 0 && (valToStr)[rc - 1] == '\n') + (valToStr)[rc - 1] = '\0'; + + /* 10 is a Cardinality, must be between 2 and 36 inclusive, + * or special value 0. Used in fuction strtoull() + */ + if (virStrToLong_ull(valToStr, NULL, 10, value) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unable to parse '%s' as an integer"), valToStr); + goto cleanup; + } + + ret = 0; +cleanup: + return ret; +} + +int +virGetCpuHaltPollTime(pid_t pid, + unsigned long long *haltPollSuccess, + unsigned long long *haltPollFail) +{ + g_autofree char *pidToStr = NULL; + g_autofree char *debugFsPath = NULL; + g_autofree char *completePath = NULL; + struct dirent *ent = NULL; + DIR *dir = NULL; + int ret = -1; + int flag = 0; + + if (!(debugFsPath = virFileFindMountPoint("debugfs"))) { + virReportSystemError(errno, "%s", + _("unable to find debugfs mountpoint")); + goto cleanup; + } + + completePath = g_strdup_printf("%s/%s", debugFsPath, "kvm"); + if (virDirOpen(&dir, completePath) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s %s", "Can not open directory", completePath); + return ret; + } + + pidToStr = g_strdup_printf("%d", pid); + while (virDirRead(dir, &ent, NULL) > 0) { + if (strncmp(ent->d_name, pidToStr, strlen(pidToStr)) == 0 && + ent->d_name[strlen(pidToStr)] == '-') { + flag = 1; + break; + } + } + + if (flag == 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Could not find VM(Pid %s) in '%s'"), pidToStr, completePath); + goto cleanup; + } + + if (virGetDebugFsKvmValue(ent, completePath, "halt_poll_success_ns", haltPollSuccess) < 0 || + virGetDebugFsKvmValue(ent, completePath, "halt_poll_fail_ns", haltPollFail) < 0) { + goto cleanup; + } + + ret = 0; +cleanup: + closedir(dir); + return ret; +} diff --git a/src/util/virutil.h b/src/util/virutil.h index 854b494890..b3c1e8a0bc 100644 --- a/src/util/virutil.h +++ b/src/util/virutil.h @@ -225,3 +225,12 @@ int virPipeQuiet(int fds[2]); * Returns: -1 on error, 0 on success */ int virPipeNonBlock(int fds[2]); + +int virGetDebugFsKvmValue(struct dirent *ent, + const char *path, + const char *filename, + unsigned long long *value); + +int virGetCpuHaltPollTime(pid_t pid, + unsigned long long *haltPollSuccess, + unsigned long long *haltPollFail); -- 2.23.0

2 2

[PATCH 0/3] Threshold event improvements
by Peter Krempa 02 Jul '21

02 Jul '21

Peter Krempa (3): storage_source: Add flag storing whether threshold event was registered with index qemu: Prevent two threshold events when it was registered with index virDomainSetBlockThreshold: Document that two events are fired when index isn't used src/conf/storage_source_conf.h | 5 +++++ src/libvirt-domain.c | 4 ++++ src/qemu/qemu_domain.c | 8 ++++++++ src/qemu/qemu_driver.c | 4 ++++ src/qemu/qemu_process.c | 3 ++- tests/qemustatusxml2xmldata/modern-in.xml | 1 + 6 files changed, 24 insertions(+), 1 deletion(-) -- 2.31.1

2 4

[PATCH libvirt v1] conf: verify for duplicate hostdevs
by Shalini Chellathurai Saroja 02 Jul '21

02 Jul '21

It is possible to define/edit(in shut off state) a domain XML with same hostdev device repeated more than once, as shown below. This behavior is not expected. So, this patch fixes it. vser1: <domain type='kvm'> [...] <devices> [...] <hostdev mode='subsystem' type='mdev' managed='no' model='vfio-ccw'> <source> <address uuid='8e782fea-e5f4-45fa-a0f9-024cf66e5009'/> </source> <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0005'/> </hostdev> <hostdev mode='subsystem' type='mdev' managed='no' model='vfio-ccw'> <source> <address uuid='8e782fea-e5f4-45fa-a0f9-024cf66e5009'/> </source> <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0006'/> </hostdev> [...] </devices> </domain> $ virsh define vser1 Domain 'vser1' defined from vser1 Signed-off-by: Shalini Chellathurai Saroja <shalini(a)linux.ibm.com> Reviewed-by: Bjoern Walk <bwalk(a)linux.ibm.com> Reviewed-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com> --- src/conf/domain_conf.c | 2 +- src/conf/domain_conf.h | 2 + src/conf/domain_validate.c | 21 ++++++++++ src/libvirt_private.syms | 1 + .../hostdev-mdev-duplicate.err | 1 + .../hostdev-mdev-duplicate.xml | 41 +++++++++++++++++++ .../hostdev-pci-duplicate.err | 1 + .../hostdev-pci-duplicate.xml | 40 ++++++++++++++++++ .../hostdev-scsi-duplicate.err | 1 + .../hostdev-scsi-duplicate.xml | 40 ++++++++++++++++++ .../hostdev-usb-duplicate.err | 1 + .../hostdev-usb-duplicate.xml | 40 ++++++++++++++++++ tests/qemuxml2argvtest.c | 8 ++++ 13 files changed, 198 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-duplicate.err create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-duplicate.xml create mode 100644 tests/qemuxml2argvdata/hostdev-pci-duplicate.err create mode 100644 tests/qemuxml2argvdata/hostdev-pci-duplicate.xml create mode 100644 tests/qemuxml2argvdata/hostdev-scsi-duplicate.err create mode 100644 tests/qemuxml2argvdata/hostdev-scsi-duplicate.xml create mode 100644 tests/qemuxml2argvdata/hostdev-usb-duplicate.err create mode 100644 tests/qemuxml2argvdata/hostdev-usb-duplicate.xml diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f65509d8..5746f69e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -15369,7 +15369,7 @@ virDomainHostdevMatchCaps(virDomainHostdevDef *a, } -static int +int virDomainHostdevMatch(virDomainHostdevDef *a, virDomainHostdevDef *b) { diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index f706c498..4d9d499b 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3590,6 +3590,8 @@ virDomainHostdevDef * virDomainHostdevRemove(virDomainDef *def, size_t i); int virDomainHostdevFind(virDomainDef *def, virDomainHostdevDef *match, virDomainHostdevDef **found); +int virDomainHostdevMatch(virDomainHostdevDef *a, + virDomainHostdevDef *b); virDomainGraphicsListenDef * virDomainGraphicsGetListen(virDomainGraphicsDef *def, size_t i); diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index 2124d25d..df2ab473 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -1068,7 +1068,25 @@ virDomainDefDuplicateDiskInfoValidate(const virDomainDef *def) return 0; } +static int +virDomainDefDuplicateHostdevInfoValidate(const virDomainDef *def) +{ + size_t i; + size_t j; + for (i = 0; i < def->nhostdevs; i++) { + for (j = i + 1; j < def->nhostdevs; j++) { + if (virDomainHostdevMatch(def->hostdevs[i], + def->hostdevs[j])) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("Hostdev already exists in the domain configuration")); + return -1; + } + } + } + + return 0; +} /** * virDomainDefDuplicateDriveAddressesValidate: @@ -1529,6 +1547,9 @@ virDomainDefValidateInternal(const virDomainDef *def, if (virDomainDefDuplicateDiskInfoValidate(def) < 0) return -1; + if (virDomainDefDuplicateHostdevInfoValidate(def) < 0) + return -1; + if (virDomainDefDuplicateDriveAddressesValidate(def) < 0) return -1; diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 2efa7876..f0d1b7b4 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -457,6 +457,7 @@ virDomainHostdevDefFree; virDomainHostdevDefNew; virDomainHostdevFind; virDomainHostdevInsert; +virDomainHostdevMatch; virDomainHostdevModeTypeToString; virDomainHostdevRemove; virDomainHostdevSubsysPCIBackendTypeToString; diff --git a/tests/qemuxml2argvdata/hostdev-mdev-duplicate.err b/tests/qemuxml2argvdata/hostdev-mdev-duplicate.err new file mode 100644 index 00000000..590afd30 --- /dev/null +++ b/tests/qemuxml2argvdata/hostdev-mdev-duplicate.err @@ -0,0 +1 @@ +XML error: Hostdev already exists in the domain configuration diff --git a/tests/qemuxml2argvdata/hostdev-mdev-duplicate.xml b/tests/qemuxml2argvdata/hostdev-mdev-duplicate.xml new file mode 100644 index 00000000..1c5e3263 --- /dev/null +++ b/tests/qemuxml2argvdata/hostdev-mdev-duplicate.xml @@ -0,0 +1,41 @@ +<domain type='qemu'> + <name>QEMUGuest2</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-i386</emulator> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <audio id='1' type='none'/> + <hostdev mode='subsystem' type='mdev' managed='no' model='vfio-pci'> + <source> + <address uuid='53764d0e-85a0-42b4-af5c-2046b460b1dc'/> + </source> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </hostdev> + <hostdev mode='subsystem' type='mdev' managed='no' model='vfio-pci'> + <source> + <address uuid='53764d0e-85a0-42b4-af5c-2046b460b1dc'/> + </source> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/> + </hostdev> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/hostdev-pci-duplicate.err b/tests/qemuxml2argvdata/hostdev-pci-duplicate.err new file mode 100644 index 00000000..590afd30 --- /dev/null +++ b/tests/qemuxml2argvdata/hostdev-pci-duplicate.err @@ -0,0 +1 @@ +XML error: Hostdev already exists in the domain configuration diff --git a/tests/qemuxml2argvdata/hostdev-pci-duplicate.xml b/tests/qemuxml2argvdata/hostdev-pci-duplicate.xml new file mode 100644 index 00000000..c744fddf --- /dev/null +++ b/tests/qemuxml2argvdata/hostdev-pci-duplicate.xml @@ -0,0 +1,40 @@ +<domain type='qemu'> + <name>QEMUGuest2</name> + <uuid>c7a5fdbd-edaf-9466-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</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-i386</emulator> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest2'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <hostdev mode='subsystem' type='pci' managed='yes'> + <source> + <address domain='0x0000' bus='0x06' slot='0x12' function='0x5'/> + </source> + </hostdev> + <hostdev mode='subsystem' type='pci' managed='yes'> + <source> + <address domain='0x0000' bus='0x06' slot='0x12' function='0x5'/> + </source> + </hostdev> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/hostdev-scsi-duplicate.err b/tests/qemuxml2argvdata/hostdev-scsi-duplicate.err new file mode 100644 index 00000000..590afd30 --- /dev/null +++ b/tests/qemuxml2argvdata/hostdev-scsi-duplicate.err @@ -0,0 +1 @@ +XML error: Hostdev already exists in the domain configuration diff --git a/tests/qemuxml2argvdata/hostdev-scsi-duplicate.xml b/tests/qemuxml2argvdata/hostdev-scsi-duplicate.xml new file mode 100644 index 00000000..ea367de3 --- /dev/null +++ b/tests/qemuxml2argvdata/hostdev-scsi-duplicate.xml @@ -0,0 +1,40 @@ +<domain type='qemu'> + <name>QEMUGuest2</name> + <uuid>c7a5fdbd-edaf-9466-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</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-i386</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest2'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='scsi' index='0' model='virtio-scsi'/> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <hostdev mode='subsystem' type='scsi' managed='yes'> + <source> + <adapter name='scsi_host0'/> + <address bus='0' target='0' unit='0'/> + </source> + </hostdev> + <hostdev mode='subsystem' type='scsi' managed='yes'> + <source> + <adapter name='scsi_host0'/> + <address bus='0' target='0' unit='0'/> + </source> + </hostdev> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/hostdev-usb-duplicate.err b/tests/qemuxml2argvdata/hostdev-usb-duplicate.err new file mode 100644 index 00000000..590afd30 --- /dev/null +++ b/tests/qemuxml2argvdata/hostdev-usb-duplicate.err @@ -0,0 +1 @@ +XML error: Hostdev already exists in the domain configuration diff --git a/tests/qemuxml2argvdata/hostdev-usb-duplicate.xml b/tests/qemuxml2argvdata/hostdev-usb-duplicate.xml new file mode 100644 index 00000000..533a9059 --- /dev/null +++ b/tests/qemuxml2argvdata/hostdev-usb-duplicate.xml @@ -0,0 +1,40 @@ +<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-i386</emulator> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <hostdev mode='subsystem' type='usb' managed='no'> + <source> + <address bus='14' device='6'/> + </source> + </hostdev> + <hostdev mode='subsystem' type='usb' managed='no'> + <source> + <address bus='14' device='6'/> + </source> + </hostdev> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 7fed871c..b9f96532 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1915,8 +1915,11 @@ mymain(void) DO_TEST("hostdev-usb-address", NONE); DO_TEST("hostdev-usb-address-device", NONE); DO_TEST("hostdev-usb-address-device-boot", NONE); + DO_TEST_PARSE_ERROR("hostdev-usb-duplicate", NONE); DO_TEST("hostdev-pci-address", QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST("hostdev-pci-address-device", QEMU_CAPS_DEVICE_VFIO_PCI); + DO_TEST_PARSE_ERROR("hostdev-pci-duplicate", + QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST("hostdev-vfio", QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST("hostdev-vfio-multidomain", @@ -1927,6 +1930,8 @@ mymain(void) QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST_PARSE_ERROR("hostdev-mdev-invalid-target-address", QEMU_CAPS_DEVICE_VFIO_PCI); + DO_TEST_PARSE_ERROR("hostdev-mdev-duplicate", + QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST_CAPS_LATEST("hostdev-mdev-display-spice-opengl"); DO_TEST_CAPS_LATEST("hostdev-mdev-display-spice-egl-headless"); DO_TEST_CAPS_LATEST("hostdev-mdev-display-vnc"); @@ -2856,6 +2861,9 @@ mymain(void) QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE_VHOST_SCSI, QEMU_CAPS_DEVICE_PCIE_ROOT_PORT, QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY); + DO_TEST_PARSE_ERROR("hostdev-scsi-duplicate", + QEMU_CAPS_VIRTIO_SCSI, + QEMU_CAPS_DEVICE_VHOST_SCSI); DO_TEST_CAPS_VER("mlock-on", "3.0.0"); DO_TEST_CAPS_VER("mlock-off", "3.0.0"); -- 2.30.2

2 5