- Devel - libvirt List Archives

[libvirt PATCH] schema: make target mandatory for filesystems
by Ján Tomko 27 Jul '21

27 Jul '21

Commit 12967c3e13 incorrectly made the target optional. The validation was re-introduced by commit e8863b91f (which put it into FSDefValidate instead of the parser), but it did not amend the schema to make it mandatory again. https://bugzilla.redhat.com/show_bug.cgi?id=1969232 Fixes: e8863b91fb98f077d4c44a11bd7ea84c5e6b29ef Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- docs/schemas/domaincommon.rng | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 14c5d4ee68..2442078969 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2859,12 +2859,10 @@ </group> </choice> <interleave> - <optional> - <element name="target"> - <attribute name="dir"/> - <empty/> - </element> - </optional> + <element name="target"> + <attribute name="dir"/> + <empty/> + </element> <optional> <attribute name="accessmode"> <choice> -- 2.31.1

2 1

[libvirt RFC PATCH 0/2] domxml-to-native: lower users' expectations
by Ján Tomko 27 Jul '21

27 Jul '21

We do not support some configs that assume fd passing. Add a disclaimer to the API and the virsh command, and a bit frendlier error message to the vsock command line generator. (Alternatively, we could fill in some random values for the file descriptor numbers, just to give the user an idea what the command line would look like. But this still won't give them a functional equivalent of the command line. Which is not possible in all cases anyway) Ján Tomko (2): domxml-to-native: add disclaimer about fd passing qemu: error out if vsock does not have a pre-opened file descriptor docs/manpages/virsh.rst | 2 ++ src/libvirt-domain.c | 3 +++ src/qemu/qemu_command.c | 6 ++++++ 3 files changed, 11 insertions(+) -- 2.31.1

2 3

[libvirt PATCH 0/4] RFC: tests: introduce lavocado
by Beraldo Leal 27 Jul '21

27 Jul '21

lavocado aims to be an alternative test framework for the libvirt project using Python, python-libvirt and Avocado. This can be used to write unit, functional and integration tests and it is inspired by the libvirt-tck framework. This series introduces the basic framework along with some basic test examples that I got from libvirt-tck. I would appreciate your comments on this RFC, to see if this fits this project's needs. Also, names and locations are just a proposal and can be changed. For now, this framework assumes that you are going to run the tests in a fresh clean environment, i.e. a VM. If you decide to use your local system, beware that execution of the tests may affect your system. One of the future goals of this framework is to utilize nested virtualization technologies and hence make sure an L1 guest is provisioned automatically for the tests to be executed in this environment and not tamper with your main system. I'm adding more information with some details inside the README file. Beraldo Leal (4): tests: introduce lavocado: initial code structure tests.lavocado: adding basic transient domain tests tests.lavocado: adding a .gitignore tests.lavocado: adding a README and Makefile for convenience tests/lavocado/.gitignore | 3 + tests/lavocado/Makefile | 2 + tests/lavocado/README.md | 124 +++++++++++++++++ tests/lavocado/lavocado/__init__.py | 0 tests/lavocado/lavocado/defaults.py | 11 ++ tests/lavocado/lavocado/exceptions.py | 20 +++ tests/lavocado/lavocado/helpers/__init__.py | 0 tests/lavocado/lavocado/helpers/domains.py | 75 ++++++++++ tests/lavocado/lavocado/test.py | 144 ++++++++++++++++++++ tests/lavocado/requirements.txt | 3 + tests/lavocado/templates/domain.xml.jinja | 20 +++ tests/lavocado/tests/domain/transient.py | 102 ++++++++++++++ 12 files changed, 504 insertions(+) create mode 100644 tests/lavocado/.gitignore create mode 100644 tests/lavocado/Makefile create mode 100644 tests/lavocado/README.md create mode 100644 tests/lavocado/lavocado/__init__.py create mode 100644 tests/lavocado/lavocado/defaults.py create mode 100644 tests/lavocado/lavocado/exceptions.py create mode 100644 tests/lavocado/lavocado/helpers/__init__.py create mode 100644 tests/lavocado/lavocado/helpers/domains.py create mode 100644 tests/lavocado/lavocado/test.py create mode 100644 tests/lavocado/requirements.txt create mode 100644 tests/lavocado/templates/domain.xml.jinja create mode 100644 tests/lavocado/tests/domain/transient.py -- 2.26.3

4 25

[libvirt PATCH 0/3] qemu: Allow pcie-expander-bus for aarch64/virt guests
by Andrea Bolognani 27 Jul '21

27 Jul '21

Andrea Bolognani (3): tests: Add capabilities for QEMU 6.0 on aarch64 qemu: Allow pcie-expander-bus for aarch64/virt guests tests: Test pcie-expander-bus for aarch64/virt guests src/qemu/qemu_domain.c | 6 +- .../qemu_6.0.0-virt.aarch64.xml | 182 + tests/domaincapsdata/qemu_6.0.0.aarch64.xml | 176 + .../caps_6.0.0.aarch64.replies | 27539 ++++++++++++++++ .../caps_6.0.0.aarch64.xml | 532 + ...fault-cpu-kvm-virt-4.2.aarch64-latest.args | 4 +- ...fault-cpu-tcg-virt-4.2.aarch64-latest.args | 4 +- .../aarch64-features-sve.aarch64-latest.args | 4 +- ...arch64-os-firmware-efi.aarch64-latest.args | 4 +- .../aarch64-tpm.aarch64-latest.args | 4 +- .../aarch64-virt-graphics.aarch64-latest.args | 6 +- .../aarch64-virt-headless.aarch64-latest.args | 6 +- .../clock-timer-armvtimer.aarch64-latest.args | 4 +- ...ult-video-type-aarch64.aarch64-latest.args | 4 +- .../disk-arm-virtio-sd.aarch64-latest.args | 4 +- .../iommu-smmuv3.aarch64-latest.args | 4 +- ...e-expander-bus-aarch64.aarch64-latest.args | 32 + .../pcie-expander-bus-aarch64.xml | 15 + .../pcie-expander-bus-bad-machine.err | 2 +- tests/qemuxml2argvtest.c | 1 + ...ie-expander-bus-aarch64.aarch64-latest.xml | 32 + tests/qemuxml2xmltest.c | 1 + 22 files changed, 28538 insertions(+), 28 deletions(-) create mode 100644 tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml create mode 100644 tests/domaincapsdata/qemu_6.0.0.aarch64.xml create mode 100644 tests/qemucapabilitiesdata/caps_6.0.0.aarch64.replies create mode 100644 tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml create mode 100644 tests/qemuxml2argvdata/pcie-expander-bus-aarch64.aarch64-latest.args create mode 100644 tests/qemuxml2argvdata/pcie-expander-bus-aarch64.xml create mode 100644 tests/qemuxml2xmloutdata/pcie-expander-bus-aarch64.aarch64-latest.xml -- 2.31.1

2 4

[libvirt PATCH] qemu: monitor: remove destroy callback
by Ján Tomko 26 Jul '21

26 Jul '21

It was added by commit c2121602 and later removed by 5a4c2374a Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/qemu/qemu_monitor.c | 2 -- src/qemu/qemu_monitor.h | 1 - 2 files changed, 3 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 6e2d8010c5..5d7b686136 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -233,8 +233,6 @@ qemuMonitorDispose(void *obj) VIR_DEBUG("mon=%p", mon); qemuMonitorDisposed = true; - if (mon->cb && mon->cb->destroy) - (mon->cb->destroy)(mon, mon->vm, mon->callbackOpaque); virObjectUnref(mon->vm); g_main_context_unref(mon->context); diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 1491c1297c..05ec228800 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -363,7 +363,6 @@ typedef void (*qemuMonitorDomainMemoryFailureCallback)(qemuMonitor *mon, typedef struct _qemuMonitorCallbacks qemuMonitorCallbacks; struct _qemuMonitorCallbacks { - qemuMonitorDestroyCallback destroy; qemuMonitorEofNotifyCallback eofNotify; qemuMonitorErrorNotifyCallback errorNotify; qemuMonitorDomainEventCallback domainEvent; -- 2.31.1

2 1

[PATCH 0/6] qemu: Add detection of 'blockdev-reopen'
by Peter Krempa 26 Jul '21

26 Jul '21

Note that the capability update patch is waiting for a series of fixes as current qemu master breaks with libvirt. Full version can be fetched from: git fetch https://gitlab.com/pipo.sk/libvirt.git blockdev-reopen Peter Krempa (6): tests: qemucapabilities: Update capabilities for qemu-6.1.0-rc0 on x86_64 qemuBlockReopenFormat: Extract @src handling and monitor invocation qemuBlockReopenFormatMon: Adapt to new argument format of 'blockdev-reopen' qemumonitorjsontest: Add test case for 'blockdev-reopen' qemu: capabilities: Enable detection of QEMU_CAPS_BLOCKDEV_REOPEN NEWS: Mention enablement of incremental backups NEWS.rst | 6 + src/qemu/qemu_block.c | 32 +- src/qemu/qemu_block.h | 5 + src/qemu/qemu_capabilities.c | 1 + .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 2 +- .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 2 +- tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 2 +- .../caps_6.1.0.x86_64.replies | 4245 +++++++++-------- .../caps_6.1.0.x86_64.xml | 8 +- tests/qemumonitorjsontest.c | 28 + 10 files changed, 2312 insertions(+), 2019 deletions(-) -- 2.31.1

2 8

[PATCH] securityselinuxlabeltest: Add debug statements for testUserXattrEnabled return value
by Peter Krempa 26 Jul '21

26 Jul '21

I've noticed the test being skipped in my build scenario (tmpfs) and the output doesn't make it clear why it's happening. Add debug statements for the various return values of testUserXattrEnabled. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- tests/securityselinuxlabeltest.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/securityselinuxlabeltest.c b/tests/securityselinuxlabeltest.c index b1a6735d33..f7dd3c866a 100644 --- a/tests/securityselinuxlabeltest.c +++ b/tests/securityselinuxlabeltest.c @@ -325,10 +325,15 @@ mymain(void) int rc = testUserXattrEnabled(); g_autoptr(virQEMUCaps) qemuCaps = NULL; - if (rc < 0) + if (rc < 0) { + VIR_TEST_VERBOSE("failed to determine xattr support"); return EXIT_FAILURE; - if (!rc) + } + + if (rc == 0) { + VIR_TEST_VERBOSE("xattr unsupported"); return EXIT_AM_SKIP; + } if (!(mgr = virSecurityManagerNew("selinux", "QEMU", VIR_SECURITY_MANAGER_DEFAULT_CONFINED | -- 2.31.1

2 1

[PATCH] gitlab: let rawhide container builds fail
by Daniel P. Berrangé 26 Jul '21

26 Jul '21

The nature of Fedora rawhide means that it will inevitably have failures periodically. Currently it is failing to even update packages due to glibc switching to use of clone3 syscall, which is mistakenly blocked by seccomp in container runtimes using EPERM instead of ENOSYS. When we fail to build the rawhide containers, it is quite likely that we still have the previous build available in the gitlab registry, so it is reasonable to allow the container job to fail and try the build job anyway. Ideally we would ignore the container build failure if-and-only-if the previous container was build with the same list of packages. We don't record the original dependency package list though, so that's not currently possible. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4757139fa9..344ecdf3ba 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -186,7 +186,7 @@ x64-fedora-34-container: NAME: fedora-34 x64-fedora-rawhide-container: - extends: .container_job + extends: .container_optional_job variables: NAME: fedora-rawhide @@ -299,12 +299,12 @@ s390x-debian-sid-container: NAME: debian-sid-cross-s390x mingw32-fedora-rawhide-container: - extends: .container_job + extends: .container_optional_job variables: NAME: fedora-rawhide-cross-mingw32 mingw64-fedora-rawhide-container: - extends: .container_job + extends: .container_optional_job variables: NAME: fedora-rawhide-cross-mingw64 -- 2.31.1

2 1

[libvirt PATCH] docs: Fix two spelling mistakes
by Tim Wiederhake 26 Jul '21

26 Jul '21

Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com> --- docs/kbase/qemu-core-dump.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/kbase/qemu-core-dump.rst b/docs/kbase/qemu-core-dump.rst index 44fd40fc52..5c3781cf90 100644 --- a/docs/kbase/qemu-core-dump.rst +++ b/docs/kbase/qemu-core-dump.rst @@ -11,7 +11,7 @@ QEMU driver configuration There is a global setting in the QEMU driver configuration file that controls whether core dumps are permitted, and their maximum size. Enabling core dumps -is simply a matter of setting the maximum size to a non-zero value by editting +is simply a matter of setting the maximum size to a non-zero value by editing the ``/etc/libvirt/qemu.conf`` file: :: @@ -65,7 +65,7 @@ machine basis in the XML configuration: <memory dumpCore="on">...</memory> -Note, it is still neccessary to at least set ``max_core`` to a non-zero +Note, it is still necessary to at least set ``max_core`` to a non-zero value in the global configuration file. Some management applications may not offer the ability to customimze the -- 2.31.1

2 1

[PATCH] qemu_vhost_user: don't raise error for unknown features
by Cole Robinson 26 Jul '21

26 Jul '21

Similar to what was done for qemu_firmware.c in 61d95a1073, don't report an error for unknown vhost-user features, just log it and correctly continue on Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/qemu/qemu_vhost_user.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_vhost_user.c b/src/qemu/qemu_vhost_user.c index bc8e7ad898..75cc718c09 100644 --- a/src/qemu/qemu_vhost_user.c +++ b/src/qemu/qemu_vhost_user.c @@ -280,6 +280,7 @@ qemuVhostUserGPUFillCapabilities(qemuVhostUser *vu, qemuVhostUserGPU *gpu = &vu->capabilities.gpu; virJSONValue *featuresJSON; size_t nfeatures; + size_t nparsed = 0; size_t i; g_autoptr(qemuVhostUserGPUFeature) features = NULL; @@ -299,17 +300,16 @@ qemuVhostUserGPUFillCapabilities(qemuVhostUser *vu, int tmp; if ((tmp = qemuVhostUserGPUFeatureTypeFromString(tmpStr)) <= 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("unknown feature %s"), - tmpStr); + VIR_DEBUG("ignoring unknown QEMU vhost-user feature '%s'", tmpStr); continue; } - features[i] = tmp; + features[nparsed] = tmp; + nparsed++; } gpu->features = g_steal_pointer(&features); - gpu->nfeatures = nfeatures; + gpu->nfeatures = nparsed; return 0; } -- 2.31.1

2 1

[PATCH] qemu: process: Ignore 'RESET' event during startup
by Peter Krempa 26 Jul '21

26 Jul '21

In cases when we are adding a <transient/> disk with sharing backend (and thus hotplugging it) we need to re-initialize ACPI tables so that the VM boots from the correct device. This has a side-effect of emitting the RESET event and handling it which in case when the 'on_reset' policy is set to 'destroy' can even kill the VM. Fix this by ignoring RESET events during startup of the VM. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_process.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 521fda57da..d6ed4a3943 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -429,12 +429,20 @@ qemuProcessHandleReset(qemuMonitor *mon G_GNUC_UNUSED, void *opaque) { virQEMUDriver *driver = opaque; - virObjectEvent *event; + virObjectEvent *event = NULL; qemuDomainObjPrivate *priv; g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); virObjectLock(vm); + /* ignore reset events on VM startup. Libvirt in certain instances does a + * reset during startup so that the ACPI tables are re-generated */ + if (vm->state.state == VIR_DOMAIN_PAUSED && + vm->state.reason == VIR_DOMAIN_PAUSED_STARTING_UP) { + VIR_DEBUG("ignoring reset event during startup"); + goto cleanup; + } + event = virDomainEventRebootNewFromObj(vm); priv = vm->privateData; if (priv->agent) -- 2.31.1

1 1

[PATCH 0/2] Another round of capng_apply() fixes
by Michal Privoznik 26 Jul '21

26 Jul '21

See 2/2 for explanation. Michal Prívozník (2): virSetUIDGIDWithCaps: Check for capng_apply() retval properly virSetUIDGIDWithCaps: Set bounding capabilities only with CAP_SETPCAP src/util/virutil.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- 2.31.1

2 4

[libvirt PATCH v2] src: workaround warning triggered in glib 2.69
by Daniel P. Berrangé 23 Jul '21

23 Jul '21

Libvirt is using the G_GNUC_FALLTHROUGH macro provided by glib since version 2.60. Since we need to support older glib, we also have some compatibility code to define it if missing. We set the GLIB_VERSION_MAX_ALLOWED macro to ensure we get warnings when we use an API that dates from a glib version newer than our minimum benchmark. Historically this didn't get enforced for (most) macros, but GLib 2.69 has addressed that gap. This causes our usage of G_GNUC_FALLTHROUGH to trigger warnings. GLib is right to warn, because it does not know that we have added our own fallback for older versions. The only way to squelch this warning though, is to fully undefine the GLib provided G_GNUC_FALLTHROUGH and use our own in its place. We'll be able to remove all this compat burden when we finally update the min glib version to be >= 2.60 Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/internal.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/internal.h b/src/internal.h index 0a03dfc46f..e1250a59fe 100644 --- a/src/internal.h +++ b/src/internal.h @@ -147,8 +147,17 @@ * * silence the compiler warning when falling through a switch case * - * TODO: Remove after upgrading to GLib >= 2.60 + * Note: GLib 2.69.0 introduced version checks on the + * macro usage. Thus an app setting GLIB_VERSION_MAX_ALLOWED + * to less than 2.60 will trigger a warning using G_GNUC_FALLTHROUGH + * Normally the warning is a good thing, but we want to use our + * fallback impl, so we have to temporarily cull the GLib macro. + * + * All this should be removed once updating to min GLib >= 2.60 */ +#if GLIB_CHECK_VERSION(2, 69, 0) +# undef G_GNUC_FALLTHROUGH +#endif #ifndef G_GNUC_FALLTHROUGH # if __GNUC_PREREQ (7, 0) # define G_GNUC_FALLTHROUGH __attribute__((fallthrough)) -- 2.31.1

2 1

[PATCH] storage: create logical volume with --yes option
by Kristina Hanicova 23 Jul '21

23 Jul '21

If lvcreate found an existing signature when trying to create a new logical volume (E.g. left after some deleted volume), the action failed due to inability to answer interactive question to wiping it (lvcreate assumed 'no' was the answer). With added option --yes to the command line, the answer to any interactive question is assumed to be yes. Therefore, lvcreate wipes the signature and the new volume is created successfully. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1940413 Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com> --- src/storage/storage_backend_logical.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index ed8e47d880..02ede74aeb 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -863,6 +863,8 @@ virStorageBackendLogicalLVCreate(virStorageVolDef *vol, else virCommandAddArg(cmd, def->source.name); + virCommandAddArg(cmd, "--yes"); + return virCommandRun(cmd, NULL); } -- 2.31.1

2 1

[PATCH] conf: Add grabToggle to evdev input
by Justin Gatzen 23 Jul '21

23 Jul '21

Add support for customizable grabToggle key combinations with <input type='evdev'>. Signed-off-by: Justin Gatzen <justin.gatzen(a)gmail.com> --- docs/formatdomain.rst | 12 +++++++----- docs/schemas/domaincommon.rng | 12 ++++++++++++ src/conf/domain_conf.c | 19 +++++++++++++++++++ src/conf/domain_conf.h | 14 ++++++++++++++ src/libvirt_private.syms | 2 ++ src/qemu/qemu_command.c | 5 +++++ .../input-linux.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/input-linux.xml | 2 +- 8 files changed, 61 insertions(+), 7 deletions(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index b621591515..61ccd8895a 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -5747,7 +5747,7 @@ to provide a graphics tablet for absolute cursor movement. <source evdev='/dev/input/event1'/> </input> <input type='evdev'> - <source dev='/dev/input/event1234' grab='all' repeat='on'/> + <source dev='/dev/input/event1234' grab='all' repeat='on' grabToggle='ctrl-ctrl'/> </input> </devices> ... @@ -5768,10 +5768,12 @@ On S390, ``address`` can be used to provide a CCW address for an input device ( sub-element ``source`` must have an ``evdev`` (for ``passthrough``) or ``dev`` (for ``evdev``) attribute containing the absolute path to the event device passed through to guests. -For type ``evdev``, ``source`` can have two optional attributes ``grab`` with -value 'all' which when enabled grabs all input devices instead of just one and -``repeat`` with value 'on'/'off' to enable/disable auto-repeat events ( -:since:`Since 7.4.0`). +For type ``evdev``, ``source`` has three optional attributes ``grab`` with +value 'all' which when enabled grabs all input devices instead of just one, +``repeat`` with value 'on'/'off' to enable/disable auto-repeat events and +``grabToggle`` (:since:`since 7.6.0`) with values ``ctrl-ctrl``, ``alt-alt``, +``shift-shift``, ``meta-meta``, ``scrolllock`` or ``ctrl-scrolllock`` to +change the grab key combination. ``input`` type ``evdev`` is currently supported only on linux devices. (KVM only) :since:`Since 5.2.0` , the ``input`` element accepts a ``model`` attribute which has the values 'virtio', 'virtio-transitional' and diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 538581360d..14c5d4ee68 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -5484,6 +5484,18 @@ <value>all</value> </attribute> </optional> + <optional> + <attribute name="grabToggle"> + <choice> + <value>ctrl-ctrl</value> + <value>alt-alt</value> + <value>shift-shift</value> + <value>meta-meta</value> + <value>scrolllock</value> + <value>ctrl-scrolllock</value> + </choice> + </attribute> + </optional> <optional> <attribute name="repeat"> <ref name="virOnOff"/> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e05ea9ba88..44d55ede5b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -891,6 +891,17 @@ VIR_ENUM_IMPL(virDomainInputSourceGrab, "all", ); +VIR_ENUM_IMPL(virDomainInputSourceGrabToggle, + VIR_DOMAIN_INPUT_SOURCE_GRAB_TOGGLE_LAST, + "default", + "ctrl-ctrl", + "alt-alt", + "shift-shift", + "meta-meta", + "scrolllock", + "ctrl-scrolllock", +); + VIR_ENUM_IMPL(virDomainGraphics, VIR_DOMAIN_GRAPHICS_TYPE_LAST, "sdl", @@ -12011,6 +12022,11 @@ virDomainInputDefParseXML(virDomainXMLOption *xmlopt, VIR_XML_PROP_NONZERO, &def->source.grab) < 0) goto error; + if (virXMLPropEnum(source, "grabToggle", + virDomainInputSourceGrabToggleTypeFromString, + VIR_XML_PROP_NONZERO, &def->source.grabToggle) < 0) + goto error; + if (virXMLPropTristateSwitch(source, "repeat", VIR_XML_PROP_NONE, &def->source.repeat) < 0) goto error; @@ -25998,6 +26014,7 @@ virDomainInputDefFormat(virBuffer *buf, const char *type = virDomainInputTypeToString(def->type); const char *bus = virDomainInputBusTypeToString(def->bus); const char *grab = virDomainInputSourceGrabTypeToString(def->source.grab); + const char *grabToggle = virDomainInputSourceGrabToggleTypeToString(def->source.grabToggle); const char *repeat = virTristateSwitchTypeToString(def->source.repeat); g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) childBuf = VIR_BUFFER_INIT_CHILD(buf); @@ -26049,6 +26066,8 @@ virDomainInputDefFormat(virBuffer *buf, if (def->source.grab) virBufferAsprintf(&sourceAttrBuf, " grab='%s'", grab); + if (def->source.grabToggle) + virBufferAsprintf(&sourceAttrBuf, " grabToggle='%s'", grabToggle); if (def->source.repeat) virBufferAsprintf(&sourceAttrBuf, " repeat='%s'", repeat); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 5c22f252d0..ca21082624 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1420,6 +1420,18 @@ typedef enum { VIR_DOMAIN_INPUT_SOURCE_GRAB_LAST } virDomainInputSourceGrab; +typedef enum { + VIR_DOMAIN_INPUT_SOURCE_GRAB_TOGGLE_DEFAULT, + VIR_DOMAIN_INPUT_SOURCE_GRAB_TOGGLE_CTRL_CTRL, + VIR_DOMAIN_INPUT_SOURCE_GRAB_TOGGLE_ALT_ALT, + VIR_DOMAIN_INPUT_SOURCE_GRAB_TOGGLE_SHIFT_SHIFT, + VIR_DOMAIN_INPUT_SOURCE_GRAB_TOGGLE_META_META, + VIR_DOMAIN_INPUT_SOURCE_GRAB_TOGGLE_SCROLLLOCK, + VIR_DOMAIN_INPUT_SOURCE_GRAB_TOGGLE_CTRL_SCROLLLOCK, + + VIR_DOMAIN_INPUT_SOURCE_GRAB_TOGGLE_LAST +} virDomainInputSourceGrabToggle; + struct _virDomainInputDef { int type; int bus; @@ -1427,6 +1439,7 @@ struct _virDomainInputDef { struct { char *evdev; virDomainInputSourceGrab grab; + virDomainInputSourceGrabToggle grabToggle; virTristateSwitch repeat; } source; virDomainDeviceInfo info; @@ -3871,6 +3884,7 @@ VIR_ENUM_DECL(virDomainInput); VIR_ENUM_DECL(virDomainInputBus); VIR_ENUM_DECL(virDomainInputModel); VIR_ENUM_DECL(virDomainInputSourceGrab); +VIR_ENUM_DECL(virDomainInputSourceGrabToggle); VIR_ENUM_DECL(virDomainGraphics); VIR_ENUM_DECL(virDomainGraphicsListen); VIR_ENUM_DECL(virDomainGraphicsAuthConnected); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 4bc2974e7f..6bbf551f48 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -476,6 +476,8 @@ virDomainInputBusTypeToString; virDomainInputDefFind; virDomainInputDefFree; virDomainInputDefGetPath; +virDomainInputSourceGrabToggleTypeFromString; +virDomainInputSourceGrabToggleTypeToString; virDomainInputSourceGrabTypeFromString; virDomainInputSourceGrabTypeToString; virDomainInputTypeToString; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 3c3ecd63e3..156af4caee 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3947,6 +3947,11 @@ qemuBuildObjectInputDevStr(virDomainInputDef *dev, if (dev->source.grab == VIR_DOMAIN_INPUT_SOURCE_GRAB_ALL) virJSONValueObjectAdd(props, "b:grab_all", true, NULL); + if (dev->source.grabToggle != VIR_DOMAIN_INPUT_SOURCE_GRAB_TOGGLE_DEFAULT) + virJSONValueObjectAdd(props, "s:grab-toggle", + virDomainInputSourceGrabToggleTypeToString(dev->source.grabToggle), + NULL); + if (qemuBuildObjectCommandlineFromJSON(&buf, props, qemuCaps) < 0) return NULL; diff --git a/tests/qemuxml2argvdata/input-linux.x86_64-latest.args b/tests/qemuxml2argvdata/input-linux.x86_64-latest.args index 688cf02873..3c7e65a7f0 100644 --- a/tests/qemuxml2argvdata/input-linux.x86_64-latest.args +++ b/tests/qemuxml2argvdata/input-linux.x86_64-latest.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=on \ -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ --object '{"qom-type":"input-linux","id":"input0","evdev":"/dev/input/event1234","repeat":true,"grab_all":true}' \ +-object '{"qom-type":"input-linux","id":"input0","evdev":"/dev/input/event1234","repeat":true,"grab_all":true,"grab-toggle":"alt-alt"}' \ -audiodev id=audio1,driver=none \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ diff --git a/tests/qemuxml2argvdata/input-linux.xml b/tests/qemuxml2argvdata/input-linux.xml index c0702676c1..389ba789a6 100644 --- a/tests/qemuxml2argvdata/input-linux.xml +++ b/tests/qemuxml2argvdata/input-linux.xml @@ -22,7 +22,7 @@ <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> <input type='evdev'> - <source dev='/dev/input/event1234' grab='all' repeat='on'/> + <source dev='/dev/input/event1234' grab='all' grabToggle='alt-alt' repeat='on'/> </input> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> -- 2.32.0

2 1

[PATCH 0/7] Various fixes
by Peter Krempa 23 Jul '21

23 Jul '21

Fixes for stuff I've noticed when reviewing Tim's hash table cleanups. This obviously applies on top of his series. Peter Krempa (7): virHashNew: Ensure return value is used hypervCreateEmbeddedParam: Don't count elements needlessly qemuBlockNodeNameGetBackingChain: Shuffle around variable initialization virDomainDefValidateAliases: Refactor to avoid cleanup section virNetworkObjNew: Remove impossible error handling qemu: domain: Move qemuDomainObjPrivateAlloc after qemuDomainObjPrivateFree qemuDomainObjPrivateAlloc: Fix unlikely memory leak src/conf/domain_validate.c | 15 ++++------ src/conf/virnetworkobj.c | 13 +++------ src/hyperv/hyperv_wmi.c | 5 ---- src/qemu/qemu_block.c | 8 ++---- src/qemu/qemu_domain.c | 57 ++++++++++++++++++-------------------- src/util/virhash.h | 2 +- 6 files changed, 39 insertions(+), 61 deletions(-) -- 2.31.1

2 8

[PATCH] qemu: save status xml after generating taint message
by Kristina Hanicova 23 Jul '21

23 Jul '21

We didn't always save status xml after generating new taint message, which resulted in it being deleted in case of a libvirtd restart. Some taint messages were preserved thanks to saving status xml separately at the end of the calling functions (which makes sense, because qemuDomainObjTaint was usually called there multiple times). But for special cases (e.g. When only few taint messages are generated) we need a separate function for generating them and saving status xml explicitly. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1965589 Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com> --- src/qemu/qemu_domain.c | 11 +++++++++++ src/qemu/qemu_domain.h | 5 +++++ src/qemu/qemu_driver.c | 4 ++-- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index ac1d8ef151..4b9e717c16 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6468,6 +6468,17 @@ void qemuDomainObjTaint(virQEMUDriver *driver, qemuDomainObjTaintMsg(driver, obj, taint, logCtxt, NULL); } +void qemuDomainObjTaintAndSave(virQEMUDriver *driver, + virDomainObj *obj, + virDomainTaintFlags taint, + qemuDomainLogContext *logCtxt) +{ + g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); + + qemuDomainObjTaintMsg(driver, obj, taint, logCtxt, NULL); + ignore_value(virDomainObjSave(obj, driver->xmlopt, cfg->stateDir)); +} + void qemuDomainObjTaintMsg(virQEMUDriver *driver, virDomainObj *obj, virDomainTaintFlags taint, diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index acf6ca5ab6..9bd711cbd4 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -568,6 +568,11 @@ void qemuDomainObjTaint(virQEMUDriver *driver, virDomainTaintFlags taint, qemuDomainLogContext *logCtxt); +void qemuDomainObjTaintAndSave(virQEMUDriver *driver, + virDomainObj *obj, + virDomainTaintFlags taint, + qemuDomainLogContext *logCtxt); + void qemuDomainObjTaintMsg(virQEMUDriver *driver, virDomainObj *obj, virDomainTaintFlags taint, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 521063d438..8652bdc3d8 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -14010,7 +14010,7 @@ static int qemuDomainQemuMonitorCommand(virDomainPtr domain, const char *cmd, priv = vm->privateData; - qemuDomainObjTaint(driver, vm, VIR_DOMAIN_TAINT_CUSTOM_MONITOR, NULL); + qemuDomainObjTaintAndSave(driver, vm, VIR_DOMAIN_TAINT_CUSTOM_MONITOR, NULL); hmp = !!(flags & VIR_DOMAIN_QEMU_MONITOR_COMMAND_HMP); @@ -16877,7 +16877,7 @@ qemuDomainQemuAgentCommand(virDomainPtr domain, if (!qemuDomainAgentAvailable(vm, true)) goto endjob; - qemuDomainObjTaint(driver, vm, VIR_DOMAIN_TAINT_CUSTOM_GA_COMMAND, NULL); + qemuDomainObjTaintAndSave(driver, vm, VIR_DOMAIN_TAINT_CUSTOM_GA_COMMAND, NULL); agent = qemuDomainObjEnterAgent(vm); ret = qemuAgentArbitraryCommand(agent, cmd, &result, timeout); -- 2.31.1

5 7

[libvirt PATCH 00/38] virHashNew refactorings - part VII
by Tim Wiederhake 23 Jul '21

23 Jul '21

"virHashNew" cannot return NULL, yet we check for NULL in various places. See https://listman.redhat.com/archives/libvir-list/2021-July/msg00074.html. Not split up further as per https://listman.redhat.com/archives/libvir-list/2021-July/msg00575.html Tim Wiederhake (38): virSystemdActivationNew: `virHashNew` cannot return NULL virSystemdActivationNew: Use automatic memory management virSystemdActivationNew: Remove superfluous `goto`s virNWFilterCreateVarsFrom: `virHashNew` cannot return NULL virNWFilterCreateVarsFrom: Use automatic memory management virNWFilterCreateVarsFrom: Remove superfluous `goto`s virNWFilterRuleDefToRuleInst: `virHashNew` cannot return NULL ebiptablesApplyNewRules: `virHashNew` cannot return NULL hypervCreateEmbeddedParam: `virHashNew` cannot return NULL qemusecuritymock: init_hash: `virHashNew` cannot return NULL libxlLoggerNew: `virHashNew` cannot return NULL qemuBlockNodeNamesDetect: `virHashNew` cannot return NULL qemuBlockNodeNameGetBackingChain: `virHashNew` cannot return NULL qemuDomainObjPrivateAlloc: `virHashNew` cannot return NULL qemuInteropFetchConfigs: `virHashNew` cannot return NULL virChrdevAlloc: `virHashNew` cannot return NULL virCloseCallbacksNew: `virHashNew` cannot return NULL virDomainCCWAddressSetCreate: `virHashNew` cannot return NULL virDomainDefBootOrderPostParse: `virHashNew` cannot return NULL virDomainDefValidateAliases: `virHashNew` cannot return NULL virDomainMomentObjListNew: `virHashNew` cannot return NULL virDomainObjListNew: `virHashNew` cannot return NULL virFileCacheNew: `virHashNew` cannot return NULL virHashAtomicNew: `virHashNew` cannot return NULL virInterfaceObjListNew: `virHashNew` cannot return NULL virLockDaemonNew: `virHashNew` cannot return NULL virLockDaemonNewPostExecRestart: `virHashNew` cannot return NULL virLockSpaceNew: `virHashNew` cannot return NULL virLockSpaceNewPostExecRestart: `virHashNew` cannot return NULL virNetDaemonNew: `virHashNew` cannot return NULL virNetworkObjListNew: `virHashNew` cannot return NULL virNetworkObjNew: `virHashNew` cannot return NULL virNodeDeviceObjListNew: `virHashNew` cannot return NULL virQEMUCapsProbeQMPHostCPU: `virHashNew` cannot return NULL virSecuritySELinuxLXCInitialize: `virHashNew` cannot return NULL virSecuritySELinuxQEMUInitialize: `virHashNew` cannot return NULL virStoragePoolObjListNew: `virHashNew` cannot return NULL virStorageVolObjListNew: `virHashNew` cannot return NULL src/conf/domain_addr.c | 7 +------ src/conf/domain_conf.c | 5 +---- src/conf/domain_validate.c | 3 +-- src/conf/virchrdev.c | 6 +----- src/conf/virdomainmomentobjlist.c | 4 ---- src/conf/virdomainobjlist.c | 8 ++------ src/conf/virinterfaceobj.c | 5 +---- src/conf/virnetworkobj.c | 8 ++------ src/conf/virnodedeviceobj.c | 5 +---- src/conf/virstorageobj.c | 17 +++++------------ src/hyperv/hyperv_wmi.c | 6 +----- src/hypervisor/virclosecallbacks.c | 4 ---- src/libxl/libxl_logger.c | 4 +--- src/locking/lock_daemon.c | 6 ++---- src/nwfilter/nwfilter_ebiptables_driver.c | 3 --- src/nwfilter/nwfilter_gentech_driver.c | 18 ++++++------------ src/qemu/qemu_block.c | 15 +++------------ src/qemu/qemu_capabilities.c | 3 +-- src/qemu/qemu_domain.c | 3 +-- src/qemu/qemu_interop_config.c | 5 +---- src/rpc/virnetdaemon.c | 3 +-- src/security/security_selinux.c | 6 ++---- src/util/virfilecache.c | 7 +------ src/util/virhash.c | 5 +---- src/util/virlockspace.c | 6 ++---- src/util/virsystemd.c | 16 +++++----------- tests/qemusecuritymock.c | 17 +++-------------- 27 files changed, 46 insertions(+), 149 deletions(-) -- 2.31.1

2 41

[libvirt PATCH] virsh: fix setmem flags logic
by Pavel Hrdina 23 Jul '21

23 Jul '21

When we dropped virDomainSetMemory usage it got kind of tricky to figure out the flags correctly. Originally the logic was following: no option | --current | --live | --config | --live --config ----------+-----------+--------+----------+---------------- LIVE | CURRENT | LIVE | CONFIG | LIVE & CONFIG But after the commit removing virDomainSetMemory usage it changed to: no option | --current | --live | --config | --live --config ----------+-----------+--------+-----------------+---------------- LIVE | CURRENT | LIVE | LIVE & CONFIG | LIVE & CONFIG This commit fixes the logic back to the original behavior except for ESX, HyperV and Virtuozzo drivers where virDomainSetMemory() default behavior was CURRENT instead of LIVE. Fixes: ce8138564bba0def7d7195814fba4555915d60d5 Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1980199 Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- tools/virsh-domain.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 6fb057736b..f9962f0515 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -9005,10 +9005,15 @@ cmdSetmem(vshControl *ctl, const vshCmd *cmd) VSH_EXCLUSIVE_OPTIONS_VAR(current, live); VSH_EXCLUSIVE_OPTIONS_VAR(current, config); - if (current) + if (config || live || current) { flags = VIR_DOMAIN_AFFECT_CURRENT; - if (config) - flags |= VIR_DOMAIN_AFFECT_CONFIG; + + if (config) + flags |= VIR_DOMAIN_AFFECT_CONFIG; + + if (live) + flags |= VIR_DOMAIN_AFFECT_LIVE; + } if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) return false; -- 2.31.1

2 1

Re: [PULL 37/48] usb: build usb-host as module
by Peter Krempa 23 Jul '21

23 Jul '21

adding libvirt-list On Thu, Jul 08, 2021 at 17:17:37 +0200, Paolo Bonzini wrote: > From: Gerd Hoffmann <kraxel(a)redhat.com> > > Drop one more shared library dependency (libusb) from core qemu. > > Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com> > Reviewed-by: Jose R. Ziviani <jziviani(a)suse.de> > Message-Id: <20210624103836.2382472-34-kraxel(a)redhat.com> > Signed-off-by: Paolo Bonzini <pbonzini(a)redhat.com> > --- > hw/usb/host-libusb.c | 1 + > hw/usb/meson.build | 8 ++++++-- > 2 files changed, 7 insertions(+), 2 deletions(-) After this commit libvirt is no longer detecting the 'hostdevice' property of 'usb-host'. In fact 'device-list-properties' is returning: "desc": "Device 'usb-host' not found" > diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c > index 2b7f87872c..c0f314462a 100644 > --- a/hw/usb/host-libusb.c > +++ b/hw/usb/host-libusb.c > @@ -1777,6 +1777,7 @@ static TypeInfo usb_host_dev_info = { > .class_init = usb_host_class_initfn, > .instance_init = usb_host_instance_init, > }; > +module_obj(TYPE_USB_HOST_DEVICE); > > static void usb_host_register_types(void) > { > diff --git a/hw/usb/meson.build b/hw/usb/meson.build > index 817f3e027a..3ca6127937 100644 > --- a/hw/usb/meson.build > +++ b/hw/usb/meson.build > @@ -72,8 +72,12 @@ if usbredir.found() > endif > > # usb pass-through > -softmmu_ss.add(when: ['CONFIG_USB', libusb], > - if_true: files('host-libusb.c')) > +if config_host.has_key('CONFIG_USB_LIBUSB') The problem is in this condition as it's evaluated as false. When I replace it with libusb.found(), everything works as it used to. Unfortunately I don't know what the real goa behind using CONFIG_USB_LIBUSB here was to see whether my approach is good. > + usbhost_ss = ss.source_set() > + usbhost_ss.add(when: ['CONFIG_USB', libusb], > + if_true: files('host-libusb.c')) > + hw_usb_modules += {'host': usbhost_ss} > +endif > > softmmu_ss.add(when: ['CONFIG_USB', 'CONFIG_XEN', libusb], if_true: files('xen-usb.c')) > > -- > 2.31.1 > > >

2 1

[libvirt PATCH] nodedev: Handle inactive mdevs with the same UUID
by Jonathon Jongsma 22 Jul '21

22 Jul '21

Unfortunately, mdevctl supports defining more than one mdev with the same UUID as long as they have different parent devices. So we can't use the UUID alone as a way to uniquely identify these node devices. Append the parent name to ensure uniqueness. For example: Before: mdev_88a6b868_46bd_4015_8e5b_26107f82da38 After: mdev_88a6b868_46bd_4015_8e5b_26107f82da38_0000_00_02_0 Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1979440 Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- QUESTION: Is there any expectation of stability in these device names? I'm not sure to what extent these changes might affect users. Given that support for persistent mdevs is fairly new, there are likely not many users yet. src/node_device/node_device_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index b4dd57e5f4..89dc704162 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -1038,7 +1038,7 @@ nodeDeviceGetMdevctlListCommand(bool defined, static void mdevGenerateDeviceName(virNodeDeviceDef *dev) { - nodeDeviceGenerateName(dev, "mdev", dev->caps->data.mdev.uuid, NULL); + nodeDeviceGenerateName(dev, "mdev", dev->caps->data.mdev.uuid, dev->parent); } -- 2.31.1

2 3

[libvirt PATCH] ci: Adapt to lcitool command line changes
by Andrea Bolognani 22 Jul '21

22 Jul '21

lcitool now uses the term "target" instead of "host" to refer to the various operating systems it supports, and we need to adapt our helper script so that it works with the new command line interface. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Getting this ready for when https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/92 is merged. ci/helper | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/ci/helper b/ci/helper index 2c3a9f8db4..441258f511 100755 --- a/ci/helper +++ b/ci/helper @@ -190,18 +190,18 @@ class Application: output = subprocess.check_output([self._args.lcitool] + args) return output.decode("utf-8") - def _lcitool_get_hosts(self): - output = self._lcitool_run(["hosts"]) + def _lcitool_get_targets(self): + output = self._lcitool_run(["targets"]) return output.splitlines() - def _generate_dockerfile(self, host, cross=None): - args = ["dockerfile", host, "libvirt"] + def _generate_dockerfile(self, target, cross=None): + args = ["dockerfile", target, "libvirt"] outdir = self._basedir.joinpath("containers") - outfile = f"{host}.Dockerfile" + outfile = f"{target}.Dockerfile" if cross: args.extend(["--cross", cross]) - outfile = f"{host}-cross-{cross}.Dockerfile" + outfile = f"{target}-cross-{cross}.Dockerfile" outpath = outdir.joinpath(outfile) if not self._args.quiet: @@ -211,10 +211,10 @@ class Application: with open(outpath, "w") as f: f.write(output) - def _generate_vars(self, host): - args = ["variables", host, "libvirt"] + def _generate_vars(self, target): + args = ["variables", target, "libvirt"] outdir = self._basedir.joinpath("cirrus") - outfile = f"{host}.vars" + outfile = f"{target}.vars" outpath = outdir.joinpath(outfile) if not self._args.quiet: @@ -241,37 +241,37 @@ class Application: "mingw64", ] - for host in self._lcitool_get_hosts(): - if host.startswith("freebsd-") or host.startswith("macos-"): + for target in self._lcitool_get_targets(): + if target.startswith("freebsd-") or target.startswith("macos-"): continue - self._generate_dockerfile(host) + self._generate_dockerfile(target) - if host == "fedora-rawhide": + if target == "fedora-rawhide": for cross in fedora_cross: - self._generate_dockerfile(host, cross) + self._generate_dockerfile(target, cross) - if host.startswith("debian-"): + if target.startswith("debian-"): for cross in debian_cross: - if host == "debian-sid" and cross == "mips": + if target == "debian-sid" and cross == "mips": continue - self._generate_dockerfile(host, cross) + self._generate_dockerfile(target, cross) def _refresh_cirrus(self): - for host in self._lcitool_get_hosts(): - if not (host.startswith("freebsd-") or host.startswith("macos-")): + for target in self._lcitool_get_targets(): + if not (target.startswith("freebsd-") or target.startswith("macos-")): continue - self._generate_vars(host) + self._generate_vars(target) def _check_stale_images(self): namespace = self._args.namespace gitlab_uri = self._args.gitlab_uri registry_uri = util.get_registry_uri(namespace, gitlab_uri) - lcitool_hosts = self._lcitool_get_hosts() + lcitool_targets = self._lcitool_get_targets() stale_images = util.get_registry_stale_images(registry_uri, - lcitool_hosts) + lcitool_targets) if stale_images: spacing = "\n" + 4 * " " stale_fmt = [f"{k} (ID: {v})" for k, v in stale_images.items()] -- 2.31.1

2 1

[PATCH v3] nodedev: fix internal error when no defined mdevs exist
by Boris Fiuczynski 22 Jul '21

22 Jul '21

Commit e9b534905f4 introduced an error when parsing an empty list returned from mdevctl. This occurs e.g. if nodedev-undefine is used to undefine the last defined mdev which causes the following error messages libvirtd[33143]: internal error: Unexpected format for mdevctl response libvirtd[33143]: internal error: failed to query mdevs from mdevctl: libvirtd[33143]: mdevctl failed to updated mediated devices Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com> Reviewed-by: Shalini Chellathurai Saroja <shalini(a)linux.ibm.com> Reviewed-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/node_device/node_device_driver.c | 6 ++++++ tests/nodedevmdevctldata/mdevctl-list-empty.json | 1 + tests/nodedevmdevctldata/mdevctl-list-empty.out.xml | 0 tests/nodedevmdevctltest.c | 1 + 4 files changed, 8 insertions(+) create mode 100644 tests/nodedevmdevctldata/mdevctl-list-empty.json create mode 100644 tests/nodedevmdevctldata/mdevctl-list-empty.out.xml diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index 17a7aea2bb..6f8968f1f0 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -1139,6 +1139,12 @@ nodeDeviceParseMdevctlJSON(const char *jsonstring, goto error; } + if (virJSONValueArraySize(json_devicelist) == 0) { + VIR_DEBUG("mdevctl has no defined mediated devices"); + *devs = NULL; + return 0; + } + /* mdevctl list --dumpjson produces an output that is an array that * contains only a single object which contains a property for each parent * device */ diff --git a/tests/nodedevmdevctldata/mdevctl-list-empty.json b/tests/nodedevmdevctldata/mdevctl-list-empty.json new file mode 100644 index 0000000000..fe51488c70 --- /dev/null +++ b/tests/nodedevmdevctldata/mdevctl-list-empty.json @@ -0,0 +1 @@ +[] diff --git a/tests/nodedevmdevctldata/mdevctl-list-empty.out.xml b/tests/nodedevmdevctldata/mdevctl-list-empty.out.xml new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/nodedevmdevctltest.c b/tests/nodedevmdevctltest.c index 8ba1d2da70..e246de4d87 100644 --- a/tests/nodedevmdevctltest.c +++ b/tests/nodedevmdevctltest.c @@ -360,6 +360,7 @@ mymain(void) DO_TEST_LIST_DEFINED(); + DO_TEST_PARSE_JSON("mdevctl-list-empty"); DO_TEST_PARSE_JSON("mdevctl-list-multiple"); DO_TEST_DEFINE("mdev_d069d019_36ea_4111_8f0a_8c9a70e21366"); -- 2.31.1

2 1

Re: [PULL 36/40] vl: switch -M parsing to keyval
by Peter Krempa 22 Jul '21

22 Jul '21

CC libvir-list On Tue, Jul 06, 2021 at 12:01:37 +0200, Paolo Bonzini wrote: > Switch from QemuOpts to keyval. This enables the introduction > of non-scalar machine properties, and JSON syntax in the future. > > For JSON syntax to be supported right now, we would have to > consider what would happen if string-based dictionaries (produced by > -M key=val) were to be merged with strongly-typed dictionaries > (produced by -M {'key': 123}). > > The simplest way out is to never enter the situation, and only allow one > -M option when JSON syntax is in use. However, we want options such as > -smp to become syntactic sugar for -M, and this is a problem; as soon > as -smp becomes a shortcut for -M, QEMU would forbid using -M '{....}' > together with -smp. Therefore, allowing JSON syntax right now for -M > would be a forward-compatibility nightmare and it would be impossible > anyway to introduce -M incrementally in tools. > > Instead, support for JSON syntax is delayed until after the main > options are converted to QOM compound properties. These include -boot, > -acpitable, -smbios, -m, -semihosting-config, -rtc and -fw_cfg. Once JSON > syntax is introduced, these options will _also_ be forbidden together > with -M '{...}'. > > Signed-off-by: Paolo Bonzini <pbonzini(a)redhat.com> > --- > softmmu/vl.c | 315 ++++++++++++++++++++++++--------------------------- > 1 file changed, 146 insertions(+), 169 deletions(-) This patch breaks detection of certain machine options features in libvirt which were being detected from 'query-command-line-options'. I presume the change simply removed this from the output of query-command-line-options due to the historical cruft how the aforementioned command works. Unfortunately I didn't find any suitable replacement from what we are querying. The entries which we now lack detection are: { "machine", "mem-merge", QEMU_CAPS_MEM_MERGE }, { "machine", "aes-key-wrap", QEMU_CAPS_AES_KEY_WRAP }, { "machine", "dea-key-wrap", QEMU_CAPS_DEA_KEY_WRAP }, { "machine", "kernel_irqchip", QEMU_CAPS_MACHINE_KERNEL_IRQCHIP }, { "machine", "loadparm", QEMU_CAPS_LOADPARM }, Note that the oldest supported qemu version in libvirt is 2.11 at this point and all the above flags are included in 2.11 and later. This means we can theoretically remove the detection and always assume the flags in case when they are unlikely to be removed in the future. Alternatively if you can suggest an option how to detect this it will be welcome. Thanks Peter

2 2

[PATCH] qemuxml2argvmock: Deduplicate some code
by Michal Privoznik 22 Jul '21

22 Jul '21

A stub implementation for virQEMUCapsGetKVMSupportsSecureGuest() was added recently. However, the very same implementation was added to domaincapsmock.c which is also loaded by qemuxml2argvtest and thus one occurrence of the stub can be dropped. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tests/qemuxml2argvmock.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/tests/qemuxml2argvmock.c b/tests/qemuxml2argvmock.c index d7f77eabf7..9235c785b2 100644 --- a/tests/qemuxml2argvmock.c +++ b/tests/qemuxml2argvmock.c @@ -302,18 +302,3 @@ virIdentityEnsureSystemToken(void) { return g_strdup("3de80bcbf22d4833897f1638e01be9b2"); } - -static bool (*real_virQEMUCapsGetKVMSupportsSecureGuest)(virQEMUCaps *qemuCaps); - -bool -virQEMUCapsGetKVMSupportsSecureGuest(virQEMUCaps *qemuCaps) -{ - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_MACHINE_CONFIDENTAL_GUEST_SUPPORT) && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_S390_PV_GUEST)) - return true; - - if (!real_virQEMUCapsGetKVMSupportsSecureGuest) - VIR_MOCK_REAL_INIT(virQEMUCapsGetKVMSupportsSecureGuest); - - return real_virQEMUCapsGetKVMSupportsSecureGuest(qemuCaps); -} -- 2.31.1

2 1