- Devel - libvirt List Archives

[PATCH v3 0/3] remove sysconfig files
by Olaf Hering 24 Sep '21

24 Sep '21

rebased to 919f25d36ef0ea41c50bdb5afa0b83187ffb3c87 Olaf Hering (3): libvirt.spec: relocate pre script of daemon-driver-qemu remove sysconfig files NEWS: mention removal of sysconfig NEWS.rst | 10 +++ docs/daemons.rst | 20 +++++ docs/remote.html.in | 2 +- libvirt.spec.in | 100 ++++++++++++++++-------- src/ch/meson.build | 5 -- src/ch/virtchd.service.in | 1 + src/ch/virtchd.sysconf | 3 - src/interface/meson.build | 5 -- src/interface/virtinterfaced.service.in | 1 + src/interface/virtinterfaced.sysconf | 3 - src/libxl/meson.build | 5 -- src/libxl/virtxend.service.in | 1 + src/libxl/virtxend.sysconf | 3 - src/locking/meson.build | 5 -- src/locking/virtlockd.service.in | 1 + src/locking/virtlockd.sysconf | 3 - src/logging/meson.build | 5 -- src/logging/virtlogd.sysconf | 3 - src/lxc/meson.build | 5 -- src/lxc/virtlxcd.service.in | 1 + src/lxc/virtlxcd.sysconf | 3 - src/meson.build | 16 ---- src/network/meson.build | 5 -- src/network/virtnetworkd.service.in | 1 + src/network/virtnetworkd.sysconf | 3 - src/node_device/meson.build | 5 -- src/node_device/virtnodedevd.service.in | 1 + src/node_device/virtnodedevd.sysconf | 3 - src/nwfilter/meson.build | 5 -- src/nwfilter/virtnwfilterd.service.in | 1 + src/nwfilter/virtnwfilterd.sysconf | 3 - src/qemu/meson.build | 5 -- src/qemu/virtqemud.service.in | 7 ++ src/qemu/virtqemud.sysconf | 12 --- src/remote/libvirtd.service.in | 7 ++ src/remote/libvirtd.sysconf | 21 ----- src/remote/meson.build | 10 --- src/remote/virtproxyd.service.in | 1 + src/remote/virtproxyd.sysconf | 3 - src/secret/meson.build | 5 -- src/secret/virtsecretd.service.in | 1 + src/secret/virtsecretd.sysconf | 3 - src/storage/meson.build | 5 -- src/storage/virtstoraged.service.in | 1 + src/storage/virtstoraged.sysconf | 3 - src/vbox/meson.build | 5 -- src/vbox/virtvboxd.service.in | 1 + src/vbox/virtvboxd.sysconf | 3 - src/vz/meson.build | 5 -- src/vz/virtvzd.service.in | 1 + src/vz/virtvzd.sysconf | 3 - tools/libvirt-guests.sh.in | 40 ++++++++++ tools/libvirt-guests.sysconf | 50 ------------ tools/meson.build | 6 -- 54 files changed, 166 insertions(+), 260 deletions(-) delete mode 100644 src/ch/virtchd.sysconf delete mode 100644 src/interface/virtinterfaced.sysconf delete mode 100644 src/libxl/virtxend.sysconf delete mode 100644 src/locking/virtlockd.sysconf delete mode 100644 src/logging/virtlogd.sysconf delete mode 100644 src/lxc/virtlxcd.sysconf delete mode 100644 src/network/virtnetworkd.sysconf delete mode 100644 src/node_device/virtnodedevd.sysconf delete mode 100644 src/nwfilter/virtnwfilterd.sysconf delete mode 100644 src/qemu/virtqemud.sysconf delete mode 100644 src/remote/libvirtd.sysconf delete mode 100644 src/remote/virtproxyd.sysconf delete mode 100644 src/secret/virtsecretd.sysconf delete mode 100644 src/storage/virtstoraged.sysconf delete mode 100644 src/vbox/virtvboxd.sysconf delete mode 100644 src/vz/virtvzd.sysconf delete mode 100644 tools/libvirt-guests.sysconf

2 6

[PATCH] vsh: Don't check for OOM in vshGetTypedParamValue()
by Michal Privoznik 24 Sep '21

24 Sep '21

Both function description and function itself mention check for OOM which can't happen really. There was a bug in glib where g_strdup_*() might have not aborted on OOM, but we have our own implementation when dealing with broken glib (see vir_g_strdup_printf()). Therefore, checking for OOM is redundant and can never be true. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tools/vsh.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/tools/vsh.c b/tools/vsh.c index e81369f224..189c452f73 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -1806,51 +1806,44 @@ vshCommandOptTimeoutToMs(vshControl *ctl, const vshCmd *cmd, int *timeout) * --------------- */ -/* Return a non-NULL string representation of a typed parameter; exit - * if we are out of memory. */ +/* Return a non-NULL string representation of a typed parameter; exit on + * unknown type. */ char * vshGetTypedParamValue(vshControl *ctl, virTypedParameterPtr item) { - char *str = NULL; - switch (item->type) { case VIR_TYPED_PARAM_INT: - str = g_strdup_printf("%d", item->value.i); + return g_strdup_printf("%d", item->value.i); break; case VIR_TYPED_PARAM_UINT: - str = g_strdup_printf("%u", item->value.ui); + return g_strdup_printf("%u", item->value.ui); break; case VIR_TYPED_PARAM_LLONG: - str = g_strdup_printf("%lld", item->value.l); + return g_strdup_printf("%lld", item->value.l); break; case VIR_TYPED_PARAM_ULLONG: - str = g_strdup_printf("%llu", item->value.ul); + return g_strdup_printf("%llu", item->value.ul); break; case VIR_TYPED_PARAM_DOUBLE: - str = g_strdup_printf("%f", item->value.d); + return g_strdup_printf("%f", item->value.d); break; case VIR_TYPED_PARAM_BOOLEAN: - str = g_strdup(item->value.b ? _("yes") : _("no")); + return g_strdup(item->value.b ? _("yes") : _("no")); break; case VIR_TYPED_PARAM_STRING: - str = g_strdup(item->value.s); + return g_strdup(item->value.s); break; default: vshError(ctl, _("unimplemented parameter type %d"), item->type); - } - - if (!str) { - vshError(ctl, "%s", _("Out of memory")); exit(EXIT_FAILURE); } - return str; } void -- 2.32.0

2 1

[PATCH v2 0/6] virsh: refactor some bigger functions
by Kristina Hanicova 24 Sep '21

24 Sep '21

This is v2 of patch: https://listman.redhat.com/archives/libvir-list/2021-September/msg00730.html Diff to v1: * split the previous patch into more smaller ones to make the code review easier * small code quality alternations I did not notice were possible before This series refactors a few bigger functions mainly trying to remove too deep indentation and make them more readable and more consistent with the rest of the files. Kristina Hanicova (6): virsh: domain: refactor cmdSchedinfo() virsh: domain: refactor virshCPUCountCollect() virsh: domain: refactor cmdLxcEnterNamespace() virsh: host: refactor cmdFreecell() virsh: host: refactor cmdNodeCpuStats() virsh: volume: refactor cmdVolInfo() tools/virsh-domain.c | 210 ++++++++++++++++++++----------------------- tools/virsh-host.c | 139 ++++++++++++++-------------- tools/virsh-volume.c | 52 +++++------ 3 files changed, 189 insertions(+), 212 deletions(-) -- 2.31.1

3 9

[libvirt PATCH] meson: Increase stack size limit for sanitizer builds
by Tim Wiederhake 24 Sep '21

24 Sep '21

When building with "CC=clang", "-Db_sanitize=address,undefined", and "-Dbuildtype=debug", the following error occurs: ../src/conf/nwfilter_conf.c:2190:1: error: stack frame size of 10616 bytes in function 'virNWFilterRuleDefFixup' [-Werror,-Wframe-larger-than=] virNWFilterRuleDefFixup(virNWFilterRuleDef *rule) ^ 1 error generated. Enforcing stack frame only makes sense on normal builds when stack usage is deterministic. Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com> --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 488490181f..be5a99a069 100644 --- a/meson.build +++ b/meson.build @@ -225,7 +225,7 @@ alloc_max = run_command( ) # sanitizer instrumentation may enlarge stack frames -stack_frame_size = get_option('b_sanitize') == 'none' ? 4096 : 8192 +stack_frame_size = get_option('b_sanitize') == 'none' ? 4096 : 32768 # array_bounds=2 check triggers false positive on some GCC # versions when using sanitizers. Seen on Fedora 34 with -- 2.31.1

2 2

[PATCH v2 0/4] virsh: refactor unnecessary variables and else branch
by Kristina Hanicova 24 Sep '21

24 Sep '21

This is partially v2 of: https://listman.redhat.com/archives/libvir-list/2021-September/msg00731.html Diff to v1: * split changes into smaller patches Kristina Hanicova (4): virsh: remove variable 'ret' and use early return if possible virsh: remove variable 'ret' in cmdVersion() virsh: remove variable 'ret' and 'inactive' virsh: util: remove 'else' branch after return tools/virsh-host.c | 25 +++++----------- tools/virsh-interface.c | 65 ++++++++++++++++++----------------------- tools/virsh-network.c | 47 +++++++++++++---------------- tools/virsh-nodedev.c | 32 ++++++++------------ tools/virsh-nwfilter.c | 15 +++++----- tools/virsh-util.c | 3 +- 6 files changed, 76 insertions(+), 111 deletions(-) -- 2.31.1

3 7

[PATCH 00/14] qemu: Some more 'query-command-line-options' originated cleanups
by Peter Krempa 23 Sep '21

23 Sep '21

There are a few more capabilities we can easily assume and stop trying to probe them and some more legacy code to delete. This time it's mainly about VNC including a modernization of qemuxml2argvtest cases for it. Peter Krempa (14): qemuxml2argvtest: Use real caps in "graphics-vnc-tls" case qemu: Always assume presence of QEMU_CAPS_OBJECT_TLS_CREDS_X509 qemu: capabilities: Retire QEMU_CAPS_OBJECT_TLS_CREDS_X509 qemuBuildTLSx509BackendProps: Remove unused 'qemuCaps' qemu: command: Simplify 'vnc' commandline generator qemu: command: Always assume QEMU_CAPS_VNC_OPTS qemu: capabilities: Retire QEMU_CAPS_VNC_OPTS qemuxml2argvtest: Replace vnc unix socket tests with pinned versions qemu: command: Always QEMU_CAPS_VNC_MULTI_SERVERS qemu: capabilities: Retire QEMU_CAPS_VNC_MULTI_SERVERS qemuxml2argvtest: Add DO_TEST_CAPS_LATEST for the vnc unix socket tests qemuxml2argvtest: Modernize the rest of 'graphics-vnc' tests qemu: validate: Always assume QEMU_CAPS_SPICE_FILE_XFER_DISABLE qemu: capabilities: Retire QEMU_CAPS_SPICE_FILE_XFER_DISABLE src/qemu/qemu_backup.c | 5 +- src/qemu/qemu_capabilities.c | 12 +- src/qemu/qemu_capabilities.h | 8 +- src/qemu/qemu_command.c | 108 ++++++------------ src/qemu/qemu_command.h | 10 +- src/qemu/qemu_domain.c | 4 - src/qemu/qemu_driver.c | 15 +-- src/qemu/qemu_hotplug.c | 13 +-- src/qemu/qemu_hotplug.h | 3 +- src/qemu/qemu_migration_params.c | 2 +- src/qemu/qemu_snapshot.c | 3 +- src/qemu/qemu_validate.c | 20 ---- .../caps_2.11.0.s390x.xml | 3 - .../caps_2.11.0.x86_64.xml | 4 - .../caps_2.12.0.aarch64.xml | 3 - .../caps_2.12.0.ppc64.xml | 3 - .../caps_2.12.0.s390x.xml | 3 - .../caps_2.12.0.x86_64.xml | 4 - .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 3 - .../caps_3.0.0.riscv32.xml | 3 - .../caps_3.0.0.riscv64.xml | 3 - .../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 3 - .../caps_3.0.0.x86_64.xml | 4 - .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 3 - .../caps_3.1.0.x86_64.xml | 4 - .../caps_4.0.0.aarch64.xml | 3 - .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 3 - .../caps_4.0.0.riscv32.xml | 4 - .../caps_4.0.0.riscv64.xml | 4 - .../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 3 - .../caps_4.0.0.x86_64.xml | 4 - .../caps_4.1.0.x86_64.xml | 4 - .../caps_4.2.0.aarch64.xml | 3 - .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 3 - .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 3 - .../caps_4.2.0.x86_64.xml | 4 - .../caps_5.0.0.aarch64.xml | 3 - .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 3 - .../caps_5.0.0.riscv64.xml | 4 - .../caps_5.0.0.x86_64.xml | 4 - .../qemucapabilitiesdata/caps_5.1.0.sparc.xml | 4 - .../caps_5.1.0.x86_64.xml | 4 - .../caps_5.2.0.aarch64.xml | 3 - .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 3 - .../caps_5.2.0.riscv64.xml | 4 - .../qemucapabilitiesdata/caps_5.2.0.s390x.xml | 3 - .../caps_5.2.0.x86_64.xml | 4 - .../caps_6.0.0.aarch64.xml | 3 - .../qemucapabilitiesdata/caps_6.0.0.s390x.xml | 3 - .../caps_6.0.0.x86_64.xml | 4 - .../caps_6.1.0.x86_64.xml | 4 - tests/qemuhotplugtest.c | 1 - ...cs-vnc-auto-socket-cfg.x86_64-2.11.0.args} | 7 +- ...ics-vnc-auto-socket-cfg.x86_64-latest.args | 36 ++++++ ...raphics-vnc-auto-socket.x86_64-2.11.0.args | 31 +++++ ...raphics-vnc-auto-socket.x86_64-latest.args | 33 ++++++ ...phics-vnc-egl-headless.x86_64-2.11.0.args} | 5 +- ...aphics-vnc-egl-headless.x86_64-latest.args | 37 ++++++ ...ics-vnc-no-listen-attr.x86_64-2.11.0.args} | 5 +- ...hics-vnc-no-listen-attr.x86_64-latest.args | 36 ++++++ ...s => graphics-vnc-none.x86_64-2.11.0.args} | 5 +- .../graphics-vnc-none.x86_64-latest.args | 33 ++++++ ...=> graphics-vnc-policy.x86_64-2.11.0.args} | 5 +- .../graphics-vnc-policy.x86_64-latest.args | 36 ++++++ ...emove-generated-socket.x86_64-2.11.0.args} | 5 +- ...remove-generated-socket.x86_64-latest.args | 36 ++++++ ...s => graphics-vnc-sasl.x86_64-2.11.0.args} | 7 +- .../graphics-vnc-sasl.x86_64-latest.args | 37 ++++++ ...vnc-socket-new-cmdline.x86_64-2.11.0.args} | 5 +- ...-vnc-socket-new-cmdline.x86_64-latest.args | 33 ++++++ .../qemuxml2argvdata/graphics-vnc-socket.args | 30 ----- ...=> graphics-vnc-socket.x86_64-2.11.0.args} | 7 +- .../graphics-vnc-socket.x86_64-latest.args | 33 ++++++ ...gs => graphics-vnc-tls.x86_64-2.11.0.args} | 8 +- ...graphics-vnc-websocket.x86_64-2.11.0.args} | 5 +- .../graphics-vnc-websocket.x86_64-latest.args | 33 ++++++ ...r.args => graphics-vnc.x86_64-2.11.0.args} | 5 +- .../graphics-vnc.x86_64-latest.args | 36 ++++++ tests/qemuxml2argvdata/name-escape.args | 2 +- tests/qemuxml2argvtest.c | 71 ++++++------ tests/qemuxml2xmltest.c | 4 +- 81 files changed, 586 insertions(+), 378 deletions(-) rename tests/qemuxml2argvdata/{graphics-vnc-auto-socket-cfg.args => graphics-vnc-auto-socket-cfg.x86_64-2.11.0.args} (79%) create mode 100644 tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/graphics-vnc-auto-socket.x86_64-2.11.0.args create mode 100644 tests/qemuxml2argvdata/graphics-vnc-auto-socket.x86_64-latest.args rename tests/qemuxml2argvdata/{graphics-vnc-egl-headless.args => graphics-vnc-egl-headless.x86_64-2.11.0.args} (84%) create mode 100644 tests/qemuxml2argvdata/graphics-vnc-egl-headless.x86_64-latest.args rename tests/qemuxml2argvdata/{graphics-vnc.args => graphics-vnc-no-listen-attr.x86_64-2.11.0.args} (83%) create mode 100644 tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.x86_64-latest.args rename tests/qemuxml2argvdata/{graphics-vnc-none.args => graphics-vnc-none.x86_64-2.11.0.args} (81%) create mode 100644 tests/qemuxml2argvdata/graphics-vnc-none.x86_64-latest.args rename tests/qemuxml2argvdata/{graphics-vnc-policy.args => graphics-vnc-policy.x86_64-2.11.0.args} (84%) create mode 100644 tests/qemuxml2argvdata/graphics-vnc-policy.x86_64-latest.args rename tests/qemuxml2argvdata/{graphics-vnc-remove-generated-socket.args => graphics-vnc-remove-generated-socket.x86_64-2.11.0.args} (83%) create mode 100644 tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.x86_64-latest.args rename tests/qemuxml2argvdata/{graphics-vnc-sasl.args => graphics-vnc-sasl.x86_64-2.11.0.args} (82%) create mode 100644 tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args rename tests/qemuxml2argvdata/{graphics-vnc-socket-new-cmdline.args => graphics-vnc-socket-new-cmdline.x86_64-2.11.0.args} (81%) create mode 100644 tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/graphics-vnc-socket.args rename tests/qemuxml2argvdata/{graphics-vnc-auto-socket.args => graphics-vnc-socket.x86_64-2.11.0.args} (78%) create mode 100644 tests/qemuxml2argvdata/graphics-vnc-socket.x86_64-latest.args rename tests/qemuxml2argvdata/{graphics-vnc-tls.args => graphics-vnc-tls.x86_64-2.11.0.args} (71%) rename tests/qemuxml2argvdata/{graphics-vnc-websocket.args => graphics-vnc-websocket.x86_64-2.11.0.args} (81%) create mode 100644 tests/qemuxml2argvdata/graphics-vnc-websocket.x86_64-latest.args rename tests/qemuxml2argvdata/{graphics-vnc-no-listen-attr.args => graphics-vnc.x86_64-2.11.0.args} (83%) create mode 100644 tests/qemuxml2argvdata/graphics-vnc.x86_64-latest.args -- 2.31.1

2 18

[PATCH 0/5] virsh: small refactoring
by Kristina Hanicova 23 Sep '21

23 Sep '21

This series targets some alterations to make the code more readable and consistent. Kristina Hanicova (5): virsh: checkpoint & domain-monitor: small refactoring virsh: domain: refactoring of small functions virsh: domain: change the way functions return bool value virsh: domain, host & volume: refactor bigger functions virsh: refactor functions to not use 'ret' variable tools/virsh-checkpoint.c | 19 +- tools/virsh-domain-monitor.c | 314 +++++++++---------- tools/virsh-domain.c | 567 ++++++++++++++--------------------- tools/virsh-host.c | 166 +++++----- tools/virsh-interface.c | 65 ++-- tools/virsh-network.c | 47 ++- tools/virsh-nodedev.c | 32 +- tools/virsh-nwfilter.c | 15 +- tools/virsh-util.c | 3 +- tools/virsh-volume.c | 56 ++-- 10 files changed, 546 insertions(+), 738 deletions(-) -- 2.31.1

3 10

[PATCH RFC 0/8] blockdev-replace
by Vladimir Sementsov-Ogievskiy 23 Sep '21

23 Sep '21

Hi all! As a continuation of "Qemu block filter insertion/removal API" discussion, here is my proposal of blockdev-replace. The realization allows: - replace children of different parents: BDS, block devices, block exports - automatically replace all parents of specific BDS, excluding creating loops (like bdrv_replace_node()) - do several replacements in one transaction It's an untested draft, so you may go to patch 8, to look at QAPI addition. Vladimir Sementsov-Ogievskiy (8): block-backend: blk_root(): drop const specifier on return type block: add BlockParentClass class block: realize BlockParentClass for BlockDriverState block/export: realize BlockParentClass functionality qdev: improve find_device_state() to distinguish simple not found case qdev: realize BlockParentClass block: improve bdrv_replace_node_noperm() qapi: add blockdev-replace command qapi/block-core.json | 78 ++++++++++++++++ include/block/block-parent.h | 32 +++++++ include/sysemu/block-backend.h | 2 +- block.c | 158 ++++++++++++++++++++++++++++++++- block/block-backend.c | 2 +- block/block-parent.c | 66 ++++++++++++++ block/export/export.c | 44 +++++++++ softmmu/qdev-monitor.c | 90 +++++++++++++++---- block/meson.build | 1 + 9 files changed, 453 insertions(+), 20 deletions(-) create mode 100644 include/block/block-parent.h create mode 100644 block/block-parent.c -- 2.29.2

2 20

[PATCH] qemu: driver: Remove unused variable 'cfg'
by Peter Krempa 23 Sep '21

23 Sep '21

Commit a50c473ad6c988a2 removed last use of 'cfg' from qemuDomainMemoryPeek and qemuDomainScreenshot triggering a compile time warning. Fixes: a50c473ad6c988a249bf79a30fb7c6dc19733347 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- Build-fix && trivial. Pushed. src/qemu/qemu_driver.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index f57e943b48..28aa7351ee 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3374,7 +3374,6 @@ qemuDomainScreenshot(virDomainPtr dom, const char *videoAlias = NULL; char *ret = NULL; bool unlink_tmp = false; - g_autoptr(virQEMUDriverConfig) cfg = NULL; virCheckFlags(0, NULL); @@ -3382,7 +3381,6 @@ qemuDomainScreenshot(virDomainPtr dom, goto cleanup; priv = vm->privateData; - cfg = virQEMUDriverGetConfig(driver); if (virDomainScreenshotEnsureACL(dom->conn, vm->def) < 0) goto cleanup; @@ -10559,7 +10557,6 @@ qemuDomainMemoryPeek(virDomainPtr dom, g_autofree char *tmp = NULL; int fd = -1, ret = -1; qemuDomainObjPrivate *priv; - g_autoptr(virQEMUDriverConfig) cfg = NULL; virCheckFlags(VIR_MEMORY_VIRTUAL | VIR_MEMORY_PHYSICAL, -1); @@ -10567,7 +10564,6 @@ qemuDomainMemoryPeek(virDomainPtr dom, goto cleanup; priv = vm->privateData; - cfg = virQEMUDriverGetConfig(driver); if (virDomainMemoryPeekEnsureACL(dom->conn, vm->def) < 0) goto cleanup; -- 2.31.1

1 0

[PATCH v4 00/11] Implement IOThreads related APIs for test driver
by Luke Yue 23 Sep '21

23 Sep '21

v4: - Rebase to current master branch - Add the forgotten virObjectUnlock(vm) in PATCH 09/11 - Refine tests CI link: https://gitlab.com/lukedyue/libvirt/-/pipelines/371315349 Luke Yue (11): domain_driver.c: Introduce and use virDomainDriverAddIOThreadCheck() test_driver: Introduce testIOThreadInfo and generate IOThread infos test_driver: Implement virDomainAddIOThread test_driver: Implement virDomainDelIOThread domain_driver.c: Introduce and use virDomainDriverGetIOThreadsConfig() test_driver: Implement virDomainGetIOThreadInfo test_driver: Implement virDomainPinIOThread test_driver: Implement testDomainSetIOThreadParams test_driver: Implement virConnectGetAllDomainStats test_driver: Introduce testDomainGetStatsIOThread tests: Test IOThread related functions for test driver examples/xml/test/testdomfc4.xml | 5 + src/hypervisor/domain_driver.c | 132 ++++++++ src/hypervisor/domain_driver.h | 10 + src/libvirt_private.syms | 3 + src/qemu/qemu_driver.c | 113 +------ src/test/test_driver.c | 516 +++++++++++++++++++++++++++++++ tests/virshtest.c | 110 +++++++ 7 files changed, 781 insertions(+), 108 deletions(-) -- 2.33.0

2 12

[PATCH v3 0/2] qemu: don't change ownership of cache directory
by Peng Liang 23 Sep '21

23 Sep '21

See path 2 for detail. v2 -> v3: - Change the directory to put the temp files of screenshot and memorypeek from autoDumpPath to per-domain directory [Daniel] v1 -> v2: - Add commit message for path1 [Peter] Peng Liang (2): qemu: move temp file of screenshot and memorypeek to per-domain dir qemu: don't change ownership of cache directory src/qemu/qemu_driver.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) -- 2.31.1

2 3

[RFC PATCH 0/7] qemu: QAPI-schema: Add support for enum value 'features'
by Peter Krempa 23 Sep '21

23 Sep '21

This series is based on Markus' effort to add 'feature' flags to enum values so that e.g. they can be deprecated: https://listman.redhat.com/archives/libvir-list/2021-September/msg00453.html This series adapts both the schema query language to support querying for arbitrary feature flags and also the schema validator to reject deprecated enum values. Libvirt didn't use any deprecated value for now so to see that this really works you can fetch this series including patches which show it's working (tests fail): git fetch https://gitlab.com/pipo.sk/libvirt.git qemu-deprecate-enum The above branch also demonstrates that parsing from the new arrays produces identical results as it has updated qemu capabilities. This series is RFC as it's waiting for the qemu additions first. Peter Krempa (7): virQEMUQAPISchemaTraverseEnum: Move helper variables into loop virQEMUQAPISchemaTraverseEnum: Use the modern 'members' array virQEMUQAPISchemaTraverseEnum: Allow query of enume type features testQEMUSchemaValidateEnum: Refactor logic to simplify switching to new QMP schema format testQEMUSchemaValidateEnum: Use new 'members' for 'enum' meta type testQEMUSchemaValidateDeprecated: Move to the top testQEMUSchemaValidateEnum: Validate deprecated members src/qemu/qemu_qapi.c | 46 +++++++++++-- tests/testutilsqemuschema.c | 130 +++++++++++++++++++++--------------- 2 files changed, 117 insertions(+), 59 deletions(-) -- 2.31.1

2 8

[libvirt PATCH 0/2] Random improvements to work around a build system issue
by Tim Wiederhake 23 Sep '21

23 Sep '21

This is an alternative to https://listman.redhat.com/archives/libvir-list/2021-September/msg00522.html. When libvirt is build: * with sanitizers enabled, * buildtype explicitly set to "debug", * on clang, the build fails with: ../src/conf/nwfilter_conf.c:2190:1: error: stack frame size of 10616 bytes in function 'virNWFilterRuleDefFixup' [-Werror,-Wframe-larger-than=] virNWFilterRuleDefFixup(virNWFilterRuleDef *rule) ^ 1 error generated. ../src/conf/domain_conf.c:19514:1: error: stack frame size of 8312 bytes in function 'virDomainDefParseXML' [-Werror,-Wframe-larger-than=] virDomainDefParseXML(xmlXPathContextPtr ctxt, ^ 1 error generated. Note that this does not happen when "-Dbuildtype" is not specified, even though "debug" is the default build type. The patches in this series happen to make these errors go away. Regards, Tim Tim Wiederhake (2): virDomainDefParseXML: Use automatic memory management virNWFilterRuleDefFixup: Replace macro with function src/conf/domain_conf.c | 208 ++++++++++++++-------------- src/conf/nwfilter_conf.c | 284 ++++++++++++++++++++------------------- 2 files changed, 245 insertions(+), 247 deletions(-) -- 2.31.1

4 5

[libvirt PATCH 0/1] Fix rpmbuild on CentOS Stream 8
by Erik Skultety 23 Sep '21

23 Sep '21

When running rpmbuild on CentOS 8 results in the following error: error: Too many levels of recursion in macro expansion. It is likely caused by recursive macro declaration. error: Macro %libvirt_daemon_perform_restart failed to expand error: line 1275: %global libvirt_daemon_perform_restart() \ if test %libvirt_daemon_needs_restart %1 \ then \ /bin/systemctl try-restart %1.service >/dev/null 2>&1 || : \ fi \ %libvirt_daemon_finish_restart %1 Erik Skultety (1): libvirt.spec.in: Replace %global with %define libvirt.spec.in | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) -- 2.31.1

2 2

[libvirt PATCH 0/9] ch: use g_auto where possible
by Ján Tomko 23 Sep '21

23 Sep '21

While cleaning up the tests, I noticed that the 'ch' driver is not using g_auto up to its full potential. Use automatic cleanup where possible and remove redundant labels. Ján Tomko (9): ch: use g_auto in virCHMonitorBuildCPUJson ch: use g_auto in virCHMonitorBuildKernelRelatedJson ch: use g_auto in virCHMonitorBuildMemoryJson ch: use g_auto in virCHMonitorBuildDiskJson ch: use g_auto in virCHMonitorBuildDisksJson ch: use g_auto in virCHMonitorBuildNetJson ch: use g_auto in virCHMonitorBuildNetsJson ch: use g_auto in virCHMonitorBuildVMJson ch: use g_auto in virCHMonitorNew src/ch/ch_monitor.c | 167 +++++++++++++++++--------------------------- 1 file changed, 63 insertions(+), 104 deletions(-) -- 2.31.1

3 14

[libvirt PATCH v4 0/4] Add a PCI/PCIe device VPD Capability
by Dmitrii Shcherbakov 22 Sep '21

22 Sep '21

Add support for deserializing the binary PCI/PCIe VPD format and exposing VPD resources as XML elements in a new nested capability of PCI/PCIe devices called 'vpd'. The series contains the following incremental changes: * The PCI VPD parser module, in-memory resource representation and tests; * VPD-related helpers added to the virpci module; * VPD capability support: XML serialization/deserialization from/into VPD resource data structures; * Documentation. The VPD format is specified in "I.3. VPD Definitions" in PCI specs (2.2+) and "6.28.1 VPD Format" PCIe 4.0. As section 6.28 in PCIe 4.0 notes, the PCI Local Bus and PCIe VPD formats are binary compatible and PCIe 4.0 merely started incorporating what was already present in PCI specs. Linux kernel exposes a binary blob in the VPD format via sysfs since v2.6.26 (commit 94e6108803469a37ee1e3c92dafdd1d59298602f) which requires a parser to interpret. There are usage scenarios where information such as the board serial number needs to be retrieved from PCI(e) VPD. Projects like Nova can utilize this information for cases which involve virtual interface plugging on SmartNIC DPUs but there may be other scenarios and types of information useful to retrieve from VPD. The fact that the format is binary requires proper parsing instead of substring searching hence the full parser is proposed. Likewise, checksum validation requires proper parsing as well. A usage example is present here: https://review.opendev.org/c/openstack/nova/+/808199 The patch follows a prior discussion on the mailing list which has additional context about the use-case but a narrower proposal: https://listman.redhat.com/archives/libvir-list/2021-May/msg00873.html https://www.mail-archive.com/libvir-list@redhat.com/msg218165.html The new functionality is mostly contained in virpcivpd with a couple of new functions added to virpci. Additionally, the necessary XML serialization/deserialization and glue code is added to expose the VPD capability to external clients as XML. A new capability flag is added along with a new capability in order to allow for filtering of PCI devices with the VPD capability using virsh: virsh nodedev-list --cap vpd sudo virsh nodedev-dumpxml --device pci_dddd_bb_ss_f In this example having the root uid is required in order to access the vpd sysfs entry, therefore, the nodedev XML output will only contain the VPD capability if virsh is run as root. The capability is treated as dynamic due to the presence of read-write sections in the VPD format per PCI/PCIe specs (the idea being that read-write resource fields may potentially be altered by the DPU OS over time independently from the host OS). Unit tests cover the parser functionality (including many possible invalid cases), in-memory representation as well as XML serialization and deserialization. Manual functional testing was performed with 2 DPUs and several other NIC models which expose PCI(e) VPD. Testing have also been performed for devices that do not have VPD or those that expose a VPD capability but exhibit invalid behavior (I/O errors while reading a sysfs entry). Per the existing guidelines, the implementation relies heavily on glib for various purposes. https://libvirt.org/glib-adoption.html The v4 of the patch includes a number of fixes compared to v3: * Fixed the patch to correctly build against older glib (2.56.0); * Notably, glib commit 86c073dba9d82ef3f1bc3d3116b058b9b5c3b1eb (in 2.59.0) fixes g_autolist support for derivable Glib types. To make things work in 2.56.0 a workaround is conditionally applied; * virCreateAnonymousFile now uses a temporary file which is unlinked after creation instead of memfd because OpenSUSE 15.2 does not have support memfd; * Keyword resources now use GTree instead of GHashTable as the underlying data structure: * This allows for stable ordering which is important for XML2XML tests as they were failing with when GLib versions were different, resulting in a different ordering of elements; * The keyword resource iteration function was complex and got replaced by a simpler g_tree_foreach-based approach; * Added more testing: functions added to virpci are now assessed by creating a mocked vpd file under a mocked sysfs structure while the parser is still tested in virpcivpdtest file; * Refactoring: * Applied changes based on the indent tool operation with some post-processing; * Renamed functions which had the Glib naming style to use camel case where possible. Auto-generated declarations are an exception: gobject/gtype.h defines type_name##_init, type_name##_class_init, module_obj_name##_get_type functions which were left unchanged; * camelCase is now used for local variables and function parameters; * Replaced //-style comments with multi-line ones; * Split out one patch into 4 based on distinct features: * PCI VPD parser functionality and the respective in-memory types; * VPD helpers in virpci; * XML serialization/deserialization and VPD capability support; * Documentation. Build & test results for targets in ci/manifest.yaml: ci/helper test --meson-args='-Dexpensive_tests=enabled' <target> * First Patch: https://gist.github.com/dshcherb/8388165df0b62b71c2c95fbc351d1aee * Patches 1 and 2: https://gist.github.com/dshcherb/33c3f0f6e717788aea24b5dae2210f38 * Patches 1, 2 and 3: https://gist.github.com/dshcherb/400bcb13d01fd28030f4986e3e178262 * All patches: https://gist.github.com/dshcherb/b2fc8bd3a349f6357a25da85c542dda3 Dmitrii Shcherbakov (4): Add a PCI/PCIe device VPD Parser Add PCI VPD-related helper functions to virpci Add PCI VPD Capability Support Add PCI VPD Capability Documentation build-aux/syntax-check.mk | 4 +- docs/drvnodedev.html.in | 46 ++ docs/formatnode.html.in | 24 +- docs/schemas/nodedev.rng | 40 + include/libvirt/libvirt-nodedev.h | 1 + po/POTFILES.in | 1 + src/conf/node_device_conf.c | 271 +++++++ src/conf/node_device_conf.h | 6 +- src/conf/virnodedeviceobj.c | 7 +- src/libvirt_private.syms | 17 + src/node_device/node_device_driver.c | 2 + src/node_device/node_device_udev.c | 2 + src/util/meson.build | 1 + src/util/virpci.c | 62 ++ src/util/virpci.h | 3 + src/util/virpcivpd.c | 755 ++++++++++++++++++ src/util/virpcivpd.h | 117 +++ src/util/virpcivpdpriv.h | 45 ++ tests/meson.build | 1 + .../pci_0000_42_00_0_vpd.xml | 33 + .../pci_0000_42_00_0_vpd.xml | 1 + tests/nodedevxml2xmltest.c | 1 + tests/testutils.c | 40 + tests/testutils.h | 4 + tests/virpcimock.c | 30 + tests/virpcitest.c | 64 ++ tests/virpcivpdtest.c | 704 ++++++++++++++++ tools/virsh-nodedev.c | 3 + 28 files changed, 2280 insertions(+), 5 deletions(-) create mode 100644 src/util/virpcivpd.c create mode 100644 src/util/virpcivpd.h create mode 100644 src/util/virpcivpdpriv.h create mode 100644 tests/nodedevschemadata/pci_0000_42_00_0_vpd.xml create mode 120000 tests/nodedevxml2xmlout/pci_0000_42_00_0_vpd.xml create mode 100644 tests/virpcivpdtest.c -- 2.30.2

1 5

[RFC PATCH 0/1] qemuxml2argvtest: Add DO_TEST_CAPS_LATEST cases for every input file
by Peter Krempa 22 Sep '21

22 Sep '21

Our QEMU commandline generation testsuite has still quite a few test cases based on fake capabilities. This might be okay in many cases but comparably doesn't scale with any real use case. I propose we add a DO_TEST_CAPS_LATEST case for every test case we have (currently this patch does it only for DO_TEST_NOCAPS as example). In this instance since we are keeping the old test too we can approach it IMO by just trusting that they are okay. The DO_TEST_NOCAPS were simple enough for now, but DO_TEST caused few more problems, thus I'm keeping this open for discussion or potentially somebody stepping up and fixing another set of test cases as I've did with 'disk'-related cases. Peter Krempa (1): qemuxml2argvtest: Add 'latest' test case for each DO_TEST_NOCAPS case

1 1

[PATCH 00/20] qemuxml2argvtest: Cleanup and modernize disk-related (and other) tests
by Peter Krempa 22 Sep '21

22 Sep '21

This series cleans up disk related tests and ensures that all use real capabilities. This is preparation for an upcoming RFC patch adding real caps test for everything. Peter Krempa (20): testCompareXMLToArgv: Avoid use of uninitialized 'monitor_chr' testQemuInfoInitArgs: Report error if path to 'latest' caps for an arch is NULL qemuxml2argvtest: Remove 'boot-strict' case qemuxml2argvtest: Agregate all 'disk'-related test cases qemuxml2argvtest: Remove fake caps versions of disk tests we have a versioned test for qemuxml2argvtest: Remove negative case for 'luks-disks-source-qcow2' qemuxml2argvtest: Remove 'disk-usb-nosupport' case qemuxml2argvtest: Convert encrypted disk test cases to DO_TEST_CAPS_LATEST qemuxml2argvtest: Use DO_TEST_CAPS_LATEST_PARSE_ERROR for disk cases qemuxml2argvtest: Use real caps for all disk frontend property tests qemuxml2argvtest: Replace 'disk-network-iscsi' by the more comprehensive 'disk-network-iscsi-modern' qemuxml2argvtest: Merge 'disk-iscsi' case into 'disk-cache' qemuxml2argvtest: Modernize 'disk-network-rbd-no-colon' case qemuxml2argvtest: Modernize outstanding disk-backend related tests qemuxml2argvtest: Modernize 'disk-floppy-pseries' case qemuxml2argvtest: Modernize s390x disk tests tests: qemu: Remove 'virtio-ccw' machine type from fake capabilities qemuxml2argvtest: Use versioned ("4.1.0") capabilities for pre '-audiodev' cases qemuxml2argvtest: Pin old-style '-no-reboot' usage to qemu-5.2 qemuxml2argvtest: remove 'fs9p' cases with fake capabilities. .../qemuhotplug-base-ccw-live+ccw-virtio.xml | 2 +- ...ith-2-ccw-virtio+ccw-virtio-1-explicit.xml | 2 +- ...with-2-ccw-virtio+ccw-virtio-1-reverse.xml | 2 +- ...otplug-base-ccw-live-with-2-ccw-virtio.xml | 2 +- ...-with-ccw-virtio+ccw-virtio-2-explicit.xml | 2 +- ...-ccw-live-with-ccw-virtio+ccw-virtio-2.xml | 2 +- ...uhotplug-base-ccw-live-with-ccw-virtio.xml | 2 +- .../qemuhotplug-base-ccw-live.xml | 2 +- ...args => audio-alsa-best.x86_64-4.1.0.args} | 9 +- ...l.err => audio-alsa-full.x86_64-4.1.0.err} | 0 ...s => audio-alsa-minimal.x86_64-4.1.0.args} | 9 +- ...=> audio-coreaudio-best.x86_64-4.1.0.args} | 9 +- ... => audio-coreaudio-full.x86_64-4.1.0.err} | 0 ...audio-coreaudio-minimal.x86_64-4.1.0.args} | 9 +- ...udio-default-nographics.x86_64-4.1.0.args} | 9 +- ...args => audio-file-best.x86_64-4.1.0.args} | 9 +- ...l.err => audio-file-full.x86_64-4.1.0.err} | 0 ...s => audio-file-minimal.x86_64-4.1.0.args} | 9 +- ...l.err => audio-jack-full.x86_64-4.1.0.err} | 0 ...rr => audio-jack-minimal.x86_64-4.1.0.err} | 0 ...r => audio-many-backends.x86_64-4.1.0.err} | 0 ...args => audio-none-best.x86_64-4.1.0.args} | 9 +- ...l.err => audio-none-full.x86_64-4.1.0.err} | 0 ...s => audio-none-minimal.x86_64-4.1.0.args} | 9 +- ....args => audio-oss-best.x86_64-4.1.0.args} | 9 +- ...ll.err => audio-oss-full.x86_64-4.1.0.err} | 0 ...gs => audio-oss-minimal.x86_64-4.1.0.args} | 9 +- ...> audio-pulseaudio-best.x86_64-4.1.0.args} | 9 +- ...=> audio-pulseaudio-full.x86_64-4.1.0.err} | 0 ...udio-pulseaudio-minimal.x86_64-4.1.0.args} | 9 +- ....args => audio-sdl-best.x86_64-4.1.0.args} | 9 +- ...ll.err => audio-sdl-full.x86_64-4.1.0.err} | 0 ...gs => audio-sdl-minimal.x86_64-4.1.0.args} | 9 +- ...rgs => audio-spice-best.x86_64-4.1.0.args} | 9 +- ....err => audio-spice-full.x86_64-4.1.0.err} | 0 ... => audio-spice-minimal.x86_64-4.1.0.args} | 9 +- .../qemuxml2argvdata/balloon-ccw-deflate.args | 2 +- .../qemuxml2argvdata/balloon-ccw-deflate.xml | 2 +- tests/qemuxml2argvdata/boot-strict.args | 48 ---- tests/qemuxml2argvdata/boot-strict.xml | 66 ----- .../qemuxml2argvdata/console-virtio-ccw.args | 2 +- tests/qemuxml2argvdata/console-virtio-ccw.xml | 2 +- ...> disk-address-conflict.x86_64-latest.err} | 0 tests/qemuxml2argvdata/disk-aio.args | 34 --- tests/qemuxml2argvdata/disk-blockio.args | 34 --- .../disk-blockio.x86_64-latest.args | 39 +++ tests/qemuxml2argvdata/disk-boot-cdrom.args | 33 --- .../disk-boot-cdrom.x86_64-latest.args | 38 +++ tests/qemuxml2argvdata/disk-boot-disk.args | 33 --- .../disk-boot-disk.x86_64-latest.args | 38 +++ .../disk-cache.x86_64-2.12.0.args | 2 +- .../disk-cache.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-cache.xml | 2 +- .../qemuxml2argvdata/disk-cdrom-network.args | 35 --- tests/qemuxml2argvdata/disk-cdrom-tray.args | 36 --- tests/qemuxml2argvdata/disk-cdrom.args | 37 --- tests/qemuxml2argvdata/disk-copy_on_read.args | 37 --- ...device-lun-type-invalid.x86_64-latest.err} | 0 tests/qemuxml2argvdata/disk-error-policy.args | 35 --- ...dc-incompatible-address.x86_64-latest.err} | 0 ...r => disk-floppy-pseries.ppc64-latest.err} | 0 tests/qemuxml2argvdata/disk-floppy-tray.args | 36 --- .../disk-floppy-tray.x86_64-latest.args | 42 +++ tests/qemuxml2argvdata/disk-floppy.args | 35 --- ...cow.err => disk-fmt-cow.x86_64-latest.err} | 0 ...dir.err => disk-fmt-dir.x86_64-latest.err} | 0 ...iso.err => disk-fmt-iso.x86_64-latest.err} | 0 ...w.args => disk-fmt-qcow.x86_64-4.1.0.args} | 9 +- .../disk-fmt-qcow.x86_64-latest.args | 38 +++ tests/qemuxml2argvdata/disk-geometry.args | 32 --- .../disk-geometry.x86_64-latest.args | 36 +++ ...v-scsi-address-conflict.x86_64-latest.err} | 0 ...de-incompatible-address.x86_64-latest.err} | 0 tests/qemuxml2argvdata/disk-ide-split.args | 34 --- .../disk-ide-split.x86_64-latest.args | 39 +++ tests/qemuxml2argvdata/disk-ide-wwn.args | 32 --- .../disk-ide-wwn.x86_64-latest.args | 36 +++ tests/qemuxml2argvdata/disk-ioeventfd.args | 37 --- .../disk-ioeventfd.x86_64-latest.args | 42 +++ tests/qemuxml2argvdata/disk-iscsi.args | 31 --- tests/qemuxml2argvdata/disk-iscsi.xml | 28 -- ...-missing-target-invalid.x86_64-latest.err} | 0 .../disk-network-gluster.args | 35 --- ...auth-secrettype-invalid.x86_64-latest.err} | 0 ...i-auth-wrong-secrettype.x86_64-latest.err} | 0 .../disk-network-iscsi-modern.args | 47 ---- .../disk-network-iscsi-modern.xml | 88 ------ .../qemuxml2argvdata/disk-network-iscsi.args | 42 --- .../disk-network-iscsi.x86_64-2.12.0.args | 5 + .../disk-network-iscsi.x86_64-latest.args | 31 ++- tests/qemuxml2argvdata/disk-network-iscsi.xml | 25 +- tests/qemuxml2argvdata/disk-network-nbd.args | 39 --- ...isk-network-rbd-no-colon.x86_64-4.1.0.err} | 0 ...sk-network-rbd-no-colon.x86_64-latest.args | 39 +++ .../disk-network-sheepdog.args | 33 --- ...etwork-source-auth-both.x86_64-latest.err} | 0 .../disk-network-source-auth.args | 38 --- tests/qemuxml2argvdata/disk-network-vxhs.args | 32 --- tests/qemuxml2argvdata/disk-no-boot.args | 36 --- .../disk-no-boot.x86_64-latest.args | 42 +++ tests/qemuxml2argvdata/disk-order.args | 38 --- .../disk-order.x86_64-latest.args | 45 +++ .../qemuxml2argvdata/disk-readonly-disk.args | 34 --- ...rr => disk-same-targets.x86_64-latest.err} | 0 tests/qemuxml2argvdata/disk-sata-device.args | 33 --- .../disk-sata-device.x86_64-latest.args | 37 +++ ...ta-incompatible-address.x86_64-latest.err} | 0 .../disk-scsi-disk-split.args | 42 --- .../disk-scsi-disk-split.x86_64-latest.args | 49 ++++ ...si-disk-vpd-build-error.x86_64-latest.err} | 0 .../qemuxml2argvdata/disk-scsi-disk-vpd.args | 36 --- .../disk-scsi-disk-vpd.x86_64-latest.args | 41 +++ .../qemuxml2argvdata/disk-scsi-disk-wwn.args | 36 --- .../disk-scsi-disk-wwn.x86_64-latest.args | 41 +++ ...si-incompatible-address.x86_64-latest.err} | 0 .../disk-scsi-lun-passthrough.args | 36 --- ...sk-scsi-lun-passthrough.x86_64-latest.args | 41 +++ tests/qemuxml2argvdata/disk-serial.args | 35 --- .../disk-serial.x86_64-latest.args | 40 +++ ...err => disk-shared-qcow.x86_64-latest.err} | 0 tests/qemuxml2argvdata/disk-snapshot.args | 36 --- .../disk-snapshot.x86_64-latest.args | 42 +++ ...> disk-source-pool-mode.x86_64-4.1.0.args} | 9 +- .../disk-source-pool-mode.x86_64-latest.args | 45 +++ ...rgs => disk-source-pool.x86_64-4.1.0.args} | 13 +- .../disk-source-pool.x86_64-latest.args | 46 +++ .../disk-usb-device-removable.args | 34 --- ...sk-usb-device-removable.x86_64-latest.args | 39 +++ tests/qemuxml2argvdata/disk-usb-device.args | 34 --- .../disk-usb-device.x86_64-latest.args | 39 +++ tests/qemuxml2argvdata/disk-usb-nosupport.err | 1 - tests/qemuxml2argvdata/disk-usb-nosupport.xml | 35 --- ...pci.err => disk-usb-pci.x86_64-latest.err} | 0 .../disk-virtio-ccw-many.args | 36 --- .../disk-virtio-ccw-many.s390x-latest.args | 43 +++ .../qemuxml2argvdata/disk-virtio-ccw-many.xml | 2 +- tests/qemuxml2argvdata/disk-virtio-ccw.args | 32 --- .../disk-virtio-ccw.s390x-latest.args | 37 +++ tests/qemuxml2argvdata/disk-virtio-ccw.xml | 2 +- .../disk-virtio-s390-zpci.args | 31 --- .../disk-virtio-s390-zpci.s390x-latest.args | 35 +++ tests/qemuxml2argvdata/disk-virtio.args | 37 --- .../disk-virtio.x86_64-latest.args | 44 +++ ...=> encrypted-disk-usage.x86_64-4.1.0.args} | 11 +- .../encrypted-disk-usage.x86_64-latest.args | 37 +++ ....args => encrypted-disk.x86_64-4.1.0.args} | 11 +- .../encrypted-disk.x86_64-latest.args | 37 +++ tests/qemuxml2argvdata/event_idx.args | 37 --- .../event_idx.x86_64-latest.args | 42 +++ tests/qemuxml2argvdata/floppy-drive-fat.args | 33 --- tests/qemuxml2argvdata/fs9p-ccw.args | 36 --- tests/qemuxml2argvdata/fs9p.args | 34 --- .../hostdev-scsi-vhost-scsi-ccw.args | 2 +- .../hostdev-scsi-vhost-scsi-ccw.xml | 2 +- ...-drive-address-conflict.x86_64-latest.err} | 0 .../iothreads-disk-virtio-ccw.args | 2 +- .../iothreads-disk-virtio-ccw.xml | 2 +- ...rr => luks-disk-invalid.x86_64-latest.err} | 0 ... luks-disks-source-both.x86_64-latest.err} | 0 .../luks-disks-source-qcow2.err | 1 - ...gs => luks-disks-source.x86_64-4.1.0.args} | 17 +- .../luks-disks-source.x86_64-latest.args | 54 ++++ ...isks.args => luks-disks.x86_64-4.1.0.args} | 11 +- .../luks-disks.x86_64-latest.args | 41 +++ tests/qemuxml2argvdata/misc-no-reboot.args | 31 --- .../misc-no-reboot.x86_64-5.2.0.args | 35 +++ tests/qemuxml2argvdata/net-virtio-ccw.args | 2 +- tests/qemuxml2argvdata/net-virtio-ccw.xml | 2 +- .../non-x86_64-timer-error.err | 2 +- .../non-x86_64-timer-error.xml | 2 +- tests/qemuxml2argvdata/virtio-lun.args | 37 --- .../virtio-lun.x86_64-latest.args | 42 +++ tests/qemuxml2argvdata/virtio-rng-ccw.args | 2 +- tests/qemuxml2argvdata/virtio-rng-ccw.xml | 2 +- tests/qemuxml2argvtest.c | 261 +++++++----------- .../disk-cache.x86_64-2.12.0.xml | 2 +- .../disk-cache.x86_64-latest.xml | 2 +- .../qemuxml2xmloutdata/disk-network-iscsi.xml | 25 ++ .../hostdev-scsi-vhost-scsi-ccw.xml | 2 +- .../iothreads-disk-virtio-ccw.xml | 2 +- tests/testutilsqemu.c | 8 +- 181 files changed, 1726 insertions(+), 2164 deletions(-) rename tests/qemuxml2argvdata/{audio-alsa-best.args => audio-alsa-best.x86_64-4.1.0.args} (81%) rename tests/qemuxml2argvdata/{audio-alsa-full.err => audio-alsa-full.x86_64-4.1.0.err} (100%) rename tests/qemuxml2argvdata/{audio-alsa-minimal.args => audio-alsa-minimal.x86_64-4.1.0.args} (75%) rename tests/qemuxml2argvdata/{audio-coreaudio-best.args => audio-coreaudio-best.x86_64-4.1.0.args} (81%) rename tests/qemuxml2argvdata/{audio-coreaudio-full.err => audio-coreaudio-full.x86_64-4.1.0.err} (100%) rename tests/qemuxml2argvdata/{audio-coreaudio-minimal.args => audio-coreaudio-minimal.x86_64-4.1.0.args} (75%) rename tests/qemuxml2argvdata/{audio-default-nographics.args => audio-default-nographics.x86_64-4.1.0.args} (75%) rename tests/qemuxml2argvdata/{audio-file-best.args => audio-file-best.x86_64-4.1.0.args} (81%) rename tests/qemuxml2argvdata/{audio-file-full.err => audio-file-full.x86_64-4.1.0.err} (100%) rename tests/qemuxml2argvdata/{audio-file-minimal.args => audio-file-minimal.x86_64-4.1.0.args} (75%) rename tests/qemuxml2argvdata/{audio-jack-full.err => audio-jack-full.x86_64-4.1.0.err} (100%) rename tests/qemuxml2argvdata/{audio-jack-minimal.err => audio-jack-minimal.x86_64-4.1.0.err} (100%) rename tests/qemuxml2argvdata/{audio-many-backends.err => audio-many-backends.x86_64-4.1.0.err} (100%) rename tests/qemuxml2argvdata/{audio-none-best.args => audio-none-best.x86_64-4.1.0.args} (80%) rename tests/qemuxml2argvdata/{audio-none-full.err => audio-none-full.x86_64-4.1.0.err} (100%) rename tests/qemuxml2argvdata/{audio-none-minimal.args => audio-none-minimal.x86_64-4.1.0.args} (75%) rename tests/qemuxml2argvdata/{audio-oss-best.args => audio-oss-best.x86_64-4.1.0.args} (82%) rename tests/qemuxml2argvdata/{audio-oss-full.err => audio-oss-full.x86_64-4.1.0.err} (100%) rename tests/qemuxml2argvdata/{audio-oss-minimal.args => audio-oss-minimal.x86_64-4.1.0.args} (75%) rename tests/qemuxml2argvdata/{audio-pulseaudio-best.args => audio-pulseaudio-best.x86_64-4.1.0.args} (82%) rename tests/qemuxml2argvdata/{audio-pulseaudio-full.err => audio-pulseaudio-full.x86_64-4.1.0.err} (100%) rename tests/qemuxml2argvdata/{audio-pulseaudio-minimal.args => audio-pulseaudio-minimal.x86_64-4.1.0.args} (75%) rename tests/qemuxml2argvdata/{audio-sdl-best.args => audio-sdl-best.x86_64-4.1.0.args} (81%) rename tests/qemuxml2argvdata/{audio-sdl-full.err => audio-sdl-full.x86_64-4.1.0.err} (100%) rename tests/qemuxml2argvdata/{audio-sdl-minimal.args => audio-sdl-minimal.x86_64-4.1.0.args} (75%) rename tests/qemuxml2argvdata/{audio-spice-best.args => audio-spice-best.x86_64-4.1.0.args} (80%) rename tests/qemuxml2argvdata/{audio-spice-full.err => audio-spice-full.x86_64-4.1.0.err} (100%) rename tests/qemuxml2argvdata/{audio-spice-minimal.args => audio-spice-minimal.x86_64-4.1.0.args} (75%) delete mode 100644 tests/qemuxml2argvdata/boot-strict.args delete mode 100644 tests/qemuxml2argvdata/boot-strict.xml rename tests/qemuxml2argvdata/{disk-address-conflict.err => disk-address-conflict.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/disk-aio.args delete mode 100644 tests/qemuxml2argvdata/disk-blockio.args create mode 100644 tests/qemuxml2argvdata/disk-blockio.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/disk-boot-cdrom.args create mode 100644 tests/qemuxml2argvdata/disk-boot-cdrom.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/disk-boot-disk.args create mode 100644 tests/qemuxml2argvdata/disk-boot-disk.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network.args delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-tray.args delete mode 100644 tests/qemuxml2argvdata/disk-cdrom.args delete mode 100644 tests/qemuxml2argvdata/disk-copy_on_read.args rename tests/qemuxml2argvdata/{disk-device-lun-type-invalid.err => disk-device-lun-type-invalid.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/disk-error-policy.args rename tests/qemuxml2argvdata/{disk-fdc-incompatible-address.err => disk-fdc-incompatible-address.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{disk-floppy-pseries.err => disk-floppy-pseries.ppc64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/disk-floppy-tray.args create mode 100644 tests/qemuxml2argvdata/disk-floppy-tray.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/disk-floppy.args rename tests/qemuxml2argvdata/{disk-fmt-cow.err => disk-fmt-cow.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{disk-fmt-dir.err => disk-fmt-dir.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{disk-fmt-iso.err => disk-fmt-iso.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{disk-fmt-qcow.args => disk-fmt-qcow.x86_64-4.1.0.args} (77%) create mode 100644 tests/qemuxml2argvdata/disk-fmt-qcow.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/disk-geometry.args create mode 100644 tests/qemuxml2argvdata/disk-geometry.x86_64-latest.args rename tests/qemuxml2argvdata/{disk-hostdev-scsi-address-conflict.err => disk-hostdev-scsi-address-conflict.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{disk-ide-incompatible-address.err => disk-ide-incompatible-address.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/disk-ide-split.args create mode 100644 tests/qemuxml2argvdata/disk-ide-split.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/disk-ide-wwn.args create mode 100644 tests/qemuxml2argvdata/disk-ide-wwn.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/disk-ioeventfd.args create mode 100644 tests/qemuxml2argvdata/disk-ioeventfd.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/disk-iscsi.args delete mode 100644 tests/qemuxml2argvdata/disk-iscsi.xml rename tests/qemuxml2argvdata/{disk-missing-target-invalid.err => disk-missing-target-invalid.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/disk-network-gluster.args rename tests/qemuxml2argvdata/{disk-network-iscsi-auth-secrettype-invalid.err => disk-network-iscsi-auth-secrettype-invalid.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{disk-network-iscsi-auth-wrong-secrettype.err => disk-network-iscsi-auth-wrong-secrettype.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/disk-network-iscsi-modern.args delete mode 100644 tests/qemuxml2argvdata/disk-network-iscsi-modern.xml delete mode 100644 tests/qemuxml2argvdata/disk-network-iscsi.args delete mode 100644 tests/qemuxml2argvdata/disk-network-nbd.args rename tests/qemuxml2argvdata/{disk-network-rbd-no-colon.err => disk-network-rbd-no-colon.x86_64-4.1.0.err} (100%) create mode 100644 tests/qemuxml2argvdata/disk-network-rbd-no-colon.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/disk-network-sheepdog.args rename tests/qemuxml2argvdata/{disk-network-source-auth-both.err => disk-network-source-auth-both.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/disk-network-source-auth.args delete mode 100644 tests/qemuxml2argvdata/disk-network-vxhs.args delete mode 100644 tests/qemuxml2argvdata/disk-no-boot.args create mode 100644 tests/qemuxml2argvdata/disk-no-boot.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/disk-order.args create mode 100644 tests/qemuxml2argvdata/disk-order.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/disk-readonly-disk.args rename tests/qemuxml2argvdata/{disk-same-targets.err => disk-same-targets.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/disk-sata-device.args create mode 100644 tests/qemuxml2argvdata/disk-sata-device.x86_64-latest.args rename tests/qemuxml2argvdata/{disk-sata-incompatible-address.err => disk-sata-incompatible-address.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/disk-scsi-disk-split.args create mode 100644 tests/qemuxml2argvdata/disk-scsi-disk-split.x86_64-latest.args rename tests/qemuxml2argvdata/{disk-scsi-disk-vpd-build-error.err => disk-scsi-disk-vpd-build-error.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/disk-scsi-disk-vpd.args create mode 100644 tests/qemuxml2argvdata/disk-scsi-disk-vpd.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/disk-scsi-disk-wwn.args create mode 100644 tests/qemuxml2argvdata/disk-scsi-disk-wwn.x86_64-latest.args rename tests/qemuxml2argvdata/{disk-scsi-incompatible-address.err => disk-scsi-incompatible-address.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args create mode 100644 tests/qemuxml2argvdata/disk-scsi-lun-passthrough.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/disk-serial.args create mode 100644 tests/qemuxml2argvdata/disk-serial.x86_64-latest.args rename tests/qemuxml2argvdata/{disk-shared-qcow.err => disk-shared-qcow.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/disk-snapshot.args create mode 100644 tests/qemuxml2argvdata/disk-snapshot.x86_64-latest.args rename tests/qemuxml2argvdata/{disk-source-pool-mode.args => disk-source-pool-mode.x86_64-4.1.0.args} (84%) create mode 100644 tests/qemuxml2argvdata/disk-source-pool-mode.x86_64-latest.args rename tests/qemuxml2argvdata/{disk-source-pool.args => disk-source-pool.x86_64-4.1.0.args} (73%) create mode 100644 tests/qemuxml2argvdata/disk-source-pool.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/disk-usb-device-removable.args create mode 100644 tests/qemuxml2argvdata/disk-usb-device-removable.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/disk-usb-device.args create mode 100644 tests/qemuxml2argvdata/disk-usb-device.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/disk-usb-nosupport.err delete mode 100644 tests/qemuxml2argvdata/disk-usb-nosupport.xml rename tests/qemuxml2argvdata/{disk-usb-pci.err => disk-usb-pci.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/disk-virtio-ccw-many.args create mode 100644 tests/qemuxml2argvdata/disk-virtio-ccw-many.s390x-latest.args delete mode 100644 tests/qemuxml2argvdata/disk-virtio-ccw.args create mode 100644 tests/qemuxml2argvdata/disk-virtio-ccw.s390x-latest.args delete mode 100644 tests/qemuxml2argvdata/disk-virtio-s390-zpci.args create mode 100644 tests/qemuxml2argvdata/disk-virtio-s390-zpci.s390x-latest.args delete mode 100644 tests/qemuxml2argvdata/disk-virtio.args create mode 100644 tests/qemuxml2argvdata/disk-virtio.x86_64-latest.args rename tests/qemuxml2argvdata/{encrypted-disk-usage.args => encrypted-disk-usage.x86_64-4.1.0.args} (74%) create mode 100644 tests/qemuxml2argvdata/encrypted-disk-usage.x86_64-latest.args rename tests/qemuxml2argvdata/{encrypted-disk.args => encrypted-disk.x86_64-4.1.0.args} (74%) create mode 100644 tests/qemuxml2argvdata/encrypted-disk.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/event_idx.args create mode 100644 tests/qemuxml2argvdata/event_idx.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/floppy-drive-fat.args delete mode 100644 tests/qemuxml2argvdata/fs9p-ccw.args delete mode 100644 tests/qemuxml2argvdata/fs9p.args rename tests/qemuxml2argvdata/{hostdevs-drive-address-conflict.err => hostdevs-drive-address-conflict.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{luks-disk-invalid.err => luks-disk-invalid.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{luks-disks-source-both.err => luks-disks-source-both.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/luks-disks-source-qcow2.err rename tests/qemuxml2argvdata/{luks-disks-source.args => luks-disks-source.x86_64-4.1.0.args} (80%) create mode 100644 tests/qemuxml2argvdata/luks-disks-source.x86_64-latest.args rename tests/qemuxml2argvdata/{luks-disks.args => luks-disks.x86_64-4.1.0.args} (77%) create mode 100644 tests/qemuxml2argvdata/luks-disks.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/misc-no-reboot.args create mode 100644 tests/qemuxml2argvdata/misc-no-reboot.x86_64-5.2.0.args delete mode 100644 tests/qemuxml2argvdata/virtio-lun.args create mode 100644 tests/qemuxml2argvdata/virtio-lun.x86_64-latest.args -- 2.31.1

2 23

[PATCH 00/12] qemu: Remove code for old insecure secret passing
by Peter Krempa 22 Sep '21

22 Sep '21

We are at the point where we can remove all the code to pass secrets (RBD/iSCSI authentication passwords) on the commandline in plaintext as all supported versions of qemu now support -object secret and the corresponding methods to pass the secrets securely. Peter Krempa (12): util: Remove use of virCryptoHaveCipher(VIR_CRYPTO_CIPHER_AES256CBC) qemu: Always assume presence of QEMU_CAPS_OBJECT_SECRET qemu: capabilities: Retire QEMU_CAPS_OBJECT_SECRET qemu: domain: Remove qemuDomainSupportsEncryptedSecret qemu: domain: Always assume QEMU_CAPS_ISCSI_PASSWORD_SECRET qemu: capabilities: Retire QEMU_CAPS_ISCSI_PASSWORD_SECRET qemu: Remove VIR_DOMAIN_SECRET_INFO_TYPE_PLAIN and associated code qemu: command: Remove qemuBuildGeneralSecinfoURI qemuBuildSCSIiSCSIHostdevDrvStr: Don't call qemuDiskSourceNeedsProps qemu: Simplify qemuDomainSecretInfo qemu: domain: Rename secrets setup function qemu: command: Remove qemuBuildRBDSecinfoURI src/libvirt_private.syms | 1 - src/qemu/qemu_backup.c | 2 +- src/qemu/qemu_block.c | 40 ++- src/qemu/qemu_capabilities.c | 6 +- src/qemu/qemu_capabilities.h | 4 +- src/qemu/qemu_command.c | 184 +++--------- src/qemu/qemu_domain.c | 274 ++++-------------- src/qemu/qemu_domain.h | 31 +- src/qemu/qemu_hotplug.c | 4 +- src/qemu/qemu_migration_params.c | 2 +- src/storage/storage_util.c | 6 - src/util/vircrypto.c | 27 -- src/util/vircrypto.h | 2 - tests/qemublocktest.c | 13 +- .../caps_2.11.0.s390x.xml | 2 - .../caps_2.11.0.x86_64.xml | 2 - .../caps_2.12.0.aarch64.xml | 2 - .../caps_2.12.0.ppc64.xml | 2 - .../caps_2.12.0.s390x.xml | 2 - .../caps_2.12.0.x86_64.xml | 2 - .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 2 - .../caps_3.0.0.riscv32.xml | 2 - .../caps_3.0.0.riscv64.xml | 2 - .../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 2 - .../caps_3.0.0.x86_64.xml | 2 - .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 2 - .../caps_3.1.0.x86_64.xml | 2 - .../caps_4.0.0.aarch64.xml | 2 - .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 2 - .../caps_4.0.0.riscv32.xml | 2 - .../caps_4.0.0.riscv64.xml | 2 - .../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 2 - .../caps_4.0.0.x86_64.xml | 2 - .../caps_4.1.0.x86_64.xml | 2 - .../caps_4.2.0.aarch64.xml | 2 - .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 2 - .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 2 - .../caps_4.2.0.x86_64.xml | 2 - .../caps_5.0.0.aarch64.xml | 2 - .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 2 - .../caps_5.0.0.riscv64.xml | 2 - .../caps_5.0.0.x86_64.xml | 2 - .../qemucapabilitiesdata/caps_5.1.0.sparc.xml | 2 - .../caps_5.1.0.x86_64.xml | 2 - .../caps_5.2.0.aarch64.xml | 2 - .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 2 - .../caps_5.2.0.riscv64.xml | 2 - .../qemucapabilitiesdata/caps_5.2.0.s390x.xml | 2 - .../caps_5.2.0.x86_64.xml | 2 - .../caps_6.0.0.aarch64.xml | 2 - .../qemucapabilitiesdata/caps_6.0.0.s390x.xml | 2 - .../caps_6.0.0.x86_64.xml | 2 - .../caps_6.1.0.x86_64.xml | 2 - .../aarch64-aavmf-virtio-mmio.args | 1 + tests/qemuxml2argvdata/aarch64-acpi-uefi.args | 1 + .../aarch64-cpu-passthrough.args | 1 + tests/qemuxml2argvdata/aarch64-gic-host.args | 1 + .../aarch64-gic-none-tcg.args | 1 + tests/qemuxml2argvdata/aarch64-gic-v2.args | 1 + tests/qemuxml2argvdata/aarch64-gic-v3.args | 1 + .../aarch64-kvm-32-on-64.args | 1 + .../aarch64-noacpi-nouefi.args | 1 + .../qemuxml2argvdata/aarch64-noacpi-uefi.args | 1 + .../qemuxml2argvdata/aarch64-pci-serial.args | 1 + .../aarch64-traditional-pci.args | 1 + .../aarch64-usb-controller-nec-xhci.args | 1 + .../aarch64-usb-controller-qemu-xhci.args | 1 + .../aarch64-video-default.args | 1 + .../aarch64-video-virtio-gpu-pci.args | 1 + .../aarch64-virt-2.6-virtio-pci-default.args | 1 + .../aarch64-virt-default-nic.args | 1 + .../qemuxml2argvdata/aarch64-virt-virtio.args | 1 + .../aarch64-virtio-pci-default.args | 1 + .../aarch64-virtio-pci-manual-addresses.args | 1 + tests/qemuxml2argvdata/acpi-table.args | 1 + .../arm-vexpressa9-basic.args | 1 + .../arm-vexpressa9-nodevs.args | 1 + .../arm-vexpressa9-virtio.args | 1 + tests/qemuxml2argvdata/arm-virt-virtio.args | 1 + tests/qemuxml2argvdata/audio-alsa-best.args | 1 + .../qemuxml2argvdata/audio-alsa-minimal.args | 1 + .../audio-coreaudio-best.args | 1 + .../audio-coreaudio-minimal.args | 1 + .../audio-default-nographics.args | 1 + tests/qemuxml2argvdata/audio-default-sdl.args | 1 + .../qemuxml2argvdata/audio-default-spice.args | 1 + tests/qemuxml2argvdata/audio-default-vnc.args | 1 + tests/qemuxml2argvdata/audio-file-best.args | 1 + .../qemuxml2argvdata/audio-file-minimal.args | 1 + tests/qemuxml2argvdata/audio-none-best.args | 1 + .../qemuxml2argvdata/audio-none-minimal.args | 1 + tests/qemuxml2argvdata/audio-oss-best.args | 1 + tests/qemuxml2argvdata/audio-oss-minimal.args | 1 + .../audio-pulseaudio-best.args | 1 + .../audio-pulseaudio-minimal.args | 1 + tests/qemuxml2argvdata/audio-sdl-best.args | 1 + tests/qemuxml2argvdata/audio-sdl-minimal.args | 1 + tests/qemuxml2argvdata/audio-spice-best.args | 1 + .../qemuxml2argvdata/audio-spice-minimal.args | 1 + tests/qemuxml2argvdata/autoindex.args | 1 + .../qemuxml2argvdata/balloon-ccw-deflate.args | 1 + .../qemuxml2argvdata/balloon-device-auto.args | 1 + .../balloon-device-deflate-off.args | 1 + .../balloon-device-deflate.args | 1 + .../balloon-device-period.args | 1 + tests/qemuxml2argvdata/balloon-device.args | 1 + .../balloon-mmio-deflate.args | 1 + tests/qemuxml2argvdata/bios-nvram-secure.args | 1 + tests/qemuxml2argvdata/bios-nvram.args | 1 + tests/qemuxml2argvdata/bios.args | 1 + tests/qemuxml2argvdata/blkiotune-device.args | 1 + tests/qemuxml2argvdata/blkiotune.args | 1 + tests/qemuxml2argvdata/boot-cdrom.args | 1 + tests/qemuxml2argvdata/boot-complex.args | 1 + tests/qemuxml2argvdata/boot-floppy-q35.args | 1 + tests/qemuxml2argvdata/boot-floppy.args | 1 + .../boot-menu-disable-drive.args | 1 + tests/qemuxml2argvdata/boot-menu-disable.args | 1 + .../boot-menu-enable-with-timeout.args | 1 + tests/qemuxml2argvdata/boot-menu-enable.args | 1 + tests/qemuxml2argvdata/boot-multi.args | 1 + tests/qemuxml2argvdata/boot-network.args | 1 + tests/qemuxml2argvdata/boot-order.args | 1 + tests/qemuxml2argvdata/boot-strict.args | 1 + tests/qemuxml2argvdata/channel-guestfwd.args | 1 + tests/qemuxml2argvdata/channel-spicevmc.args | 1 + .../qemuxml2argvdata/channel-virtio-auto.args | 1 + .../channel-virtio-autoadd.args | 1 + .../channel-virtio-autoassign.args | 1 + .../channel-virtio-default.args | 1 + .../channel-virtio-state.args | 1 + .../qemuxml2argvdata/channel-virtio-unix.args | 1 + tests/qemuxml2argvdata/channel-virtio.args | 1 + tests/qemuxml2argvdata/chardev-reconnect.args | 1 + tests/qemuxml2argvdata/clock-catchup.args | 1 + tests/qemuxml2argvdata/clock-france.args | 1 + tests/qemuxml2argvdata/clock-hpet-off.args | 1 + .../clock-localtime-basis-localtime.args | 1 + tests/qemuxml2argvdata/clock-localtime.args | 1 + tests/qemuxml2argvdata/clock-realtime.args | 1 + .../clock-timer-hyperv-rtc.args | 1 + tests/qemuxml2argvdata/clock-utc.args | 1 + tests/qemuxml2argvdata/clock-variable.args | 1 + .../qemuxml2argvdata/console-compat-auto.args | 1 + .../console-compat-chardev.args | 1 + tests/qemuxml2argvdata/console-compat.args | 1 + .../qemuxml2argvdata/console-virtio-ccw.args | 1 + .../qemuxml2argvdata/console-virtio-many.args | 1 + tests/qemuxml2argvdata/console-virtio.args | 1 + tests/qemuxml2argvdata/controller-order.args | 1 + tests/qemuxml2argvdata/cpu-Haswell-noTSX.args | 1 + tests/qemuxml2argvdata/cpu-Haswell.args | 1 + tests/qemuxml2argvdata/cpu-Haswell2.args | 1 + tests/qemuxml2argvdata/cpu-Haswell3.args | 1 + tests/qemuxml2argvdata/cpu-cache-disable.args | 1 + .../qemuxml2argvdata/cpu-cache-disable2.args | 1 + .../qemuxml2argvdata/cpu-cache-disable3.args | 1 + .../cpu-cache-emulate-l3.args | 1 + .../cpu-cache-passthrough.args | 1 + .../cpu-cache-passthrough2.args | 1 + .../cpu-check-default-none.args | 1 + .../cpu-check-default-none2.args | 1 + .../cpu-check-default-partial.args | 1 + .../cpu-check-default-partial2.args | 1 + tests/qemuxml2argvdata/cpu-check-none.args | 1 + tests/qemuxml2argvdata/cpu-eoi-disabled.args | 1 + tests/qemuxml2argvdata/cpu-eoi-enabled.args | 1 + tests/qemuxml2argvdata/cpu-exact1.args | 1 + .../cpu-exact2-nofallback.args | 1 + tests/qemuxml2argvdata/cpu-exact2.args | 1 + tests/qemuxml2argvdata/cpu-fallback.args | 1 + tests/qemuxml2argvdata/cpu-host-kvmclock.args | 1 + .../qemuxml2argvdata/cpu-host-model-cmt.args | 1 + .../cpu-host-model-fallback.args | 1 + .../cpu-host-model-vendor.args | 1 + tests/qemuxml2argvdata/cpu-host-model.args | 1 + .../cpu-host-passthrough-features.args | 1 + .../cpu-host-passthrough.args | 1 + .../qemuxml2argvdata/cpu-hotplug-startup.args | 1 + tests/qemuxml2argvdata/cpu-kvmclock.args | 1 + tests/qemuxml2argvdata/cpu-minimum1.args | 1 + tests/qemuxml2argvdata/cpu-minimum2.args | 1 + .../cpu-no-removed-features.args | 1 + tests/qemuxml2argvdata/cpu-numa-disjoint.args | 1 + .../qemuxml2argvdata/cpu-numa-memshared.args | 1 + .../cpu-numa-no-memory-element.args | 1 + tests/qemuxml2argvdata/cpu-numa1.args | 1 + tests/qemuxml2argvdata/cpu-numa2.args | 1 + tests/qemuxml2argvdata/cpu-s390-features.args | 1 + tests/qemuxml2argvdata/cpu-s390-zEC12.args | 1 + tests/qemuxml2argvdata/cpu-strict1.args | 1 + tests/qemuxml2argvdata/cpu-topology1.args | 1 + tests/qemuxml2argvdata/cpu-topology2.args | 1 + tests/qemuxml2argvdata/cpu-topology3.args | 1 + tests/qemuxml2argvdata/cpu-tsc-frequency.args | 1 + tests/qemuxml2argvdata/cputune-numatune.args | 1 + .../qemuxml2argvdata/cputune-zero-shares.args | 1 + tests/qemuxml2argvdata/cputune.args | 1 + .../default-kvm-host-arch.args | 1 + .../default-qemu-host-arch.args | 1 + tests/qemuxml2argvdata/disk-aio.args | 1 + tests/qemuxml2argvdata/disk-blockio.args | 1 + tests/qemuxml2argvdata/disk-boot-cdrom.args | 1 + tests/qemuxml2argvdata/disk-boot-disk.args | 1 + .../qemuxml2argvdata/disk-cdrom-network.args | 1 + tests/qemuxml2argvdata/disk-cdrom-tray.args | 1 + tests/qemuxml2argvdata/disk-cdrom.args | 1 + tests/qemuxml2argvdata/disk-copy_on_read.args | 1 + tests/qemuxml2argvdata/disk-error-policy.args | 1 + tests/qemuxml2argvdata/disk-floppy-tray.args | 1 + tests/qemuxml2argvdata/disk-floppy.args | 1 + tests/qemuxml2argvdata/disk-fmt-qcow.args | 1 + tests/qemuxml2argvdata/disk-geometry.args | 1 + tests/qemuxml2argvdata/disk-ide-split.args | 1 + tests/qemuxml2argvdata/disk-ide-wwn.args | 1 + tests/qemuxml2argvdata/disk-ioeventfd.args | 1 + tests/qemuxml2argvdata/disk-iscsi.args | 1 + .../disk-network-gluster.args | 1 + .../disk-network-iscsi-modern.args | 10 +- .../qemuxml2argvdata/disk-network-iscsi.args | 13 +- tests/qemuxml2argvdata/disk-network-nbd.args | 1 + .../disk-network-sheepdog.args | 1 + .../disk-network-source-auth.args | 10 +- tests/qemuxml2argvdata/disk-network-vxhs.args | 1 + tests/qemuxml2argvdata/disk-no-boot.args | 1 + tests/qemuxml2argvdata/disk-order.args | 1 + .../qemuxml2argvdata/disk-readonly-disk.args | 1 + tests/qemuxml2argvdata/disk-sata-device.args | 1 + .../disk-scsi-disk-split.args | 1 + .../qemuxml2argvdata/disk-scsi-disk-vpd.args | 1 + .../qemuxml2argvdata/disk-scsi-disk-wwn.args | 1 + .../disk-scsi-lun-passthrough.args | 1 + tests/qemuxml2argvdata/disk-serial.args | 1 + tests/qemuxml2argvdata/disk-snapshot.args | 1 + .../disk-source-pool-mode.args | 5 +- tests/qemuxml2argvdata/disk-source-pool.args | 1 + .../disk-usb-device-removable.args | 1 + tests/qemuxml2argvdata/disk-usb-device.args | 1 + .../disk-virtio-ccw-many.args | 1 + tests/qemuxml2argvdata/disk-virtio-ccw.args | 1 + .../disk-virtio-s390-zpci.args | 1 + tests/qemuxml2argvdata/disk-virtio.args | 1 + tests/qemuxml2argvdata/event_idx.args | 1 + .../fd-memory-no-numa-topology.args | 1 + .../fd-memory-numa-topology.args | 1 + .../fd-memory-numa-topology2.args | 1 + .../fd-memory-numa-topology3.args | 1 + tests/qemuxml2argvdata/floppy-drive-fat.args | 1 + tests/qemuxml2argvdata/fs9p-ccw.args | 1 + tests/qemuxml2argvdata/fs9p.args | 1 + .../graphics-egl-headless.args | 1 + .../graphics-sdl-fullscreen.args | 1 + tests/qemuxml2argvdata/graphics-sdl.args | 1 + .../graphics-spice-agent-file-xfer.args | 1 + .../graphics-spice-agentmouse.args | 1 + .../graphics-spice-auto-socket-cfg.args | 1 + .../graphics-spice-auto-socket.args | 1 + .../graphics-spice-compression.args | 1 + .../graphics-spice-egl-headless.args | 1 + .../graphics-spice-no-args.args | 1 + .../graphics-spice-qxl-vga.args | 1 + .../qemuxml2argvdata/graphics-spice-sasl.args | 1 + .../graphics-spice-socket.args | 1 + .../graphics-spice-timeout.args | 1 + .../graphics-spice-usb-redir.args | 1 + tests/qemuxml2argvdata/graphics-spice.args | 1 + .../graphics-vnc-auto-socket-cfg.args | 1 + .../graphics-vnc-auto-socket.args | 1 + .../graphics-vnc-egl-headless.args | 1 + .../graphics-vnc-no-listen-attr.args | 1 + tests/qemuxml2argvdata/graphics-vnc-none.args | 1 + .../qemuxml2argvdata/graphics-vnc-policy.args | 1 + .../graphics-vnc-remove-generated-socket.args | 1 + tests/qemuxml2argvdata/graphics-vnc-sasl.args | 1 + .../graphics-vnc-socket-new-cmdline.args | 1 + .../qemuxml2argvdata/graphics-vnc-socket.args | 1 + tests/qemuxml2argvdata/graphics-vnc-tls.args | 1 + .../graphics-vnc-websocket.args | 1 + tests/qemuxml2argvdata/graphics-vnc.args | 1 + .../hostdev-mdev-precreated.args | 1 + .../hostdev-pci-address-device.args | 1 + .../hostdev-pci-address-unassigned.args | 1 + .../qemuxml2argvdata/hostdev-pci-address.args | 1 + .../hostdev-pci-multifunction.args | 1 + .../hostdev-scsi-vhost-scsi-ccw.args | 1 + .../hostdev-scsi-vhost-scsi-pci.args | 1 + .../hostdev-scsi-vhost-scsi-pcie.args | 1 + .../hostdev-subsys-mdev-vfio-ccw.args | 1 + .../hostdev-usb-address-device-boot.args | 1 + .../hostdev-usb-address-device.args | 1 + .../qemuxml2argvdata/hostdev-usb-address.args | 1 + .../hostdev-vfio-multidomain.args | 1 + .../hostdev-vfio-zpci-autogenerate-fids.args | 1 + .../hostdev-vfio-zpci-autogenerate-uids.args | 1 + .../hostdev-vfio-zpci-autogenerate.args | 1 + .../hostdev-vfio-zpci-boundaries.args | 1 + .../hostdev-vfio-zpci-ccw-memballoon.args | 1 + .../hostdev-vfio-zpci-multidomain-many.args | 1 + tests/qemuxml2argvdata/hostdev-vfio-zpci.args | 1 + tests/qemuxml2argvdata/hostdev-vfio.args | 1 + tests/qemuxml2argvdata/hotplug-base.args | 1 + .../hugepages-default-2M.args | 1 + .../hugepages-default-system-size.args | 1 + tests/qemuxml2argvdata/hugepages-default.args | 1 + .../qemuxml2argvdata/hugepages-memaccess.args | 1 + .../hugepages-memaccess2.args | 1 + tests/qemuxml2argvdata/hugepages-nodeset.args | 1 + .../hugepages-numa-default-2M.args | 1 + .../hugepages-numa-default-dimm.args | 1 + .../hugepages-numa-default.args | 1 + .../hugepages-numa-nodeset-part.args | 1 + .../hugepages-numa-nodeset.args | 1 + tests/qemuxml2argvdata/hugepages-shared.args | 1 + .../qemuxml2argvdata/input-usbmouse-addr.args | 1 + tests/qemuxml2argvdata/input-usbmouse.args | 1 + tests/qemuxml2argvdata/input-usbtablet.args | 1 + tests/qemuxml2argvdata/input-virtio-ccw.args | 1 + .../iothreads-disk-virtio-ccw.args | 1 + tests/qemuxml2argvdata/iothreads-disk.args | 1 + .../iothreads-ids-partial.args | 1 + tests/qemuxml2argvdata/iothreads-ids.args | 1 + tests/qemuxml2argvdata/iothreads.args | 1 + tests/qemuxml2argvdata/kvm-features-off.args | 1 + tests/qemuxml2argvdata/kvm-features.args | 1 + tests/qemuxml2argvdata/kvm-pit-delay.args | 1 + tests/qemuxml2argvdata/kvm-pit-discard.args | 1 + tests/qemuxml2argvdata/kvmclock.args | 1 + .../luks-disks-source-qcow2.args | 5 +- tests/qemuxml2argvdata/luks-disks-source.args | 5 +- .../mach-virt-console-virtio.args | 1 + .../mach-virt-serial-native.args | 1 + .../mach-virt-serial-pci.args | 1 + .../mach-virt-serial-usb.args | 1 + .../machine-aeskeywrap-off-cap.args | 1 + .../machine-aeskeywrap-off-caps.args | 1 + .../machine-aeskeywrap-on-cap.args | 1 + .../machine-aeskeywrap-on-caps.args | 1 + tests/qemuxml2argvdata/machine-aliases1.args | 1 + tests/qemuxml2argvdata/machine-aliases2.args | 1 + tests/qemuxml2argvdata/machine-core-off.args | 1 + tests/qemuxml2argvdata/machine-core-on.args | 1 + .../machine-deakeywrap-off-cap.args | 1 + .../machine-deakeywrap-off-caps.args | 1 + .../machine-deakeywrap-on-cap.args | 1 + .../machine-deakeywrap-on-caps.args | 1 + .../machine-keywrap-none-caps.args | 1 + .../machine-keywrap-none.args | 1 + ...ine-loadparm-multiple-disks-nets-s390.args | 1 + .../machine-loadparm-net-s390.args | 1 + .../machine-loadparm-s390.args | 1 + tests/qemuxml2argvdata/machine-smm-opt.args | 1 + .../qemuxml2argvdata/machine-vmport-opt.args | 1 + .../memory-hotplug-dimm-addr.args | 1 + .../qemuxml2argvdata/memory-hotplug-dimm.args | 1 + ...emory-hotplug-nvdimm-ppc64-abi-update.args | 1 + .../memory-hotplug-nvdimm-ppc64.args | 1 + ...emory-hotplug-ppc64-nonuma-abi-update.args | 1 + .../memory-hotplug-ppc64-nonuma.args | 1 + tests/qemuxml2argvdata/memory-hotplug.args | 1 + tests/qemuxml2argvdata/memtune-unlimited.args | 1 + tests/qemuxml2argvdata/memtune.args | 1 + .../migrate-numa-unaligned.args | 1 + tests/qemuxml2argvdata/migrate.args | 1 + tests/qemuxml2argvdata/minimal.args | 1 + tests/qemuxml2argvdata/misc-acpi.args | 1 + tests/qemuxml2argvdata/misc-disable-s3.args | 1 + .../misc-disable-suspends.args | 1 + tests/qemuxml2argvdata/misc-enable-s4.args | 1 + tests/qemuxml2argvdata/misc-no-reboot.args | 1 + tests/qemuxml2argvdata/misc-uuid.args | 1 + tests/qemuxml2argvdata/monitor-json.args | 1 + .../multifunction-pci-device.args | 1 + tests/qemuxml2argvdata/name-escape.args | 2 +- tests/qemuxml2argvdata/net-client.args | 1 + tests/qemuxml2argvdata/net-eth-hostip.args | 1 + tests/qemuxml2argvdata/net-eth-ifname.args | 1 + tests/qemuxml2argvdata/net-eth-names.args | 1 + .../net-eth-unmanaged-tap.args | 1 + tests/qemuxml2argvdata/net-eth.args | 1 + .../net-hostdev-bootorder.args | 1 + .../net-hostdev-multidomain.args | 1 + .../net-hostdev-vfio-multidomain.args | 1 + tests/qemuxml2argvdata/net-hostdev-vfio.args | 1 + tests/qemuxml2argvdata/net-hostdev.args | 1 + tests/qemuxml2argvdata/net-many-models.args | 1 + tests/qemuxml2argvdata/net-mcast.args | 1 + tests/qemuxml2argvdata/net-server.args | 1 + tests/qemuxml2argvdata/net-udp.args | 1 + tests/qemuxml2argvdata/net-user-addr.args | 1 + tests/qemuxml2argvdata/net-user.args | 1 + .../net-vhostuser-multiq.args | 1 + tests/qemuxml2argvdata/net-vhostuser.args | 1 + tests/qemuxml2argvdata/net-virtio-ccw.args | 1 + tests/qemuxml2argvdata/net-virtio-device.args | 1 + .../net-virtio-disable-offloads.args | 1 + tests/qemuxml2argvdata/net-virtio-netdev.args | 1 + .../net-virtio-rxtxqueuesize.args | 1 + .../net-virtio-teaming-hostdev.args | 1 + .../qemuxml2argvdata/net-virtio-teaming.args | 1 + tests/qemuxml2argvdata/net-virtio.args | 1 + tests/qemuxml2argvdata/nosharepages.args | 1 + .../numad-auto-memory-vcpu-cpuset.args | 1 + ...o-memory-vcpu-no-cpuset-and-placement.args | 1 + .../numad-auto-vcpu-static-numatune.args | 1 + .../numad-static-memory-auto-vcpu.args | 1 + tests/qemuxml2argvdata/numad.args | 1 + .../numatune-auto-nodeset-invalid.args | 1 + .../numatune-auto-prefer.args | 1 + .../qemuxml2argvdata/numatune-distances.args | 1 + .../numatune-memnode-no-memory.args | 1 + tests/qemuxml2argvdata/numatune-memnode.args | 1 + tests/qemuxml2argvdata/numatune-memory.args | 1 + tests/qemuxml2argvdata/numatune-no-vcpu.args | 1 + .../qemuxml2argvdata/pages-dimm-discard.args | 1 + .../pages-discard-hugepages.args | 1 + tests/qemuxml2argvdata/pages-discard.args | 1 + tests/qemuxml2argvdata/panic-double.args | 1 + tests/qemuxml2argvdata/panic-no-address.args | 1 + tests/qemuxml2argvdata/panic.args | 1 + .../parallel-parport-chardev.args | 1 + .../parallel-tcp-chardev.args | 1 + tests/qemuxml2argvdata/pci-autoadd-addr.args | 1 + tests/qemuxml2argvdata/pci-autoadd-idx.args | 1 + tests/qemuxml2argvdata/pci-autofill-addr.args | 1 + .../pci-bridge-many-disks.args | 1 + tests/qemuxml2argvdata/pci-bridge.args | 1 + tests/qemuxml2argvdata/pci-expander-bus.args | 1 + tests/qemuxml2argvdata/pci-many.args | 1 + tests/qemuxml2argvdata/pci-rom-disabled.args | 1 + tests/qemuxml2argvdata/pci-rom.args | 1 + .../pci-serial-dev-chardev.args | 1 + tests/qemuxml2argvdata/pcie-expander-bus.args | 1 + .../pcie-root-port-model-generic.args | 1 + .../pcie-root-port-model-ioh3420.args | 1 + tests/qemuxml2argvdata/pcie-root-port.args | 1 + tests/qemuxml2argvdata/pcie-root.args | 1 + .../pcie-switch-downstream-port.args | 1 + .../pcie-switch-upstream-port.args | 1 + tests/qemuxml2argvdata/pcihole64-q35.args | 1 + tests/qemuxml2argvdata/pcihole64.args | 1 + tests/qemuxml2argvdata/pmu-feature-off.args | 1 + tests/qemuxml2argvdata/pmu-feature.args | 1 + tests/qemuxml2argvdata/ppc-dtb.args | 1 + .../ppc64-usb-controller-legacy.args | 1 + .../ppc64-usb-controller-qemu-xhci.args | 1 + .../ppc64-usb-controller.args | 1 + tests/qemuxml2argvdata/ppce500-serial.args | 1 + tests/qemuxml2argvdata/pseries-basic.args | 1 + .../pseries-console-virtio.args | 1 + .../pseries-cpu-compat-power9.args | 1 + .../qemuxml2argvdata/pseries-cpu-compat.args | 1 + tests/qemuxml2argvdata/pseries-cpu-exact.args | 1 + tests/qemuxml2argvdata/pseries-cpu-le.args | 1 + tests/qemuxml2argvdata/pseries-features.args | 1 + .../qemuxml2argvdata/pseries-hostdevs-1.args | 1 + .../qemuxml2argvdata/pseries-hostdevs-2.args | 1 + .../qemuxml2argvdata/pseries-hostdevs-3.args | 1 + .../pseries-machine-max-cpu-compat.args | 1 + .../pseries-many-buses-1.args | 1 + .../pseries-many-buses-2.args | 1 + .../pseries-many-devices.args | 1 + tests/qemuxml2argvdata/pseries-nvram.args | 1 + .../pseries-panic-missing.args | 1 + .../pseries-panic-no-address.args | 1 + .../pseries-phb-default-missing.args | 1 + .../pseries-phb-numa-node.args | 1 + .../qemuxml2argvdata/pseries-phb-simple.args | 1 + .../pseries-serial-native.args | 1 + .../qemuxml2argvdata/pseries-serial-pci.args | 1 + .../qemuxml2argvdata/pseries-serial-usb.args | 1 + .../qemuxml2argvdata/pseries-usb-default.args | 1 + tests/qemuxml2argvdata/pseries-usb-kbd.args | 1 + tests/qemuxml2argvdata/pseries-usb-multi.args | 1 + .../pseries-vio-user-assigned.args | 1 + tests/qemuxml2argvdata/pseries-vio.args | 1 + tests/qemuxml2argvdata/q35-acpi-nouefi.args | 1 + tests/qemuxml2argvdata/q35-acpi-uefi.args | 1 + .../q35-default-devices-only.args | 1 + tests/qemuxml2argvdata/q35-multifunction.args | 1 + tests/qemuxml2argvdata/q35-noacpi-nouefi.args | 1 + .../q35-pci-force-address.args | 1 + tests/qemuxml2argvdata/q35-pcie-autoadd.args | 1 + tests/qemuxml2argvdata/q35-pcie.args | 1 + .../q35-pm-disable-fallback.args | 1 + tests/qemuxml2argvdata/q35-pm-disable.args | 1 + tests/qemuxml2argvdata/q35-usb2-multi.args | 1 + tests/qemuxml2argvdata/q35-usb2-reorder.args | 1 + tests/qemuxml2argvdata/q35-usb2.args | 1 + .../q35-virt-manager-basic.args | 1 + tests/qemuxml2argvdata/q35-virtio-pci.args | 1 + tests/qemuxml2argvdata/q35.args | 1 + tests/qemuxml2argvdata/qemu-ns-alt.args | 1 + .../qemu-ns-commandline-ns0.args | 1 + .../qemu-ns-commandline-ns1.args | 1 + .../qemuxml2argvdata/qemu-ns-commandline.args | 1 + .../qemu-ns-domain-commandline-ns0.args | 1 + .../qemu-ns-domain-commandline.args | 1 + .../qemuxml2argvdata/qemu-ns-domain-ns0.args | 1 + tests/qemuxml2argvdata/qemu-ns-no-env.args | 1 + .../reboot-timeout-disabled.args | 1 + .../reboot-timeout-enabled.args | 1 + tests/qemuxml2argvdata/restore-v2-fd.args | 1 + tests/qemuxml2argvdata/restore-v2.args | 1 + tests/qemuxml2argvdata/riscv64-virt-pci.args | 1 + tests/qemuxml2argvdata/riscv64-virt.args | 1 + .../qemuxml2argvdata/s390-panic-missing.args | 1 + .../s390-panic-no-address.args | 1 + tests/qemuxml2argvdata/s390-serial-2.args | 1 + .../qemuxml2argvdata/s390-serial-console.args | 1 + tests/qemuxml2argvdata/s390-serial.args | 1 + tests/qemuxml2argvdata/seclabel-dac-none.args | 1 + .../seclabel-dynamic-baselabel.args | 1 + .../seclabel-dynamic-labelskip.args | 1 + .../seclabel-dynamic-override.args | 1 + .../seclabel-dynamic-relabel.args | 1 + tests/qemuxml2argvdata/seclabel-dynamic.args | 1 + tests/qemuxml2argvdata/seclabel-none.args | 1 + .../seclabel-static-labelskip.args | 1 + .../seclabel-static-relabel.args | 1 + tests/qemuxml2argvdata/seclabel-static.args | 1 + .../serial-dev-chardev-iobase.args | 1 + .../qemuxml2argvdata/serial-dev-chardev.args | 1 + .../qemuxml2argvdata/serial-file-chardev.args | 1 + tests/qemuxml2argvdata/serial-file-log.args | 1 + .../qemuxml2argvdata/serial-many-chardev.args | 1 + .../qemuxml2argvdata/serial-pty-chardev.args | 1 + .../serial-spiceport-nospice.args | 1 + tests/qemuxml2argvdata/serial-spiceport.args | 1 + .../qemuxml2argvdata/serial-tcp-chardev.args | 1 + .../serial-tcp-telnet-chardev.args | 1 + .../serial-tcp-tlsx509-chardev-notls.args | 1 + .../serial-tcp-tlsx509-chardev-verify.args | 1 + .../serial-tcp-tlsx509-chardev.args | 1 + .../qemuxml2argvdata/serial-udp-chardev.args | 1 + .../qemuxml2argvdata/serial-unix-chardev.args | 1 + tests/qemuxml2argvdata/serial-vc-chardev.args | 1 + .../shmem-plain-doorbell.args | 1 + tests/qemuxml2argvdata/shmem.args | 1 + .../smartcard-controller.args | 1 + .../smartcard-host-certificates-database.args | 1 + .../smartcard-host-certificates.args | 1 + tests/qemuxml2argvdata/smartcard-host.args | 1 + .../smartcard-passthrough-spicevmc.args | 1 + .../smartcard-passthrough-tcp.args | 1 + tests/qemuxml2argvdata/smbios-type-fwcfg.args | 1 + tests/qemuxml2argvdata/smbios.args | 1 + tests/qemuxml2argvdata/smp-dies.args | 1 + tests/qemuxml2argvdata/smp.args | 1 + tests/qemuxml2argvdata/sound-device.args | 1 + tests/qemuxml2argvdata/sound.args | 1 + tests/qemuxml2argvdata/sparc-minimal.args | 1 + .../usb-controller-default-q35.args | 1 + .../usb-controller-explicit-q35.args | 1 + .../usb-controller-qemu-xhci.args | 1 + .../qemuxml2argvdata/usb-controller-xhci.args | 1 + tests/qemuxml2argvdata/usb-controller.args | 1 + .../usb-hub-autoadd-deluxe.args | 1 + tests/qemuxml2argvdata/usb-hub-autoadd.args | 1 + tests/qemuxml2argvdata/usb-hub.args | 1 + .../qemuxml2argvdata/usb-ich9-autoassign.args | 1 + .../qemuxml2argvdata/usb-ich9-companion.args | 1 + .../qemuxml2argvdata/usb-ich9-ehci-addr.args | 1 + .../qemuxml2argvdata/usb-long-port-path.args | 1 + tests/qemuxml2argvdata/usb-none.args | 1 + .../usb-piix3-controller.args | 1 + .../qemuxml2argvdata/usb-port-autoassign.args | 1 + tests/qemuxml2argvdata/usb-port-missing.args | 1 + tests/qemuxml2argvdata/usb-ports.args | 1 + tests/qemuxml2argvdata/usb-redir-boot.args | 1 + .../usb-redir-filter-version.args | 1 + tests/qemuxml2argvdata/usb-redir-filter.args | 1 + tests/qemuxml2argvdata/usb-redir.args | 1 + .../qemuxml2argvdata/usb-xhci-autoassign.args | 1 + tests/qemuxml2argvdata/usb1-usb2.args | 1 + tests/qemuxml2argvdata/user-aliases-usb.args | 1 + .../vcpu-placement-static.args | 1 + .../video-device-pciaddr-default.args | 1 + tests/qemuxml2argvdata/video-none-device.args | 1 + .../video-qxl-device-vgamem.args | 1 + tests/qemuxml2argvdata/video-qxl-device.args | 1 + tests/qemuxml2argvdata/video-qxl-heads.args | 1 + tests/qemuxml2argvdata/video-qxl-noheads.args | 1 + .../video-qxl-resolution.args | 1 + .../video-qxl-sec-device-vgamem.args | 1 + .../video-qxl-sec-device.args | 1 + .../video-vga-device-vgamem.args | 1 + tests/qemuxml2argvdata/video-vga-device.args | 1 + .../qemuxml2argvdata/video-vga-qxl-heads.args | 1 + .../video-virtio-gpu-ccw.args | 1 + .../video-virtio-gpu-device.args | 1 + .../video-virtio-gpu-sdl-gl.args | 1 + .../video-virtio-gpu-secondary.args | 1 + .../video-virtio-gpu-spice-gl.args | 1 + .../video-virtio-gpu-virgl.args | 1 + tests/qemuxml2argvdata/video-virtio-vga.args | 1 + .../virtio-input-passthrough.args | 1 + tests/qemuxml2argvdata/virtio-input.args | 1 + tests/qemuxml2argvdata/virtio-lun.args | 1 + tests/qemuxml2argvdata/virtio-rng-ccw.args | 1 + .../qemuxml2argvdata/virtio-rng-default.args | 1 + tests/qemuxml2argvdata/virtio-rng-egd.args | 1 + .../qemuxml2argvdata/virtio-rng-multiple.args | 1 + tests/qemuxml2argvdata/virtio-rng-random.args | 1 + tests/qemuxml2argvdata/vmcoreinfo.args | 1 + tests/qemuxml2argvdata/watchdog-device.args | 1 + tests/qemuxml2argvdata/watchdog-dump.args | 1 + .../qemuxml2argvdata/watchdog-injectnmi.args | 1 + tests/qemuxml2argvdata/watchdog.args | 1 + tests/qemuxml2argvdata/x86-kvm-32-on-64.args | 1 + tests/qemuxml2argvtest.c | 23 +- tests/vircryptotest.c | 5 - 611 files changed, 710 insertions(+), 591 deletions(-) -- 2.31.1

2 13

Plans for the next release
by Jiri Denemark 21 Sep '21

21 Sep '21

We are getting close to the next release of libvirt. To aim for the release on Oct 01 I suggest entering the freeze on Monday Sep 27 and tagging RC2 on Wednesday Sep 29. I hope this works for everyone. Jirka

1 0

[libvirt PATCH] scripts: apibuild: fix spacing
by Ján Tomko 21 Sep '21

21 Sep '21

Syntax check reports: E226 missing whitespace around arithmetic operator Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- Pushed. scripts/apibuild.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/apibuild.py b/scripts/apibuild.py index 722fd33f0e..9b29466e1d 100755 --- a/scripts/apibuild.py +++ b/scripts/apibuild.py @@ -604,10 +604,10 @@ class CLexer: continue j = i - while (j + 1) < nline and line[j+1] in "+-*><=/%&!|": + while (j + 1) < nline and line[j + 1] in "+-*><=/%&!|": j = j + 1 - self.tokens.append(('op', line[i:j+1])) + self.tokens.append(('op', line[i:j + 1])) i = j + 1 continue s = i -- 2.31.1

1 0

[libvirt PATCH] scripts: fix API parsing of *** pointers
by Daniel P. Berrangé 21 Sep '21

21 Sep '21

The currrent generated API contains *** pointer types with bogus whitespace in the middle: <arg name='keys' type='char ** *' info='pointer to a variable to store authorized keys'/> because the tokenizer only tries to merge 2 distinct '*' together. This refactors the code to merge an arbitrary number, resulting in <arg name='keys' type='char ***' info='pointer to a variable to store authorized keys'/> Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- scripts/apibuild.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/scripts/apibuild.py b/scripts/apibuild.py index b94c0f6c09..722fd33f0e 100755 --- a/scripts/apibuild.py +++ b/scripts/apibuild.py @@ -603,13 +603,12 @@ class CLexer: i = i + 3 continue - j = i + 1 - if j < nline and line[j] in "+-*><=/%&!|": - self.tokens.append(('op', line[i:j + 1])) - i = j + 1 - else: - self.tokens.append(('op', line[i])) - i = i + 1 + j = i + while (j + 1) < nline and line[j+1] in "+-*><=/%&!|": + j = j + 1 + + self.tokens.append(('op', line[i:j+1])) + i = j + 1 continue s = i while i < nline: -- 2.31.1

2 1

[PATCH v6 00/16] Introduce virtio-mem <memory/> model
by Michal Privoznik 21 Sep '21

21 Sep '21

v6 of: https://listman.redhat.com/archives/libvir-list/2021-September/msg00333.html diff to v5: - Rebased onto current master - Produce warning (in 05/16) when prealloc was requested for virtio-mem (it's not officially supported by QEMU yet). Special thanks goes to David Hildebrand for testing these patches and giving valuable feedback. Michal Prívozník (16): virhostmem: Introduce virHostMemGetTHPSize() qemu_capabilities: Introduce QEMU_CAPS_DEVICE_VIRTIO_MEM_PCI qemu_capabilities: Introduce QEMU_CAPS_MEMORY_BACKEND_RESERVE conf: Introduce virtio-mem <memory/> model qemu: Build command line for virtio-mem qemu: Wire up <memory/> live update qemu: Wire up <memory/> offline update Introduce <current/> property to virtio-mem conf: Introduce virDomainMemoryFindByDeviceAlias() qemu: Wire up MEMORY_DEVICE_SIZE_CHANGE event qemu: Refresh the current size of virtio-mem on monitor reconnect qemu: Account for both memballoon and virtio-mem qemuDomainSetMemoryFlags: Take virtio-mem into consideration virsh: Introduce update-memory-device command news: document recent virtio memory addition kbase: Document virtio-mem NEWS.rst | 7 + docs/formatdomain.rst | 45 ++- docs/kbase/index.rst | 4 + docs/kbase/memorydevices.rst | 150 ++++++++++ docs/kbase/meson.build | 1 + docs/manpages/virsh.rst | 30 ++ docs/schemas/domaincommon.rng | 16 ++ examples/c/misc/event-test.c | 17 ++ include/libvirt/libvirt-domain.h | 24 ++ src/conf/domain_conf.c | 126 ++++++++- src/conf/domain_conf.h | 16 ++ src/conf/domain_event.c | 84 ++++++ src/conf/domain_event.h | 10 + src/conf/domain_validate.c | 39 +++ src/libvirt_private.syms | 5 + src/qemu/qemu_alias.c | 10 +- src/qemu/qemu_capabilities.c | 6 + src/qemu/qemu_capabilities.h | 4 + src/qemu/qemu_command.c | 29 +- src/qemu/qemu_domain.c | 33 ++- src/qemu/qemu_domain.h | 1 + src/qemu/qemu_domain_address.c | 38 ++- src/qemu/qemu_driver.c | 259 +++++++++++++++++- src/qemu/qemu_hotplug.c | 18 ++ src/qemu/qemu_hotplug.h | 5 + src/qemu/qemu_monitor.c | 34 +++ src/qemu/qemu_monitor.h | 28 ++ src/qemu/qemu_monitor_json.c | 97 +++++-- src/qemu/qemu_monitor_json.h | 5 + src/qemu/qemu_process.c | 72 +++++ src/qemu/qemu_validate.c | 8 + src/remote/remote_daemon_dispatch.c | 30 ++ src/remote/remote_driver.c | 32 +++ src/remote/remote_protocol.x | 15 +- src/remote_protocol-structs | 7 + src/security/security_apparmor.c | 1 + src/security/security_dac.c | 2 + src/security/security_selinux.c | 2 + src/util/virhostmem.c | 54 ++++ src/util/virhostmem.h | 3 + tests/domaincapsmock.c | 9 + .../caps_5.1.0.x86_64.xml | 1 + .../caps_5.2.0.x86_64.xml | 1 + .../caps_6.0.0.x86_64.xml | 1 + .../caps_6.1.0.x86_64.xml | 2 + ...mory-hotplug-virtio-mem.x86_64-latest.args | 41 +++ .../memory-hotplug-virtio-mem.xml | 67 +++++ tests/qemuxml2argvtest.c | 1 + ...emory-hotplug-virtio-mem.x86_64-latest.xml | 1 + tests/qemuxml2xmltest.c | 1 + tools/virsh-domain.c | 181 ++++++++++++ 51 files changed, 1617 insertions(+), 56 deletions(-) create mode 100644 docs/kbase/memorydevices.rst create mode 100644 tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/memory-hotplug-virtio-mem.xml create mode 120000 tests/qemuxml2xmloutdata/memory-hotplug-virtio-mem.x86_64-latest.xml -- 2.32.0

2 18

[PATCH 0/5] qemu: add virtio-blk queue-size option
by Hiroki Narukawa 21 Sep '21

21 Sep '21

This is resubmit of "qemu: add virtio-blk queue-size option" after following the review. The option "queue-size" in virtio-blk was added in qemu-2.12.0, and default value increased from qemu-5.0.0. However, increasing this value may lead to drop of random access performance. This is configurable value, so we want to use it via libvirt. Hiroki Narukawa (5): qemu: Make disk-virtio-queues tests use DO_TEST_CAPS_LATEST qemu: add disk queue count ABI stability check qemu: add queue_size option to disk qemu: add QEMU_CAPS_VIRTIO_BLK_QUEUE_SIZE capability qemu: add virtio-blk queue-size option docs/formatdomain.rst | 4 +- docs/schemas/domaincommon.rng | 5 +++ src/conf/domain_conf.c | 20 ++++++++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 3 ++ src/qemu/qemu_validate.c | 7 ++++ .../caps_2.12.0.aarch64.xml | 1 + .../caps_2.12.0.ppc64.xml | 1 + .../caps_2.12.0.s390x.xml | 1 + .../caps_2.12.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 + .../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 1 + .../caps_3.0.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 + .../caps_3.1.0.x86_64.xml | 1 + .../caps_4.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 + .../caps_4.0.0.riscv32.xml | 1 + .../caps_4.0.0.riscv64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 + .../caps_4.0.0.x86_64.xml | 1 + .../caps_4.1.0.x86_64.xml | 1 + .../caps_4.2.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 + .../caps_4.2.0.x86_64.xml | 1 + .../caps_5.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 + .../caps_5.0.0.riscv64.xml | 1 + .../caps_5.0.0.x86_64.xml | 1 + .../caps_5.1.0.x86_64.xml | 1 + .../caps_5.2.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 + .../caps_5.2.0.riscv64.xml | 1 + .../qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 + .../caps_5.2.0.x86_64.xml | 1 + .../caps_6.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 + .../caps_6.0.0.x86_64.xml | 1 + .../caps_6.1.0.x86_64.xml | 1 + .../disk-virtio-queue-size.args | 35 +++++++++++++++++ .../disk-virtio-queue-size.x86_64-latest.args | 35 +++++++++++++++++ .../disk-virtio-queue-size.xml | 38 +++++++++++++++++++ .../qemuxml2argvdata/disk-virtio-queues.args | 20 ++++++---- .../disk-virtio-queues.x86_64-latest.args | 35 +++++++++++++++++ tests/qemuxml2argvdata/disk-virtio-queues.xml | 5 ++- tests/qemuxml2argvtest.c | 4 +- .../disk-virtio-queue-size.x86_64-latest.xml | 38 +++++++++++++++++++ .../disk-virtio-queue-size.xml | 35 +++++++++++++++++ .../disk-virtio-queues.x86_64-latest.xml | 1 + tests/qemuxml2xmltest.c | 3 +- 53 files changed, 314 insertions(+), 12 deletions(-) create mode 100644 tests/qemuxml2argvdata/disk-virtio-queue-size.args create mode 100644 tests/qemuxml2argvdata/disk-virtio-queue-size.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-virtio-queue-size.xml create mode 100644 tests/qemuxml2argvdata/disk-virtio-queues.x86_64-latest.args create mode 100644 tests/qemuxml2xmloutdata/disk-virtio-queue-size.x86_64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/disk-virtio-queue-size.xml create mode 120000 tests/qemuxml2xmloutdata/disk-virtio-queues.x86_64-latest.xml -- 2.17.1

2 11

[PATCH] virDevMapperGetTargets: Fix non-linux implementation
by Peter Krempa 21 Sep '21

21 Sep '21

s/GSlist/GSList/ Fixes: 6c49c2ee9fcb88de02cdc333f666a8e95d60a3b0 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/util/virdevmapper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virdevmapper.c b/src/util/virdevmapper.c index e42324fd19..7796e7719b 100644 --- a/src/util/virdevmapper.c +++ b/src/util/virdevmapper.c @@ -342,7 +342,7 @@ virIsDevMapperDevice(const char *dev_name) int virDevMapperGetTargets(const char *path G_GNUC_UNUSED, - GSlist **devPaths G_GNUC_UNUSED) + GSList **devPaths G_GNUC_UNUSED) { errno = ENOSYS; return -1; -- 2.31.1

2 1

[PATCH 0/3] schemas: Couple of nodedev related fixes
by Michal Privoznik 21 Sep '21

21 Sep '21

These three patches address the first three problems raised in https://bugzilla.redhat.com/show_bug.cgi?id=1999420 The fourth one is a bit different because I'm failing to find a path in the code that would allow empty <capability/> for vdpa. Michal Prívozník (3): schemas: Make <type/> for capscsi type optional schemas: Provide grammar for scsi_generic capabilities schemas: Allow <unique_id/> to be zero docs/schemas/nodedev.rng | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) -- 2.32.0

2 4

[PATCH 0/3] meson: Misc tweaks
by Michal Privoznik 21 Sep '21

21 Sep '21

Pipeline: https://gitlab.com/MichalPrivoznik/libvirt/-/pipelines/370312403 Michal Prívozník (3): lib: Use $PROG instead of $PROG_PATH meson: Don't set $PROG_PATH macros meson: Enable ZFS storage backend more often meson.build | 24 +++++----- src/util/virfirewall.c | 8 ++-- src/util/virnetdevip.c | 14 +++--- tests/virfirewalltest.c | 98 ++++++++++++++++++++--------------------- 4 files changed, 71 insertions(+), 73 deletions(-) -- 2.32.0

2 4

[PATCH 00/14] qemu: more 'query-command-line-options' cleanups
by Peter Krempa 21 Sep '21

21 Sep '21

In a private conversation Markus dug out the history of certain of the flags we probe via 'query-command-line-options'. I already had some patches for this but without the history or justification. To prevent us going through this again I've decided to send some more removal of capability bits based on stuff that all qemu's we support have. Peter Krempa (14): qemu: command: Always assume 'QEMU_CAPS_BOOT_STRICT' qemu: capabilities: Retire QEMU_CAPS_BOOT_STRICT tests: qemuxml2argv: Remove negative case for 'reboot-timeout-enabled' qemu: Always assume QEMU_CAPS_REBOOT_TIMEOUT qemu: capabilities: Retire QEMU_CAPS_REBOOT_TIMEOUT qemuxml2argvtest: Remove negative case for 'boot-menu-enable-with-timeout' qemu: Always assume QEMU_CAPS_SPLASH_TIMEOUT qemu: capabilities: Retire QEMU_CAPS_SPLASH_TIMEOUT qemu: Always assume QEMU_CAPS_MEM_MERGE qemu: capabilities: QEMU_CAPS_MEM_MERGE qemu: capabilities: Assume QEMU_CAPS_AES_KEY_WRAP and QEMU_CAPS_DEA_KEY_WRAP for s390 only qemu: capabilities: Assume QEMU_CAPS_LOADPARM for s390 only qemu: Assume QEMU_CAPS_FW_CFG qemu: capabilities: Retire QEMU_CAPS_FW_CFG src/qemu/qemu_capabilities.c | 27 ++++++------ src/qemu/qemu_capabilities.h | 10 ++--- src/qemu/qemu_command.c | 10 ++--- src/qemu/qemu_validate.c | 42 ++----------------- .../caps_2.11.0.s390x.xml | 5 --- .../caps_2.11.0.x86_64.xml | 8 ---- .../caps_2.12.0.aarch64.xml | 8 ---- .../caps_2.12.0.ppc64.xml | 8 ---- .../caps_2.12.0.s390x.xml | 5 --- .../caps_2.12.0.x86_64.xml | 8 ---- .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 8 ---- .../caps_3.0.0.riscv32.xml | 8 ---- .../caps_3.0.0.riscv64.xml | 8 ---- .../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 5 --- .../caps_3.0.0.x86_64.xml | 8 ---- .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 8 ---- .../caps_3.1.0.x86_64.xml | 8 ---- .../caps_4.0.0.aarch64.xml | 8 ---- .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 8 ---- .../caps_4.0.0.riscv32.xml | 8 ---- .../caps_4.0.0.riscv64.xml | 8 ---- .../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 5 --- .../caps_4.0.0.x86_64.xml | 8 ---- .../caps_4.1.0.x86_64.xml | 8 ---- .../caps_4.2.0.aarch64.xml | 8 ---- .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 8 ---- .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 5 --- .../caps_4.2.0.x86_64.xml | 8 ---- .../caps_5.0.0.aarch64.xml | 8 ---- .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 8 ---- .../caps_5.0.0.riscv64.xml | 8 ---- .../caps_5.0.0.x86_64.xml | 8 ---- .../qemucapabilitiesdata/caps_5.1.0.sparc.xml | 8 ---- .../caps_5.1.0.x86_64.xml | 8 ---- .../caps_5.2.0.aarch64.xml | 8 ---- .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 8 ---- .../caps_5.2.0.riscv64.xml | 8 ---- .../qemucapabilitiesdata/caps_5.2.0.s390x.xml | 5 --- .../caps_5.2.0.x86_64.xml | 8 ---- .../caps_6.0.0.aarch64.xml | 8 ---- .../qemucapabilitiesdata/caps_6.0.0.s390x.xml | 5 --- .../caps_6.0.0.x86_64.xml | 8 ---- .../caps_6.1.0.x86_64.xml | 8 ---- .../aarch64-aavmf-virtio-mmio.args | 1 + tests/qemuxml2argvdata/aarch64-acpi-uefi.args | 1 + .../aarch64-cpu-passthrough.args | 1 + tests/qemuxml2argvdata/aarch64-gic-host.args | 1 + .../aarch64-gic-none-tcg.args | 1 + tests/qemuxml2argvdata/aarch64-gic-v2.args | 1 + tests/qemuxml2argvdata/aarch64-gic-v3.args | 1 + .../aarch64-kvm-32-on-64.args | 1 + .../aarch64-noacpi-nouefi.args | 1 + .../qemuxml2argvdata/aarch64-noacpi-uefi.args | 1 + .../qemuxml2argvdata/aarch64-pci-serial.args | 1 + .../aarch64-traditional-pci.args | 1 + .../aarch64-usb-controller-nec-xhci.args | 1 + .../aarch64-usb-controller-qemu-xhci.args | 1 + .../aarch64-video-default.args | 1 + .../aarch64-video-virtio-gpu-pci.args | 1 + .../aarch64-virt-2.6-virtio-pci-default.args | 1 + .../aarch64-virt-default-nic.args | 1 + .../qemuxml2argvdata/aarch64-virt-virtio.args | 1 + .../aarch64-virtio-pci-default.args | 1 + .../aarch64-virtio-pci-manual-addresses.args | 1 + tests/qemuxml2argvdata/acpi-table.args | 1 + .../arm-vexpressa9-basic.args | 1 + .../arm-vexpressa9-nodevs.args | 1 + .../arm-vexpressa9-virtio.args | 1 + tests/qemuxml2argvdata/arm-virt-virtio.args | 1 + tests/qemuxml2argvdata/audio-alsa-best.args | 1 + .../qemuxml2argvdata/audio-alsa-minimal.args | 1 + .../audio-coreaudio-best.args | 1 + .../audio-coreaudio-minimal.args | 1 + .../audio-default-nographics.args | 1 + tests/qemuxml2argvdata/audio-default-sdl.args | 1 + .../qemuxml2argvdata/audio-default-spice.args | 1 + tests/qemuxml2argvdata/audio-default-vnc.args | 1 + tests/qemuxml2argvdata/audio-file-best.args | 1 + .../qemuxml2argvdata/audio-file-minimal.args | 1 + tests/qemuxml2argvdata/audio-none-best.args | 1 + .../qemuxml2argvdata/audio-none-minimal.args | 1 + tests/qemuxml2argvdata/audio-oss-best.args | 1 + tests/qemuxml2argvdata/audio-oss-minimal.args | 1 + .../audio-pulseaudio-best.args | 1 + .../audio-pulseaudio-minimal.args | 1 + tests/qemuxml2argvdata/audio-sdl-best.args | 1 + tests/qemuxml2argvdata/audio-sdl-minimal.args | 1 + tests/qemuxml2argvdata/audio-spice-best.args | 1 + .../qemuxml2argvdata/audio-spice-minimal.args | 1 + tests/qemuxml2argvdata/autoindex.args | 1 + .../qemuxml2argvdata/balloon-ccw-deflate.args | 1 + .../qemuxml2argvdata/balloon-device-auto.args | 1 + .../balloon-device-deflate-off.args | 1 + .../balloon-device-deflate.args | 1 + .../balloon-device-period.args | 1 + tests/qemuxml2argvdata/balloon-device.args | 1 + .../balloon-mmio-deflate.args | 1 + tests/qemuxml2argvdata/bios-nvram-secure.args | 2 +- tests/qemuxml2argvdata/bios-nvram.args | 2 +- tests/qemuxml2argvdata/bios.args | 2 +- tests/qemuxml2argvdata/blkiotune-device.args | 1 + tests/qemuxml2argvdata/blkiotune.args | 1 + tests/qemuxml2argvdata/boot-cdrom.args | 1 + tests/qemuxml2argvdata/boot-complex.args | 1 + tests/qemuxml2argvdata/boot-floppy-q35.args | 1 + tests/qemuxml2argvdata/boot-floppy.args | 1 + .../boot-menu-disable-drive.args | 2 +- tests/qemuxml2argvdata/boot-menu-disable.args | 2 +- .../boot-menu-enable-with-timeout.args | 2 +- .../boot-menu-enable-with-timeout.err | 1 - tests/qemuxml2argvdata/boot-menu-enable.args | 2 +- tests/qemuxml2argvdata/boot-multi.args | 2 +- tests/qemuxml2argvdata/boot-network.args | 1 + tests/qemuxml2argvdata/boot-order.args | 1 + tests/qemuxml2argvdata/channel-guestfwd.args | 1 + tests/qemuxml2argvdata/channel-spicevmc.args | 1 + .../qemuxml2argvdata/channel-virtio-auto.args | 1 + .../channel-virtio-autoadd.args | 1 + .../channel-virtio-autoassign.args | 1 + .../channel-virtio-default.args | 1 + .../channel-virtio-state.args | 1 + .../qemuxml2argvdata/channel-virtio-unix.args | 1 + tests/qemuxml2argvdata/channel-virtio.args | 1 + tests/qemuxml2argvdata/chardev-reconnect.args | 1 + tests/qemuxml2argvdata/clock-catchup.args | 1 + tests/qemuxml2argvdata/clock-france.args | 1 + tests/qemuxml2argvdata/clock-hpet-off.args | 1 + .../clock-localtime-basis-localtime.args | 1 + tests/qemuxml2argvdata/clock-localtime.args | 1 + tests/qemuxml2argvdata/clock-realtime.args | 1 + .../clock-timer-hyperv-rtc.args | 1 + tests/qemuxml2argvdata/clock-utc.args | 1 + tests/qemuxml2argvdata/clock-variable.args | 1 + .../qemuxml2argvdata/console-compat-auto.args | 1 + .../console-compat-chardev.args | 1 + tests/qemuxml2argvdata/console-compat.args | 1 + .../qemuxml2argvdata/console-virtio-ccw.args | 1 + .../qemuxml2argvdata/console-virtio-many.args | 1 + tests/qemuxml2argvdata/console-virtio.args | 1 + tests/qemuxml2argvdata/controller-order.args | 2 +- tests/qemuxml2argvdata/cpu-Haswell-noTSX.args | 1 + tests/qemuxml2argvdata/cpu-Haswell.args | 1 + tests/qemuxml2argvdata/cpu-Haswell2.args | 1 + tests/qemuxml2argvdata/cpu-Haswell3.args | 1 + tests/qemuxml2argvdata/cpu-cache-disable.args | 1 + .../qemuxml2argvdata/cpu-cache-disable2.args | 1 + .../qemuxml2argvdata/cpu-cache-disable3.args | 1 + .../cpu-cache-emulate-l3.args | 1 + .../cpu-cache-passthrough.args | 1 + .../cpu-cache-passthrough2.args | 1 + .../cpu-check-default-none.args | 1 + .../cpu-check-default-none2.args | 1 + .../cpu-check-default-partial.args | 1 + .../cpu-check-default-partial2.args | 1 + tests/qemuxml2argvdata/cpu-check-none.args | 1 + tests/qemuxml2argvdata/cpu-eoi-disabled.args | 1 + tests/qemuxml2argvdata/cpu-eoi-enabled.args | 1 + tests/qemuxml2argvdata/cpu-exact1.args | 1 + .../cpu-exact2-nofallback.args | 1 + tests/qemuxml2argvdata/cpu-exact2.args | 1 + tests/qemuxml2argvdata/cpu-fallback.args | 1 + tests/qemuxml2argvdata/cpu-host-kvmclock.args | 1 + .../qemuxml2argvdata/cpu-host-model-cmt.args | 1 + .../cpu-host-model-fallback.args | 1 + .../cpu-host-model-vendor.args | 1 + tests/qemuxml2argvdata/cpu-host-model.args | 1 + .../cpu-host-passthrough-features.args | 1 + .../cpu-host-passthrough.args | 1 + .../qemuxml2argvdata/cpu-hotplug-startup.args | 1 + tests/qemuxml2argvdata/cpu-kvmclock.args | 1 + tests/qemuxml2argvdata/cpu-minimum1.args | 1 + tests/qemuxml2argvdata/cpu-minimum2.args | 1 + .../cpu-no-removed-features.args | 1 + tests/qemuxml2argvdata/cpu-numa-disjoint.args | 1 + .../qemuxml2argvdata/cpu-numa-memshared.args | 1 + .../cpu-numa-no-memory-element.args | 1 + tests/qemuxml2argvdata/cpu-numa1.args | 1 + tests/qemuxml2argvdata/cpu-numa2.args | 1 + tests/qemuxml2argvdata/cpu-s390-features.args | 1 + tests/qemuxml2argvdata/cpu-s390-zEC12.args | 1 + tests/qemuxml2argvdata/cpu-strict1.args | 1 + tests/qemuxml2argvdata/cpu-topology1.args | 1 + tests/qemuxml2argvdata/cpu-topology2.args | 1 + tests/qemuxml2argvdata/cpu-topology3.args | 1 + tests/qemuxml2argvdata/cpu-tsc-frequency.args | 1 + tests/qemuxml2argvdata/cputune-numatune.args | 1 + .../qemuxml2argvdata/cputune-zero-shares.args | 1 + tests/qemuxml2argvdata/cputune.args | 1 + .../default-kvm-host-arch.args | 1 + .../default-qemu-host-arch.args | 1 + tests/qemuxml2argvdata/disk-aio.args | 1 + tests/qemuxml2argvdata/disk-blockio.args | 1 + tests/qemuxml2argvdata/disk-boot-cdrom.args | 1 + tests/qemuxml2argvdata/disk-boot-disk.args | 1 + .../qemuxml2argvdata/disk-cdrom-network.args | 1 + tests/qemuxml2argvdata/disk-cdrom-tray.args | 2 +- tests/qemuxml2argvdata/disk-cdrom.args | 1 + tests/qemuxml2argvdata/disk-copy_on_read.args | 2 +- tests/qemuxml2argvdata/disk-error-policy.args | 1 + tests/qemuxml2argvdata/disk-floppy-tray.args | 1 + tests/qemuxml2argvdata/disk-floppy.args | 1 + tests/qemuxml2argvdata/disk-fmt-qcow.args | 1 + tests/qemuxml2argvdata/disk-geometry.args | 1 + tests/qemuxml2argvdata/disk-ide-split.args | 1 + tests/qemuxml2argvdata/disk-ide-wwn.args | 1 + tests/qemuxml2argvdata/disk-ioeventfd.args | 2 +- tests/qemuxml2argvdata/disk-iscsi.args | 1 + .../disk-network-gluster.args | 1 + .../disk-network-iscsi-modern.args | 1 + .../qemuxml2argvdata/disk-network-iscsi.args | 1 + tests/qemuxml2argvdata/disk-network-nbd.args | 1 + .../disk-network-sheepdog.args | 1 + .../disk-network-source-auth.args | 1 + tests/qemuxml2argvdata/disk-network-vxhs.args | 1 + tests/qemuxml2argvdata/disk-no-boot.args | 1 + tests/qemuxml2argvdata/disk-order.args | 1 + .../qemuxml2argvdata/disk-readonly-disk.args | 1 + tests/qemuxml2argvdata/disk-sata-device.args | 1 + .../disk-scsi-disk-split.args | 1 + .../qemuxml2argvdata/disk-scsi-disk-vpd.args | 1 + .../qemuxml2argvdata/disk-scsi-disk-wwn.args | 1 + .../disk-scsi-lun-passthrough.args | 1 + tests/qemuxml2argvdata/disk-serial.args | 1 + tests/qemuxml2argvdata/disk-snapshot.args | 1 + .../disk-source-pool-mode.args | 1 + tests/qemuxml2argvdata/disk-source-pool.args | 1 + .../disk-usb-device-removable.args | 1 + tests/qemuxml2argvdata/disk-usb-device.args | 1 + .../disk-virtio-ccw-many.args | 1 + tests/qemuxml2argvdata/disk-virtio-ccw.args | 1 + .../qemuxml2argvdata/disk-virtio-queues.args | 1 + .../disk-virtio-s390-zpci.args | 1 + tests/qemuxml2argvdata/disk-virtio.args | 1 + .../encrypted-disk-usage.args | 1 + tests/qemuxml2argvdata/encrypted-disk.args | 1 + tests/qemuxml2argvdata/event_idx.args | 2 +- .../fd-memory-no-numa-topology.args | 1 + .../fd-memory-numa-topology.args | 1 + .../fd-memory-numa-topology2.args | 1 + .../fd-memory-numa-topology3.args | 1 + tests/qemuxml2argvdata/floppy-drive-fat.args | 1 + tests/qemuxml2argvdata/fs9p-ccw.args | 1 + tests/qemuxml2argvdata/fs9p.args | 1 + .../graphics-egl-headless.args | 1 + .../graphics-sdl-fullscreen.args | 1 + tests/qemuxml2argvdata/graphics-sdl.args | 1 + .../graphics-spice-agent-file-xfer.args | 1 + .../graphics-spice-agentmouse.args | 1 + .../graphics-spice-auto-socket-cfg.args | 1 + .../graphics-spice-auto-socket.args | 1 + .../graphics-spice-compression.args | 1 + .../graphics-spice-egl-headless.args | 1 + .../graphics-spice-no-args.args | 1 + .../graphics-spice-qxl-vga.args | 1 + .../qemuxml2argvdata/graphics-spice-sasl.args | 1 + .../graphics-spice-socket.args | 1 + .../graphics-spice-timeout.args | 2 +- .../graphics-spice-usb-redir.args | 1 + tests/qemuxml2argvdata/graphics-spice.args | 1 + .../graphics-vnc-auto-socket-cfg.args | 1 + .../graphics-vnc-auto-socket.args | 1 + .../graphics-vnc-egl-headless.args | 1 + .../graphics-vnc-no-listen-attr.args | 1 + tests/qemuxml2argvdata/graphics-vnc-none.args | 1 + .../qemuxml2argvdata/graphics-vnc-policy.args | 1 + .../graphics-vnc-remove-generated-socket.args | 1 + tests/qemuxml2argvdata/graphics-vnc-sasl.args | 1 + .../graphics-vnc-socket-new-cmdline.args | 1 + .../qemuxml2argvdata/graphics-vnc-socket.args | 1 + tests/qemuxml2argvdata/graphics-vnc-tls.args | 1 + .../graphics-vnc-websocket.args | 1 + tests/qemuxml2argvdata/graphics-vnc.args | 1 + .../hostdev-mdev-precreated.args | 1 + .../hostdev-pci-address-device.args | 1 + .../hostdev-pci-address-unassigned.args | 1 + .../qemuxml2argvdata/hostdev-pci-address.args | 1 + .../hostdev-pci-multifunction.args | 1 + .../hostdev-scsi-vhost-scsi-ccw.args | 1 + .../hostdev-scsi-vhost-scsi-pci.args | 1 + .../hostdev-scsi-vhost-scsi-pcie.args | 1 + .../hostdev-subsys-mdev-vfio-ccw.args | 1 + .../hostdev-usb-address-device-boot.args | 1 + .../hostdev-usb-address-device.args | 1 + .../qemuxml2argvdata/hostdev-usb-address.args | 1 + .../hostdev-vfio-multidomain.args | 1 + .../hostdev-vfio-zpci-autogenerate-fids.args | 1 + .../hostdev-vfio-zpci-autogenerate-uids.args | 1 + .../hostdev-vfio-zpci-autogenerate.args | 1 + .../hostdev-vfio-zpci-boundaries.args | 1 + .../hostdev-vfio-zpci-ccw-memballoon.args | 1 + .../hostdev-vfio-zpci-multidomain-many.args | 1 + tests/qemuxml2argvdata/hostdev-vfio-zpci.args | 1 + tests/qemuxml2argvdata/hostdev-vfio.args | 1 + tests/qemuxml2argvdata/hotplug-base.args | 1 + .../hugepages-default-2M.args | 1 + .../hugepages-default-system-size.args | 1 + tests/qemuxml2argvdata/hugepages-default.args | 1 + .../qemuxml2argvdata/hugepages-memaccess.args | 1 + .../hugepages-memaccess2.args | 1 + tests/qemuxml2argvdata/hugepages-nodeset.args | 1 + .../hugepages-numa-default-2M.args | 1 + .../hugepages-numa-default-dimm.args | 1 + .../hugepages-numa-default.args | 1 + .../hugepages-numa-nodeset-part.args | 1 + .../hugepages-numa-nodeset.args | 1 + tests/qemuxml2argvdata/hugepages-shared.args | 1 + .../qemuxml2argvdata/input-usbmouse-addr.args | 1 + tests/qemuxml2argvdata/input-usbmouse.args | 1 + tests/qemuxml2argvdata/input-usbtablet.args | 1 + tests/qemuxml2argvdata/input-virtio-ccw.args | 1 + .../iothreads-disk-virtio-ccw.args | 1 + tests/qemuxml2argvdata/iothreads-disk.args | 1 + .../iothreads-ids-partial.args | 1 + tests/qemuxml2argvdata/iothreads-ids.args | 1 + tests/qemuxml2argvdata/iothreads.args | 1 + tests/qemuxml2argvdata/kvm-features-off.args | 1 + tests/qemuxml2argvdata/kvm-features.args | 1 + tests/qemuxml2argvdata/kvm-pit-delay.args | 1 + tests/qemuxml2argvdata/kvm-pit-discard.args | 1 + tests/qemuxml2argvdata/kvmclock.args | 1 + .../luks-disks-source-qcow2.args | 1 + tests/qemuxml2argvdata/luks-disks-source.args | 1 + tests/qemuxml2argvdata/luks-disks.args | 1 + .../mach-virt-console-virtio.args | 1 + .../mach-virt-serial-native.args | 1 + .../mach-virt-serial-pci.args | 1 + .../mach-virt-serial-usb.args | 1 + .../machine-aeskeywrap-off-cap.args | 1 + .../machine-aeskeywrap-off-caps.args | 1 + .../machine-aeskeywrap-on-cap.args | 1 + .../machine-aeskeywrap-on-caps.args | 1 + tests/qemuxml2argvdata/machine-aliases1.args | 1 + tests/qemuxml2argvdata/machine-aliases2.args | 1 + tests/qemuxml2argvdata/machine-core-off.args | 1 + tests/qemuxml2argvdata/machine-core-on.args | 1 + .../machine-deakeywrap-off-cap.args | 1 + .../machine-deakeywrap-off-caps.args | 1 + .../machine-deakeywrap-on-cap.args | 1 + .../machine-deakeywrap-on-caps.args | 1 + .../machine-keywrap-none-caps.args | 1 + .../machine-keywrap-none.args | 1 + ...ine-loadparm-multiple-disks-nets-s390.args | 1 + .../machine-loadparm-net-s390.args | 1 + .../machine-loadparm-s390.args | 1 + tests/qemuxml2argvdata/machine-smm-opt.args | 1 + .../qemuxml2argvdata/machine-vmport-opt.args | 1 + tests/qemuxml2argvdata/master-key.args | 1 + .../memory-hotplug-dimm-addr.args | 1 + .../qemuxml2argvdata/memory-hotplug-dimm.args | 1 + ...emory-hotplug-nvdimm-ppc64-abi-update.args | 1 + .../memory-hotplug-nvdimm-ppc64.args | 1 + ...emory-hotplug-ppc64-nonuma-abi-update.args | 1 + .../memory-hotplug-ppc64-nonuma.args | 1 + tests/qemuxml2argvdata/memory-hotplug.args | 1 + tests/qemuxml2argvdata/memtune-unlimited.args | 1 + tests/qemuxml2argvdata/memtune.args | 1 + .../migrate-numa-unaligned.args | 1 + tests/qemuxml2argvdata/migrate.args | 1 + tests/qemuxml2argvdata/minimal.args | 1 + tests/qemuxml2argvdata/misc-acpi.args | 1 + tests/qemuxml2argvdata/misc-disable-s3.args | 1 + .../misc-disable-suspends.args | 1 + tests/qemuxml2argvdata/misc-enable-s4.args | 1 + tests/qemuxml2argvdata/misc-no-reboot.args | 1 + tests/qemuxml2argvdata/misc-uuid.args | 1 + tests/qemuxml2argvdata/monitor-json.args | 1 + .../multifunction-pci-device.args | 1 + tests/qemuxml2argvdata/name-escape.args | 1 + tests/qemuxml2argvdata/net-client.args | 1 + tests/qemuxml2argvdata/net-eth-hostip.args | 1 + tests/qemuxml2argvdata/net-eth-ifname.args | 1 + tests/qemuxml2argvdata/net-eth-names.args | 1 + .../net-eth-unmanaged-tap.args | 1 + tests/qemuxml2argvdata/net-eth.args | 1 + .../net-hostdev-bootorder.args | 1 + .../net-hostdev-multidomain.args | 1 + .../net-hostdev-vfio-multidomain.args | 1 + tests/qemuxml2argvdata/net-hostdev-vfio.args | 1 + tests/qemuxml2argvdata/net-hostdev.args | 1 + tests/qemuxml2argvdata/net-many-models.args | 1 + tests/qemuxml2argvdata/net-mcast.args | 1 + tests/qemuxml2argvdata/net-server.args | 1 + tests/qemuxml2argvdata/net-udp.args | 1 + tests/qemuxml2argvdata/net-user-addr.args | 1 + tests/qemuxml2argvdata/net-user.args | 1 + .../net-vhostuser-multiq.args | 1 + tests/qemuxml2argvdata/net-vhostuser.args | 1 + tests/qemuxml2argvdata/net-virtio-ccw.args | 1 + tests/qemuxml2argvdata/net-virtio-device.args | 1 + .../net-virtio-disable-offloads.args | 1 + tests/qemuxml2argvdata/net-virtio-netdev.args | 1 + .../net-virtio-rxtxqueuesize.args | 1 + .../net-virtio-teaming-hostdev.args | 1 + .../qemuxml2argvdata/net-virtio-teaming.args | 1 + tests/qemuxml2argvdata/net-virtio.args | 1 + tests/qemuxml2argvdata/nosharepages.args | 1 + .../numad-auto-memory-vcpu-cpuset.args | 1 + ...o-memory-vcpu-no-cpuset-and-placement.args | 1 + .../numad-auto-vcpu-static-numatune.args | 1 + .../numad-static-memory-auto-vcpu.args | 1 + tests/qemuxml2argvdata/numad.args | 1 + .../numatune-auto-nodeset-invalid.args | 1 + .../numatune-auto-prefer.args | 1 + .../qemuxml2argvdata/numatune-distances.args | 1 + .../numatune-memnode-no-memory.args | 1 + tests/qemuxml2argvdata/numatune-memnode.args | 1 + tests/qemuxml2argvdata/numatune-memory.args | 1 + tests/qemuxml2argvdata/numatune-no-vcpu.args | 1 + .../qemuxml2argvdata/pages-dimm-discard.args | 1 + .../pages-discard-hugepages.args | 1 + tests/qemuxml2argvdata/pages-discard.args | 1 + tests/qemuxml2argvdata/panic-double.args | 1 + tests/qemuxml2argvdata/panic-no-address.args | 1 + tests/qemuxml2argvdata/panic.args | 1 + .../parallel-parport-chardev.args | 1 + .../parallel-tcp-chardev.args | 1 + tests/qemuxml2argvdata/pci-autoadd-addr.args | 1 + tests/qemuxml2argvdata/pci-autoadd-idx.args | 1 + tests/qemuxml2argvdata/pci-autofill-addr.args | 1 + .../pci-bridge-many-disks.args | 1 + tests/qemuxml2argvdata/pci-bridge.args | 1 + tests/qemuxml2argvdata/pci-expander-bus.args | 1 + tests/qemuxml2argvdata/pci-many.args | 1 + tests/qemuxml2argvdata/pci-rom-disabled.args | 1 + tests/qemuxml2argvdata/pci-rom.args | 1 + .../pci-serial-dev-chardev.args | 1 + tests/qemuxml2argvdata/pcie-expander-bus.args | 1 + .../pcie-root-port-model-generic.args | 1 + .../pcie-root-port-model-ioh3420.args | 1 + tests/qemuxml2argvdata/pcie-root-port.args | 1 + tests/qemuxml2argvdata/pcie-root.args | 1 + .../pcie-switch-downstream-port.args | 1 + .../pcie-switch-upstream-port.args | 1 + tests/qemuxml2argvdata/pcihole64-q35.args | 1 + tests/qemuxml2argvdata/pcihole64.args | 1 + tests/qemuxml2argvdata/pmu-feature-off.args | 1 + tests/qemuxml2argvdata/pmu-feature.args | 1 + tests/qemuxml2argvdata/ppc-dtb.args | 1 + .../ppc64-usb-controller-legacy.args | 1 + .../ppc64-usb-controller-qemu-xhci.args | 1 + .../ppc64-usb-controller.args | 1 + tests/qemuxml2argvdata/ppce500-serial.args | 1 + tests/qemuxml2argvdata/pseries-basic.args | 1 + .../pseries-console-virtio.args | 1 + .../pseries-cpu-compat-power9.args | 1 + .../qemuxml2argvdata/pseries-cpu-compat.args | 1 + tests/qemuxml2argvdata/pseries-cpu-exact.args | 1 + tests/qemuxml2argvdata/pseries-cpu-le.args | 1 + tests/qemuxml2argvdata/pseries-features.args | 1 + .../qemuxml2argvdata/pseries-hostdevs-1.args | 1 + .../qemuxml2argvdata/pseries-hostdevs-2.args | 1 + .../qemuxml2argvdata/pseries-hostdevs-3.args | 1 + .../pseries-machine-max-cpu-compat.args | 1 + .../pseries-many-buses-1.args | 1 + .../pseries-many-buses-2.args | 1 + .../pseries-many-devices.args | 1 + tests/qemuxml2argvdata/pseries-nvram.args | 1 + .../pseries-panic-missing.args | 1 + .../pseries-panic-no-address.args | 1 + .../pseries-phb-default-missing.args | 1 + .../pseries-phb-numa-node.args | 1 + .../qemuxml2argvdata/pseries-phb-simple.args | 1 + .../pseries-serial-native.args | 1 + .../qemuxml2argvdata/pseries-serial-pci.args | 1 + .../qemuxml2argvdata/pseries-serial-usb.args | 1 + .../qemuxml2argvdata/pseries-usb-default.args | 1 + tests/qemuxml2argvdata/pseries-usb-kbd.args | 1 + tests/qemuxml2argvdata/pseries-usb-multi.args | 1 + .../pseries-vio-user-assigned.args | 1 + tests/qemuxml2argvdata/pseries-vio.args | 1 + tests/qemuxml2argvdata/q35-acpi-nouefi.args | 1 + tests/qemuxml2argvdata/q35-acpi-uefi.args | 1 + .../q35-default-devices-only.args | 1 + tests/qemuxml2argvdata/q35-multifunction.args | 1 + tests/qemuxml2argvdata/q35-noacpi-nouefi.args | 1 + .../q35-pci-force-address.args | 1 + tests/qemuxml2argvdata/q35-pcie-autoadd.args | 1 + tests/qemuxml2argvdata/q35-pcie.args | 1 + .../q35-pm-disable-fallback.args | 1 + tests/qemuxml2argvdata/q35-pm-disable.args | 1 + tests/qemuxml2argvdata/q35-usb2-multi.args | 1 + tests/qemuxml2argvdata/q35-usb2-reorder.args | 1 + tests/qemuxml2argvdata/q35-usb2.args | 1 + .../q35-virt-manager-basic.args | 1 + tests/qemuxml2argvdata/q35-virtio-pci.args | 1 + tests/qemuxml2argvdata/q35.args | 1 + tests/qemuxml2argvdata/qemu-ns-alt.args | 1 + .../qemu-ns-commandline-ns0.args | 1 + .../qemu-ns-commandline-ns1.args | 1 + .../qemuxml2argvdata/qemu-ns-commandline.args | 1 + .../qemu-ns-domain-commandline-ns0.args | 1 + .../qemu-ns-domain-commandline.args | 1 + .../qemuxml2argvdata/qemu-ns-domain-ns0.args | 1 + tests/qemuxml2argvdata/qemu-ns-no-env.args | 1 + .../reboot-timeout-disabled.args | 2 +- .../reboot-timeout-enabled.args | 2 +- .../reboot-timeout-enabled.err | 1 - tests/qemuxml2argvdata/restore-v2-fd.args | 1 + tests/qemuxml2argvdata/restore-v2.args | 1 + tests/qemuxml2argvdata/riscv64-virt-pci.args | 1 + tests/qemuxml2argvdata/riscv64-virt.args | 1 + .../qemuxml2argvdata/s390-panic-missing.args | 1 + .../s390-panic-no-address.args | 1 + tests/qemuxml2argvdata/s390-serial-2.args | 1 + .../qemuxml2argvdata/s390-serial-console.args | 1 + tests/qemuxml2argvdata/s390-serial.args | 1 + tests/qemuxml2argvdata/seclabel-dac-none.args | 1 + .../seclabel-dynamic-baselabel.args | 1 + .../seclabel-dynamic-labelskip.args | 1 + .../seclabel-dynamic-override.args | 1 + .../seclabel-dynamic-relabel.args | 1 + tests/qemuxml2argvdata/seclabel-dynamic.args | 1 + tests/qemuxml2argvdata/seclabel-none.args | 1 + .../seclabel-static-labelskip.args | 1 + .../seclabel-static-relabel.args | 1 + tests/qemuxml2argvdata/seclabel-static.args | 1 + .../serial-dev-chardev-iobase.args | 1 + .../qemuxml2argvdata/serial-dev-chardev.args | 1 + .../qemuxml2argvdata/serial-file-chardev.args | 1 + tests/qemuxml2argvdata/serial-file-log.args | 1 + .../qemuxml2argvdata/serial-many-chardev.args | 1 + .../qemuxml2argvdata/serial-pty-chardev.args | 1 + .../serial-spiceport-nospice.args | 1 + tests/qemuxml2argvdata/serial-spiceport.args | 1 + .../qemuxml2argvdata/serial-tcp-chardev.args | 1 + .../serial-tcp-telnet-chardev.args | 1 + .../serial-tcp-tlsx509-chardev-notls.args | 1 + .../serial-tcp-tlsx509-chardev-verify.args | 1 + .../serial-tcp-tlsx509-chardev.args | 1 + .../serial-tcp-tlsx509-secret-chardev.args | 1 + .../qemuxml2argvdata/serial-udp-chardev.args | 1 + .../qemuxml2argvdata/serial-unix-chardev.args | 1 + tests/qemuxml2argvdata/serial-vc-chardev.args | 1 + .../shmem-plain-doorbell.args | 1 + tests/qemuxml2argvdata/shmem.args | 1 + .../smartcard-controller.args | 1 + .../smartcard-host-certificates-database.args | 1 + .../smartcard-host-certificates.args | 1 + tests/qemuxml2argvdata/smartcard-host.args | 1 + .../smartcard-passthrough-spicevmc.args | 1 + .../smartcard-passthrough-tcp.args | 1 + tests/qemuxml2argvdata/smbios-type-fwcfg.args | 1 + tests/qemuxml2argvdata/smbios.args | 1 + tests/qemuxml2argvdata/smp-dies.args | 1 + tests/qemuxml2argvdata/smp.args | 1 + tests/qemuxml2argvdata/sound-device.args | 1 + tests/qemuxml2argvdata/sound.args | 1 + tests/qemuxml2argvdata/sparc-minimal.args | 1 + .../usb-controller-default-q35.args | 1 + .../usb-controller-explicit-q35.args | 1 + .../usb-controller-qemu-xhci.args | 1 + .../qemuxml2argvdata/usb-controller-xhci.args | 1 + tests/qemuxml2argvdata/usb-controller.args | 1 + .../usb-hub-autoadd-deluxe.args | 1 + tests/qemuxml2argvdata/usb-hub-autoadd.args | 1 + tests/qemuxml2argvdata/usb-hub.args | 1 + .../qemuxml2argvdata/usb-ich9-autoassign.args | 1 + .../qemuxml2argvdata/usb-ich9-companion.args | 1 + .../qemuxml2argvdata/usb-ich9-ehci-addr.args | 1 + .../qemuxml2argvdata/usb-long-port-path.args | 1 + tests/qemuxml2argvdata/usb-none.args | 1 + .../usb-piix3-controller.args | 1 + .../qemuxml2argvdata/usb-port-autoassign.args | 1 + tests/qemuxml2argvdata/usb-port-missing.args | 1 + tests/qemuxml2argvdata/usb-ports.args | 1 + tests/qemuxml2argvdata/usb-redir-boot.args | 1 + .../usb-redir-filter-version.args | 1 + tests/qemuxml2argvdata/usb-redir-filter.args | 1 + tests/qemuxml2argvdata/usb-redir.args | 1 + .../qemuxml2argvdata/usb-xhci-autoassign.args | 1 + tests/qemuxml2argvdata/usb1-usb2.args | 1 + tests/qemuxml2argvdata/user-aliases-usb.args | 1 + tests/qemuxml2argvdata/user-aliases.args | 1 + .../vcpu-placement-static.args | 1 + .../video-device-pciaddr-default.args | 1 + tests/qemuxml2argvdata/video-none-device.args | 1 + .../video-qxl-device-vgamem.args | 1 + tests/qemuxml2argvdata/video-qxl-device.args | 1 + tests/qemuxml2argvdata/video-qxl-heads.args | 1 + tests/qemuxml2argvdata/video-qxl-noheads.args | 1 + .../video-qxl-resolution.args | 1 + .../video-qxl-sec-device-vgamem.args | 1 + .../video-qxl-sec-device.args | 1 + .../video-vga-device-vgamem.args | 1 + tests/qemuxml2argvdata/video-vga-device.args | 1 + .../qemuxml2argvdata/video-vga-qxl-heads.args | 1 + .../video-virtio-gpu-ccw.args | 1 + .../video-virtio-gpu-device.args | 1 + .../video-virtio-gpu-sdl-gl.args | 1 + .../video-virtio-gpu-secondary.args | 1 + .../video-virtio-gpu-spice-gl.args | 1 + .../video-virtio-gpu-virgl.args | 1 + tests/qemuxml2argvdata/video-virtio-vga.args | 1 + .../virtio-input-passthrough.args | 1 + tests/qemuxml2argvdata/virtio-input.args | 1 + tests/qemuxml2argvdata/virtio-lun.args | 2 +- tests/qemuxml2argvdata/virtio-rng-ccw.args | 1 + .../qemuxml2argvdata/virtio-rng-default.args | 1 + tests/qemuxml2argvdata/virtio-rng-egd.args | 1 + .../qemuxml2argvdata/virtio-rng-multiple.args | 1 + tests/qemuxml2argvdata/virtio-rng-random.args | 1 + tests/qemuxml2argvdata/vmcoreinfo.args | 1 + tests/qemuxml2argvdata/watchdog-device.args | 1 + tests/qemuxml2argvdata/watchdog-dump.args | 1 + .../qemuxml2argvdata/watchdog-injectnmi.args | 1 + tests/qemuxml2argvdata/watchdog.args | 1 + tests/qemuxml2argvdata/x86-kvm-32-on-64.args | 1 + tests/qemuxml2argvtest.c | 17 +++----- tests/qemuxml2xmltest.c | 8 ++-- 609 files changed, 596 insertions(+), 390 deletions(-) delete mode 100644 tests/qemuxml2argvdata/boot-menu-enable-with-timeout.err delete mode 100644 tests/qemuxml2argvdata/reboot-timeout-enabled.err -- 2.31.1

2 17

[PATCH v5 00/16] Introduce virtio-mem <memory/> model
by Michal Privoznik 21 Sep '21

21 Sep '21

v4 of: https://listman.redhat.com/archives/libvir-list/2021-June/msg00679.html diff to v4: - Rebased onto current master - Worked in David's suggestions, e.g. rename from <actual/> to <current/>, implemented offline memory update, implemented --node argument to virsh update-memory-device, prealloc is OFF and reserve is ON for virtio-mem Some suggestions are left as future work. For instance: - Don't require memory slots because virtio-mem lives on PCI bus anyway - Allow path backed backend for virtio-mem - support .prealloc for virtio-mem object (not memory-backend-* !) I keep occasionally rebased version on my gitlab: https://gitlab.com/MichalPrivoznik/libvirt/-/commits/virtio_mem_v5/ Michal Prívozník (16): virhostmem: Introduce virHostMemGetTHPSize() qemu_capabilities: Introduce QEMU_CAPS_DEVICE_VIRTIO_MEM_PCI qemu_capabilities: Introduce QEMU_CAPS_MEMORY_BACKEND_RESERVE conf: Introduce virtio-mem <memory/> model qemu: Build command line for virtio-mem qemu: Wire up <memory/> live update qemu: Wire up <memory/> offline update Introduce <current/> property to virtio-mem conf: Introduce virDomainMemoryFindByDeviceAlias() qemu: Wire up MEMORY_DEVICE_SIZE_CHANGE event qemu: Refresh the current size of virtio-mem on monitor reconnect qemu: Account for both memballoon and virtio-mem qemuDomainSetMemoryFlags: Take virtio-mem into consideration virsh: Introduce update-memory-device command news: document recent virtio memory addition kbase: Document virtio-mem NEWS.rst | 7 + docs/formatdomain.rst | 45 ++- docs/kbase/index.rst | 4 + docs/kbase/memorydevices.rst | 150 ++++++++++ docs/kbase/meson.build | 1 + docs/manpages/virsh.rst | 30 ++ docs/schemas/domaincommon.rng | 16 ++ examples/c/misc/event-test.c | 17 ++ include/libvirt/libvirt-domain.h | 24 ++ src/conf/domain_conf.c | 126 ++++++++- src/conf/domain_conf.h | 16 ++ src/conf/domain_event.c | 84 ++++++ src/conf/domain_event.h | 10 + src/conf/domain_validate.c | 39 +++ src/libvirt_private.syms | 5 + src/qemu/qemu_alias.c | 10 +- src/qemu/qemu_capabilities.c | 6 + src/qemu/qemu_capabilities.h | 4 + src/qemu/qemu_command.c | 25 +- src/qemu/qemu_domain.c | 33 ++- src/qemu/qemu_domain.h | 1 + src/qemu/qemu_domain_address.c | 38 ++- src/qemu/qemu_driver.c | 259 +++++++++++++++++- src/qemu/qemu_hotplug.c | 18 ++ src/qemu/qemu_hotplug.h | 5 + src/qemu/qemu_monitor.c | 34 +++ src/qemu/qemu_monitor.h | 28 ++ src/qemu/qemu_monitor_json.c | 97 +++++-- src/qemu/qemu_monitor_json.h | 5 + src/qemu/qemu_process.c | 72 +++++ src/qemu/qemu_validate.c | 8 + src/remote/remote_daemon_dispatch.c | 30 ++ src/remote/remote_driver.c | 32 +++ src/remote/remote_protocol.x | 15 +- src/remote_protocol-structs | 7 + src/security/security_apparmor.c | 1 + src/security/security_dac.c | 2 + src/security/security_selinux.c | 2 + src/util/virhostmem.c | 54 ++++ src/util/virhostmem.h | 3 + tests/domaincapsmock.c | 9 + .../caps_5.1.0.x86_64.xml | 1 + .../caps_5.2.0.x86_64.xml | 1 + .../caps_6.0.0.x86_64.xml | 1 + .../caps_6.1.0.x86_64.xml | 2 + ...mory-hotplug-virtio-mem.x86_64-latest.args | 41 +++ .../memory-hotplug-virtio-mem.xml | 67 +++++ tests/qemuxml2argvtest.c | 1 + ...emory-hotplug-virtio-mem.x86_64-latest.xml | 1 + tests/qemuxml2xmltest.c | 1 + tools/virsh-domain.c | 181 ++++++++++++ 51 files changed, 1613 insertions(+), 56 deletions(-) create mode 100644 docs/kbase/memorydevices.rst create mode 100644 tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/memory-hotplug-virtio-mem.xml create mode 120000 tests/qemuxml2xmloutdata/memory-hotplug-virtio-mem.x86_64-latest.xml -- 2.32.0

4 29

question: about the bug: current master had lost the ability "Cancel disk mirrors after libvirtd restart"
by wangjie (P) 21 Sep '21

21 Sep '21

bug reproduce process: 1、perform migrateToURI3. 2、kill libvirtd when enter memory migration phase，and restart libvirtd. 3、perform migrateToURI3 again and again，migrateToURI3 will fail forever with err-msg "Requested operation is not valid: domain has active block job" I found the reasion which trigger the bug as follow: 1、the qemuBlockJobData is not persistent when libvirtd restart，so the job which return from qemuBlockJobDiskGetJob while always NULL, so qemuMigrationSrcNBDCopyCancel will not be taken. 2、calltrace: qemuProcessReconnect ->qemuProcessRecoverJob ->qemuProcessRecoverMigrationOut ->qemuMigrationSrcCancel 3、code as follow: qemuMigrationSrcCancel(virQEMUDriver *driver, virDomainObj *vm) { ... ... for (i = 0; i < vm->def->ndisks; i++) { virDomainDiskDef *disk = vm->def->disks[i]; qemuDomainDiskPrivate *diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk); qemuBlockJobData *job; if (!(job = qemuBlockJobDiskGetJob(disk)) || //the job is always NULL !!! !qemuBlockJobIsRunning(job)) diskPriv->migrating = false; if (diskPriv->migrating) { qemuBlockJobSyncBegin(job); storage = true; } virObjectUnref(job); } ... ... if (storage && qemuMigrationSrcNBDCopyCancel(driver, vm, true, QEMU_ASYNC_JOB_NONE, NULL) < 0) return -1; ... ... } 4、I think current master had lost the ability of the followed patch: http://10.175.124.40/cgit/cgit.cgi/code.huawei.com/libvirt.git/commit/?id=e… can you give some suggestions to fix it?

2 2

RFC: revert to external snapshot API
by Nikolay Shirokovskiy 21 Sep '21

21 Sep '21

Hi, all. I want to implement reverting to external snapshot functionality. I've checked the mailing list history and found some previous attempts (not sure if this is a complete list of them). [1] was done in 2012 by the Redhat team itself. [2] and [3] was done in 2018. Looks like it was not clear how the API should look like. For example we have disk.qcow2 <- disk.snap1 chain <- disk.snap2 chain (after having snap1 and snap2 snapshots). Now we want to revert to snap1 snapshot. The snapshot state is held by disk.qcow2 image. We can run reverted domain on disk.qcow2 itself but then we lose snap1 (held by disk.qcow2) and snap2 (held by disk.snap1). So we definitely should run on some overlay over disk.qcow2. But then what name should be given to overlay? We should have an option for mgmt to specify this name like in case of snapshots itself. The [1] has some discussion on adding extra options to reverting functionality. Like for example if we revert back to snap2 then having the ability to run from state in disk.snap2 rather than disk.snap1. My opinion is there is no need to as if one wants to revert to the state of disk2.snap2 it can take a snapshot (some snap3). At the same time one needs to be aware that revert operation loses current state and later one can revert only to the states of snapshots. This is the way internal snapshots work and the way one expects external snapshots to work too. The [2] takes an approach of reusing current top image as overlay on revert so that in the above example disk.snap2 will be overlay over disk.qcow2 on reverting to snap1 snapshot. IMHO this is a confusing naming scheme. The [3] suggests a different scheme for naming images. For example after taking snapshot snap1 the chain should be disk.snap1 <- disk.qcow2 which looks very appealing to me. With this naming using the [2] approach is quite natural. Implementing this does not look hard even for a running domain but this is a big change to API and all mgmt need to be aware of (well it could be done safely using a new flag). Anyway we can go on with current image names. In order to specify overlay image name let's introduce new API: int virDomainRevertToSnapshotXML(virDomainSnapshotPtr snapshot, char *xmlDesc, unsigned int flags) with XML like: <domainsnapshotrevert> <disks> <disk name='vda'> <source file='/path/to/revert/overlay'/> </disk> </disks> </domainsnapshotrevert> Having an XML looks like a bit overkill right now but I could not find a better solution. If overlay name is omitted the generated name will be like disk.snap1-1 in the above example to be in alignment with creating a snapshot case. So that disk.snap1* images hold states derived from snap1 state. We can also support reverting to external snapshot thru existing virDomainRevertToSnapshot for those who rely on generated names using this naming scheme. [1] Re: [PATCHv4 4/4] snapshot: qemu: Implement reverting of external snapshots https://listman.redhat.com/archives/libvir-list/2012-November/msg00932.html [2] Re: [PATCH 1/5] snapshot: Implement reverting for external disk snapshots https://listman.redhat.com/archives/libvir-list/2018-November/msg00338.html [3] External disk snapshot paths and the revert operation https://listman.redhat.com/archives/libvir-list/2018-October/msg01110.html

3 6

[PATCH 0/2] selinux: Don't ignore ENOENT in Permissive mode
by Michal Privoznik 21 Sep '21

21 Sep '21

See 2/2 for explanation. Michal Prívozník (2): selinux: Swap two blocks handling setfilecon_raw() failure selinux: Don't ignore ENOENT in Permissive mode src/security/security_selinux.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) -- 2.32.0

3 4

[PATCH 0/4] virsh: Follow up improvements
by Michal Privoznik 20 Sep '21

20 Sep '21

These are the fixes I spotted when reviewing Peter's patchset earlier. Michal Prívozník (4): virsh: Provide local path completer for screenshot --file virsh: Provide local path completer for vol-download --file vsh: Extend checks for aliased commands vsh: Ensure that bool --options don't have completer tools/virsh-domain.c | 1 + tools/virsh-volume.c | 6 +----- tools/vsh.c | 30 +++++++++++++++++++++++++++++- 3 files changed, 31 insertions(+), 6 deletions(-) -- 2.32.0

2 5

[PATCH 0/4] Various cleanups
by Peter Krempa 20 Sep '21

20 Sep '21

Few patches from old branches. Peter Krempa (4): util: virdevmapper: Sanitize use of macros for buffer size virDevMapperGetTargets: Use a linked list as return type util: virstring: Remove unused 'virStringListMerge' qemuMonitorJSONGetStatus: Refactor cleanup src/libvirt_private.syms | 1 - src/qemu/qemu_cgroup.c | 11 ++++---- src/qemu/qemu_monitor_json.c | 18 +++++-------- src/qemu/qemu_namespace.c | 9 +++---- src/util/virdevmapper.c | 49 +++++++++++++++++------------------- src/util/virdevmapper.h | 2 +- src/util/virstring.c | 35 -------------------------- src/util/virstring.h | 3 --- tests/qemuhotplugmock.c | 10 +++----- 9 files changed, 43 insertions(+), 95 deletions(-) -- 2.31.1

2 5

[PATCH 00/14] virsh: Completion improvements and checking tool
by Peter Krempa 20 Sep '21

20 Sep '21

When inspecting whether https://gitlab.com/libvirt/libvirt/-/issues/9 is still valid I wrote a tool which outputs command options missing completers. Now that I had a bit of time with lot of interruptions which is ideal for going through such a thing I decided to clean up the tool and post it along with a few fixes and additions to completers. After this patchset the following completers are still missing: $ virsh self-test --completers-missing attach-disk: source, targetbus, driver, subdriver, cache, io, type, mode, sourcetype, source-protocol, source-host-transport, source-host-socket attach-interface: type, source, script, model blockcopy: dest change-media: source detach-interface: type domdisplay: type domxml-from-native: format domxml-to-native: format dump: file get-user-sshkeys: user metadata: uri, key numatune: mode, nodeset qemu-monitor-event: event restore: file save: file save-image-define: file save-image-dumpxml: file save-image-edit: file screenshot: file set-user-sshkeys: user set-user-password: user cpu-models: arch domcapabilities: virttype, emulatorbin, arch, machine hypervisor-cpu-baseline: virttype, emulator, arch, machine hypervisor-cpu-compare: virttype, emulator, arch, machine maxvcpus: type iface-bridge: bridge iface-unbridge: bridge net-update: command, section nodedev-detach: driver snapshot-create-as: memspec find-storage-pool-sources-as: type find-storage-pool-sources: type pool-create-as: source-path, source-dev, source-name, target, source-format, auth-type, secret-usage, secret-uuid, adapter-name, adapter-wwnn, adapter-wwpn, adapter-parent, adapter-parent-wwnn, adapter-parent-wwpn, adapter-parent-fabric-wwn, source-protocol-ver pool-define-as: source-path, source-dev, source-name, target, source-format, auth-type, secret-usage, secret-uuid, adapter-name, adapter-wwnn, adapter-wwpn, adapter-parent, adapter-parent-wwnn, adapter-parent-wwpn, adapter-parent-fabric-wwn, source-protocol-ver vol-create-as: format, backing-vol, backing-vol-format vol-download: file vol-wipe: algorithm cd: dir The list is not so long any more. Mostly missing completers are for remote file paths (passed to libvirt or the VM itself), few enums, guest-agent-based user list and a few which need to be assesed. Peter Krempa (14): virshCheckpointNameCompleter: Sanitize forward declaration use virsh-completer*.h: Use modern header style virsh: Remove hack using 'VSH_CMD_FLAG_ALIAS' to hide virsh commands vshCmddefCheckInternals: Sanitize command alias validation vsh: Introduce '--completers-missing' for 'self-test' command virsh-snapshot: Use 'virshSnapshotNameCompleter' for '--from' of 'snapshot-list' virsh: Use 'virshStoragePoolNameCompleter' for two options vsh: Add completer for '--command' of 'help' command virsh: Provide completers for options taking comma separated list of disk targets virsh: Expand VIRSH_COMMON_OPT_FILE for cases when it's not a local file used by virsh virsh: completer: Introduce dummy completer for local files virsh: Use 'virshCompletePathLocalExisting' for options reading local files virsh: Introduce virshCompleteEmpty and use it for places where we can't suggest anything virsh-completer: Provide completer for '--top' and '--base' for blockjobs tools/virsh-backup.c | 2 + tools/virsh-checkpoint.c | 3 + tools/virsh-completer-checkpoint.h | 7 +- tools/virsh-completer-domain.c | 136 +++++++++++++++++++++++ tools/virsh-completer-domain.h | 170 ++++++++++++++++++----------- tools/virsh-completer-host.h | 28 +++-- tools/virsh-completer-interface.h | 14 ++- tools/virsh-completer-network.h | 35 +++--- tools/virsh-completer-nodedev.h | 21 ++-- tools/virsh-completer-nwfilter.h | 14 ++- tools/virsh-completer-pool.h | 21 ++-- tools/virsh-completer-secret.h | 14 ++- tools/virsh-completer-snapshot.h | 7 +- tools/virsh-completer-volume.h | 14 ++- tools/virsh-completer.c | 35 ++++++ tools/virsh-completer.h | 18 ++- tools/virsh-domain.c | 84 +++++++++++++- tools/virsh-network.c | 1 + tools/virsh-pool.c | 9 ++ tools/virsh-secret.c | 2 + tools/virsh-snapshot.c | 4 + tools/virsh-volume.c | 12 +- tools/virsh.c | 4 +- tools/virsh.h | 2 + tools/virt-admin.c | 3 +- tools/vsh.c | 66 +++++++++-- tools/vsh.h | 10 +- 27 files changed, 568 insertions(+), 168 deletions(-) -- 2.31.1

4 24

[PATCH 0/2] virsh: Fix fallback code path for vcpuinfo
by Peter Krempa 20 Sep '21

20 Sep '21

Peter Krempa (2): virshDomainGetVcpuBitmap: Return bitmap when taking the fallback path virshDomainGetVcpuBitmap: Refactor cleanup tools/virsh-domain.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) -- 2.31.1

5 6

[libvirt PATCH] gitlab: remove obsolete job rules for TEMPORARILY_DISABLED variable
by Daniel P. Berrangé 20 Sep '21

20 Sep '21

We previously had a 'rules:' entry that caused a job to be skipped if the variable "TEMPORARILY_DISABLED" was set. This is no longer needed since we can set a similar flag in ci/manifest.yml and re-generate to temporarily skip a job. Unfortunately the 'rules:' entry had an unexpected side-effect on the pipelines that was never previously noticed. Instead of only running pipelines on push, the mere existance of the 'rules:' entry caused triggering of pipelines on merge requests too. The newly auto-generated ci/gitlab.yml file does not have a 'rules:' for the container job template, and thus only runs on git push. The result is that build jobs try to run on merge requests and the container jobs they depend on don't exist. This breaks the entire pipeline with a message that the config is invalid due to broken job dependencies. This fixes a regression introduced in commit ccc7a44adbea003d6a0dc2f156adb2856c28bd4c Author: Daniel P. Berrangé <berrange(a)redhat.com> Date: Thu Sep 9 14:49:01 2021 +0100 ci: re-generate containers/gitlab config from manifest Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- .gitlab-ci.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b396a1511d..d486faca58 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,10 +18,6 @@ include: '/ci/gitlab.yml' .native_build_job: extends: .gitlab_native_build_job - rules: - - if: "$TEMPORARILY_DISABLED" - allow_failure: true - - when: on_success cache: paths: - ccache/ @@ -45,10 +41,6 @@ include: '/ci/gitlab.yml' paths: - ccache/ key: "$CI_JOB_NAME" - rules: - - if: "$TEMPORARILY_DISABLED" - allow_failure: true - - when: on_success before_script: - *script_variables script: -- 2.31.1

2 1

[PATCH] tools: virsh-snapshot: refactor small functions
by Kristina Hanicova 20 Sep '21

20 Sep '21

This patch includes: * removal of dead code * simplifying nested if conditions * removal of unnecessary variables * usage of "direct" boolean return Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com> --- tools/virsh-snapshot.c | 43 +++++++++++++++--------------------------- 1 file changed, 15 insertions(+), 28 deletions(-) diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index 2659b4340d..3bdad03df0 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -771,7 +771,6 @@ virshSnapshotFilter(vshControl *ctl, virDomainSnapshotPtr snapshot, g_autofree char *xml = NULL; g_autoptr(xmlDoc) xmldoc = NULL; g_autoptr(xmlXPathContext) ctxt = NULL; - int ret = -1; g_autofree char *state = NULL; if (!snapshot) @@ -796,20 +795,17 @@ virshSnapshotFilter(vshControl *ctl, virDomainSnapshotPtr snapshot, return -1; } if (STREQ(state, "disk-snapshot")) { - ret = ((flags & (VIR_DOMAIN_SNAPSHOT_LIST_DISK_ONLY | - VIR_DOMAIN_SNAPSHOT_LIST_EXTERNAL)) == - (VIR_DOMAIN_SNAPSHOT_LIST_DISK_ONLY | - VIR_DOMAIN_SNAPSHOT_LIST_EXTERNAL)); - } else { - if (!(flags & VIR_DOMAIN_SNAPSHOT_LIST_INTERNAL)) - ret = 0; - else if (STREQ(state, "shutoff")) - ret = !!(flags & VIR_DOMAIN_SNAPSHOT_LIST_INACTIVE); - else - ret = !!(flags & VIR_DOMAIN_SNAPSHOT_LIST_ACTIVE); + return ((flags & (VIR_DOMAIN_SNAPSHOT_LIST_DISK_ONLY | + VIR_DOMAIN_SNAPSHOT_LIST_EXTERNAL)) == + (VIR_DOMAIN_SNAPSHOT_LIST_DISK_ONLY | + VIR_DOMAIN_SNAPSHOT_LIST_EXTERNAL)); } - return ret; + if (!(flags & VIR_DOMAIN_SNAPSHOT_LIST_INTERNAL)) + return 0; + if (STREQ(state, "shutoff")) + return !!(flags & VIR_DOMAIN_SNAPSHOT_LIST_INACTIVE); + return !!(flags & VIR_DOMAIN_SNAPSHOT_LIST_ACTIVE); } /* @@ -869,14 +865,8 @@ cmdSnapshotInfo(vshControl *ctl, const vshCmd *cmd) * attempt a fallback. */ current = virDomainSnapshotIsCurrent(snapshot, 0); if (current < 0) { - g_autoptr(virshDomainSnapshot) other = NULL; - vshResetLibvirtError(); current = 0; - if (other) { - if (STREQ(name, virDomainSnapshotGetName(other))) - current = 1; - } } vshPrint(ctl, "%-15s %s\n", _("Current:"), current > 0 ? _("yes") : _("no")); @@ -1776,10 +1766,8 @@ cmdDomainSnapshotRevert(vshControl *ctl, const vshCmd *cmd) vshResetLibvirtError(); result = virDomainRevertToSnapshot(snapshot, flags); } - if (result < 0) - return false; - return true; + return result >= 0; } /* @@ -1844,16 +1832,15 @@ cmdSnapshotDelete(vshControl *ctl, const vshCmd *cmd) /* XXX If we wanted, we could emulate DELETE_CHILDREN_ONLY even on * older servers that reject the flag, by manually computing the * list of descendants. But that's a lot of code to maintain. */ - if (virDomainSnapshotDelete(snapshot, flags) == 0) { - if (flags & VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN_ONLY) - vshPrintExtra(ctl, _("Domain snapshot %s children deleted\n"), name); - else - vshPrintExtra(ctl, _("Domain snapshot %s deleted\n"), name); - } else { + if (virDomainSnapshotDelete(snapshot, flags) < 0) { vshError(ctl, _("Failed to delete snapshot %s"), name); return false; } + if (flags & VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN_ONLY) + vshPrintExtra(ctl, _("Domain snapshot %s children deleted\n"), name); + else + vshPrintExtra(ctl, _("Domain snapshot %s deleted\n"), name); return true; } -- 2.31.1

3 2

[libvirt PATCH 0/2] conf: log error when attempting to live update device acpi index
by Laine Stump 17 Sep '21

17 Sep '21

This isn't possible (acpi index is set when devices are probed at guest startup) and libvirt wasn't even trying to communicate the change to the guest in any way, but instead of logging an error, we were just pretending the request had succeeded. Laine Stump (2): conf: reformat virDomainDefCompatibleDevice for upcoming additional check conf: log error on attempts to modify ACPI index of active device src/conf/domain_conf.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) -- 2.31.1

3 11

[libvirt PATCH 0/3] Reduce stack frame size of virNWFilterRuleDefFixup
by Tim Wiederhake 17 Sep '21

17 Sep '21

When libvirt is build with sanitizers enabled, in debug mode, on clang, virNWFilterRuleDefFixup exceeds the maximum stack frame size of 8192 bytes, as specified in meson.build: ../src/conf/nwfilter_conf.c:2190:1: error: stack frame size of 10616 bytes in function 'virNWFilterRuleDefFixup' [-Werror,-Wframe-larger-than=] virNWFilterRuleDefFixup(virNWFilterRuleDef *rule) ^ 1 error generated. This series reworks the function a bit to bring the frame size below 8192. Regards, Tim Tim Wiederhake (3): virNWFilterRuleDefFixup: Factor out ethHdr as variable virNWFilterRuleDefFixup: Factor out ipHdr as variable virNWFilterRuleDefFixup: Factor out portData as variable src/conf/nwfilter_conf.c | 179 ++++++++++++++++----------------------- 1 file changed, 73 insertions(+), 106 deletions(-) -- 2.31.1

2 10

[libvirt PATCH v3 0/1] Add a PCI/PCIe device VPD Capability
by Dmitrii Shcherbakov 17 Sep '21

17 Sep '21

Add support for deserializing the binary PCI/PCIe VPD format and exposing VPD resources as XML elements in a new nested capability of PCI/PCIe devices called 'vpd'. The VPD format is specified in "I.3. VPD Definitions" in PCI specs (2.2+) and "6.28.1 VPD Format" PCIe 4.0. As section 6.28 in PCIe 4.0 notes, the PCI Local Bus and PCIe VPD formats are binary compatible and PCIe 4.0 merely started incorporating what was already present in PCI specs. Linux kernel exposes a binary blob in the VPD format via sysfs since v2.6.26 (commit 94e6108803469a37ee1e3c92dafdd1d59298602f) which requires a parser to interpret. There are usage scenarios where information such as the board serial number needs to be retrieved from PCI(e) VPD. Projects like Nova can utilize this information for cases which involve virtual interface plugging on SmartNIC DPUs but there may be other scenarios and types of information useful to retrieve from VPD. The fact that the format is binary requires proper parsing instead of substring searching hence the full parser is proposed. Likewise, checksum validation requires proper parsing as well. The patch follows a prior discussion on the mailing list which has additional context about the use-case but a narrower proposal: https://listman.redhat.com/archives/libvir-list/2021-May/msg00873.html https://www.mail-archive.com/libvir-list@redhat.com/msg218165.html The new functionality is mostly contained in virpcivpd with a couple of new functions added to virpci. Additionally, the necessary XML serialization/deserialization and glue code is added to expose the VPD capability to external clients as XML. A new capability flag is added along with a new capability in order to allow for filtering of PCI devices with the VPD capability using virsh: virsh nodedev-list --cap vpd sudo virsh nodedev-dumpxml --device pci_dddd_bb_ss_f In this example having the root uid is required in order to access the vpd sysfs entry, therefore, the nodedev XML output will only contain the VPD capability if virsh is run as root. The capability is treated as dynamic due to the presence of read-write sections in the VPD format per PCI/PCIe specs (the idea being that read-write resource fields may potentially be altered by the DPU OS over time independently from the host OS). Unit tests cover the parser functionality (including many possible invalid cases), in-memory representation as well as XML serialization and deserialization. Manual functional testing was performed with 2 DPUs and several other NIC models which expose PCI(e) VPD. Testing have also been performed for devices that do not have VPD or those that expose a VPD capability but exhibit invalid behavior (I/O errors while reading a sysfs entry). Per the existing guidelines, the implementation relies heavily on glib for various purposes. https://libvirt.org/glib-adoption.html v3 of the patch is a rebase of v2 on top of the latest changes to the master branch. Dmitrii Shcherbakov (1): Add a PCI/PCIe device VPD Capability build-aux/syntax-check.mk | 4 +- docs/drvnodedev.html.in | 46 ++ docs/formatnode.html.in | 24 +- docs/schemas/nodedev.rng | 40 + include/libvirt/libvirt-nodedev.h | 1 + po/POTFILES.in | 1 + src/conf/node_device_conf.c | 258 ++++++ src/conf/node_device_conf.h | 6 +- src/conf/virnodedeviceobj.c | 7 +- src/libvirt_private.syms | 17 + src/node_device/node_device_driver.c | 2 + src/node_device/node_device_udev.c | 2 + src/util/meson.build | 1 + src/util/virpci.c | 60 ++ src/util/virpci.h | 3 + src/util/virpcivpd.c | 771 +++++++++++++++++ src/util/virpcivpd.h | 106 +++ src/util/virpcivpdpriv.h | 42 + tests/meson.build | 1 + .../pci_0000_42_00_0_vpd.xml | 33 + .../pci_0000_42_00_0_vpd.xml | 1 + tests/nodedevxml2xmltest.c | 1 + tests/testutils.c | 51 ++ tests/testutils.h | 6 + tests/virpcitest.c | 3 + tests/virpcivpdtest.c | 777 ++++++++++++++++++ tools/virsh-nodedev.c | 3 + 27 files changed, 2262 insertions(+), 5 deletions(-) create mode 100644 src/util/virpcivpd.c create mode 100644 src/util/virpcivpd.h create mode 100644 src/util/virpcivpdpriv.h create mode 100644 tests/nodedevschemadata/pci_0000_42_00_0_vpd.xml create mode 120000 tests/nodedevxml2xmlout/pci_0000_42_00_0_vpd.xml create mode 100644 tests/virpcivpdtest.c -- 2.30.2

2 3

[libvirt PATCH] Fix typos
by Tim Wiederhake 17 Sep '21

17 Sep '21

Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com> --- src/ch/ch_monitor.c | 2 +- tests/virstoragetest.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ch/ch_monitor.c b/src/ch/ch_monitor.c index 4ed7cbfee7..d277466262 100644 --- a/src/ch/ch_monitor.c +++ b/src/ch/ch_monitor.c @@ -789,7 +789,7 @@ virCHMonitorResumeVM(virCHMonitor *mon) * @mon: Pointer to the monitor * @info: Get VM info * - * Retrive the VM info and store in @info + * Retrieve the VM info and store in @info * * Returns 0 on success. */ diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index ec185d8660..ccfc9f7001 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -100,7 +100,7 @@ testPrepImages(void) return NULL; } - /* create the folowing real backing chain with qcow2 images with absolute + /* create the following real backing chain with qcow2 images with absolute * backing and different qcow2 versions: * datadir/raw <- datadir/qcow2 (qcow2v2) <- datadir/wrap (qcow2v3) */ cmdraw = virCommandNewArgList(qemuimg, "create", -- 2.31.1

2 1

[PATCH] vsh: Move 'vshReadlineOptionsGenerator' out of '#if WITH_READLINE'
by Peter Krempa 17 Sep '21

17 Sep '21

It's now also used in vshCompleteHelpCommand which is outside of the conditionally compiled code. Fixes: 80f70c74a7 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- Pushed under the build-fix rule. tools/vsh.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/tools/vsh.c b/tools/vsh.c index cf24586b25..9057310077 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -2543,17 +2543,12 @@ vshTreePrint(vshControl *ctl, vshTreeLookup lookup, void *opaque, return ret; } -#if WITH_READLINE - -/* ----------------- - * Readline stuff - * ----------------- - */ /** * vshReadlineCommandGenerator: * - * Generator function for command completion. + * Generator function for command completion. Used also for completing the + * '--command' option of the 'help' command. * * Returns a string list of all commands, or NULL on failure. */ @@ -2590,6 +2585,15 @@ vshReadlineCommandGenerator(void) return g_steal_pointer(&ret); } + +#if WITH_READLINE + +/* ----------------- + * Readline stuff + * ----------------- + */ + + static char ** vshReadlineOptionsGenerator(const vshCmdDef *cmd, vshCmd *last) -- 2.31.1

1 0

[PATCH v2 0/5] network create: add support for validation against schema
by Kristina Hanicova 16 Sep '21

16 Sep '21

This is v2 of: https://listman.redhat.com/archives/libvir-list/2021-August/msg00871.html diff to v1: - rebased onto the current master - changed the way of working with flags to make the code more readable (suggested by Jano and Daniel). I added a comment in one case when it was not possible without further refactoring of more functions. Kristina Hanicova (5): api: add public virNetworkCreateXMLFlags() and remote protocol src: add driver support for networkCreateXMLFlags() api: add virNetworkCreateFlags network: allow VIR_NETWORK_CREATE_VALIDATE flag virsh: add support for '--validate' option in create network docs/manpages/virsh.rst | 4 ++- include/libvirt/libvirt-network.h | 7 ++++++ src/driver-network.h | 6 +++++ src/libvirt-network.c | 41 +++++++++++++++++++++++++++++++ src/libvirt_public.syms | 1 + src/network/bridge_driver.c | 21 +++++++++++++--- src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 18 +++++++++++++- src/remote_protocol-structs | 8 ++++++ src/test/test_driver.c | 16 ++++++++++-- src/vbox/vbox_network.c | 13 +++++++++- tools/virsh-network.c | 13 +++++++++- 12 files changed, 139 insertions(+), 10 deletions(-) -- 2.31.1

2 8

[PATCH] tools/virsh-pool: refactor smaller functions
by Kristina Hanicova 16 Sep '21

16 Sep '21

I think these functions look much more readable with just simple if conditions. Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com> --- tools/virsh-pool.c | 68 ++++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 38 deletions(-) diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c index 1a2ab8cc53..c65e8163a6 100644 --- a/tools/virsh-pool.c +++ b/tools/virsh-pool.c @@ -269,7 +269,6 @@ cmdPoolCreate(vshControl *ctl, const vshCmd *cmd) { virStoragePoolPtr pool; const char *from = NULL; - bool ret = true; g_autofree char *buffer = NULL; bool build; bool overwrite; @@ -297,17 +296,15 @@ cmdPoolCreate(vshControl *ctl, const vshCmd *cmd) if (virFileReadAll(from, VSH_MAX_XML_FILE, &buffer) < 0) return false; - pool = virStoragePoolCreateXML(priv->conn, buffer, flags); - - if (pool != NULL) { - vshPrintExtra(ctl, _("Pool %s created from %s\n"), - virStoragePoolGetName(pool), from); - virStoragePoolFree(pool); - } else { + if (!(pool = virStoragePoolCreateXML(priv->conn, buffer, flags))) { vshError(ctl, _("Failed to create pool from %s"), from); - ret = false; + return false; } - return ret; + + vshPrintExtra(ctl, _("Pool %s created from %s\n"), + virStoragePoolGetName(pool), from); + virStoragePoolFree(pool); + return true; } static const vshCmdOptDef opts_pool_define_as[] = { @@ -490,17 +487,16 @@ cmdPoolCreateAs(vshControl *ctl, const vshCmd *cmd) if (printXML) { vshPrint(ctl, "%s", xml); - } else { - pool = virStoragePoolCreateXML(priv->conn, xml, flags); + return true; + } - if (pool != NULL) { - vshPrintExtra(ctl, _("Pool %s created\n"), name); - virStoragePoolFree(pool); - } else { - vshError(ctl, _("Failed to create pool %s"), name); - return false; - } + if (!(pool = virStoragePoolCreateXML(priv->conn, xml, flags))) { + vshError(ctl, _("Failed to create pool %s"), name); + return false; } + + vshPrintExtra(ctl, _("Pool %s created\n"), name); + virStoragePoolFree(pool); return true; } @@ -532,7 +528,6 @@ cmdPoolDefine(vshControl *ctl, const vshCmd *cmd) { virStoragePoolPtr pool; const char *from = NULL; - bool ret = true; g_autofree char *buffer = NULL; unsigned int flags = 0; virshControl *priv = ctl->privData; @@ -546,17 +541,15 @@ cmdPoolDefine(vshControl *ctl, const vshCmd *cmd) if (virFileReadAll(from, VSH_MAX_XML_FILE, &buffer) < 0) return false; - pool = virStoragePoolDefineXML(priv->conn, buffer, flags); - - if (pool != NULL) { - vshPrintExtra(ctl, _("Pool %s defined from %s\n"), - virStoragePoolGetName(pool), from); - virStoragePoolFree(pool); - } else { + if (!(pool = virStoragePoolDefineXML(priv->conn, buffer, flags))) { vshError(ctl, _("Failed to define pool from %s"), from); - ret = false; + return false; } - return ret; + + vshPrintExtra(ctl, _("Pool %s defined from %s\n"), + virStoragePoolGetName(pool), from); + virStoragePoolFree(pool); + return true; } /* @@ -586,17 +579,16 @@ cmdPoolDefineAs(vshControl *ctl, const vshCmd *cmd) if (printXML) { vshPrint(ctl, "%s", xml); - } else { - pool = virStoragePoolDefineXML(priv->conn, xml, 0); + return true; + } - if (pool != NULL) { - vshPrintExtra(ctl, _("Pool %s defined\n"), name); - virStoragePoolFree(pool); - } else { - vshError(ctl, _("Failed to define pool %s"), name); - return false; - } + if (!(pool = virStoragePoolDefineXML(priv->conn, xml, 0))) { + vshError(ctl, _("Failed to define pool %s"), name); + return false; } + + vshPrintExtra(ctl, _("Pool %s defined\n"), name); + virStoragePoolFree(pool); return true; } -- 2.31.1

2 1

[libvirt PATCH 1/2] docs: Expand manpage documentation for nodedev commands
by Jonathon Jongsma 16 Sep '21

16 Sep '21

Bring the documentation for nodedev-list up to date with the latest code, especially documenting the --active and -all options. Also add documentation for the nodedev-define, nodedev-undefine, and nodedev-start commands. Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- docs/manpages/virsh.rst | 48 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 44 insertions(+), 4 deletions(-) diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst index ce98283ae3..73daf2735f 100644 --- a/docs/manpages/virsh.rst +++ b/docs/manpages/virsh.rst @@ -5020,6 +5020,44 @@ Note that this makes libvirt quit managing a host device, and may even make that device unusable by the rest of the physical host until a reboot. +nodedev-define +-------------- + +**Syntax:** + +:: + + nodedev-define FILE + +Define an inactive persistent device or modify an existing persistent one from +the XML *FILE*. + + +nodedev-undefine +---------------- + +**Syntax:** + +:: + + nodedev-undefine device + +Undefine the configuration for a persistent device. If the device is active, +make it transient. + + +nodedev-start +------------- + +**Syntax:** + +:: + + nodedev-start network + +Start a (previously defined) inactive device. + + nodedev-detach -------------- @@ -5076,16 +5114,18 @@ nodedev-list :: - nodedev-list cap --tree + nodedev-list [--cap capability] [--tree] [--inactive | --all] List all of the devices available on the node that are known by libvirt. *cap* is used to filter the list by capability types, the types must be separated by comma, e.g. --cap pci,scsi. Valid capability types include 'system', 'pci', 'usb_device', 'usb', 'net', 'scsi_host', 'scsi_target', 'scsi', 'storage', 'fc_host', 'vports', 'scsi_generic', 'drm', 'mdev', -'mdev_types', 'ccw', 'css', 'ap_card', 'ap_queue', 'ap_matrix'. -If *--tree* is used, the output is formatted in a tree representing parents of each -node. *cap* and *--tree* are mutually exclusive. +'mdev_types', 'ccw', 'css', 'ap_card', 'ap_queue', 'ap_matrix'. By default, +only active devices are listed. *--inactive* is used to list only inactive +devices, and *-all* is used to list both active and inactive devices. +If *--tree* is used, the output is formatted in a tree representing parents of +each node. *--tree* is mutually exclusive with all other options. nodedev-reattach -- 2.31.1

2 2

[PATCH] qemu: Fix typo in qemuBuilNumaCellCache
by Michal Privoznik 16 Sep '21

16 Sep '21

The function should be named qemuBuildNumaCellCache (note the missing 'd' in Build). Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed as trivial. src/qemu/qemu_command.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 4d29313f45..73868ab4b7 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7281,9 +7281,9 @@ qemuBuildIOThreadCommandLine(virCommand *cmd, static int -qemuBuilNumaCellCache(virCommand *cmd, - const virDomainDef *def, - size_t cell) +qemuBuildNumaCellCache(virCommand *cmd, + const virDomainDef *def, + size_t cell) { size_t ncaches = virDomainNumaGetNodeCacheCount(def->numa, cell); size_t i; @@ -7540,7 +7540,7 @@ qemuBuildNumaCommandLine(virQEMUDriverConfig *cfg, /* This can't be moved into any of the loops above, * because hmat-cache can be specified only after hmat-lb. */ for (i = 0; i < ncells; i++) { - if (qemuBuilNumaCellCache(cmd, def, i) < 0) + if (qemuBuildNumaCellCache(cmd, def, i) < 0) goto cleanup; } } -- 2.32.0

1 0

[PATCH v2 0/3] qapi & doc: deprecate drive-backup
by Vladimir Sementsov-Ogievskiy 15 Sep '21

15 Sep '21

Hi all! See 03 commit message for details. 01-02 are preparation docs update. v2: add a lot of documentation changes v1 was "[PATCH] qapi: deprecate drive-backup" Supersedes: <20210423125900.3640-1-vsementsov(a)virtuozzo.com> Vladimir Sementsov-Ogievskiy (3): docs/block-replication: use blockdev-backup docs/interop/bitmaps: use blockdev-backup qapi: deprecate drive-backup docs/block-replication.txt | 4 +- docs/interop/bitmaps.rst | 285 +++++++++++++++++++------ docs/interop/live-block-operations.rst | 47 ++-- docs/system/deprecated.rst | 11 + qapi/block-core.json | 5 +- 5 files changed, 263 insertions(+), 89 deletions(-) -- 2.29.2

4 17

[libvirt PATCH] virsh: Make code flow in cmdManagedSaveRemove more straightforward
by Jiri Denemark 15 Sep '21

15 Sep '21

By doing so we can get rid of the code which violates our coding style guidelines. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- tools/virsh-domain.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index e5bd1fdd75..ca56c3b33d 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -4788,18 +4788,19 @@ cmdManagedSaveRemove(vshControl *ctl, const vshCmd *cmd) return false; } - if (hassave) { - if (virDomainManagedSaveRemove(dom, 0) < 0) { - vshError(ctl, _("Failed to remove managed save image for domain '%s'"), - name); - return false; - } - else - vshPrintExtra(ctl, _("Removed managedsave image for domain '%s'"), name); - } - else + if (hassave == 0) { vshPrintExtra(ctl, _("Domain '%s' has no manage save image; removal skipped"), name); + return true; + } + + if (virDomainManagedSaveRemove(dom, 0) < 0) { + vshError(ctl, _("Failed to remove managed save image for domain '%s'"), + name); + return false; + } + + vshPrintExtra(ctl, _("Removed managedsave image for domain '%s'"), name); return true; } -- 2.33.0

2 1

[PATCH] docs: fix migration_features element name in formatcaps.html.in
by Andrea Bolognani 15 Sep '21

15 Sep '21

From: Robin Lee <cheeselee(a)fedoraproject.org> Signed-off-by: Robin Lee <cheeselee(a)fedoraproject.org> Reviewed-by: Andrea Bolognani <abologna(a)redhat.com> --- Taken from https://gitlab.com/libvirt/libvirt/-/merge_requests/106 I've pushed it already. docs/formatcaps.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatcaps.html.in b/docs/formatcaps.html.in index 59d21a7d9e..09662f78c8 100644 --- a/docs/formatcaps.html.in +++ b/docs/formatcaps.html.in @@ -43,7 +43,7 @@ <dd>whether host is capable of memory suspend, disk hibernation, or hybrid suspend.</dd> - <dt><code>migration</code></dt> + <dt><code>migration_features</code></dt> <dd>This element exposes information on the hypervisor's migration capabilities, like live migration, supported URI transports, and so on.</dd> -- 2.31.1

1 0

[PATCH] virsh: Add QMP command wrapping for 'qemu-monitor-command'
by Peter Krempa 15 Sep '21

15 Sep '21

Issuing simple QMP commands is pain as they need to be wrapped by the JSON wrapper: { "execute": "COMMAND" } and optionally also: { "execute": "COMMAND", "arguments":...} For simple commands without arguments we can add syntax sugar to virsh which allows simple usage of QMP and additionally prepares also for passing through of the 'arguments' section: virsh qemu-monitor-command --qmpwrap $VM query-status is equivalent to virsh qemu-monitor-command $VM '{"execute":"query-status"}' and virsh qemu-monitor-command --qmpwrap $VM query-named-block-nodes '{"flat":true}' is equivalent to virsh qemu-monitor-command $VM '{"execute":"query-named-block-nodes", "arguments":{"flat":true}}' Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- I originally called the flag '--qmp' but that could be confusing given that we have '--hmp'. On the other hand it's shorter so I wouldn't mind turning it back to '--qmp'. docs/manpages/virsh.rst | 9 ++++++++- tools/virsh-domain.c | 31 ++++++++++++++++++++++++++++--- 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst index 9561b3f59d..b8cb3cfbc2 100644 --- a/docs/manpages/virsh.rst +++ b/docs/manpages/virsh.rst @@ -7694,7 +7694,8 @@ qemu-monitor-command :: - qemu-monitor-command domain { [--hmp] | [--pretty] [--return-value] } command... + qemu-monitor-command domain { [--hmp] | [--qmpwrap] [--pretty] + [--return-value] } command... Send an arbitrary monitor command *command* to domain *domain* through the QEMU monitor. The results of the command will be printed on stdout. @@ -7705,6 +7706,12 @@ a space in between before passing the single command to the monitor. Note that libvirt uses the QMP to talk to qemu so *command* must be valid JSON in QMP format to work properly. +If *--qmpwrap* is passed the first argument passed as *command* is used as a QMP +command name and appropriately wrapped into a JSON block. Additionally a second +argument passed as *command* is appended as value of the 'arguments' parameter +of the QMP command verbatim. *Note* that in the future automatic formatting +*--qmpwrap* of the arguments might be added, so scripts should format their own JSON. + If *--pretty* is given the QMP reply is pretty-printed. If *--return-value* is given the 'return' key of the QMP response object is diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index e5bd1fdd75..ac57196b20 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -9380,6 +9380,10 @@ static const vshCmdOptDef opts_qemu_monitor_command[] = { .type = VSH_OT_BOOL, .help = N_("extract the value of the 'return' key from the returned string") }, + {.name = "qmpwrap", + .type = VSH_OT_BOOL, + .help = N_("wrap the 'cmd' argument in JSON wrapper for QMP") + }, {.name = "cmd", .type = VSH_OT_ARGV, .flags = VSH_OFLAG_REQ, @@ -9405,14 +9409,35 @@ cmdQemuMonitorCommand(vshControl *ctl, const vshCmd *cmd) VSH_EXCLUSIVE_OPTIONS("hmp", "pretty"); VSH_EXCLUSIVE_OPTIONS("hmp", "return-value"); + VSH_EXCLUSIVE_OPTIONS("hmp", "qmpwrap"); if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) return false; - while ((opt = vshCommandOptArgv(ctl, cmd, opt))) - virBufferAsprintf(&buf, "%s ", opt->data); + if (vshCommandOptBool(cmd, "qmpwrap")) { + const char *command = NULL; + const char *arguments = NULL; - virBufferTrim(&buf, " "); + if ((opt = vshCommandOptArgv(ctl, cmd, opt))) + command = opt->data; + if ((opt = vshCommandOptArgv(ctl, cmd, opt))) + arguments = opt->data; + + if (!command || (arguments && vshCommandOptArgv(ctl, cmd, opt))) { + vshError(ctl, "%s", _("--qmpwrap option requires 1 or 2 arguments")); + return false; + } + + virBufferAsprintf(&buf, "{\"execute\":\"%s\"", command); + if (arguments) + virBufferAsprintf(&buf, ", \"arguments\":%s", arguments); + virBufferAddLit(&buf, "}"); + } else { + while ((opt = vshCommandOptArgv(ctl, cmd, opt))) + virBufferAsprintf(&buf, "%s ", opt->data); + + virBufferTrim(&buf, " "); + } monitor_cmd = virBufferContentAndReset(&buf); -- 2.31.1

3 2

[libvirt PATCH v2] news: mention new nodedev API
by Jonathon Jongsma 15 Sep '21

15 Sep '21

Add news item about the new API for node devices. Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- NEWS.rst | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 4521499db7..fd20e50d18 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -17,6 +17,18 @@ v7.8.0 (unreleased) * **New features** + * nodedev: Add ability to automatically start mediated devices + + The autostart status of a persistent mediated devices can be managed with + the new APIs ``virNodeDeviceSetAutostart()`` and + ``virNodeDeviceGetAutostart()``. The corresponding virsh command is + ``nodedev-autostart``. In addition, two new APIs were added to get + additional information about node devices: ``virNodeDeviceIsPersistent()`` + checks whether the device is persistently defined, and + ``virNodeDeviceIsActive()`` checks whether the node device is currently + active. This information can also be retrieved with the new virsh command + ``nodedev-info``. + * **Improvements** * **Bug fixes** -- 2.31.1

2 1

[PATCH] qemu: validate: Allow 'preserve' action for on_crash lifecycle action
by Peter Krempa 15 Sep '21

15 Sep '21

In fact keeping the VM around for debugging is a desirable configuration and actually the implementation has no code as we keep the VM around. Remove the validation and add a note that it's actually used. Fixes: b1b85a475fb251b9068b75f629479f5c452f1b43 Reported-by: Christian Borntraeger <borntraeger(a)de.ibm.com> Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_driver.c | 1 + src/qemu/qemu_validate.c | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index dfc27572c4..6ae678b165 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3647,6 +3647,7 @@ processGuestPanicEvent(virQEMUDriver *driver, break; case VIR_DOMAIN_LIFECYCLE_ACTION_PRESERVE: + /* the VM is kept around for debugging */ break; default: diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 9d93f373ab..6b685881a8 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -1083,10 +1083,9 @@ qemuValidateLifecycleAction(virDomainLifecycleAction onPoweroff, /* The qemu driver doesn't yet implement any meaningful handling for * VIR_DOMAIN_LIFECYCLE_ACTION_PRESERVE */ if (onPoweroff == VIR_DOMAIN_LIFECYCLE_ACTION_PRESERVE || - onReboot == VIR_DOMAIN_LIFECYCLE_ACTION_PRESERVE || - onCrash == VIR_DOMAIN_LIFECYCLE_ACTION_PRESERVE) { + onReboot == VIR_DOMAIN_LIFECYCLE_ACTION_PRESERVE) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("qemu driver doesn't support the 'preserve' action for 'on_reboot'/'on_poweroff'/'on_crash'")); + _("qemu driver doesn't support the 'preserve' action for 'on_reboot'/'on_poweroff'")); return -1; } -- 2.31.1

3 2

[PATCH 00/22] qemu: Fix mess with lifecycle actions and unbreak transient disks
by Peter Krempa 15 Sep '21

15 Sep '21

While investigating how to fix issue with transient disks breaking when -no-shutdown is not used I've ended up figuring out that lifecycle action handling in the qemu driver is very broken. Unbreak the handling by rejecting some actions which were never implemented, add support for 'set-action' qmp command and use it to update the 'reset' action in qemu and always use '-no-shutdown'. Peter Krempa (22): qemuMonitorJSONSetWatchdogAction: Use automatic memory clearing qemuDomainSetLifecycleAction: Add a note about argument range-check qemu: driver: Use 'qemuDomainSaveStatus' for saving status XML qemu: validate: Reformat header and purge unused includes qemu: Reject 'rename-restart' action for 'on_reboot'/'on_poweroff'/'on_crash' qemu: driver: Validate lifecycle actions in 'qemuDomainSetLifecycleAction' qemu: Reject 'preserve' action for 'on_reboot'/'on_poweroff'/'on_crash' qemu: Honor 'restart' action for 'on_poweroff' qemu: capablities: Detect presence of 'set-action' as QEMU_CAPS_SET_ACTION qemu: monitor: Implement monitor code for 'set-action' command qemuDomainAttachWatchdog: Use 'set-action' instead of 'watchdog-set-action' if supported qemuxml2argvtest: Add 'LATEST' version of 'misc-no-reboot' test case qemuDomainObjPrivate: Annotate 'allowReboot' field qemu: migration: Don't transfer 'allowReboot' flag qemu: domain: Remove qemuDomainIsUsingNoShutdown qemuDomainSetLifecycleAction: Forbid live update of 'on_reboot' qemuProcessHandleReset: Don't emulate lifecycle actions for RESET event qemuProcessLaunch: Setup handling of 'on_reboot' via QMP when starting the process qemu: command: Always use '-no-shutdown' qemu: process: Don't set 'allowReboot' when qemu supports 'set-action' qemuDomainSetLifecycleAction: Properly update 'onReboot' action in qemu qemu: process: Ignore 'RESET' event during startup docs/formatdomain.rst | 8 +- src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 14 +- src/qemu/qemu_domain.c | 16 -- src/qemu/qemu_domain.h | 11 +- src/qemu/qemu_driver.c | 201 +++++++++++------- src/qemu/qemu_hotplug.c | 54 ++++- src/qemu/qemu_migration.c | 5 - src/qemu/qemu_migration_cookie.c | 22 -- src/qemu/qemu_migration_cookie.h | 4 - src/qemu/qemu_monitor.c | 16 ++ src/qemu/qemu_monitor.h | 49 +++++ src/qemu/qemu_monitor_json.c | 95 ++++++++- src/qemu/qemu_monitor_json.h | 7 + src/qemu/qemu_process.c | 85 +++++--- src/qemu/qemu_validate.c | 51 +++++ src/qemu/qemu_validate.h | 31 +-- .../caps_6.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 + .../caps_6.0.0.x86_64.xml | 1 + .../caps_6.1.0.x86_64.xml | 1 + .../basic-xml2xml-out.xml | 1 - .../full-xml2xml-out.xml | 1 - .../modern-dom-out-dest.xml | 1 - .../modern-dom-out-source.xml | 1 - .../nbd-bitmaps-xml2xml-out.xml | 1 - tests/qemumonitorjsontest.c | 6 + .../misc-no-reboot.x86_64-latest.args | 35 +++ tests/qemuxml2argvtest.c | 1 + 30 files changed, 529 insertions(+), 194 deletions(-) create mode 100644 tests/qemuxml2argvdata/misc-no-reboot.x86_64-latest.args -- 2.31.1

4 27

[PATCH 0/1] qemu_tpm: Start swtpm(8) daemon with --terminate switch
by Nick Chevsky 15 Sep '21

15 Sep '21

libvirt expects the swtpm(8) daemon to auto-terminate along with QEMU. While that's already the case, it's currently happening for the wrong reason: swtpm's documented way of achieving this behavior is via the --terminate switch (which causes the daemon to shut down when the data channel connection drops), but libvirt isn't currently using this switch--and it should. The reason this currently works anyway, even without the --terminate switch, is two-fold: (1) When QEMU terminates gracefully, it sends command CMD_SHUTDOWN to swtpm which triggers a shutdown. Nothing wrong with this one. (2) When QEMU dies abruptly (e.g. SIGKILL, SIGSEGV) without issuing CMD_SHUTDOWN, swtpm should (a) shut down if the --terminate switch was given OR (b) stay alive if --terminate wasn't given. At the moment this isn't being respected, and swtpm unconditionally shuts down (regardless of whether --terminate was given or not) due to a bug in swtpm's connection handling logic [1]. libvirt currently relies on this incorrect and undocumented upstream behavior, trusting swtpm to shut itself down even when --terminate wasn't given, which is wrong and bound to break. The discussion [1] between swtpm's author and I shows that --terminate (a) is the proper way to achieve--and guarantee--the current behavior, (b) is innocuous to add since it won't alter existing behavior, (c) should've been used by libvirt all along, and (d) should be enforced by swtpm going forward. Since libvirt presently relies on swtpm's current (incorrect) behavior and we don't want to break libvirt, we need libvirt to start invoking swtpm with the --terminate switch ASAP so that the upstream bug can be fixed as soon as it's safe. Fixing the bug is the first step toward eventually enabling non-libvirt swtpm users to optionally run swtpm as a persistent service, allowing a VM to connect to and disconnect from it without the daemon dying. Proxmox VE, to which I also contribute, is already using --terminate in its (WIP) swtpm implementation. [1] https://github.com/stefanberger/swtpm/pull/509 -- Note that this already-merged PR addresses only one half of the bug; the other half (which will actually effect the change) remains on hold until libvirt implements --terminate. Nick Chevsky (1): qemu_tpm: Start swtpm(8) daemon with --terminate switch src/qemu/qemu_tpm.c | 2 ++ 1 file changed, 2 insertions(+) -- 2.30.2

2 4

[PATCH] libxl: Don't autostart domains on driver reload
by Jim Fehlig 14 Sep '21

14 Sep '21

When libxlAutostartDomain was introduced with commit fb92307f0d, one hunk mistakenly added a call site in libxlStateReload. Domains should not be autostarted when reloading the driver, so remove the offending hunk. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_driver.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index c5dbcaafa5..7ea157f9c4 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -825,10 +825,6 @@ libxlStateReload(void) libxl_driver->xmlopt, NULL, libxl_driver); - virDomainObjListForEach(libxl_driver->domains, false, - libxlAutostartDomain, - libxl_driver); - virObjectUnref(cfg); return 0; } -- 2.33.0

2 1

[PATCH] node_device_conf: Don't prealloc @vfs in virNodeDeviceGetPCISRIOVCaps()
by Michal Privoznik 14 Sep '21

14 Sep '21

The array of virtual functions @vfs in virNodeDeviceGetPCISRIOVCaps() is allocated twice: the first time during its declaration and the second time inside virPCIGetVirtualFunctions() which leads to a memleak: ==16691== 1,128 bytes in 47 blocks are definitely lost in loss record 1,771 of 1,803 ==16691== at 0x4844CC1: calloc (vg_replace_malloc.c:1117) ==16691== by 0x4E50070: g_malloc0 (in /usr/lib64/libglib-2.0.so.0.6800.3) ==16691== by 0x4A7B034: virNodeDeviceGetPCISRIOVCaps (node_device_conf.c:2649) ==16691== by 0x4A7B5E2: virNodeDeviceGetPCIDynamicCaps (node_device_conf.c:2762) ==16691== by 0xA7F6E18: udevProcessPCI (node_device_udev.c:418) Fixes: c97518d9b833a607f29b9bb02e3fbe74c011c088 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/node_device_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index b4c1acb6a5..9bbff97ffd 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -2646,7 +2646,7 @@ static int virNodeDeviceGetPCISRIOVCaps(const char *sysfsPath, virNodeDevCapPCIDev *pci_dev) { - g_autoptr(virPCIVirtualFunctionList) vfs = g_new0(virPCIVirtualFunctionList, 1); + g_autoptr(virPCIVirtualFunctionList) vfs = NULL; size_t i; int ret; -- 2.32.0

2 1

[PATCH] docs: Format @variable properly
by Michal Privoznik 14 Sep '21

14 Sep '21

When documenting our public API in some places we use '@' to refer to the variable. For instance: * This API tries to set guest time to the given value. The time * to set (@seconds and @nseconds) should be in seconds relative * to the Epoch of 1970-01-01 00:00:00 in UTC. However, when generating HTML documentation these tokens are copied verbatim. What we can do is drop the '@' character and wrap the variable in <code/> so that it is formatted properly. Due to the way we 'parse' docs a token might actually be slightly more than just '@variable'. For instance in the example above we will have the following tokens: '(@seconds' and '@nseconds)'. Thus we need to handle possible substring before and after variable. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- docs/newapi.xsl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/newapi.xsl b/docs/newapi.xsl index 7ac8caa35d..e56a5f2a27 100644 --- a/docs/newapi.xsl +++ b/docs/newapi.xsl @@ -139,6 +139,12 @@ </a> <xsl:value-of select="substring-after($token, '>')"/> </xsl:when> + <xsl:when test="contains($token, '@')"> + <xsl:variable name="prologue" select="substring-before($token, '@')"/> + <xsl:value-of select="$prologue"/> + <code><xsl:value-of select="$stem"/></code> + <xsl:value-of select="substring($token, string-length($prologue) + string-length($stem) + 2)"/> + </xsl:when> <xsl:otherwise> <xsl:value-of select="$token"/> </xsl:otherwise> -- 2.32.0

2 1

[PATCH] libxl: Fix driver reload
by Jim Fehlig 14 Sep '21

14 Sep '21

On reload, the libxl driver calls virDomainObjListLoadAllConfigs to load all configs from /etc/libvirt/libxl/ but incorrectly passes 'true' for the liveStatus parameter, resulting in error messages such as libvirtd[21053]: XML error: unexpected root element <domain>, expecting <domstatus> libvirtd[21053]: Failed to load config for domain 'sles15sp3' Fix by not requesting live status when re-reading the persistent VM config files. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 6a3938ead4..c5dbcaafa5 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -821,7 +821,7 @@ libxlStateReload(void) virDomainObjListLoadAllConfigs(libxl_driver->domains, cfg->configDir, cfg->autostartDir, - true, + false, libxl_driver->xmlopt, NULL, libxl_driver); -- 2.33.0

2 2

question on vhost, limiting kernel threads and NPROC
by Mike Christie 14 Sep '21

14 Sep '21

Hi, The goal of this email is to try and figure how we want to track/limit the number of kernel threads created by vhost devices. Background: ----------- For vhost-scsi, we've hit a issue where the single vhost worker thread can't handle all IO the being sent from multiple queues. IOPs is stuck at around 500K. To fix this, we did this patchset: https://lore.kernel.org/linux-scsi/20210525180600.6349-1-michael.christie@o… which allows userspace to create N threads and map them to a dev's virtqueues. With this we can get around 1.4M IOPs. Problem: -------- While those patches were being reviewed, a concern about tracking all these new possible threads was raised here: https://lore.kernel.org/linux-scsi/YL45CfpHyzSEcAJv@stefanha-x1.localdomain/ To save you some time, the question is what does other kernel code using the kthread API do to track the number of kernel threads created on behalf of a userspace thread. The answer is they don't do anything so we will have to add that code. I started to do that here: https://lkml.org/lkml/2021/6/23/1233 where those patches would charge/check the vhost device owner's RLIMIT_NPROC value. But, the question of if we really want to do this has come up which is why I'm bugging lists like libvirt now. Question/Solution: ------------------ I'm bugging everyone so we can figure out: If we need to specifically track the number of kernel threads being made for the vhost kernel use case by the RLIMIT_NPROC limit? Or, is it ok to limit the number of devices with the RLIMIT_NOFILE limit. Then each device has a limit on the number of threads it can create.

4 4

[libvirt PATCH 0/2] ci: Add Debian 11 builds
by Andrea Bolognani 14 Sep '21

14 Sep '21

It's been out for a bit. Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/368763275 Andrea Bolognani (2): ci: Add Debian 11 builds ci: Regenerate configuration from manifest .../debian-11-cross-aarch64.Dockerfile | 126 +++++++++++++++++ .../debian-11-cross-armv6l.Dockerfile | 125 +++++++++++++++++ .../debian-11-cross-armv7l.Dockerfile | 126 +++++++++++++++++ ci/containers/debian-11-cross-i686.Dockerfile | 125 +++++++++++++++++ .../debian-11-cross-mips64el.Dockerfile | 125 +++++++++++++++++ .../debian-11-cross-mipsel.Dockerfile | 125 +++++++++++++++++ .../debian-11-cross-ppc64le.Dockerfile | 125 +++++++++++++++++ .../debian-11-cross-s390x.Dockerfile | 125 +++++++++++++++++ ci/containers/debian-11.Dockerfile | 106 ++++++++++++++ ci/gitlab.yml | 130 ++++++++++++++---- ci/manifest.yml | 42 +++++- 11 files changed, 1248 insertions(+), 32 deletions(-) create mode 100644 ci/containers/debian-11-cross-aarch64.Dockerfile create mode 100644 ci/containers/debian-11-cross-armv6l.Dockerfile create mode 100644 ci/containers/debian-11-cross-armv7l.Dockerfile create mode 100644 ci/containers/debian-11-cross-i686.Dockerfile create mode 100644 ci/containers/debian-11-cross-mips64el.Dockerfile create mode 100644 ci/containers/debian-11-cross-mipsel.Dockerfile create mode 100644 ci/containers/debian-11-cross-ppc64le.Dockerfile create mode 100644 ci/containers/debian-11-cross-s390x.Dockerfile create mode 100644 ci/containers/debian-11.Dockerfile -- 2.31.1

2 3

[PATCH] qemuxml2argvdata: Remove unused '.err' files
by Peter Krempa 14 Sep '21

14 Sep '21

These are no longer referenced by any existing test as of: os-firmware-invalid-type -> a9b1375d7d2f7d240dce09c5f8b62e568e386051 tseg-explicit-size -> 604990a1758bfdc302f3c576c5766c0763912dfd Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- .../qemuxml2argvdata/os-firmware-invalid-type.x86_64-latest.err | 1 - tests/qemuxml2argvdata/tseg-explicit-size.x86_64-2.10.0.err | 1 - 2 files changed, 2 deletions(-) delete mode 100644 tests/qemuxml2argvdata/os-firmware-invalid-type.x86_64-latest.err delete mode 100644 tests/qemuxml2argvdata/tseg-explicit-size.x86_64-2.10.0.err diff --git a/tests/qemuxml2argvdata/os-firmware-invalid-type.x86_64-latest.err b/tests/qemuxml2argvdata/os-firmware-invalid-type.x86_64-latest.err deleted file mode 100644 index c8174b1c8b..0000000000 --- a/tests/qemuxml2argvdata/os-firmware-invalid-type.x86_64-latest.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: firmware attribute and firmware type has to be the same diff --git a/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-2.10.0.err b/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-2.10.0.err deleted file mode 100644 index 82f8685a90..0000000000 --- a/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-2.10.0.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: Setting TSEG size is not supported with this QEMU binary -- 2.31.1

2 1

[libvirt PATCH 0/2] docs: virtiofs: move legacy docs to the bottom
by Stefan Hajnoczi 14 Sep '21

14 Sep '21

The virtiofs kbase article includes a lot of information that is only relevant to old versions of QEMU and libvirt. Setting up virtiofs can seem intimidating but it's actually easier than the article lets on. Move the legacy information out of the way. Stefan Hajnoczi (2): docs: virtiofs: move legacy docs to the bottom docs: virtiofs: use the preferred virtiofs spelling docs/kbase/virtiofs.rst | 183 +++++++++++++++++++++------------------- 1 file changed, 97 insertions(+), 86 deletions(-) -- 2.31.1

3 8

[libvirt PATCH v2 00/12] Automatic mutex management
by Tim Wiederhake 14 Sep '21

14 Sep '21

V1: https://listman.redhat.com/archives/libvir-list/2021-August/msg00823.html Changes since V1: * Replaced vir_g_auto* macros with redefinitions of g_auto* if compiled with clang (patch 1). * Split up VIR_XPATH_NODE_AUTORESTORE simplification differently (patches 2 and 3). * Added virObjectLockGuard / VIR_WITH_OBJECT_LOCK_GUARD for automatic mutex management of virObjectLockable variables. * Used different set of example cleanups (patches 9 - 12). Regards, Tim Tim Wiederhake (12): glibcompat: Add G_GNUC_UNUSED to g_auto* definitions for clang virxml: Simplify VIR_XPATH_NODE_AUTORESTORE VIR_XPATH_NODE_AUTORESTORE: Require semicolon internal: Add CONCAT macro virthread: Introduce virLockGuard virthread: Introduce VIR_WITH_MUTEX_LOCK_GUARD virobject: Introduce virObjectLockGuard virobject: Introduce VIR_WITH_OBJECT_LOCK_GUARD virChrdevFDStreamCloseCb: Use virLockGuardNew virChrdevFree: Use VIR_WITH_MUTEX_LOCK bhyveAutostartDomain: Use virObjectLockGuard lxcDomainDetachDeviceHostdevUSBLive: Use VIR_WITH_OBJECT_LOCK_GUARD src/bhyve/bhyve_driver.c | 4 +- src/conf/backup_conf.c | 2 +- src/conf/checkpoint_conf.c | 2 +- src/conf/cpu_conf.c | 2 +- src/conf/domain_conf.c | 140 ++++++++++++++--------------- src/conf/interface_conf.c | 8 +- src/conf/netdev_vlan_conf.c | 2 +- src/conf/network_conf.c | 14 +-- src/conf/networkcommon_conf.c | 2 +- src/conf/node_device_conf.c | 42 ++++----- src/conf/numa_conf.c | 6 +- src/conf/snapshot_conf.c | 2 +- src/conf/storage_adapter_conf.c | 2 +- src/conf/storage_conf.c | 4 +- src/conf/storage_encryption_conf.c | 4 +- src/conf/storage_source_conf.c | 2 +- src/conf/virchrdev.c | 12 ++- src/conf/virsavecookie.c | 2 +- src/cpu/cpu_map.c | 4 +- src/cpu/cpu_x86.c | 2 +- src/internal.h | 3 + src/libvirt_private.syms | 4 + src/lxc/lxc_domain.c | 2 +- src/lxc/lxc_driver.c | 6 +- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_domain.c | 8 +- src/qemu/qemu_domainjob.c | 2 +- src/qemu/qemu_migration_cookie.c | 8 +- src/util/glibcompat.h | 19 ++++ src/util/virobject.c | 16 ++++ src/util/virobject.h | 24 +++++ src/util/virthread.c | 26 ++++++ src/util/virthread.h | 30 +++++++ src/util/virxml.h | 4 +- 34 files changed, 265 insertions(+), 147 deletions(-) -- 2.31.1

3 22

[PATCH 0/3] Resend after following review: qemu: add virtio-blk queue-size option
by Hiroki Narukawa 14 Sep '21

14 Sep '21

This is resubmit of "qemu: add virtio-blk queue-size option" after following the review. The option "queue-size" in virtio-blk was added in qemu-2.12.0, and default value increased from qemu-5.0.0. However, increasing this value may lead to drop of random access performance. This is configurable value, so we want to use it via libvirt. Hiroki Narukawa (3): qemu: accept queue_size XML element qemu: add QEMU_CAPS_VIRTIO_BLK_QUEUE_SIZE capability qemu: add virtio-blk queue-size option docs/schemas/domaincommon.rng | 5 +++ src/conf/domain_conf.c | 6 ++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 3 ++ src/qemu/qemu_validate.c | 6 ++++ .../caps_2.12.0.aarch64.xml | 1 + .../caps_2.12.0.ppc64.xml | 1 + .../caps_2.12.0.s390x.xml | 1 + .../caps_2.12.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 + .../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 1 + .../caps_3.0.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 + .../caps_3.1.0.x86_64.xml | 1 + .../caps_4.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 + .../caps_4.0.0.riscv32.xml | 1 + .../caps_4.0.0.riscv64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 + .../caps_4.0.0.x86_64.xml | 1 + .../caps_4.1.0.x86_64.xml | 1 + .../caps_4.2.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 + .../caps_4.2.0.x86_64.xml | 1 + .../caps_5.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 + .../caps_5.0.0.riscv64.xml | 1 + .../caps_5.0.0.x86_64.xml | 1 + .../caps_5.1.0.x86_64.xml | 1 + .../caps_5.2.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 + .../caps_5.2.0.riscv64.xml | 1 + .../qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 + .../caps_5.2.0.x86_64.xml | 1 + .../caps_6.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 + .../caps_6.0.0.x86_64.xml | 1 + .../caps_6.1.0.x86_64.xml | 1 + .../disk-virtio-queue-size.args | 29 +++++++++++++++ .../disk-virtio-queue-size.xml | 35 +++++++++++++++++++ tests/qemuxml2argvtest.c | 2 ++ .../disk-virtio-queue-size.xml | 35 +++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 46 files changed, 160 insertions(+) create mode 100644 tests/qemuxml2argvdata/disk-virtio-queue-size.args create mode 100644 tests/qemuxml2argvdata/disk-virtio-queue-size.xml create mode 100644 tests/qemuxml2xmloutdata/disk-virtio-queue-size.xml -- 2.17.1

2 7

[PATCH v1] qemu: Add support for librbd encryption
by Or Ozeri 14 Sep '21

14 Sep '21

Starting from ceph Pacific, RBD has built-in support for image-level encryption. qemu 6.1 added support for this encryption using a new "encrypt" property to the RBD qdict. This commit extends the libvirt XML API to allow the user to choose between the existing qemu encryption engine, and the new librbd encryption engine. Signed-off-by: Or Ozeri <oro(a)il.ibm.com> --- docs/formatstorageencryption.html.in | 8 +++- docs/schemas/domainbackup.rng | 7 ++++ docs/schemas/storagecommon.rng | 8 ++++ src/conf/storage_encryption_conf.c | 30 +++++++++++++- src/conf/storage_encryption_conf.h | 11 +++++ src/qemu/qemu_block.c | 40 +++++++++++++++++++ src/qemu/qemu_domain.c | 3 +- .../backup-pull-encrypted.xml | 6 +-- .../backup-pull-internal-invalid.xml | 6 +-- .../backup-push-encrypted.xml | 6 +-- tests/qemustatusxml2xmldata/upgrade-out.xml | 6 +-- tests/qemuxml2argvdata/disk-nvme.xml | 2 +- tests/qemuxml2argvdata/disk-slices.xml | 4 +- .../qemuxml2argvdata/encrypted-disk-usage.xml | 2 +- tests/qemuxml2argvdata/encrypted-disk.xml | 2 +- .../luks-disks-source-qcow2.xml | 14 +++---- tests/qemuxml2argvdata/luks-disks-source.xml | 10 ++--- tests/qemuxml2argvdata/luks-disks.xml | 4 +- tests/qemuxml2argvdata/user-aliases.xml | 2 +- .../disk-slices.x86_64-latest.xml | 4 +- tests/qemuxml2xmloutdata/encrypted-disk.xml | 2 +- .../luks-disks-source-qcow2.x86_64-latest.xml | 14 +++---- .../qemuxml2xmloutdata/luks-disks-source.xml | 10 ++--- .../storagevolxml2xmlout/vol-luks-cipher.xml | 2 +- tests/storagevolxml2xmlout/vol-luks.xml | 2 +- .../vol-qcow2-encryption.xml | 2 +- tests/storagevolxml2xmlout/vol-qcow2-luks.xml | 2 +- 27 files changed, 154 insertions(+), 55 deletions(-) diff --git a/docs/formatstorageencryption.html.in b/docs/formatstorageencryption.html.in index 7215c307d7..e0eb8697aa 100644 --- a/docs/formatstorageencryption.html.in +++ b/docs/formatstorageencryption.html.in @@ -18,11 +18,17 @@ is <code>encryption</code>, with a mandatory attribute <code>format</code>. Currently defined values of <code>format</code> are <code>default</code>, <code>qcow</code>, - and <code>luks</code>. + <code>luks</code>, and <code>luks2</code>. Each value of <code>format</code> implies some expectations about the content of the <code>encryption</code> tag. Other format values may be defined in the future. </p> + <p> + The <code>encryption</code> tag supports an optional <code>engine</code> + tag, which allows selecting which component actually handles + the encryption. Currently defined values of <code>engine</code> are + <code>qemu</code> (default) and <code>librbd</code>. + </p> <p> The <code>encryption</code> tag can currently contain a sequence of <code>secret</code> tags, each with mandatory attributes <code>type</code> diff --git a/docs/schemas/domainbackup.rng b/docs/schemas/domainbackup.rng index c03455a5a7..05cc28ab00 100644 --- a/docs/schemas/domainbackup.rng +++ b/docs/schemas/domainbackup.rng @@ -14,6 +14,13 @@ <value>luks</value> </choice> </attribute> + <optional> + <attribute name="engine"> + <choice> + <value>qemu</value> + </choice> + </attribute> + </optional> <interleave> <ref name="secret"/> <optional> diff --git a/docs/schemas/storagecommon.rng b/docs/schemas/storagecommon.rng index 9ebb27700d..3ddff02e43 100644 --- a/docs/schemas/storagecommon.rng +++ b/docs/schemas/storagecommon.rng @@ -15,6 +15,14 @@ <value>luks</value> </choice> </attribute> + <optional> + <attribute name="engine"> + <choice> + <value>qemu</value> + <value>librbd</value> + </choice> + </attribute> + </optional> <interleave> <ref name="secret"/> <optional> diff --git a/src/conf/storage_encryption_conf.c b/src/conf/storage_encryption_conf.c index 9112b96cc7..64044057bf 100644 --- a/src/conf/storage_encryption_conf.c +++ b/src/conf/storage_encryption_conf.c @@ -44,7 +44,12 @@ VIR_ENUM_IMPL(virStorageEncryptionSecret, VIR_ENUM_IMPL(virStorageEncryptionFormat, VIR_STORAGE_ENCRYPTION_FORMAT_LAST, - "default", "qcow", "luks", + "default", "qcow", "luks", "luks2", +); + +VIR_ENUM_IMPL(virStorageEncryptionEngine, + VIR_STORAGE_ENCRYPTION_ENGINE_LAST, + "qemu", "librbd", ); static void @@ -217,6 +222,7 @@ virStorageEncryptionParseNode(xmlNodePtr node, xmlNodePtr *nodes = NULL; virStorageEncryption *encdef = NULL; virStorageEncryption *ret = NULL; + g_autofree char *engine_str = NULL; g_autofree char *format_str = NULL; int n; size_t i; @@ -239,6 +245,18 @@ virStorageEncryptionParseNode(xmlNodePtr node, goto cleanup; } + if (!(engine_str = virXPathString("string(./@engine)", ctxt))) { + encdef->engine = VIR_STORAGE_ENCRYPTION_ENGINE_QEMU; + } else { + if ((encdef->engine = + virStorageEncryptionEngineTypeFromString(engine_str)) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown volume encryption engine type %s"), + engine_str); + goto cleanup; + } + } + if ((n = virXPathNodeSet("./secret", ctxt, &nodes)) < 0) goto cleanup; @@ -327,15 +345,23 @@ int virStorageEncryptionFormat(virBuffer *buf, virStorageEncryption *enc) { + const char *engine; const char *format; size_t i; + if (!(engine = virStorageEncryptionEngineTypeToString(enc->engine))) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("unexpected encryption engine")); + return -1; + } + if (!(format = virStorageEncryptionFormatTypeToString(enc->format))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("unexpected encryption format")); return -1; } - virBufferAsprintf(buf, "<encryption format='%s'>\n", format); + virBufferAsprintf(buf, "<encryption format='%s' engine='%s'>\n", format, + engine); virBufferAdjustIndent(buf, 2); for (i = 0; i < enc->nsecrets; i++) { diff --git a/src/conf/storage_encryption_conf.h b/src/conf/storage_encryption_conf.h index 34adbd5f7b..bd8787be98 100644 --- a/src/conf/storage_encryption_conf.h +++ b/src/conf/storage_encryption_conf.h @@ -51,11 +51,21 @@ struct _virStorageEncryptionInfoDef { char *ivgen_hash; }; +typedef enum { + /* "default" is only valid for volume creation */ + VIR_STORAGE_ENCRYPTION_ENGINE_QEMU = 0, /* default */ + VIR_STORAGE_ENCRYPTION_ENGINE_LIBRBD, + + VIR_STORAGE_ENCRYPTION_ENGINE_LAST, +} virStorageEncryptionEngineType; +VIR_ENUM_DECL(virStorageEncryptionEngine); + typedef enum { /* "default" is only valid for volume creation */ VIR_STORAGE_ENCRYPTION_FORMAT_DEFAULT = 0, VIR_STORAGE_ENCRYPTION_FORMAT_QCOW, /* Both qcow and qcow2 */ VIR_STORAGE_ENCRYPTION_FORMAT_LUKS, + VIR_STORAGE_ENCRYPTION_FORMAT_LUKS2, VIR_STORAGE_ENCRYPTION_FORMAT_LAST, } virStorageEncryptionFormatType; @@ -63,6 +73,7 @@ VIR_ENUM_DECL(virStorageEncryptionFormat); typedef struct _virStorageEncryption virStorageEncryption; struct _virStorageEncryption { + int engine; /* virStorageEncryptionEngineType */ int format; /* virStorageEncryptionFormatType */ int payload_offset; diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 0bc92f6a23..e064e5a490 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -875,6 +875,8 @@ qemuBlockStorageSourceGetRBDProps(virStorageSource *src, qemuDomainStorageSourcePrivate *srcPriv = QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(src); g_autoptr(virJSONValue) servers = NULL; virJSONValue *ret = NULL; + g_autoptr(virJSONValue) encrypt = NULL; + const char *encformat; const char *username = NULL; g_autoptr(virJSONValue) authmodes = NULL; g_autoptr(virJSONValue) mode = NULL; @@ -899,12 +901,47 @@ qemuBlockStorageSourceGetRBDProps(virStorageSource *src, return NULL; } + if (src->encryption && + src->encryption->engine == VIR_STORAGE_ENCRYPTION_ENGINE_LIBRBD) { + switch ((virStorageEncryptionFormatType) src->encryption->format) { + case VIR_STORAGE_ENCRYPTION_FORMAT_LUKS: + encformat = "luks"; + break; + + case VIR_STORAGE_ENCRYPTION_FORMAT_LUKS2: + encformat = "luks2"; + break; + + case VIR_STORAGE_ENCRYPTION_FORMAT_DEFAULT: + case VIR_STORAGE_ENCRYPTION_FORMAT_QCOW: + case VIR_STORAGE_ENCRYPTION_FORMAT_LAST: + default: + virReportEnumRangeError(virStorageEncryptionFormatType, + src->encryption->format); + return NULL; + } + + if (!srcPriv || !srcPriv->encinfo || !srcPriv->encinfo->s.aes.alias) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("missing secret info for rbd encryption driver")); + return NULL; + } + + encrypt = virJSONValueNewObject(); + if (virJSONValueObjectAdd(encrypt, + "s:format", encformat, + "s:key-secret", srcPriv->encinfo->s.aes.alias, + NULL) < 0) + return NULL; + } + if (virJSONValueObjectCreate(&ret, "s:pool", src->volume, "s:image", src->path, "S:snapshot", src->snapshot, "S:conf", src->configFile, "A:server", &servers, + "A:encrypt", &encrypt, "S:user", username, "A:auth-client-required", &authmodes, "S:key-secret", keysecret, @@ -1318,6 +1355,7 @@ qemuBlockStorageSourceGetCryptoProps(virStorageSource *src, * VIR_DOMAIN_SECRET_INFO_TYPE_AES works here. The correct type needs to be * instantiated elsewhere. */ if (!src->encryption || + src->encryption->engine != VIR_STORAGE_ENCRYPTION_ENGINE_QEMU || !srcpriv || !srcpriv->encinfo || srcpriv->encinfo->type != VIR_DOMAIN_SECRET_INFO_TYPE_AES) @@ -1333,6 +1371,7 @@ qemuBlockStorageSourceGetCryptoProps(virStorageSource *src, break; case VIR_STORAGE_ENCRYPTION_FORMAT_DEFAULT: + case VIR_STORAGE_ENCRYPTION_FORMAT_LUKS2: case VIR_STORAGE_ENCRYPTION_FORMAT_LAST: default: virReportEnumRangeError(virStorageEncryptionFormatType, @@ -1453,6 +1492,7 @@ qemuBlockStorageSourceGetBlockdevFormatProps(virStorageSource *src) * put a raw layer on top */ case VIR_STORAGE_FILE_RAW: if (src->encryption && + src->encryption->engine == VIR_STORAGE_ENCRYPTION_ENGINE_QEMU && src->encryption->format == VIR_STORAGE_ENCRYPTION_FORMAT_LUKS) { if (qemuBlockStorageSourceGetFormatLUKSProps(src, props) < 0) return NULL; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 25b7f03204..cd7d19a0c5 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1354,7 +1354,8 @@ static bool qemuDomainDiskHasEncryptionSecret(virStorageSource *src) { if (!virStorageSourceIsEmpty(src) && src->encryption && - src->encryption->format == VIR_STORAGE_ENCRYPTION_FORMAT_LUKS && + (src->encryption->format == VIR_STORAGE_ENCRYPTION_FORMAT_LUKS || + src->encryption->format == VIR_STORAGE_ENCRYPTION_FORMAT_LUKS2) && src->encryption->nsecrets > 0) return true; diff --git a/tests/domainbackupxml2xmlout/backup-pull-encrypted.xml b/tests/domainbackupxml2xmlout/backup-pull-encrypted.xml index 42051d1d24..e975feddc5 100644 --- a/tests/domainbackupxml2xmlout/backup-pull-encrypted.xml +++ b/tests/domainbackupxml2xmlout/backup-pull-encrypted.xml @@ -5,7 +5,7 @@ <disk name='vda' backup='yes' type='file' backupmode='incremental' incremental='1525889631' exportname='test-vda' exportbitmap='blah'> <driver type='qcow2'/> <scratch file='/path/to/file'> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/> </encryption> </scratch> @@ -13,7 +13,7 @@ <disk name='vdb' backup='yes' type='file' backupmode='incremental' incremental='1525889631' exportname='test-vda' exportbitmap='blah'> <driver type='qcow2'/> <scratch file='/path/to/file'> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' usage='/storage/backup/vdb'/> </encryption> </scratch> @@ -21,7 +21,7 @@ <disk name='vdc' backup='yes' type='block' backupmode='incremental' incremental='1525889631'> <driver type='qcow2'/> <scratch dev='/dev/block'> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' usage='/storage/backup/vdc'/> </encryption> </scratch> diff --git a/tests/domainbackupxml2xmlout/backup-pull-internal-invalid.xml b/tests/domainbackupxml2xmlout/backup-pull-internal-invalid.xml index 092b6bf8a7..80c2c8f7d8 100644 --- a/tests/domainbackupxml2xmlout/backup-pull-internal-invalid.xml +++ b/tests/domainbackupxml2xmlout/backup-pull-internal-invalid.xml @@ -5,7 +5,7 @@ <disk name='vda' backup='yes' state='running' type='file' backupmode='incremental' incremental='1525889631' exportname='test-vda' exportbitmap='blah'> <driver type='qcow2'/> <scratch file='/path/to/file'> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/> </encryption> </scratch> @@ -13,7 +13,7 @@ <disk name='vdb' backup='yes' state='complete' type='file' backupmode='incremental' incremental='1525889631' exportname='test-vda' exportbitmap='blah'> <driver type='qcow2'/> <scratch file='/path/to/file'> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' usage='/storage/backup/vdb'/> </encryption> </scratch> @@ -21,7 +21,7 @@ <disk name='vdc' backup='yes' state='running' type='block' backupmode='incremental' incremental='1525889631'> <driver type='qcow2'/> <scratch dev='/dev/block'> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' usage='/storage/backup/vdc'/> </encryption> </scratch> diff --git a/tests/domainbackupxml2xmlout/backup-push-encrypted.xml b/tests/domainbackupxml2xmlout/backup-push-encrypted.xml index 3b664b0dcb..95cf16a4b3 100644 --- a/tests/domainbackupxml2xmlout/backup-push-encrypted.xml +++ b/tests/domainbackupxml2xmlout/backup-push-encrypted.xml @@ -4,7 +4,7 @@ <disk name='vda' backup='yes' type='file' backupmode='incremental' incremental='1525889631'> <driver type='qcow2'/> <target file='/path/to/file'> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/> </encryption> </target> @@ -12,7 +12,7 @@ <disk name='vdb' backup='yes' type='file' backupmode='incremental' incremental='1525889631'> <driver type='raw'/> <target file='/path/to/file'> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' usage='/storage/backup/vdb'/> </encryption> </target> @@ -20,7 +20,7 @@ <disk name='vdc' backup='yes' type='block' backupmode='incremental' incremental='1525889631'> <driver type='qcow2'/> <target dev='/dev/block'> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' usage='/storage/backup/vdc'/> </encryption> </target> diff --git a/tests/qemustatusxml2xmldata/upgrade-out.xml b/tests/qemustatusxml2xmldata/upgrade-out.xml index f9476731f6..5218092cb9 100644 --- a/tests/qemustatusxml2xmldata/upgrade-out.xml +++ b/tests/qemustatusxml2xmldata/upgrade-out.xml @@ -316,7 +316,7 @@ <disk type='file' device='disk'> <driver name='qemu' type='qcow2'/> <source file='/var/lib/libvirt/images/b.qcow2'> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/> </encryption> <privateData> @@ -333,7 +333,7 @@ <disk type='file' device='disk'> <driver name='qemu' type='qcow2'/> <source file='/var/lib/libvirt/images/c.qcow2'> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/> </encryption> <privateData> @@ -354,7 +354,7 @@ <auth username='testuser-iscsi'> <secret type='iscsi' usage='testuser-iscsi-secret'/> </auth> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/> </encryption> <privateData> diff --git a/tests/qemuxml2argvdata/disk-nvme.xml b/tests/qemuxml2argvdata/disk-nvme.xml index 1ccbbfd598..9a5fafce7d 100644 --- a/tests/qemuxml2argvdata/disk-nvme.xml +++ b/tests/qemuxml2argvdata/disk-nvme.xml @@ -42,7 +42,7 @@ <driver name='qemu' type='qcow2' cache='none'/> <source type='pci' managed='no' namespace='2'> <address domain='0x0001' bus='0x02' slot='0x00' function='0x0'/> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/> </encryption> </source> diff --git a/tests/qemuxml2argvdata/disk-slices.xml b/tests/qemuxml2argvdata/disk-slices.xml index 016aa1b905..849809f05a 100644 --- a/tests/qemuxml2argvdata/disk-slices.xml +++ b/tests/qemuxml2argvdata/disk-slices.xml @@ -44,7 +44,7 @@ <slices> <slice type='storage' offset='1234' size='321'/> </slices> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/> </encryption> </source> @@ -69,7 +69,7 @@ <slices> <slice type='storage' offset='1234' size='321'/> </slices> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/> </encryption> </source> diff --git a/tests/qemuxml2argvdata/encrypted-disk-usage.xml b/tests/qemuxml2argvdata/encrypted-disk-usage.xml index 7c2da9ee83..d2b87b94b6 100644 --- a/tests/qemuxml2argvdata/encrypted-disk-usage.xml +++ b/tests/qemuxml2argvdata/encrypted-disk-usage.xml @@ -18,7 +18,7 @@ <driver name='qemu' type='qcow2'/> <source file='/storage/guest_disks/encryptdisk'/> <target dev='vda' bus='virtio'/> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' usage='/storage/guest_disks/encryptdisk'/> </encryption> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> diff --git a/tests/qemuxml2argvdata/encrypted-disk.xml b/tests/qemuxml2argvdata/encrypted-disk.xml index e996cde889..a75ed7ebf4 100644 --- a/tests/qemuxml2argvdata/encrypted-disk.xml +++ b/tests/qemuxml2argvdata/encrypted-disk.xml @@ -18,7 +18,7 @@ <driver name='qemu' type='qcow2'/> <source file='/storage/guest_disks/encryptdisk'/> <target dev='vda' bus='virtio'/> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/> </encryption> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> diff --git a/tests/qemuxml2argvdata/luks-disks-source-qcow2.xml b/tests/qemuxml2argvdata/luks-disks-source-qcow2.xml index 7192ca00bd..46d2036cc3 100644 --- a/tests/qemuxml2argvdata/luks-disks-source-qcow2.xml +++ b/tests/qemuxml2argvdata/luks-disks-source-qcow2.xml @@ -17,7 +17,7 @@ <disk type='file' device='disk'> <driver name='qemu' type='qcow2'/> <source file='/storage/guest_disks/encryptdisk'> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/> </encryption> </source> @@ -27,7 +27,7 @@ <disk type='file' device='disk'> <driver name='qemu' type='qcow2'/> <source file='/storage/guest_disks/encryptdisk2'> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' usage='/storage/guest_disks/encryptdisk2'/> </encryption> </source> @@ -41,7 +41,7 @@ <auth username='myname'> <secret type='iscsi' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80e80'/> </auth> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80f77'/> </encryption> </source> @@ -50,7 +50,7 @@ <disk type='volume' device='disk'> <driver name='qemu' type='qcow2'/> <source pool='pool-iscsi' volume='unit:0:0:3' mode='direct'> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80f80'/> </encryption> </source> @@ -62,7 +62,7 @@ <host name='mon1.example.org' port='6321'/> <host name='mon2.example.org' port='6322'/> <host name='mon3.example.org' port='6322'/> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80fb0'/> </encryption> </source> @@ -71,14 +71,14 @@ <disk type='file' device='disk'> <driver name='qemu' type='qcow2'/> <source file='/storage/guest_disks/encryptdisk5'> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/> </encryption> </source> <backingStore type='file'> <format type='qcow2'/> <source file='/storage/guest_disks/base.qcow2'> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/> </encryption> </source> diff --git a/tests/qemuxml2argvdata/luks-disks-source.xml b/tests/qemuxml2argvdata/luks-disks-source.xml index 293877df9e..72d97d2f4b 100644 --- a/tests/qemuxml2argvdata/luks-disks-source.xml +++ b/tests/qemuxml2argvdata/luks-disks-source.xml @@ -17,7 +17,7 @@ <disk type='file' device='disk'> <driver name='qemu' type='raw'/> <source file='/storage/guest_disks/encryptdisk'> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/> </encryption> </source> @@ -27,7 +27,7 @@ <disk type='file' device='disk'> <driver name='qemu' type='raw'/> <source file='/storage/guest_disks/encryptdisk2'> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' usage='/storage/guest_disks/encryptdisk2'/> </encryption> </source> @@ -41,7 +41,7 @@ <auth username='myname'> <secret type='iscsi' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80e80'/> </auth> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80f77'/> </encryption> </source> @@ -50,7 +50,7 @@ <disk type='volume' device='disk'> <driver name='qemu' type='raw'/> <source pool='pool-iscsi' volume='unit:0:0:3' mode='direct'> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80f80'/> </encryption> </source> @@ -62,7 +62,7 @@ <host name='mon1.example.org' port='6321'/> <host name='mon2.example.org' port='6322'/> <host name='mon3.example.org' port='6322'/> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80fb0'/> </encryption> </source> diff --git a/tests/qemuxml2argvdata/luks-disks.xml b/tests/qemuxml2argvdata/luks-disks.xml index ae6d3d996c..1c76f0dc26 100644 --- a/tests/qemuxml2argvdata/luks-disks.xml +++ b/tests/qemuxml2argvdata/luks-disks.xml @@ -18,7 +18,7 @@ <driver name='qemu' type='raw'/> <source file='/storage/guest_disks/encryptdisk'/> <target dev='vda' bus='virtio'/> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/> </encryption> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> @@ -27,7 +27,7 @@ <driver name='qemu' type='raw'/> <source file='/storage/guest_disks/encryptdisk2'/> <target dev='vdb' bus='virtio'/> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' usage='/storage/guest_disks/encryptdisk2'/> </encryption> <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> diff --git a/tests/qemuxml2argvdata/user-aliases.xml b/tests/qemuxml2argvdata/user-aliases.xml index 47bfc56e73..10b7749521 100644 --- a/tests/qemuxml2argvdata/user-aliases.xml +++ b/tests/qemuxml2argvdata/user-aliases.xml @@ -55,7 +55,7 @@ <driver name='qemu' type='qcow2'/> <source file='/var/lib/libvirt/images/OtherDemo.img'/> <target dev='vdb' bus='virtio'/> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='e78d4b51-a2af-485f-b0f5-afca709a80f4'/> </encryption> <alias name='ua-myEncryptedDisk1'/> diff --git a/tests/qemuxml2xmloutdata/disk-slices.x86_64-latest.xml b/tests/qemuxml2xmloutdata/disk-slices.x86_64-latest.xml index be5cd25084..a058cbad61 100644 --- a/tests/qemuxml2xmloutdata/disk-slices.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/disk-slices.x86_64-latest.xml @@ -49,7 +49,7 @@ <slices> <slice type='storage' offset='1234' size='321'/> </slices> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/> </encryption> </source> @@ -75,7 +75,7 @@ <slices> <slice type='storage' offset='1234' size='321'/> </slices> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/> </encryption> </source> diff --git a/tests/qemuxml2xmloutdata/encrypted-disk.xml b/tests/qemuxml2xmloutdata/encrypted-disk.xml index 06f2c5b47c..e30c8a36e8 100644 --- a/tests/qemuxml2xmloutdata/encrypted-disk.xml +++ b/tests/qemuxml2xmloutdata/encrypted-disk.xml @@ -18,7 +18,7 @@ <driver name='qemu' type='qcow2'/> <source file='/storage/guest_disks/encryptdisk'/> <target dev='vda' bus='virtio'/> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/> </encryption> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> diff --git a/tests/qemuxml2xmloutdata/luks-disks-source-qcow2.x86_64-latest.xml b/tests/qemuxml2xmloutdata/luks-disks-source-qcow2.x86_64-latest.xml index 5f600f5ba7..7f98dd597e 100644 --- a/tests/qemuxml2xmloutdata/luks-disks-source-qcow2.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/luks-disks-source-qcow2.x86_64-latest.xml @@ -20,7 +20,7 @@ <disk type='file' device='disk'> <driver name='qemu' type='qcow2'/> <source file='/storage/guest_disks/encryptdisk'> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/> </encryption> </source> @@ -30,7 +30,7 @@ <disk type='file' device='disk'> <driver name='qemu' type='qcow2'/> <source file='/storage/guest_disks/encryptdisk2'> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' usage='/storage/guest_disks/encryptdisk2'/> </encryption> </source> @@ -44,7 +44,7 @@ <auth username='myname'> <secret type='iscsi' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80e80'/> </auth> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80f77'/> </encryption> </source> @@ -54,7 +54,7 @@ <disk type='volume' device='disk'> <driver name='qemu' type='qcow2'/> <source pool='pool-iscsi' volume='unit:0:0:3' mode='direct'> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80f80'/> </encryption> </source> @@ -67,7 +67,7 @@ <host name='mon1.example.org' port='6321'/> <host name='mon2.example.org' port='6322'/> <host name='mon3.example.org' port='6322'/> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80fb0'/> </encryption> </source> @@ -77,14 +77,14 @@ <disk type='file' device='disk'> <driver name='qemu' type='qcow2'/> <source file='/storage/guest_disks/encryptdisk5'> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/> </encryption> </source> <backingStore type='file'> <format type='qcow2'/> <source file='/storage/guest_disks/base.qcow2'> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/> </encryption> </source> diff --git a/tests/qemuxml2xmloutdata/luks-disks-source.xml b/tests/qemuxml2xmloutdata/luks-disks-source.xml index 5333d4ac6e..891b5d9d17 100644 --- a/tests/qemuxml2xmloutdata/luks-disks-source.xml +++ b/tests/qemuxml2xmloutdata/luks-disks-source.xml @@ -17,7 +17,7 @@ <disk type='file' device='disk'> <driver name='qemu' type='raw'/> <source file='/storage/guest_disks/encryptdisk'> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f'/> </encryption> </source> @@ -27,7 +27,7 @@ <disk type='file' device='disk'> <driver name='qemu' type='raw'/> <source file='/storage/guest_disks/encryptdisk2'> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' usage='/storage/guest_disks/encryptdisk2'/> </encryption> </source> @@ -41,7 +41,7 @@ <auth username='myname'> <secret type='iscsi' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80e80'/> </auth> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80f77'/> </encryption> </source> @@ -51,7 +51,7 @@ <disk type='volume' device='disk'> <driver name='qemu' type='raw'/> <source pool='pool-iscsi' volume='unit:0:0:3' mode='direct'> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80f80'/> </encryption> </source> @@ -64,7 +64,7 @@ <host name='mon1.example.org' port='6321'/> <host name='mon2.example.org' port='6322'/> <host name='mon3.example.org' port='6322'/> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='0a81f5b2-8403-7b23-c8d6-21ccc2f80fb0'/> </encryption> </source> diff --git a/tests/storagevolxml2xmlout/vol-luks-cipher.xml b/tests/storagevolxml2xmlout/vol-luks-cipher.xml index fd99793612..b3fbcbe9a3 100644 --- a/tests/storagevolxml2xmlout/vol-luks-cipher.xml +++ b/tests/storagevolxml2xmlout/vol-luks-cipher.xml @@ -12,7 +12,7 @@ <group>0</group> <label>unconfined_u:object_r:virt_image_t:s0</label> </permissions> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='f52a81b2-424e-490c-823d-6bd4235bc572'/> <cipher name='serpent' size='256' mode='cbc' hash='sha256'/> <ivgen name='plain64' hash='sha256'/> diff --git a/tests/storagevolxml2xmlout/vol-luks.xml b/tests/storagevolxml2xmlout/vol-luks.xml index c011d4cc62..8ff345ecb3 100644 --- a/tests/storagevolxml2xmlout/vol-luks.xml +++ b/tests/storagevolxml2xmlout/vol-luks.xml @@ -12,7 +12,7 @@ <group>0</group> <label>unconfined_u:object_r:virt_image_t:s0</label> </permissions> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='f52a81b2-424e-490c-823d-6bd4235bc572'/> </encryption> </target> diff --git a/tests/storagevolxml2xmlout/vol-qcow2-encryption.xml b/tests/storagevolxml2xmlout/vol-qcow2-encryption.xml index 837adf41b1..d9a34492bb 100644 --- a/tests/storagevolxml2xmlout/vol-qcow2-encryption.xml +++ b/tests/storagevolxml2xmlout/vol-qcow2-encryption.xml @@ -12,7 +12,7 @@ <group>0</group> <label>unconfined_u:object_r:virt_image_t:s0</label> </permissions> - <encryption format='qcow'> + <encryption format='qcow' engine='qemu'> <secret type='passphrase' uuid='e78d4b51-a2af-485f-b0f5-afca709a80f4'/> </encryption> </target> diff --git a/tests/storagevolxml2xmlout/vol-qcow2-luks.xml b/tests/storagevolxml2xmlout/vol-qcow2-luks.xml index 78edc4239c..63f2bdf9b2 100644 --- a/tests/storagevolxml2xmlout/vol-qcow2-luks.xml +++ b/tests/storagevolxml2xmlout/vol-qcow2-luks.xml @@ -12,7 +12,7 @@ <group>0</group> <label>unconfined_u:object_r:virt_image_t:s0</label> </permissions> - <encryption format='luks'> + <encryption format='luks' engine='qemu'> <secret type='passphrase' uuid='e78d4b51-a2af-485f-b0f5-afca709a80f4'/> </encryption> </target> -- 2.25.1

2 1

[libvirt PATCH 0/2] ci: Some minor adjustments
by Andrea Bolognani 14 Sep '21

14 Sep '21

After recent changes. Andrea Bolognani (2): ci: Restore information about Coverity integration ci: Avoid use of magic constants ci/README.rst | 22 ++++++++++++++++++++++ ci/util.py | 3 ++- 2 files changed, 24 insertions(+), 1 deletion(-) -- 2.31.1

3 4

[libvirt PATCH v2 0/4] report interface infomation in guestinfo command
by zhanglei 14 Sep '21

14 Sep '21

zhanglei (4): domain: add interface information to 'virDomainGetGuestInfo' virsh: add interface information to guestinfo command qemu: report guest interface information in 'qemuDomainGetGuestInfo' NEWS: qemu: report guest interfaces information in 'virDomainGetGuestInfo' NEWS.rst | 5 ++ docs/manpages/virsh.rst | 12 ++++- include/libvirt/libvirt-domain.h | 1 + src/libvirt-domain.c | 13 +++++ src/qemu/qemu_agent.c | 9 ++-- src/qemu/qemu_agent.h | 3 +- src/qemu/qemu_driver.c | 89 +++++++++++++++++++++++++++++++- tests/qemuagenttest.c | 2 +- tools/virsh-domain.c | 6 +++ 9 files changed, 131 insertions(+), 9 deletions(-) -- 2.31.1

2 7

[PATCH] libxl: Improve reporting of die_id in capabilities
by Jim Fehlig 14 Sep '21

14 Sep '21

On Xen, libvirt runs in a VM (typically dom0) and does not have an accurate picture of numa and cpu topology of the underlying physical machine using the "usual" mechanisms. numa info and cpu toplogy are retrieved from libxl and used to populate the libvirt conterparts. Commit 7b79ee2f78b introduced support for reporting die_id in capabilities, but did not account for special handling of numa and cpu topology in libxl. Currently, Xen does not report die_id in the libxl_cputopology structure. In the meantime, set die_id to 0, which was suggested by the Xen developers and is slightly better than random garbage such as <cpu id='1' socket_id='0' die_id='-1073069552' core_id='0' siblings='0-1'/> Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_capabilities.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index b4bd1d7e62..4afed71436 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -292,6 +292,8 @@ libxlCapsInitNuma(libxl_ctx *ctx, virCaps *caps) cpus[node][nr_cpus_node[node]-1].id = i; cpus[node][nr_cpus_node[node]-1].socket_id = cpu_topo[i].socket; cpus[node][nr_cpus_node[node]-1].core_id = cpu_topo[i].core; + /* Until Xen reports die_id, 0 is better than random garbage */ + cpus[node][nr_cpus_node[node]-1].die_id = 0; /* Allocate the siblings maps. We will be filling them later */ cpus[node][nr_cpus_node[node]-1].siblings = virBitmapNew(nr_cpus); } -- 2.33.0

2 1

[PATCH v4 for v7.6.0 00/14] Introduce virtio-mem <memory/> model
by Michal Privoznik 13 Sep '21

13 Sep '21

v4 of: https://listman.redhat.com/archives/libvir-list/2021-April/msg01138.html diff to v3: - Rebased code on the top of master - Tried to work in all Peter's review suggestions - Fixed a bug where adjusting <requested/> was viewed as hotplug of new <memory/> by XML validator and thus if <maxMemory/> was close enough to <currentMemory/> the validator reported an error (this was reported by David). You can also find these patches on my branch: https://gitlab.com/MichalPrivoznik/libvirt/-/tree/virtio_mem_v4 Michal Prívozník (14): virhostmem: Introduce virHostMemGetTHPSize() qemu_capabilities: Introduce QEMU_CAPS_DEVICE_VIRTIO_MEM_PCI conf: Introduce virtio-mem <memory/> model qemu: Build command line for virtio-mem qemu: Wire up <memory/> live update Introduce <actual/> property to virtio-mem conf: Introduce virDomainMemoryFindByDeviceAlias() qemu: Wire up MEMORY_DEVICE_SIZE_CHANGE event qemu: Refresh the actual size of virtio-mem on monitor reconnect qemu: Account for both memballoon and virtio-mem qemuDomainSetMemoryFlags: Take virtio-mem into consideration virsh: Introduce update-memory-device command news: document recent virtio memory addition kbase: Document virtio-mem NEWS.rst | 12 + docs/formatdomain.rst | 45 +++- docs/kbase/index.rst | 4 + docs/kbase/memorydevices.rst | 150 +++++++++++ docs/kbase/meson.build | 1 + docs/manpages/virsh.rst | 30 +++ docs/schemas/domaincommon.rng | 16 ++ examples/c/misc/event-test.c | 17 ++ include/libvirt/libvirt-domain.h | 23 ++ src/conf/domain_conf.c | 118 ++++++++- src/conf/domain_conf.h | 15 ++ src/conf/domain_event.c | 84 ++++++ src/conf/domain_event.h | 10 + src/conf/domain_validate.c | 39 +++ src/libvirt_private.syms | 5 + src/qemu/qemu_alias.c | 10 +- src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 13 +- src/qemu/qemu_domain.c | 33 ++- src/qemu/qemu_domain.h | 1 + src/qemu/qemu_domain_address.c | 38 ++- src/qemu/qemu_driver.c | 240 +++++++++++++++++- src/qemu/qemu_hotplug.c | 18 ++ src/qemu/qemu_hotplug.h | 5 + src/qemu/qemu_monitor.c | 37 +++ src/qemu/qemu_monitor.h | 28 ++ src/qemu/qemu_monitor_json.c | 97 +++++-- src/qemu/qemu_monitor_json.h | 5 + src/qemu/qemu_process.c | 72 ++++++ src/qemu/qemu_validate.c | 8 + src/remote/remote_daemon_dispatch.c | 30 +++ src/remote/remote_driver.c | 32 +++ src/remote/remote_protocol.x | 14 +- src/remote_protocol-structs | 7 + src/security/security_apparmor.c | 1 + src/security/security_dac.c | 2 + src/security/security_selinux.c | 2 + src/util/virhostmem.c | 54 ++++ src/util/virhostmem.h | 3 + tests/domaincapsmock.c | 9 + .../caps_5.1.0.x86_64.xml | 1 + .../caps_5.2.0.x86_64.xml | 1 + .../caps_6.0.0.x86_64.xml | 1 + .../caps_6.1.0.x86_64.xml | 1 + ...mory-hotplug-virtio-mem.x86_64-latest.args | 41 +++ .../memory-hotplug-virtio-mem.xml | 67 +++++ tests/qemuxml2argvtest.c | 1 + ...emory-hotplug-virtio-mem.x86_64-latest.xml | 1 + tests/qemuxml2xmltest.c | 1 + tools/virsh-domain.c | 169 ++++++++++++ 51 files changed, 1562 insertions(+), 53 deletions(-) create mode 100644 docs/kbase/memorydevices.rst create mode 100644 tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/memory-hotplug-virtio-mem.xml create mode 120000 tests/qemuxml2xmloutdata/memory-hotplug-virtio-mem.x86_64-latest.xml -- 2.31.1

4 21

[RFC REPOST 0/7] introduce support for live appid updates
by Pavel Hrdina 13 Sep '21

13 Sep '21

Rebased on top of current master. I'm posting this as an RFC mainly because I'm not sure how to model the new API. This patches introduce a new naive API that will change only the APPID and nothing else. Currently there are no other known features related to Fibre Channel resources so this non-extendable API will be sufficient, however the appid lives in <resource> element in the XML where we currently have root cgroup partition. Even though changing the partition will not be supported and we don't know about anything else that could be placed here it doesn't mean it will not happen in the future. In that case we would have to add new API as well. So I'm wondering if we should create a more generic API that would take typed parameters as arguments: int virDomainSetResource(virDomainPtr domain, virTypedParameterPtr params, int nparams, unsigned int flags) Any ideas? Pavel Hrdina (7): conf: extract appid validation to virDomainDefResourceAppidValidate cgroup: extract setting fibre channel appid into virCgroupSetFCAppid virCgroupSetFCAppid: properly handle when appid is NULL src: introduce virDomainSetFibreChannelAppid API remote: add RPC support for the virDomainSetFibreChannelAppid API qemu: implement virDomainSetFibreChannelAppid API tools: introduce virsh setappid command docs/manpages/virsh.rst | 14 ++++++ include/libvirt/libvirt-domain.h | 4 ++ src/conf/domain_validate.c | 42 ++++++++++-------- src/conf/domain_validate.h | 2 + src/driver-hypervisor.h | 6 +++ src/libvirt-domain.c | 44 +++++++++++++++++++ src/libvirt_private.syms | 2 + src/libvirt_public.syms | 1 + src/qemu/qemu_cgroup.c | 17 +------- src/qemu/qemu_driver.c | 75 ++++++++++++++++++++++++++++++++ src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 14 +++++- src/remote_protocol-structs | 6 +++ src/util/vircgroup.c | 24 ++++++++++ src/util/vircgroup.h | 3 ++ tools/virsh-domain.c | 65 +++++++++++++++++++++++++++ 16 files changed, 286 insertions(+), 34 deletions(-) -- 2.31.1

3 22

device-specific VFIO drivers
by Laine Stump 13 Sep '21

13 Sep '21

The Linux kernel has recently added support for device-specific VFIO drivers to be used (instead of the current generic, one-size-fits-all vfio_pci driver) when assigning a device to a guest with VFIO. The intent of this is to (for example) support APIs for device-specific setup that needs to be done before the device is handed over to the guest, and to support migration of guests using these devices. More details can be found in the comments of the patch emails here: https://lore.kernel.org/kvm/20210826103912.128972-1-yishaih@nvidia.com/ There are a couple of issues that need to be resolved before that will work well with libvirt-managed guests: 1) Although they've outlined a system for determining the best / most specific driver for a device by extending the existing modules aliases, the kernel people have left it up to userspace to actually parse the module.aliases info to determine the best driver for a device. They've even "thrown us a bone" in the form of an example python script to do just that: https://github.com/maxgurtovoy/linux_tools/blob/main/vfio/bind_vfio_pci_dri… Currently, if a device is assigned to a guest with <hostdev managed='yes'> (the default) then libvirt will unbind the device from whatever host driver its bound to, and bind it to the vfio_pci driver (since, up to now, that has been the only driver available). In the future, if we want to be able to take advantage of the extended capabilities provided by the device-specific vfio drivers, we will need to figure out which driver to load. I personally don't like the idea of embedding the logic from the above example program into libvirt - this really seems to me like something that should be implemented in one place for use by many consumers (libvirt being one of the consumers). One suggestion made by Alex Williamson (in a private discussion, not on a mailing list) was that possibly we could get the driverctl utility to add this functionality, and then call driverctl to learn the name of the best-fit vfio driver for a device. I haven't yet looked at it, but I've been told that driverctl is a bash script :-O. If we decide that's a good route, perhaps we could also convince someone to convert drivertctl to rust, similar to what jjongsma did with mdevctl (nudge nudge, hint hint). Or maybe I'm making it into a bigger deal than it needs to be, and we should just implement the logic of the python script up above directly in libvirt. Does anyone have an opinion? (NB: If a device is assigned to a guest by libvirt with <hostdev managed='no'> then libvirt will just blindly assume that it is already bound to the correct driver, so until we get internal support for using the device-specific drivers, users can still get the same functionality by binding their devices to the device-specific vfio driver externally to libvirt). ===== 2) There may be cases where, in spite of a device-specific driver being available, the user prefers to use the generic vfio_pci driver. To support that we will need to have a place in our config to set the driver name. We already have a <driver> subelement of <hostdev> that was originally added to allow choosing between VFIO device assignment and legacy KVM device assignment: <driver name='vfio|kvm'/> All support for KVM device assignment was removed a few years ago, so in practice the driver name is always "vfio". The most natural looking way to support device-specific drivers would be to use this name attribute to specify the driver name, e.g. if you wanted to let libvirt select the best driver, you would use: <driver name='vfio'/> (what it's currently set to in everyone's configs). But if you wanted to force use of the generic driver, you'd use: <driver name='vfio_pci'/> or if you wanted to force use of another driver that wasn't the 'best fit' according to the module aliases, you could use, e.g.: <driver name='vfio_pci_xyzzy'/> I'm uncomfortable with the fact that we're effectively "re-using" the name attribute for a new purpose though - up until now it has been "which device assignment method?", but this changes it to "which vfio driver should be loaded?". So maybe we need a new element. I'm not sure what to call it though. How about this? <driver name='vfio' modname='vfio_pci'/> Does anyone have a better idea for the name?

2 1

[PATH v2 0/2] qemu: don't change ownership of cache directory
by Peng Liang 13 Sep '21

13 Sep '21

See path 2 for detail. v1 -> v2: - Add commit message for path1 [Peter] Peng Liang (2): qemu: move temp file of screenshot and memorypeek to autoDumpPath qemu: don't change ownership of cache directory src/qemu/qemu_driver.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) -- 2.31.1

2 4

[PATCH] docs: Fix dimm example
by Michal Privoznik 13 Sep '21

13 Sep '21

In the example for <memory model='dimm'/> we show how to configure hugepages as backend. In the example we show 4MiB hugepages which are non-standard and thus at the first glance may mislead users thinking that a regular sized pages (4K) will be used. Use 2MiB as the value instead. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- docs/formatdomain.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 67cb934881..7dc93d6abe 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -7745,7 +7745,7 @@ Example: usage of the memory devices </memory> <memory model='dimm'> <source> - <pagesize unit='KiB'>4096</pagesize> + <pagesize unit='KiB'>2048</pagesize> <nodemask>1-3</nodemask> </source> <target> -- 2.32.0

2 1

[libvirt PATCH 0/4] qemu: replace -device sga with -M graphics=off
by Daniel P. Berrangé 13 Sep '21

13 Sep '21

SeaBIOS >= 1.11 / QEMU >= 2.11 no longer requires the 'sga' device for serial console output from the BIOS. It can be done directly with graphics=off machine option. This appears to be live migration compatible, despite changing the number of option ROMS loaded, though I need a little more testing to fully confirm this. Daniel P. Berrangé (4): qemu: prevent use of <bios useserial='yes'> on non-x86 arches qemu: tweak error message to be more general purpose qemu: switch to use -M graphics=off instead of -device sga qemu: stop probing for '-device sga' support src/qemu/qemu_capabilities.c | 3 +-- src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 25 ++++++++----------- src/qemu/qemu_validate.c | 15 ++++++++--- .../caps_2.11.0.x86_64.xml | 1 - .../caps_2.12.0.x86_64.xml | 1 - .../caps_3.0.0.x86_64.xml | 1 - .../caps_3.1.0.x86_64.xml | 1 - .../caps_4.0.0.x86_64.xml | 1 - .../caps_4.1.0.x86_64.xml | 1 - .../caps_4.2.0.x86_64.xml | 1 - .../caps_5.0.0.x86_64.xml | 1 - .../caps_5.1.0.x86_64.xml | 1 - .../caps_5.2.0.x86_64.xml | 1 - .../caps_6.0.0.x86_64.xml | 1 - .../caps_6.1.0.x86_64.xml | 1 - tests/qemuxml2argvdata/bios.args | 3 +-- tests/qemuxml2argvtest.c | 3 +-- 18 files changed, 25 insertions(+), 38 deletions(-) -- 2.31.1

3 7

[PATCH 0/2] qemu: don't change ownership of cache directory
by Peng Liang 13 Sep '21

13 Sep '21

See path 2 for detail. Peng Liang (2): qemu: move temp file of screenshot and memorypeek to autoDumpPath qemu: don't change ownership of cache directory src/qemu/qemu_driver.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) -- 2.31.1

2 3

Libvirt with Firecracker
by Puscasu, Felix 12 Sep '21

12 Sep '21

Hello Libvirt team, For the last couple of months, as an AWS intern I have been reading and learning how to use libvirt. I have been working on integrating Firecracker<https://github.com/firecracker-microvm/firecracker>, an open source virtual machine monitor into libvirt as a hypervisor driver, believing its design would be a great addition to the fleet of already existing drivers. One question I have is regarding testing, I couldn’t properly use the libvirt-test-API repository, and neither the libvirt-TCK one. I am now looking at the testing done In the libvirt repository itself and wanted to ask if integration-like tests would be achievable here, and if it is in line with the project’s direction. We would like to have tests to be as “end to end” as they can. Another mention is this contribution is more of a proof of concept than a production ready patch/series of patches as it doesn’t have (yet) tests in any way. It can be a starting point for future contributions (that can also be from the open source community). I wanted to check with you if this integration collides with any of your ongoing work and what would be some of your initial thoughts. Kind regards, Felix Puscasu Amazon Development Center (Romania) S.R.L. registered office: 27A Sf. Lazar Street, UBC5, floor 2, Iasi, Iasi County, 700045, Romania. Registered in Romania. Registration number J22/2621/2005. Amazon Development Center (Romania) S.R.L. registered office: 27A Sf. Lazar Street, UBC5, floor 2, Iasi, Iasi County, 700045, Romania. Registered in Romania. Registration number J22/2621/2005.

3 2

[PATCH v2 0/4] Add support for two i386 pm options which control acpi hotplug
by Ani Sinha 12 Sep '21

12 Sep '21

Hi: I added some negative xml2argv tests as well as new xml2xml tests. In the process, I also fixed a bug where I had not added appropriate code to generate the output xml correctly. The patch series is sent again as v2. Kindly, please provide inputs and review them. [PATCH v2 1/4] pm/i386: add support for two options that controls [PATCH v2 2/4] tests: add positive xml2argv tests to exercize pm acpi [PATCH v2 3/4] tests: add negative xml2argv tests to exercize pm acpi [PATCH v2 4/4] tests: add xml2xml tests to exercize pm acpi hotplug

2 8

[PATCH] src: network_conf: propagate only bool to virNetworkDefParseString()
by Kristina Hanicova 10 Sep '21

10 Sep '21

We don't need to propagate all public flags, only the information about the presence of the validation one, which can differ from function to function. This patch makes it easier and more readable in case of a future additions of validation flags. This change was suggested by Daniel. Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com> --- src/conf/domain_conf.c | 2 +- src/conf/network_conf.c | 12 ++++++------ src/conf/network_conf.h | 2 +- src/esx/esx_network_driver.c | 2 +- src/network/bridge_driver.c | 5 +++-- src/qemu/qemu_process.c | 2 +- src/test/test_driver.c | 5 +++-- src/vbox/vbox_network.c | 3 ++- 8 files changed, 18 insertions(+), 15 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index cb9e7218ff..858f6f923a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -30523,7 +30523,7 @@ virDomainNetResolveActualType(virDomainNetDef *iface) if (!(xml = virNetworkGetXMLDesc(net, 0))) goto cleanup; - if (!(def = virNetworkDefParseString(xml, NULL, 0))) + if (!(def = virNetworkDefParseString(xml, NULL, false))) goto cleanup; switch ((virNetworkForwardType) def->forward.type) { diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index f23599abac..7a0f6f02c3 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -318,7 +318,7 @@ virNetworkDefCopy(virNetworkDef *def, if (!(xml = virNetworkDefFormat(def, xmlopt, flags))) return NULL; - return virNetworkDefParseString(xml, xmlopt, 0); + return virNetworkDefParseString(xml, xmlopt, false); } @@ -2086,14 +2086,14 @@ static virNetworkDef * virNetworkDefParse(const char *xmlStr, const char *filename, virNetworkXMLOption *xmlopt, - unsigned int flags) + bool validate_flag) { g_autoptr(xmlDoc) xml = NULL; virNetworkDef *def = NULL; int keepBlanksDefault = xmlKeepBlanksDefault(0); if ((xml = virXMLParse(filename, xmlStr, _("(network_definition)"), - "network.rng", flags & VIR_NETWORK_DEFINE_VALIDATE))) + "network.rng", validate_flag))) def = virNetworkDefParseNode(xml, xmlDocGetRootElement(xml), xmlopt); xmlKeepBlanksDefault(keepBlanksDefault); @@ -2104,9 +2104,9 @@ virNetworkDefParse(const char *xmlStr, virNetworkDef * virNetworkDefParseString(const char *xmlStr, virNetworkXMLOption *xmlopt, - unsigned int flags) + bool validate_flag) { - return virNetworkDefParse(xmlStr, NULL, xmlopt, flags); + return virNetworkDefParse(xmlStr, NULL, xmlopt, validate_flag); } @@ -2114,7 +2114,7 @@ virNetworkDef * virNetworkDefParseFile(const char *filename, virNetworkXMLOption *xmlopt) { - return virNetworkDefParse(NULL, filename, xmlopt, 0); + return virNetworkDefParse(NULL, filename, xmlopt, false); } diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index 30958eff64..1dda45b25c 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -329,7 +329,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt, virNetworkDef * virNetworkDefParseString(const char *xmlStr, virNetworkXMLOption *xmlopt, - unsigned int flags); + bool validate_flag); virNetworkDef * virNetworkDefParseFile(const char *filename, diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c index 673ed5421f..8acf7591cf 100644 --- a/src/esx/esx_network_driver.c +++ b/src/esx/esx_network_driver.c @@ -298,7 +298,7 @@ esxNetworkDefineXMLFlags(virConnectPtr conn, const char *xml, return NULL; /* Parse network XML */ - def = virNetworkDefParseString(xml, NULL, flags); + def = virNetworkDefParseString(xml, NULL, flags & VIR_NETWORK_DEFINE_VALIDATE); if (!def) return NULL; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 06822fb3a0..4b6daf19a8 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -3474,7 +3474,7 @@ networkCreateXML(virConnectPtr conn, virNetworkPtr net = NULL; virObjectEvent *event = NULL; - if (!(newDef = virNetworkDefParseString(xml, network_driver->xmlopt, 0))) + if (!(newDef = virNetworkDefParseString(xml, network_driver->xmlopt, false))) goto cleanup; if (virNetworkCreateXMLEnsureACL(conn, newDef) < 0) @@ -3529,7 +3529,8 @@ networkDefineXMLFlags(virConnectPtr conn, virCheckFlags(VIR_NETWORK_DEFINE_VALIDATE, NULL); - if (!(def = virNetworkDefParseString(xml, network_driver->xmlopt, flags))) + if (!(def = virNetworkDefParseString(xml, network_driver->xmlopt, + flags & VIR_NETWORK_DEFINE_VALIDATE))) goto cleanup; if (virNetworkDefineXMLFlagsEnsureACL(conn, def) < 0) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 207129a556..51d02e9fb6 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4778,7 +4778,7 @@ qemuProcessGetNetworkAddress(const char *netname, if (!xml) goto cleanup; - netdef = virNetworkDefParseString(xml, NULL, 0); + netdef = virNetworkDefParseString(xml, NULL, false); if (!netdef) goto cleanup; diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 2f19b7c520..33f611081c 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -5581,7 +5581,7 @@ testNetworkCreateXML(virConnectPtr conn, const char *xml) virNetworkPtr net = NULL; virObjectEvent *event = NULL; - if ((newDef = virNetworkDefParseString(xml, NULL, 0)) == NULL) + if ((newDef = virNetworkDefParseString(xml, NULL, false)) == NULL) goto cleanup; if (!(obj = virNetworkObjAssignDef(privconn->networks, newDef, @@ -5620,7 +5620,8 @@ testNetworkDefineXMLFlags(virConnectPtr conn, virCheckFlags(VIR_NETWORK_DEFINE_VALIDATE, NULL); - if ((newDef = virNetworkDefParseString(xml, NULL, flags)) == NULL) + if (!(newDef = virNetworkDefParseString(xml, NULL, + flags & VIR_NETWORK_DEFINE_VALIDATE))) goto cleanup; if (!(obj = virNetworkObjAssignDef(privconn->networks, newDef, 0))) diff --git a/src/vbox/vbox_network.c b/src/vbox/vbox_network.c index c554b052c9..c0694d42d5 100644 --- a/src/vbox/vbox_network.c +++ b/src/vbox/vbox_network.c @@ -397,7 +397,8 @@ vboxNetworkDefineCreateXML(virConnectPtr conn, const char *xml, bool start, VBOX_IID_INITIALIZE(&vboxnetiid); - if (!(def = virNetworkDefParseString(xml, NULL, flags)) || + if (!(def = virNetworkDefParseString(xml, NULL, + flags & VIR_NETWORK_DEFINE_VALIDATE)) || (def->forward.type != VIR_NETWORK_FORWARD_NONE) || (def->nips == 0 || !def->ips)) goto cleanup; -- 2.31.1

2 1

[PATCH] qemuProcessQMPInit: Use long options for '-qmp' when probing qemu.
by Peter Krempa 10 Sep '21

10 Sep '21

'-qmp' in this case behaves the same as '-chardev' so it should have been converted the same way as others were in 43c9c0859f2d53321 since short options are deprecated. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 207129a556..df1f481433 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -9045,7 +9045,7 @@ qemuProcessQMPInit(qemuProcessQMP *proc) proc->monpath = g_strdup_printf("%s/%s", proc->uniqDir, "qmp.monitor"); - proc->monarg = g_strdup_printf("unix:%s,server,nowait", proc->monpath); + proc->monarg = g_strdup_printf("unix:%s,server=on,wait=off", proc->monpath); /* * Normally we'd use runDir for pid files, but because we're using -- 2.31.1

2 1

[libvirt PATCH 0/7] gitlab: convert to use the lcitool manifest feature
by Daniel P. Berrangé 10 Sep '21

10 Sep '21

This switches our CI rules to be largely auto-generated by the lcitool manifest command, so that they share a consistent design with all other projects and are simpler to modify in future. Daniel P. Berrangé (7): gitlab: move codestyle job to the sanity_checks stage gitlab: refresh containers / cirrus files with latest content gitlab: fold sanitizer jobs into regular ubuntu jobs gitlab: define a manifest file to express the CI config ci: re-generate containers/gitlab config from manifest ci: remove obsolete refresh documentation ci: remove obsolete logic for refreshing containers/cirrus .gitlab-ci.yml | 539 +--------------- ci/cirrus/freebsd-12.vars | 8 +- ci/cirrus/freebsd-13.vars | 8 +- ci/cirrus/freebsd-current.vars | 8 +- ci/cirrus/macos-11.vars | 4 +- ci/containers/README.rst | 36 -- ci/containers/centos-8.Dockerfile | 5 +- ci/containers/centos-stream-8.Dockerfile | 5 +- .../debian-10-cross-aarch64.Dockerfile | 8 +- .../debian-10-cross-armv6l.Dockerfile | 8 +- .../debian-10-cross-armv7l.Dockerfile | 8 +- ci/containers/debian-10-cross-i686.Dockerfile | 8 +- ci/containers/debian-10-cross-mips.Dockerfile | 8 +- .../debian-10-cross-mips64el.Dockerfile | 8 +- .../debian-10-cross-mipsel.Dockerfile | 8 +- .../debian-10-cross-ppc64le.Dockerfile | 8 +- .../debian-10-cross-s390x.Dockerfile | 8 +- ci/containers/debian-10.Dockerfile | 8 +- .../debian-sid-cross-aarch64.Dockerfile | 5 +- .../debian-sid-cross-armv6l.Dockerfile | 5 +- .../debian-sid-cross-armv7l.Dockerfile | 5 +- .../debian-sid-cross-i686.Dockerfile | 5 +- .../debian-sid-cross-mips64el.Dockerfile | 5 +- .../debian-sid-cross-mipsel.Dockerfile | 5 +- .../debian-sid-cross-ppc64le.Dockerfile | 5 +- .../debian-sid-cross-s390x.Dockerfile | 5 +- ci/containers/debian-sid.Dockerfile | 5 +- ci/containers/fedora-33.Dockerfile | 5 +- ci/containers/fedora-34.Dockerfile | 5 +- .../fedora-rawhide-cross-mingw32.Dockerfile | 4 +- .../fedora-rawhide-cross-mingw64.Dockerfile | 4 +- ci/containers/fedora-rawhide.Dockerfile | 5 +- ci/containers/opensuse-leap-152.Dockerfile | 5 +- ci/containers/opensuse-tumbleweed.Dockerfile | 5 +- ci/containers/ubuntu-1804.Dockerfile | 5 +- ci/containers/ubuntu-2004.Dockerfile | 5 +- ci/gitlab.yml | 602 ++++++++++++++++++ ci/helper | 121 +--- ci/manifest.yml | 153 +++++ ci/util.py | 32 +- 40 files changed, 871 insertions(+), 818 deletions(-) delete mode 100644 ci/containers/README.rst create mode 100644 ci/gitlab.yml create mode 100644 ci/manifest.yml -- 2.31.1

2 8

[PATCH] libvirt-domain.c: Fix typo in virDomainAttachDevice doc
by Michal Privoznik 10 Sep '21

10 Sep '21

In the documentation to virDomainAttachDevice() we refer to a non-existent virDomainUpdateDeviceFlag() function. The correct name is virDomainUpdateDeviceFlags(). Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed as trivial. src/libvirt-domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index a8a386e839..57baef6889 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -8309,7 +8309,7 @@ virDomainGetMetadata(virDomainPtr domain, * * For compatibility, this method can also be used to change the media * in an existing CDROM/Floppy device, however, applications are - * recommended to use the virDomainUpdateDeviceFlag method instead. + * recommended to use the virDomainUpdateDeviceFlags method instead. * * Be aware that hotplug changes might not persist across a domain going * into S4 state (also known as hibernation) unless you also modify the -- 2.32.0

1 0

[PATCH] hw/misc: deprecate the 'sga' device
by Daniel P. Berrangé 10 Sep '21

10 Sep '21

This is obsolete since SeaBIOS 1.11.0 introduced native support for sending messages to the serial console. The new support can be activated using -machine graphics=off on x86 targets. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- docs/about/deprecated.rst | 10 ++++++++++ hw/misc/sga.c | 2 ++ 2 files changed, 12 insertions(+) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 9ee355ec0b..cafca05826 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -280,6 +280,16 @@ full SCSI support. Use virtio-scsi instead when SCSI passthrough is required. Note this also applies to ``-device virtio-blk-pci,scsi=on|off``, which is an alias. +``-device sga`` (since 6.2) +^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +The ``sga`` device loads an option ROM for x86 targets which enables +SeaBIOS to send messages to the serial console. SeaBIOS 1.11.0 onwards +contains native support for this feature and thus use of the option +ROM approach is obsolete. The native SeaBIOS support can be activated +by using ``-machine graphics=off``. + + Block device options '''''''''''''''''''' diff --git a/hw/misc/sga.c b/hw/misc/sga.c index 4dbe6d78f9..1d04672b01 100644 --- a/hw/misc/sga.c +++ b/hw/misc/sga.c @@ -30,6 +30,7 @@ #include "hw/loader.h" #include "qemu/module.h" #include "qom/object.h" +#include "qemu/error-report.h" #define SGABIOS_FILENAME "sgabios.bin" @@ -42,6 +43,7 @@ struct ISASGAState { static void sga_realizefn(DeviceState *dev, Error **errp) { + warn_report("-device sga is deprecated, use -machine graphics=off"); rom_add_vga(SGABIOS_FILENAME); } -- 2.31.1

2 1

[PATCH 0/9] Fix image labels lost after migration with shared fs
by Peng Liang 10 Sep '21

10 Sep '21

When migrating using shared fs, the dst host will remember the image labels again before launching the VM and the src host will remove the image labels after migration. It leads to that the image labels lost after migration. Patch 7-9 are the real fix patches. Peng Liang (9): security: add virSecurityUpdateTimestampIfexists security: add virSecurityManagerUpdateImageLabel security: implement domainUpdateSecurityImageLabel for stack security: implement domainUpdateSecurityImageLabel for DAC qemu: add qemuSecurityUpdateImageLabel security: rename virSecurityDACSetImageLabelInternal to virSecurityDACSetImageLabelSingle migration: don't remember image labels when migrating with shared fs migration: don't remove image labels after migration migration: update image labels in dst after migration src/libvirt_private.syms | 1 + src/qemu/qemu_migration.c | 12 +++++++ src/qemu/qemu_process.c | 5 ++- src/qemu/qemu_security.c | 10 ++++++ src/qemu/qemu_security.h | 5 +++ src/security/security_dac.c | 58 +++++++++++++++++++++++++-------- src/security/security_driver.h | 5 +++ src/security/security_manager.c | 29 +++++++++++++++++ src/security/security_manager.h | 5 +++ src/security/security_stack.c | 20 ++++++++++++ src/security/security_util.c | 32 ++++++++++++++++++ src/security/security_util.h | 4 +++ 12 files changed, 172 insertions(+), 14 deletions(-) -- 2.31.1

2 18

[libvirt PATCH] docs: virtiofs: remove extra slash
by Ján Tomko 09 Sep '21

09 Sep '21

Reported-by: Richard W.M. Jones <rjones(a)redhat.com> Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- Pushed as trivial. docs/kbase/virtiofs.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/kbase/virtiofs.rst b/docs/kbase/virtiofs.rst index b89de0c57a..9123fc2316 100644 --- a/docs/kbase/virtiofs.rst +++ b/docs/kbase/virtiofs.rst @@ -81,7 +81,7 @@ control and need to be set by the application running virtiofsd. :: - <filesystem type='mount'/> + <filesystem type='mount'> <driver type='virtiofs' queue='1024'/> <source socket='/var/virtiofsd.sock'/> <target dir='tag'/> -- 2.31.1

1 0

[libvirt PATCH] docs: virtiofs: provide more context for elements
by Ján Tomko 09 Sep '21

09 Sep '21

Suggested-by: Richard W.M. Jones <rjones(a)redhat.com> Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- Pushed as trivial. docs/kbase/virtiofs.rst | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/docs/kbase/virtiofs.rst b/docs/kbase/virtiofs.rst index d728a1358c..b89de0c57a 100644 --- a/docs/kbase/virtiofs.rst +++ b/docs/kbase/virtiofs.rst @@ -62,11 +62,14 @@ More optional elements can be specified :: - <driver type='virtiofs' queue='1024'/> - <binary path='/usr/libexec/virtiofsd' xattr='on'> - <cache mode='always'/> - <lock posix='on' flock='on'/> - </binary> + <filesystem type='mount' accessmode='passthrough'> + <driver type='virtiofs' queue='1024'/> + ... + <binary path='/usr/libexec/virtiofsd' xattr='on'> + <cache mode='always'/> + <lock posix='on' flock='on'/> + </binary> + </filesystem> Externally-launched virtiofsd ============================= -- 2.31.1

1 0

[libvirt PATCH 00/24] tests: use g_auto more (glib chronicles)
by Ján Tomko 09 Sep '21

09 Sep '21

Ján Tomko (24): tests: virnetdaemontest: split variable declarations conf: add cleanup func for virNetworkXMLOption conf: add cleanup func for virMacMap tests: use g_autoptr instead of virObjectUnref tests: qemu: use g_autofree tests: network: use g_autofree tests: libxl: use g_autofree tests: nwfilter: use g_autofree tests: vmx: use g_autofree tests: vir: use g_autofree tests: use g_autofree tests: use g_autoptr instead of virJSONValueFree tests: use g_auto for virCPUDataFree tests: use g_auto instead of VIR_FORCE_FCLOSE tests: use VIR_AUTOCLOSE tests: use g_auto instead of vshTableFree tests: use g_auto instead of virDomainFree tests: qemu: remove pointless labels tests: vmx: remove pointless labels tests: libxl: remove pointless labels tests: nwfilter: remove pointless labels tests: vshtabletest: remove pointless labels tests: vir: remove pointless labels tests: remove pointless labels src/conf/network_conf.h | 1 + src/util/virmacmap.h | 2 + tests/cputest.c | 51 ++++------- tests/domaincapstest.c | 60 +++++-------- tests/domainconftest.c | 18 ++-- tests/eventtest.c | 3 +- tests/fchosttest.c | 70 +++++---------- tests/fdstreamtest.c | 24 ++--- tests/genericxml2xmltest.c | 6 +- tests/interfacexml2xmltest.c | 9 +- tests/libxlxml2domconfigtest.c | 18 ++-- tests/lxcconf2xmltest.c | 37 +++----- tests/lxcxml2xmltest.c | 6 +- tests/metadatatest.c | 37 +++----- tests/networkxml2conftest.c | 19 ++-- tests/networkxml2firewalltest.c | 9 +- tests/networkxml2xmltest.c | 13 +-- tests/networkxml2xmlupdatetest.c | 16 ++-- tests/nodedevxml2xmltest.c | 9 +- tests/nsstest.c | 4 +- tests/nwfilterebiptablestest.c | 84 ++++++----------- tests/nwfilterxml2firewalltest.c | 12 +-- tests/nwfilterxml2xmltest.c | 10 +-- tests/openvzutilstest.c | 23 ++--- tests/qemuagenttest.c | 31 ++----- tests/qemucapsprobemock.c | 12 +-- tests/qemucommandutiltest.c | 15 ++-- tests/qemumonitorjsontest.c | 116 +++++++++--------------- tests/qemumonitortestutils.c | 45 +++------- tests/qemuxml2argvtest.c | 24 ++--- tests/scsihosttest.c | 37 +++----- tests/secretxml2xmltest.c | 7 +- tests/securityselinuxlabeltest.c | 27 ++---- tests/sockettest.c | 4 +- tests/testutils.c | 8 +- tests/testutilslxc.c | 4 +- tests/vboxsnapshotxmltest.c | 12 +-- tests/vircapstest.c | 20 ++--- tests/vircgrouptest.c | 3 +- tests/virconftest.c | 44 ++++----- tests/vircryptotest.c | 35 +++----- tests/virfilecachetest.c | 3 +- tests/virfilemock.c | 3 +- tests/virfiletest.c | 61 +++++-------- tests/virhostcputest.c | 42 +++------ tests/viriscsitest.c | 18 ++-- tests/virkmodtest.c | 39 +++----- tests/virmacmaptest.c | 49 ++++------ tests/virnetdaemontest.c | 13 ++- tests/virnetsockettest.c | 6 +- tests/virnettlshelpers.c | 4 +- tests/virnetworkportxml2xmltest.c | 23 ++--- tests/virnumamock.c | 14 +-- tests/virnwfilterbindingxml2xmltest.c | 7 +- tests/virpcimock.c | 4 +- tests/virpcitest.c | 56 +++++------- tests/virresctrltest.c | 34 +++---- tests/virrotatingfiletest.c | 4 +- tests/virscsitest.c | 31 ++----- tests/virstringtest.c | 44 +++------ tests/virsystemdtest.c | 29 ++---- tests/virtestmock.c | 10 +-- tests/viruritest.c | 3 +- tests/virusbmock.c | 7 +- tests/virusbtest.c | 6 +- tests/vmwarevertest.c | 20 ++--- tests/vmx2xmltest.c | 35 +++----- tests/vshtabletest.c | 125 ++++++++++---------------- tests/xlconfigtest.c | 85 +++++++----------- tests/xmconfigtest.c | 62 +++++-------- tests/xml2vmxtest.c | 32 +++---- 71 files changed, 628 insertions(+), 1226 deletions(-) -- 2.31.1

2 32

[libvirt PATCH v3 0/7] Enable autostarting mediated devices
by Jonathon Jongsma 09 Sep '21

09 Sep '21

This first version of this series was reviewed quite a while ago and all patches were ACKed except the second one. I posted a second series with changes noted below but it was never ACKed and I dropped the ball for a little while. Subsequently there were questions about whether physical devices (e.g. pci, usb, etc) should return 'true' or 'false' for the GetAutostart()/IsPersistent() calls. I had initially marked them as persistent=true and autostart=true because they superficially act a bit like persistently-defined devices. But Boris convinced me that this is not a very accurate classification since if the physical device is unplugged, there will be no record of it left behind. So I've switched all non-mdev devices to be persistent=false and autostart=false. This is also imperfect, but it seems relatively harmless. Comments welcome. A reminder of what is included in this series: - new API consistent with existing libvirt objects: - virNodeDeviceGetAutostart() - virNodeDeviceSetAutostart() - virNodeDeviceIsPersistent() - virNodeDeviceIsActive - new virsh commands - nodedev-info - nodedev-autostart Changes in version 2: - Parse the autostart property from mdevctl output. Changes in version 3: - switch physical devices to autostart=false, persistent=false - rebase to upstream - update version numbers for new API, etc - fix accidental copy-paste error in virsh command descriptions Jonathon Jongsma (7): api: add virNodeDevice(Get|Set)Autostart() nodedev: implement virNodeDevice(Get|Set)Autostart() nodedev: Add tests for mdevctl autostart command virsh: add nodedev-autostart api: add virNodeDeviceIsPersistent()/IsActive() nodedev: Implement virNodeDeviceIsPersistent()/IsActive() virsh: add nodedev-info docs/manpages/virsh.rst | 27 +++ include/libvirt/libvirt-nodedev.h | 10 + src/conf/node_device_conf.h | 1 + src/conf/virnodedeviceobj.c | 16 ++ src/conf/virnodedeviceobj.h | 6 + src/driver-nodedev.h | 18 ++ src/libvirt-nodedev.c | 141 +++++++++++++ src/libvirt_private.syms | 2 + src/libvirt_public.syms | 4 + src/node_device/node_device_driver.c | 189 +++++++++++++++++- src/node_device/node_device_driver.h | 19 ++ src/node_device/node_device_udev.c | 22 +- src/remote/remote_driver.c | 6 +- src/remote/remote_protocol.x | 60 +++++- src/remote_protocol-structs | 26 +++ .../nodedevmdevctldata/mdevctl-autostart.argv | 8 + tests/nodedevmdevctltest.c | 55 +++++ tools/virsh-nodedev.c | 139 +++++++++++++ 18 files changed, 740 insertions(+), 9 deletions(-) create mode 100644 tests/nodedevmdevctldata/mdevctl-autostart.argv -- 2.31.1

2 9

[PATCH] virsh: Display vhostuser socket path in domblklist
by dinglimin 09 Sep '21

09 Sep '21

The domblklist command is designed to show a brief information about the blocks of a domain. One piece of information that is shows is "Target "and "Source". Before the modification, the Vhost disk of SPDK is displayed as "-". After the modification, the socket associated with it can be displayed Signed-off-by: dinglimin <dinglimin(a)cmss.chinamobile.com> --- tools/virsh-domain-monitor.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index f7cf82acdf..eb3e0ef11a 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -644,7 +644,8 @@ cmdDomblklist(vshControl *ctl, const vshCmd *cmd) "|./source/@dev" "|./source/@dir" "|./source/@name" - "|./source/@volume)", ctxt); + "|./source/@volume" + "|./source/@path)", ctxt); } if (details) { -- 2.18.2

2 1

[PATCH] qemu_driver:report guest interface informations
by scuzhanglei 09 Sep '21

09 Sep '21

Signed-off-by: scuzhanglei <greatzhanglei(a)gmail.com> --- NEWS.rst | 5 ++ include/libvirt/libvirt-domain.h | 1 + src/libvirt-domain.c | 12 +++++ src/qemu/qemu_agent.c | 9 ++-- src/qemu/qemu_agent.h | 3 +- src/qemu/qemu_driver.c | 88 +++++++++++++++++++++++++++++++- tests/qemuagenttest.c | 2 +- tools/virsh-domain.c | 2 + 8 files changed, 115 insertions(+), 7 deletions(-) diff --git a/NEWS.rst b/NEWS.rst index 21df0e1602..fde781b320 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -19,6 +19,11 @@ v7.7.0 (unreleased) * **Improvements** + * qemu: Report guest interfaces information in ``virDomainGetGuestInfo`` + + Libvirt is now able to report interfaces from the guest's + perspective (using guest agent). + * **Bug fixes** diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 7ef8ac51e5..b088847725 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -5074,6 +5074,7 @@ typedef enum { VIR_DOMAIN_GUEST_INFO_HOSTNAME = (1 << 3), /* return hostname information */ VIR_DOMAIN_GUEST_INFO_FILESYSTEM = (1 << 4), /* return filesystem information */ VIR_DOMAIN_GUEST_INFO_DISKS = (1 << 5), /* return disks information */ + VIR_DOMAIN_GUEST_INFO_INTERFACES = (1 << 6), /* return interfaces information */ } virDomainGuestInfoTypes; int virDomainGetGuestInfo(virDomainPtr domain, diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index a8a386e839..dfd84b4744 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -12586,6 +12586,18 @@ virDomainSetVcpu(virDomainPtr domain, * virTypedParamsFree to free memory returned in @params. * * Returns 0 on success, -1 on error. + * VIR_DOMAIN_GUEST_INFO_INTERFACES: + * Returns information about the interfaces within the domain. the typed + * parameter keys are in this format: + * + * "if.count" - the number of interfaces defined on this domain + * as an unsigned int + * "if.<num>.name" - interface name in the guest + * "if.<num>.hwaddr" - hardware address of interface + * "if.<num>.addr.count - the number of ip addresses of interface + * "if.<num>.addr.<num>.type" - the type of ip address(e.g. ipv4) + * "if.<num>.addr.<num>.addr" - the ip address + * "if.<num>.addr.<num>.prefix" - the number of bits of ip address prefix */ int virDomainGetGuestInfo(virDomainPtr domain, unsigned int types, diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 5f421be6f6..a7f943e0dc 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -2245,17 +2245,20 @@ qemuAgentGetAllInterfaceAddresses(virDomainInterfacePtr **ifaces_ret, */ int qemuAgentGetInterfaces(qemuAgent *agent, - virDomainInterfacePtr **ifaces) + virDomainInterfacePtr **ifaces, + bool report_unsupported) { g_autoptr(virJSONValue) cmd = NULL; g_autoptr(virJSONValue) reply = NULL; virJSONValue *ret_array = NULL; + int rc; if (!(cmd = qemuAgentMakeCommand("guest-network-get-interfaces", NULL))) return -1; - if (qemuAgentCommand(agent, cmd, &reply, agent->timeout) < 0) - return -1; + if ((rc = qemuAgentCommandFull(agent, cmd, &reply, agent->timeout, + report_unsupported)) < 0) + return rc; if (!(ret_array = virJSONValueObjectGetArray(reply, "return"))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", diff --git a/src/qemu/qemu_agent.h b/src/qemu/qemu_agent.h index 81b45b8e5d..94eab9de9f 100644 --- a/src/qemu/qemu_agent.h +++ b/src/qemu/qemu_agent.h @@ -151,7 +151,8 @@ int qemuAgentSetTime(qemuAgent *mon, bool sync); int qemuAgentGetInterfaces(qemuAgent *mon, - virDomainInterfacePtr **ifaces); + virDomainInterfacePtr **ifaces, + bool report_unsupported); int qemuAgentSetUserPassword(qemuAgent *mon, const char *user, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index f1f961c51c..0b803c392b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -18957,7 +18957,7 @@ qemuDomainInterfaceAddresses(virDomainPtr dom, goto endjob; agent = qemuDomainObjEnterAgent(vm); - ret = qemuAgentGetInterfaces(agent, ifaces); + ret = qemuAgentGetInterfaces(agent, ifaces, true); qemuDomainObjExitAgent(vm, agent); endjob: @@ -19903,7 +19903,8 @@ static const unsigned int qemuDomainGetGuestInfoSupportedTypes = VIR_DOMAIN_GUEST_INFO_TIMEZONE | VIR_DOMAIN_GUEST_INFO_HOSTNAME | VIR_DOMAIN_GUEST_INFO_FILESYSTEM | - VIR_DOMAIN_GUEST_INFO_DISKS; + VIR_DOMAIN_GUEST_INFO_DISKS | + VIR_DOMAIN_GUEST_INFO_INTERFACES; static int qemuDomainGetGuestInfoCheckSupport(unsigned int types, @@ -20102,6 +20103,69 @@ qemuAgentFSInfoFormatParams(qemuAgentFSInfo **fsinfo, } } +static void +virDomainInterfaceFormatParams(virDomainInterfacePtr *ifaces, +int nifaces, +virTypedParameterPtr *params, +int *nparams, int * maxparams) +{ + size_t i, j; + const char *type = NULL; + + if (virTypedParamsAddUInt(params, nparams, maxparams, + "if.count", nifaces) < 0) + return; + + for (i = 0; i < nifaces; i++) { + char param_name[VIR_TYPED_PARAM_FIELD_LENGTH]; + g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, + "if.%zu.name", i); + if (virTypedParamsAddString(params, nparams, maxparams, + param_name, ifaces[i]->name) < 0) + return; + + g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, + "if.%zu.hwaddr", i); + if (virTypedParamsAddString(params, nparams, maxparams, + param_name, ifaces[i]->hwaddr) < 0) + return; + + g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, + "if.%zu.addr.count", i); + if (virTypedParamsAddUInt(params, nparams, maxparams, + param_name, ifaces[i]->naddrs) < 0) + return; + + for (j = 0; j < ifaces[i]->naddrs; j++) { + switch (ifaces[i]->addrs[j].type) { + case VIR_IP_ADDR_TYPE_IPV4: + type = "ipv4"; + break; + case VIR_IP_ADDR_TYPE_IPV6: + type = "ipv6"; + break; + } + + g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, + "if.%zu.addr.%zu.type", i, j); + if (virTypedParamsAddString(params, nparams, maxparams, + param_name, type) < 0) + return; + + g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, + "if.%zu.addr.%zu.addr", i, j); + if (virTypedParamsAddString(params, nparams, maxparams, + param_name, ifaces[i]->addrs[j].addr) < 0) + return; + + g_snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, + "if.%zu.addr.%zu.prefix", i, j); + if (virTypedParamsAddUInt(params, nparams, maxparams, + param_name, ifaces[i]->addrs[j].prefix) < 0) + return; + } + } +} static int qemuDomainGetGuestInfo(virDomainPtr dom, @@ -20123,6 +20187,8 @@ qemuDomainGetGuestInfo(virDomainPtr dom, qemuAgentFSInfo **agentfsinfo = NULL; size_t ndisks = 0; qemuAgentDiskInfo **agentdiskinfo = NULL; + virDomainInterfacePtr *ifaces = NULL; + size_t nifaces = 0; size_t i; virCheckFlags(0, -1); @@ -20188,6 +20254,15 @@ qemuDomainGetGuestInfo(virDomainPtr dom, } } + if (supportedTypes & VIR_DOMAIN_GUEST_INFO_INTERFACES) { + rc = qemuAgentGetInterfaces(agent, &ifaces, report_unsupported); + if (rc == -1) { + goto exitagent; + } else if (rc >= 0) { + nifaces = rc; + } + } + qemuDomainObjExitAgent(vm, agent); qemuDomainObjEndAgentJob(vm); @@ -20210,6 +20285,10 @@ qemuDomainGetGuestInfo(virDomainPtr dom, qemuDomainObjEndJob(driver, vm); } + if (nifaces > 0) { + virDomainInterfaceFormatParams(ifaces, nifaces, params, nparams, &maxparams); + } + ret = 0; cleanup: @@ -20219,6 +20298,11 @@ qemuDomainGetGuestInfo(virDomainPtr dom, for (i = 0; i < ndisks; i++) qemuAgentDiskInfoFree(agentdiskinfo[i]); g_free(agentdiskinfo); + if (ifaces && nifaces > 0) { + for (i = 0; i < nifaces; i++) + virDomainInterfaceFree(ifaces[i]); + } + g_free(ifaces); virDomainObjEndAPI(&vm); return ret; diff --git a/tests/qemuagenttest.c b/tests/qemuagenttest.c index a447c93494..e0b22c042a 100644 --- a/tests/qemuagenttest.c +++ b/tests/qemuagenttest.c @@ -920,7 +920,7 @@ testQemuAgentGetInterfaces(const void *data) goto cleanup; if ((ifaces_count = qemuAgentGetInterfaces(qemuMonitorTestGetAgent(test), - &ifaces)) < 0) + &ifaces, true)) < 0) goto cleanup; if (ifaces_count != 4) { diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index e5bd1fdd75..ea3ba58616 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -13854,6 +13854,8 @@ cmdGuestInfo(vshControl *ctl, const vshCmd *cmd) types |= VIR_DOMAIN_GUEST_INFO_FILESYSTEM; if (vshCommandOptBool(cmd, "disk")) types |= VIR_DOMAIN_GUEST_INFO_DISKS; + if (vshCommandOptBool(cmd, "interface")) + types |= VIR_DOMAIN_GUEST_INFO_INTERFACES; if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) return false; -- 2.31.1

2 2

[PATCHv4 0/9] ch: Add Console support
by William Douglas 09 Sep '21

09 Sep '21

This series enables console support in the cloud-hypervisor driver. Cloud-hypervisor only supports a single console or serial device at a time, hence the checks to ensure the domain configuration is only passing one or the other. Changes since v3: * Reset ch monitor's curl handle after a get info request * Improved PTY validation logic * Updated deviceValidateCallback to handle PTY validation * Added error reporting for unexpected PTY json data * Dropped the parallels scanning for PTY * Added a fix for handling deviceValidateCallback failures Changes since v2: * Squashed an additional patch. Changes since v1: * Added missing patch to add the virChrdev device * Added handling for multiple curl WRITEFUNCTION call backs * Added missing free for data.content * Removed redundant console configuration check * Improved handling of pty JSON data to make use of g_autoptr * Squashed two patches William Douglas (9): ch_domain: Add virChrdevs for console support ch_monitor: Make unused function static ch_monitor: Update virCHMonitorGet to handle accept a response ch_monitor: Use virCHMonitorGet to access cloud-hypervisor API ch_monitor: Add pty json builder function ch_process: Handle enabled console devices ch_domain: Allow controller and chr devices ch_driver: Add handler for console API ch_driver: Handle validation failure correctly src/ch/ch_domain.c | 40 +++++++++++++++++++- src/ch/ch_domain.h | 3 ++ src/ch/ch_driver.c | 76 ++++++++++++++++++++++++++++++++++++- src/ch/ch_monitor.c | 91 +++++++++++++++++++++++++++++++++++++++++++-- src/ch/ch_monitor.h | 3 ++ src/ch/ch_process.c | 84 +++++++++++++++++++++++++++++++++++++++++ 6 files changed, 290 insertions(+), 7 deletions(-) -- 2.31.1

2 14

[PATCH 00/24] virstoragetest: Re-instate testing of images without backing format
by Peter Krempa 09 Sep '21

09 Sep '21

Most of the series are refactors to make virstoragetest less archaic, the last commit then re-introduces testing of images which don't have backing format recorded in the metadata which can't be formatted using qemu-img any more but have security implications if we'd mishandle them. Peter Krempa (24): virstoragetest: Drop testing of RBD backends via parsing real images virstoragetest: Drop testing of NBD backends via parsing real images testutils: Introduce helper for stripping bulilddir/srcdir from test outputs virstoragetest: Store output of TEST_CHAIN in output files virstoragetest: Remove redundant arguments for chain lookup tests virstoragetest: Rework TEST_LOOKUP* cases to work on fake backing chain virstoragetest: Test backing chain loops with hardcoded images virstoragetest: Use existing directory in the source tree for 'directory' probing tests virstoragetest: Use a pre-formatted QED file for testing backing store extraction virstoragetest: Use pre-formatted file for non-path extraction test virstoragetest: Use preformatted file for testing missing backing store virstoragetest: Use existing file for testing 'raw' image lookup virstoragetest: Convert symlink and relative image testing use preformatted images virstoragetest: Use preformatted qcow2 image for testing relative paths virstoragetest: Unify testing of QCOW2 images with absolute backing virstoragetest: Stop rewriting images in 'mymain' virstoragetest: Don't rewrite the 'qcow2' image virstoragetest: Assume that 'qemu-img' supports '-o compat=' virstoragetest: testPrepImages: Don't reuse 'cmd' pointer virstoragetest: testPrepImages: Use 'qemu-img' to format 'raw' image virstoragetest: testStorageChain: Skip test if filename is NULL virstoragetest: Don't skip the whole test when qemu-img fails to format images virstoragetest: Remove pointless goto from mymain virstoragetest: Reinstate testing of images without 'backing_fmt' build-aux/syntax-check.mk | 2 +- tests/testutils.c | 30 + tests/testutils.h | 3 + tests/virstoragetest.c | 906 ++++++------------ tests/virstoragetestdata/images/loop-1.qcow2 | Bin 0 -> 196616 bytes tests/virstoragetestdata/images/loop-2.qcow2 | Bin 0 -> 196616 bytes .../virstoragetestdata/images/loop-self.qcow2 | Bin 0 -> 196616 bytes tests/virstoragetestdata/images/qcow2 | Bin 0 -> 196616 bytes .../images/qcow2_nbd-raw.qcow2 | Bin 0 -> 196616 bytes .../images/qcow2_qcow2-auto.qcow2 | Bin 0 -> 196616 bytes .../images/qcow2_qcow2-auto_qcow2-auto.qcow2 | Bin 0 -> 196616 bytes .../images/qcow2_qcow2-missing.qcow2 | Bin 0 -> 196616 bytes ...2_qcow2-qcow2-symlink_raw-raw-reldir.qcow2 | Bin 0 -> 196616 bytes .../images/qcow2_qcow2-qcow2_qcow2-auto.qcow2 | Bin 0 -> 196616 bytes .../images/qcow2_qcow2-qcow2_raw-auto.qcow2 | Bin 0 -> 196616 bytes .../images/qcow2_raw-auto.qcow2 | Bin 0 -> 196616 bytes .../images/qcow2_raw-raw-relative.qcow2 | Bin 0 -> 196616 bytes .../images/qcow2_raw-raw-reldir.qcow2 | Bin 0 -> 196616 bytes .../images/qed_raw-raw-relative | Bin 0 -> 327680 bytes tests/virstoragetestdata/images/raw | Bin 0 -> 1024 bytes tests/virstoragetestdata/images/sub/link1 | 1 + tests/virstoragetestdata/images/sub/link2 | 1 + tests/virstoragetestdata/lookup/qcow2 | 0 tests/virstoragetestdata/lookup/raw | 0 tests/virstoragetestdata/lookup/sub/link2 | 1 + tests/virstoragetestdata/lookup/wrap | 0 tests/virstoragetestdata/out/directory-dir | 9 + tests/virstoragetestdata/out/directory-none | 9 + tests/virstoragetestdata/out/directory-raw | 9 + .../out/qcow2-auto_qcow2-qcow2_raw-raw | 9 + .../out/qcow2-auto_raw-raw-relative | 9 + .../out/qcow2-qcow2_nbd-raw | 19 + .../out/qcow2-qcow2_qcow2-auto | 19 + .../out/qcow2-qcow2_qcow2-qcow2_qcow2-auto | 29 + .../out/qcow2-qcow2_qcow2-qcow2_raw-auto | 29 + .../out/qcow2-qcow2_qcow2-qcow2_raw-raw | 29 + .../out/qcow2-qcow2_raw-raw-relative | 19 + tests/virstoragetestdata/out/qcow2-symlinks | 29 + tests/virstoragetestdata/out/qed-auto_raw | 9 + tests/virstoragetestdata/out/qed-qed_raw | 19 + tests/virstoragetestdata/out/raw-auto | 9 + tests/virstoragetestdata/out/raw-raw | 9 + 42 files changed, 580 insertions(+), 628 deletions(-) create mode 100644 tests/virstoragetestdata/images/loop-1.qcow2 create mode 100644 tests/virstoragetestdata/images/loop-2.qcow2 create mode 100644 tests/virstoragetestdata/images/loop-self.qcow2 create mode 100644 tests/virstoragetestdata/images/qcow2 create mode 100644 tests/virstoragetestdata/images/qcow2_nbd-raw.qcow2 create mode 100644 tests/virstoragetestdata/images/qcow2_qcow2-auto.qcow2 create mode 100644 tests/virstoragetestdata/images/qcow2_qcow2-auto_qcow2-auto.qcow2 create mode 100644 tests/virstoragetestdata/images/qcow2_qcow2-missing.qcow2 create mode 100644 tests/virstoragetestdata/images/qcow2_qcow2-qcow2-symlink_raw-raw-reldir.qcow2 create mode 100644 tests/virstoragetestdata/images/qcow2_qcow2-qcow2_qcow2-auto.qcow2 create mode 100644 tests/virstoragetestdata/images/qcow2_qcow2-qcow2_raw-auto.qcow2 create mode 100644 tests/virstoragetestdata/images/qcow2_raw-auto.qcow2 create mode 100644 tests/virstoragetestdata/images/qcow2_raw-raw-relative.qcow2 create mode 100644 tests/virstoragetestdata/images/qcow2_raw-raw-reldir.qcow2 create mode 100644 tests/virstoragetestdata/images/qed_raw-raw-relative create mode 100644 tests/virstoragetestdata/images/raw create mode 120000 tests/virstoragetestdata/images/sub/link1 create mode 120000 tests/virstoragetestdata/images/sub/link2 create mode 100644 tests/virstoragetestdata/lookup/qcow2 create mode 100644 tests/virstoragetestdata/lookup/raw create mode 120000 tests/virstoragetestdata/lookup/sub/link2 create mode 100644 tests/virstoragetestdata/lookup/wrap create mode 100644 tests/virstoragetestdata/out/directory-dir create mode 100644 tests/virstoragetestdata/out/directory-none create mode 100644 tests/virstoragetestdata/out/directory-raw create mode 100644 tests/virstoragetestdata/out/qcow2-auto_qcow2-qcow2_raw-raw create mode 100644 tests/virstoragetestdata/out/qcow2-auto_raw-raw-relative create mode 100644 tests/virstoragetestdata/out/qcow2-qcow2_nbd-raw create mode 100644 tests/virstoragetestdata/out/qcow2-qcow2_qcow2-auto create mode 100644 tests/virstoragetestdata/out/qcow2-qcow2_qcow2-qcow2_qcow2-auto create mode 100644 tests/virstoragetestdata/out/qcow2-qcow2_qcow2-qcow2_raw-auto create mode 100644 tests/virstoragetestdata/out/qcow2-qcow2_qcow2-qcow2_raw-raw create mode 100644 tests/virstoragetestdata/out/qcow2-qcow2_raw-raw-relative create mode 100644 tests/virstoragetestdata/out/qcow2-symlinks create mode 100644 tests/virstoragetestdata/out/qed-auto_raw create mode 100644 tests/virstoragetestdata/out/qed-qed_raw create mode 100644 tests/virstoragetestdata/out/raw-auto create mode 100644 tests/virstoragetestdata/out/raw-raw -- 2.31.1

2 26

[PATCH] qemu: remove unnecessary strlen for LINE_ENDING
by renlei1998＠163.com 08 Sep '21

08 Sep '21

From: Ren Lei <ren.lei4(a)zte.com.cn> the length of LINE_ENDING is static, it's a waste to call strlen every time. Signed-off-by: Ren Lei <ren.lei4(a)zte.com.cn> --- src/qemu/qemu_agent.c | 5 +++-- src/qemu/qemu_monitor_json.c | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 5f421be6f6..3a453b4c58 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -47,6 +47,7 @@ VIR_LOG_INIT("qemu.qemu_agent"); #define LINE_ENDING "\n" +#define LINE_ENDING_LENGTH 1 #define DEBUG_IO 0 #define DEBUG_RAW_IO 0 @@ -341,11 +342,11 @@ static int qemuAgentIOProcessData(qemuAgent *agent, if (nl) { int got = nl - (data + used); - for (i = 0; i < strlen(LINE_ENDING); i++) + for (i = 0; i < LINE_ENDING_LENGTH; i++) data[used + got + i] = '\0'; if (qemuAgentIOProcessLine(agent, data + used, msg) < 0) return -1; - used += got + strlen(LINE_ENDING); + used += got + LINE_ENDING_LENGTH; } else { break; } diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 8d3c4031a6..8b77b3cdaa 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -51,6 +51,7 @@ VIR_LOG_INIT("qemu.qemu_monitor_json"); #define QOM_CPU_PATH "/machine/unattached/device[0]" #define LINE_ENDING "\r\n" +#define LINE_ENDING_LENGTH 2 VIR_ENUM_IMPL(qemuMonitorJob, QEMU_MONITOR_JOB_TYPE_LAST, @@ -271,7 +272,7 @@ int qemuMonitorJSONIOProcess(qemuMonitor *mon, int got = nl - (data + used); char *line; line = g_strndup(data + used, got); - used += got + strlen(LINE_ENDING); + used += got + LINE_ENDING_LENGTH; line[got] = '\0'; /* kill \n */ if (qemuMonitorJSONIOProcessLine(mon, line, msg) < 0) { VIR_FREE(line); -- 2.27.0

2 1

[PATCH 0/6] qemu: Fix crash when validating a XML without disk's <target>
by Peter Krempa 08 Sep '21

08 Sep '21

Apart from fixing the crash the validation code is fixed to do the correct thing and a test case is added. Peter Krempa (6): qemuDomainDefValidateDiskLunSource: Unbreak error messages conf: validate: Move qemu-specific LUN disk validation to global validation conf: validate: Run global device definition validation before callbacks conf: Don't call 'virDomainDiskDefAssignAddress' when disk->dst is NULL virDomainDiskDefValidate: Move validation of disk target qemuxml2argvtest: Add test case for missing disk '<target>' src/conf/domain_conf.c | 1 + src/conf/domain_validate.c | 94 ++++++++++++++----- src/conf/domain_validate.h | 2 + src/libvirt_private.syms | 1 + src/qemu/qemu_domain.c | 50 ---------- src/qemu/qemu_domain.h | 3 - src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_validate.c | 3 - .../default-video-type-x86_64-caps-test-0.err | 2 +- .../disk-fdc-incompatible-address.err | 2 +- .../disk-ide-incompatible-address.err | 2 +- .../disk-missing-target-invalid.err | 1 + .../disk-missing-target-invalid.xml | 22 +++++ .../disk-sata-incompatible-address.err | 2 +- .../disk-scsi-incompatible-address.err | 2 +- .../pseries-default-phb-numa-node.err | 2 +- .../pseries-phb-invalid-target-index-1.err | 2 +- .../pseries-phb-invalid-target-index-2.err | 2 +- .../pseries-phb-invalid-target-index-3.err | 2 +- .../video-invalid-multiple-devices.err | 2 +- ...splay-device-pci-address.x86_64-latest.err | 2 +- tests/qemuxml2argvtest.c | 1 + 22 files changed, 109 insertions(+), 93 deletions(-) create mode 100644 tests/qemuxml2argvdata/disk-missing-target-invalid.err create mode 100644 tests/qemuxml2argvdata/disk-missing-target-invalid.xml -- 2.31.1

2 7

[PATCH v2 0/3] support for virtio-blk-pci discard option
by yuxiating＠huawei.com 08 Sep '21

08 Sep '21

From: yuxiating <yuxiating(a)huawei.com> v1->v2 add docs/formatdomain.rst for discard_enable add qemuxml2argvtest change virDomainDiskDiscardEnable to virTristateSwitch yuxiating (3): qemu: probe for virtio-blk-pci discard option support conf: support for virtio-blk-pci discard option qemu: command: support for virtio-blk-pci discard option docs/formatdomain.rst | 3 ++ docs/schemas/domaincommon.rng | 8 +++++ src/conf/domain_conf.c | 8 +++++ src/conf/domain_conf.h | 1 + src/conf/domain_validate.c | 6 ++++ src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 5 +++ .../caps_4.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 + .../caps_4.0.0.riscv32.xml | 1 + .../caps_4.0.0.riscv64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 + .../caps_4.0.0.x86_64.xml | 1 + .../caps_4.1.0.x86_64.xml | 1 + .../caps_4.2.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 + .../caps_4.2.0.x86_64.xml | 1 + .../caps_5.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 + .../caps_5.0.0.riscv64.xml | 1 + .../caps_5.0.0.x86_64.xml | 1 + .../caps_5.1.0.x86_64.xml | 1 + .../caps_5.2.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 + .../caps_5.2.0.riscv64.xml | 1 + .../qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 + .../caps_5.2.0.x86_64.xml | 1 + .../caps_6.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 + .../caps_6.0.0.x86_64.xml | 1 + .../caps_6.1.0.x86_64.xml | 1 + .../qemuxml2argvdata/disk-virtio-discard.args | 29 +++++++++++++++ .../qemuxml2argvdata/disk-virtio-discard.xml | 35 +++++++++++++++++++ tests/qemuxml2argvtest.c | 2 ++ 36 files changed, 125 insertions(+) create mode 100644 tests/qemuxml2argvdata/disk-virtio-discard.args create mode 100644 tests/qemuxml2argvdata/disk-virtio-discard.xml -- 2.27.0

2 6

[libvirt PATCH 0/6] libxl: remove enum libxlHwcapVersion
by Ján Tomko 08 Sep '21

08 Sep '21

While looking at users of virCPU.*Free, I found some code that is supposed to deal with Xen < 4.7. The minimum version is 4.9 since the following commit: commit 68940b3fb3c43b8aa03cb6fd2f1d00b1737c9b2c Author: Jim Fehlig <jfehlig(a)suse.com> CommitDate: 2021-06-17 10:11:56 -0600 Xen: Bump minimum supported Xen version to 4.9 Remove the code dealing with the old version and use g_auto moer. Ján Tomko (6): libxl: capabilities: assume Xen version >= 4.7 libxl: remove enum libxlHwcapVersion libxl: capsInitCPU: fail if we can't initialize host features libxl: refactor libxlCapsInitCPU libxl: use g_auto in libxlCapsNodeData libxl: use g_auto in libxlDomainGetEmulatorType src/libxl/libxl_capabilities.c | 119 ++++++++++----------------------- 1 file changed, 37 insertions(+), 82 deletions(-) -- 2.31.1

2 7

Re: [PATCH 2/2] qemu: support for virtio-blk-pci discard options
by y005616296 07 Sep '21

07 Sep '21

>On Tue, Aug 31, 2021 at 20:50:04 +0800, yuxiating wrote: >> DISCARD and WRITE_ZEROES features for machine type >= 4.0 is enabled by default since >> commit 5c81161f804144b146607f890e84613a4cbad95c >> virtio-blk: add "discard" and "write-zeroes" properties >> Sometimes guestos has bugs DISCARD need to be disabled. > >I'm not very persuaded by this commit message, could you please elaborate how the bugs show themselves? > >Specifically this fells like a hack/workaround rather so a proper justification would be great. > Virtio_blk kernel driver has a bug that causes memory corruption in virtblk_setup_discard_write_zeroes(); af822aa68fbd ("block: virtio_blk: fix handling single range discard request") has fix it. However, some operating systems are not fixed and need to disabled on the QEMU side. >> Signed-off-by: yuxiating <yuxiating(a)huawei.com> >> --- >> src/conf/domain_conf.c | 15 +++++++++++++++ >> src/conf/domain_conf.h | 9 +++++++++ >> src/conf/domain_validate.c | 6 ++++++ >> src/libvirt_private.syms | 3 ++- >> src/qemu/qemu_command.c | 11 +++++++++++ >> 5 files changed, 43 insertions(+), 1 deletion(-) > >Please split the conf/* changes from the qemu changes. > >Also you didn't add any documentation to docs/formatdomain.rst which describes the XML which is unacceptable. > >Additionally you are also missing test cases for qemuxml2argvtest. > I will add a description to docs/ formatDomain.rst. qemuxml2argvtest will be added in version V2. >> >> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index >> 6127513117..bfe4721e60 100644 >> --- a/src/conf/domain_conf.c >> +++ b/src/conf/domain_conf.c >> @@ -1278,6 +1278,13 @@ VIR_ENUM_IMPL(virDomainDiskDiscard, >> "ignore", >> ); >> >> +VIR_ENUM_IMPL(virDomainDiskDiscardEnable, >> + VIR_DOMAIN_DISK_DISCARD_ENABLE_LAST, >> + "default", >> + "off", >> + "on", > >NACK to this hunk, 'default' value feels weird, and for the rest we have the virTristateBool type. > > I find virTristateSwitch more appropriate. >> +); >> + >> VIR_ENUM_IMPL(virDomainDiskDetectZeroes, >> VIR_DOMAIN_DISK_DETECT_ZEROES_LAST, >> "default", >> @@ -8930,6 +8937,10 @@ virDomainDiskDefDriverParseXML(virDomainDiskDef *def, >> if (virXMLPropUInt(cur, "queues", 10, VIR_XML_PROP_NONE, &def->queues) < 0) >> return -1; >> >> + if (virXMLPropEnum(cur, "discard_enable", virDomainDiskDiscardEnableTypeFromString, >> + VIR_XML_PROP_NONZERO, &def->discard_enable) < 0) >> + return -1; >> + >> return 0; >> } >> >> @@ -23416,6 +23427,10 @@ virDomainDiskDefFormatDriver(virBuffer *buf, >> if (disk->queues) >> virBufferAsprintf(&attrBuf, " queues='%u'", disk->queues); >> >> + if (disk->discard_enable) >> + virBufferAsprintf(&attrBuf, " discard_enable='%s'", >> + >> + virDomainDiskDiscardEnableTypeToString(disk->discard_enable)); > >It even behaves exactly like virTristateBool. > I'll use virTristateSwitch instead >> + >> virDomainVirtioOptionsFormat(&attrBuf, disk->virtio); >> >> if (disk->src->metadataCacheMaxSize > 0) { diff --git >> a/src/conf/domain_conf.h b/src/conf/domain_conf.h index >> c7e6df7981..c39694a19e 100644 >> --- a/src/conf/domain_conf.h >> +++ b/src/conf/domain_conf.h > >[...] > >> diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index >> ab8a6c00c3..52a74dd2d5 100644 >> --- a/src/libvirt_private.syms >> +++ b/src/libvirt_private.syms >> @@ -1,5 +1,5 @@ >> -# >> # General private symbols. Add symbols here, and see src/meson.build >> for >> +# mainDiskDeviceTypeToString >> # more details. >> # >> # Keep this file sorted by header name, then by symbols with each header. > >NACK to this hunk too, you shouldn't need to modify the header here. > It was my mistake. >> @@ -377,6 +377,7 @@ virDomainDiskDefParseSource; >> virDomainDiskDetectZeroesTypeFromString; >> virDomainDiskDetectZeroesTypeToString; >> virDomainDiskDeviceTypeToString; >> +virDomainDiskDiscardEnableTypeToString; >> virDomainDiskDiscardTypeToString; >> virDomainDiskEmptySource; >> virDomainDiskErrorPolicyTypeFromString; >> diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index >> b230314f7f..894c8b17b9 100644 >> --- a/src/qemu/qemu_command.c >> +++ b/src/qemu/qemu_command.c >> @@ -1739,6 +1739,17 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, >> virBufferAsprintf(&opt, ",num-queues=%u", disk->queues); >> } >> >> + if (disk->discard_enable) { >> + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_DISCARD)) >> + { > >This capability was also checked in the validator so you don't need to do this here. > >> + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", >> + _("virtio-blk discard property isn't supported by this " >> + "QEMU binary")); > > > I'm going to delete this check. >> + return NULL; >> + } >> + virBufferAsprintf(&opt, ",discard=%s", >> + virDomainDiskDiscardEnableTypeToString(disk->discard_enable)); >> + } >> + >> qemuBuildVirtioOptionsStr(&opt, disk->virtio); >> >> if (qemuBuildDeviceAddressStr(&opt, def, &disk->info) < 0) >> -- >> 2.27.0 >> >>

1 0

[PATCH] qemu_security: Set the label of monitor
by Peng Liang 07 Sep '21

07 Sep '21

Signed-off-by: Peng Liang <liangpeng10(a)huawei.com> --- src/qemu/qemu_security.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/qemu/qemu_security.c b/src/qemu/qemu_security.c index 19d957dd4b96..96755a62bd2c 100644 --- a/src/qemu/qemu_security.c +++ b/src/qemu/qemu_security.c @@ -52,6 +52,12 @@ qemuSecuritySetAllLabel(virQEMUDriver *driver, priv->chardevStdioLogd, migrated) < 0) goto cleanup; + if (priv->monConfig && + virSecurityManagerSetChardevLabel(driver->securityManager, + vm->def, + priv->monConfig, + priv->chardevStdioLogd) < 0) + goto cleanup; if (virSecurityManagerTransactionCommit(driver->securityManager, pid, priv->rememberOwner) < 0) -- 2.31.1

2 4

[libvirt PATCH 0/6] tests: refactor some functions (glib chronicles)
by Ján Tomko 06 Sep '21

06 Sep '21

Ján Tomko (6): tests: esxutils: refactor testParseDatastorePath tests: esxutils: reduce variable scope in testEscapeDatastoreItem tests: esxutils: reduce variable scope in testConvertWindows1252ToUTF8 tests: reduce variable scope in testSELinuxCheckLabels tests: refactor testSELinuxLoadDef virnetsockettest: refactor checkProtocols tests/esxutilstest.c | 46 +++++++++----------------------- tests/securityselinuxlabeltest.c | 41 +++++++++------------------- tests/virnetsockettest.c | 26 +++++++----------- 3 files changed, 34 insertions(+), 79 deletions(-) -- 2.31.1

2 7

[libvirt PATCH] secretxml2xmltest: refactor testCompareXMLToXMLFiles (glib chronicles)
by Ján Tomko 06 Sep '21

06 Sep '21

Use g_auto where possible and remove the pointless label. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- tests/secretxml2xmltest.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/tests/secretxml2xmltest.c b/tests/secretxml2xmltest.c index 48f48416b5..99aaa9db15 100644 --- a/tests/secretxml2xmltest.c +++ b/tests/secretxml2xmltest.c @@ -10,25 +10,19 @@ static int testCompareXMLToXMLFiles(const char *inxml, const char *outxml) { - char *actual = NULL; - int ret = -1; - virSecretDef *secret = NULL; + g_autofree char *actual = NULL; + g_autoptr(virSecretDef) secret = NULL; if (!(secret = virSecretDefParseFile(inxml))) - goto fail; + return -1; if (!(actual = virSecretDefFormat(secret))) - goto fail; + return -1; if (virTestCompareToFile(actual, outxml) < 0) - goto fail; + return -1; - ret = 0; - - fail: - VIR_FREE(actual); - virSecretDefFree(secret); - return ret; + return 0; } struct testInfo { -- 2.31.1

2 1