- Devel - libvirt List Archives

[PATCH] virnetsocket: pass HOME and XDG_RUNTIME_DIR to ssh
by Дамјан Георгиевски 09 Nov '21

09 Nov '21

openssh supports environment variable expansion in its ssh_config file[1]. These two environment variables can be used to expand paths for ssh sockets and other files. Ex. ``` Host * ControlMaster auto ControlPath ${XDG_RUNTIME_DIR}/ssh-%C.ctl IdentityAgent ${XDG_RUNTIME_DIR}/ssh-agent.socket ``` see also: [1] https://man7.org/linux/man-pages/man5/ssh_config.5.html#ENVIRONMENT_VARIABL… [2] https://gitlab.com/libvirt/libvirt/-/issues/232 Signed-off-by: Дамјан Георгиевски <gdamjan(a)gmail.com> --- src/rpc/virnetsocket.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 943406cd64..76d8519d3a 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -852,6 +852,8 @@ int virNetSocketNewConnectSSH(const char *nodename, cmd = virCommandNew(binary ? binary : "ssh"); virCommandAddEnvPassCommon(cmd); + virCommandAddEnvPass(cmd, "HOME"); + virCommandAddEnvPass(cmd, "XDG_RUNTIME_DIR"); virCommandAddEnvPass(cmd, "KRB5CCNAME"); virCommandAddEnvPass(cmd, "SSH_AUTH_SOCK"); virCommandAddEnvPass(cmd, "SSH_ASKPASS"); -- 2.33.1

2 1

[PATCH v1] docs: add minor clarifications for librbd encryption
by Or Ozeri 09 Nov '21

09 Nov '21

This should make the documentation less confusing mainly for Ceph people. Signed-off-by: Or Ozeri <oro(a)il.ibm.com> --- docs/formatstorageencryption.html.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/formatstorageencryption.html.in b/docs/formatstorageencryption.html.in index 66bf95ab0b..c8c9f08d1e 100644 --- a/docs/formatstorageencryption.html.in +++ b/docs/formatstorageencryption.html.in @@ -129,9 +129,10 @@ <h3><a id="StorageEncryptionLuks2">"luks2" format</a></h3> <p> The <code>luks2</code> format is currently supported only by the - <code>librbd</code> engine, and can only be applied to RBD network disks. + <code>librbd</code> engine, and can only be applied to RBD network disks + (RBD images). Since the <code>librbd</code> engine is currently not supported by the - storage driver, you cannot use it to control such disks. However, + libvirt storage driver, you cannot use it to control such disks. However, pre-formatted RBD luks2 disks can be loaded to a qemu VM using the qemu VM driver. A single -- 2.25.1

2 1

[PATCH] qemu: tpm: Initialize variable with NULL
by Stefan Berger 08 Nov '21

08 Nov '21

Initialize an autofree'd variable with NULL that causes crashes if a TPM 1.2 is used and the variable doesn't get a value assigned. Signed-off-by: Stefan Berger <stefanb(a)linux.ibm.com> --- src/qemu/qemu_tpm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index b305313ad2..1992b596cb 100644 --- a/src/qemu/qemu_tpm.c +++ b/src/qemu/qemu_tpm.c @@ -610,7 +610,7 @@ qemuTPMEmulatorReconfigure(const char *storagepath, { g_autoptr(virCommand) cmd = NULL; int exitstatus; - g_autofree char *activePcrBanksStr; + g_autofree char *activePcrBanksStr = NULL; g_autofree char *swtpm_setup = virTPMGetSwtpmSetup(); VIR_AUTOCLOSE pwdfile_fd = -1; -- 2.31.1

5 5

[libvirt PATCH 00/10] Cleanup some cleanup / error paths
by Tim Wiederhake 08 Nov '21

08 Nov '21

Tim Wiederhake (10): adminConnectListServers: Cleanup virCHDomainObjBeginJob: Cleanup virDomainCapsCPUModelsCopy: Cleanup virNetworkEventDispatchDefaultFunc: Cleanup virSaveCookieParse: Cleanup virBufferAddBuffer: Cleanup virSCSIVHostOpenVhostSCSI: Cleanup fillXenCaps: Cleanup testLXCCapsInit: Cleanup testVshTableHeader: Cleanup src/admin/admin_server.c | 4 ++-- src/ch/ch_domain.c | 34 ++++++++++++++++------------------ src/conf/domain_capabilities.c | 10 +++------- src/conf/network_event.c | 9 +++------ src/conf/virsavecookie.c | 9 ++------- src/util/virbuffer.c | 10 ++++------ src/util/virscsivhost.c | 7 +------ tests/domaincapstest.c | 18 +++++------------- tests/testutilslxc.c | 17 +++++------------ tests/vshtabletest.c | 12 +++++------- 10 files changed, 46 insertions(+), 84 deletions(-) -- 2.31.1

2 12

[libvirt PATCHv2 0/7] qemu: retire QEMU_CAPS_SPICE_UNIX
by Ján Tomko 08 Nov '21

08 Nov '21

Tim already acked v1, but I noticed a failure in the CI in patch 5/7 because with the latest caps, we try to create a logfile for one chardev in /tmp. Fix that by only testing name-escape with v2.11.0 QEMU caps. I've heard rumors of Peter having a patch ready that would make qemuxml2argv testing possible with all kinds of chardev, so the latest version of the tests can possibly be added later. Ján Tomko (7): tests: remove disks from spice tests tests: qemuxml2xmltest: move graphics-spice-timeout tests: qemuxml2xml: use latest caps for spice tests tests: qemuxml2argv: use latest caps for spice tests tests: convert name-escape to use real caps qemu: always assume QEMU_CAPS_SPICE_UNIX qemu: retire QEMU_CAPS_SPICE_UNIX src/qemu/qemu_capabilities.c | 3 +- src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_validate.c | 10 +-- .../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.riscv32.xml | 1 - .../caps_4.0.0.riscv64.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.riscv64.xml | 1 - .../caps_5.0.0.x86_64.xml | 1 - .../qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 - .../caps_5.1.0.x86_64.xml | 1 - .../caps_5.2.0.riscv64.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 - .../caps_6.2.0.aarch64.xml | 1 - .../caps_6.2.0.x86_64.xml | 1 - .../graphics-spice-agent-file-xfer.args | 34 --------- ...s-spice-agent-file-xfer.x86_64-latest.args | 35 +++++++++ .../graphics-spice-agent-file-xfer.xml | 5 -- .../graphics-spice-agentmouse.args | 36 --------- ...aphics-spice-agentmouse.x86_64-latest.args | 37 +++++++++ .../graphics-spice-agentmouse.xml | 5 -- ...-spice-auto-socket-cfg.x86_64-latest.args} | 17 +++-- ...hics-spice-auto-socket.x86_64-latest.args} | 17 +++-- .../graphics-spice-compression.args | 34 --------- ...phics-spice-compression.x86_64-latest.args | 35 +++++++++ .../graphics-spice-compression.xml | 5 -- .../graphics-spice-egl-headless.args | 34 --------- ...hics-spice-egl-headless.x86_64-latest.args | 35 +++++++++ .../graphics-spice-egl-headless.xml | 5 -- .../graphics-spice-invalid-egl-headless.xml | 5 -- .../graphics-spice-no-args.args | 31 -------- .../graphics-spice-no-args.x86_64-latest.args | 34 +++++++++ .../graphics-spice-qxl-vga.args | 34 --------- .../graphics-spice-qxl-vga.x86_64-latest.args | 35 +++++++++ .../graphics-spice-qxl-vga.xml | 5 -- .../qemuxml2argvdata/graphics-spice-sasl.args | 34 --------- .../graphics-spice-sasl.x86_64-latest.args | 35 +++++++++ .../qemuxml2argvdata/graphics-spice-sasl.xml | 6 -- .../graphics-spice-socket.args | 30 -------- .../graphics-spice-socket.x86_64-latest.args | 33 ++++++++ .../graphics-spice-timeout.args | 40 ---------- .../graphics-spice-timeout.x86_64-latest.args | 38 ++++++++++ .../graphics-spice-timeout.xml | 13 ---- .../graphics-spice-usb-redir.args | 38 ---------- ...raphics-spice-usb-redir.x86_64-latest.args | 41 ++++++++++ tests/qemuxml2argvdata/graphics-spice.args | 34 --------- .../graphics-spice.x86_64-latest.args | 35 +++++++++ tests/qemuxml2argvdata/graphics-spice.xml | 5 -- ...pe.args => name-escape.x86_64-2.11.0.args} | 7 +- tests/qemuxml2argvtest.c | 75 ++++--------------- ...s-spice-auto-socket-cfg.x86_64-latest.xml} | 5 +- ...phics-spice-auto-socket.x86_64-latest.xml} | 5 +- ...phics-spice-compression.x86_64-latest.xml} | 11 +-- ...hics-spice-egl-headless.x86_64-latest.xml} | 11 +-- ... graphics-spice-qxl-vga.x86_64-latest.xml} | 11 +-- ...> graphics-spice-socket.x86_64-latest.xml} | 5 +- ... graphics-spice-timeout.x86_64-latest.xml} | 15 +--- ...e.xml => graphics-spice.x86_64-latest.xml} | 11 +-- tests/qemuxml2xmltest.c | 35 ++------- 66 files changed, 471 insertions(+), 614 deletions(-) delete mode 100644 tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args create mode 100644 tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/graphics-spice-agentmouse.args create mode 100644 tests/qemuxml2argvdata/graphics-spice-agentmouse.x86_64-latest.args rename tests/qemuxml2argvdata/{graphics-spice-auto-socket-cfg.args => graphics-spice-auto-socket-cfg.x86_64-latest.args} (50%) rename tests/qemuxml2argvdata/{graphics-spice-auto-socket.args => graphics-spice-auto-socket.x86_64-latest.args} (50%) delete mode 100644 tests/qemuxml2argvdata/graphics-spice-compression.args create mode 100644 tests/qemuxml2argvdata/graphics-spice-compression.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/graphics-spice-egl-headless.args create mode 100644 tests/qemuxml2argvdata/graphics-spice-egl-headless.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/graphics-spice-no-args.args create mode 100644 tests/qemuxml2argvdata/graphics-spice-no-args.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/graphics-spice-qxl-vga.args create mode 100644 tests/qemuxml2argvdata/graphics-spice-qxl-vga.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/graphics-spice-sasl.args create mode 100644 tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/graphics-spice-socket.args create mode 100644 tests/qemuxml2argvdata/graphics-spice-socket.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/graphics-spice-timeout.args create mode 100644 tests/qemuxml2argvdata/graphics-spice-timeout.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/graphics-spice-usb-redir.args create mode 100644 tests/qemuxml2argvdata/graphics-spice-usb-redir.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/graphics-spice.args create mode 100644 tests/qemuxml2argvdata/graphics-spice.x86_64-latest.args rename tests/qemuxml2argvdata/{name-escape.args => name-escape.x86_64-2.11.0.args} (90%) rename tests/qemuxml2xmloutdata/{graphics-spice-auto-socket-cfg.xml => graphics-spice-auto-socket-cfg.x86_64-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{graphics-spice-auto-socket.xml => graphics-spice-auto-socket.x86_64-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{graphics-spice-compression.xml => graphics-spice-compression.x86_64-latest.xml} (86%) rename tests/qemuxml2xmloutdata/{graphics-spice-egl-headless.xml => graphics-spice-egl-headless.x86_64-latest.xml} (83%) rename tests/qemuxml2xmloutdata/{graphics-spice-qxl-vga.xml => graphics-spice-qxl-vga.x86_64-latest.xml} (85%) rename tests/qemuxml2xmloutdata/{graphics-spice-socket.xml => graphics-spice-socket.x86_64-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{graphics-spice-timeout.xml => graphics-spice-timeout.x86_64-latest.xml} (82%) rename tests/qemuxml2xmloutdata/{graphics-spice.xml => graphics-spice.x86_64-latest.xml} (87%) -- 2.31.1

3 9

[PATCH] bridge_driver: Drop needless fwd declarations
by Michal Privoznik 08 Nov '21

08 Nov '21

Some forward declarations in bridge_driver.c are not needed really. They only create a noise when trying to jump onto the correct tag. Drop them. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/network/bridge_driver.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 498c45d0a7..7e5fab630b 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -259,20 +259,6 @@ static int networkShutdownNetwork(virNetworkDriverState *driver, virNetworkObj *obj); -static int -networkStartNetworkVirtual(virNetworkDriverState *driver, - virNetworkObj *obj); - -static int -networkShutdownNetworkVirtual(virNetworkDriverState *driver, - virNetworkObj *obj); - -static int -networkStartNetworkExternal(virNetworkObj *obj); - -static int -networkShutdownNetworkExternal(virNetworkObj *obj); - static void networkReloadFirewallRules(virNetworkDriverState *driver, bool startup, -- 2.32.0

3 2

[PATCH] docs/about/deprecated: Remove empty 'related binaries' section
by Philippe Mathieu-Daudé 08 Nov '21

08 Nov '21

Commit 497a30dbb06 ("qemu-img: Require -F with -b backing image") removed the content of the "Related binaries" section but forgot to remove the section title. Since it is now empty, remove it too. Signed-off-by: Philippe Mathieu-Daudé <philmd(a)redhat.com> --- docs/about/deprecated.rst | 3 --- 1 file changed, 3 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 56f9ad15ab5..5e514fb443d 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -370,9 +370,6 @@ The ``I7200`` guest CPU relies on the nanoMIPS ISA, which is deprecated (the ISA has never been upstreamed to a compiler toolchain). Therefore this CPU is also deprecated. -Related binaries ----------------- - Backwards compatibility ----------------------- -- 2.31.1

4 3

[PATCH v2 0/2] tests/acceptance: rename tests acceptance to tests avocado
by Willian Rampazzo 08 Nov '21

08 Nov '21

In the discussion about renaming the `tests/acceptance` [1], the conclusion was that the folders inside `tests` are related to the framework running the tests and not directly related to the type of the tests. This changes the folder to `tests/avocado` and adjusts the MAKEFILE, the CI related files and the documentation. [1] https://lists.gnu.org/archive/html/qemu-devel/2021-05/msg06553.html GitLab pipeline with new naming: https://gitlab.com/willianrampazzo/qemu/-/pipelines/403056475 Changes from v1: - Split changes on Makefile leaving `check-acceptance` available and adding a deprecate warning message when it is used. (Suggested-by: Philippe Mathieu-Daudé) - Remove unrelated changes. Signed-off-by: Willian Rampazzo <willianr(a)redhat.com> Willian Rampazzo (2): tests/acceptance: introduce new check-avocado tartget tests/acceptance: rename tests acceptance to tests avocado .gitlab-ci.d/buildtest-template.yml | 2 +- .gitlab-ci.d/buildtest.yml | 56 +++++++++---------- MAINTAINERS | 52 ++++++++--------- configure | 2 +- docs/about/deprecated.rst | 13 +++++ docs/devel/build-system.rst | 2 +- docs/devel/ci-definitions.rst.inc | 2 +- docs/devel/testing.rst | 49 ++++++++-------- docs/system/arm/orangepi.rst | 8 +-- python/qemu/machine/README.rst | 2 +- python/qemu/qmp/README.rst | 2 +- python/qemu/utils/README.rst | 2 +- tests/Makefile.include | 21 ++++--- tests/acceptance/README.rst | 10 ---- tests/avocado/README.rst | 10 ++++ .../avocado_qemu/__init__.py | 2 +- tests/{acceptance => avocado}/boot_linux.py | 0 .../boot_linux_console.py | 0 tests/{acceptance => avocado}/boot_xen.py | 0 tests/{acceptance => avocado}/cpu_queries.py | 0 .../empty_cpu_model.py | 0 tests/{acceptance => avocado}/hotplug_cpu.py | 0 tests/{acceptance => avocado}/info_usernet.py | 0 tests/{acceptance => avocado}/intel_iommu.py | 0 tests/{acceptance => avocado}/linux_initrd.py | 2 +- .../linux_ssh_mips_malta.py | 0 .../machine_arm_canona1100.py | 0 .../machine_arm_integratorcp.py | 0 .../machine_arm_n8x0.py | 0 tests/{acceptance => avocado}/machine_avr6.py | 2 +- .../machine_m68k_nextcube.py | 0 .../machine_microblaze.py | 0 .../machine_mips_fuloong2e.py | 0 .../machine_mips_loongson3v.py | 0 .../machine_mips_malta.py | 0 .../machine_rx_gdbsim.py | 0 .../machine_s390_ccw_virtio.py | 0 .../machine_sparc64_sun4u.py | 0 .../machine_sparc_leon3.py | 0 tests/{acceptance => avocado}/migration.py | 0 tests/{acceptance => avocado}/multiprocess.py | 0 .../pc_cpu_hotplug_props.py | 0 tests/{acceptance => avocado}/ppc_405.py | 0 tests/{acceptance => avocado}/ppc_bamboo.py | 0 .../{acceptance => avocado}/ppc_mpc8544ds.py | 0 tests/{acceptance => avocado}/ppc_prep_40p.py | 0 tests/{acceptance => avocado}/ppc_pseries.py | 0 .../ppc_virtex_ml507.py | 0 .../{acceptance => avocado}/replay_kernel.py | 0 tests/{acceptance => avocado}/replay_linux.py | 0 .../reverse_debugging.py | 0 tests/{acceptance => avocado}/smmu.py | 0 tests/{acceptance => avocado}/tcg_plugins.py | 0 .../tesseract_utils.py | 0 tests/{acceptance => avocado}/version.py | 0 tests/{acceptance => avocado}/virtio-gpu.py | 0 .../virtio_check_params.py | 0 .../{acceptance => avocado}/virtio_version.py | 0 .../virtiofs_submounts.py | 0 .../virtiofs_submounts.py.data/cleanup.sh | 0 .../guest-cleanup.sh | 0 .../virtiofs_submounts.py.data/guest.sh | 0 .../virtiofs_submounts.py.data/host.sh | 0 tests/{acceptance => avocado}/vnc.py | 0 .../x86_cpu_model_versions.py | 0 65 files changed, 129 insertions(+), 110 deletions(-) delete mode 100644 tests/acceptance/README.rst create mode 100644 tests/avocado/README.rst rename tests/{acceptance => avocado}/avocado_qemu/__init__.py (99%) rename tests/{acceptance => avocado}/boot_linux.py (100%) rename tests/{acceptance => avocado}/boot_linux_console.py (100%) rename tests/{acceptance => avocado}/boot_xen.py (100%) rename tests/{acceptance => avocado}/cpu_queries.py (100%) rename tests/{acceptance => avocado}/empty_cpu_model.py (100%) rename tests/{acceptance => avocado}/hotplug_cpu.py (100%) rename tests/{acceptance => avocado}/info_usernet.py (100%) rename tests/{acceptance => avocado}/intel_iommu.py (100%) rename tests/{acceptance => avocado}/linux_initrd.py (99%) rename tests/{acceptance => avocado}/linux_ssh_mips_malta.py (100%) rename tests/{acceptance => avocado}/machine_arm_canona1100.py (100%) rename tests/{acceptance => avocado}/machine_arm_integratorcp.py (100%) rename tests/{acceptance => avocado}/machine_arm_n8x0.py (100%) rename tests/{acceptance => avocado}/machine_avr6.py (98%) rename tests/{acceptance => avocado}/machine_m68k_nextcube.py (100%) rename tests/{acceptance => avocado}/machine_microblaze.py (100%) rename tests/{acceptance => avocado}/machine_mips_fuloong2e.py (100%) rename tests/{acceptance => avocado}/machine_mips_loongson3v.py (100%) rename tests/{acceptance => avocado}/machine_mips_malta.py (100%) rename tests/{acceptance => avocado}/machine_rx_gdbsim.py (100%) rename tests/{acceptance => avocado}/machine_s390_ccw_virtio.py (100%) rename tests/{acceptance => avocado}/machine_sparc64_sun4u.py (100%) rename tests/{acceptance => avocado}/machine_sparc_leon3.py (100%) rename tests/{acceptance => avocado}/migration.py (100%) rename tests/{acceptance => avocado}/multiprocess.py (100%) rename tests/{acceptance => avocado}/pc_cpu_hotplug_props.py (100%) rename tests/{acceptance => avocado}/ppc_405.py (100%) rename tests/{acceptance => avocado}/ppc_bamboo.py (100%) rename tests/{acceptance => avocado}/ppc_mpc8544ds.py (100%) rename tests/{acceptance => avocado}/ppc_prep_40p.py (100%) rename tests/{acceptance => avocado}/ppc_pseries.py (100%) rename tests/{acceptance => avocado}/ppc_virtex_ml507.py (100%) rename tests/{acceptance => avocado}/replay_kernel.py (100%) rename tests/{acceptance => avocado}/replay_linux.py (100%) rename tests/{acceptance => avocado}/reverse_debugging.py (100%) rename tests/{acceptance => avocado}/smmu.py (100%) rename tests/{acceptance => avocado}/tcg_plugins.py (100%) rename tests/{acceptance => avocado}/tesseract_utils.py (100%) rename tests/{acceptance => avocado}/version.py (100%) rename tests/{acceptance => avocado}/virtio-gpu.py (100%) rename tests/{acceptance => avocado}/virtio_check_params.py (100%) rename tests/{acceptance => avocado}/virtio_version.py (100%) rename tests/{acceptance => avocado}/virtiofs_submounts.py (100%) rename tests/{acceptance => avocado}/virtiofs_submounts.py.data/cleanup.sh (100%) rename tests/{acceptance => avocado}/virtiofs_submounts.py.data/guest-cleanup.sh (100%) rename tests/{acceptance => avocado}/virtiofs_submounts.py.data/guest.sh (100%) rename tests/{acceptance => avocado}/virtiofs_submounts.py.data/host.sh (100%) rename tests/{acceptance => avocado}/vnc.py (100%) rename tests/{acceptance => avocado}/x86_cpu_model_versions.py (100%) -- 2.33.1

5 9

[PATCH v4 0/3] qapi & doc: deprecate drive-backup
by Markus Armbruster 05 Nov '21

05 Nov '21

See 03 commit message for details. 01-02 are preparation docs update. v4: deprecate drive-backup transaction by squashing [PATCH v4 5/5] block: Deprecate transaction type drive-backup Message-Id: <20211025042405.3762351-6-armbru(a)redhat.com> into PATCH 3 v3: wording fix-ups and improvements suggested by Kashyap v2: add a lot of documentation changes v1 was "[PATCH] qapi: deprecate drive-backup" Vladimir Sementsov-Ogievskiy (3): docs/block-replication: use blockdev-backup docs/interop/bitmaps: use blockdev-backup qapi: deprecate drive-backup docs/about/deprecated.rst | 11 + docs/block-replication.txt | 4 +- docs/interop/bitmaps.rst | 285 +++++++++++++++++++------ docs/interop/live-block-operations.rst | 47 ++-- qapi/block-core.json | 5 +- qapi/transaction.json | 6 +- 6 files changed, 268 insertions(+), 90 deletions(-) -- 2.31.1

2 4

[PULL 00/10] Misc 20211102 patches
by Gerd Hoffmann 05 Nov '21

05 Nov '21

The following changes since commit 8cb41fda78c7ebde0dd248c6afe1d336efb0de50: Merge remote-tracking branch 'remotes/philmd/tags/machine-20211101' into staging (2021-11-02 05:53:45 -0400) are available in the Git repository at: git://git.kraxel.org/qemu tags/misc-20211102-pull-request for you to fetch changes up to 58d7d4c7869cb3addb0714aa7b6bd88f2b6b7edf: usb-storage: tag usb_msd_csw as packed struct (2021-11-02 17:24:18 +0100) ---------------------------------------------------------------- MAINTAINERS: audio updates microvm: device tree support console: chardev fixes misc: deprecate sga usb: fix struct usb_msd_csw ---------------------------------------------------------------- Christian Schoenebeck (1): MAINTAINERS: add myself as partial audio reviewer Daniel P. Berrangé (1): hw/misc: deprecate the 'sga' device Dongwon Kim (1): ui/gtk: skip any extra draw of same guest scanout blob res Gerd Hoffmann (2): microvm: add device tree support. usb-storage: tag usb_msd_csw as packed struct Nikola Pavlica (1): ui/gtk: Update the refresh rate for gl-area too Thomas Huth (1): MAINTAINERS: Add myself as a reviewer for SDL audio Volker Rümelin (3): ui/console: replace QEMUFIFO with Fifo8 ui/console: replace kbd_timer with chr_accept_input callback ui/console: remove chardev frontend connected test hw/i386/microvm-dt.h | 8 + include/hw/i386/microvm.h | 4 + include/hw/usb/msd.h | 2 +- include/ui/console.h | 1 + hw/display/virtio-gpu-udmabuf.c | 2 +- hw/i386/microvm-dt.c | 341 +++++++++++++++++++++++++++++ hw/i386/microvm.c | 2 + hw/misc/sga.c | 2 + ui/console.c | 109 +++------ ui/gtk-egl.c | 40 ++-- ui/gtk-gl-area.c | 52 +++-- .gitlab-ci.d/buildtest.yml | 1 - MAINTAINERS | 4 + configs/targets/i386-softmmu.mak | 1 + configs/targets/x86_64-softmmu.mak | 1 + docs/about/deprecated.rst | 10 + hw/i386/meson.build | 2 +- 17 files changed, 466 insertions(+), 116 deletions(-) create mode 100644 hw/i386/microvm-dt.h create mode 100644 hw/i386/microvm-dt.c -- 2.31.1

3 12

[libvirt PATCH v2 00/20] Invalidate the cpu flags cache on host cpuid mismatch
by Tim Wiederhake 05 Nov '21

05 Nov '21

Many things can affect the availability of cpu features (e.g. software upgrades, kernel versions, kernel command line, etc.) and invalidate the cached capabilities without notice. Add CPUID information to the capabilities cache. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1953389. V1: https://listman.redhat.com/archives/libvir-list/2021-August/msg00138.html Tim Wiederhake (20): cpu_x86: Simplify x86ParseCPUID cpu_x86: Simplify x86ParseMSR cpu_x86: Add x86ParseDataItemList cpu: Change virCPUArchDataParse to take xmlNodePtr cpu: Split up virCPUDataParse cpu: Add virCPUDataIsIdentical cpu_x86: Implement virCPUDataIsIdentical for x86 cpu_arm: No need to protect macro definitions cpu_arm: Implement virCPUDataIsIdentical for arm cpu_ppc64: Implement virCPUDataIsIdentical for ppc64 cpu: Add virCPUDataNewCopy cpu_x86: Implement virCPUDataNewCopy for x86 cpu_arm: Implement virCPUDataNewCopy for arm cpu_ppc64: Implement virCPUDataNewCopy for ppc64 virhostcpu: Add virHostCPUGetCPUID cpu_x86: Add virCPUDataGetHost cpu_x86: Implement virCPUDataGetHost for x86 virQEMUCaps: Add host cpuid information virQEMUCapsCachePriv: Add host cpuid information qemu: Invalidate capabilities cache on host cpuid mismatch src/cpu/cpu.c | 97 +++++++++++- src/cpu/cpu.h | 27 +++- src/cpu/cpu_arm.c | 54 ++++++- src/cpu/cpu_ppc64.c | 44 ++++++ src/cpu/cpu_x86.c | 296 +++++++++++++++++++++++------------ src/libvirt_private.syms | 5 + src/qemu/qemu_capabilities.c | 33 +++- src/qemu/qemu_capspriv.h | 3 +- src/util/virhostcpu.c | 43 +++++ src/util/virhostcpu.h | 2 + tests/qemucapsprobe.c | 2 +- 11 files changed, 486 insertions(+), 120 deletions(-) -- 2.31.1

2 25

[libvirt PATCH] NEWS: document tcp_min_ssf
by Ján Tomko 05 Nov '21

05 Nov '21

Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- NEWS.rst | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 983153a631..fc47c63bd2 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -24,6 +24,13 @@ v7.10.0 (unreleased) Libvirt is now able to report interface information from the guest's perspective (using guest agent). + * Minimum SSF setting + + The libvirtd.conf option tcp_min_ssf can be used to override the minimum + permitted security strength factor for non-TLS remote connections. + The current hardcoded minimum is 56 (single-DES) and will be raised to 112 + in the future. Setting a minimum lower than 112 is not supported. + * **Bug fixes** -- 2.31.1

2 1

[PATCH] remote_daemon: Validate tcp_min_ssf value only if found in config
by Michal Privoznik 05 Nov '21

05 Nov '21

If there is no tcp_min_ssf value set in daemon config we still compare it against the default (56 which corresponds to DES) and if the value is below our expected minimum (112 which corresponds to 3DES) an error is reported and the daemon refuses to start. This is not what we want. What we want is to check the value iff the value was specified in the config file. Fixes: 58a48cff840 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/remote/remote_daemon_config.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/remote/remote_daemon_config.c b/src/remote/remote_daemon_config.c index a9961013f2..30653e82cf 100644 --- a/src/remote/remote_daemon_config.c +++ b/src/remote/remote_daemon_config.c @@ -231,6 +231,8 @@ daemonConfigLoadOptions(struct daemonConfig *data, const char *filename, virConf *conf) { + int rc G_GNUC_UNUSED; + #ifdef WITH_IP if (virConfGetValueBool(conf, "listen_tcp", &data->listen_tcp) < 0) return -1; @@ -303,10 +305,9 @@ daemonConfigLoadOptions(struct daemonConfig *data, if (virConfGetValueString(conf, "tls_priority", &data->tls_priority) < 0) return -1; - if (virConfGetValueUInt(conf, "tcp_min_ssf", &data->tcp_min_ssf) < 0) + if ((rc = virConfGetValueUInt(conf, "tcp_min_ssf", &data->tcp_min_ssf)) < 0) { return -1; - - if (data->tcp_min_ssf < SSF_WARNING_LEVEL) { + } else if (rc > 0 && data->tcp_min_ssf < SSF_WARNING_LEVEL) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("minimum SSF levels lower than %d are not supported"), SSF_WARNING_LEVEL); -- 2.32.0

2 1

[libvirt PATCH v4 0/5] add interface infomation in guestinfo command
by zhanglei 05 Nov '21

05 Nov '21

zhanglei (5): domain: add interface information to 'virDomainGetGuestInfo' virsh: add interface information to guestinfo command qemu: refactor 'qemuAgentGetInterfaces' qemu: add guest interface information in 'qemuDomainGetGuestInfo' NEWS: add guest interface information in 'virDomainGetGuestInfo' NEWS.rst | 5 ++ docs/manpages/virsh.rst | 12 ++++- 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 | 90 +++++++++++++++++++++++++++++++- tests/qemuagenttest.c | 2 +- tools/virsh-domain.c | 6 +++ 9 files changed, 131 insertions(+), 9 deletions(-) -- 2.31.1

2 8

[PATCH] syntax-check: Fix regex for sc_require_attribute_cleanup_initialization:
by Peter Krempa 05 Nov '21

05 Nov '21

When I was cleaning up the regex after we removed most of our custom autofree helpers I've forgot to delete one closing brace, thus the regex was not matching anything. Fixes: 65f702020e8 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- build-aux/syntax-check.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index 2a6e2f86a1..4d396699c9 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -910,7 +910,7 @@ sc_prohibit_backslash_alignment: # Rule to ensure that variables declared using a cleanup macro are # always initialized. sc_require_attribute_cleanup_initialization: - @prohibit='((g_auto(ptr|free|slist)?)|VIR_AUTOCLOSE)) *[^=]+;' \ + @prohibit='((g_auto(ptr|free|slist)?)|VIR_AUTOCLOSE) *[^=]+;' \ in_vc_files='\.[chx]$$' \ halt='variable declared with a cleanup macro must be initialized' \ $(_sc_search_regexp) -- 2.31.1

2 1

[libvirt PATCH] ci: disable CCACHE for the coverity job
by Ján Tomko 05 Nov '21

05 Nov '21

Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- Untested, as I obviously do not have access to the COVERITY_SCAN_TOKEN. .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d486faca58..3e06d16fb1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -116,6 +116,8 @@ coverity: needs: - x86_64-centos-8-container stage: builds + before_script: + export CCACHE_DISABLE=1 script: - curl https://scan.coverity.com/download/linux64 --form project=$COVERITY_SCAN_PROJECT_NAME --form token=$COVERITY_SCAN_TOKEN -o /tmp/cov-analysis-linux64.tgz - tar xfz /tmp/cov-analysis-linux64.tgz -- 2.31.1

1 0

[PATCH 0/2] Allow tweaking TCG's tb-size
by Michal Privoznik 05 Nov '21

05 Nov '21

*** BLURB HERE *** Michal Prívozník (2): conf: Introduce TCG domain features qemu: Generate command line for tb-cache feature docs/formatdomain.rst | 11 +++ docs/schemas/domaincommon.rng | 15 +++- src/conf/domain_conf.c | 90 +++++++++++++++++++ src/conf/domain_conf.h | 7 ++ src/qemu/qemu_command.c | 14 ++- src/qemu/qemu_validate.c | 11 +++ ...efault-cpu-tcg-features.x86_64-latest.args | 40 +++++++++ .../x86_64-default-cpu-tcg-features.xml | 67 ++++++++++++++ tests/qemuxml2argvtest.c | 1 + ...default-cpu-tcg-features.x86_64-latest.xml | 1 + tests/qemuxml2xmltest.c | 1 + 11 files changed, 256 insertions(+), 2 deletions(-) create mode 100644 tests/qemuxml2argvdata/x86_64-default-cpu-tcg-features.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/x86_64-default-cpu-tcg-features.xml create mode 120000 tests/qemuxml2xmloutdata/x86_64-default-cpu-tcg-features.x86_64-latest.xml -- 2.32.0

4 12

[PATCH] qemuTPMEmulatorReconfigure: Fix two build issues
by Peter Krempa 05 Nov '21

05 Nov '21

1) 'activePcrBanksStr' is not initialized: ../../../libvirt/src/qemu/qemu_tpm.c: In function ‘qemuExtTPMStart’: /usr/include/glib-2.0/glib/glib-autocleanups.h:28:3: error: ‘activePcrBanksStr’ may be used uninitialized in this function [-Werror=maybe-uninitialized] 28 | g_free (*pp); | ^~~~~~~~~~~~ ../../../libvirt/src/qemu/qemu_tpm.c:613:22: note: ‘activePcrBanksStr’ was declared here 613 | g_autofree char *activePcrBanksStr; | ^~~~~~~~~~~~~~~~~ 2) 'pwdfile_fd' is unused: ../../../libvirt/src/qemu/qemu_tpm.c:615:19: error: unused variable 'pwdfile_fd' [-Werror,-Wunused-variable] VIR_AUTOCLOSE pwdfile_fd = -1; Fixes: a5bbe1a8b63 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- Pushed. src/qemu/qemu_tpm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index 25890a8589..7d05394356 100644 --- a/src/qemu/qemu_tpm.c +++ b/src/qemu/qemu_tpm.c @@ -610,9 +610,8 @@ qemuTPMEmulatorReconfigure(const char *storagepath, { g_autoptr(virCommand) cmd = NULL; int exitstatus; - g_autofree char *activePcrBanksStr; + g_autofree char *activePcrBanksStr = NULL; g_autofree char *swtpm_setup = virTPMGetSwtpmSetup(); - VIR_AUTOCLOSE pwdfile_fd = -1; if (!swtpm_setup) return -1; -- 2.31.1

1 0

[PATCH v3 0/2] qemu: tpm: Activate PCR banks of a TPM 2.0 before VM start
by Stefan Berger 05 Nov '21

05 Nov '21

This series of patches adds support for activating the PCR banks of a TPM 2.0 before starting a VM. Stefan Stefan Berger (2): qemu: Move code to add encryption options for swtpm_setup into function qemu: tpm: Extend TPM domain XML with PCR banks to activate docs/formatdomain.rst | 12 ++ docs/schemas/domaincommon.rng | 30 ++++ src/conf/domain_conf.c | 50 +++++- src/conf/domain_conf.h | 11 ++ src/libvirt_private.syms | 2 + src/qemu/qemu_tpm.c | 152 ++++++++++++++++-- src/util/virtpm.c | 1 + src/util/virtpm.h | 1 + tests/qemuxml2argvdata/tpm-emulator-tpm2.xml | 7 +- .../tpm-emulator-tpm2.x86_64-latest.xml | 7 +- 10 files changed, 252 insertions(+), 21 deletions(-) -- 2.31.1

2 4

[libvirt PATCH] qemu: Check return value of virJSONValueObjectAdd
by Jiri Denemark 05 Nov '21

05 Nov '21

The return value was not properly checked in the code for input type evdev. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_command.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 45278c7108..483041f584 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4336,13 +4336,15 @@ qemuBuildInputEvdevProps(virDomainInputDef *dev) NULL) < 0) return NULL; - if (dev->source.grab == VIR_DOMAIN_INPUT_SOURCE_GRAB_ALL) - virJSONValueObjectAdd(props, "b:grab_all", true, NULL); + if (dev->source.grab == VIR_DOMAIN_INPUT_SOURCE_GRAB_ALL && + virJSONValueObjectAdd(props, "b:grab_all", true, NULL) < 0) + return NULL; - if (dev->source.grabToggle != VIR_DOMAIN_INPUT_SOURCE_GRAB_TOGGLE_DEFAULT) + if (dev->source.grabToggle != VIR_DOMAIN_INPUT_SOURCE_GRAB_TOGGLE_DEFAULT && virJSONValueObjectAdd(props, "s:grab-toggle", virDomainInputSourceGrabToggleTypeToString(dev->source.grabToggle), - NULL); + NULL) < 0) + return NULL; return g_steal_pointer(&props); } -- 2.33.1

2 1

[libvirt PATCH] qemu: Do not pass negative ncpus to virCapabilitiesClearHostNUMACellCPUTopology
by Jiri Denemark 05 Nov '21

05 Nov '21

It won't cause any harm as cpus is NULL when we pass a negative ncpus, but doing so when the function expects unsigned value is not right. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/conf/capabilities.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index a3e68741a9..cea4803fc8 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -1954,6 +1954,7 @@ virCapabilitiesHostNUMAInitReal(virCapsHostNUMA *caps) if (ncpus == -2) continue; + ncpus = 0; goto cleanup; } -- 2.33.1

2 1

[libvirt PATCH] util: Avoid null pointer dereference when setting QoS on OVS
by Jiri Denemark 05 Nov '21

05 Nov '21

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/util/virnetdevopenvswitch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c index 250726a633..5dab545037 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -759,7 +759,7 @@ virNetDevOpenvswitchInterfaceSetQos(const char *ifname, } virCommandAddArgList(cmd, vmid_ex_id, ifname_ex_id, NULL); if (virCommandRun(cmd, NULL) < 0) { - if (*queue_uuid) { + if (queue_uuid && *queue_uuid) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to set queue configuration on port %s"), ifname); } else { -- 2.33.1

2 1

[PATCH v3 0/3] qapi & doc: deprecate drive-backup
by Vladimir Sementsov-Ogievskiy 04 Nov '21

04 Nov '21

Hi all! See 03 commit message for details. 01-02 are preparation docs update. v3: wording fix-ups and improvements suggested by Kashyap v2: add a lot of documentation changes v1 was "[PATCH] qapi: deprecate drive-backup" Note, that this series lack deprecating drive-backup transaction action. That's done by Markus in 05 patch of "[PATCH v4 0/5] qapi: Add feature flags to enum members" So, the most effective would be to take these series together. Vladimir Sementsov-Ogievskiy (3): docs/block-replication: use blockdev-backup docs/interop/bitmaps: use blockdev-backup qapi: deprecate drive-backup docs/about/deprecated.rst | 11 + docs/block-replication.txt | 4 +- docs/interop/bitmaps.rst | 285 +++++++++++++++++++------ docs/interop/live-block-operations.rst | 47 ++-- qapi/block-core.json | 5 +- 5 files changed, 263 insertions(+), 89 deletions(-) -- 2.31.1

3 5

[libvirt PATCH 0/3] daemon: allow setting minimum SSF level
by Ján Tomko 04 Nov '21

04 Nov '21

https://bugzilla.redhat.com/show_bug.cgi?id=1431589 Ján Tomko (3): remote: warn on low SSF daemon: virNetSASLContext: store tcpMinSSF daemon: add tcp_min_ssf option src/libvirt_sasl.syms | 1 + src/remote/libvirtd.aug.in | 1 + src/remote/libvirtd.conf.in | 8 ++++++++ src/remote/remote_daemon.c | 7 ++++++- src/remote/remote_daemon_config.c | 15 +++++++++++++++ src/remote/remote_daemon_config.h | 1 + src/remote/remote_daemon_dispatch.c | 2 +- src/remote/remote_driver.c | 5 +++++ src/remote/remote_driver.h | 2 ++ src/remote/test_libvirtd.aug.in | 1 + src/rpc/virnetsaslcontext.c | 11 ++++++++++- src/rpc/virnetsaslcontext.h | 5 ++++- 12 files changed, 55 insertions(+), 4 deletions(-) -- 2.31.1

2 4

[PATCH v2 0/2] qemu: tpm: Activate PCR banks of a TPM 2.0 before VM start
by Stefan Berger 04 Nov '21

04 Nov '21

This series of patches adds support for activating the PCR banks of a TPM 2.0 before starting a VM. Stefan Stefan Berger (2): qemu: Move code to add encryption options for swtpm_setup into function qemu: tpm: Extend TPM domain XML with PCR banks to activate docs/formatdomain.rst | 12 +- docs/schemas/basictypes.rng | 6 + docs/schemas/domaincommon.rng | 5 + src/conf/domain_conf.c | 21 ++- src/conf/domain_conf.h | 1 + src/qemu/qemu_tpm.c | 135 +++++++++++++++--- src/util/virtpm.c | 1 + src/util/virtpm.h | 1 + tests/qemuxml2argvdata/tpm-emulator-tpm2.xml | 2 +- .../tpm-emulator-tpm2.x86_64-latest.xml | 2 +- 10 files changed, 165 insertions(+), 21 deletions(-) -- 2.31.1

4 11

[PATCH v2 0/1] virt-aa-helper: Remove corrupted profile
by Ioanna Alifieraki 04 Nov '21

04 Nov '21

This is a v2 of the patches sent previously and hopefully makes things simpler. (previous patches subject: [PATCH 0/4] virt-aa-helper: Add new option to remove corrupted). This patch aims to address the bug reported in [1] and [2]. Bug description : Some times libvirt fails to start a vm with the following error : libvirt: error : unable to set AppArmor profile 'libvirt-b05b297f-952f-42d6-b04e-f9a13767db54' for '/usr/bin/kvm-spice': No such file or directory This happens because file /etc/apparmor.d/libvirt/libvirt-<vm-uuid> has 0 size. During the vm start-up virt-aa-helper tries to load the profile and because it is 0 it fails. When file /etc/apparmor.d/libvirt/libvirt-<vm-uuid> is removed the vm can start without problems. To address this issue this patch checks if the profile has 0 size and if this is the case it removes it. Changes with v1: I incorporated the feedback provided on v1 so the patches change as follows : Patches 1, 2 and 4 from v1 are dropped. The first patch is dropped because according to feedback provided remove_profile is not necessary and in the new version we unlink the profile directly in main(). In addition we skip calling create_profile twice by adding a boolean variable 'purged' if the profile was purged and creation occurs later on in main(). The second patch, which was adding a the option (-P) to remove the profile is dropped because currently this action happens only internally and there is no use case needed to make it available to the users of virt-aa-helper. The third patch which is the actual fix stays but modified. The forth patch which was adding a test to virt-aa-helper-test was the hardest to drop. Although, I'd like to have a test for this case, there is no apparent to make a test for this without having any side effects. The tests in virt-aa-helper-test are run with the --dryrun option and therefore no action should really happen. To test this fix, we need to create a corrupted profile and then remove it violating the dryrun. [1] https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1927519 [2] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=890084 Ioanna Alifieraki (1): virt-aa-helper: Purge profile if corrupted src/security/virt-aa-helper.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) -- 2.17.1

3 4

[libvirt PATCH] docs: fix documentation for nodedev-start
by Jonathon Jongsma 03 Nov '21

03 Nov '21

Presumably the result of a copy/paste mistake, the the argument for the `nodedev-start` command was described as a 'network' rather than a 'device'. Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- pushed as trivial docs/manpages/virsh.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst index bcc9c80320..ac564d94f2 100644 --- a/docs/manpages/virsh.rst +++ b/docs/manpages/virsh.rst @@ -5083,7 +5083,7 @@ nodedev-start :: - nodedev-start network + nodedev-start device Start a (previously defined) inactive device. -- 2.31.1

1 0

[PATCH 0/4] qemu: Report stats for backing images
by Peter Krempa 03 Nov '21

03 Nov '21

Management tools such as oVirt need to monitor the 'allocation' of the backup job scratch file or disk copy target. Add the stats to the bulk stats. The stats can be queried by: $ virsh domstats $VM --block --backing Patch 1 fixes a bug in the status XML formatter where we'd not store the private data for the scratch file of a backup job, which resulted in a failure of getting the stats after restart of libvirtd. Peter Krempa (4): virDomainBackupDefFormat: Propagate private data callbacks qemustatusxml2xmldata: backup-pull: Add private data for scratch image qemuMonitorJSONQueryBlockstats: query stats for helper images qemuDomainGetStatsBlockExportDisk: Report stats also for helper images src/conf/backup_conf.c | 10 +-- src/conf/backup_conf.h | 3 +- src/qemu/qemu_backup.c | 4 +- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_driver.c | 61 +++++++++++++++++++ src/qemu/qemu_monitor.c | 4 +- src/qemu/qemu_monitor_json.c | 20 +++--- src/qemu/qemu_monitor_json.h | 3 +- tests/genericxml2xmltest.c | 2 +- .../qemustatusxml2xmldata/backup-pull-in.xml | 9 ++- 10 files changed, 95 insertions(+), 23 deletions(-) -- 2.31.1

3 8

[PATCH] meson: Fix rst2html5 detection
by Andrea Bolognani 03 Nov '21

03 Nov '21

The first part of the version string contains the name that the rst2html5 command was invoked as, which can differ based on the operating system: on FreeBSD, for example, it's rst2html5.py instead of just rst2html5. Fix our detection logic so that it works regardless of the specific name used for the docutils-provided rst2html5 command. Fixes: cf0c9e186565e886a0016b2b269088b3eed3d26d Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as a CI fix. meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 3a9066b9fe..6f5d480c1e 100644 --- a/meson.build +++ b/meson.build @@ -836,8 +836,8 @@ endforeach # Use this knowledge to detect the version that we know doesn't work # for building libvirt and reject it rst2html5_version = run_command(rst2html5_prog, '--version') -rst2html5_version = rst2html5_version.stdout().split('(') -if rst2html5_version[0] != 'rst2html5 ' +rst2html5_version = rst2html5_version.stdout().split(' ') +if rst2html5_version[1] != '(Docutils' error('Please uninstall the rst2html5 package and install the docutils package') endif -- 2.31.1

1 0

[libvirt PATCH 0/2] meson: Detect and reject invalid rst2html5 command
by Andrea Bolognani 03 Nov '21

03 Nov '21

Previous attempt at solving this issue: https://listman.redhat.com/archives/libvir-list/2021-June/msg00097.html The solution presented here should be way more future-proof, though there's of course always the risk that the format used to report version information will change in a way that causes our detection to trip over... Andrea Bolognani (2): meson: Use 'rst2html5' instead of 'rst2html' everywhere meson: Detect and reject invalid rst2html5 command docs/go/meson.build | 2 +- docs/kbase/meson.build | 2 +- docs/manpages/meson.build | 2 +- docs/meson.build | 8 ++++---- meson.build | 30 +++++++++++++++++++++++++++++- 5 files changed, 36 insertions(+), 8 deletions(-) -- 2.31.1

3 9

[libvirt PATCH 0/2] meson: Enable ZFS storage backend even more often
by Andrea Bolognani 03 Nov '21

03 Nov '21

And drop some useless code. Andrea Bolognani (2): meson: Enable ZFS storage backend even more often meson: Stop looking up ZFS programs at build time meson.build | 16 ---------------- src/storage/storage_backend_zfs.c | 3 +++ 2 files changed, 3 insertions(+), 16 deletions(-) -- 2.31.1

2 3

[libvirt PATCH 0/7] qemu: retire QEMU_CAPS_SPICE_UNIX
by Ján Tomko 03 Nov '21

03 Nov '21

One less thing to probe via query-command-line-options Ján Tomko (7): tests: remove disks from spice tests tests: qemuxml2xmltest: move graphics-spice-timeout tests: qemuxml2xml: use latest caps for spice tests tests: qemuxml2argv: use latest caps for spice tests tests: convert name-escape to use real caps qemu: always assume QEMU_CAPS_SPICE_UNIX qemu: retire QEMU_CAPS_SPICE_UNIX src/qemu/qemu_capabilities.c | 3 +- src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_validate.c | 10 +-- .../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.riscv32.xml | 1 - .../caps_4.0.0.riscv64.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.riscv64.xml | 1 - .../caps_5.0.0.x86_64.xml | 1 - .../qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 - .../caps_5.1.0.x86_64.xml | 1 - .../caps_5.2.0.riscv64.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 - .../caps_6.2.0.aarch64.xml | 1 - .../caps_6.2.0.x86_64.xml | 1 - .../graphics-spice-agent-file-xfer.args | 34 --------- ...s-spice-agent-file-xfer.x86_64-latest.args | 35 +++++++++ .../graphics-spice-agent-file-xfer.xml | 5 -- .../graphics-spice-agentmouse.args | 36 --------- ...aphics-spice-agentmouse.x86_64-latest.args | 37 +++++++++ .../graphics-spice-agentmouse.xml | 5 -- ...-spice-auto-socket-cfg.x86_64-latest.args} | 17 +++-- ...hics-spice-auto-socket.x86_64-latest.args} | 17 +++-- .../graphics-spice-compression.args | 34 --------- ...phics-spice-compression.x86_64-latest.args | 35 +++++++++ .../graphics-spice-compression.xml | 5 -- .../graphics-spice-egl-headless.args | 34 --------- ...hics-spice-egl-headless.x86_64-latest.args | 35 +++++++++ .../graphics-spice-egl-headless.xml | 5 -- .../graphics-spice-invalid-egl-headless.xml | 5 -- .../graphics-spice-no-args.args | 31 -------- .../graphics-spice-no-args.x86_64-latest.args | 34 +++++++++ .../graphics-spice-qxl-vga.args | 34 --------- .../graphics-spice-qxl-vga.x86_64-latest.args | 35 +++++++++ .../graphics-spice-qxl-vga.xml | 5 -- .../qemuxml2argvdata/graphics-spice-sasl.args | 34 --------- .../graphics-spice-sasl.x86_64-latest.args | 35 +++++++++ .../qemuxml2argvdata/graphics-spice-sasl.xml | 6 -- .../graphics-spice-socket.args | 30 -------- .../graphics-spice-socket.x86_64-latest.args | 33 ++++++++ .../graphics-spice-timeout.args | 40 ---------- .../graphics-spice-timeout.x86_64-latest.args | 38 ++++++++++ .../graphics-spice-timeout.xml | 13 ---- .../graphics-spice-usb-redir.args | 38 ---------- ...raphics-spice-usb-redir.x86_64-latest.args | 41 ++++++++++ tests/qemuxml2argvdata/graphics-spice.args | 34 --------- .../graphics-spice.x86_64-latest.args | 35 +++++++++ tests/qemuxml2argvdata/graphics-spice.xml | 5 -- ...pe.args => name-escape.x86_64-2.11.0.args} | 7 +- .../name-escape.x86_64-latest.args | 50 ++++++++++++ tests/qemuxml2argvtest.c | 76 ++++--------------- ...s-spice-auto-socket-cfg.x86_64-latest.xml} | 5 +- ...phics-spice-auto-socket.x86_64-latest.xml} | 5 +- ...phics-spice-compression.x86_64-latest.xml} | 11 +-- ...hics-spice-egl-headless.x86_64-latest.xml} | 11 +-- ... graphics-spice-qxl-vga.x86_64-latest.xml} | 11 +-- ...> graphics-spice-socket.x86_64-latest.xml} | 5 +- ... graphics-spice-timeout.x86_64-latest.xml} | 15 +--- ...e.xml => graphics-spice.x86_64-latest.xml} | 11 +-- tests/qemuxml2xmltest.c | 35 ++------- 67 files changed, 522 insertions(+), 614 deletions(-) delete mode 100644 tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args create mode 100644 tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/graphics-spice-agentmouse.args create mode 100644 tests/qemuxml2argvdata/graphics-spice-agentmouse.x86_64-latest.args rename tests/qemuxml2argvdata/{graphics-spice-auto-socket-cfg.args => graphics-spice-auto-socket-cfg.x86_64-latest.args} (50%) rename tests/qemuxml2argvdata/{graphics-spice-auto-socket.args => graphics-spice-auto-socket.x86_64-latest.args} (50%) delete mode 100644 tests/qemuxml2argvdata/graphics-spice-compression.args create mode 100644 tests/qemuxml2argvdata/graphics-spice-compression.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/graphics-spice-egl-headless.args create mode 100644 tests/qemuxml2argvdata/graphics-spice-egl-headless.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/graphics-spice-no-args.args create mode 100644 tests/qemuxml2argvdata/graphics-spice-no-args.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/graphics-spice-qxl-vga.args create mode 100644 tests/qemuxml2argvdata/graphics-spice-qxl-vga.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/graphics-spice-sasl.args create mode 100644 tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/graphics-spice-socket.args create mode 100644 tests/qemuxml2argvdata/graphics-spice-socket.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/graphics-spice-timeout.args create mode 100644 tests/qemuxml2argvdata/graphics-spice-timeout.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/graphics-spice-usb-redir.args create mode 100644 tests/qemuxml2argvdata/graphics-spice-usb-redir.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/graphics-spice.args create mode 100644 tests/qemuxml2argvdata/graphics-spice.x86_64-latest.args rename tests/qemuxml2argvdata/{name-escape.args => name-escape.x86_64-2.11.0.args} (90%) create mode 100644 tests/qemuxml2argvdata/name-escape.x86_64-latest.args rename tests/qemuxml2xmloutdata/{graphics-spice-auto-socket-cfg.xml => graphics-spice-auto-socket-cfg.x86_64-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{graphics-spice-auto-socket.xml => graphics-spice-auto-socket.x86_64-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{graphics-spice-compression.xml => graphics-spice-compression.x86_64-latest.xml} (86%) rename tests/qemuxml2xmloutdata/{graphics-spice-egl-headless.xml => graphics-spice-egl-headless.x86_64-latest.xml} (83%) rename tests/qemuxml2xmloutdata/{graphics-spice-qxl-vga.xml => graphics-spice-qxl-vga.x86_64-latest.xml} (85%) rename tests/qemuxml2xmloutdata/{graphics-spice-socket.xml => graphics-spice-socket.x86_64-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{graphics-spice-timeout.xml => graphics-spice-timeout.x86_64-latest.xml} (82%) rename tests/qemuxml2xmloutdata/{graphics-spice.xml => graphics-spice.x86_64-latest.xml} (87%) -- 2.31.1

2 8

[PATCH 0/5] Various cleanups
by Michal Privoznik 03 Nov '21

03 Nov '21

I've been playing with cocci lately and noticed it had troubles parsing some files. When I looked into them I had trouble parsing them as well. Michal Prívozník (5): node_device_conf: Bring variables into loops virpcivpd: Bring variables into loops virpcivpdtest: Declare variables at multiple lines lib: Use G_N_ELEMENTS instead of sizeof()/sizeof() scripts: Properly declare g_auto() stub for cocci scripts/cocci-macro-file.h | 2 +- src/conf/node_device_conf.c | 46 +++++++++++++--------------------- src/libxl/libxl_capabilities.c | 2 +- src/util/virpcivpd.c | 19 +++----------- tests/virpcimock.c | 2 +- tests/virpcivpdtest.c | 29 ++++++++++----------- 6 files changed, 39 insertions(+), 61 deletions(-) -- 2.32.0

2 6

[libvirt PATCH] tests: qemuxml2argv: remove validation warning
by Ján Tomko 03 Nov '21

03 Nov '21

This warning is emitted for pretty much every test case, making it hard to see what the actual error is. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- tests/qemuxml2argvtest.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 804f01fb01..f7ae792371 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -527,8 +527,6 @@ testCompareXMLToArgvValidateSchemaCommand(GStrv args, } if (*curargs != '{') { - VIR_TEST_DEBUG("skipping validation of '%s': argument is not JSON", - command->name); arg++; break; } -- 2.31.1

2 1

[PATCH] virttools-planet: update location of Cornelia's blog
by Cornelia Huck 02 Nov '21

02 Nov '21

Signed-off-by: Cornelia Huck <cohuck(a)redhat.com> --- virt-tools/config.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/virt-tools/config.ini b/virt-tools/config.ini index f56495a26fd8..89b4e5ae6f91 100644 --- a/virt-tools/config.ini +++ b/virt-tools/config.ini @@ -162,7 +162,7 @@ name = Cédric Bosdonnat [http://www.studiopixl.com/feeds/rss] name = Nathan Gauër -[https://virtualpenguins.blogspot.com/feeds/posts/default] +[https://people.redhat.com/~cohuck/feed.xml] name = Cornelia Huck [http://www.otubo.net/feeds/posts/default/-/virt/?alt=rss] -- 2.31.1

2 2

[virttools-planet PATCH] Fix format in config.ini
by Tim Wiederhake 02 Nov '21

02 Nov '21

Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com> --- virt-tools/config.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/virt-tools/config.ini b/virt-tools/config.ini index f56495a..f2ae9a4 100644 --- a/virt-tools/config.ini +++ b/virt-tools/config.ini @@ -75,8 +75,8 @@ encoding = utf-8 [https://rwmj.wordpress.com/tag/virt-tools/feed/] name = Richard Jones face = rjones.jpeg -facewidth: 48 -faceheight: 48 +facewidth = 48 +faceheight = 48 [https://www.berrange.com/topics/virt-tools/feed/] name = Daniel Berrange -- 2.31.1

1 1

[PATCH] lib: Introduce and use g_autoptr() for virInterfaceDef
by Michal Privoznik 02 Nov '21

02 Nov '21

There are a lot of places where we call virInterfaceDefFree() explicitly. We can define autoptr cleanup macro and annotate declarations with g_autoptr() and remove plenty of those explicit free calls. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/interface_conf.c | 32 ++++++++--------- src/conf/interface_conf.h | 1 + src/conf/virinterfaceobj.c | 3 +- src/interface/interface_backend_netcf.c | 47 ++++++++----------------- src/interface/interface_backend_udev.c | 29 +++++---------- src/test/test_driver.c | 17 ++++----- tests/interfacexml2xmltest.c | 17 ++++----- 7 files changed, 53 insertions(+), 93 deletions(-) diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c index b45dc37379..f2b3804bec 100644 --- a/src/conf/interface_conf.c +++ b/src/conf/interface_conf.c @@ -679,7 +679,7 @@ static virInterfaceDef * virInterfaceDefParseXML(xmlXPathContextPtr ctxt, int parentIfType) { - virInterfaceDef *def; + g_autoptr(virInterfaceDef) def = NULL; int type; char *tmp; VIR_XPATH_NODE_AUTORESTORE(ctxt) @@ -716,28 +716,28 @@ virInterfaceDefParseXML(xmlXPathContextPtr ctxt, virReportError(VIR_ERR_XML_ERROR, _("interface has unsupported type '%s'"), virInterfaceTypeToString(type)); - goto error; + return NULL; } def->type = type; if (virInterfaceDefParseName(def, ctxt) < 0) - goto error; + return NULL; if (parentIfType == VIR_INTERFACE_TYPE_LAST) { /* only recognize these in toplevel bond interfaces */ if (virInterfaceDefParseStartMode(def, ctxt) < 0) - goto error; + return NULL; if (virInterfaceDefParseMtu(def, ctxt) < 0) - goto error; + return NULL; if (virInterfaceDefParseIfAdressing(def, ctxt) < 0) - goto error; + return NULL; } if (type != VIR_INTERFACE_TYPE_BRIDGE) { /* link status makes no sense for a bridge */ lnk = virXPathNode("./link", ctxt); if (lnk && virInterfaceLinkParseXML(lnk, &def->lnk) < 0) - goto error; + return NULL; } switch (type) { @@ -751,11 +751,11 @@ virInterfaceDefParseXML(xmlXPathContextPtr ctxt, if (!(bridge = virXPathNode("./bridge[1]", ctxt))) { virReportError(VIR_ERR_XML_ERROR, "%s", _("bridge interface misses the bridge element")); - goto error; + return NULL; } ctxt->node = bridge; if (virInterfaceDefParseBridge(def, ctxt) < 0) - goto error; + return NULL; break; } case VIR_INTERFACE_TYPE_BOND: { @@ -764,11 +764,11 @@ virInterfaceDefParseXML(xmlXPathContextPtr ctxt, if (!(bond = virXPathNode("./bond[1]", ctxt))) { virReportError(VIR_ERR_XML_ERROR, "%s", _("bond interface misses the bond element")); - goto error; + return NULL; } ctxt->node = bond; if (virInterfaceDefParseBond(def, ctxt) < 0) - goto error; + return NULL; break; } case VIR_INTERFACE_TYPE_VLAN: { @@ -777,21 +777,17 @@ virInterfaceDefParseXML(xmlXPathContextPtr ctxt, if (!(vlan = virXPathNode("./vlan[1]", ctxt))) { virReportError(VIR_ERR_XML_ERROR, "%s", _("vlan interface misses the vlan element")); - goto error; + return NULL; } ctxt->node = vlan; if (virInterfaceDefParseVlan(def, ctxt) < 0) - goto error; + return NULL; break; } } - return def; - - error: - virInterfaceDefFree(def); - return NULL; + return g_steal_pointer(&def); } diff --git a/src/conf/interface_conf.h b/src/conf/interface_conf.h index ea92e0fb31..510d83b2bf 100644 --- a/src/conf/interface_conf.h +++ b/src/conf/interface_conf.h @@ -153,6 +153,7 @@ struct _virInterfaceDef { void virInterfaceDefFree(virInterfaceDef *def); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virInterfaceDef, virInterfaceDefFree); virInterfaceDef * virInterfaceDefParseString(const char *xmlStr, diff --git a/src/conf/virinterfaceobj.c b/src/conf/virinterfaceobj.c index 9439bb3d0b..ceb3ae7595 100644 --- a/src/conf/virinterfaceobj.c +++ b/src/conf/virinterfaceobj.c @@ -362,7 +362,7 @@ virInterfaceObjListCloneCb(void *payload, virInterfaceObj *srcObj = payload; struct _virInterfaceObjListCloneData *data = opaque; char *xml = NULL; - virInterfaceDef *backup = NULL; + g_autoptr(virInterfaceDef) backup = NULL; virInterfaceObj *obj; if (data->error) @@ -387,7 +387,6 @@ virInterfaceObjListCloneCb(void *payload, error: data->error = true; VIR_FREE(xml); - virInterfaceDefFree(backup); virObjectUnlock(srcObj); return 0; } diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interface_backend_netcf.c index 78fd4f9bc7..146a703953 100644 --- a/src/interface/interface_backend_netcf.c +++ b/src/interface/interface_backend_netcf.c @@ -387,7 +387,7 @@ static int netcfConnectNumOfInterfacesImpl(virConnectPtr conn, } for (i = 0; i < count; i++) { - virInterfaceDef *def; + g_autoptr(virInterfaceDef) def = NULL; struct netcf_if *iface; iface = ncf_lookup_by_name(driver->netcf, names[i]); @@ -416,11 +416,8 @@ static int netcfConnectNumOfInterfacesImpl(virConnectPtr conn, } ncf_if_free(iface); - if (!filter(conn, def)) { - virInterfaceDefFree(def); + if (!filter(conn, def)) continue; - } - virInterfaceDefFree(def); want++; } @@ -481,7 +478,7 @@ static int netcfConnectListInterfacesImpl(virConnectPtr conn, } for (i = 0; i < count && want < nnames; i++) { - virInterfaceDef *def; + g_autoptr(virInterfaceDef) def = NULL; struct netcf_if *iface; iface = ncf_lookup_by_name(driver->netcf, allnames[i]); @@ -510,11 +507,8 @@ static int netcfConnectListInterfacesImpl(virConnectPtr conn, } ncf_if_free(iface); - if (!filter(conn, def)) { - virInterfaceDefFree(def); + if (!filter(conn, def)) continue; - } - virInterfaceDefFree(def); names[want++] = g_steal_pointer(&allnames[i]); } @@ -665,7 +659,7 @@ netcfConnectListAllInterfaces(virConnectPtr conn, tmp_iface_objs = g_new0(virInterfacePtr, count + 1); for (i = 0; i < count; i++) { - virInterfaceDef *def; + g_autoptr(virInterfaceDef) def = NULL; iface = ncf_lookup_by_name(driver->netcf, names[i]); if (!iface) { @@ -693,20 +687,17 @@ netcfConnectListAllInterfaces(virConnectPtr conn, if (!virConnectListAllInterfacesCheckACL(conn, def)) { ncf_if_free(iface); iface = NULL; - virInterfaceDefFree(def); continue; } if (ifaces) { - if (!(iface_obj = virGetInterface(conn, def->name, def->mac))) { - virInterfaceDefFree(def); + if (!(iface_obj = virGetInterface(conn, def->name, def->mac))) goto cleanup; - } + tmp_iface_objs[niface_objs] = iface_obj; } niface_objs++; - virInterfaceDefFree(def); ncf_if_free(iface); iface = NULL; } @@ -743,7 +734,7 @@ static virInterfacePtr netcfInterfaceLookupByName(virConnectPtr conn, { struct netcf_if *iface; virInterfacePtr ret = NULL; - virInterfaceDef *def = NULL; + g_autoptr(virInterfaceDef) def = NULL; virObjectLock(driver); iface = ncf_lookup_by_name(driver->netcf, name); @@ -772,7 +763,6 @@ static virInterfacePtr netcfInterfaceLookupByName(virConnectPtr conn, cleanup: ncf_if_free(iface); - virInterfaceDefFree(def); virObjectUnlock(driver); return ret; } @@ -783,7 +773,7 @@ static virInterfacePtr netcfInterfaceLookupByMACString(virConnectPtr conn, struct netcf_if *iface; int niface; virInterfacePtr ret = NULL; - virInterfaceDef *def = NULL; + g_autoptr(virInterfaceDef) def = NULL; virObjectLock(driver); niface = ncf_lookup_by_mac_string(driver->netcf, macstr, 1, &iface); @@ -820,7 +810,6 @@ static virInterfacePtr netcfInterfaceLookupByMACString(virConnectPtr conn, cleanup: ncf_if_free(iface); - virInterfaceDefFree(def); virObjectUnlock(driver); return ret; } @@ -830,7 +819,7 @@ static char *netcfInterfaceGetXMLDesc(virInterfacePtr ifinfo, { struct netcf_if *iface = NULL; char *xmlstr = NULL; - virInterfaceDef *ifacedef = NULL; + g_autoptr(virInterfaceDef) ifacedef = NULL; char *ret = NULL; bool active; @@ -880,7 +869,6 @@ static char *netcfInterfaceGetXMLDesc(virInterfacePtr ifinfo, cleanup: ncf_if_free(iface); VIR_FREE(xmlstr); - virInterfaceDefFree(ifacedef); virObjectUnlock(driver); return ret; } @@ -891,7 +879,7 @@ static virInterfacePtr netcfInterfaceDefineXML(virConnectPtr conn, { struct netcf_if *iface = NULL; char *xmlstr = NULL; - virInterfaceDef *ifacedef = NULL; + g_autoptr(virInterfaceDef) ifacedef = NULL; virInterfacePtr ret = NULL; virCheckFlags(VIR_INTERFACE_DEFINE_VALIDATE, NULL); @@ -929,7 +917,6 @@ static virInterfacePtr netcfInterfaceDefineXML(virConnectPtr conn, cleanup: ncf_if_free(iface); VIR_FREE(xmlstr); - virInterfaceDefFree(ifacedef); virObjectUnlock(driver); return ret; } @@ -937,7 +924,7 @@ static virInterfacePtr netcfInterfaceDefineXML(virConnectPtr conn, static int netcfInterfaceUndefine(virInterfacePtr ifinfo) { struct netcf_if *iface = NULL; - virInterfaceDef *def = NULL; + g_autoptr(virInterfaceDef) def = NULL; int ret = -1; virObjectLock(driver); @@ -968,7 +955,6 @@ static int netcfInterfaceUndefine(virInterfacePtr ifinfo) cleanup: ncf_if_free(iface); - virInterfaceDefFree(def); virObjectUnlock(driver); return ret; } @@ -977,7 +963,7 @@ static int netcfInterfaceCreate(virInterfacePtr ifinfo, unsigned int flags) { struct netcf_if *iface = NULL; - virInterfaceDef *def = NULL; + g_autoptr(virInterfaceDef) def = NULL; int ret = -1; bool active; @@ -1020,7 +1006,6 @@ static int netcfInterfaceCreate(virInterfacePtr ifinfo, cleanup: ncf_if_free(iface); - virInterfaceDefFree(def); virObjectUnlock(driver); return ret; } @@ -1029,7 +1014,7 @@ static int netcfInterfaceDestroy(virInterfacePtr ifinfo, unsigned int flags) { struct netcf_if *iface = NULL; - virInterfaceDef *def = NULL; + g_autoptr(virInterfaceDef) def = NULL; int ret = -1; bool active; @@ -1072,7 +1057,6 @@ static int netcfInterfaceDestroy(virInterfacePtr ifinfo, cleanup: ncf_if_free(iface); - virInterfaceDefFree(def); virObjectUnlock(driver); return ret; } @@ -1080,7 +1064,7 @@ static int netcfInterfaceDestroy(virInterfacePtr ifinfo, static int netcfInterfaceIsActive(virInterfacePtr ifinfo) { struct netcf_if *iface = NULL; - virInterfaceDef *def = NULL; + g_autoptr(virInterfaceDef) def = NULL; int ret = -1; bool active; @@ -1105,7 +1089,6 @@ static int netcfInterfaceIsActive(virInterfacePtr ifinfo) cleanup: ncf_if_free(iface); - virInterfaceDefFree(def); virObjectUnlock(driver); return ret; } diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c index 0217f16607..8c417714e5 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -165,7 +165,7 @@ udevNumOfInterfacesByStatus(virConnectPtr conn, virUdevStatus status, udev_list_entry_foreach(dev_entry, devices) { struct udev_device *dev; const char *path; - virInterfaceDef *def; + g_autoptr(virInterfaceDef) def = NULL; path = udev_list_entry_get_name(dev_entry); dev = udev_device_new_from_syspath(udev, path); @@ -174,7 +174,6 @@ udevNumOfInterfacesByStatus(virConnectPtr conn, virUdevStatus status, if (filter(conn, def)) count++; udev_device_unref(dev); - virInterfaceDefFree(def); } cleanup: @@ -218,7 +217,7 @@ udevListInterfacesByStatus(virConnectPtr conn, udev_list_entry_foreach(dev_entry, devices) { struct udev_device *dev; const char *path; - virInterfaceDef *def; + g_autoptr(virInterfaceDef) def = NULL; /* Ensure we won't exceed the size of our array */ if (count > names_len) @@ -233,7 +232,6 @@ udevListInterfacesByStatus(virConnectPtr conn, count++; } udev_device_unref(dev); - virInterfaceDefFree(def); } udev_enumerate_unref(enumerate); @@ -355,7 +353,7 @@ udevConnectListAllInterfaces(virConnectPtr conn, const char *path; const char *name; const char *macaddr; - virInterfaceDef *def; + g_autoptr(virInterfaceDef) def = NULL; path = udev_list_entry_get_name(dev_entry); dev = udev_device_new_from_syspath(udev, path); @@ -366,10 +364,8 @@ udevConnectListAllInterfaces(virConnectPtr conn, def = udevGetMinimalDefForDevice(dev); if (!virConnectListAllInterfacesCheckACL(conn, def)) { udev_device_unref(dev); - virInterfaceDefFree(def); continue; } - virInterfaceDefFree(def); /* Filter the results */ if (MATCH(VIR_CONNECT_LIST_INTERFACES_FILTERS_ACTIVE) && @@ -413,7 +409,7 @@ udevInterfaceLookupByName(virConnectPtr conn, const char *name) struct udev *udev = udev_ref(driver->udev); struct udev_device *dev; virInterfacePtr ret = NULL; - virInterfaceDef *def = NULL; + g_autoptr(virInterfaceDef) def = NULL; /* get a device reference based on the device name */ dev = udev_device_new_from_subsystem_sysname(udev, "net", name); @@ -435,7 +431,6 @@ udevInterfaceLookupByName(virConnectPtr conn, const char *name) cleanup: udev_unref(udev); - virInterfaceDefFree(def); return ret; } @@ -447,7 +442,7 @@ udevInterfaceLookupByMACString(virConnectPtr conn, const char *macstr) struct udev_enumerate *enumerate = NULL; struct udev_list_entry *dev_entry; struct udev_device *dev; - virInterfaceDef *def = NULL; + g_autoptr(virInterfaceDef) def = NULL; virInterfacePtr ret = NULL; enumerate = udevGetDevices(udev, VIR_UDEV_IFACE_ALL); @@ -499,7 +494,6 @@ udevInterfaceLookupByMACString(virConnectPtr conn, const char *macstr) if (enumerate) udev_enumerate_unref(enumerate); udev_unref(udev); - virInterfaceDefFree(def); return ret; } @@ -945,7 +939,7 @@ static virInterfaceDef * ATTRIBUTE_NONNULL(1) udevGetIfaceDef(struct udev *udev, const char *name) { struct udev_device *dev = NULL; - virInterfaceDef *ifacedef; + g_autoptr(virInterfaceDef) ifacedef = NULL; unsigned int mtu; const char *mtu_str; char *vlan_parent_dev = NULL; @@ -1038,13 +1032,11 @@ udevGetIfaceDef(struct udev *udev, const char *name) udev_device_unref(dev); - return ifacedef; + return g_steal_pointer(&ifacedef); error: udev_device_unref(dev); - virInterfaceDefFree(ifacedef); - return NULL; } @@ -1053,7 +1045,7 @@ udevInterfaceGetXMLDesc(virInterfacePtr ifinfo, unsigned int flags) { struct udev *udev = udev_ref(driver->udev); - virInterfaceDef *ifacedef; + g_autoptr(virInterfaceDef) ifacedef = NULL; char *xmlstr = NULL; virCheckFlags(VIR_INTERFACE_XML_INACTIVE, NULL); @@ -1071,8 +1063,6 @@ udevInterfaceGetXMLDesc(virInterfacePtr ifinfo, xmlstr = virInterfaceDefFormat(ifacedef); - virInterfaceDefFree(ifacedef); - cleanup: /* decrement our udev ptr */ udev_unref(udev); @@ -1085,7 +1075,7 @@ udevInterfaceIsActive(virInterfacePtr ifinfo) { struct udev *udev = udev_ref(driver->udev); struct udev_device *dev; - virInterfaceDef *def = NULL; + g_autoptr(virInterfaceDef) def = NULL; int status = -1; dev = udev_device_new_from_subsystem_sysname(udev, "net", @@ -1110,7 +1100,6 @@ udevInterfaceIsActive(virInterfacePtr ifinfo) cleanup: udev_unref(udev); - virInterfaceDefFree(def); return status; } diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 13d07e570e..ea474d55ac 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1096,7 +1096,7 @@ testParseNetworks(testDriver *privconn, return -1; for (i = 0; i < num; i++) { - virNetworkDef *def; + g_autoptr(virNetworkDef) def = NULL; xmlNodePtr node = testParseXMLDocFromFile(nodes[i], file, "network"); if (!node) return -1; @@ -1105,10 +1105,9 @@ testParseNetworks(testDriver *privconn, if (!def) return -1; - if (!(obj = virNetworkObjAssignDef(privconn->networks, def, 0))) { - virNetworkDefFree(def); + if (!(obj = virNetworkObjAssignDef(privconn->networks, def, 0))) return -1; - } + def = NULL; virNetworkObjSetActive(obj, true); virNetworkObjEndAPI(&obj); @@ -1133,7 +1132,7 @@ testParseInterfaces(testDriver *privconn, return -1; for (i = 0; i < num; i++) { - virInterfaceDef *def; + g_autoptr(virInterfaceDef) def = NULL; xmlNodePtr node = testParseXMLDocFromFile(nodes[i], file, "interface"); if (!node) @@ -1143,10 +1142,9 @@ testParseInterfaces(testDriver *privconn, if (!def) return -1; - if (!(obj = virInterfaceObjListAssignDef(privconn->ifaces, def))) { - virInterfaceDefFree(def); + if (!(obj = virInterfaceObjListAssignDef(privconn->ifaces, def))) return -1; - } + def = NULL; virInterfaceObjSetActive(obj, true); virInterfaceObjEndAPI(&obj); @@ -6195,7 +6193,7 @@ testInterfaceDefineXML(virConnectPtr conn, unsigned int flags) { testDriver *privconn = conn->privateData; - virInterfaceDef *def; + g_autoptr(virInterfaceDef) def = NULL; virInterfaceObj *obj = NULL; virInterfaceDef *objdef; virInterfacePtr ret = NULL; @@ -6214,7 +6212,6 @@ testInterfaceDefineXML(virConnectPtr conn, ret = virGetInterface(conn, objdef->name, objdef->mac); cleanup: - virInterfaceDefFree(def); virInterfaceObjEndAPI(&obj); virObjectUnlock(privconn); return ret; diff --git a/tests/interfacexml2xmltest.c b/tests/interfacexml2xmltest.c index 8235e701a9..15fab88107 100644 --- a/tests/interfacexml2xmltest.c +++ b/tests/interfacexml2xmltest.c @@ -18,28 +18,23 @@ testCompareXMLToXMLFiles(const char *xml) { g_autofree char *xmlData = NULL; g_autofree char *actual = NULL; - int ret = -1; - virInterfaceDef *dev = NULL; + g_autoptr(virInterfaceDef) dev = NULL; if (virTestLoadFile(xml, &xmlData) < 0) - goto fail; + return -1; if (!(dev = virInterfaceDefParseString(xmlData, 0))) - goto fail; + return -1; if (!(actual = virInterfaceDefFormat(dev))) - goto fail; + return -1; if (STRNEQ(xmlData, actual)) { virTestDifferenceFull(stderr, xmlData, xml, actual, NULL); - goto fail; + return -1; } - ret = 0; - - fail: - virInterfaceDefFree(dev); - return ret; + return 0; } static int -- 2.32.0

3 2

Re: Re: for rbd, how to use qmp directly to add dick
by Peter Krempa 02 Nov '21

02 Nov '21

On Tue, Nov 02, 2021 at 12:28:29 +0800, longguang.yue wrote: Firstly I'd like to ask you to follow mailing list posting netiquette and don't drop the mailing list on replies from the CC list. My reply would then not end up in the archives and the community would not be able to refer to it later. > i use kata on kubernetes. kata manages qemu via qmp directly. So this makes this out of scope for libvirt. A better forum to ask qemu-only related questions is the qemu mailing list. You can also make this a case for the Kata community to adopt usage of libvirt, as libvirt gives you a stable, secure and tested way to manage a qemu process. I think the Kata project would benefit from libvirt usage and could focus their efforts on adding features rather than reinventing what libvirt has for a long time already. > suppose secret object does not have keyid and iv, can i store base64-coded ceph-auth-ring into data? > could you tell me a complete command to add rbd disk ? no encrypt Note that would be insecure as anybody with access to the host could read the commandline and know your secret. Let's rephrase your question to: "How does libvirt securely pass passwords to qemu on the commandline?" Libvirt uses two kinds of secrets, which both are secure when used properly: (Note that libvirt nowadays uses direct JSON with -object as it's possible starting with qemu-6.0, thus my examples will use the new format) 1) Secret stored in a file: -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' libvirt uses this format to pass the master key, which is used to encrypt other secrets, but any other secret can be passed this way. It's a bit tedious, and that's the reason why libvirt passes only the master key using the file. When the access permissions are set properly this way is secure. 2) Inline (base64) encrypted secrets -object '{"qom-type":"secret","id":"libvirt-5-storage-auth-secret0","data":"9eao5F8qtkGt+seB1HYivWIxbtwU6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw==","format":"base64"}' This secret is encrypted using the master key (as you can see above). When inspecting the commandline an attacker can't tell the original value. Theoretically when using the monitor (QMP) it's also secure to pass a plaintext secret, but that's tricky if the monitor traffic is logged, so libvirt opted to use encrypted secrets also in that case. For any other use please refer to the qemu documentation: https://gitlab.com/qemu-project/qemu/-/blob/master/qapi/crypto.json#L386 The above direct link describes how to use the secret object. (I'm deliberately not showing the insecure usage so that it's not getting copied around).

2 1

[PATCH 0/9] Configurable policy for handling unstable interfaces
by Markus Armbruster 02 Nov '21

02 Nov '21

Option -compat lets you configure what to do when deprecated interfaces get used. This series extends this to unstable interfaces. Works the same way. Intended for testing users of the management interfaces. It is experimental. To make it possible, I replace the "x-" naming convention by special feature flag "unstable". See PATCH 1 for rationale. Based on my "[PATCH v4 0/5] qapi: Add feature flags to enum members" Based-on: Message-Id: <20211025042405.3762351-1-armbru(a)redhat.com> Markus Armbruster (9): qapi: New special feature flag "unstable" qapi: Mark unstable QMP parts with feature 'unstable' qapi: Eliminate QCO_NO_OPTIONS for a slight simplification qapi: Tools for sets of special feature flags in generated code qapi: Generalize struct member policy checking qapi: Generalize command policy checking qapi: Generalize enum member policy checking qapi: Factor out compat_policy_input_ok() qapi: Extend -compat to set policy for unstable interfaces docs/devel/qapi-code-gen.rst | 9 +- qapi/block-core.json | 123 +++++++++++++++++------- qapi/compat.json | 6 +- qapi/migration.json | 35 +++++-- qapi/misc.json | 6 +- qapi/qom.json | 11 ++- include/qapi/compat-policy.h | 7 ++ include/qapi/qmp/dispatch.h | 6 +- include/qapi/util.h | 8 +- include/qapi/visitor-impl.h | 6 +- include/qapi/visitor.h | 17 +++- monitor/misc.c | 7 +- qapi/qapi-forward-visitor.c | 16 +-- qapi/qapi-visit-core.c | 41 ++++---- qapi/qmp-dispatch.c | 57 ++++++++--- qapi/qmp-registry.c | 4 +- qapi/qobject-input-visitor.c | 22 ++--- qapi/qobject-output-visitor.c | 13 ++- storage-daemon/qemu-storage-daemon.c | 3 +- qapi/trace-events | 4 +- qemu-options.hx | 20 +++- scripts/qapi/commands.py | 12 +-- scripts/qapi/events.py | 10 +- scripts/qapi/gen.py | 13 +++ scripts/qapi/schema.py | 11 ++- scripts/qapi/types.py | 22 +++-- scripts/qapi/visit.py | 14 +-- tests/qapi-schema/qapi-schema-test.json | 7 +- tests/qapi-schema/qapi-schema-test.out | 5 + 29 files changed, 353 insertions(+), 162 deletions(-) -- 2.31.1

9 57

[PATCH 0/1] Fix the bug about virsh attach-interface from a
by jx8zjs 02 Nov '21

02 Nov '21

virsh: inherit qos from network definition when attaching an interface Resolved: https://bugzilla.redhat.com/show_bug.cgi?id=1826168 jx8zjs (1): virsh: inherit qos from network definition when attaching an interface tools/virsh-domain.c | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) -- 2.30.2.windows.1

3 3

[PATCH 1/2] tests: qemu: use domain type 'kvm' for kvm-features-off
by zhenwei pi 02 Nov '21

02 Nov '21

KVM features off test cases should be tested for a KVM domain, so keep align kvm-features-off test with kvm-features except KVM features on/off. Signed-off-by: zhenwei pi <pizhenwei(a)bytedance.com> --- tests/qemuxml2argvdata/kvm-features-off.args | 4 ++-- tests/qemuxml2argvdata/kvm-features-off.xml | 5 +++-- tests/qemuxml2xmloutdata/kvm-features-off.xml | 7 +++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/qemuxml2argvdata/kvm-features-off.args b/tests/qemuxml2argvdata/kvm-features-off.args index f6f13495e6..f7133bc0c3 100644 --- a/tests/qemuxml2argvdata/kvm-features-off.args +++ b/tests/qemuxml2argvdata/kvm-features-off.args @@ -11,7 +11,8 @@ QEMU_AUDIO_DRV=none \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,accel=kvm,usb=off,dump-guest-core=off \ +-cpu host \ -m 214 \ -realtime mlock=off \ -smp 6,sockets=6,cores=1,threads=1 \ @@ -25,5 +26,4 @@ QEMU_AUDIO_DRV=none \ -no-shutdown \ -boot strict=on \ -usb \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/kvm-features-off.xml b/tests/qemuxml2argvdata/kvm-features-off.xml index d63a573239..7871698f06 100644 --- a/tests/qemuxml2argvdata/kvm-features-off.xml +++ b/tests/qemuxml2argvdata/kvm-features-off.xml @@ -1,4 +1,4 @@ -<domain type='qemu'> +<domain type='kvm'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <memory unit='KiB'>219100</memory> @@ -16,6 +16,7 @@ <poll-control state='off'/> </kvm> </features> + <cpu mode='host-passthrough' check='none'/> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> @@ -26,6 +27,6 @@ <controller type='pci' index='0' model='pci-root'/> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> - <memballoon model='virtio'/> + <memballoon model='none'/> </devices> </domain> diff --git a/tests/qemuxml2xmloutdata/kvm-features-off.xml b/tests/qemuxml2xmloutdata/kvm-features-off.xml index f2e9407ac9..9c176190a5 100644 --- a/tests/qemuxml2xmloutdata/kvm-features-off.xml +++ b/tests/qemuxml2xmloutdata/kvm-features-off.xml @@ -1,4 +1,4 @@ -<domain type='qemu'> +<domain type='kvm'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <memory unit='KiB'>219100</memory> @@ -16,6 +16,7 @@ <poll-control state='off'/> </kvm> </features> + <cpu mode='host-passthrough' check='none' migratable='off'/> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> @@ -29,8 +30,6 @@ <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <audio id='1' type='none'/> - <memballoon model='virtio'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> - </memballoon> + <memballoon model='none'/> </devices> </domain> -- 2.25.1

2 3

[PATCH v2 0/8] qemu: QAPI-schema: Add support for enum value 'features'
by Peter Krempa 01 Nov '21

01 Nov '21

Patches 2-8 were already reviewed by Michal. 1/8 is new as the qemu functionality was just merged upstream. Peter Krempa (8): qemucapabilitiestest: Update capability probe for qemu-6.2 on x86_64 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 +- .../caps_6.2.0.x86_64.replies | 3513 +++++++++++++++-- .../caps_6.2.0.x86_64.xml | 2 +- tests/testutilsqemuschema.c | 130 +- 4 files changed, 3214 insertions(+), 477 deletions(-) -- 2.31.1

2 9

[PATCH v2] qemu_block: Refactor qemuBlockExportAddNBD()
by Kristina Hanicova 01 Nov '21

01 Nov '21

This is v2 of: https://listman.redhat.com/archives/libvir-list/2021-October/msg01035.html Diff to v1: * negation of 'if' with switched body (proposed by Peter) Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com> --- src/qemu/qemu_block.c | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 34fdec2c4b..b8e70f6a83 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -3592,28 +3592,21 @@ qemuBlockExportAddNBD(virDomainObj *vm, const char *bitmap) { qemuDomainObjPrivate *priv = vm->privateData; + g_autoptr(virJSONValue) nbdprops = NULL; + const char *bitmaps[2] = { bitmap, NULL }; - if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) { - if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCK_EXPORT_ADD)) { - g_autoptr(virJSONValue) nbdprops = NULL; - const char *bitmaps[2] = { bitmap, NULL }; + /* older qemu versions didn't support configuring the exportname and + * took the 'drivealias' as the export name */ + if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) + return qemuMonitorNBDServerAdd(priv->mon, drivealias, NULL, writable, NULL); - if (!(nbdprops = qemuBlockExportGetNBDProps(src->nodeformat, - exportname, - writable, - bitmaps))) - return -1; + if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCK_EXPORT_ADD)) + return qemuMonitorNBDServerAdd(priv->mon, src->nodeformat, + exportname, writable, bitmap); - return qemuMonitorBlockExportAdd(priv->mon, &nbdprops); - } else { - return qemuMonitorNBDServerAdd(priv->mon, src->nodeformat, - exportname, writable, bitmap); - } - } else { - /* older qemu versions didn't support configuring the exportname and - * took the 'drivealias' as the export name */ - return qemuMonitorNBDServerAdd(priv->mon, drivealias, NULL, writable, NULL); - } + if (!(nbdprops = qemuBlockExportGetNBDProps(src->nodeformat, exportname, + writable, bitmaps))) + return -1; - return 0; + return qemuMonitorBlockExportAdd(priv->mon, &nbdprops); } -- 2.31.1

2 1

[PATCH] virsh: Fix ambiguous output in metadata-change event
by Han Han 01 Nov '21

01 Nov '21

When you set metadata with type element like the following: dom.setMetadata(libvirt.VIR_DOMAIN_METADATA_ELEMENT, "<test/>", 'abc', "HAHAH", 0) Then for `virsh event --all`, then it will output this message: event 'metadata-change' for domain 'rhel9': element HAHAH The message is ambiguous since it looks like the params for metadata-change event is the element HAHAH. Actually that means the type is element while the url is HAHAH. Let's make it more clear. Signed-off-by: Han Han <hhan(a)redhat.com> --- tools/virsh-domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 7f3356a536..d454075dfc 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -13317,7 +13317,7 @@ virshEventMetadataChangePrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event 'metadata-change' for domain '%s': %s %s\n"), + virBufferAsprintf(&buf, _("event 'metadata-change' for domain '%s': type %s, uri %s\n"), virDomainGetName(dom), UNKNOWNSTR(virshEventMetadataChangeTypeTypeToString(type)), NULLSTR(nsuri)); -- 2.33.1

2 1

[PATCH 0/2] Unify calculation of ovs and tc.
by jx8zjs 01 Nov '21

01 Nov '21

For other interface type, values in tc rules are calculated by multiply by 8*1000 instead of 8*1024. Related link: https://listman.redhat.com/archives/libvir-list/2021-October/msg01121.html zhangjl02 (2): virnetdevopenvswitch: unify calculation of ovs and tc. For other interface type, values in tc rules are calculated by multiply by 8*1000 instead of 8*1024. virnetdevopenvswitchtest: fix inbound value calculation src/util/virnetdevopenvswitch.c | 2 +- tests/virnetdevopenvswitchtest.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) -- 2.30.2.windows.1

2 3

[PATCH] ch_driver: Drop needless fwd declaration
by Michal Privoznik 01 Nov '21

01 Nov '21

In ch_driver.c there are two forward declarations that are not needed. Drop them. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/ch/ch_driver.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/ch/ch_driver.c b/src/ch/ch_driver.c index 1824d2fd16..9eaf3ee499 100644 --- a/src/ch/ch_driver.c +++ b/src/ch/ch_driver.c @@ -47,11 +47,6 @@ VIR_LOG_INIT("ch.ch_driver"); -static int chStateInitialize(bool privileged, - const char *root, - virStateInhibitCallback callback, - void *opaque); -static int chStateCleanup(void); virCHDriver *ch_driver = NULL; static virDomainObj * -- 2.32.0

2 1

[PATCH 0/2] lib: Drop retval check for virCapabilitiesAddGuest{, Domain)()
by Michal Privoznik 01 Nov '21

01 Nov '21

*** BLURB HERE *** Michal Prívozník (2): lib: Don't check for virCapabilitiesAddGuest() retval lib: Don't check for virCapabilitiesAddGuestDomain() retval src/bhyve/bhyve_capabilities.c | 13 ++++----- src/ch/ch_conf.c | 20 +++----------- src/esx/esx_driver.c | 14 +++------- src/hyperv/hyperv_driver.c | 12 +++------ src/libxl/libxl_capabilities.c | 34 +++++++++--------------- src/lxc/lxc_conf.c | 38 ++++++--------------------- src/openvz/openvz_conf.c | 19 +++----------- src/qemu/qemu_capabilities.c | 31 +++++----------------- src/security/virt-aa-helper.c | 23 +++------------- src/test/test_driver.c | 19 +++----------- src/vbox/vbox_common.c | 18 +++---------- src/vmware/vmware_conf.c | 26 ++++++------------ src/vz/vz_driver.c | 8 +++--- tests/testutils.c | 41 ++++++++++++----------------- tests/testutilslxc.c | 26 +++++++----------- tests/testutilsqemu.c | 30 ++++++--------------- tests/testutilsxen.c | 48 +++++++++++++++------------------- tests/vmx2xmltest.c | 38 +++++++-------------------- tests/xml2vmxtest.c | 39 +++++++-------------------- 19 files changed, 147 insertions(+), 350 deletions(-) -- 2.32.0

2 4

[PATCH] qemu: tpm: Enable creation of certs for TPM 1.2 in non-privileged mode
by Stefan Berger 01 Nov '21

01 Nov '21

When 'swtpm_setup --print-capabilities' shows the 'tpm12-not-need-root' flag, then it is possible to create certificates for the TPM 1.2 also in non-privileged mode since swtpm_setup doesn't need tcsd anymore. Check for this flag and create the certificates if this flag is found. Signed-off-by: Stefan Berger <stefanb(a)linux.ibm.com> --- src/qemu/qemu_tpm.c | 5 ++++- src/util/virtpm.c | 1 + src/util/virtpm.h | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index e1b08a66c5..91e21ae646 100644 --- a/src/qemu/qemu_tpm.c +++ b/src/qemu/qemu_tpm.c @@ -463,11 +463,14 @@ qemuTPMEmulatorRunSetup(const char *storagepath, if (!swtpm_setup) return -1; - if (!privileged && tpmversion == VIR_DOMAIN_TPM_VERSION_1_2) + if (!privileged && tpmversion == VIR_DOMAIN_TPM_VERSION_1_2 && + !virTPMSwtpmSetupCapsGet( + VIR_TPM_SWTPM_SETUP_FEATURE_TPM12_NOT_NEED_ROOT)) { return virFileWriteStr(logfile, _("Did not create EK and certificates since " "this requires privileged mode for a " "TPM 1.2\n"), 0600); + } if (!privileged && qemuTPMCreateConfigFiles(swtpm_setup) < 0) return -1; diff --git a/src/util/virtpm.c b/src/util/virtpm.c index 0f50de866c..40d9272e66 100644 --- a/src/util/virtpm.c +++ b/src/util/virtpm.c @@ -46,6 +46,7 @@ VIR_ENUM_IMPL(virTPMSwtpmSetupFeature, VIR_TPM_SWTPM_SETUP_FEATURE_LAST, "cmdarg-pwdfile-fd", "cmdarg-create-config-files", + "tpm12-not-need-root", ); /** diff --git a/src/util/virtpm.h b/src/util/virtpm.h index 3bb03b3b33..b75eb84f31 100644 --- a/src/util/virtpm.h +++ b/src/util/virtpm.h @@ -39,6 +39,7 @@ typedef enum { typedef enum { VIR_TPM_SWTPM_SETUP_FEATURE_CMDARG_PWDFILE_FD, VIR_TPM_SWTPM_SETUP_FEATURE_CMDARG_CREATE_CONFIG_FILES, + VIR_TPM_SWTPM_SETUP_FEATURE_TPM12_NOT_NEED_ROOT, VIR_TPM_SWTPM_SETUP_FEATURE_LAST } virTPMSwtpmSetupFeature; -- 2.31.1

2 1

[PATCH] qemu: support kvm-pv-ipi off
by zhenwei pi 01 Nov '21

01 Nov '21

QEMU version 3.1 introduced PV_SEND_IPI CPUID feature bit under commit 7f710c32bb8 (target-i386: adds PV_SEND_IPI CPUID feature bit). This patch adds a new KVM feature 'pv-ipi' to disable this feature (enabled by default). Newer CPU platform (Ex, AMD Zen2) supports hardware accelation for IPI in guest, to use this feature to get better performance in some scenarios. Detailed about the discussion: https://lkml.org/lkml/2021/10/20/423 To disable kvm-pv-ipi and have libvirt add "-cpu host,kvm-pv-ipi=off" to the QEMU command line, the following XML code needs to be added to the guest's domain description: <features> <kvm> <pv-ipi state='off'/> </kvm> </features> Signed-off-by: zhenwei pi <pizhenwei(a)bytedance.com> --- docs/formatdomain.rst | 2 ++ docs/schemas/domaincommon.rng | 5 +++++ src/conf/domain_conf.c | 3 +++ src/conf/domain_conf.h | 1 + src/qemu/qemu_command.c | 5 +++++ 5 files changed, 16 insertions(+) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 58768f7e5e..8ff833bbd2 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -1842,6 +1842,7 @@ Hypervisors may allow certain CPU / machine features to be toggled on/off. <hidden state='on'/> <hint-dedicated state='on'/> <poll-control state='on'/> + <pv-ipi state='off'/> </kvm> <xen> <e820_host state='on'/> @@ -1930,6 +1931,7 @@ are: hidden Hide the KVM hypervisor from standard MSR based discovery on, off :since:`1.2.8 (QEMU 2.1.0)` hint-dedicated Allows a guest to enable optimizations when running on dedicated vCPUs on, off :since:`5.7.0 (QEMU 2.12.0)` poll-control Decrease IO completion latency by introducing a grace period of busy waiting on, off :since:`6.10.0 (QEMU 4.2)` + pv-ipi Paravirtualized send IPIs on, off :since:`7.10.0 (QEMU 3.1)` ============== ============================================================================ ======= ============================ ``xen`` diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index f71e375a33..67df13d90d 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -7177,6 +7177,11 @@ <ref name="featurestate"/> </element> </optional> + <optional> + <element name="pv-ipi"> + <ref name="featurestate"/> + </element> + </optional> </interleave> </element> </define> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 48c6ee9865..c8868de577 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -204,6 +204,7 @@ VIR_ENUM_IMPL(virDomainKVM, "hidden", "hint-dedicated", "poll-control", + "pv-ipi", ); VIR_ENUM_IMPL(virDomainXen, @@ -21789,6 +21790,7 @@ virDomainDefFeaturesCheckABIStability(virDomainDef *src, case VIR_DOMAIN_KVM_HIDDEN: case VIR_DOMAIN_KVM_DEDICATED: case VIR_DOMAIN_KVM_POLLCONTROL: + case VIR_DOMAIN_KVM_PVIPI: if (src->kvm_features[i] != dst->kvm_features[i]) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("State of KVM feature '%s' differs: " @@ -27821,6 +27823,7 @@ virDomainDefFormatFeatures(virBuffer *buf, case VIR_DOMAIN_KVM_HIDDEN: case VIR_DOMAIN_KVM_DEDICATED: case VIR_DOMAIN_KVM_POLLCONTROL: + case VIR_DOMAIN_KVM_PVIPI: if (def->kvm_features[j]) virBufferAsprintf(&childBuf, "<%s state='%s'/>\n", virDomainKVMTypeToString(j), diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index f4be5c84f0..cb6d8975b8 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2073,6 +2073,7 @@ typedef enum { VIR_DOMAIN_KVM_HIDDEN = 0, VIR_DOMAIN_KVM_DEDICATED, VIR_DOMAIN_KVM_POLLCONTROL, + VIR_DOMAIN_KVM_PVIPI, VIR_DOMAIN_KVM_LAST } virDomainKVM; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 7374b2beca..f7c19246d8 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6848,6 +6848,11 @@ qemuBuildCpuCommandLine(virCommand *cmd, virBufferAddLit(&buf, ",kvm-poll-control=on"); break; + case VIR_DOMAIN_KVM_PVIPI: + if (def->kvm_features[i] == VIR_TRISTATE_SWITCH_OFF) + virBufferAddLit(&buf, ",kvm-pv-ipi=off"); + break; + case VIR_DOMAIN_KVM_LAST: break; } -- 2.25.1

2 2

[PATCH v2] qemu_agent: remove unused code
by Kristina Hanicova 01 Nov '21

01 Nov '21

This is v2 of: https://listman.redhat.com/archives/libvir-list/2021-October/msg01064.html Diff to v1: * I forgot to delete another part of the unused code which belonged together (noticed by Jano) This section of code was left unused ever since it was introduced ten years ago. I think we can safely remove it. Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com> --- src/qemu/qemu_agent.c | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 5f421be6f6..f319b881fc 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -60,17 +60,6 @@ VIR_LOG_INIT("qemu.qemu_agent"); */ #define QEMU_AGENT_MAX_RESPONSE (10 * 1024 * 1024) -/* When you are the first to uncomment this, - * don't forget to uncomment the corresponding - * part in qemuAgentIOProcessEvent as well. - * -static struct { - const char *type; - void (*handler)(qemuAgent *agent, virJSONValue *data); -} eventHandlers[] = { -}; -*/ - typedef struct _qemuAgentMessage qemuAgentMessage; struct _qemuAgentMessage { char *txBuffer; @@ -237,17 +226,6 @@ qemuAgentIOProcessEvent(qemuAgent *agent, return -1; } -/* - for (i = 0; i < G_N_ELEMENTS(eventHandlers); i++) { - if (STREQ(eventHandlers[i].type, type)) { - virJSONValue *data = virJSONValueObjectGet(obj, "data"); - VIR_DEBUG("handle %s handler=%p data=%p", type, - eventHandlers[i].handler, data); - (eventHandlers[i].handler)(agent, data); - break; - } - } -*/ return 0; } -- 2.31.1

2 1

Release of libvirt-7.9.0
by Jiri Denemark 01 Nov '21

01 Nov '21

The 7.9.0 release of both libvirt and libvirt-python is tagged and signed tarballs and source RPMs are available at https://libvirt.org/sources/ https://libvirt.org/sources/python/ Thanks everybody who helped with this release by sending patches, reviewing, testing, or providing feedback. Your work is greatly appreciated. * New features * Introduce virtio-mem ``<memory/>`` model New virtio-mem model is introduced for ``<memory/>`` device which is a paravirtualized mechanism of adding/removing memory to/from a VM. Use ``virDomainUpdateDeviceFlags()`` API to adjust amount of memory or ``virsh update-memory-device`` for convenience. * qemu: support disabling hotplug of devices on the pci-root controller the <target hotplug='on|off'/> option is now supported for the pci-root controller on i440fx-based (x86 "pc") machinetypes. This can be used to disable hotplug/unplug of devices from this controller. The default behavior is unchanged (hotplug is allowed). * Support hotplug and hotunplug for virtiofs Filesystems backed by virtiofsd can now be hotplugged and hotunplugged. * virpcivpd: Add a PCI VPD parser A parser for the standard PCI/PCIe VPD ("I.3. VPD Definitions" in PCI 2.2+ and an equivalent definition in "6.28.1 VPD Format" PCIe 4.0) was added along with relevant types to represent PCI VPD in memory. This functionality got added for Linux only at this point (kernels above v2.6.26 have support for exposing VPD via sysfs). * virpci: Add PCI VPD-related helper functions to virpci In order to utilize the PCI VPD parser, a couple of helper functions got introduced to check for the presence of a VPD file in the sysfs tree and to invoke the PCI VPD parser to get a list of resources representing PCI VPD contents in memory. * nodedev: Add PCI VPD capability support Support for serializing and deserializing PCI VPD data structures is added following the addition of the PCI VPD parser. A new PCI device capability called "vpd" is introduced holding string resources and keyword resources found in PCI VPD. * qemu: Support page_per_vq for driver element This optional virtio attribute ``page_per_vq`` controls the layout of the notification capabilities exposed to the guest. It is recommended for the vDPA devices. * qemu: Support librbd encryption Add an encryption engine ``librbd``. It will provides the image-level encryption of librbd. It requires QEMU >= 6.1.0 and librbd >= 16.1.0. * Improvements * Use of JSON syntax with ``-device`` with upcoming QEMU-6.2 Libvirt started using JSON directly with the ``-device`` commandline parameter as it's considered the preferred stable syntax for further QEMU releases. If any problems with the conversion are encountered please report them as soon as possible. * Bug fixes * qemu: Fix problems on ``virsh domstats`` with qemu <5.2.0 Libvirt v7.2.0 and later called query-dirty-rate, which was introduced in qemu-5.2.0, regardless of qemu version and failed in qemu-5.1.0. This release fixes the bug. * Don't enter endless loop when unable to accept new clients If libvirtd (or any other daemon) hit the ulimit for maximum number of open files but there are still client connections pending then libvirtd (or corresponding split daemon) would enter an endless loop from which it would never recover. This behaviour is now fixed. * qemu: Run secondary driver hooks in split daemon mode Because of a bug in implementation it may happen that hooks from secondary drivers were not called in all cases, for instance a network hook wasn't called upon removal of interface after domain shut off itself. With this release the bug is fixed. Enjoy. Jirka

2 1

[PATCH v2 0/4] MAINTAINERS: Sanitize 'MIPS TCG CPUs' section
by Philippe Mathieu-Daudé 01 Nov '21

01 Nov '21

Move various files unrelated to MIPS TCG frontend into new sections. Since v1: - Do not add Paul without his consent - un-deprecate nanoMIPS Philippe Mathieu-Daudé (4): MAINTAINERS: Add MIPS general architecture support entry MAINTAINERS: Add entries to cover MIPS CPS / GIC hardware MAINTAINERS: Split MIPS TCG frontend vs MIPS machines/hardware MAINTAINERS: Agree to maintain nanoMIPS TCG frontend docs/about/deprecated.rst | 23 --------------------- MAINTAINERS | 43 +++++++++++++++++++++++++-------------- 2 files changed, 28 insertions(+), 38 deletions(-) -- 2.31.1

2 9

for rbd, how to use qmp directly to add dick
by longguang.yue 01 Nov '21

01 Nov '21

Hi, all: in my case, i need to add device via qmp. but for rbd drive needs a secret object. how to produce secret object. 'base64 -d' outputs unreadable code . -object secret,id=virtio-disk0-secret0,data=2YVH6svMZa42RfVx8MbIIVjtU6iGO8QzFADuDnLk7BU=,keyid=masterKey0,iv=/m3QyHQ33NeMEfDDMuDEeg==,format=base64 thanks

2 1

[libvirt PATCH v2 0/3] PCI VPD: Handle More Edge Cases
by Dmitrii Shcherbakov 01 Nov '21

01 Nov '21

This patch set improves edge case testing: * The parser is now more strict about checking boundary conditions when parsing fields: an invalid field length is a possibility which is now being accounted for; * The parser will now make sure that RV and RW fields are the last in their section by making sure that no more data is left to read after those; * The RW field in the read-write section is not considered a VPD format violation even though it is a violation of the spec since it does not prevent Libvirt from parsing valid data for presenting it to a user. This is a policy decision made by Libvirt in favor of usability with hardware that does not strictly follow the PCI/PCIe VPD spec. Invalid field values are now skipped instead of halting further parsing completely. Some vendors use 0xFF as placeholders in VPD-W since those values do not correspond to printable ASCII characters, they will be discarded, however, parsing will continue beyond that point. Also, it turns out that some vendors use printable ASCII characters not present in the alphanumeric range. Following a mailing list discussion Libvirt will accept printable ASCII characters to avoid cases where useful data is discarded. https://listman.redhat.com/archives/libvir-list/2021-October/msg01043.html Higher-level software needs to account for this character set and act accordingly. For example, the outcome of this is that one may get "N/A" as a value for a serial number that is supposed to be unique, however, there is no way for Libvirt to validate serial number uniqueness anyway even if it was a different character sequence. https://gitlab.com/dmitriis/libvirt/-/pipelines/398517951 (x86_64 only, have not set up arch-specific runners yet and over the limit of what gitlab provides) Dmitrii Shcherbakov (3): PCI VPD: handle additional edge cases PCI VPD: Skip fields with invalid values PCI VPD: Fix a wrong return code in a test case src/util/virpcivpd.c | 63 +++++++--- tests/virpcivpdtest.c | 263 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 296 insertions(+), 30 deletions(-) -- 2.32.0

2 4

[PATCH] qemu: Extend qemu.conf with PCR banks to activate during 'TPM manufacturing'
by Stefan Berger 29 Oct '21

29 Oct '21

Extend qemu.conf with a configration option swtpm_active_pcr_banks that allows a user to set a comma-separated list of PCR banks to activate during 'TPM manufacturing'. Valid PCR banks are sha1,sha256,sha384 and sha512. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2016599 Signed-off-by: Stefan Berger <stefanb(a)linux.ibm.com> --- src/qemu/qemu.conf | 8 ++++++++ src/qemu/qemu_conf.c | 6 ++++++ src/qemu/qemu_conf.h | 1 + src/qemu/qemu_tpm.c | 8 ++++++++ 4 files changed, 23 insertions(+) diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index 71fd125699..7aa151ed55 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -915,6 +915,14 @@ #swtpm_user = "tss" #swtpm_group = "tss" +# The PCR banks to activate during 'TPM manufacturing' before a swtpm instance +# is started the first time. +# +# A comma-separated list without spaces containing sha1,sha256,sha384, or +# sha512. The default is 'sha256'. +# +# swtpm_active_pcr_banks = "sha256,sha384" + # For debugging and testing purposes it's sometimes useful to be able to disable # libvirt behaviour based on the capabilities of the qemu process. This option # allows to do so. DO _NOT_ use in production and beaware that the behaviour diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 0451bc70ac..a62525385e 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -384,6 +384,8 @@ static void virQEMUDriverConfigDispose(void *obj) g_strfreev(cfg->capabilityfilters); g_free(cfg->deprecationBehavior); + + g_free(cfg->swtpmActivePcrBanks); } @@ -1030,6 +1032,10 @@ virQEMUDriverConfigLoadSWTPMEntry(virQEMUDriverConfig *cfg, if (swtpm_group && virGetGroupID(swtpm_group, &cfg->swtpm_group) < 0) return -1; + if (virConfGetValueString(conf, "swtpm_active_pcr_banks", + &cfg->swtpmActivePcrBanks) < 0) + return -1; + return 0; } diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 2f64e39a18..37461d9e31 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -219,6 +219,7 @@ struct _virQEMUDriverConfig { uid_t swtpm_user; gid_t swtpm_group; + char *swtpmActivePcrBanks; char **capabilityfilters; diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index e1b08a66c5..69fd1e67e3 100644 --- a/src/qemu/qemu_tpm.c +++ b/src/qemu/qemu_tpm.c @@ -448,6 +448,7 @@ qemuTPMEmulatorRunSetup(const char *storagepath, bool privileged, uid_t swtpm_user, gid_t swtpm_group, + const char *swtpmActivePcrBanks, const char *logfile, const virDomainTPMVersion tpmversion, const unsigned char *secretuuid, @@ -512,6 +513,9 @@ qemuTPMEmulatorRunSetup(const char *storagepath, } if (!incomingMigration) { + if (!swtpmActivePcrBanks) + swtpmActivePcrBanks = "sha256"; + virCommandAddArgList(cmd, "--tpm-state", storagepath, "--vmid", vmid, @@ -521,6 +525,7 @@ qemuTPMEmulatorRunSetup(const char *storagepath, "--create-platform-cert", "--lock-nvram", "--not-overwrite", + "--pcr-banks", swtpmActivePcrBanks, NULL); } else { virCommandAddArgList(cmd, @@ -568,6 +573,7 @@ qemuTPMEmulatorBuildCommand(virDomainTPMDef *tpm, bool privileged, uid_t swtpm_user, gid_t swtpm_group, + const char *swtpmActivePcrBanks, const char *swtpmStateDir, const char *shortName, bool incomingMigration) @@ -593,6 +599,7 @@ qemuTPMEmulatorBuildCommand(virDomainTPMDef *tpm, if (created && qemuTPMEmulatorRunSetup(tpm->data.emulator.storagepath, vmname, vmuuid, privileged, swtpm_user, swtpm_group, + swtpmActivePcrBanks, tpm->data.emulator.logfile, tpm->version, secretuuid, incomingMigration) < 0) goto error; @@ -812,6 +819,7 @@ qemuExtTPMStartEmulator(virQEMUDriver *driver, driver->privileged, cfg->swtpm_user, cfg->swtpm_group, + cfg->swtpmActivePcrBanks, cfg->swtpmStateDir, shortName, incomingMigration))) return -1; -- 2.31.1

3 6

[PATCH v2 0/9] Configurable policy for handling unstable interfaces
by Markus Armbruster 29 Oct '21

29 Oct '21

Option -compat lets you configure what to do when deprecated interfaces get used. This series extends this to unstable interfaces. Works the same way. Intended for testing users of the management interfaces. It is experimental. To make it possible, I replace the "x-" naming convention by special feature flag "unstable". See PATCH 1 for rationale. v2: * Rebased * PATCH 1: Commit message revamped [Kevin], R-bys kept * PATCH 6: gen_special_features() rewritten [John] * PATCH 7: disastrous typos fixed [Philippe] Markus Armbruster (9): qapi: New special feature flag "unstable" qapi: Mark unstable QMP parts with feature 'unstable' qapi: Eliminate QCO_NO_OPTIONS for a slight simplification qapi: Tools for sets of special feature flags in generated code qapi: Generalize struct member policy checking qapi: Generalize command policy checking qapi: Generalize enum member policy checking qapi: Factor out compat_policy_input_ok() qapi: Extend -compat to set policy for unstable interfaces docs/devel/qapi-code-gen.rst | 9 +- qapi/block-core.json | 123 +++++++++++++++++------- qapi/compat.json | 6 +- qapi/migration.json | 35 +++++-- qapi/misc.json | 6 +- qapi/qom.json | 11 ++- include/qapi/compat-policy.h | 7 ++ include/qapi/qmp/dispatch.h | 6 +- include/qapi/util.h | 8 +- include/qapi/visitor-impl.h | 6 +- include/qapi/visitor.h | 17 +++- monitor/misc.c | 7 +- qapi/qapi-forward-visitor.c | 16 +-- qapi/qapi-visit-core.c | 41 ++++---- qapi/qmp-dispatch.c | 57 ++++++++--- qapi/qmp-registry.c | 4 +- qapi/qobject-input-visitor.c | 22 ++--- qapi/qobject-output-visitor.c | 13 ++- storage-daemon/qemu-storage-daemon.c | 3 +- qapi/trace-events | 4 +- qemu-options.hx | 20 +++- scripts/qapi/commands.py | 12 +-- scripts/qapi/events.py | 10 +- scripts/qapi/gen.py | 8 ++ scripts/qapi/schema.py | 11 ++- scripts/qapi/types.py | 22 +++-- scripts/qapi/visit.py | 14 +-- tests/qapi-schema/qapi-schema-test.json | 7 +- tests/qapi-schema/qapi-schema-test.out | 5 + 29 files changed, 348 insertions(+), 162 deletions(-) -- 2.31.1

4 27

[PATCH 0/7] qemu: Various monitor cleanups and removal of legacy cpu hotplug
by Peter Krempa 29 Oct '21

29 Oct '21

Peter Krempa (7): qemuMonitorJSONQueryBlock: Reformat function header qemuMonitorJSONBlockInfoAdd: Refactor hash table addition qemuhotplugtest: Remove tests for legacy cpu hotplug on x86 qemuDomainHotplugAddVcpu: Remove legacy hotplug branch qemu: monitor: Remove unused qemuMonitorSetCPU qemuMonitorEjectMedia: Remove stale comment qemuMonitorJSONSave[Physical|Virtual]Memory: Reformat function headers src/qemu/qemu_hotplug.c | 22 +- src/qemu/qemu_monitor.c | 14 -- src/qemu/qemu_monitor.h | 6 - src/qemu/qemu_monitor_json.c | 77 +++---- src/qemu/qemu_monitor_json.h | 1 - tests/qemuhotplugtest.c | 1 - .../x86-old-bulk-domain.xml | 21 -- .../x86-old-bulk-monitor.json | 193 ------------------ .../x86-old-bulk-result-conf.xml | 31 --- .../x86-old-bulk-result-live.xml | 39 ---- tests/qemumonitorjsontest.c | 2 - 11 files changed, 35 insertions(+), 372 deletions(-) delete mode 100644 tests/qemuhotplugtestcpus/x86-old-bulk-domain.xml delete mode 100644 tests/qemuhotplugtestcpus/x86-old-bulk-monitor.json delete mode 100644 tests/qemuhotplugtestcpus/x86-old-bulk-result-conf.xml delete mode 100644 tests/qemuhotplugtestcpus/x86-old-bulk-result-live.xml -- 2.31.1

2 9

[PATCH for 7.9.0] NEWS: Document my bugfixes for v7.9.0
by Michal Privoznik 29 Oct '21

29 Oct '21

There are two bugs I fixed worth mentioning in the 7.9.0 release notes. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- NEWS.rst | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 1d2d31430f..1bb6897abd 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -86,6 +86,21 @@ v7.9.0 (unreleased) qemu-5.2.0, regardless of qemu version and failed in qemu-5.1.0. This release fixes the bug. + * Don't enter endless loop when unable to accept new clients + + If libvirtd (or any other daemon) hit the ulimit for maximum number of open + files but there are still client connections pending then libvirtd (or + corresponding split daemon) would enter an endless loop from which it would + never recover. This behaviour is now fixed. + + * qemu: Run secondary driver hooks in split daemon mode + + Because of a bug in implementation it may happen that hooks from secondary + drivers were not called in all cases, for instance a network hook wasn't + called upon removal of interface after domain shut off itself. With this + release the bug is fixed. + + v7.8.0 (2021-10-01) =================== -- 2.32.0

2 1

[libvirt PATCH] spec: Depend on qemu-kvm-block-driver-curl in RHEL-9
by Jiri Denemark 29 Oct '21

29 Oct '21

The curl block driver is no longer a requirement for qemu-kvm package in RHEL-9, which breaks support for https network disks. Let's depend on it explicitly (in libvirt-daemon-kvm meta package) until we possibly reimplement the https disk support using nbdkit (tracked in bug 2016527). https://bugzilla.redhat.com/show_bug.cgi?id=2014229 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- libvirt.spec.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 4ecb28114c..b71888653d 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -791,6 +791,10 @@ Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release} Requires: libvirt-daemon-driver-secret = %{version}-%{release} Requires: libvirt-daemon-driver-storage = %{version}-%{release} Requires: qemu-kvm +# qemu-kvm no longer depends on curl block driver in RHEL-9 +%if 0%{?rhel} > 8 +Requires: qemu-kvm-block-driver-curl +%endif %description daemon-kvm Server side daemon and driver required to manage the virtualization -- 2.33.1

3 4

[PATCH 0/4] Some news and docs update for v7.9.0
by Han Han 29 Oct '21

29 Oct '21

Han Han (4): docs: Fix a typo of page_per_vq news: News for the new virtio attribute page_per_vq docs: Make the version requirement more clear for rbd encryption news: Add support for librbd encryption NEWS.rst | 11 +++++++++++ docs/formatdomain.rst | 2 +- docs/formatstorageencryption.html.in | 5 +++-- 3 files changed, 15 insertions(+), 3 deletions(-) -- 2.33.1

2 5

Entering freeze for libvirt-7.9.0
by Jiri Denemark 29 Oct '21

29 Oct '21

I have just tagged v7.9.0-rc1 in the repository and pushed signed tarballs and source RPMs to https://libvirt.org/sources/ Please give the release candidate some testing and in case you find a serious issue which should have a fix in the upcoming release, feel free to reply to this thread to make sure the issue is more visible. If you have not done so yet, please update NEWS.rst to document any significant change you made since the last release. Thanks, Jirka

1 1

[PATCH v3 0/4] Add qemu support setting qos via ovs on ovs interface
by zhangjl02 29 Oct '21

29 Oct '21

--- diff to v2: - Remove passing "actualType" argument, get it inside funtion - Format code. diff to v1: - Move qemuDomainDefIsOvsport from src/qemu/qemu_domain.c to src/conf/domain_conf.c - Call virCommandFree(cmd)free cmd before reusing it. - Ddd g_autofree to variables. - Reduce usage of virReportError(), and coupled it with return -1. - Fix remove port qos error. - Optimise code structure. Thanks to Michal Privoznik for helping reviewing these patches and solving problems. Really sorry to bring extra work to review them. I will continue to learn and become familiar with submission process. Now libvirt use tc rules to manage interface's qos. But when an interface is created by ovs, there is no qos setting result in ovs database. Therefore, qos of ovs port should be set via ovs management command. We add a function to tell whether a port definition is an ovs managed virtual port. Change default qdisc rules, which return 0 directly if the port is ovs managed(When the ovs port is set noqueue, qos config on this port will not work). Add ovs management function of setting and cleaning qos. Then check if the port is an ovs managed port during its life cycle, and call the ovs management function to set or clean qos settings. zhangjl02 (4): virDomain: interface: add virDomainNetDefIsOvsport virDomain: interface: add virNetDevOpenvswitchInterfaceSetQos and virNetDevOpenvswitchInterfaceClearQos qemu: interface: remove setting noqueue for ovs port qemu: interface: check and use ovs command to set qos of ovs managed port src/conf/domain_conf.c | 11 ++ src/conf/domain_conf.h | 2 + src/libvirt_private.syms | 3 + src/qemu/qemu_command.c | 10 +- src/qemu/qemu_domain.c | 3 +- src/qemu/qemu_driver.c | 23 ++- src/qemu/qemu_hotplug.c | 35 ++-- src/qemu/qemu_process.c | 7 +- src/util/virnetdevopenvswitch.c | 274 ++++++++++++++++++++++++++++++++ src/util/virnetdevopenvswitch.h | 11 ++ 10 files changed, 364 insertions(+), 15 deletions(-) -- 2.30.2.windows.1

4 14

[PATCH 0/3] Docs and news update for v7.8.0
by Han Han 29 Oct '21

29 Oct '21

Han Han (3): docs: Mention QEMU version requirement for queue-size news: Add queue_size option to virtio disk news: Add validation flags for creating of net, nwfilter-binding, net port NEWS.rst | 16 ++++++++++++++++ docs/formatdomain.rst | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) -- 2.33.1

2 4

[PATCH] news: Support vhostuser in virsh attach-interface since v7.7.0
by Han Han 29 Oct '21

29 Oct '21

Signed-off-by: Han Han <hhan(a)redhat.com> --- NEWS.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 5f1cf19940..694c506cad 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -162,6 +162,8 @@ v7.7.0 (2021-09-01) forbidden for older qemus which don't support the update API as the guest could still reboot and execute some instructions until it was terminated. + * virsh: Support vhostuser in attach-interface + * **Bug fixes** * qemu: Open chardev logfile on behalf of QEMU -- 2.33.1

1 0

[RFC] Allowing SEV attestation
by Michal Prívozník 29 Oct '21

29 Oct '21

Dear list, in the light of recent development of secure virtualization (for instance AMD SEV-SNP [1]) I'd like us to be prepared for when QEMU adopts these new technologies and thus would like to discuss our options. So far, I've came across AMD SEV-SNP [2]. While it's true that we do support SEV, we need to adopt its newer version too. Consider the following example: you loan a VM on a public cloud and you want to process some private data there. Of course, the data has to be stored on an encrypted disk/partition. But encrypting guest memory (confidentiality) prevents you only from finding the key in a memory dump. It doesn't help if the guest image, initial guest memory, hypervisor or firmware were tampered with. This is where attestation comes to help - it enables the guest owner (which in this example is different to the one running it) verify - with cryptographic level of confidence - that data confidentiality and integrity can be ensured. Depending on the technology, attestation will be done at different times in the VM lifecycle. When it's done before starting guest vCPUs, it's called pre-attestation and when it's done after the guest has launched, it's called post-attestation. For example, AMD SEV and SEV-ES require pre-attestation. SEV-SNP allows for post attestation. The crux of the issue here is that *when* and *how* the guest owner will interact with the VM for attestation will be different depending on which technology is being used. It looks like QEMU will expose commands needed for attestation via QMP [3]. But question then is, how to expose those at Libvirt level? Should we allow users to bypass Libvirt and communicate to QEMU directly or wrap those QMPs in public APIs, or something completely different? Will those APIs be generic enough to serve other technologies too? For instance, given set of APIs in given order works for SEV but might not work for Intel's TDX. 1: https://kvmforum2019.sched.com/event/Tmwl/improving-and-expanding-sev-suppo… 2: https://www.amd.com/system/files/TechDocs/SEV-SNP-strengthening-vm-isolatio… 3: https://lists.gnu.org/archive/html/qemu-devel/2021-02/msg03689.html Michal

5 13

[PATCH v5 0/5] Add support for librbd encryption
by Or Ozeri 28 Oct '21

28 Oct '21

v5: rebased + nit fixes suggested by Peter v4: - added disk post parse to image creation flow in qemublocktest (since more tests failed after adding engine validation) - removed symlink changes - added luks2 and engine documentation - switched to using enum engine instead of int - added validation for encryption engine and formats v3: rebased on master v2: addressed (hopefully) all of Peter's v1 comments (thanks Peter!) Feel free to make any other changes before pushing. Thanks! Or Ozeri (5): qemu: add disk post parse to qemublocktest qemu: capablities: Detect presence of 'rbd-encryption' as QEMU_CAPS_RBD_ENCRYPTION conf: add encryption engine property qemu: add librbd encryption engine conf: add luks2 encryption format docs/formatstorageencryption.html.in | 29 ++++++- docs/schemas/domainbackup.rng | 7 ++ docs/schemas/storagecommon.rng | 9 ++ src/conf/storage_encryption_conf.c | 28 ++++++- src/conf/storage_encryption_conf.h | 11 +++ src/qemu/qemu_block.c | 41 +++++++++ src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_domain.c | 69 ++++++++++++++- src/qemu/qemu_domain.h | 3 + tests/qemublocktest.c | 29 +++---- .../caps_6.1.0.x86_64.xml | 1 + .../caps_6.2.0.x86_64.xml | 1 + tests/qemustatusxml2xmldata/upgrade-out.xml | 6 +- ...sk-network-rbd-encryption.x86_64-6.0.0.err | 1 + ...-network-rbd-encryption.x86_64-latest.args | 49 +++++++++++ .../disk-network-rbd-encryption.xml | 75 +++++++++++++++++ tests/qemuxml2argvdata/disk-nvme.xml | 2 +- .../qemuxml2argvdata/encrypted-disk-usage.xml | 2 +- tests/qemuxml2argvdata/luks-disks.xml | 4 +- tests/qemuxml2argvdata/user-aliases.xml | 2 +- tests/qemuxml2argvtest.c | 2 + ...k-network-rbd-encryption.x86_64-latest.xml | 83 +++++++++++++++++++ .../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 +-- tests/qemuxml2xmltest.c | 1 + 28 files changed, 443 insertions(+), 45 deletions(-) create mode 100644 tests/qemuxml2argvdata/disk-network-rbd-encryption.x86_64-6.0.0.err create mode 100644 tests/qemuxml2argvdata/disk-network-rbd-encryption.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-network-rbd-encryption.xml create mode 100644 tests/qemuxml2xmloutdata/disk-network-rbd-encryption.x86_64-latest.xml -- 2.25.1

4 8

[libvirt][PATCH v7 0/5] Support query and use SGX
by Haibin Huang 28 Oct '21

28 Oct '21

This patch series provides support for enabling Intel's Software Guard Extensions (SGX) feature in guest VM. Giving the SGX support in QEMU be accepted and will be merged in two days Intel Software Guard Extensions (Intel�� SGX) is a set of instructions that increases the security of application code and data, giving them more protection from disclosure or modification. Developers can partition sensitive information into enclaves, which are areas of execution in memory with more security protection. The typical flow looks below at very high level: 1. Calls virConnectGetDomainCapabilities API to domain capabilities that includes the following SGX information. <feature> ... <sgx supported='yes'> <epc_size unit=��KiB��>N</epc_size> </sgx> </feature> 2. User requests to start a guest calling virCreateXML() with SGX requirement. It should contain <devices> ... <memory model='sgx-epc'> <target> <size unit='KiB'>N</size> </target> </memory> ... </devices> Haibin Huang (2): Support to query SGX capability Add get domaincaps unit test Lin Yang (3): conf: Introduce SGX EPC element into device memory xml qemu: Add command-line to generate SGX EPC memory backend Add unit tests for guest VM creation command with SGX EPC docs/schemas/domaincaps.rng | 19 ++- docs/schemas/domaincommon.rng | 1 + src/conf/domain_capabilities.c | 29 ++++ src/conf/domain_capabilities.h | 13 ++ src/conf/domain_conf.c | 5 + src/conf/domain_conf.h | 1 + src/conf/domain_validate.c | 1 + src/libvirt_private.syms | 2 +- src/qemu/qemu_alias.c | 6 +- src/qemu/qemu_capabilities.c | 142 ++++++++++++++++++ src/qemu/qemu_capabilities.h | 4 + src/qemu/qemu_command.c | 39 ++++- src/qemu/qemu_domain.c | 10 +- src/qemu/qemu_domain_address.c | 4 + src/qemu/qemu_monitor.c | 10 ++ src/qemu/qemu_monitor.h | 3 + src/qemu/qemu_monitor_json.c | 89 +++++++++++ src/qemu/qemu_monitor_json.h | 3 + src/qemu/qemu_process.c | 2 + src/qemu/qemu_validate.c | 8 + src/security/security_apparmor.c | 1 + src/security/security_dac.c | 2 + src/security/security_selinux.c | 2 + tests/domaincapsdata/bhyve_basic.x86_64.xml | 1 + tests/domaincapsdata/bhyve_fbuf.x86_64.xml | 1 + tests/domaincapsdata/bhyve_uefi.x86_64.xml | 1 + tests/domaincapsdata/empty.xml | 1 + tests/domaincapsdata/libxl-xenfv.xml | 1 + tests/domaincapsdata/libxl-xenpv.xml | 1 + .../domaincapsdata/qemu_2.11.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.11.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_2.11.0.s390x.xml | 1 + tests/domaincapsdata/qemu_2.11.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.12.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.12.0-tcg.x86_64.xml | 1 + .../qemu_2.12.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_2.12.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_2.12.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_2.12.0.s390x.xml | 1 + tests/domaincapsdata/qemu_2.12.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.4.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.4.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_2.4.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.5.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.5.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_2.5.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.6.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.6.0-tcg.x86_64.xml | 1 + .../qemu_2.6.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_2.6.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_2.6.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_2.6.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.7.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.7.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_2.7.0.s390x.xml | 1 + tests/domaincapsdata/qemu_2.7.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.8.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.8.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_2.8.0.s390x.xml | 1 + tests/domaincapsdata/qemu_2.8.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.9.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.9.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_2.9.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_2.9.0.s390x.xml | 1 + tests/domaincapsdata/qemu_2.9.0.x86_64.xml | 1 + .../domaincapsdata/qemu_3.0.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_3.0.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_3.0.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_3.0.0.s390x.xml | 1 + tests/domaincapsdata/qemu_3.0.0.x86_64.xml | 1 + .../domaincapsdata/qemu_3.1.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_3.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_3.1.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_3.1.0.x86_64.xml | 1 + .../domaincapsdata/qemu_4.0.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_4.0.0-tcg.x86_64.xml | 1 + .../qemu_4.0.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.0.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.0.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_4.0.0.s390x.xml | 1 + tests/domaincapsdata/qemu_4.0.0.x86_64.xml | 1 + .../domaincapsdata/qemu_4.1.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_4.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_4.1.0.x86_64.xml | 1 + .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 1 + .../qemu_4.2.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_4.2.0.s390x.xml | 1 + tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 1 + .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 1 + .../qemu_5.0.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.0.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.0.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 1 + .../domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_5.1.0.sparc.xml | 1 + tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 1 + .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 1 + .../qemu_5.2.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.2.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_5.2.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_5.2.0.s390x.xml | 1 + tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 1 + .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 1 + .../qemu_6.0.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.0.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_6.0.0.s390x.xml | 1 + tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 1 + .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 1 + .../sgx-epc.x86_64-5.1.0.args | 37 +++++ tests/qemuxml2argvdata/sgx-epc.xml | 40 +++++ tests/qemuxml2argvtest.c | 1 + 120 files changed, 560 insertions(+), 8 deletions(-) create mode 100644 tests/qemuxml2argvdata/sgx-epc.x86_64-5.1.0.args create mode 100644 tests/qemuxml2argvdata/sgx-epc.xml -- 2.17.1

3 14

[libvirt PATCH 0/4] PCI VPD: Handle More Edge Cases
by Dmitrii Shcherbakov 27 Oct '21

27 Oct '21

This patch set improves edge case testing: * The parser is now more strict about checking boundary conditions when parsing fields: an invalid field length is a possibility which is now being accounted for; * The parser will now make sure that RV and RW fields are the last in their section by making sure that no more data is left to read after those; * RW field presence was already checked for but there was no test case for it. This was prompted by a real-world hardware example where this field was not present. Invalid field values are now skipped instead of halting further parsing completely. It turns out that some vendors use values like "N/A" if fields were not populated in VPD-R and 0xFF as placeholders in VPD-W. While this data is not valid, other data might be and it should be possible to retrieve it. Dmitrii Shcherbakov (4): PCI VPD: handle additional edge cases PCI VPD: Add a test case for the absence of RW PCI VPD: Skip fields with invalid values PCI VPD: Fix a wrong return code in a test case src/util/virpcivpd.c | 37 ++++++-- tests/virpcivpdtest.c | 207 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 225 insertions(+), 19 deletions(-) -- 2.32.0

2 9

[PATCH 0/3] qemu: Set "qemu-event" thread identity
by Michal Privoznik 27 Oct '21

27 Oct '21

I propose to merge only the first two patches. The third one is just an alternative to the first two, but honestly, I view it as a terrible hack. Nevertheless, a hack worth discussion. Michal Prívozník (3): virthreadpool: Allow setting identity for workers qemu: Set "qemu-event" thread identity *** DO NOT MERGE *** src/nwfilter/nwfilter_dhcpsnoop.c | 1 + src/qemu/qemu_driver.c | 5 ++++- src/qemu/qemu_process.c | 4 ++++ src/rpc/virnetserver.c | 1 + src/util/virthreadpool.c | 12 ++++++++++++ src/util/virthreadpool.h | 12 +++++++----- 6 files changed, 29 insertions(+), 6 deletions(-) -- 2.32.0

3 9

[PATCH] qemu_agent: remove unused code
by Kristina Hanicova 27 Oct '21

27 Oct '21

Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com> --- src/qemu/qemu_agent.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 5f421be6f6..f7feadd5eb 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -237,17 +237,6 @@ qemuAgentIOProcessEvent(qemuAgent *agent, return -1; } -/* - for (i = 0; i < G_N_ELEMENTS(eventHandlers); i++) { - if (STREQ(eventHandlers[i].type, type)) { - virJSONValue *data = virJSONValueObjectGet(obj, "data"); - VIR_DEBUG("handle %s handler=%p data=%p", type, - eventHandlers[i].handler, data); - (eventHandlers[i].handler)(agent, data); - break; - } - } -*/ return 0; } -- 2.31.1

2 1

[PATCH] qemu_block: Refactor qemuBlockExportAddNBD()
by Kristina Hanicova 26 Oct '21

26 Oct '21

I think this patch improves readability of the function by removing unnecessary 'else' branches after 'return' and reworking the code a bit. Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com> --- src/qemu/qemu_block.c | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 34fdec2c4b..4e532d29c0 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -3592,28 +3592,21 @@ qemuBlockExportAddNBD(virDomainObj *vm, const char *bitmap) { qemuDomainObjPrivate *priv = vm->privateData; + g_autoptr(virJSONValue) nbdprops = NULL; + const char *bitmaps[2] = { bitmap, NULL }; - if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) { - if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCK_EXPORT_ADD)) { - g_autoptr(virJSONValue) nbdprops = NULL; - const char *bitmaps[2] = { bitmap, NULL }; + /* older qemu versions didn't support configuring the exportname and + * took the 'drivealias' as the export name */ + if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) + return qemuMonitorNBDServerAdd(priv->mon, drivealias, NULL, writable, NULL); - if (!(nbdprops = qemuBlockExportGetNBDProps(src->nodeformat, - exportname, - writable, - bitmaps))) - return -1; + if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCK_EXPORT_ADD)) + return qemuMonitorNBDServerAdd(priv->mon, src->nodeformat, + exportname, writable, bitmap); - return qemuMonitorBlockExportAdd(priv->mon, &nbdprops); - } else { - return qemuMonitorNBDServerAdd(priv->mon, src->nodeformat, - exportname, writable, bitmap); - } - } else { - /* older qemu versions didn't support configuring the exportname and - * took the 'drivealias' as the export name */ - return qemuMonitorNBDServerAdd(priv->mon, drivealias, NULL, writable, NULL); - } + if ((nbdprops = qemuBlockExportGetNBDProps(src->nodeformat, exportname, + writable, bitmaps))) + return qemuMonitorBlockExportAdd(priv->mon, &nbdprops); - return 0; + return -1; } -- 2.31.1

2 1

[libvirt PATCH 0/1] Fix some typos
by Tim Wiederhake 26 Oct '21

26 Oct '21

Found by "codespell", see proposed script at https://listman.redhat.com/archives/libvir-list/2021-October/msg00015.html Cheers, Tim Tim Wiederhake (1): Fix some typos NEWS.rst | 2 +- src/conf/domain_conf.c | 2 +- src/qemu/qemu_command.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) -- 2.31.1

2 2

Re: [PATCH 0/5] trace: inroduce qmp: trace namespace
by Markus Armbruster 26 Oct '21

26 Oct '21

Vladimir Sementsov-Ogievskiy <vsementsov(a)virtuozzo.com> writes: > Hi all! > > We have handle_qmp_command and qmp_command_repond trace points to trace > qmp commands. They are very useful to debug problems involving > management tools like libvirt. > > But tracing all qmp commands is too much. > > Here I suggest a kind of tracing namespace. Formally this series adds a > trace points called qmp:<some-command> for every command, which may be > enabled in separate like > > --trace qmp:drive-backup > > or by pattern like > > --trace qmp:block-job-* > > or similarly with help of qmp command trace-event-set-state. > > This also allows to enable tracing of some qmp commands permanently > (by downstream patch or in libvirt xml). For example, I'm going to > enable tracing of block job comamnds and blockdev-* commands in > Virtuozzo. Qemu logs are often too empty (for example, in comparison > with Libvirt), logging block jobs is not too much but will be very > helpful. What exactly is traced? Peeking at PATCH 5... looks like it's input that makes it to qmp_dispatch() and command responses, but not events. Fine print on "input that makes it to qmp_dispatch()": * You trace right before we execute the command, not when we receive, parse and enqueue input. * Corollary: input with certain errors is not traced. * You don't trace the input text, you trace the unparsed parse tree. All fine, I presume. Existing tracepoints in monitor/qmp.c, and what information they send (inessential bits omitted for clarity): * handle_qmp_command Handling a QMP command: unparsed parse tree Fine print, safe to ignore: - Out-of-band commands will be executed right away, in-band commands will be queued. Tracepoints monitor_qmp_in_band_enqueue and monitor_qmp_in_band_dequeue provide insight into that. - This also receives and queues parse errors, without tracing them. Tracepoint monitor_qmp_err_in_band traces them as they are dequeued. * monitor_qmp_cmd_in_band About to execute in-band command: command ID, if any * monitor_qmp_cmd_out_of_band About to execute out-of-band command: command ID, if any * monitor_qmp_respond About to send command response or event: QObject For input, --trace qmp:* is like --trace handle_qmp_command, except it traces late rather than early. For output, --trace qmp:* is like --trace monitor_qmp_respond less events. The main improvement over existing tracepoints seems to be the ability to filter on command names. To get that, you overload the @name argument of QMP command trace-event-set-state. In addition to the documented meaning "Event name pattern", it also has an alternate, undocumented meaning "QMP command name pattern". The "undocumented" part is easy enough to fix. However, QMP heavily frowns on argument values that need to be parsed. But before we discuss this in depth, we should decide whether we want the filtering feature. Management applications can enable and disable tracing as needed, but doing it all in QEMU might be more convenient or robust. Libvirt logs all QMP traffic. I doubt it'll make use of your filtering feature. Cc'ing libvir-list just in case. Another way to log all traffic is to route it through socat -x or similar. Opinions?

3 3

[PATCH 0/2] domainMemoryDeviceSizeChange: Two simple improvements
by Michal Privoznik 26 Oct '21

26 Oct '21

*** BLURB HERE *** Michal Prívozník (2): qemu_monitor: Make domainMemoryDeviceSizeChange cb return void qemuProcessHandleMemoryDeviceSizeChange: Use qemuProcessEventSubmit() src/qemu/qemu_monitor.h | 10 +++++----- src/qemu/qemu_process.c | 14 ++------------ 2 files changed, 7 insertions(+), 17 deletions(-) -- 2.32.0

2 3

The exact meaning of DEVICE_REMOVED event
by Han Han 26 Oct '21

26 Oct '21

Hi, developers I has a question about the event VIR_DOMAIN_EVENT_ID_DEVICE_REMOVED. When will it occur? Detach device from an active VM? Or an inactive VM? Or both? I get a code comment from the callback of this event https://gitlab.com/libvirt/libvirt/-/blob/master/include/libvirt/libvirt-do… "This callback occurs when a device is removed from the domain" But it is not clear the domain could be active or inactive or both.

2 1

[libvirt PATCH] util: Drop pointless NUL_TERMINATE macro
by Jiri Denemark 26 Oct '21

26 Oct '21

It's only used once and open coding it is at least as clear as using the macro. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/internal.h | 2 -- src/util/virutil.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/internal.h b/src/internal.h index e1250a59fe..d3809bf057 100644 --- a/src/internal.h +++ b/src/internal.h @@ -91,8 +91,6 @@ #define STREQ_NULLABLE(a, b) (g_strcmp0(a, b) == 0) #define STRNEQ_NULLABLE(a, b) (g_strcmp0(a, b) != 0) -#define NUL_TERMINATE(buf) do { (buf)[sizeof(buf)-1] = '\0'; } while (0) - #ifdef WIN32 # ifndef O_CLOEXEC # define O_CLOEXEC _O_NOINHERIT diff --git a/src/util/virutil.c b/src/util/virutil.c index c9de043c40..e04f1343d8 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -485,7 +485,7 @@ virGetHostnameImpl(bool quiet) "%s", _("failed to determine host name")); return NULL; } - NUL_TERMINATE(hostname); + hostname[sizeof(hostname) - 1] = '\0'; if (STRPREFIX(hostname, "localhost") || strchr(hostname, '.')) { /* in this case, gethostname returned localhost (meaning we can't -- 2.33.1

2 1

[libvirt PATCH] storage_file: Compute QCOW2 cluster size as ULL
by Jiri Denemark 26 Oct '21

26 Oct '21

While the QCOW2 cluster size is represented in only 4 bits in the QCOW2 header and thus 1 << cluster_size cannot overflow int, qcow2GetClusterSize is supposed to return unsigned long long so we can just compute the result as ULL rather than computing it as int and promoting to unsigned long long. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/storage_file/storage_file_probe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/storage_file/storage_file_probe.c b/src/storage_file/storage_file_probe.c index f5bb8b7dbb..dc438a5e5d 100644 --- a/src/storage_file/storage_file_probe.c +++ b/src/storage_file/storage_file_probe.c @@ -487,7 +487,7 @@ qcow2GetClusterSize(const char *buf, clusterBits = virReadBufInt32BE(buf + QCOWX_HDR_CLUSTER_BITS_OFFSET); if (clusterBits > 0) - return 1 << clusterBits; + return 1ULL << clusterBits; return 0; } -- 2.33.1

2 1

[libvirt PATCH] node_device: Fix memory leak in udevProcessMediatedDevice
by Jiri Denemark 26 Oct '21

26 Oct '21

One of the paths returned -1 directly without going through the cleanup section. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/node_device/node_device_udev.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 7c3bb762b3..cd1722f934 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1020,10 +1020,9 @@ static int udevProcessMediatedDevice(struct udev_device *dev, virNodeDeviceDef *def) { - int ret = -1; int iommugrp = -1; - char *linkpath = NULL; - char *canonicalpath = NULL; + g_autofree char *linkpath = NULL; + g_autofree char *canonicalpath = NULL; virNodeDevCapMdev *data = &def->caps->data.mdev; struct udev_device *parent_device = NULL; @@ -1039,19 +1038,19 @@ udevProcessMediatedDevice(struct udev_device *dev, virReportSystemError(errno, _("failed to wait for file '%s' to appear"), linkpath); - goto cleanup; + return -1; } if (virFileResolveLink(linkpath, &canonicalpath) < 0) { virReportSystemError(errno, _("failed to resolve '%s'"), linkpath); - goto cleanup; + return -1; } data->type = g_path_get_basename(canonicalpath); data->uuid = g_strdup(udev_device_get_sysname(dev)); if ((iommugrp = virMediatedDeviceGetIOMMUGroupNum(data->uuid)) < 0) - goto cleanup; + return -1; /* lookup the address of parent device */ parent_device = udev_device_get_parent(dev); @@ -1072,11 +1071,7 @@ udevProcessMediatedDevice(struct udev_device *dev, data->iommuGroupNumber = iommugrp; - ret = 0; - cleanup: - VIR_FREE(linkpath); - VIR_FREE(canonicalpath); - return ret; + return 0; } -- 2.33.1

2 1

[PATCH] cosmetic: remove unused function return value
by Ani Sinha 26 Oct '21

26 Oct '21

qemuBuildPMPCIRootHotplugCommandLine() returns 0 unconditionally. There is no failure scenario at present. So clean up the code by removing integer return from the function and also remove the failure check conditional from the function call. Also fix indentation for the above function call while at it. Signed-off-by: Ani Sinha <ani(a)anisinha.ca> --- src/qemu/qemu_command.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index d6df50ec73..093d8ae62c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3177,9 +3177,9 @@ qemuBuildSkipController(const virDomainControllerDef *controller, return false; } -static int +static void qemuBuildPMPCIRootHotplugCommandLine(virCommand *cmd, - const virDomainControllerDef *controller) + const virDomainControllerDef *controller) { if (controller->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI && controller->model == VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT && @@ -3189,7 +3189,7 @@ qemuBuildPMPCIRootHotplugCommandLine(virCommand *cmd, virCommandAddArgFormat(cmd, "PIIX4_PM.acpi-root-pci-hotplug=%s", virTristateSwitchTypeToString(controller->opts.pciopts.hotplug)); } - return 0; + return; } static int @@ -3207,8 +3207,7 @@ qemuBuildControllersByTypeCommandLine(virCommand *cmd, if (cont->type != type) continue; - if (qemuBuildPMPCIRootHotplugCommandLine(cmd, cont)) - continue; + qemuBuildPMPCIRootHotplugCommandLine(cmd, cont); if (qemuBuildSkipController(cont, def)) continue; -- 2.25.1

2 1

[PATCH] i440fx/hotplug: Fix error message format to conform to spec
by Ani Sinha 26 Oct '21

26 Oct '21

Error messages must conform to spec as specified here: https://www.libvirt.org/coding-style.html#error-message-format This change makes some error messages conform to the spec above. Fixes: 8eadf82fb5 ("conf: introduce option to enable/disable pci hotplug on pci-root controller") Signed-off-by: Ani Sinha <ani(a)anisinha.ca> --- src/qemu/qemu_validate.c | 6 +++--- .../pc-i440fx-acpi-root-hotplug-disable.x86_64-5.1.0.err | 2 +- .../pc-i440fx-acpi-root-hotplug-enable.x86_64-5.1.0.err | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 3045e4b64b..f93b697265 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -3947,7 +3947,7 @@ qemuValidateDomainDeviceDefControllerPCI(const virDomainControllerDef *cont, case VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT: if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_PIIX4_ACPI_ROOT_PCI_HOTPLUG)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("setting the %s property on a '%s' device is not supported by this QEMU binary"), + _("setting the '%s' property on a '%s' device is not supported by this QEMU binary"), "hotplug", "pci-root"); return -1; } @@ -3956,8 +3956,8 @@ qemuValidateDomainDeviceDefControllerPCI(const virDomainControllerDef *cont, case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_SWITCH_DOWNSTREAM_PORT: if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_PCIE_ROOT_PORT_HOTPLUG)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("setting the hotplug property on a '%s' device is not supported by this QEMU binary"), - modelName); + _("setting the '%s' property on a '%s' device is not supported by this QEMU binary"), + "hotplug", modelName); return -1; } break; diff --git a/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-5.1.0.err b/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-5.1.0.err index b507f1f8bc..55ec41c476 100644 --- a/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-5.1.0.err +++ b/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-5.1.0.err @@ -1 +1 @@ -unsupported configuration: setting the hotplug property on a 'pci-root' device is not supported by this QEMU binary +unsupported configuration: setting the 'hotplug' property on a 'pci-root' device is not supported by this QEMU binary diff --git a/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-5.1.0.err b/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-5.1.0.err index b507f1f8bc..55ec41c476 100644 --- a/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-5.1.0.err +++ b/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-5.1.0.err @@ -1 +1 @@ -unsupported configuration: setting the hotplug property on a 'pci-root' device is not supported by this QEMU binary +unsupported configuration: setting the 'hotplug' property on a 'pci-root' device is not supported by this QEMU binary -- 2.25.1

2 1

[PATCH] docs: fix docs output path with meson 0.60.0
by Daniel P. Berrangé 25 Oct '21

25 Oct '21

The meson 0.60.0 release introduced a bug with the '/' operator when using an empty path component. '/foo' / '' will now result in '/foo' not '/foo/' https://github.com/mesonbuild/meson/issues/9450 This breaks libvirt because xsltproc requires the trailing '/' on the output directory path. Fortunately the explicit 'join_paths' function is not affected by the regression Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as a CI / build fix docs/meson.build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/meson.build b/docs/meson.build index cbc138fa1f..fb6e0029d0 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -1,7 +1,9 @@ docs_html_dir = docdir / 'html' # xsltproc requires that the -o path ends with '/' -docs_builddir = meson.current_build_dir() / '' +# Not using '/' operator due to bug in meson 0.60.0 +# https://github.com/mesonbuild/meson/issues/9450 +docs_builddir = join_paths(meson.current_build_dir(), '') docs_assets = [ 'android-chrome-192x192.png', -- 2.31.1

1 0

[PATCH] qemublocktest: Don't leak 'disk' in testQemuImageCreateLoadDiskXML
by Peter Krempa 25 Oct '21

25 Oct '21

The function returns only the source portion but forgot to free the disk wrapper. Fixes: 9696427ad67196 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- Pushed as a trivial CI fix. tests/qemublocktest.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c index 0176fbd3f4..9d3c2fe6b0 100644 --- a/tests/qemublocktest.c +++ b/tests/qemublocktest.c @@ -473,7 +473,7 @@ testQemuImageCreateLoadDiskXML(const char *name, virDomainXMLOption *xmlopt) { - virDomainDiskDef *disk = NULL; + g_autoptr(virDomainDiskDef) disk = NULL; g_autofree char *xmlpath = NULL; g_autofree char *xmlstr = NULL; @@ -490,7 +490,7 @@ testQemuImageCreateLoadDiskXML(const char *name, if (qemuDomainDeviceDiskDefPostParse(disk, 0) < 0) return NULL; - return disk->src; + return g_steal_pointer(&disk->src); } -- 2.31.1

1 0

[PATCH] ci: regenerate container from manifest
by Daniel P. Berrangé 25 Oct '21

25 Oct '21

This removes the libnetcf-dev package from Debian Sid, as it is no longer available in that distro stream. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- * Pushed as a CI build fix ci/containers/debian-sid.Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/containers/debian-sid.Dockerfile b/ci/containers/debian-sid.Dockerfile index d8667c5f1b..16dd6cc587 100644 --- a/ci/containers/debian-sid.Dockerfile +++ b/ci/containers/debian-sid.Dockerfile @@ -46,7 +46,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libglusterfs-dev \ libgnutls28-dev \ libiscsi-dev \ - libnetcf-dev \ libnl-3-dev \ libnl-route-3-dev \ libnuma-dev \ -- 2.31.1

2 2

[PATCH 00/13] qemu_monitor_json: Use g_auto* more
by Michal Privoznik 25 Oct '21

25 Oct '21

*** BLURB HERE *** Michal Prívozník (13): qemu_monitor_json: Don't check for qemuMonitorNextCommandID() retval qemu_monitor_json: Don't transfer ownership to @msg qemuMonitorJSONHumanCommand: Require @reply_str qemuMonitorJSONGetMigrationStats: Don't clear @stats on failure qemuMonitorJSONQueryRxFilterParse: Set *filter only on success qemu_monitor: Declare and use g_autoptr for qemuMonitorEventPanicInfo qemu_monitor_json: Use g_autoptr() for virCPUData qemu_monitor_json: Use g_autoptr() for qemuMonitorCPUModelInfo qemuMonitorJSONExtractPRManagerInfo: Declare @entry inside the loop qemu_monitor_json: Use g_autoptr() for virJSONValue qemu_monitor_json: Use g_autofree qemu_monitor_json: Drop pointless cleanup labels qemu_monitor_json: Drop pointless error labels src/qemu/qemu_monitor.c | 2 +- src/qemu/qemu_monitor.h | 3 +- src/qemu/qemu_monitor_json.c | 1803 ++++++++++++---------------------- 3 files changed, 641 insertions(+), 1167 deletions(-) -- 2.32.0

2 14

[PATCH] lib: Drop intermediary return variables
by Michal Privoznik 25 Oct '21

25 Oct '21

In a few places we declare a variable (which is optionally followed by a code not touching it) then set the variable to a value and return the variable immediately. It's obvious that the variable is needless and the value can be returned directly instead. This patch was generated using this semantic patch: @@ type T; identifier ret; expression E; @@ - T ret; ... when != ret when strict - ret = E; - return ret; + return E; After that I fixed couple of formatting issues because coccinelle formatted some lines differently than our coding style. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/bhyve/bhyve_domain.c | 6 +----- src/conf/domain_addr.c | 6 +----- src/conf/domain_conf.c | 5 +---- src/conf/virnetworkobj.c | 4 +--- src/conf/virnwfilterbindingobj.c | 5 +---- src/conf/virnwfilterobj.c | 5 +---- src/esx/esx_driver.c | 5 +---- src/esx/esx_storage_backend_iscsi.c | 5 +---- src/esx/esx_storage_backend_vmfs.c | 5 +---- src/hyperv/hyperv_driver.c | 5 +---- src/locking/lock_daemon.c | 5 +---- src/locking/lock_driver_sanlock.c | 6 ++---- src/logging/log_daemon.c | 5 +---- src/network/bridge_driver.c | 27 +++++---------------------- src/qemu/qemu_alias.c | 24 ++++-------------------- src/qemu/qemu_command.c | 15 ++++++--------- src/qemu/qemu_domain.c | 10 +++------- src/qemu/qemu_monitor.c | 5 +---- src/security/security_apparmor.c | 5 +---- src/security/security_nop.c | 5 +---- src/test/test_driver.c | 9 ++------- src/util/viraudit.c | 4 +--- src/util/virfirewall.c | 6 +----- src/util/virmacmap.c | 6 +----- src/util/virnetdev.c | 5 +---- src/util/virpci.c | 10 ++-------- src/vbox/vbox_common.c | 7 +++---- tests/bhyvexml2argvmock.c | 5 +---- tests/qemumonitortestutils.c | 5 +---- tests/qemusecuritymock.c | 6 +----- tests/qemuxml2argvmock.c | 5 +---- tests/virnetserverclienttest.c | 6 +----- tests/virpcimock.c | 8 ++------ tests/virusbmock.c | 4 +--- 34 files changed, 54 insertions(+), 190 deletions(-) diff --git a/src/bhyve/bhyve_domain.c b/src/bhyve/bhyve_domain.c index 33e74e2e25..b526235a4e 100644 --- a/src/bhyve/bhyve_domain.c +++ b/src/bhyve/bhyve_domain.c @@ -36,11 +36,7 @@ VIR_LOG_INIT("bhyve.bhyve_domain"); static void * bhyveDomainObjPrivateAlloc(void *opaque G_GNUC_UNUSED) { - bhyveDomainObjPrivate *priv; - - priv = g_new0(bhyveDomainObjPrivate, 1); - - return priv; + return g_new0(bhyveDomainObjPrivate, 1); } static void diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index fe6520cf3a..a06721c35d 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -1862,11 +1862,7 @@ virDomainUSBAddressPortFormat(unsigned int *port) virDomainUSBAddressSet * virDomainUSBAddressSetCreate(void) { - virDomainUSBAddressSet *addrs; - - addrs = g_new0(virDomainUSBAddressSet, 1); - - return addrs; + return g_new0(virDomainUSBAddressSet, 1); } diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 15228d1e38..1b36699761 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -28879,10 +28879,7 @@ char *virDomainConfigFile(const char *dir, const char *name) { - char *ret; - - ret = g_strdup_printf("%s/%s.xml", dir, name); - return ret; + return g_strdup_printf("%s/%s.xml", dir, name); } /* Translates a device name of the form (regex) "[fhv]d[a-z]+" into diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index aa629af6f6..f1baffc516 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -1601,9 +1601,7 @@ char * virNetworkObjGetPortStatusDir(virNetworkObj *net, const char *stateDir) { - char *ret; - ret = g_strdup_printf("%s/%s/ports", stateDir, net->def->name); - return ret; + return g_strdup_printf("%s/%s/ports", stateDir, net->def->name); } int diff --git a/src/conf/virnwfilterbindingobj.c b/src/conf/virnwfilterbindingobj.c index 29fbb63b5f..acea240b5d 100644 --- a/src/conf/virnwfilterbindingobj.c +++ b/src/conf/virnwfilterbindingobj.c @@ -138,10 +138,7 @@ char * virNWFilterBindingObjConfigFile(const char *dir, const char *name) { - char *ret; - - ret = g_strdup_printf("%s/%s.xml", dir, name); - return ret; + return g_strdup_printf("%s/%s.xml", dir, name); } diff --git a/src/conf/virnwfilterobj.c b/src/conf/virnwfilterobj.c index c3b2eb048c..6bbdf6e6fa 100644 --- a/src/conf/virnwfilterobj.c +++ b/src/conf/virnwfilterobj.c @@ -117,10 +117,7 @@ virNWFilterObjListFree(virNWFilterObjList *nwfilters) virNWFilterObjList * virNWFilterObjListNew(void) { - virNWFilterObjList *nwfilters; - - nwfilters = g_new0(virNWFilterObjList, 1); - return nwfilters; + return g_new0(virNWFilterObjList, 1); } diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 5d9687733f..ee752662ec 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -1800,10 +1800,7 @@ esxDomainDestroy(virDomainPtr dom) static char * esxDomainGetOSType(virDomainPtr domain G_GNUC_UNUSED) { - char *osType; - - osType = g_strdup("hvm"); - return osType; + return g_strdup("hvm"); } diff --git a/src/esx/esx_storage_backend_iscsi.c b/src/esx/esx_storage_backend_iscsi.c index d89b5a4ba8..043de1690d 100644 --- a/src/esx/esx_storage_backend_iscsi.c +++ b/src/esx/esx_storage_backend_iscsi.c @@ -766,10 +766,7 @@ esxStorageVolWipe(virStorageVolPtr volume G_GNUC_UNUSED, static char * esxStorageVolGetPath(virStorageVolPtr volume) { - char *path; - - path = g_strdup(volume->name); - return path; + return g_strdup(volume->name); } diff --git a/src/esx/esx_storage_backend_vmfs.c b/src/esx/esx_storage_backend_vmfs.c index cb2be59a33..5dba813111 100644 --- a/src/esx/esx_storage_backend_vmfs.c +++ b/src/esx/esx_storage_backend_vmfs.c @@ -1392,10 +1392,7 @@ esxStorageVolGetXMLDesc(virStorageVolPtr volume, static char * esxStorageVolGetPath(virStorageVolPtr volume) { - char *path; - - path = g_strdup_printf("[%s] %s", volume->pool, volume->name); - return path; + return g_strdup_printf("[%s] %s", volume->pool, volume->name); } diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index a672901a81..3e6360f2a7 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -2234,10 +2234,7 @@ hypervDomainDestroy(virDomainPtr domain) static char * hypervDomainGetOSType(virDomainPtr domain G_GNUC_UNUSED) { - char *osType; - - osType = g_strdup("hvm"); - return osType; + return g_strdup("hvm"); } diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index fa08acbc76..faca4a2485 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -616,10 +616,7 @@ virLockDaemonExecRestartStatePath(bool privileged, static char * virLockDaemonGetExecRestartMagic(void) { - char *ret; - - ret = g_strdup_printf("%lld", (long long int)getpid()); - return ret; + return g_strdup_printf("%lld", (long long int)getpid()); } diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index 46e2cbc4f0..2dceb1eefc 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -174,13 +174,11 @@ static int virLockManagerSanlockInitLockspace(virLockManagerSanlockDriver *driver, struct sanlk_lockspace *ls) { - int ret; - const int max_hosts = 0; /* defaults used in sanlock_init() implementation */ const unsigned int lockspaceFlags = 0; - ret = sanlock_write_lockspace(ls, max_hosts, lockspaceFlags, driver->io_timeout); - return ret; + return sanlock_write_lockspace(ls, max_hosts, lockspaceFlags, + driver->io_timeout); } /* How many times try adding a lockspace? */ diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c index 1b04fbdae8..cc7889399b 100644 --- a/src/logging/log_daemon.c +++ b/src/logging/log_daemon.c @@ -423,10 +423,7 @@ virLogDaemonExecRestartStatePath(bool privileged, static char * virLogDaemonGetExecRestartMagic(void) { - char *ret; - - ret = g_strdup_printf("%lld", (long long int)getpid()); - return ret; + return g_strdup_printf("%lld", (long long int)getpid()); } diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 7027dc636c..498c45d0a7 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -365,10 +365,7 @@ static char * networkDnsmasqLeaseFileNameDefault(virNetworkDriverState *driver, const char *netname) { - char *leasefile; - - leasefile = g_strdup_printf("%s/%s.leases", driver->dnsmasqStateDir, netname); - return leasefile; + return g_strdup_printf("%s/%s.leases", driver->dnsmasqStateDir, netname); } @@ -376,10 +373,7 @@ static char * networkDnsmasqLeaseFileNameCustom(virNetworkDriverState *driver, const char *bridge) { - char *leasefile; - - leasefile = g_strdup_printf("%s/%s.status", driver->dnsmasqStateDir, bridge); - return leasefile; + return g_strdup_printf("%s/%s.status", driver->dnsmasqStateDir, bridge); } @@ -387,21 +381,13 @@ static char * networkDnsmasqConfigFileName(virNetworkDriverState *driver, const char *netname) { - char *conffile; - - conffile = g_strdup_printf("%s/%s.conf", driver->dnsmasqStateDir, netname); - return conffile; + return g_strdup_printf("%s/%s.conf", driver->dnsmasqStateDir, netname); } static char * networkRadvdPidfileBasename(const char *netname) -{ - /* this is simple but we want to be sure it's consistently done */ - char *pidfilebase; - - pidfilebase = g_strdup_printf("%s-radvd", netname); - return pidfilebase; +{return g_strdup_printf("%s-radvd", netname); } @@ -409,10 +395,7 @@ static char * networkRadvdConfigFileName(virNetworkDriverState *driver, const char *netname) { - char *configfile; - - configfile = g_strdup_printf("%s/%s-radvd.conf", driver->radvdStateDir, netname); - return configfile; + return g_strdup_printf("%s/%s-radvd.conf", driver->radvdStateDir, netname); } diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c index 276a03cb56..a36f346592 100644 --- a/src/qemu/qemu_alias.c +++ b/src/qemu/qemu_alias.c @@ -804,11 +804,7 @@ qemuAliasFromHostdev(const virDomainHostdevDef *hostdev) char * qemuDomainGetMasterKeyAlias(void) { - char *alias; - - alias = g_strdup("masterKey0"); - - return alias; + return g_strdup("masterKey0"); } @@ -837,11 +833,7 @@ qemuAliasForSecret(const char *parentalias, char * qemuAliasTLSObjFromSrcAlias(const char *srcAlias) { - char *ret; - - ret = g_strdup_printf("obj%s_tls0", srcAlias); - - return ret; + return g_strdup_printf("obj%s_tls0", srcAlias); } @@ -853,11 +845,7 @@ qemuAliasTLSObjFromSrcAlias(const char *srcAlias) char * qemuAliasChardevFromDevAlias(const char *devAlias) { - char *ret; - - ret = g_strdup_printf("char%s", devAlias); - - return ret; + return g_strdup_printf("char%s", devAlias); } @@ -871,11 +859,7 @@ qemuDomainGetManagedPRAlias(void) char * qemuDomainGetUnmanagedPRAlias(const char *parentalias) { - char *ret; - - ret = g_strdup_printf("pr-helper-%s", parentalias); - - return ret; + return g_strdup_printf("pr-helper-%s", parentalias); } diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index d6df50ec73..335bad5616 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3811,18 +3811,15 @@ qemuBuildMemoryDeviceProps(const virDomainDef *def, static char * qemuBuildLegacyNicStr(virDomainNetDef *net) { - char *str; char macaddr[VIR_MAC_STRING_BUFLEN]; const char *netmodel = virDomainNetGetModelString(net); - str = g_strdup_printf("nic,macaddr=%s,netdev=host%s%s%s%s%s", - virMacAddrFormat(&net->mac, macaddr), - net->info.alias, - netmodel ? ",model=" : "", - NULLSTR_EMPTY(netmodel), - (net->info.alias ? ",id=" : ""), - NULLSTR_EMPTY(net->info.alias)); - return str; + return g_strdup_printf("nic,macaddr=%s,netdev=host%s%s%s%s%s", + virMacAddrFormat(&net->mac, macaddr), + net->info.alias, netmodel ? ",model=" : "", + NULLSTR_EMPTY(netmodel), + (net->info.alias ? ",id=" : ""), + NULLSTR_EMPTY(net->info.alias)); } diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index e719c7b8c7..d0cb2eebed 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5944,13 +5944,9 @@ qemuDomainDefFromXML(virQEMUDriver *driver, virQEMUCaps *qemuCaps, const char *xml) { - virDomainDef *def; - - def = virDomainDefParseString(xml, driver->xmlopt, qemuCaps, - VIR_DOMAIN_DEF_PARSE_INACTIVE | - VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE); - - return def; + return virDomainDefParseString(xml, driver->xmlopt, qemuCaps, + VIR_DOMAIN_DEF_PARSE_INACTIVE | + VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE); } diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 6b6d6cd613..81d9087839 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -920,10 +920,7 @@ qemuMonitorClose(qemuMonitor *mon) char * qemuMonitorNextCommandID(qemuMonitor *mon) { - char *id; - - id = g_strdup_printf("libvirt-%d", ++mon->nextSerial); - return id; + return g_strdup_printf("libvirt-%d", ++mon->nextSerial); } diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c index 2cc15ba6af..dadcfd67db 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -1169,10 +1169,7 @@ static char * AppArmorGetMountOptions(virSecurityManager *mgr G_GNUC_UNUSED, virDomainDef *vm G_GNUC_UNUSED) { - char *opts; - - opts = g_strdup(""); - return opts; + return g_strdup(""); } static const char * diff --git a/src/security/security_nop.c b/src/security/security_nop.c index a634e7f3fe..0b3d37142a 100644 --- a/src/security/security_nop.c +++ b/src/security/security_nop.c @@ -178,10 +178,7 @@ static char * virSecurityDomainGetMountOptionsNop(virSecurityManager *mgr G_GNUC_UNUSED, virDomainDef *vm G_GNUC_UNUSED) { - char *opts; - - opts = g_strdup(""); - return opts; + return g_strdup(""); } static const char * diff --git a/src/test/test_driver.c b/src/test/test_driver.c index b5413cc03d..fd7486b8ca 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1666,7 +1666,6 @@ static char * testConnectGetSysinfo(virConnectPtr conn G_GNUC_UNUSED, unsigned int flags) { - char *ret; const char *sysinfo = "<sysinfo type='smbios'>\n" " <bios>\n" " <entry name='vendor'>LENOVO</entry>\n" @@ -1678,8 +1677,7 @@ testConnectGetSysinfo(virConnectPtr conn G_GNUC_UNUSED, virCheckFlags(0, NULL); - ret = g_strdup(sysinfo); - return ret; + return g_strdup(sysinfo); } static const char * @@ -2706,10 +2704,7 @@ testDomainCoreDump(virDomainPtr domain, static char * testDomainGetOSType(virDomainPtr dom G_GNUC_UNUSED) { - char *ret; - - ret = g_strdup("linux"); - return ret; + return g_strdup("linux"); } diff --git a/src/util/viraudit.c b/src/util/viraudit.c index bbd2462897..76ad3a73ed 100644 --- a/src/util/viraudit.c +++ b/src/util/viraudit.c @@ -140,8 +140,6 @@ char *virAuditEncode(const char *key, const char *value) #if WITH_AUDIT return audit_encode_nv_string(key, value, 0); #else - char *str; - str = g_strdup_printf("%s=%s", key, value); - return str; + return g_strdup_printf("%s=%s", key, value); #endif } diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c index fb02992912..1a546335f6 100644 --- a/src/util/virfirewall.c +++ b/src/util/virfirewall.c @@ -157,11 +157,7 @@ virFirewallSetBackend(virFirewallBackend backend) static virFirewallGroup * virFirewallGroupNew(void) { - virFirewallGroup *group; - - group = g_new0(virFirewallGroup, 1); - - return group; + return g_new0(virFirewallGroup, 1); } diff --git a/src/util/virmacmap.c b/src/util/virmacmap.c index 297d57a931..fb16062cd1 100644 --- a/src/util/virmacmap.c +++ b/src/util/virmacmap.c @@ -267,11 +267,7 @@ char * virMacMapFileName(const char *dnsmasqStateDir, const char *bridge) { - char *filename; - - filename = g_strdup_printf("%s/%s.macs", dnsmasqStateDir, bridge); - - return filename; + return g_strdup_printf("%s/%s.macs", dnsmasqStateDir, bridge); } diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 5b4c585716..58f7360a0f 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -2803,10 +2803,7 @@ static int virNetDevGetMulticastTable(const char *ifname, virNetDevRxFilter * virNetDevRxFilterNew(void) { - virNetDevRxFilter *filter; - - filter = g_new0(virNetDevRxFilter, 1); - return filter; + return g_new0(virNetDevRxFilter, 1); } diff --git a/src/util/virpci.c b/src/util/virpci.c index e746a2b25b..2d12e28004 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -1438,14 +1438,8 @@ void virPCIDeviceAddressCopy(virPCIDeviceAddress *dst, char * virPCIDeviceAddressAsString(const virPCIDeviceAddress *addr) { - char *str; - - str = g_strdup_printf(VIR_PCI_DEVICE_ADDRESS_FMT, - addr->domain, - addr->bus, - addr->slot, - addr->function); - return str; + return g_strdup_printf(VIR_PCI_DEVICE_ADDRESS_FMT, addr->domain, + addr->bus, addr->slot, addr->function); } bool diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 7334254a36..45e7225ae1 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -2699,16 +2699,15 @@ static int vboxDomainDestroy(virDomainPtr dom) return vboxDomainDestroyFlags(dom, 0); } -static char *vboxDomainGetOSType(virDomainPtr dom G_GNUC_UNUSED) { +static char *vboxDomainGetOSType(virDomainPtr dom G_GNUC_UNUSED) +{ /* Returning "hvm" always as suggested on list, cause * this functions seems to be badly named and it * is supposed to pass the ABI name and not the domain * operating system driver as I had imagined ;) */ - char *osType; - osType = g_strdup("hvm"); - return osType; + return g_strdup("hvm"); } static int vboxDomainSetMemory(virDomainPtr dom, unsigned long memory) diff --git a/tests/bhyvexml2argvmock.c b/tests/bhyvexml2argvmock.c index f3820ef032..9b77f97e5f 100644 --- a/tests/bhyvexml2argvmock.c +++ b/tests/bhyvexml2argvmock.c @@ -74,10 +74,7 @@ int virNetDevTapCreateInBridgePort(const char *brname G_GNUC_UNUSED, char *virNetDevTapGetRealDeviceName(char *name G_GNUC_UNUSED) { - char *fakename; - - fakename = g_strdup("faketapdev"); - return fakename; + return g_strdup("faketapdev"); } int virNetDevSetOnline(const char *ifname G_GNUC_UNUSED, diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index 35a1bce071..75a6a76b92 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -1282,13 +1282,10 @@ qemuMonitorTestFullAddItem(qemuMonitorTest *test, size_t line) { g_autofree char *cmderr = NULL; - int ret; cmderr = g_strdup_printf("wrong expected command in %s:%zu: ", filename, line); - ret = qemuMonitorTestAddItemVerbatim(test, command, cmderr, response); - - return ret; + return qemuMonitorTestAddItemVerbatim(test, command, cmderr, response); } diff --git a/tests/qemusecuritymock.c b/tests/qemusecuritymock.c index 87aadf564e..f092383b62 100644 --- a/tests/qemusecuritymock.c +++ b/tests/qemusecuritymock.c @@ -128,11 +128,7 @@ static char * get_key(const char *path, const char *name) { - char *ret; - - ret = g_strdup_printf("%s:%s", path, name); - - return ret; + return g_strdup_printf("%s:%s", path, name); } diff --git a/tests/qemuxml2argvmock.c b/tests/qemuxml2argvmock.c index 2265492f1e..f4e2f52680 100644 --- a/tests/qemuxml2argvmock.c +++ b/tests/qemuxml2argvmock.c @@ -107,12 +107,9 @@ virNumaNodesetIsAvailable(virBitmap *nodeset) char * virTPMCreateCancelPath(const char *devpath) { - char *path; (void)devpath; - path = g_strdup("/sys/class/misc/tpm0/device/cancel"); - - return path; + return g_strdup("/sys/class/misc/tpm0/device/cancel"); } /** diff --git a/tests/virnetserverclienttest.c b/tests/virnetserverclienttest.c index 942901bf60..d3c817f70d 100644 --- a/tests/virnetserverclienttest.c +++ b/tests/virnetserverclienttest.c @@ -30,11 +30,7 @@ static void * testClientNew(virNetServerClient *client G_GNUC_UNUSED, void *opaque G_GNUC_UNUSED) { - char *dummy; - - dummy = g_new0(char, 1); - - return dummy; + return g_new0(char, 1); } diff --git a/tests/virpcimock.c b/tests/virpcimock.c index 0f8d5ad54f..f65ae7c0c5 100644 --- a/tests/virpcimock.c +++ b/tests/virpcimock.c @@ -351,12 +351,8 @@ remove_fd(int fd) static char * pci_address_format(struct pciDeviceAddress const *addr) { - char *ret; - - ret = g_strdup_printf(ADDR_STR_FMT, - addr->domain, addr->bus, - addr->device, addr->function); - return ret; + return g_strdup_printf(ADDR_STR_FMT, addr->domain, addr->bus, + addr->device, addr->function); } static int diff --git a/tests/virusbmock.c b/tests/virusbmock.c index a1f539b8b1..5b09895197 100644 --- a/tests/virusbmock.c +++ b/tests/virusbmock.c @@ -64,14 +64,12 @@ static char *get_fake_path(const char *real_path) DIR *opendir(const char *name) { g_autofree char *path = NULL; - DIR* ret; init_syms(); path = get_fake_path(name); - ret = realopendir(path); - return ret; + return realopendir(path); } int open(const char *pathname, int flags, ...) -- 2.32.0

2 1

[PATCH v3 0/5] qapi: Add feature flags to enum members
by Markus Armbruster 25 Oct '21

25 Oct '21

PATCH 1+2 add feature flags to enum members. Awkward due to an introspection design mistake; see PATCH 1 for details. PATCH 3+4 implement policy deprecated-input={reject,crash} for enum values. Policy deprecated-output=hide is not implemented, because we can't hide a value without hiding the entire member, which is almost certainly more than the requester of this policy bargained for. Perhaps we want a new policy deprecated-output=hide-or-else-crash to help us catch unwanted use of deprecated enum values. Perhaps we want deprecated-output=hide to behave that way together with deprecated-input=crash. Or even always. Thoughts? PATCH 5 puts the new feature flags to use. It's RFC because it makes sense only on top of Vladimir's deprecation of drive-backup. See its commit message for a reference. I prefer to commit new features together with a use outside tests/. PATCH 5 adds such a use, but it's RFC, because it depends on Vladimir's work. Perhaps another use pops up. I can delay this work in the hope of a use becoming ready, but the feature flags work I have in the pipeline will eventually force my hand. v3: * PATCH 1+2: Update qapi-code-gen.rst [Kevin, Eric] * PATCH 4: Commit message typo [Eric], doc update moved to PATCH 2 * PATCH 5: Doc comment FIXME resolved [Kevin] v2: * Rebased with straightforward conflicts. * PATCH 1-4: No longer RFC. * PATCH 1: "Since" information fixed [Eric]. Commit message updated to reflect feedback. * PATCH 2: Commit message amended to point out special feature flag 'deprecated' is ignored at this stage. * PATCH 4: Documentation updated. Commit message tweaked. Markus Armbruster (5): qapi: Enable enum member introspection to show more than name qapi: Add feature flags to enum members qapi: Move compat policy from QObject to generic visitor qapi: Implement deprecated-input={reject,crash} for enum values block: Deprecate transaction type drive-backup docs/devel/qapi-code-gen.rst | 29 ++++++++++++++----- qapi/compat.json | 3 ++ qapi/introspect.json | 24 +++++++++++++-- qapi/transaction.json | 6 +++- include/qapi/qobject-input-visitor.h | 4 --- include/qapi/qobject-output-visitor.h | 4 --- include/qapi/util.h | 6 +++- include/qapi/visitor-impl.h | 3 ++ include/qapi/visitor.h | 9 ++++++ qapi/qapi-visit-core.c | 27 +++++++++++++++-- qapi/qmp-dispatch.c | 4 +-- qapi/qobject-input-visitor.c | 14 +-------- qapi/qobject-output-visitor.c | 14 +-------- scripts/qapi/expr.py | 3 +- scripts/qapi/introspect.py | 19 +++++++++--- scripts/qapi/schema.py | 22 ++++++++++++-- scripts/qapi/types.py | 17 ++++++++++- tests/qapi-schema/doc-good.json | 5 +++- tests/qapi-schema/doc-good.out | 3 ++ tests/qapi-schema/doc-good.txt | 3 ++ .../qapi-schema/enum-dict-member-unknown.err | 2 +- tests/qapi-schema/qapi-schema-test.json | 3 +- tests/qapi-schema/qapi-schema-test.out | 1 + tests/qapi-schema/test-qapi.py | 1 + 24 files changed, 164 insertions(+), 62 deletions(-) -- 2.31.1

1 6

[libvirt PATCH 0/1] [RFC] Ignore EPERM on attempts to clear a VF VLAN ID
by Dmitrii Shcherbakov 22 Oct '21

22 Oct '21

SmartNIC DPUs may not expose some privileged eswitch operations to the hypervisor hosts. For example, this happens with Bluefield devices running in the ECPF (default) mode [1] for security reasons. While VF MAC address programming is possible via an RTM_SETLINK operation, trying to set a VLAN ID in the same operation will fail with EPERM. The equivalent ip link commands below provide an illustration: 1. This works (ECPF mode): sudo ip link set enp130s0f0 vf 2 mac de:ad:be:ef:ca:fe 2. Setting (or clearing) a VLAN fails with EPERM: sudo ip link set enp130s0f0 vf 2 vlan 0 RTNETLINK answers: Operation not permitted 3. This is what Libvirt attempts to do today (when trying to clear a VF VLAN at the same time as programming a VF MAC). sudo ip link set enp130s0f0 vf 2 vlan 0 mac de:ad:be:ef:ca:fe RTNETLINK answers: Operation not permitted If setting an explicit VLAN ID results in an EPERM, clearing a VLAN (setting a VLAN ID to 0) can be handled gracefully by ignoring the EPERM error with the rationale being that if we cannot set this state in the first place, we cannot clear it either. The downside is that we do not know if the VLAN setting operation failed previously with the same error or if it succeded and it is just clearing that fails with EPERM but this seems like a very unlikely scenario. Thus, virNetDevSetVfConfig is split into two distinct functions. If clearing a VLAN ID fails with EPERM, the error is simply ignored. An alternative to this could be providing a higher level control plane mechanism that would provide metadata about a device being remotely managed in which case Libvirt would avoid trying to set or clear a VLAN ID. This would be more complicated since other software (like Nova in the OpenStack case) would have to annotate every guest device with an attribute indicating whether a device is remotely managed or not based on operator provided configuration so that Libvirt can act on this and avoid VLAN programming. Note: this is an RFC to get some feedback before going into adding additional test cases and possibly reducing duplication in how the requests are formed. [1] https://docs.mellanox.com/display/BlueFieldSWv35111601/Modes+of+Operation#M… Dmitrii Shcherbakov (1): Ignore EPERM on attempts to clear VF VLAN ID src/util/virnetdev.c | 144 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 124 insertions(+), 20 deletions(-) -- 2.32.0

1 1

[libvirt PATCH 00/13] cgroup and thread management in ch driver.
by Vineeth Pillai 21 Oct '21

21 Oct '21

This patchset adds support for cgroup management of ch threads. This version correctly manages cgroups for vcpu and emulator threads created by ch. cgroup management for iothreads is not yet supported. Along with cgroup management, this patchset also enables support for pinning vcpu and emulator threads to selected host cpus. Praveen K Paladugu (2): ch_process: Setup emulator and iothread settings ch_driver: emulator threadinfo & pinning callbacks Vineeth Pillai (11): util: Helper functions to get process info ch: Explicitly link to virt_util_lib ch_domain: add virCHDomainGetMonitor helper method ch_domain: add methods to manage private vcpu data ch_driver,ch_domain: vcpu info getter callbacks ch_driver: domainGetVcpuPinInfo and nodeGetCPUMap ch_monitor: Get nicindexes in prep for cgroup mgmt ch_cgroup: methods for cgroup mgmt in ch driver ch_driver,ch_domain: vcpupin callback in ch driver ch_driver: enable typed param string for numatune ch_driver: add numatune callbacks for CH driver po/POTFILES.in | 1 + src/ch/ch_cgroup.c | 457 ++++++++++++++++++++++++ src/ch/ch_cgroup.h | 45 +++ src/ch/ch_conf.c | 2 + src/ch/ch_conf.h | 9 +- src/ch/ch_domain.c | 170 ++++++++- src/ch/ch_domain.h | 32 +- src/ch/ch_driver.c | 810 +++++++++++++++++++++++++++++++++++++++++- src/ch/ch_monitor.c | 254 ++++++++++++- src/ch/ch_monitor.h | 60 +++- src/ch/ch_process.c | 368 ++++++++++++++++++- src/ch/ch_process.h | 3 + src/ch/meson.build | 6 + src/util/virprocess.c | 136 +++++++ src/util/virprocess.h | 5 + 15 files changed, 2329 insertions(+), 29 deletions(-) create mode 100644 src/ch/ch_cgroup.c create mode 100644 src/ch/ch_cgroup.h -- 2.27.0

1 13

[PATCH 0/4] virt-aa-helper: Add new option to remove corrupted
by Ioanna Alifieraki 21 Oct '21

21 Oct '21

This patch-series aims to address the bug reported in [1] and [2]. Bug description : Some times libvirt fails to start a vm with the following error : libvirt: error : unable to set AppArmor profile 'libvirt-b05b297f-952f-42d6-b04e-f9a13767db54' for '/usr/bin/kvm-spice': No such file or directory This happens because file /etc/apparmor.d/libvirt/libvirt-<vm-uuid> has 0 size. During the vm start-up virt-aa-helper tries to load the profile and because it is 0 it fails. When file /etc/apparmor.d/libvirt/libvirt-<vm-uuid> is removed the vm can start without problems. To address this issue this patch-series suggests the following. On the vm start-up check if the profile has 0 size and if this is the case remove it and create it again. To do so a new option (-P) is introduced and also create and remove profile fuctionalities are placed into separate functions. The first commit moves create and remove functionlites into functinos for later reuse from different places. The second commit adds a new option (-P) to remove the profile file. The thid commit implements the actual fix (check if the profile has 0 size and if so remove it and create it again). The fourth patch adds a test for the above fix. [1] https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1927519 [2] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=890084 Ioanna Alifieraki (4): virt-aa-helper: Move create and remove profile into separate functions virt-aa-helper: Add new purge (-P) option virt-aa-helper: Purge profile if corrupted virt-aa-helper: test: add test for new option -P src/security/virt-aa-helper.c | 87 ++++++++++++++++++++++++++--------- tests/meson.build | 1 + tests/virt-aa-helper-test | 29 ++++++++++++ 3 files changed, 96 insertions(+), 21 deletions(-) -- 2.17.1

4 11

[libvirt PATCH v7 0/5] Add a PCI/PCIe device VPD Capability
by Dmitrii Shcherbakov 21 Oct '21

21 Oct '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). v7 changes: * Fixed a number of memleaks in virpcivpd.c, virpcivpdtest.c, node_device_conf.c (see the test results in a paste below); * Moved some preprocessor definitions and virPCIVPDResourceFieldValueFormat to virpcivpdpriv.h (not the .c file since those are used in unit tests); * virPCIVPDResourceUpdateKeyword now prints a warning and returns true for unexpected keywords, whereas virPCIVPDParseVPDLargeResourceFields fails on errors returned from virPCIVPDResourceUpdateKeyword; * Updates to static fields now free the memory allocated to old values. Build & test results for targets in ci/manifest.yaml: ci/helper test --meson-args='-Dexpensive_tests=enabled' <target> as well as valgrind results for the following: valgrind --leak-check=full build/tests/virpcivpdtest valgrind --leak-check=full build/tests/nodedevxml2xmltest valgrind --leak-check=full build/tests/virpcitest https://gist.github.com/dshcherb/b2c92f8d0eabab818ea1e2113d585ab4 Dmitrii Shcherbakov (5): 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 news: Add PCI VPD parser & capability notes NEWS.rst | 22 + build-aux/syntax-check.mk | 4 +- docs/drvnodedev.html.in | 69 ++ docs/formatnode.html.in | 63 +- docs/schemas/nodedev.rng | 96 +++ include/libvirt/libvirt-nodedev.h | 1 + po/POTFILES.in | 1 + src/conf/node_device_conf.c | 309 +++++++ src/conf/node_device_conf.h | 7 +- src/conf/virnodedeviceobj.c | 7 +- src/libvirt_private.syms | 20 + 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 | 70 ++ src/util/virpci.h | 4 + src/util/virpcivpd.c | 754 ++++++++++++++++ src/util/virpcivpd.h | 76 ++ src/util/virpcivpdpriv.h | 83 ++ tests/meson.build | 1 + .../pci_0000_42_00_0_vpd.xml | 42 + .../pci_0000_42_00_0_vpd.xml | 1 + tests/nodedevxml2xmltest.c | 1 + tests/testutils.c | 35 + tests/testutils.h | 4 + tests/virpcimock.c | 32 + tests/virpcitest.c | 39 + tests/virpcivpdtest.c | 809 ++++++++++++++++++ tools/virsh-nodedev.c | 3 + 29 files changed, 2553 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.32.0

2 11

[PATCH v2 0/6] qemu_monitor_json: Assume existence of some commands
by Michal Privoznik 21 Oct '21

21 Oct '21

Technically a v2 of: https://listman.redhat.com/archives/libvir-list/2021-October/msg00825.html but I've cancelled sending in the middle of v1. Anyway, patch 1/6 is new (yeah, I've noticed a test failing so I've cancelled sending v1). Michal Prívozník (6): qemumigparamstest: Drop "unsupported" test case qemuMonitorJSONGetMigrationParams: Don't return early on CommandNotFound qemuMonitorJSONGetDumpGuestMemoryCapability: Don't return early on CommandNotFound qemuMonitorJSONGetKVMState: Don't return early on CommandNotFound qemuMonitorJSONGetMemoryDeviceInfo: Don't return early on CommandNotFound qemuMonitorJSONGetMigrationCapabilities: Don't return early on CommandNotFound src/qemu/qemu_monitor_json.c | 23 ----------------------- tests/qemumigparamsdata/unsupported.json | 3 --- tests/qemumigparamsdata/unsupported.reply | 7 ------- tests/qemumigparamsdata/unsupported.xml | 4 ---- tests/qemumigparamstest.c | 1 - 5 files changed, 38 deletions(-) delete mode 100644 tests/qemumigparamsdata/unsupported.json delete mode 100644 tests/qemumigparamsdata/unsupported.reply delete mode 100644 tests/qemumigparamsdata/unsupported.xml -- 2.32.0

2 7

[PATCH v4 0/5] Add support for librbd encryption
by Or Ozeri 21 Oct '21

21 Oct '21

v4: - added disk post parse to image creation flow in qemublocktest (since more tests failed after adding engine validation) - removed symlink changes - added luks2 and engine documentation - switched to using enum engine instead of int - added validation for encryption engine and formats v3: rebased on master v2: addressed (hopefully) all of Peter's v1 comments (thanks Peter!) Or Ozeri (5): qemu: add disk post parse to qemublocktest qemu: capablities: Detect presence of 'rbd-encryption' as QEMU_CAPS_RBD_ENCRYPTION conf: add encryption engine property qemu: add librbd encryption engine conf: add luks2 encryption format docs/formatstorageencryption.html.in | 23 ++++- docs/schemas/domainbackup.rng | 7 ++ docs/schemas/storagecommon.rng | 9 ++ src/conf/storage_encryption_conf.c | 29 ++++++- src/conf/storage_encryption_conf.h | 11 +++ src/qemu/qemu_block.c | 33 ++++++++ src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_domain.c | 61 +++++++++++++- src/qemu/qemu_domain.h | 3 + tests/qemublocktest.c | 29 +++---- .../caps_6.1.0.x86_64.xml | 1 + tests/qemustatusxml2xmldata/upgrade-out.xml | 6 +- ...sk-network-rbd-encryption.x86_64-6.0.0.err | 1 + ...-network-rbd-encryption.x86_64-latest.args | 49 +++++++++++ .../disk-network-rbd-encryption.xml | 75 +++++++++++++++++ tests/qemuxml2argvdata/disk-nvme.xml | 2 +- .../qemuxml2argvdata/encrypted-disk-usage.xml | 2 +- tests/qemuxml2argvdata/luks-disks.xml | 4 +- tests/qemuxml2argvdata/user-aliases.xml | 2 +- tests/qemuxml2argvtest.c | 2 + ...k-network-rbd-encryption.x86_64-latest.xml | 83 +++++++++++++++++++ .../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 +-- tests/qemuxml2xmltest.c | 1 + 27 files changed, 421 insertions(+), 45 deletions(-) create mode 100644 tests/qemuxml2argvdata/disk-network-rbd-encryption.x86_64-6.0.0.err create mode 100644 tests/qemuxml2argvdata/disk-network-rbd-encryption.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-network-rbd-encryption.xml create mode 100644 tests/qemuxml2xmloutdata/disk-network-rbd-encryption.x86_64-latest.xml -- 2.25.1

3 14

[PATCH 0/5] qemu_monitor_json: Assume existence of some commands
by Michal Privoznik 21 Oct '21

21 Oct '21

Just like with QEMU capabilities, we can safely assume existence of some monitor commands because they were introduced in older than minimal required version and do not depend on QEMU build arguments. Michal Prívozník (5): qemuMonitorJSONGetMigrationParams: Don't return early on CommandNotFound qemuMonitorJSONGetDumpGuestMemoryCapability: Don't return early on CommandNotFound qemuMonitorJSONGetKVMState: Don't return early on CommandNotFound qemuMonitorJSONGetMemoryDeviceInfo: Don't return early on CommandNotFound qemuMonitorJSONGetMigrationCapabilities: Don't return early on CommandNotFound src/qemu/qemu_monitor_json.c | 23 ----------------------- 1 file changed, 23 deletions(-) -- 2.32.0

2 1

[PATCH v2 0/5] qapi: Add feature flags to enum members
by Markus Armbruster 21 Oct '21

21 Oct '21

PATCH 1+2 add feature flags to enum members. Awkward due to an introspection design mistake; see PATCH 1 for details. PATCH 3+4 implement policy deprecated-input={reject,crash} for enum values. Policy deprecated-output=hide is not implemented, because we can't hide a value without hiding the entire member, which is almost certainly more than the requester of this policy bargained for. Perhaps we want a new policy deprecated-output=hide-or-else-crash to help us catch unwanted use of deprecated enum values. Perhaps we want deprecated-output=hide to behave that way together with deprecated-input=crash. Or even always. Thoughts? PATCH 5 puts the new feature flags to use. It's RFC because it makes sense only on top of Vladimir's deprecation of drive-backup. See its commit message for a reference. I prefer to commit new features together with a use outside tests/. PATCH 5 adds such a use, but it's RFC, because it depends on Vladimir's work. Perhaps another use pops up. I can delay this work in the hope of a use becoming ready, but the feature flags work I have in the pipeline will eventually force my hand. v2: * Rebased with straightforward conflicts. * PATCH 1-4: No longer RFC. * PATCH 1: "Since" information fixed [Eric]. Commit message updated to reflect feedback. * PATCH 2: Commit message amended to point out special feature flag 'deprecated' is ignored at this stage. * PATCH 4: Documentation updated. Commit message tweaked. Markus Armbruster (5): qapi: Enable enum member introspection to show more than name qapi: Add feature flags to enum members qapi: Move compat policy from QObject to generic visitor qapi: Implement deprecated-input={reject,crash} for enum values block: Deprecate transaction type drive-backup docs/devel/qapi-code-gen.rst | 10 ++++--- qapi/compat.json | 3 +++ qapi/introspect.json | 24 +++++++++++++++-- qapi/transaction.json | 5 +++- include/qapi/qobject-input-visitor.h | 4 --- include/qapi/qobject-output-visitor.h | 4 --- include/qapi/util.h | 6 ++++- include/qapi/visitor-impl.h | 3 +++ include/qapi/visitor.h | 9 +++++++ qapi/qapi-visit-core.c | 27 ++++++++++++++++--- qapi/qmp-dispatch.c | 4 +-- qapi/qobject-input-visitor.c | 14 +--------- qapi/qobject-output-visitor.c | 14 +--------- scripts/qapi/expr.py | 3 ++- scripts/qapi/introspect.py | 19 ++++++++++--- scripts/qapi/schema.py | 22 +++++++++++++-- scripts/qapi/types.py | 17 +++++++++++- tests/qapi-schema/doc-good.json | 5 +++- tests/qapi-schema/doc-good.out | 3 +++ tests/qapi-schema/doc-good.txt | 3 +++ .../qapi-schema/enum-dict-member-unknown.err | 2 +- tests/qapi-schema/qapi-schema-test.json | 3 ++- tests/qapi-schema/qapi-schema-test.out | 1 + tests/qapi-schema/test-qapi.py | 1 + 24 files changed, 149 insertions(+), 57 deletions(-) -- 2.31.1

4 16

[PATCH 0/5] qemu: Prefer -numa cpu over -numa node,cpus=
by Michal Privoznik 21 Oct '21

21 Oct '21

I've sent these patches a while ago. Resending them again to resume the discussion. https://listman.redhat.com/archives/libvir-list/2020-May/msg01035.html Michal Prívozník (5): virCPUDefParseXML: Parse uint using virXPathUInt() virCPUDefParseXML: Prefer virXMLPropUInt over virXPathUInt qemuBuildNumaCommandLine: Move vars into loops qemuBuildNumaCommandLine: Separate out building of CPU list qemu: Prefer -numa cpu over -numa node,cpus= src/conf/cpu_conf.c | 45 ++---- src/qemu/qemu_command.c | 151 ++++++++++++++++-- .../hugepages-nvdimm.x86_64-latest.args | 4 +- ...memory-default-hugepage.x86_64-latest.args | 10 +- .../memfd-memory-numa.x86_64-latest.args | 10 +- ...y-hotplug-nvdimm-access.x86_64-latest.args | 4 +- ...ory-hotplug-nvdimm-align.x86_64-5.2.0.args | 4 +- ...ry-hotplug-nvdimm-align.x86_64-latest.args | 4 +- ...ory-hotplug-nvdimm-label.x86_64-5.2.0.args | 4 +- ...ry-hotplug-nvdimm-label.x86_64-latest.args | 4 +- ...mory-hotplug-nvdimm-pmem.x86_64-5.2.0.args | 4 +- ...ory-hotplug-nvdimm-pmem.x86_64-latest.args | 4 +- ...-hotplug-nvdimm-readonly.x86_64-5.2.0.args | 4 +- ...hotplug-nvdimm-readonly.x86_64-latest.args | 4 +- .../memory-hotplug-nvdimm.x86_64-latest.args | 4 +- ...mory-hotplug-virtio-pmem.x86_64-5.2.0.args | 4 +- ...ory-hotplug-virtio-pmem.x86_64-latest.args | 4 +- .../numatune-hmat.x86_64-latest.args | 18 ++- ...emnode-restrictive-mode.x86_64-latest.args | 38 ++++- .../numatune-memnode.x86_64-5.2.0.args | 38 ++++- .../numatune-memnode.x86_64-latest.args | 38 ++++- ...vhost-user-fs-fd-memory.x86_64-latest.args | 4 +- ...vhost-user-fs-hugepages.x86_64-latest.args | 4 +- ...host-user-gpu-secondary.x86_64-latest.args | 3 +- .../vhost-user-vga.x86_64-latest.args | 3 +- 25 files changed, 338 insertions(+), 76 deletions(-) -- 2.32.0

4 17

[RFC PATCH 00/10] VirtioNet RSS support
by Andrew Melnychenko 21 Oct '21

21 Oct '21

This series of patches add RSS property support for virtio-net-pci. Virtio RSS effectively works with TAP devices, it requires additional vectors for VirtioNet, queues for TAP device, and vCPU cores. Example of device configuration: ``` <interface type="network"> <mac address="52:54:00:c4:90:25"/> <source network="default"/> <model type="virtio"/> <driver name="qemu" queues="9" rss="on" rss_hash_report="off"/> <address type="pci" domain="0x0000" bus="0x01" slot="0x00" function="0x0"/> </interface> ``` Capability "rss" enables RSS, "rss_hash_report" - enables hashes in vheader. Qemu uses eBPF program as RSS driver. For loading RSS eBPF program, the helper is used. Path to the helper is provided by Qemu through "query-helper-paths" qmp command. The helper "qemu-ebpf-rss-helper" is built with Qemu and may differ from build to build. So it's required that the Qemu should provide a proper helper path. Libvirt would call the helper and receive the program and map fd through unix socket. Fds would be passed to Qemu in "ebpf_rss_fds" property by passing to child process or unix socket. If libvirt would fail at helper call or Qemu didn't provide the path, the Qemu would be launched without "ebpf_rss_fds" property. Without "ebpf_rss_fds" property, Qemu would try to load eBPF program by itself - usually, it would require additional system permissions. Qemu may use "in-qemu" RSS as a fallback option, which will not require system permissions, but doesn't work with vhost TAP. Qemu patches: https://lists.nongnu.org/archive/html/qemu-devel/2021-07/msg03535.html Andrew Melnychenko (10): domain_conf: Added configs for RSS and Hash report. qemu_capabilities: Added capabilites for qemu's "rss" and "hash". qemu_command: Added "rss" and "hash" properties. virsocket: Added receive for multiple fds. qemu_capabilities: Added capability for qemu's "ebpf_rss_fds". qemu_capabilities: Added capability for ebpf helper path. qemu_interface: Added ebpf helper call. qemu_command: Added ebpf RSS helper call for NIC creation. qemu_hotplug: Added helper call for hotplug NIC. docs: Added descriptions for "rss" and "rss_hash_report" configurations. docs/formatdomain.rst | 16 +++++++ src/conf/domain_conf.c | 31 +++++++++++++- src/conf/domain_conf.h | 2 + src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 48 +++++++++++++++++++++ src/qemu/qemu_capabilities.h | 5 +++ src/qemu/qemu_command.c | 46 +++++++++++++++++++- src/qemu/qemu_command.h | 2 + src/qemu/qemu_hotplug.c | 30 ++++++++++++- src/qemu/qemu_interface.c | 54 +++++++++++++++++++++++ src/qemu/qemu_interface.h | 2 + src/qemu/qemu_monitor.c | 9 ++++ src/qemu/qemu_monitor.h | 3 ++ src/qemu/qemu_monitor_json.c | 50 ++++++++++++++++++++++ src/qemu/qemu_monitor_json.h | 3 ++ src/qemu/qemu_validate.c | 16 +++++++ src/util/virsocket.c | 83 ++++++++++++++++++++++++++++++++++++ src/util/virsocket.h | 2 + 18 files changed, 399 insertions(+), 4 deletions(-) -- 2.31.1

4 29

[PATCH] acpi/hotplug: Fix error message format to conform to spec
by Ani Sinha 21 Oct '21

21 Oct '21

Error messages must conform to spec as specified here: https://www.libvirt.org/coding-style.html#error-message-format This change encloses format specifiers in quotes and unbreaks error messages. Fixes: 8eadf82fb5 ("conf: introduce option to enable/disable pci hotplug on pci-root controller") Fixes: 7300ccc9b3 ("conf: introduce support for acpi-bridge-hotplug feature") Signed-off-by: Ani Sinha <ani(a)anisinha.ca> --- src/conf/domain_conf.c | 6 ++---- src/qemu/qemu_validate.c | 6 +++--- .../pc-i440fx-acpi-root-hotplug-disable.x86_64-5.1.0.err | 2 +- .../pc-i440fx-acpi-root-hotplug-enable.x86_64-5.1.0.err | 2 +- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6fcf86ba58..d5de07d13d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -17557,8 +17557,7 @@ virDomainFeaturesPCIDefParse(virDomainDef *def, feature = virDomainPCITypeFromString((const char *)node->name); if (feature < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported PCI feature: %s"), - node->name); + _("unsupported PCI feature: '%s'"), node->name); return -1; } @@ -21833,8 +21832,7 @@ virDomainDefFeaturesCheckABIStability(virDomainDef *src, case VIR_DOMAIN_PCI_ACPI_BRIDGE_HOTPLUG: if (src->pci_features[i] != dst->pci_features[i]) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("State of PCI feature '%s' differs: " - "source: '%s', destination: '%s'"), + _("State of PCI feature '%s' differs: source: '%s', destination: '%s'"), virDomainPCITypeToString(i), virTristateSwitchTypeToString(src->pci_features[i]), virTristateSwitchTypeToString(dst->pci_features[i])); diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 3045e4b64b..f93b697265 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -3947,7 +3947,7 @@ qemuValidateDomainDeviceDefControllerPCI(const virDomainControllerDef *cont, case VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT: if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_PIIX4_ACPI_ROOT_PCI_HOTPLUG)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("setting the %s property on a '%s' device is not supported by this QEMU binary"), + _("setting the '%s' property on a '%s' device is not supported by this QEMU binary"), "hotplug", "pci-root"); return -1; } @@ -3956,8 +3956,8 @@ qemuValidateDomainDeviceDefControllerPCI(const virDomainControllerDef *cont, case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_SWITCH_DOWNSTREAM_PORT: if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_PCIE_ROOT_PORT_HOTPLUG)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("setting the hotplug property on a '%s' device is not supported by this QEMU binary"), - modelName); + _("setting the '%s' property on a '%s' device is not supported by this QEMU binary"), + "hotplug", modelName); return -1; } break; diff --git a/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-5.1.0.err b/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-5.1.0.err index b507f1f8bc..55ec41c476 100644 --- a/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-5.1.0.err +++ b/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-5.1.0.err @@ -1 +1 @@ -unsupported configuration: setting the hotplug property on a 'pci-root' device is not supported by this QEMU binary +unsupported configuration: setting the 'hotplug' property on a 'pci-root' device is not supported by this QEMU binary diff --git a/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-5.1.0.err b/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-5.1.0.err index b507f1f8bc..55ec41c476 100644 --- a/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-5.1.0.err +++ b/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-5.1.0.err @@ -1 +1 @@ -unsupported configuration: setting the hotplug property on a 'pci-root' device is not supported by this QEMU binary +unsupported configuration: setting the 'hotplug' property on a 'pci-root' device is not supported by this QEMU binary -- 2.25.1

2 2

[libvirt PATCH v2 00/22] qemu: Implement virtio-iommu support
by Andrea Bolognani 20 Oct '21

20 Oct '21

The first patch adds QEMU replies and as such has been aggressively snipped to deal with mailing list message size limits. Grab the unabriged version with $ git fetch https://gitlab.com/abologna/libvirt.git virtio-iommu As noted in patch 10, the QEMU feature this series enables has not yet been accepted upstream: the relevant patches are https://lists.gnu.org/archive/html/qemu-devel/2021-10/msg00161.html https://lists.gnu.org/archive/html/qemu-devel/2021-09/msg07819.html and of course this series should only be merged once those have gone in. That said, patches 1-6 are necessary to implement the feature but also not strictly related to it, so they could be merged right away. Changes from [v1]: * rebased after Peter's recent changes enabling JSON for -device. [v1] https://listman.redhat.com/archives/libvir-list/2021-October/msg00459.html Andrea Bolognani (22): tests: Add replies for QEMU 6.2.0 on aarch64 conf: Make virDomainDeviceInfoFormat() const correct qemu: Make qemuBuildDeviceAddressProps() const correct qemu: Make qemuBuildVirtioDevProps() const correct conf: Add IOMMU support to virDomainDeviceDefCopy() conf: Add new/free functions for virDomainIOMMUDef conf: Introduce VIR_PCI_CONNECT_INTEGRATED qemu: Tweak some code qemu: Introduce QEMU_CAPS_DEVICE_VIRTIO_IOMMU_PCI DONOTMERGEYET: qemu: Introduce QEMU_CAPS_VIRTIO_IOMMU_BOOT_BYPASS conf: Introduce virtio model for <iommu> tests: Add test cases for virtio-iommu qemu: Validate machine type used with virtio-iommu qemu: Validate capabilities for virtio-iommu qemu: Validate use of ACPI with virtio-iommu conf: Add virDomainDeviceInfo to virDomainIOMMUDef qemu: Assign PCI address to virtio-iommu qemu: Validate address type for virtio-iommu tests: Add test for virtio-iommu address qemu: Generate command line for virtio-iommu docs: Document virtio-iommu news: Document virtio-iommu NEWS.rst | 4 + docs/formatdomain.rst | 5 +- docs/schemas/domaincommon.rng | 64 +- src/conf/domain_addr.c | 21 +- src/conf/domain_addr.h | 30 +- src/conf/domain_conf.c | 74 +- src/conf/domain_conf.h | 5 + src/qemu/qemu_capabilities.c | 10 + src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 52 +- src/qemu/qemu_domain_address.c | 33 +- src/qemu/qemu_validate.c | 32 + .../qemu_6.2.0-virt.aarch64.xml | 184 + tests/domaincapsdata/qemu_6.2.0.aarch64.xml | 178 + .../caps_5.0.0.aarch64.replies | 71 +- .../caps_5.0.0.aarch64.xml | 1 + .../caps_5.0.0.ppc64.replies | 59 +- .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 + .../caps_5.0.0.riscv64.replies | 55 +- .../caps_5.0.0.riscv64.xml | 1 + .../caps_5.0.0.x86_64.replies | 71 +- .../caps_5.0.0.x86_64.xml | 1 + .../caps_5.1.0.x86_64.replies | 71 +- .../caps_5.1.0.x86_64.xml | 1 + .../caps_5.2.0.aarch64.replies | 71 +- .../caps_5.2.0.aarch64.xml | 1 + .../caps_5.2.0.ppc64.replies | 59 +- .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 + .../caps_5.2.0.riscv64.replies | 55 +- .../caps_5.2.0.riscv64.xml | 1 + .../caps_5.2.0.s390x.replies | 59 +- .../qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 + .../caps_5.2.0.x86_64.replies | 71 +- .../caps_5.2.0.x86_64.xml | 1 + .../caps_6.0.0.aarch64.replies | 71 +- .../caps_6.0.0.aarch64.xml | 1 + .../caps_6.0.0.s390x.replies | 59 +- .../qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 + .../caps_6.0.0.x86_64.replies | 71 +- .../caps_6.0.0.x86_64.xml | 1 + .../caps_6.1.0.x86_64.replies | 71 +- .../caps_6.1.0.x86_64.xml | 1 + ...h64.replies => caps_6.2.0.aarch64.replies} | 5594 ++++++++++------- ...0.0.aarch64.xml => caps_6.2.0.aarch64.xml} | 58 +- .../caps_6.2.0.x86_64.replies | 275 +- .../caps_6.2.0.x86_64.xml | 2 + ...fault-cpu-kvm-virt-4.2.aarch64-latest.args | 6 +- ...fault-cpu-tcg-virt-4.2.aarch64-latest.args | 6 +- .../aarch64-tpm.aarch64-latest.args | 2 +- .../aarch64-virt-graphics.aarch64-latest.args | 36 +- .../aarch64-virt-headless.aarch64-latest.args | 28 +- ...ult-video-type-aarch64.aarch64-latest.args | 6 +- .../disk-arm-virtio-sd.aarch64-latest.args | 2 +- ...e-expander-bus-aarch64.aarch64-latest.args | 2 +- ... virtio-iommu-aarch64.aarch64-latest.args} | 17 +- .../qemuxml2argvdata/virtio-iommu-aarch64.xml | 20 + ...mmu-invalid-address-type.x86_64-latest.err | 1 + .../virtio-iommu-invalid-address-type.xml | 20 + ...io-iommu-invalid-address.x86_64-latest.err | 1 + .../virtio-iommu-invalid-address.xml | 20 + .../virtio-iommu-no-acpi.x86_64-latest.err | 1 + .../qemuxml2argvdata/virtio-iommu-no-acpi.xml | 15 + ...rtio-iommu-wrong-machine.x86_64-latest.err | 1 + .../virtio-iommu-wrong-machine.xml | 18 + .../virtio-iommu-x86_64.x86_64-6.1.0.err | 1 + .../virtio-iommu-x86_64.x86_64-latest.args | 31 + .../qemuxml2argvdata/virtio-iommu-x86_64.xml | 18 + tests/qemuxml2argvtest.c | 7 + .../virtio-iommu-aarch64.aarch64-latest.xml | 34 + .../virtio-iommu-x86_64.x86_64-latest.xml | 36 + tests/qemuxml2xmltest.c | 2 + 71 files changed, 5278 insertions(+), 2604 deletions(-) create mode 100644 tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml create mode 100644 tests/domaincapsdata/qemu_6.2.0.aarch64.xml copy tests/qemucapabilitiesdata/{caps_6.0.0.aarch64.replies => caps_6.2.0.aarch64.replies} (92%) copy tests/qemucapabilitiesdata/{caps_6.0.0.aarch64.xml => caps_6.2.0.aarch64.xml} (92%) copy tests/qemuxml2argvdata/{aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.args => virtio-iommu-aarch64.aarch64-latest.args} (54%) create mode 100644 tests/qemuxml2argvdata/virtio-iommu-aarch64.xml create mode 100644 tests/qemuxml2argvdata/virtio-iommu-invalid-address-type.x86_64-latest.err create mode 100644 tests/qemuxml2argvdata/virtio-iommu-invalid-address-type.xml create mode 100644 tests/qemuxml2argvdata/virtio-iommu-invalid-address.x86_64-latest.err create mode 100644 tests/qemuxml2argvdata/virtio-iommu-invalid-address.xml create mode 100644 tests/qemuxml2argvdata/virtio-iommu-no-acpi.x86_64-latest.err create mode 100644 tests/qemuxml2argvdata/virtio-iommu-no-acpi.xml create mode 100644 tests/qemuxml2argvdata/virtio-iommu-wrong-machine.x86_64-latest.err create mode 100644 tests/qemuxml2argvdata/virtio-iommu-wrong-machine.xml create mode 100644 tests/qemuxml2argvdata/virtio-iommu-x86_64.x86_64-6.1.0.err create mode 100644 tests/qemuxml2argvdata/virtio-iommu-x86_64.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/virtio-iommu-x86_64.xml create mode 100644 tests/qemuxml2xmloutdata/virtio-iommu-aarch64.aarch64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/virtio-iommu-x86_64.x86_64-latest.xml -- 2.31.1

2 24

[PATCH v5] qemu: tpm: Run swtpm_setup --create-config-files in session mode
by Stefan Berger 20 Oct '21

20 Oct '21

Using swtpm v0.7.0 we can run swtpm_setup to create default config files for swtpm_setup and swtpm-localca in session mode. Now a user can start a VM with an attached TPM without having to run this program on the command line before. This program needs to run once. This patch addresses the issue raised in https://bugzilla.redhat.com/show_bug.cgi?id=2010649 Signed-off-by: Stefan Berger <stefanb(a)linux.ibm.com> --- v5: - Address Daniel's comments on v4 - Pass swtpm_setup to function since it's already been looked up v4: - Append stderr output to virReportError if swtpm_setup fails v3: - Removed logfile parameter v2: - fixed return code if swtpm_setup doesn't support the option --- src/qemu/qemu_tpm.c | 40 ++++++++++++++++++++++++++++++++++++++++ src/util/virtpm.c | 1 + src/util/virtpm.h | 1 + 3 files changed, 42 insertions(+) diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index 100481503c..e1b08a66c5 100644 --- a/src/qemu/qemu_tpm.c +++ b/src/qemu/qemu_tpm.c @@ -385,6 +385,43 @@ qemuTPMSetupEncryption(const unsigned char *secretuuid, return virCommandSetSendBuffer(cmd, g_steal_pointer(&secret), secret_len); } + +/* + * qemuTPMCreateConfigFiles: run swtpm_setup --create-config-files skip-if-exist + */ +static int +qemuTPMCreateConfigFiles(const char *swtpm_setup) +{ + g_autoptr(virCommand) cmd = NULL; + g_autofree char *errbuf = NULL; + int exitstatus; + + if (!virTPMSwtpmSetupCapsGet( + VIR_TPM_SWTPM_SETUP_FEATURE_CMDARG_CREATE_CONFIG_FILES)) + return 0; + + cmd = virCommandNew(swtpm_setup); + if (!cmd) + return -1; + + virCommandAddArgList(cmd, "--create-config-files", "skip-if-exist", NULL); + virCommandClearCaps(cmd); + virCommandSetErrorBuffer(cmd, &errbuf); + + if (virCommandRun(cmd, &exitstatus) < 0) + return -1; + if (exitstatus != 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Could not run '%s' to create config files. " + "exitstatus: %d;\nError: %s"), + swtpm_setup, exitstatus, errbuf); + return -1; + } + + return 0; +} + + /* * qemuTPMEmulatorRunSetup * @@ -432,6 +469,9 @@ qemuTPMEmulatorRunSetup(const char *storagepath, "this requires privileged mode for a " "TPM 1.2\n"), 0600); + if (!privileged && qemuTPMCreateConfigFiles(swtpm_setup) < 0) + return -1; + cmd = virCommandNew(swtpm_setup); if (!cmd) return -1; diff --git a/src/util/virtpm.c b/src/util/virtpm.c index 1a567139b4..0f50de866c 100644 --- a/src/util/virtpm.c +++ b/src/util/virtpm.c @@ -45,6 +45,7 @@ VIR_ENUM_IMPL(virTPMSwtpmFeature, VIR_ENUM_IMPL(virTPMSwtpmSetupFeature, VIR_TPM_SWTPM_SETUP_FEATURE_LAST, "cmdarg-pwdfile-fd", + "cmdarg-create-config-files", ); /** diff --git a/src/util/virtpm.h b/src/util/virtpm.h index d021a083b4..3bb03b3b33 100644 --- a/src/util/virtpm.h +++ b/src/util/virtpm.h @@ -38,6 +38,7 @@ typedef enum { typedef enum { VIR_TPM_SWTPM_SETUP_FEATURE_CMDARG_PWDFILE_FD, + VIR_TPM_SWTPM_SETUP_FEATURE_CMDARG_CREATE_CONFIG_FILES, VIR_TPM_SWTPM_SETUP_FEATURE_LAST } virTPMSwtpmSetupFeature; -- 2.31.1

4 3

[libvirt PATCH] Switch to new GitHub repo-lockdown configuration
by Daniel P. Berrangé 20 Oct '21

20 Oct '21

The repo-lockdown service used to run as a bot outside GitHub, but has now switched to using the GitHub Actions workflow framework. This requires use of a new configuration file. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- .github/lockdown.yml | 38 ------------------------- .github/workflows/lockdown.yml | 51 ++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 38 deletions(-) delete mode 100644 .github/lockdown.yml create mode 100644 .github/workflows/lockdown.yml diff --git a/.github/lockdown.yml b/.github/lockdown.yml deleted file mode 100644 index 7601a2a156..0000000000 --- a/.github/lockdown.yml +++ /dev/null @@ -1,38 +0,0 @@ -# Configuration for Repo Lockdown - https://github.com/dessant/repo-lockdown - -skipCreatedBefore: 2020-01-01 - -# Close issues and pull requests -close: true - -# Lock issues and pull requests -lock: true - -# Optionally, specify configuration settings just for `issues` or `pulls` -issues: - comment: | - Thank you for your interest in the libvirt project. - - Since this repository is a read-only mirror of the project's master repostory hosted on GitLab, issues opened here are not processed. - - We kindly request that new issues are reported to - - https://gitlab.com/libvirt/libvirt/-/issues/new - - Thank you for your time and understanding. - -pulls: - comment: | - Thank you for your interest in the libvirt project. - - Since this repository is a read-only mirror of the project's master repostory hosted on GitLab, merge requests opened here are not processed. - - We kindly request that contributors fork the project at - - https://gitlab.com/libvirt/libvirt/ - - push changes to the fork, and then open a new merge request at - - https://gitlab.com/libvirt/libvirt/-/merge_requests/new - - Thank you for your time and understanding. diff --git a/.github/workflows/lockdown.yml b/.github/workflows/lockdown.yml new file mode 100644 index 0000000000..f7646d9bde --- /dev/null +++ b/.github/workflows/lockdown.yml @@ -0,0 +1,51 @@ +--- +# Configuration for Repo Lockdown - https://github.com/dessant/repo-lockdown + +name: 'Repo Lockdown' + +on: + issues: + types: opened + pull_request_target: + types: opened + +permissions: + pull-requests: write + +jobs: + action: + runs-on: ubuntu-latest + steps: + - uses: dessant/repo-lockdown@v2 + with: + issue-comment: | + Thank you for your interest in the libvirt project. + + Since this repository is a read-only mirror of the project's master + repostory hosted on GitLab, issues opened here are not processed. + + We kindly request that new issues are reported to + + https://gitlab.com/libvirt/libvirt/-/issues/new + + Thank you for your time and understanding. + lock-issue: true + close-issue: true + pr-comment: | + Thank you for your interest in the libvirt project. + + Since this repository is a read-only mirror of the project's master + repostory hosted on GitLab, merge requests opened here are not + processed. + + We kindly request that contributors fork the project at + + https://gitlab.com/libvirt/libvirt/ + + push changes to the fork, and then open a new merge request at + + https://gitlab.com/libvirt/libvirt/-/merge_requests/new + + Thank you for your time and understanding. + lock-pr: true + close-pr: true -- 2.31.1

2 2