April 2023 - Devel - libvirt List Archives

Re: [PATCH] qemu-options.hx: Update descriptions of memory options for NUMA node
by Yohei Kojima 11 Apr '23

11 Apr '23

ping This patch updates an outdated description in qemu-options.hx . The patch reflects the changes in qemu behavior already described in another documentation, and it also changes paragraph structure for further readability. The original patch is: https://patchew.org/QEMU/TYZPR06MB5418D6B0175A49E8E76988439D8E9@TYZPR06MB54… On 2023/03/30 19:09, Yohei Kojima wrote: > This commit adds the following description: > 1. `memdev` option is recommended over `mem` option (see [1,2]) > 2. users must specify memory for all NUMA nodes (see [2]) > > This commit also separates descriptions for `mem` and `memdev` into two > paragraphs. The old doc describes legacy `mem` option first, and it was > a bit confusing. > > Related documantations: > [1] https://wiki.qemu.org/ChangeLog/5.1#Incompatible_changes > [2] https://www.qemu.org/docs/master/about/removed-features.html > > Signed-off-by: Yohei Kojima <y-koj(a)outlook.jp> > --- > qemu-options.hx | 25 ++++++++++++++++--------- > 1 file changed, 16 insertions(+), 9 deletions(-) > > diff --git a/qemu-options.hx b/qemu-options.hx > index 59bdf67a2c..174f0d0c2d 100644 > --- a/qemu-options.hx > +++ b/qemu-options.hx > @@ -405,15 +405,22 @@ SRST > -numa node,nodeid=0 -numa node,nodeid=1 \ > -numa cpu,node-id=0,socket-id=0 -numa cpu,node-id=1,socket-id=1 > > - Legacy '\ ``mem``\ ' assigns a given RAM amount to a node (not supported > - for 5.1 and newer machine types). '\ ``memdev``\ ' assigns RAM from > - a given memory backend device to a node. If '\ ``mem``\ ' and > - '\ ``memdev``\ ' are omitted in all nodes, RAM is split equally between them. > - > - > - '\ ``mem``\ ' and '\ ``memdev``\ ' are mutually exclusive. > - Furthermore, if one node uses '\ ``memdev``\ ', all of them have to > - use it. > + '\ ``memdev``\ ' option assigns RAM from a given memory backend > + device to a node. It is recommended to use '\ ``memdev``\ ' option > + over legacy '\ ``mem``\ ' option. This is because '\ ``memdev``\ ' > + option provides better performance and more control over the > + backend's RAM (e.g. '\ ``prealloc``\ ' parameter of > + '\ ``-memory-backend-ram``\ ' allows memory preallocation). > + > + For compatibility reasons, legacy '\ ``mem``\ ' option is > + supported in 5.0 and older machine types. Note that '\ ``mem``\ ' > + and '\ ``memdev``\ ' are mutually exclusive. If one node uses > + '\ ``memdev``\ ', the rest nodes have to use '\ ``memdev``\ ' > + option, and vice versa. > + > + Users must specify memory for all NUMA nodes by '\ ``memdev``\ ' > + (or legacy '\ ``mem``\ ' if available). In QEMU 5.2, the support > + for '\ ``-numa node``\ ' without memory specified was removed. > > '\ ``initiator``\ ' is an additional option that points to an > initiator NUMA node that has best performance (the lowest latency or

1 0

[libvirt PATCH 0/3] RFC: fix compilation on msys2
by marcandre.lureau＠redhat.com 11 Apr '23

11 Apr '23

From: Marc-André Lureau <marcandre.lureau(a)redhat.com> Hi, libvirt fails to compile on msys2/win32. Here is a few patches that solve it, but the way python scripts are being handled in general is a bit odd, so this is RFC. (fwiw, a lot of tests fail though, I can send the log if anyone is interested - or attach it to a gitlab issue) Fixes: https://gitlab.com/libvirt/libvirt/-/issues/453 Marc-André Lureau (3): meson: don't look for unix paths on win32 meson: drop explicit python interpreter rpc/ssh: ssh_userauth_agent() is not supported on win32 docs/manpages/meson.build | 4 ++-- docs/meson.build | 6 ++---- meson.build | 14 +++++++++----- src/admin/meson.build | 4 ++-- src/esx/meson.build | 4 ++-- src/hyperv/meson.build | 2 +- src/meson.build | 8 ++++---- src/rpc/virnetlibsshsession.c | 14 ++++++++++++-- src/util/meson.build | 4 ++-- 9 files changed, 36 insertions(+), 24 deletions(-) -- 2.39.2

3 9

[PATCH 00/21] qemu capability testing cleanups and improvements (part 5)
by Peter Krempa 11 Apr '23

11 Apr '23

This series applies on top of 'part 4' fetch everything from my repo: git fetch https://gitlab.com/pipo.sk/libvirt.git aarch-send In this part tests for the 'aarch64' platform are converted to use real capabilities. Peter Krempa (21): virDomainPCIAddressSetExtensionAlloc: Remove return value qemuxml2argvdata: Do not symlink output files for aarch64 gic tests qemuxml2argvtest: Use real capabilities in tests for picking the aarch64 GIC version qemuxml2argvtest: Convert DO_TEST_GIC to use real latest capabilities qemuxml2argvtest: Convert the rest of GIC tests to latest capabilities qemuxml2argvtest: Add real-caps versions of 'aarch64-virt-virtio' qemuxml2argvtest: Drop "aarch64-virt-2.6-virtio-pci-default" case qemuxml2argv: Test default aarch64 cofig without PCIe support qemuxml2argvtest: Modernize 'balloon-mmio-deflate' qemuxml2argvtest: Don't symlink output files for 'mach-virt-' cases qemuxml2argvtest: Modernize all 'mach-virt-' aarch64 test cases qemuxml2argvtest: Update 'aarch64-virtio-pci-manual-addresses' case qemuxml2*test: Drop fake-caps invocation of 'aarch64-virtio-pci-manual-addresses' qemuxml2(argv|xml)test: Modernize testing of USB controllers on aarch64 qemuxml2argvtest: Modernize the rest of 'aarch64' cases qemuxml2xmlout: Do not symlink output files for 'aarch64-gic' cases qemuxml2xmltest: Modernize 'aarch64-gic*' test cases qemuxml2xmloutdata: Don't symlink output data for 'mach-virt*' cases qemuxml2xmltest: Modernize 'mach-virt*' cases qemuxml2xmltest: Convert rest of 'aarch64' cases to real capabilities testutilsqemu: Drop fake capability testing infrastructure for 'aarch64' src/conf/domain_addr.c | 13 +- ...h64-aavmf-virtio-mmio.aarch64-latest.args} | 20 +- ...rch64-cpu-passthrough.aarch64-latest.args} | 26 +-- .../aarch64-gic-default-both.args | 33 ++- .../aarch64-gic-default-v2.args | 33 ++- .../aarch64-gic-default-v3.args | 33 ++- ...=> aarch64-gic-default.aarch64-4.2.0.args} | 14 +- ...> aarch64-gic-default.aarch64-latest.args} | 17 +- .../qemuxml2argvdata/aarch64-gic-default.args | 1 - tests/qemuxml2argvdata/aarch64-gic-host.args | 6 +- ...=> aarch64-gic-invalid.aarch64-latest.err} | 0 .../aarch64-gic-none-both.args | 33 ++- .../aarch64-gic-none-tcg.args | 6 +- .../qemuxml2argvdata/aarch64-gic-none-v2.args | 33 ++- .../qemuxml2argvdata/aarch64-gic-none-v3.args | 33 ++- ...gs => aarch64-gic-none.aarch64-4.2.0.args} | 8 +- .../aarch64-gic-none.aarch64-latest.args | 32 +++ tests/qemuxml2argvdata/aarch64-gic-none.args | 1 - ...> aarch64-gic-not-virt.aarch64-latest.err} | 0 tests/qemuxml2argvdata/aarch64-gic-v2.args | 6 +- tests/qemuxml2argvdata/aarch64-gic-v3.args | 6 +- .../aarch64-pci-serial.aarch64-latest.args | 38 +++ ...arch64-tpm-wrong-model.aarch64-latest.err} | 0 ...arch64-traditional-pci.aarch64-latest.args | 37 +++ .../aarch64-traditional-pci.args | 34 --- .../aarch64-usb-controller-qemu-xhci.args | 30 --- .../aarch64-usb-controller-qemu-xhci.xml | 16 -- ...arch64-usb-controller.aarch64-latest.args} | 11 +- ...ec-xhci.xml => aarch64-usb-controller.xml} | 6 + ...aarch64-video-default.aarch64-latest.args} | 13 +- ...4-video-virtio-gpu-pci.aarch64-latest.args | 37 +++ .../aarch64-video-virtio-gpu-pci.args | 35 --- .../aarch64-virt-2.6-virtio-pci-default.xml | 46 ---- ...ch64-virt-default-nic.aarch64-latest.args} | 10 +- ...ch64-virt-virtio-MMIO.aarch64.latest.args} | 20 +- ...=> aarch64-virt-virtio.aarch64-4.2.0.args} | 22 +- .../aarch64-virt-virtio.aarch64-latest.args | 55 +++++ ...o-pci-manual-addresses.aarch64-latest.args | 49 ++++ .../aarch64-virtio-pci-manual-addresses.xml | 4 +- .../balloon-mmio-deflate.aarch64-latest.args | 37 +++ ...h-virt-console-native.aarch64-latest.args} | 7 +- .../mach-virt-console-native.args | 1 - ...ch-virt-console-virtio.aarch64-latest.args | 37 +++ ...serial+console-native.aarch64-latest.args} | 12 +- .../mach-virt-serial+console-native.args | 1 - ...ch-virt-serial-compat.aarch64-latest.args} | 12 +- .../mach-virt-serial-compat.args | 1 - ...-serial-invalid-machine.x86_64-latest.err} | 0 ...ch-virt-serial-native.aarch64-latest.args} | 12 +- .../mach-virt-serial-pci.aarch64-latest.args | 37 +++ .../mach-virt-serial-usb.aarch64-latest.args | 37 +++ tests/qemuxml2argvtest.c | 217 +++++++----------- ...ch64-aavmf-virtio-mmio.aarch64-latest.xml} | 1 + ...arch64-gic-default-both.aarch64-latest.xml | 26 +++ .../aarch64-gic-default-both.xml | 1 - .../aarch64-gic-default-v2.aarch64-latest.xml | 26 +++ .../aarch64-gic-default-v2.xml | 1 - .../aarch64-gic-default-v3.aarch64-latest.xml | 26 +++ .../aarch64-gic-default-v3.xml | 1 - .../aarch64-gic-default.aarch64-latest.xml | 26 +++ .../aarch64-gic-default.xml | 1 - .../aarch64-gic-host.aarch64-latest.xml | 26 +++ tests/qemuxml2xmloutdata/aarch64-gic-host.xml | 1 - .../aarch64-gic-none-both.aarch64-latest.xml | 26 +++ .../aarch64-gic-none-both.xml | 1 - ...> aarch64-gic-none-tcg.aarch64-latest.xml} | 1 + .../aarch64-gic-none-v2.aarch64-latest.xml | 26 +++ .../aarch64-gic-none-v2.xml | 1 - .../aarch64-gic-none-v3.aarch64-latest.xml | 26 +++ .../aarch64-gic-none-v3.xml | 1 - .../aarch64-gic-none.aarch64-latest.xml | 26 +++ tests/qemuxml2xmloutdata/aarch64-gic-none.xml | 1 - .../aarch64-gic-v2.aarch64-latest.xml | 26 +++ tests/qemuxml2xmloutdata/aarch64-gic-v2.xml | 1 - .../aarch64-gic-v3.aarch64-latest.xml | 26 +++ tests/qemuxml2xmloutdata/aarch64-gic-v3.xml | 1 - ... => aarch64-pci-serial.aarch64-latest.xml} | 19 +- ...arch64-traditional-pci.aarch64-latest.xml} | 3 + .../aarch64-usb-controller.aarch64-latest.xml | 36 +++ ... aarch64-video-default.aarch64-latest.xml} | 22 +- ...4-video-virtio-gpu-pci.aarch64-latest.xml} | 4 +- ...o-pci-manual-addresses.aarch64-latest.xml} | 24 +- ...ch-virt-console-native.aarch64-latest.xml} | 4 + .../mach-virt-console-native.xml | 1 - ...ach-virt-console-virtio.aarch64-latest.xml | 44 ++++ ...-serial+console-native.aarch64-latest.xml} | 14 +- .../mach-virt-serial+console-native.xml | 1 - ...mach-virt-serial-compat.aarch64-latest.xml | 36 +++ ...mach-virt-serial-native.aarch64-latest.xml | 36 +++ .../mach-virt-serial-native.xml | 1 - ...> mach-virt-serial-pci.aarch64-latest.xml} | 19 +- ...> mach-virt-serial-usb.aarch64-latest.xml} | 3 + tests/qemuxml2xmltest.c | 153 ++++++------ tests/testutilsqemu.c | 6 - 94 files changed, 1396 insertions(+), 557 deletions(-) rename tests/qemuxml2argvdata/{aarch64-aavmf-virtio-mmio.args => aarch64-aavmf-virtio-mmio.aarch64-latest.args} (57%) rename tests/qemuxml2argvdata/{aarch64-virtio-pci-manual-addresses.args => aarch64-cpu-passthrough.aarch64-latest.args} (52%) mode change 120000 => 100644 tests/qemuxml2argvdata/aarch64-gic-default-both.args mode change 120000 => 100644 tests/qemuxml2argvdata/aarch64-gic-default-v2.args mode change 120000 => 100644 tests/qemuxml2argvdata/aarch64-gic-default-v3.args rename tests/qemuxml2argvdata/{balloon-mmio-deflate.args => aarch64-gic-default.aarch64-4.2.0.args} (71%) rename tests/qemuxml2argvdata/{aarch64-pci-serial.args => aarch64-gic-default.aarch64-latest.args} (55%) delete mode 120000 tests/qemuxml2argvdata/aarch64-gic-default.args rename tests/qemuxml2argvdata/{aarch64-gic-invalid.err => aarch64-gic-invalid.aarch64-latest.err} (100%) mode change 120000 => 100644 tests/qemuxml2argvdata/aarch64-gic-none-both.args mode change 120000 => 100644 tests/qemuxml2argvdata/aarch64-gic-none-v2.args mode change 120000 => 100644 tests/qemuxml2argvdata/aarch64-gic-none-v3.args rename tests/qemuxml2argvdata/{aarch64-cpu-passthrough.args => aarch64-gic-none.aarch64-4.2.0.args} (67%) create mode 100644 tests/qemuxml2argvdata/aarch64-gic-none.aarch64-latest.args delete mode 120000 tests/qemuxml2argvdata/aarch64-gic-none.args rename tests/qemuxml2argvdata/{aarch64-gic-not-virt.err => aarch64-gic-not-virt.aarch64-latest.err} (100%) create mode 100644 tests/qemuxml2argvdata/aarch64-pci-serial.aarch64-latest.args rename tests/qemuxml2argvdata/{aarch64-tpm-wrong-model.err => aarch64-tpm-wrong-model.aarch64-latest.err} (100%) create mode 100644 tests/qemuxml2argvdata/aarch64-traditional-pci.aarch64-latest.args delete mode 100644 tests/qemuxml2argvdata/aarch64-traditional-pci.args delete mode 100644 tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args delete mode 100644 tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.xml rename tests/qemuxml2argvdata/{aarch64-usb-controller-nec-xhci.args => aarch64-usb-controller.aarch64-latest.args} (55%) rename tests/qemuxml2argvdata/{aarch64-usb-controller-nec-xhci.xml => aarch64-usb-controller.xml} (61%) rename tests/qemuxml2argvdata/{aarch64-video-default.args => aarch64-video-default.aarch64-latest.args} (54%) create mode 100644 tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.aarch64-latest.args delete mode 100644 tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args delete mode 100644 tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.xml rename tests/qemuxml2argvdata/{aarch64-virt-default-nic.args => aarch64-virt-default-nic.aarch64-latest.args} (56%) rename tests/qemuxml2argvdata/{aarch64-virt-virtio.args => aarch64-virt-virtio-MMIO.aarch64.latest.args} (58%) rename tests/qemuxml2argvdata/{aarch64-virt-2.6-virtio-pci-default.args => aarch64-virt-virtio.aarch64-4.2.0.args} (63%) create mode 100644 tests/qemuxml2argvdata/aarch64-virt-virtio.aarch64-latest.args create mode 100644 tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.aarch64-latest.args create mode 100644 tests/qemuxml2argvdata/balloon-mmio-deflate.aarch64-latest.args rename tests/qemuxml2argvdata/{mach-virt-serial-native.args => mach-virt-console-native.aarch64-latest.args} (67%) delete mode 120000 tests/qemuxml2argvdata/mach-virt-console-native.args create mode 100644 tests/qemuxml2argvdata/mach-virt-console-virtio.aarch64-latest.args rename tests/qemuxml2argvdata/{mach-virt-serial-pci.args => mach-virt-serial+console-native.aarch64-latest.args} (65%) delete mode 120000 tests/qemuxml2argvdata/mach-virt-serial+console-native.args rename tests/qemuxml2argvdata/{mach-virt-serial-usb.args => mach-virt-serial-compat.aarch64-latest.args} (64%) delete mode 120000 tests/qemuxml2argvdata/mach-virt-serial-compat.args rename tests/qemuxml2argvdata/{mach-virt-serial-invalid-machine.err => mach-virt-serial-invalid-machine.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{mach-virt-console-virtio.args => mach-virt-serial-native.aarch64-latest.args} (62%) create mode 100644 tests/qemuxml2argvdata/mach-virt-serial-pci.aarch64-latest.args create mode 100644 tests/qemuxml2argvdata/mach-virt-serial-usb.aarch64-latest.args rename tests/qemuxml2xmloutdata/{aarch64-aavmf-virtio-mmio.xml => aarch64-aavmf-virtio-mmio.aarch64-latest.xml} (96%) create mode 100644 tests/qemuxml2xmloutdata/aarch64-gic-default-both.aarch64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/aarch64-gic-default-both.xml create mode 100644 tests/qemuxml2xmloutdata/aarch64-gic-default-v2.aarch64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/aarch64-gic-default-v2.xml create mode 100644 tests/qemuxml2xmloutdata/aarch64-gic-default-v3.aarch64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/aarch64-gic-default-v3.xml create mode 100644 tests/qemuxml2xmloutdata/aarch64-gic-default.aarch64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/aarch64-gic-default.xml create mode 100644 tests/qemuxml2xmloutdata/aarch64-gic-host.aarch64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/aarch64-gic-host.xml create mode 100644 tests/qemuxml2xmloutdata/aarch64-gic-none-both.aarch64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/aarch64-gic-none-both.xml rename tests/qemuxml2xmloutdata/{aarch64-gic-none-tcg.xml => aarch64-gic-none-tcg.aarch64-latest.xml} (93%) create mode 100644 tests/qemuxml2xmloutdata/aarch64-gic-none-v2.aarch64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/aarch64-gic-none-v2.xml create mode 100644 tests/qemuxml2xmloutdata/aarch64-gic-none-v3.aarch64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/aarch64-gic-none-v3.xml create mode 100644 tests/qemuxml2xmloutdata/aarch64-gic-none.aarch64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/aarch64-gic-none.xml create mode 100644 tests/qemuxml2xmloutdata/aarch64-gic-v2.aarch64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/aarch64-gic-v2.xml create mode 100644 tests/qemuxml2xmloutdata/aarch64-gic-v3.aarch64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/aarch64-gic-v3.xml rename tests/qemuxml2xmloutdata/{aarch64-pci-serial.xml => aarch64-pci-serial.aarch64-latest.xml} (70%) rename tests/qemuxml2xmloutdata/{aarch64-traditional-pci.xml => aarch64-traditional-pci.aarch64-latest.xml} (93%) create mode 100644 tests/qemuxml2xmloutdata/aarch64-usb-controller.aarch64-latest.xml rename tests/qemuxml2xmloutdata/{aarch64-video-default.xml => aarch64-video-default.aarch64-latest.xml} (67%) rename tests/qemuxml2xmloutdata/{aarch64-video-virtio-gpu-pci.xml => aarch64-video-virtio-gpu-pci.aarch64-latest.xml} (95%) rename tests/qemuxml2xmloutdata/{aarch64-virtio-pci-manual-addresses.xml => aarch64-virtio-pci-manual-addresses.aarch64-latest.xml} (68%) rename tests/qemuxml2xmloutdata/{mach-virt-serial-compat.xml => mach-virt-console-native.aarch64-latest.xml} (84%) delete mode 120000 tests/qemuxml2xmloutdata/mach-virt-console-native.xml create mode 100644 tests/qemuxml2xmloutdata/mach-virt-console-virtio.aarch64-latest.xml rename tests/qemuxml2xmloutdata/{mach-virt-console-virtio.xml => mach-virt-serial+console-native.aarch64-latest.xml} (68%) delete mode 120000 tests/qemuxml2xmloutdata/mach-virt-serial+console-native.xml create mode 100644 tests/qemuxml2xmloutdata/mach-virt-serial-compat.aarch64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/mach-virt-serial-native.aarch64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/mach-virt-serial-native.xml rename tests/qemuxml2xmloutdata/{mach-virt-serial-pci.xml => mach-virt-serial-pci.aarch64-latest.xml} (71%) rename tests/qemuxml2xmloutdata/{mach-virt-serial-usb.xml => mach-virt-serial-usb.aarch64-latest.xml} (93%) -- 2.39.2

2 22

[PATCHv2] storage_file_probe: change maximum len value in vmdk4GetBackingStore
by Anastasia Belova 11 Apr '23

11 Apr '23

desc length should be always less than VIR_STORAGE_MAX_HEADER. If len = VIR_STORAGE_MAX_HEADER, desc may be out of bounds. Fixes: 348b4e254b ("storage: always probe type with buffer") Signed-off-by: Anastasia Belova <abelova(a)astralinux.ru> --- v2: change Fixes: line src/storage_file/storage_file_probe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/storage_file/storage_file_probe.c b/src/storage_file/storage_file_probe.c index 9465af5d96..0dcc9c2c54 100644 --- a/src/storage_file/storage_file_probe.c +++ b/src/storage_file/storage_file_probe.c @@ -586,8 +586,8 @@ vmdk4GetBackingStore(char **res, return BACKING_STORE_INVALID; len = buf_size - 0x200; - if (len > VIR_STORAGE_MAX_HEADER) - len = VIR_STORAGE_MAX_HEADER; + if (len >= VIR_STORAGE_MAX_HEADER) + len = VIR_STORAGE_MAX_HEADER - 1; memcpy(desc, buf + 0x200, len); desc[len] = '\0'; start = strstr(desc, prefix); -- 2.30.2

2 1

[libvirt PATCH v3] Conf: Move validation of virDomainGraphicsListenDef out of Parser
by K Shiva 07 Apr '23

07 Apr '23

In an effort to separate the validation steps from the Parse stage, a part of the validation of virDomainGraphicsListenDef has been moved to domain_validate.h. Signed-off-by: K Shiva <shiva_kr(a)riseup.net> --- This is a v3 of: https://listman.redhat.com/archives/libvir-list/2023-April/239265.html diff to v2: - Cleaned patch as to be directly applied onto master branch src/conf/domain_conf.c | 30 +----------------------------- src/conf/domain_validate.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 29 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 70e4d52ee6..8df751cc46 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -10986,7 +10986,6 @@ virDomainGraphicsAuthDefParseXML(xmlNodePtr node, /** * virDomainGraphicsListenDefParseXML: * @def: listen def pointer to be filled - * @graphics: graphics def pointer * @node: xml node of <listen/> element * @parent: xml node of <graphics/> element * @flags: bit-wise or of VIR_DOMAIN_DEF_PARSE_* @@ -10998,13 +10997,11 @@ virDomainGraphicsAuthDefParseXML(xmlNodePtr node, */ static int virDomainGraphicsListenDefParseXML(virDomainGraphicsListenDef *def, - virDomainGraphicsDef *graphics, xmlNodePtr node, xmlNodePtr parent, unsigned int flags) { int ret = -1; - const char *graphicsType = virDomainGraphicsTypeToString(graphics->type); g_autofree char *address = virXMLPropString(node, "address"); g_autofree char *network = virXMLPropString(node, "network"); g_autofree char *socketPath = virXMLPropString(node, "socket"); @@ -11021,31 +11018,6 @@ virDomainGraphicsListenDefParseXML(virDomainGraphicsListenDef *def, VIR_XML_PROP_REQUIRED, &def->type) < 0) goto error; - switch (def->type) { - case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET: - if (graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC && - graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("listen type 'socket' is not available for graphics type '%1$s'"), - graphicsType); - goto error; - } - break; - case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NONE: - if (graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE && - graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("listen type 'none' is not available for graphics type '%1$s'"), - graphicsType); - goto error; - } - break; - case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS: - case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK: - case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_LAST: - break; - } - if (def->type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS) { if (address && addressCompat && STRNEQ(address, addressCompat)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -11148,7 +11120,7 @@ virDomainGraphicsListensParseXML(virDomainGraphicsDef *def, def->listens = g_new0(virDomainGraphicsListenDef, nListens); for (i = 0; i < nListens; i++) { - if (virDomainGraphicsListenDefParseXML(&def->listens[i], def, + if (virDomainGraphicsListenDefParseXML(&def->listens[i], listenNodes[i], i == 0 ? node : NULL, flags) < 0) diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index 9265fef4f9..9a1a8ee156 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -2627,6 +2627,39 @@ virDomainAudioDefValidate(const virDomainDef *def, return 0; } +static int +virDomainGraphicsListenDefValidate(const virDomainGraphicsListenDef *def, + const virDomainGraphicsDef *graphics) +{ + const char *graphicsType = virDomainGraphicsTypeToString(graphics->type); + + switch (def->type) { + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET: + if (graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC && + graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("listen type 'socket' is not available for graphics type '%1$s'"), + graphicsType); + return -1; + } + break; + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NONE: + if (graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE && + graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("listen type 'none' is not available for graphics type '%1$s'"), + graphicsType); + return -1; + } + break; + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS: + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK: + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_LAST: + break; + } + return 0; +} + static int virDomainGraphicsDefListensValidate(const virDomainGraphicsDef *def) { @@ -2640,6 +2673,8 @@ virDomainGraphicsDefListensValidate(const virDomainGraphicsDef *def) "listen type 'network'")); return -1; } + if (virDomainGraphicsListenDefValidate(&def->listens[i], def) < 0) + return -1; } return 0; -- 2.40.0

3 3

Re: [libvirt PATCH v4] Conf: Move validation of virDomainGraphicsListenDef out of Parser
by K Shiva 07 Apr '23

07 Apr '23

In an effort to separate the validation steps from the Parse stage, a few validation checks of virDomainGraphicsListenDef have been moved from virDomainGraphicsListenDefParseXML() in domain_conf.c to virDomainGraphicsDefListensValidate() in domain_validate.c Signed-off-by: Koninty Shiva Kiran <shiva_kr(a)riseup.net> --- src/conf/domain_conf.c | 30 +----------------------------- src/conf/domain_validate.c | 37 +++++++++++++++++++++++++++++++------ 2 files changed, 32 insertions(+), 35 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 70e4d52ee6..8df751cc46 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -10986,7 +10986,6 @@ virDomainGraphicsAuthDefParseXML(xmlNodePtr node, /** * virDomainGraphicsListenDefParseXML: * @def: listen def pointer to be filled - * @graphics: graphics def pointer * @node: xml node of <listen/> element * @parent: xml node of <graphics/> element * @flags: bit-wise or of VIR_DOMAIN_DEF_PARSE_* @@ -10998,13 +10997,11 @@ virDomainGraphicsAuthDefParseXML(xmlNodePtr node, */ static int virDomainGraphicsListenDefParseXML(virDomainGraphicsListenDef *def, - virDomainGraphicsDef *graphics, xmlNodePtr node, xmlNodePtr parent, unsigned int flags) { int ret = -1; - const char *graphicsType = virDomainGraphicsTypeToString(graphics->type); g_autofree char *address = virXMLPropString(node, "address"); g_autofree char *network = virXMLPropString(node, "network"); g_autofree char *socketPath = virXMLPropString(node, "socket"); @@ -11021,31 +11018,6 @@ virDomainGraphicsListenDefParseXML(virDomainGraphicsListenDef *def, VIR_XML_PROP_REQUIRED, &def->type) < 0) goto error; - switch (def->type) { - case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET: - if (graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC && - graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("listen type 'socket' is not available for graphics type '%1$s'"), - graphicsType); - goto error; - } - break; - case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NONE: - if (graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE && - graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("listen type 'none' is not available for graphics type '%1$s'"), - graphicsType); - goto error; - } - break; - case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS: - case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK: - case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_LAST: - break; - } - if (def->type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS) { if (address && addressCompat && STRNEQ(address, addressCompat)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -11148,7 +11120,7 @@ virDomainGraphicsListensParseXML(virDomainGraphicsDef *def, def->listens = g_new0(virDomainGraphicsListenDef, nListens); for (i = 0; i < nListens; i++) { - if (virDomainGraphicsListenDefParseXML(&def->listens[i], def, + if (virDomainGraphicsListenDefParseXML(&def->listens[i], listenNodes[i], i == 0 ? node : NULL, flags) < 0) diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index 9265fef4f9..988f0854a5 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -2631,14 +2631,39 @@ static int virDomainGraphicsDefListensValidate(const virDomainGraphicsDef *def) { size_t i; + const char *graphicsType = virDomainGraphicsTypeToString(def->type); for (i = 0; i < def->nListens; i++) { - if (def->listens[i].type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK && - !def->listens[i].network) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("'network' attribute is required for " - "listen type 'network'")); - return -1; + switch (def->listens[i].type) { + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK: + if (!def->listens[i].network) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("'network' attribute is required for " + "listen type 'network'")); + return -1; + } + break; + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET: + if (def->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC && + def->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("listen type 'socket' is not available for graphics type '%1$s'"), + graphicsType); + return -1; + } + break; + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NONE: + if (def->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE && + def->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("listen type 'none' is not available for graphics type '%1$s'"), + graphicsType); + return -1; + } + break; + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS: + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_LAST: + break; } } -- 2.40.0

1 0

Re: [libvirt PATCH v3] Conf: Move validation of virDomainGraphicsListenDef out of Parser virDomainGraphicsListenDef out of Parser
by K Shiva 07 Apr '23

07 Apr '23

In an effort to separate the validation steps from the Parse stage, a few validation checks of virDomainGraphicsListenDef have been moved from virDomainGraphicsListenDefParseXML() in domain_conf.c to virDomainGraphicsDefListensValidate() in domain_validate.c Signed-off-by: Koninty Shiva Kiran <shiva_kr(a)riseup.net> --- Change to previous mail: https://listman.redhat.com/archives/libvir-list/2023-April/239286.html - Previously forgot to add full name under signoff, added it here src/conf/domain_conf.c | 30 +----------------------------- src/conf/domain_validate.c | 37 +++++++++++++++++++++++++++++++------ 2 files changed, 32 insertions(+), 35 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 70e4d52ee6..8df751cc46 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -10986,7 +10986,6 @@ virDomainGraphicsAuthDefParseXML(xmlNodePtr node, /** * virDomainGraphicsListenDefParseXML: * @def: listen def pointer to be filled - * @graphics: graphics def pointer * @node: xml node of <listen/> element * @parent: xml node of <graphics/> element * @flags: bit-wise or of VIR_DOMAIN_DEF_PARSE_* @@ -10998,13 +10997,11 @@ virDomainGraphicsAuthDefParseXML(xmlNodePtr node, */ static int virDomainGraphicsListenDefParseXML(virDomainGraphicsListenDef *def, - virDomainGraphicsDef *graphics, xmlNodePtr node, xmlNodePtr parent, unsigned int flags) { int ret = -1; - const char *graphicsType = virDomainGraphicsTypeToString(graphics->type); g_autofree char *address = virXMLPropString(node, "address"); g_autofree char *network = virXMLPropString(node, "network"); g_autofree char *socketPath = virXMLPropString(node, "socket"); @@ -11021,31 +11018,6 @@ virDomainGraphicsListenDefParseXML(virDomainGraphicsListenDef *def, VIR_XML_PROP_REQUIRED, &def->type) < 0) goto error; - switch (def->type) { - case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET: - if (graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC && - graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("listen type 'socket' is not available for graphics type '%1$s'"), - graphicsType); - goto error; - } - break; - case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NONE: - if (graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE && - graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("listen type 'none' is not available for graphics type '%1$s'"), - graphicsType); - goto error; - } - break; - case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS: - case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK: - case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_LAST: - break; - } - if (def->type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS) { if (address && addressCompat && STRNEQ(address, addressCompat)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -11148,7 +11120,7 @@ virDomainGraphicsListensParseXML(virDomainGraphicsDef *def, def->listens = g_new0(virDomainGraphicsListenDef, nListens); for (i = 0; i < nListens; i++) { - if (virDomainGraphicsListenDefParseXML(&def->listens[i], def, + if (virDomainGraphicsListenDefParseXML(&def->listens[i], listenNodes[i], i == 0 ? node : NULL, flags) < 0) diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index 9265fef4f9..988f0854a5 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -2631,14 +2631,39 @@ static int virDomainGraphicsDefListensValidate(const virDomainGraphicsDef *def) { size_t i; + const char *graphicsType = virDomainGraphicsTypeToString(def->type); for (i = 0; i < def->nListens; i++) { - if (def->listens[i].type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK && - !def->listens[i].network) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("'network' attribute is required for " - "listen type 'network'")); - return -1; + switch (def->listens[i].type) { + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK: + if (!def->listens[i].network) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("'network' attribute is required for " + "listen type 'network'")); + return -1; + } + break; + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET: + if (def->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC && + def->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("listen type 'socket' is not available for graphics type '%1$s'"), + graphicsType); + return -1; + } + break; + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NONE: + if (def->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE && + def->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("listen type 'none' is not available for graphics type '%1$s'"), + graphicsType); + return -1; + } + break; + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS: + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_LAST: + break; } } -- 2.40.0

1 0

[libvirt PATCH] util: acpi: include unistd.h
by Ján Tomko 06 Apr '23

06 Apr '23

For lseek. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- Pushed as a build breaker fix. src/util/viracpi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/util/viracpi.c b/src/util/viracpi.c index e66df99f03..c96b7c296b 100644 --- a/src/util/viracpi.c +++ b/src/util/viracpi.c @@ -22,6 +22,7 @@ #include <inttypes.h> #include <fcntl.h> +#include <unistd.h> #define LIBVIRT_VIRACPIPRIV_H_ALLOW #include "internal.h" -- 2.39.2

1 0

[PATCH] qemu: snapshot: Allow inactive internal snapshots with uefi
by Peter Krempa 06 Apr '23

06 Apr '23

Historically the snapshot code attempted to forbid internal snapshots with UEFI both in active and inactive case. Unfortunately due to the intricacies of UEFI probing this didn't really work for inactive VMs which made users rely on the feature. Now with the changes to store detected UEFI environment also in the inactive definition this broke the feature for those users. Since the varstore doesn't really change that much in the lifecycle of a VM it usually is okay to simply leave it as is. Restore the functionality for inactive snapshots by disabling the check. In the future when uefi snapshotting will be added the rest of the condition will also be removed. Resolves: https://gitlab.com/libvirt/libvirt/-/issues/460 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_snapshot.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index 12ddf19c48..91de8b0c31 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -749,11 +749,17 @@ qemuSnapshotPrepare(virDomainObj *vm, * - if the variable store is raw, the snapshot fails * - allowing a qcow2 image as the varstore would make it eligible to receive * the vmstate dump, which would make it huge - * - offline snapshot would not snapshot the varstore at all * - * Avoid the issues by forbidding internal snapshot with pflash completely. + * While offline snapshot would not snapshot the varstore at all, this used + * to work as auto-detected UEFI firmware was not present in the offline + * definition. Since in most cases the varstore doesn't change it's usually + * not an issue. Allow this as there are existing users of this case. + * + * Avoid the issues by forbidding internal snapshot with pflash if the + * VM is active. */ - if (found_internal && + if (active && + found_internal && virDomainDefHasOldStyleUEFI(vm->def)) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("internal snapshots of a VM with pflash based " -- 2.39.2

2 1

[PATCH] viracpi: Fir error format string in virAcpiParseIORTNodeHeader()
by Michal Privoznik 06 Apr '23

06 Apr '23

Inside of virAcpiParseIORTNodeHeader() there's an virReportError() which reports size of a structure using sizeof() operator. Well, it's not well documented but the returned type of sizeof() is apparently size_t but the format string uses %lu. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under build breaker rule. Also verified this builds successfully on a 32bit ARM. src/util/viracpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/viracpi.c b/src/util/viracpi.c index 74fff0f0ac..e66df99f03 100644 --- a/src/util/viracpi.c +++ b/src/util/viracpi.c @@ -102,7 +102,7 @@ virAcpiParseIORTNodeHeader(int fd, * least size of header itself. */ if (nodeHeader->len < sizeof(*nodeHeader)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("IORT table node type %1$s has invalid length: got %2$u, expected at least %3$lu"), + _("IORT table node type %1$s has invalid length: got %2$u, expected at least %3$zu"), NULLSTR(typeStr), (unsigned int)nodeHeader->len, sizeof(*nodeHeader)); return -1; } -- 2.39.2

1 0

[PATCH v2] Conf: Move validation of virDomainGraphicsListenDef out of Parser
by K Shiva 06 Apr '23

06 Apr '23

From: skran <shiva_kr(a)riseup.net> In an effort to separate the validation steps from the Parse stage, a part of the validation of virDomainGraphicsListenDef has been moved to domain_validate.h. Signed-off-by: K Shiva <shiva_kr(a)riseup.net> --- This is a v2 of: https://listman.redhat.com/archives/libvir-list/2023-April/239205.html diff to v1: - Made virDomainGraphicsListenDefValidate() static, called by virDomainGraphicsDefListensValidate() - Removed unused Parameter (*graphics) out of Parse Function definition i.e virDomainGraphicsListenParseXML() - Corrected code format src/conf/domain_conf.c | 9 ++--- src/conf/domain_validate.c | 68 ++++++++++++++++++++------------------ src/conf/domain_validate.h | 4 --- 3 files changed, 37 insertions(+), 44 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 1e0ac737bb..746bb4efdf 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5836,7 +5836,7 @@ virDomainStorageNetworkParseHost(xmlNodePtr hostnode, host->socket = virXMLPropString(hostnode, "socket"); - // Socket Validation + /* Socket Validation */ if (virDomainStorageNetHostSocketValidate(host, transport) < 0) goto cleanup; @@ -10975,7 +10975,6 @@ virDomainGraphicsAuthDefParseXML(xmlNodePtr node, /** * virDomainGraphicsListenDefParseXML: * @def: listen def pointer to be filled - * @graphics: graphics def pointer * @node: xml node of <listen/> element * @parent: xml node of <graphics/> element * @flags: bit-wise or of VIR_DOMAIN_DEF_PARSE_* @@ -10987,7 +10986,6 @@ virDomainGraphicsAuthDefParseXML(xmlNodePtr node, */ static int virDomainGraphicsListenDefParseXML(virDomainGraphicsListenDef *def, - virDomainGraphicsDef *graphics, xmlNodePtr node, xmlNodePtr parent, unsigned int flags) @@ -11009,9 +11007,6 @@ virDomainGraphicsListenDefParseXML(virDomainGraphicsListenDef *def, VIR_XML_PROP_REQUIRED, &def->type) < 0) goto error; - if (virDomainGraphicsListenDefValidate(def, graphics) == -1) - goto error; - if (def->type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS) { if (address && addressCompat && STRNEQ(address, addressCompat)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -11114,7 +11109,7 @@ virDomainGraphicsListensParseXML(virDomainGraphicsDef *def, def->listens = g_new0(virDomainGraphicsListenDef, nListens); for (i = 0; i < nListens; i++) { - if (virDomainGraphicsListenDefParseXML(&def->listens[i], def, + if (virDomainGraphicsListenDefParseXML(&def->listens[i], listenNodes[i], i == 0 ? node : NULL, flags) < 0) diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index 10f8242c84..a84dbe8bc9 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -2627,6 +2627,39 @@ virDomainAudioDefValidate(const virDomainDef *def, return 0; } +static int +virDomainGraphicsListenDefValidate(const virDomainGraphicsListenDef *def, + const virDomainGraphicsDef *graphics) +{ + const char *graphicsType = virDomainGraphicsTypeToString(graphics->type); + + switch (def->type) { + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET: + if (graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC && + graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("listen type 'socket' is not available for graphics type '%1$s'"), + graphicsType); + return -1; + } + break; + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NONE: + if (graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE && + graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("listen type 'none' is not available for graphics type '%1$s'"), + graphicsType); + return -1; + } + break; + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS: + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK: + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_LAST: + break; + } + return 0; +} + static int virDomainGraphicsDefListensValidate(const virDomainGraphicsDef *def) { @@ -2640,6 +2673,8 @@ virDomainGraphicsDefListensValidate(const virDomainGraphicsDef *def) "listen type 'network'")); return -1; } + if (virDomainGraphicsListenDefValidate(&def->listens[i], def) < 0) + return -1; } return 0; @@ -2669,39 +2704,6 @@ virDomainGraphicsDefValidate(const virDomainDef *def, return 0; } -int -virDomainGraphicsListenDefValidate(const virDomainGraphicsListenDef *def, - const virDomainGraphicsDef *graphics) -{ - const char *graphicsType = virDomainGraphicsTypeToString(graphics->type); - - switch (def->type) { - case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET: - if (graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC && - graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("listen type 'socket' is not available for graphics type '%1$s'"), - graphicsType); - return -1; - } - break; - case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NONE: - if (graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE && - graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("listen type 'none' is not available for graphics type '%1$s'"), - graphicsType); - return -1; - } - break; - case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS: - case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK: - case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_LAST: - break; - } - return 0; -} - static int virDomainIOMMUDefValidate(const virDomainIOMMUDef *iommu) { diff --git a/src/conf/domain_validate.h b/src/conf/domain_validate.h index baeae4b2a3..7772a62e18 100644 --- a/src/conf/domain_validate.h +++ b/src/conf/domain_validate.h @@ -48,9 +48,5 @@ int virDomainDiskDefSourceLUNValidate(const virStorageSource *src); int virDomainDefOSValidate(const virDomainDef *def, virDomainXMLOption *xmlopt); -int -virDomainGraphicsListenDefValidate(const virDomainGraphicsListenDef *def, - const virDomainGraphicsDef *graphics); - int virDomainStorageNetHostSocketValidate(const virStorageNetHostDef *host, const char *transport); -- 2.40.0

3 3

[PATCH v2 0/3] virt-host-validate: Detect SMMU presence on ARMs by parsing IORT table
by Michal Privoznik 06 Apr '23

06 Apr '23

v2 of: https://listman.redhat.com/archives/libvir-list/2023-April/239251.html diff to v1: - Renamed couple of enum values, - fixed their string translations, - Other small nits pointed out by Andrea Michal Prívozník (3): util: Introduce virAcpi module tests: Introduce viracpitest virt-host-validate: Detect SMMU presence on ARMs by parsing IORT table build-aux/syntax-check.mk | 2 +- po/POTFILES | 1 + src/libvirt_private.syms | 7 + src/util/meson.build | 1 + src/util/viracpi.c | 226 ++++++++++++++++++++++++++++ src/util/viracpi.h | 23 +++ src/util/viracpipriv.h | 58 +++++++ tests/meson.build | 1 + tests/viracpidata/IORT_ampere | Bin 0 -> 2304 bytes tests/viracpidata/IORT_empty | Bin 0 -> 65 bytes tests/viracpidata/IORT_gigabyte | Bin 0 -> 10100 bytes tests/viracpidata/IORT_qualcomm | Bin 0 -> 3560 bytes tests/viracpidata/IORT_virt_aarch64 | Bin 0 -> 128 bytes tests/viracpitest.c | 135 +++++++++++++++++ tools/virt-host-validate-common.c | 18 ++- 15 files changed, 468 insertions(+), 4 deletions(-) create mode 100644 src/util/viracpi.c create mode 100644 src/util/viracpi.h create mode 100644 src/util/viracpipriv.h create mode 100644 tests/viracpidata/IORT_ampere create mode 100644 tests/viracpidata/IORT_empty create mode 100644 tests/viracpidata/IORT_gigabyte create mode 100644 tests/viracpidata/IORT_qualcomm create mode 100644 tests/viracpidata/IORT_virt_aarch64 create mode 100644 tests/viracpitest.c -- 2.39.2

2 4

[RFC PATCH] docs/about/deprecated: Deprecate 32-bit host systems
by Thomas Huth 06 Apr '23

06 Apr '23

Testing 32-bit host OS support takes a lot of precious time during the QEMU contiguous integration tests, and considering that many OS vendors stopped shipping 32-bit variants of their OS distributions and most hardware from the past >10 years is capable of 64-bit, keeping the 32-bit support alive is an inadequate burden for the QEMU project. Let's mark the 32-bit support as deprecated so we can drop it after a while - this will help us to cut down our limited CI minutes in the gitlab CI, for example. Signed-off-by: Thomas Huth <thuth(a)redhat.com> --- docs/about/deprecated.rst | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 9f1bbc495d..ce6463e72b 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -181,9 +181,20 @@ As Debian 10 ("Buster") moved into LTS the big endian 32 bit version of MIPS moved out of support making it hard to maintain our cross-compilation CI tests of the architecture. As we no longer have CI coverage support may bitrot away before the deprecation process -completes. The little endian variants of MIPS (both 32 and 64 bit) are +completes. The little endian variants of MIPS are still a supported host architecture. +32-bit host operating systems (since 8.0) +''''''''''''''''''''''''''''''''''''''''' + +Testing 32-bit host OS support takes a lot of precious time during the QEMU +contiguous integration tests, and considering that many OS vendors stopped +shipping 32-bit variants of their OS distributions and most hardware from +the past >10 years is capable of 64-bit, keeping the 32-bit support alive +is an inadequate burden for the QEMU project. Thus QEMU will soon drop the +support for 32-bit host systems. + + QEMU API (QAPI) events ---------------------- -- 2.31.1

16 44

[PATCH] Conf: Move validation of Graphics Transport and StorageNetwork Socket out of parser
by skran 05 Apr '23

05 Apr '23

Thank you for the corrections. I understand it now. [1] I have made the Graphics Transport validation function static and moved its call out of the parser, to virDomainGraphicsDefListensValidate() in domain_validate.h. Is this a correct implementation?, it does pass the tests. I have removed the *graphics def parameter from ParseXML function as it became unused after moving the validation out of the Parser. [2] I can't find a way to implement virDomainStorageNetHostSocketValidate() as static. Could you please point as to which function within domain_validate.h could be used to call this validation function? similar to virDomainGraphicsDefListensValidate() for [1]. [3] How do I obtain char *transport within the validation function without parameter passing? It's used only to report this error in the below snippet virReportError(VIR_ERR_XML_ERROR, _("transport '%1$s' does not support socket attribute"), transport); Do I use virXMLPropString(hostnode, "transport") after passing xmlNodePtr hostnode as a parameter? How do I obtain these in domain_validate.h. Thank you for your help! Signed-off-by: K Shiva <shiva_kr(a)riseup.net> --- src/conf/domain_conf.c | 9 ++--- src/conf/domain_validate.c | 68 ++++++++++++++++++++------------------ src/conf/domain_validate.h | 4 --- 3 files changed, 37 insertions(+), 44 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 1e0ac737bb..746bb4efdf 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5836,7 +5836,7 @@ virDomainStorageNetworkParseHost(xmlNodePtr hostnode, host->socket = virXMLPropString(hostnode, "socket"); - // Socket Validation + /* Socket Validation */ if (virDomainStorageNetHostSocketValidate(host, transport) < 0) goto cleanup; @@ -10975,7 +10975,6 @@ virDomainGraphicsAuthDefParseXML(xmlNodePtr node, /** * virDomainGraphicsListenDefParseXML: * @def: listen def pointer to be filled - * @graphics: graphics def pointer * @node: xml node of <listen/> element * @parent: xml node of <graphics/> element * @flags: bit-wise or of VIR_DOMAIN_DEF_PARSE_* @@ -10987,7 +10986,6 @@ virDomainGraphicsAuthDefParseXML(xmlNodePtr node, */ static int virDomainGraphicsListenDefParseXML(virDomainGraphicsListenDef *def, - virDomainGraphicsDef *graphics, xmlNodePtr node, xmlNodePtr parent, unsigned int flags) @@ -11009,9 +11007,6 @@ virDomainGraphicsListenDefParseXML(virDomainGraphicsListenDef *def, VIR_XML_PROP_REQUIRED, &def->type) < 0) goto error; - if (virDomainGraphicsListenDefValidate(def, graphics) == -1) - goto error; - if (def->type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS) { if (address && addressCompat && STRNEQ(address, addressCompat)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -11114,7 +11109,7 @@ virDomainGraphicsListensParseXML(virDomainGraphicsDef *def, def->listens = g_new0(virDomainGraphicsListenDef, nListens); for (i = 0; i < nListens; i++) { - if (virDomainGraphicsListenDefParseXML(&def->listens[i], def, + if (virDomainGraphicsListenDefParseXML(&def->listens[i], listenNodes[i], i == 0 ? node : NULL, flags) < 0) diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index 10f8242c84..a84dbe8bc9 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -2627,6 +2627,39 @@ virDomainAudioDefValidate(const virDomainDef *def, return 0; } +static int +virDomainGraphicsListenDefValidate(const virDomainGraphicsListenDef *def, + const virDomainGraphicsDef *graphics) +{ + const char *graphicsType = virDomainGraphicsTypeToString(graphics->type); + + switch (def->type) { + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET: + if (graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC && + graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("listen type 'socket' is not available for graphics type '%1$s'"), + graphicsType); + return -1; + } + break; + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NONE: + if (graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE && + graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("listen type 'none' is not available for graphics type '%1$s'"), + graphicsType); + return -1; + } + break; + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS: + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK: + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_LAST: + break; + } + return 0; +} + static int virDomainGraphicsDefListensValidate(const virDomainGraphicsDef *def) { @@ -2640,6 +2673,8 @@ virDomainGraphicsDefListensValidate(const virDomainGraphicsDef *def) "listen type 'network'")); return -1; } + if (virDomainGraphicsListenDefValidate(&def->listens[i], def) < 0) + return -1; } return 0; @@ -2669,39 +2704,6 @@ virDomainGraphicsDefValidate(const virDomainDef *def, return 0; } -int -virDomainGraphicsListenDefValidate(const virDomainGraphicsListenDef *def, - const virDomainGraphicsDef *graphics) -{ - const char *graphicsType = virDomainGraphicsTypeToString(graphics->type); - - switch (def->type) { - case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET: - if (graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC && - graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("listen type 'socket' is not available for graphics type '%1$s'"), - graphicsType); - return -1; - } - break; - case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NONE: - if (graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE && - graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("listen type 'none' is not available for graphics type '%1$s'"), - graphicsType); - return -1; - } - break; - case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS: - case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK: - case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_LAST: - break; - } - return 0; -} - static int virDomainIOMMUDefValidate(const virDomainIOMMUDef *iommu) { diff --git a/src/conf/domain_validate.h b/src/conf/domain_validate.h index baeae4b2a3..7772a62e18 100644 --- a/src/conf/domain_validate.h +++ b/src/conf/domain_validate.h @@ -48,9 +48,5 @@ int virDomainDiskDefSourceLUNValidate(const virStorageSource *src); int virDomainDefOSValidate(const virDomainDef *def, virDomainXMLOption *xmlopt); -int -virDomainGraphicsListenDefValidate(const virDomainGraphicsListenDef *def, - const virDomainGraphicsDef *graphics); - int virDomainStorageNetHostSocketValidate(const virStorageNetHostDef *host, const char *transport); -- 2.40.0

2 1

[PATCH 0/2] libxl: Support custom EFI firmware path
by Jim Fehlig 05 Apr '23

05 Apr '23

libxl added support for specifying custom firmware paths long ago. This series adds support to the libxl driver and the XML to xl.cfg config converter. Jim Fehlig (2): libxl: Support specifying a custom firmware path libxl: Add support for custom firmware path in config converter src/libxl/libxl_conf.c | 14 ++-- src/libxl/xen_xl.c | 19 +++-- tests/libxlxml2domconfigdata/efi-hvm.json | 91 +++++++++++++++++++++++ tests/libxlxml2domconfigdata/efi-hvm.xml | 36 +++++++++ tests/libxlxml2domconfigtest.c | 1 + tests/xlconfigdata/test-fullvirt-ovmf.cfg | 1 + tests/xlconfigdata/test-fullvirt-ovmf.xml | 2 +- 7 files changed, 150 insertions(+), 14 deletions(-) create mode 100644 tests/libxlxml2domconfigdata/efi-hvm.json create mode 100644 tests/libxlxml2domconfigdata/efi-hvm.xml -- 2.39.1

3 5

[libvirt PATCH 00/20] introduce external snapshot revert support
by Pavel Hrdina 05 Apr '23

05 Apr '23

This implements virDomainRevertToSnapshot to work with external snapshots. In addition it modifies virDomainSnapshotDelete to work correctly when we revert to non-leaf snapshot. Gitlab repo with the patches: https://gitlab.com/phrdina/libvirt/-/tree/snapshot-revert-external Pavel Hrdina (20): libvirt_private: list virDomainMomentDefPostParse snapshot_conf: export virDomainSnapshotDiskDefClear snapshot_conf: use alternate domain definition in virDomainSnapshotDefAssignExternalNames snapshot_conf: introduce <revertDisks> metadata element qemu_snapshot: introduce qemuSnapshotDomainDefUpdateDisk qemu_snapshot: use virDomainDiskByName while updating domain def qemu_snapshot: introduce qemuSnapshotCreateQcow2Files qemu_snapshot: allow using alternate domain definition when creating qcow2 files qemu_snapshot: introduce external snapshot revert support qemu_snapshot: rename qemuSnapshotDeleteExternalPrepare qemu_snapshot: extract external snapshot delete prepare to function qemu_snapshot: add blockCommit to external snapshot delete prepare data qemu_snapshot: prepare data for non-active leaf external snapshot deletion qemu_snapshot: add support to delete external snapshot without block commit qemu_snapshot: delete: properly update parent snapshot with revert data qemu_snapshot: don't allow creating external snapshot after reverting virdomainmomentobjlist: introduce virDomainMomentIsAncestor qemu_snapshot: check only once if snapshot is external qemu_snapshot: add checks for external snapshot deletion qemu_snapshot: allow snapshot revert for external snapshots src/conf/schemas/domainsnapshot.rng | 7 + src/conf/snapshot_conf.c | 37 +- src/conf/snapshot_conf.h | 8 + src/conf/virdomainmomentobjlist.c | 21 + src/conf/virdomainmomentobjlist.h | 4 + src/libvirt_private.syms | 6 + src/qemu/qemu_snapshot.c | 621 ++++++++++++++++++++-------- 7 files changed, 538 insertions(+), 166 deletions(-) -- 2.39.2

2 41

Re: [PATCH] Conf: Move validation of Graphics Transport and StorageNetwork Socket out of parser
by skran 05 Apr '23

05 Apr '23

Thank you for the corrections. I understand it now. [1] I have made the Graphics Transport validation function static and moved its call out of the parser, to virDomainGraphicsDefListensValidate() in domain_validate.h. Is this a correct implementation?, it does pass the tests. I have removed the *graphics def parameter from ParseXML function as it became unused after moving the validation out of the Parser. [2] I can't find a way to implement virDomainStorageNetHostSocketValidate() as static. Could you please point as to which function within domain_validate.h could be used to call this validation function? similar to virDomainGraphicsDefListensValidate() for [1]. [3] How do I obtain char *transport within the validation function without parameter passing? It's used only to report this error in the below snippet virReportError(VIR_ERR_XML_ERROR, _("transport '%1$s' does not support socket attribute"), transport); Do I use virXMLPropString(hostnode, "transport") after passing xmlNodePtr hostnode as a parameter? How do I obtain these in domain_validate.h. Thank you for your help! Signed-off-by: K Shiva <shiva_kr(a)riseup.net> --- src/conf/domain_conf.c | 9 ++--- src/conf/domain_validate.c | 68 ++++++++++++++++++++------------------ src/conf/domain_validate.h | 4 --- 3 files changed, 37 insertions(+), 44 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 1e0ac737bb..746bb4efdf 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5836,7 +5836,7 @@ virDomainStorageNetworkParseHost(xmlNodePtr hostnode, host->socket = virXMLPropString(hostnode, "socket"); - // Socket Validation + /* Socket Validation */ if (virDomainStorageNetHostSocketValidate(host, transport) < 0) goto cleanup; @@ -10975,7 +10975,6 @@ virDomainGraphicsAuthDefParseXML(xmlNodePtr node, /** * virDomainGraphicsListenDefParseXML: * @def: listen def pointer to be filled - * @graphics: graphics def pointer * @node: xml node of <listen/> element * @parent: xml node of <graphics/> element * @flags: bit-wise or of VIR_DOMAIN_DEF_PARSE_* @@ -10987,7 +10986,6 @@ virDomainGraphicsAuthDefParseXML(xmlNodePtr node, */ static int virDomainGraphicsListenDefParseXML(virDomainGraphicsListenDef *def, - virDomainGraphicsDef *graphics, xmlNodePtr node, xmlNodePtr parent, unsigned int flags) @@ -11009,9 +11007,6 @@ virDomainGraphicsListenDefParseXML(virDomainGraphicsListenDef *def, VIR_XML_PROP_REQUIRED, &def->type) < 0) goto error; - if (virDomainGraphicsListenDefValidate(def, graphics) == -1) - goto error; - if (def->type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS) { if (address && addressCompat && STRNEQ(address, addressCompat)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -11114,7 +11109,7 @@ virDomainGraphicsListensParseXML(virDomainGraphicsDef *def, def->listens = g_new0(virDomainGraphicsListenDef, nListens); for (i = 0; i < nListens; i++) { - if (virDomainGraphicsListenDefParseXML(&def->listens[i], def, + if (virDomainGraphicsListenDefParseXML(&def->listens[i], listenNodes[i], i == 0 ? node : NULL, flags) < 0) diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index 10f8242c84..a84dbe8bc9 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -2627,6 +2627,39 @@ virDomainAudioDefValidate(const virDomainDef *def, return 0; } +static int +virDomainGraphicsListenDefValidate(const virDomainGraphicsListenDef *def, + const virDomainGraphicsDef *graphics) +{ + const char *graphicsType = virDomainGraphicsTypeToString(graphics->type); + + switch (def->type) { + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET: + if (graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC && + graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("listen type 'socket' is not available for graphics type '%1$s'"), + graphicsType); + return -1; + } + break; + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NONE: + if (graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE && + graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("listen type 'none' is not available for graphics type '%1$s'"), + graphicsType); + return -1; + } + break; + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS: + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK: + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_LAST: + break; + } + return 0; +} + static int virDomainGraphicsDefListensValidate(const virDomainGraphicsDef *def) { @@ -2640,6 +2673,8 @@ virDomainGraphicsDefListensValidate(const virDomainGraphicsDef *def) "listen type 'network'")); return -1; } + if (virDomainGraphicsListenDefValidate(&def->listens[i], def) < 0) + return -1; } return 0; @@ -2669,39 +2704,6 @@ virDomainGraphicsDefValidate(const virDomainDef *def, return 0; } -int -virDomainGraphicsListenDefValidate(const virDomainGraphicsListenDef *def, - const virDomainGraphicsDef *graphics) -{ - const char *graphicsType = virDomainGraphicsTypeToString(graphics->type); - - switch (def->type) { - case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET: - if (graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC && - graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("listen type 'socket' is not available for graphics type '%1$s'"), - graphicsType); - return -1; - } - break; - case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NONE: - if (graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE && - graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("listen type 'none' is not available for graphics type '%1$s'"), - graphicsType); - return -1; - } - break; - case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS: - case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK: - case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_LAST: - break; - } - return 0; -} - static int virDomainIOMMUDefValidate(const virDomainIOMMUDef *iommu) { diff --git a/src/conf/domain_validate.h b/src/conf/domain_validate.h index baeae4b2a3..7772a62e18 100644 --- a/src/conf/domain_validate.h +++ b/src/conf/domain_validate.h @@ -48,9 +48,5 @@ int virDomainDiskDefSourceLUNValidate(const virStorageSource *src); int virDomainDefOSValidate(const virDomainDef *def, virDomainXMLOption *xmlopt); -int -virDomainGraphicsListenDefValidate(const virDomainGraphicsListenDef *def, - const virDomainGraphicsDef *graphics); - int virDomainStorageNetHostSocketValidate(const virStorageNetHostDef *host, const char *transport); -- 2.40.0

1 0

[PATCH] Conf: Move validation of Graphics Transport and StorageNetwork Socket out of parser
by skran 04 Apr '23

04 Apr '23

I have implemented your corrections successfully. Thank you. Signed-off-by: K Shiva <shiva_kr(a)riseup.net> --- src/conf/domain_conf.c | 42 +++------------------------- src/conf/domain_validate.c | 56 ++++++++++++++++++++++++++++++++++++++ src/conf/domain_validate.h | 7 +++++ 3 files changed, 67 insertions(+), 38 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 70e4d52ee6..1e0ac737bb 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5836,20 +5836,9 @@ virDomainStorageNetworkParseHost(xmlNodePtr hostnode, host->socket = virXMLPropString(hostnode, "socket"); - if (host->transport == VIR_STORAGE_NET_HOST_TRANS_UNIX && - host->socket == NULL) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("missing socket for unix transport")); + // Socket Validation + if (virDomainStorageNetHostSocketValidate(host, transport) < 0) goto cleanup; - } - - if (host->transport != VIR_STORAGE_NET_HOST_TRANS_UNIX && - host->socket != NULL) { - virReportError(VIR_ERR_XML_ERROR, - _("transport '%1$s' does not support socket attribute"), - transport); - goto cleanup; - } if (host->transport != VIR_STORAGE_NET_HOST_TRANS_UNIX) { if (!(host->name = virXMLPropString(hostnode, "name"))) { @@ -11004,7 +10993,6 @@ virDomainGraphicsListenDefParseXML(virDomainGraphicsListenDef *def, unsigned int flags) { int ret = -1; - const char *graphicsType = virDomainGraphicsTypeToString(graphics->type); g_autofree char *address = virXMLPropString(node, "address"); g_autofree char *network = virXMLPropString(node, "network"); g_autofree char *socketPath = virXMLPropString(node, "socket"); @@ -11021,30 +11009,8 @@ virDomainGraphicsListenDefParseXML(virDomainGraphicsListenDef *def, VIR_XML_PROP_REQUIRED, &def->type) < 0) goto error; - switch (def->type) { - case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET: - if (graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC && - graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("listen type 'socket' is not available for graphics type '%1$s'"), - graphicsType); - goto error; - } - break; - case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NONE: - if (graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE && - graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("listen type 'none' is not available for graphics type '%1$s'"), - graphicsType); - goto error; - } - break; - case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS: - case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK: - case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_LAST: - break; - } + if (virDomainGraphicsListenDefValidate(def, graphics) == -1) + goto error; if (def->type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS) { if (address && addressCompat && STRNEQ(address, addressCompat)) { diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index 9265fef4f9..10f8242c84 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -2669,6 +2669,39 @@ virDomainGraphicsDefValidate(const virDomainDef *def, return 0; } +int +virDomainGraphicsListenDefValidate(const virDomainGraphicsListenDef *def, + const virDomainGraphicsDef *graphics) +{ + const char *graphicsType = virDomainGraphicsTypeToString(graphics->type); + + switch (def->type) { + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET: + if (graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC && + graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("listen type 'socket' is not available for graphics type '%1$s'"), + graphicsType); + return -1; + } + break; + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NONE: + if (graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE && + graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("listen type 'none' is not available for graphics type '%1$s'"), + graphicsType); + return -1; + } + break; + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS: + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK: + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_LAST: + break; + } + return 0; +} + static int virDomainIOMMUDefValidate(const virDomainIOMMUDef *iommu) { @@ -2898,3 +2931,26 @@ virDomainDeviceDefValidate(const virDomainDeviceDef *dev, return 0; } + +int +virDomainStorageNetHostSocketValidate(const virStorageNetHostDef *host, + const char* transport) +{ + if (host->transport == VIR_STORAGE_NET_HOST_TRANS_UNIX && + host->socket == NULL) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("missing socket for unix transport")); + return -1; + } + + if (host->transport != VIR_STORAGE_NET_HOST_TRANS_UNIX && + host->socket != NULL) { + virReportError(VIR_ERR_XML_ERROR, + _("transport '%1$s' does not support socket attribute"), + transport); + return -1; + } + + + return 0; +} diff --git a/src/conf/domain_validate.h b/src/conf/domain_validate.h index fc441cef5b..baeae4b2a3 100644 --- a/src/conf/domain_validate.h +++ b/src/conf/domain_validate.h @@ -47,3 +47,10 @@ int virDomainDiskDefSourceLUNValidate(const virStorageSource *src); int virDomainDefOSValidate(const virDomainDef *def, virDomainXMLOption *xmlopt); + +int +virDomainGraphicsListenDefValidate(const virDomainGraphicsListenDef *def, + const virDomainGraphicsDef *graphics); + +int virDomainStorageNetHostSocketValidate(const virStorageNetHostDef *host, + const char *transport); -- 2.40.0

2 1

[PATCH] coding style: Follow our own rule on comment style
by Michal Privoznik 04 Apr '23

04 Apr '23

In our coding style document we have examples of good and bad code, which we mark as: // Good // Bad respectively. But in the very same document we advocate for using C style of comments over C++. Follow our own advice and switch annotation to: /* Good */ /* Bad */ And while at it, align these annotations within their blocks for better readability. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- docs/coding-style.rst | 76 +++++++++++++++++++++---------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/docs/coding-style.rst b/docs/coding-style.rst index 92f6099d82..fe5fe9a906 100644 --- a/docs/coding-style.rst +++ b/docs/coding-style.rst @@ -161,24 +161,24 @@ a single space following them before the opening bracket. E.g. :: - if(foo) // Bad - if (foo) // Good + if(foo) /* Bad */ + if (foo) /* Good */ Function implementations must **not** have any whitespace between the function name and the opening bracket. E.g. :: - int foo (int wizz) // Bad - int foo(int wizz) // Good + int foo (int wizz) /* Bad */ + int foo(int wizz) /* Good */ Function calls must **not** have any whitespace between the function name and the opening bracket. E.g. :: - bar = foo (wizz); // Bad - bar = foo(wizz); // Good + bar = foo (wizz); /* Bad */ + bar = foo(wizz); /* Good */ Function typedefs must **not** have any whitespace between the closing bracket of the function name and opening bracket of the @@ -186,16 +186,16 @@ arg list. E.g. :: - typedef int (*foo) (int wizz); // Bad - typedef int (*foo)(int wizz); // Good + typedef int (*foo) (int wizz); /* Bad */ + typedef int (*foo)(int wizz); /* Good */ There must not be any whitespace immediately following any opening bracket, or immediately prior to any closing bracket. E.g. :: - int foo( int wizz ); // Bad - int foo(int wizz); // Good + int foo( int wizz ); /* Bad */ + int foo(int wizz); /* Good */ Commas ------ @@ -206,8 +206,8 @@ syntax-check'. :: - call(a,b ,c);// Bad - call(a, b, c); // Good + call(a,b ,c); /* Bad */ + call(a, b, c); /* Good */ When declaring an enum or using a struct initializer that occupies more than one line, use a trailing comma. That way, future edits @@ -225,11 +225,11 @@ C99 allows trailing commas, remember that JSON and XDR do not. enum { VALUE_ONE, - VALUE_TWO // Bad + VALUE_TWO /* Bad */ }; enum { VALUE_THREE, - VALUE_FOUR, // Good + VALUE_FOUR, /* Good */ }; Semicolons @@ -243,10 +243,10 @@ not enforced, loop counters generally use post-increment. :: - for (i = 0 ;i < limit ; ++i) { // Bad - for (i = 0; i < limit; i++) { // Good - for (;;) { // ok - while (1) { // Better + for (i = 0 ;i < limit ; ++i) { /* Bad */ + for (i = 0; i < limit; i++) { /* Good */ + for (;;) { /* ok */ + while (1) { /* Better */ Empty loop bodies are better represented with curly braces and a comment, although use of a semicolon is not currently rejected. @@ -254,9 +254,9 @@ comment, although use of a semicolon is not currently rejected. :: while ((rc = waitpid(pid, &st, 0) == -1) && - errno == EINTR); // ok + errno == EINTR); /* ok */ while ((rc = waitpid(pid, &st, 0) == -1) && - errno == EINTR) { // Better + errno == EINTR) { /* Better */ /* nothing */ } @@ -271,19 +271,19 @@ single-\ *statement* loop: each has only one *line* in its body. :: - while (expr) // single line body; {} is optional + while (expr) /* single line body; {} is optional */ single_line_stmt(); :: while (expr(arg1, - arg2)) // indentation makes it obvious it is single line, - single_line_stmt(); // {} is optional (not enforced either way) + arg2)) /* indentation makes it obvious it is single line, */ + single_line_stmt(); /* {} is optional (not enforced either way) */ :: while (expr1 && - expr2) { // multi-line, at same indentation, {} required + expr2) { /* multi-line, at same indentation, {} required */ single_line_stmt(); } @@ -295,7 +295,7 @@ braces), thinking it is already a multi-statement loop: :: - while (true) // BAD! multi-line body with no braces + while (true) /* BAD! multi-line body with no braces */ /* comment... */ single_line_stmt(); @@ -303,7 +303,7 @@ Do this instead: :: - while (true) { // Always put braces around a multi-line body. + while (true) { /* Always put braces around a multi-line body. */ /* comment... */ single_line_stmt(); } @@ -325,8 +325,8 @@ To reiterate, don't do this: :: - if (expr) // BAD: no braces around... - while (expr_2) { // ... a multi-line body + if (expr) /* BAD: no braces around... */ + while (expr_2) { /* ... a multi-line body */ ... } @@ -356,11 +356,11 @@ longer, multi-line block be the ``else`` block. ... } else - x = y; // BAD: braceless "else" with braced "then", - // and short block last + x = y; /* BAD: braceless "else" with braced "then", + * and short block last */ if (expr) - x = y; // BAD: braceless "if" with braced "else" + x = y; /* BAD: braceless "if" with braced "else" */ else { ... ... @@ -375,7 +375,7 @@ rather than after the more involved block: :: if (!expr) { - x = y; // putting the smaller block first is more readable + x = y; /* putting the smaller block first is more readable */ } else { ... ... @@ -403,19 +403,19 @@ itself. void foo(int a, int b) - { // correct - function body + { /* correct - function body */ int 2d[][] = { - { // correct - complex initialization + { /* correct - complex initialization */ 1, 2, }, }; if (a) - { // BAD: compound brace on its own line + { /* BAD: compound brace on its own line */ do_stuff(); } - { // correct - nested scope + { /* correct - nested scope */ int tmp; - if (a < b) { // correct - hanging brace + if (a < b) { /* correct - hanging brace */ tmp = b; b = a; a = tmp; @@ -601,7 +601,7 @@ calling another function. x = y + 20; - char *z = NULL; // <=== + char *z = NULL; /* <=== */ ... } -- 2.39.2

2 1

(GSoC) Contributor Application
by Shiva 04 Apr '23

04 Apr '23

Greetings libvirt developers! My name is Shiva and I am interested in contributing to the project titled *"Metadata support for all object schemas". * My apologies for the delay in contact as this is my first time at GSoC and I have missed the dates. Is this the correct mailing list for GSoC Communication? If not please point me to the right one (libvir-users list?). As part of the requirements, I have successfully compiled libvirt on my Arch Linux system and have also created a Merge Request for my first bytesizedtask in request#245 <https://gitlab.com/libvirt/libvirt/-/merge_requests/245>. My understanding of the project is as follows: - Provide support for <metadata>, <title> and <description> tags for all object schemas including networks, nwfilters, interfaces, storage pools etc. - Add set and get metadata public API functions that interact with these tags. - Add an async event callback for each object that notifies of changes in these tags. Please correct me if I have gotten anything wrong. If there is an interview to be conducted, please provide me a schedule for it. I will be happy to provide any additional information. Thank You. SIncerely K Shiva Kiran GSoC Applicant

3 3

[PATCH 1/1] Partial fixes for Issue #7 titled 'Move validation checks out of domain XML parsing'
by skran 03 Apr '23

03 Apr '23

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 3ab7cd2666..2a94566047 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5840,14 +5840,14 @@ virDomainStorageNetworkParseHost(xmlNodePtr hostnode, host->socket = virXMLPropString(hostnode, "socket"); if (host->transport == VIR_STORAGE_NET_HOST_TRANS_UNIX && - host->socket == NULL) { + virDomainStorageNetHostSocketValidate(host)) { virReportError(VIR_ERR_XML_ERROR, "%s", _("missing socket for unix transport")); goto cleanup; } if (host->transport != VIR_STORAGE_NET_HOST_TRANS_UNIX && - host->socket != NULL) { + !virDomainStorageNetHostSocketValidate(host)) { virReportError(VIR_ERR_XML_ERROR, _("transport '%1$s' does not support socket attribute"), transport); @@ -11024,30 +11024,8 @@ virDomainGraphicsListenDefParseXML(virDomainGraphicsListenDef *def, VIR_XML_PROP_REQUIRED, &def->type) < 0) goto error; - switch (def->type) { - case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET: - if (graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC && - graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("listen type 'socket' is not available for graphics type '%1$s'"), - graphicsType); - goto error; - } - break; - case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NONE: - if (graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE && - graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("listen type 'none' is not available for graphics type '%1$s'"), - graphicsType); - goto error; - } - break; - case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS: - case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK: - case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_LAST: - break; - } + if (virDomainGraphicsListenDefValidate(def, graphics, graphicsType)) + goto error; if (def->type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS) { if (address && addressCompat && STRNEQ(address, addressCompat)) { diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index 9265fef4f9..b8b8f941cc 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -2669,6 +2669,38 @@ virDomainGraphicsDefValidate(const virDomainDef *def, return 0; } +int +virDomainGraphicsListenDefValidate(const virDomainGraphicsListenDef *def, + const virDomainGraphicsDef *graphics, + const char *graphicsType) +{ + switch (def->type) { + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET: + if (graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC && + graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("listen type 'socket' is not available for graphics type '%1$s'"), + graphicsType); + return -1; + } + break; + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NONE: + if (graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE && + graphics->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("listen type 'none' is not available for graphics type '%1$s'"), + graphicsType); + return -1; + } + break; + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS: + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK: + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_LAST: + break; + } + return 0; +} + static int virDomainIOMMUDefValidate(const virDomainIOMMUDef *iommu) { @@ -2898,3 +2930,13 @@ virDomainDeviceDefValidate(const virDomainDeviceDef *dev, return 0; } + +int +virDomainStorageNetHostSocketValidate(const virStorageNetHostDef *host) + +{ + if (host->socket) + return 0; + else + return -1; +} diff --git a/src/conf/domain_validate.h b/src/conf/domain_validate.h index fc441cef5b..58ee9b7da5 100644 --- a/src/conf/domain_validate.h +++ b/src/conf/domain_validate.h @@ -47,3 +47,10 @@ int virDomainDiskDefSourceLUNValidate(const virStorageSource *src); int virDomainDefOSValidate(const virDomainDef *def, virDomainXMLOption *xmlopt); + +int virDomainStorageNetHostSocketValidate(const virStorageNetHostDef *host); + +int +virDomainGraphicsListenDefValidate(const virDomainGraphicsListenDef *def, + const virDomainGraphicsDef *graphics, + const char *graphicsType); -- 2.40.0

3 2

[PATCH (pushed)] domaincapstest: Skip unknown variants instead of the default variant
by Peter Krempa 03 Apr '23

03 Apr '23

Fix the logic selecting when to run the tests to skip unknown variants rather than the default variant. Fixes: 738c5bae888 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- Pushed as trivial. I've messed up when applying review feedback. tests/domaincapstest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index a02197c4ea..ca4761aad0 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -326,7 +326,7 @@ doTestQemu(const char *inputDir G_GNUC_UNUSED, if (STREQ(variant, "+hvf")) hvf = true; - else if (STREQ(variant, "")) + else if (STRNEQ(variant, "")) return 0; if (STREQ(arch, "x86_64")) { -- 2.39.2

1 0

[libvirt PATCH] Remove trailing spaces from translatable strings
by Ján Tomko 03 Apr '23

03 Apr '23

Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/rpc/virnetsshsession.c | 2 +- src/test/test_driver.c | 2 +- tools/virt-admin.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c index 7bf27c161a..f84805825b 100644 --- a/src/rpc/virnetsshsession.c +++ b/src/rpc/virnetsshsession.c @@ -737,7 +737,7 @@ virNetSSHAuthenticateKeyboardInteractive(virNetSSHSession *sess, if (!sess->cred || !sess->cred->cb) { virReportError(VIR_ERR_SSH, "%s", _("Can't perform keyboard-interactive authentication: " - "Authentication callback not provided ")); + "Authentication callback not provided")); return -1; } diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 822639e0f3..7b06896d44 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -3979,7 +3979,7 @@ testDomainSetBlockIoTune(virDomainPtr dom, do { \ if (info.FIELD > info.FIELD_MAX) { \ virReportError(VIR_ERR_INVALID_ARG, \ - _("%1$s cannot be set higher than %2$s "), \ + _("%1$s cannot be set higher than %2$s"), \ #FIELD, #FIELD_MAX); \ goto cleanup; \ } \ diff --git a/tools/virt-admin.c b/tools/virt-admin.c index 43c91097a3..db246dc3a6 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -501,7 +501,7 @@ cmdSrvThreadpoolSet(vshControl *ctl, const vshCmd *cmd) if (!nparams) { vshError(ctl, "%s", _("At least one of options --min-workers, --max-workers, " - "--priority-workers is mandatory ")); + "--priority-workers is mandatory")); goto cleanup; } -- 2.39.2

2 1

Release of libvirt-9.2.0
by Jiri Denemark 01 Apr '23

01 Apr '23

The 9.2.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 * qemu: Add support for QCOW2 formatted firmware This type of firmware can be picked up either automatically, if the corresponding JSON descriptor has the highest priority, or manually by using ``<loader format='qcow2'/>`` in the domain XML. * Improvements * qemu: Make firmware selection persistent Up until now, firmware autoselection has been performed at domain startup time: as a result, changes to the JSON firmware descriptors present on the system could have translated to a different firmware being chosen for subsequent startups of the same domain, potentially rendering it unbootable or lowering the security guarantees. Firmware selection now happens once, when the domain is defined, and its results are stored in the domain XML to be reused, unchanged, for all subsequent boots. * qemu: passt now works when SELinux/AppArmor is enabled In the case of SELinux, this requires passt-specific support code to be present in the host policy, so it might only work with upcoming operating systems and not with existing ones. * xen: Support custom UEFI firmware paths The Xen libxl driver now supports specifying a custom UEFI firmware path. Previously the Xen default was used in all cases. * Bug fixes * qemu: Fix validation of the HPET timer Due to a logic bug introduced in libvirt 9.0.0, VM configurations explicitly enabling the HPET timer were rejected. * qemu: Fix thread-context .host-nodes generation With new enough QEMU, libvirt instructs QEMU to set affinity of memory allocation threads. But this may have resulted in QEMU being unable to do so, as affinity to NUMA nodes inaccessible to emulator thread might have been requested. * rpc: fix typo in admin code generation Fix the bug in the remote ``virt-admin`` code generator, that resulted in a crash. Introduced in libvirt 9.1.0. * qemu: relax shared memory check for vhostuser daemons Fix hotplug of virtiofs ``filesystem`` after restarting libvirtd. Before, libvirtd would incorrectly complain about missing shared memory. Enjoy. Jirka

1 0