- Devel - libvirt List Archives

[libvirt PATCH] conf: Fix error message in virNetworkForwardDefParseXML
by Jiri Denemark 01 Feb '24

01 Feb '24

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/conf/network_conf.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index a2220c05a6..ef3415cd89 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -1362,8 +1362,9 @@ virNetworkForwardDefParseXML(const char *networkName, forwardDev = virXPathString("string(./@dev)", ctxt); if (forwardDev && (nForwardAddrs > 0 || nForwardPfs > 0)) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("the <forward> 'dev' attribute cannot be used when <address> or <pf> sub-elements are present in network %1$s")); + virReportError(VIR_ERR_XML_ERROR, + _("the <forward> 'dev' attribute cannot be used when <address> or <pf> sub-elements are present in network %1$s"), + networkName); return -1; } -- 2.43.0

2 1

[PATCH 00/10] tests: Introduce tool for qemu '.replies' files
by Peter Krempa 31 Jan '24

31 Jan '24

This a much improved version of my first attempt for this tool [1]. This: - replaces tests/qemucapabilitiesnumbering.c - including much simpler approach for programatic modification of the .replies files - adds 'dump' capability to simplify comparing two qemu versions or figuring out query strings for qmp schema [1]: [PATCH] scripts: QMP schema query string helper script Peter Krempa (10): tests: qemucaps: Make JSON output identical to python's 'json.dump' method syntax-check: Exclude 'scripts/*.py' from 'sc_prohibit_magic_number_exit' scripts: Add 'qemu-qmp-replies-tool' script for testing and modifying data for qemucapabilitiestest tests: Remove 'qemucapabilitiesnumbering' test util: json: Remove 'virJSONValueObjectReplaceValue' qemumonitortestutils: Unexport 'qemuMonitorTestProcessFileEntries' qemu-replies-tool: Add validation of known fields in 'query-qmp-schema' qemu-replies-tool: Add mode to dump all QMP schema query strings qemu-replies-tool: Dump 'qom-list-types' qemu-replies-tool: Dump 'device-list-properties' build-aux/syntax-check.mk | 3 + scripts/meson.build | 1 + scripts/qemu-replies-tool.py | 557 ++++++++++++++++++ src/libvirt_private.syms | 1 - src/util/virjson.c | 20 - src/util/virjson.h | 6 - tests/meson.build | 12 +- .../caps_4.2.0_aarch64.replies | 42 +- .../caps_4.2.0_ppc64.replies | 42 +- .../caps_4.2.0_s390x.replies | 297 ++++------ .../caps_4.2.0_x86_64.replies | 363 ++++-------- .../caps_5.0.0_aarch64.replies | 39 +- .../caps_5.0.0_ppc64.replies | 39 +- .../caps_5.0.0_riscv64.replies | 42 +- .../caps_5.0.0_x86_64.replies | 372 ++++-------- .../caps_5.1.0_sparc.replies | 42 +- .../caps_5.1.0_x86_64.replies | 291 +++------ .../caps_5.2.0_aarch64.replies | 39 +- .../caps_5.2.0_ppc64.replies | 39 +- .../caps_5.2.0_riscv64.replies | 42 +- .../caps_5.2.0_s390x.replies | 303 ++++------ .../caps_5.2.0_x86_64.replies | 291 +++------ .../caps_6.0.0_aarch64.replies | 39 +- .../caps_6.0.0_s390x.replies | 303 ++++------ .../caps_6.0.0_x86_64.replies | 291 +++------ .../caps_6.1.0_x86_64.replies | 297 ++++------ .../caps_6.2.0_aarch64.replies | 45 +- .../caps_6.2.0_ppc64.replies | 45 +- .../caps_6.2.0_x86_64.replies | 297 ++++------ .../caps_7.0.0_aarch64+hvf.replies | 45 +- .../caps_7.0.0_aarch64.replies | 45 +- .../caps_7.0.0_ppc64.replies | 45 +- .../caps_7.0.0_x86_64.replies | 297 ++++------ .../caps_7.1.0_ppc64.replies | 45 +- .../caps_7.1.0_x86_64.replies | 297 ++++------ .../caps_7.2.0_ppc.replies | 45 +- .../caps_7.2.0_x86_64+hvf.replies | 297 ++++------ .../caps_7.2.0_x86_64.replies | 297 ++++------ .../caps_8.0.0_riscv64.replies | 36 +- .../caps_8.0.0_x86_64.replies | 297 ++++------ .../caps_8.1.0_s390x.replies | 318 ++++------ .../caps_8.1.0_x86_64.replies | 285 +++------ .../caps_8.2.0_aarch64.replies | 48 +- .../caps_8.2.0_x86_64.replies | 288 +++------ .../caps_9.0.0_x86_64.replies | 288 +++------ tests/qemucapabilitiesnumbering.c | 245 -------- tests/qemucapsprobemock.c | 28 +- tests/qemumonitortestutils.c | 9 +- tests/qemumonitortestutils.h | 13 - 49 files changed, 2796 insertions(+), 4672 deletions(-) create mode 100755 scripts/qemu-replies-tool.py delete mode 100644 tests/qemucapabilitiesnumbering.c -- 2.43.0

3 36

[PATCH 0/3] qemu: Improvements related to MODEL_SCSI_AUTO
by Andrea Bolognani 31 Jan '24

31 Jan '24

Andrea Bolognani (3): tests: Add controller-scsi-auto qemu: Handle MODEL_SCSI_{AUTO,DEFAULT} appropriately qemu: Use virDomainControllerDefNew() more src/qemu/qemu_command.c | 4 +-- src/qemu/qemu_domain_address.c | 4 +-- src/qemu/qemu_hotplug.c | 4 +-- src/qemu/qemu_validate.c | 2 +- .../controller-scsi-auto.x86_64-latest.args | 32 +++++++++++++++++++ .../controller-scsi-auto.x86_64-latest.xml | 30 +++++++++++++++++ .../qemuxmlconfdata/controller-scsi-auto.xml | 15 +++++++++ tests/qemuxmlconftest.c | 1 + 8 files changed, 85 insertions(+), 7 deletions(-) create mode 100644 tests/qemuxmlconfdata/controller-scsi-auto.x86_64-latest.args create mode 100644 tests/qemuxmlconfdata/controller-scsi-auto.x86_64-latest.xml create mode 100644 tests/qemuxmlconfdata/controller-scsi-auto.xml -- 2.43.0

2 4

Re: Re: [PATCH] apparmor: Add user session path for PID and socket files used by passt
by Andrea Bolognani 31 Jan '24

31 Jan '24

On Tue, Jan 30, 2024 at 10:47:54AM -0800, Andrea Bolognani wrote: > On Tue, Jan 30, 2024 at 07:15:51PM +0100, Stefano Brivio wrote: > > Commit 7a39b04d683f ("apparmor: Enable passt support") grants > > passt(1) read-write access to /{,var/}run/libvirt/qemu/passt/* if > > started by the libvirt daemon. That's the path where passt creates > > PID and socket files only if the guest is started by the root user. > > > > If the guest is started by another user, though, the path is more > > commonly /var/run/user/$UID/libvirt/qemu/run/passt: add it as > > read-write location. Otherwise, passt won't be able to start, as > > reported by Andreas. > > > > While at it, replace /{,var/}run/ in the existing rule by its > > corresponding tunable variable, @{run}. > > > > Reported-by: Andreas B. Mundt <andi(a)debian.org> > > Link: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1061678 > > Fixes: 7a39b04d683f ("apparmor: Enable passt support") > > Signed-off-by: Stefano Brivio <sbrivio(a)redhat.com> > > --- > > src/security/apparmor/libvirt-qemu.in | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/src/security/apparmor/libvirt-qemu.in b/src/security/apparmor/libvirt-qemu.in > > index f40f471891..8b92915281 100644 > > --- a/src/security/apparmor/libvirt-qemu.in > > +++ b/src/security/apparmor/libvirt-qemu.in > > @@ -196,7 +196,8 @@ > > signal (receive) set=("term") peer=libvirtd, > > signal (receive) set=("term") peer=virtqemud, > > > > - owner /{,var/}run/libvirt/qemu/passt/* rw, > > + owner @{run}/user/[0-9]*/libvirt/qemu/run/passt/* rw, > > + owner @{run}/libvirt/qemu/passt/* rw, > > Makes sense to me, so > > Reviewed-by: Andrea Bolognani <abologna(a)redhat.com> > > I'll give Jim and others a chance to take a look before pushing. I just realized that you sent the patch to the old mailing list address. We've migrated somewhat recently, so that's completely understandable :) I've adjusted the recipient now. I don't think it's necessary for you to post the patch again, as its contents are fully contained within the quoted part of this message. -- Andrea Bolognani / Red Hat / Virtualization

2 2

[PATCH 00/31] pci vpd: Fix broken XML formatter and refactor questionable error reporting
by Peter Krempa 31 Jan '24

31 Jan '24

The first part of the series fixes the XML formatter of nodedevs to not generate invalid XML if a PCI device custom field contains '>' which would be printed unescaped The rest fixes questionable and broken error reporting from the pci vpd device code which actually parses the above data. https://gitlab.com/pipo.sk/libvirt/-/pipelines/1157912774 Peter Krempa (31): virPCIVPDResourceIsValidTextValue: Adjust comment to reflect actual code util: pcivpd: Refactor virPCIVPDResourceIsValidTextValue virNodeDeviceCapVPDFormatCustom*: Escape unsanitized strings virNodeDeviceCapVPDFormat: Properly escape system-originated strings schema: nodedev: Adjust allowed characters in 'vpdFieldValueFormat' tests: Test the previously mishandled PCI VPD characters Don't overwrite error message from 'virXPathNodeSet' tests: virpcivpdtest: Remove 'testVirPCIVPDReadVPDBytes' case util: virpcivpd: Unexport 'virPCIVPDReadVPDBytes' util: pcivpd: Unexport virPCIVPDParseVPDLargeResourceFields tests: virpcivpd: Remove 'testVirPCIVPDParseVPDStringResource' case util: virpcivpd: Unexport 'virPCIVPDParseVPDLargeResourceString' virPCIVPDResourceGetKeywordPrefix: Fix logging util: virpcivpd: Remove return value from virPCIVPDResourceCustomUpsertValue conf: virNodeDeviceCapVPDParse*: Remove pointless NULL checks virpcivpdtest: testPCIVPDResourceBasic: Remove tests for uninitialized 'ro'/'rw' section util: virPCIVPDResourceUpdateKeyword: Remove impossible checks conf: node_device: Refactor 'virNodeDeviceCapVPDParseCustomFields' to fix error reporting virNodeDeviceCapVPDParseXML: Fix error reporting util: virpcivpd: Remove return value from virPCIVPDResourceUpdateKeyword virPCIDeviceHasVPD: Refactor "debug" messages virPCIDeviceGetVPD: Fix multiple error handling bugs virPCIDeviceGetVPD: Handle errors in callers virPCIVPDReadVPDBytes: Refactor error handling virPCIVPDParseVPDLargeResourceString: Properly report errors virPCIVPDParseVPDLargeResourceFields: Merge logic conditions virPCIVPDParseVPDLargeResourceFields: Remove impossible 'default' swithch case virPCIVPDParseVPDLargeResourceFields: Refactor processing of read data virPCIVPDParseVPDLargeResourceFields: Refactor return logic virPCIVPDParseVPDLargeResourceFields: Report proper errors virPCIVPDParse: Do reasonable error reporting src/conf/domain_conf.c | 78 +-- src/conf/network_conf.c | 80 +-- src/conf/node_device_conf.c | 177 +++---- src/conf/numa_conf.c | 15 +- src/conf/schemas/nodedev.rng | 2 +- src/cpu/cpu_ppc64.c | 5 +- src/libvirt_private.syms | 3 - src/qemu/qemu_capabilities.c | 30 +- src/qemu/qemu_domain.c | 23 +- src/qemu/qemu_migration_cookie.c | 5 +- src/qemu/qemu_nbdkit.c | 5 +- src/util/virpci.c | 34 +- src/util/virpcivpd.c | 454 ++++++++---------- src/util/virpcivpd.h | 8 +- src/util/virpcivpdpriv.h | 11 +- src/vz/vz_sdk.c | 5 +- .../pci_0000_42_00_0_vpd.xml | 4 +- tests/virpcimock.c | 4 +- tests/virpcitest.c | 3 +- tests/virpcivpdtest.c | 160 +----- 20 files changed, 386 insertions(+), 720 deletions(-) -- 2.43.0

2 39

[PATCH v2] meson: Adjust -fstack-protector use
by Andrea Bolognani 31 Jan '24

31 Jan '24

Back in 2014, -fstack-protector was reported not to work on aarch64, so fe881ae086ec disabled it on that target. OS-wise, its use is currently limited to just Linux, FreeBSD and Windows. Looking at the situation today, it seems that whatever issue was affecting aarch64 a decade ago has been resolved; moreover, macOS can also use the feature these days. I haven't checked any of the other BSDs, but since the feature works on FreeBSD it's pretty safe to the assume that they can use it too. If we get reports that it's not the case, we can always further restrict its usage accordingly. Best viewed with 'git show -w'. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/1157984478 Changes from [v1]: * drop alpha-specific exception. [v1] https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/R5C5… meson.build | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/meson.build b/meson.build index 611cc582c0..e1c70fce92 100644 --- a/meson.build +++ b/meson.build @@ -442,22 +442,17 @@ supported_cc_flags = [] if get_option('warning_level') == '2' supported_cc_flags = cc.get_supported_arguments(cc_flags) - # on aarch64 error: -fstack-protector not supported for this target - if host_machine.cpu_family() != 'aarch64' - if host_machine.system() in [ 'linux', 'freebsd', 'windows' ] - # we prefer -fstack-protector-strong but fallback to -fstack-protector-all - fstack_cflags = cc.first_supported_argument([ - '-fstack-protector-strong', - '-fstack-protector-all', - ]) - supported_cc_flags += fstack_cflags - - # When building with mingw using -fstack-protector requires libssp library - # which is included by using -fstack-protector with linker. - if fstack_cflags.length() == 1 and host_machine.system() == 'windows' - add_project_link_arguments(fstack_cflags, language: 'c') - endif - endif + # we prefer -fstack-protector-strong but fallback to -fstack-protector-all + fstack_cflags = cc.first_supported_argument([ + '-fstack-protector-strong', + '-fstack-protector-all', + ]) + supported_cc_flags += fstack_cflags + + # When building with mingw using -fstack-protector requires libssp library + # which is included by using -fstack-protector with linker. + if fstack_cflags.length() == 1 and host_machine.system() == 'windows' + add_project_link_arguments(fstack_cflags, language: 'c') endif if supported_cc_flags.contains('-Wlogical-op') -- 2.43.0

2 1

[PATCH] scripts: Make check-symfile.py work on alpha
by Andrea Bolognani 30 Jan '24

30 Jan '24

The script expects each of the symbols that it looks for to be in one of three sections, which in nm(1) are described as follows: T - The symbol is in the text (code) section. B - The symbol is in the BSS data section. This section typically contains zero-initialized or uninitialized data, although the exact behavior is system dependent. D - The symbol is in the initialized data section. When building on alpha, however, some of the symbols show up in one of two additional sections, specifically: S - The symbol is in an uninitialized or zero-initialized data section for small objects. G - The symbol is in an initialized data section for small objects. In other words, S is the same as B and G is the same as D, except with some optimization for small objects that for some reason is applied on alpha but not on other architectures. I have confirmed that, for all the symbols that the script complained about being missing on alpha, the section is the expected one, that is, symbols that are reported as B on x86 are reported as S on alpha, and symbols that are reported as D on x86 are reported as G on alpha. Note that, while the B section doesn't seem to be used at all on alpha, at least in our case, the D section still is. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- scripts/check-symfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/check-symfile.py b/scripts/check-symfile.py index 0f6e780df0..c2ee405118 100755 --- a/scripts/check-symfile.py +++ b/scripts/check-symfile.py @@ -61,7 +61,7 @@ for elflib in elflibs: for line in nm: line = line.decode("utf-8") - symmatch = re.search(r'''^\S+\s(?:[TBD])\s(\S+)\s*$''', line) + symmatch = re.search(r'''^\S+\s(?:[TBSDG])\s(\S+)\s*$''', line) if symmatch is None: continue -- 2.43.0

4 10

[libvirt PATCH 0/2] don't require disk-only flag when creating external snapshots
by Pavel Hrdina 30 Jan '24

30 Jan '24

Pavel Hrdina (2): qemu_snapshot: create: refactor external snapshot detection qemu_snapshot: create: don't require disk-only flag for offline external snapshot src/qemu/qemu_snapshot.c | 44 ++++++++++++++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 9 deletions(-) -- 2.43.0

2 4

[libvirt PATCH] qemu_snapshot: fix detection if non-leaf snapshot isn't in active chain
by Pavel Hrdina 30 Jan '24

30 Jan '24

The condition was completely wrong. As per the comment for function virDomainMomentIsAncestor() it checks that the first argument is descendant of the second argument. Consider the following snapshot tree for VM: s1 | +- s2 | | | +- s3 | +- s4 | +- s5 (current) When deleting s2 with the original code we checked if virDomainMomentIsAncestor(s2, s5) which would return false basically for any snapshot as s5 is leaf snapshot so no children. When deleting s2 with fixed code we check if virDomainMomentIsAncestor(s5, s2) which still returns false but when deleting s4 it will correctly return true. Resolves: https://issues.redhat.com/browse/RHEL-23212 Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/qemu/qemu_snapshot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index 73ff533827..af5f995b0d 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -3815,7 +3815,7 @@ qemuSnapshotDeleteValidate(virDomainObj *vm, } if (snap != current && snap->nchildren != 0 && - virDomainMomentIsAncestor(snap, current)) { + !virDomainMomentIsAncestor(current, snap)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("deletion of non-leaf external snapshot that is not in active chain is not supported")); return -1; -- 2.43.0

2 1

[PATCH] ch_driver: fix condition in virCHDomainRemoveInactive()
by Purna Pavan Chandra Aekkaladevi 30 Jan '24

30 Jan '24

Rectify the condition to remove a domain only if it is not persistent. Signed-off-by: Purna Pavan Chandra Aekkaladevi <paekkaladevi(a)linux.microsoft.com> --- src/ch/ch_domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ch/ch_domain.c b/src/ch/ch_domain.c index c0d6c75b1d..2f3fae6758 100644 --- a/src/ch/ch_domain.c +++ b/src/ch/ch_domain.c @@ -36,7 +36,7 @@ void virCHDomainRemoveInactive(virCHDriver *driver, virDomainObj *vm) { - if (vm->persistent) { + if (!vm->persistent) { virDomainObjListRemove(driver->domains, vm); } } -- 2.34.1

3 2

[libvirt PATCH V2 0/4] add loongarch support for libvirt
by Xianglai Li 30 Jan '24

30 Jan '24

Hello, Everyone: This patch series adds libvirt support for loongarch.Although the bios path and name has not been officially integrated into qemu and we think there are still many shortcomings, we try to push a version of patch to the community according to the opinions of the community, hoping to listen to everyone's opinions. Anyway we have a version of libvirt that supports loongarch. You can also get libvirt's patch from the link below: https://gitlab.com/lixianglai/libvirt branch: loongarch Since the patch associated with loongarch has not yet been submitted to the virt-manager community, we are providing a temporary patch with loongarch for the time being patch's virt-manager, the open source work of virt-manager adding loongarch will be followed up later or synchronized with the open source libvirt. You can get the virt-manager code with loongarch patch from the link below: https://github.com/lixianglai/virt-manager branch: loongarch loongarch's virtual machine bios is not yet available in qemu, so you can get it from the following link https://github.com/lixianglai/LoongarchVirtFirmware (Note: You should clone the repository using git instead of downloading the file via wget or you'll get xml) We named the bios QEMU_EFI.fd, QEMU_VARS.fd is used to store pflash images of non-volatile variables.After installing qemu-system-loongarch64,You can install the loongarch bios by executing the script install-loongarch-virt-firmware.sh Since there is no fedora operating system that supports the loongarch architecture, you can find an iso that supports loongarch at the link below for testing purposes: https://github.com/fedora-remix-loongarch/releases-info Well, if you have completed the above steps I think you can now install loongarch virtual machine, you can install it through the virt-manager graphical interface, or install it through vrit-install, here is an example of installing it using virt-install: virt-install \ --virt-type=qemu \ --name loongarch-test \ --memory 4096 \ --vcpus=4 \ --arch=loongarch64 \ --boot cdrom \ --disk device=cdrom,bus=scsi,path=/root/livecd-fedora-mate-4.loongarch64.iso \ --disk path=/var/lib/libvirt/images/debian12-loongarch64.qcow2,size=10,format=qcow2,bus=scsi \ --network network=default \ --osinfo archlinux \ --video=virtio \ --graphics=vnc,listen=0.0.0.0 CHANGES V1->V2: 1.Modify the link addresses of virtu-manager and firmeware in the cover letter. Please obtain the code and firmware from the latest link address. 2.Rename the bios name. Delete the loongarch bios name from libvirt and use the json file to obtain the bios path. 3.Refer to riscv64 to simplify the implementation of loongarch cpu driver.And fix some code style errors. 4.Delete unnecessary or redundant device enablement.Such as USB NEC. 5.Add some test cases for loongarch. xianglai li (4): Add loongarch cpu support Config some capabilities for loongarch virt machine Implement the method of getting host info for loongarch Add test script for loongarch src/conf/schemas/basictypes.rng | 1 + src/cpu/cpu.c | 2 + src/cpu/cpu_loongarch.c | 80 + src/cpu/cpu_loongarch.h | 25 + src/cpu/meson.build | 1 + src/qemu/qemu_capabilities.c | 12 +- src/qemu/qemu_domain.c | 33 +- src/qemu/qemu_domain.h | 1 + src/util/virarch.c | 4 + src/util/virarch.h | 4 + src/util/virhostcpu.c | 7 +- src/util/virsysinfo.c | 3 +- .../qemu_8.2.0-tcg-virt.loongarch64.xml | 163 + .../qemu_8.2.0-virt.loongarch64.xml | 167 + tests/domaincapstest.c | 13 + .../caps_8.2.0_loongarch64.replies | 30140 ++++++++++++++++ .../caps_8.2.0_loongarch64.xml | 175 + .../qemucaps2xmloutdata/caps.loongarch64.xml | 28 + ...o-type-loongarch64.loongarch64-latest.args | 34 + .../default-video-type-loongarch64.xml | 18 + ...ch64-virt-graphics.loongarch64-latest.args | 56 + .../loongarch64-virt-graphics.xml | 48 + ...ch64-virt-headless.loongarch64-latest.args | 52 + .../loongarch64-virt-headless.xml | 42 + ...ongarch64-virt-pci.loongarch64-latest.args | 39 + .../qemuxml2argvdata/loongarch64-virt-pci.xml | 27 + .../loongarch64-virt.loongarch64-latest.args | 44 + tests/qemuxml2argvdata/loongarch64-virt.xml | 22 + tests/qemuxml2argvtest.c | 9 + ...eo-type-loongarch64.loongarch64-latest.xml | 45 + ...rch64-virt-graphics.loongarch64-latest.xml | 114 + ...rch64-virt-headless.loongarch64-latest.xml | 100 + ...oongarch64-virt-pci.loongarch64-latest.xml | 48 + .../loongarch64-virt.loongarch64-latest.xml | 66 + tests/qemuxml2xmltest.c | 6 + tests/testutilshostcpus.h | 10 + 36 files changed, 31633 insertions(+), 6 deletions(-) create mode 100644 src/cpu/cpu_loongarch.c create mode 100644 src/cpu/cpu_loongarch.h create mode 100644 tests/domaincapsdata/qemu_8.2.0-tcg-virt.loongarch64.xml create mode 100644 tests/domaincapsdata/qemu_8.2.0-virt.loongarch64.xml create mode 100644 tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.replies create mode 100644 tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml create mode 100644 tests/qemucaps2xmloutdata/caps.loongarch64.xml create mode 100644 tests/qemuxml2argvdata/default-video-type-loongarch64.loongarch64-latest.args create mode 100644 tests/qemuxml2argvdata/default-video-type-loongarch64.xml create mode 100644 tests/qemuxml2argvdata/loongarch64-virt-graphics.loongarch64-latest.args create mode 100644 tests/qemuxml2argvdata/loongarch64-virt-graphics.xml create mode 100644 tests/qemuxml2argvdata/loongarch64-virt-headless.loongarch64-latest.args create mode 100644 tests/qemuxml2argvdata/loongarch64-virt-headless.xml create mode 100644 tests/qemuxml2argvdata/loongarch64-virt-pci.loongarch64-latest.args create mode 100644 tests/qemuxml2argvdata/loongarch64-virt-pci.xml create mode 100644 tests/qemuxml2argvdata/loongarch64-virt.loongarch64-latest.args create mode 100644 tests/qemuxml2argvdata/loongarch64-virt.xml create mode 100644 tests/qemuxml2xmloutdata/default-video-type-loongarch64.loongarch64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/loongarch64-virt-graphics.loongarch64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/loongarch64-virt-headless.loongarch64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/loongarch64-virt-pci.loongarch64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/loongarch64-virt.loongarch64-latest.xml -- 2.39.1

4 25

[PATCH 00/33] qemu: Improve handling of architecture-specific defaults
by Andrea Bolognani 29 Jan '24

29 Jan '24

This is a significantly expanded upon follow up to [1], and specifically the last 5 patches in that series. While looking at implementing the improvements suggested by Peter, I realized that there were many additional areas in which our handling of defaults was suboptimal, with the relevant code scattered all over the place and sometimes duplicated. So I set out to rationalize things. I ended up changing very little in terms of observable behavior outside of RISC-V, where I feel that we still have leeway to make things right before it reaches significant adoption and backwards compatibility becomes a major concern. [1] https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/MREX… Andrea Bolognani (33): tests: Add usb-controller-automatic-unavailable-q35 tests: Add aarch64-panic-no-model tests: Add title-and-description tests: Drop existing <title> and <description> tags tests: Rename and minimize no-memory tests: Add minimal cases for many architectures tests: Drop minimal tests: Add default-models cases for many architectures qemu: Fix a few comments qemu: Default to no USB and no memballoon for new architectures qemu: Clean up qemuDomainDefaultNetModel() qemu: Drop qemuDomainFindSCSIControllerModel() qemu: Drop qemuDomainSetSCSIControllerModel() qemu: Add missing error handling qemu: Simplify qemuDomainFindOrCreateSCSIDiskController() qemu: Move qemuDomainGetSCSIControllerModel() qemu: Rename qemuDomainDefaultSCSIControllerModel() qemu: Clean up qemuDomainDefaultSCSIControllerModel() qemu: Add qemuDomainDefaultUSBControllerModel() qemu: Enhance qemuDomainDefaultUSBControllerModel() qemu: Clean up qemuDomainDefaultUSBControllerModel() qemu: Move qemuDomainForbidLegacyUSBController() qemu: Enhance qemuDomainForbidLegacyUSBController() qemu: Add qemuDomainDefaultSerialType() qemu: Add qemuDomainDefaultSerialModel() qemu: Add qemuDomainDefaultPanicModel() qemu: Use qemuDomainDefaultPanicModel() more qemu: Rename qemuDomainDefaultVideoModel() qemu: Move qemuDomainDefault*() functions together qemu: Only default to <panic model='isa'/> on x86 qemu: Don't add memballoon by default on RISC-V qemu: Use qemu-xhci by default on RISC-V qemu: Use virtio-scsi by default on RISC-V src/qemu/qemu_alias.c | 13 +- src/qemu/qemu_command.c | 23 +- src/qemu/qemu_domain.c | 588 ++++++++++++------ src/qemu/qemu_domain.h | 4 + src/qemu/qemu_domain_address.c | 87 --- src/qemu/qemu_domain_address.h | 11 - src/qemu/qemu_hotplug.c | 13 +- src/qemu/qemu_validate.c | 9 +- tests/qemuxmlconfdata/440fx-wrong-root.xml | 5 - .../aarch64-panic-no-model.aarch64-latest.err | 1 + .../aarch64-panic-no-model.xml | 13 + ...64-virt-default-models.aarch64-latest.args | 44 ++ ...h64-virt-default-models.aarch64-latest.xml | 79 +++ .../aarch64-virt-default-models.xml | 21 + .../aarch64-virt-minimal.aarch64-latest.args | 31 + .../aarch64-virt-minimal.aarch64-latest.xml | 26 + .../qemuxmlconfdata/aarch64-virt-minimal.xml | 12 + .../cpu-host-model-features.x86_64-latest.xml | 5 - .../cpu-host-model-features.xml | 5 - ...ost-passthrough-features.x86_64-latest.xml | 5 - .../cpu-host-passthrough-features.xml | 5 - .../cpu-tsc-frequency.x86_64-latest.xml | 5 - tests/qemuxmlconfdata/cpu-tsc-frequency.xml | 5 - .../disk-cdrom-bus-other.x86_64-latest.xml | 1 - .../qemuxmlconfdata/disk-cdrom-bus-other.xml | 1 - tests/qemuxmlconfdata/minimal-no-memory.xml | 25 - .../minimal.x86_64-latest.args | 36 -- tests/qemuxmlconfdata/minimal.xml | 34 - tests/qemuxmlconfdata/missing-machine.xml | 1 - ...latest.err => no-memory.x86_64-latest.err} | 0 tests/qemuxmlconfdata/no-memory.xml | 11 + ...4-pseries-default-models.ppc64-latest.args | 38 ++ ...64-pseries-default-models.ppc64-latest.xml | 53 ++ .../ppc64-pseries-default-models.xml | 21 + .../ppc64-pseries-minimal.ppc64-latest.args | 33 + .../ppc64-pseries-minimal.ppc64-latest.xml | 33 + .../qemuxmlconfdata/ppc64-pseries-minimal.xml | 12 + ...64-virt-default-models.riscv64-latest.args | 42 ++ ...v64-virt-default-models.riscv64-latest.xml | 69 ++ .../riscv64-virt-default-models.xml | 21 + .../riscv64-virt-minimal.riscv64-latest.args | 30 + .../riscv64-virt-minimal.riscv64-latest.xml | 20 + .../qemuxmlconfdata/riscv64-virt-minimal.xml | 12 + ...s390x-ccw-default-models.s390x-latest.args | 37 ++ .../s390x-ccw-default-models.s390x-latest.xml | 46 ++ .../s390x-ccw-default-models.xml | 21 + .../s390x-ccw-minimal.s390x-latest.args | 32 + .../s390x-ccw-minimal.s390x-latest.xml | 27 + tests/qemuxmlconfdata/s390x-ccw-minimal.xml | 12 + .../title-and-description.x86_64-latest.args | 31 + ...> title-and-description.x86_64-latest.xml} | 20 +- .../qemuxmlconfdata/title-and-description.xml | 19 + ...tomatic-unavailable-q35.x86_64-latest.args | 33 + ...utomatic-unavailable-q35.x86_64-latest.xml | 30 + ...b-controller-automatic-unavailable-q35.xml | 20 + ...86_64-pc-default-models.x86_64-latest.args | 39 ++ ...x86_64-pc-default-models.x86_64-latest.xml | 50 ++ .../x86_64-pc-default-models.xml | 21 + .../x86_64-pc-minimal.x86_64-latest.args | 33 + ...ml => x86_64-pc-minimal.x86_64-latest.xml} | 24 +- tests/qemuxmlconfdata/x86_64-pc-minimal.xml | 12 + ...6_64-q35-default-models.x86_64-latest.args | 44 ++ ...86_64-q35-default-models.x86_64-latest.xml | 68 ++ .../x86_64-q35-default-models.xml | 21 + .../x86_64-q35-minimal.x86_64-latest.args | 38 ++ .../x86_64-q35-minimal.x86_64-latest.xml | 50 ++ tests/qemuxmlconfdata/x86_64-q35-minimal.xml | 12 + tests/qemuxmlconftest.c | 28 +- 68 files changed, 1783 insertions(+), 488 deletions(-) create mode 100644 tests/qemuxmlconfdata/aarch64-panic-no-model.aarch64-latest.err create mode 100644 tests/qemuxmlconfdata/aarch64-panic-no-model.xml create mode 100644 tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-latest.args create mode 100644 tests/qemuxmlconfdata/aarch64-virt-default-models.aarch64-latest.xml create mode 100644 tests/qemuxmlconfdata/aarch64-virt-default-models.xml create mode 100644 tests/qemuxmlconfdata/aarch64-virt-minimal.aarch64-latest.args create mode 100644 tests/qemuxmlconfdata/aarch64-virt-minimal.aarch64-latest.xml create mode 100644 tests/qemuxmlconfdata/aarch64-virt-minimal.xml delete mode 100644 tests/qemuxmlconfdata/minimal-no-memory.xml delete mode 100644 tests/qemuxmlconfdata/minimal.x86_64-latest.args delete mode 100644 tests/qemuxmlconfdata/minimal.xml rename tests/qemuxmlconfdata/{minimal-no-memory.x86_64-latest.err => no-memory.x86_64-latest.err} (100%) create mode 100644 tests/qemuxmlconfdata/no-memory.xml create mode 100644 tests/qemuxmlconfdata/ppc64-pseries-default-models.ppc64-latest.args create mode 100644 tests/qemuxmlconfdata/ppc64-pseries-default-models.ppc64-latest.xml create mode 100644 tests/qemuxmlconfdata/ppc64-pseries-default-models.xml create mode 100644 tests/qemuxmlconfdata/ppc64-pseries-minimal.ppc64-latest.args create mode 100644 tests/qemuxmlconfdata/ppc64-pseries-minimal.ppc64-latest.xml create mode 100644 tests/qemuxmlconfdata/ppc64-pseries-minimal.xml create mode 100644 tests/qemuxmlconfdata/riscv64-virt-default-models.riscv64-latest.args create mode 100644 tests/qemuxmlconfdata/riscv64-virt-default-models.riscv64-latest.xml create mode 100644 tests/qemuxmlconfdata/riscv64-virt-default-models.xml create mode 100644 tests/qemuxmlconfdata/riscv64-virt-minimal.riscv64-latest.args create mode 100644 tests/qemuxmlconfdata/riscv64-virt-minimal.riscv64-latest.xml create mode 100644 tests/qemuxmlconfdata/riscv64-virt-minimal.xml create mode 100644 tests/qemuxmlconfdata/s390x-ccw-default-models.s390x-latest.args create mode 100644 tests/qemuxmlconfdata/s390x-ccw-default-models.s390x-latest.xml create mode 100644 tests/qemuxmlconfdata/s390x-ccw-default-models.xml create mode 100644 tests/qemuxmlconfdata/s390x-ccw-minimal.s390x-latest.args create mode 100644 tests/qemuxmlconfdata/s390x-ccw-minimal.s390x-latest.xml create mode 100644 tests/qemuxmlconfdata/s390x-ccw-minimal.xml create mode 100644 tests/qemuxmlconfdata/title-and-description.x86_64-latest.args copy tests/qemuxmlconfdata/{440fx-wrong-root.xml => title-and-description.x86_64-latest.xml} (58%) create mode 100644 tests/qemuxmlconfdata/title-and-description.xml create mode 100644 tests/qemuxmlconfdata/usb-controller-automatic-unavailable-q35.x86_64-latest.args create mode 100644 tests/qemuxmlconfdata/usb-controller-automatic-unavailable-q35.x86_64-latest.xml create mode 100644 tests/qemuxmlconfdata/usb-controller-automatic-unavailable-q35.xml create mode 100644 tests/qemuxmlconfdata/x86_64-pc-default-models.x86_64-latest.args create mode 100644 tests/qemuxmlconfdata/x86_64-pc-default-models.x86_64-latest.xml create mode 100644 tests/qemuxmlconfdata/x86_64-pc-default-models.xml create mode 100644 tests/qemuxmlconfdata/x86_64-pc-minimal.x86_64-latest.args rename tests/qemuxmlconfdata/{minimal.x86_64-latest.xml => x86_64-pc-minimal.x86_64-latest.xml} (52%) create mode 100644 tests/qemuxmlconfdata/x86_64-pc-minimal.xml create mode 100644 tests/qemuxmlconfdata/x86_64-q35-default-models.x86_64-latest.args create mode 100644 tests/qemuxmlconfdata/x86_64-q35-default-models.x86_64-latest.xml create mode 100644 tests/qemuxmlconfdata/x86_64-q35-default-models.xml create mode 100644 tests/qemuxmlconfdata/x86_64-q35-minimal.x86_64-latest.args create mode 100644 tests/qemuxmlconfdata/x86_64-q35-minimal.x86_64-latest.xml create mode 100644 tests/qemuxmlconfdata/x86_64-q35-minimal.xml -- 2.43.0

2 83

[PATCH] remote_driver: Restore special behavior of remoteDomainGetBlockIoTune()
by Michal Privoznik 29 Jan '24

29 Jan '24

In v9.10.0-rc1~103 the remote driver was switched to g_auto() for client RPC return parameters. But whilst doing so a small bug slipped in: previously, when virDomainGetBlockIoTune() was called with *nparams == 0, the function set *nparams to the number of supported params and zero was returned (so that client can allocate memory and call the API second time). IOW - the usual, old style of APIs where we didn't want to allocate memory on caller's behalf. But because of this bug, a negative one is returned instead. Fixes: 501825011c1fe80f458820c7efe5a198e0af9be5 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/remote/remote_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 392377deae..bedf2cb833 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -2570,7 +2570,7 @@ static int remoteDomainGetBlockIoTune(virDomainPtr domain, */ if (*nparams == 0) { *nparams = ret.nparams; - return -1; + return 0; } if (virTypedParamsDeserialize((struct _virTypedParameterRemote *) ret.params.params_val, -- 2.43.0

2 1

[PATCH] qemu: fix nbdkit command test for backing chains
by Jonathon Jongsma 29 Jan '24

29 Jan '24

Previously this test only tested the generated nbdkit command for the top level disk source. Update it to test the generated commmands for all sources in the chain. Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- ...sk0 => disk-cdrom-network.args.disk0-src0} | 2 +- ...sk1 => disk-cdrom-network.args.disk1-src0} | 2 +- ...sk-cdrom-network.args.disk1-src0.pipe.778} | 0 ...sk2 => disk-cdrom-network.args.disk2-src0} | 2 +- ...sk-cdrom-network.args.disk2-src0.pipe.780} | 0 ...isk0 => disk-network-http.args.disk0-src0} | 2 +- ...isk1 => disk-network-http.args.disk1-src0} | 2 +- ...isk2 => disk-network-http.args.disk2-src0} | 2 +- ...isk-network-http.args.disk2-src0.pipe.778} | 0 ...isk3 => disk-network-http.args.disk3-src0} | 2 +- ...isk-network-http.args.disk3-src0.pipe.780} | 0 ...ource-curl-nbdkit-backing.args.disk0-src0} | 2 +- ...l-nbdkit-backing.args.disk0-src0.pipe.778} | 0 ...source-curl-nbdkit-backing.args.disk0-src1 | 7 ++ ...rl-nbdkit-backing.args.disk0-src1.pipe.780 | 1 + ... disk-network-source-curl.args.disk0-src0} | 2 +- ...work-source-curl.args.disk0-src0.pipe.778} | 0 ... disk-network-source-curl.args.disk1-src0} | 2 +- ...work-source-curl.args.disk1-src0.pipe.780} | 0 ...work-source-curl.args.disk1-src0.pipe.782} | 0 ... disk-network-source-curl.args.disk2-src0} | 2 +- ...work-source-curl.args.disk2-src0.pipe.784} | 0 ... disk-network-source-curl.args.disk3-src0} | 2 +- ... disk-network-source-curl.args.disk4-src0} | 2 +- ...0 => disk-network-ssh-key.args.disk0-src0} | 2 +- ...1 => disk-network-ssh-key.args.disk1-src0} | 2 +- ...disk-network-ssh-password.args.disk0-src0} | 2 +- ...ork-ssh-password.args.disk0-src0.pipe.778} | 0 ...disk0 => disk-network-ssh.args.disk0-src0} | 2 +- tests/qemunbdkittest.c | 96 ++++++++++--------- 30 files changed, 77 insertions(+), 61 deletions(-) rename tests/qemunbdkitdata/{disk-cdrom-network.args.disk0 => disk-cdrom-network.args.disk0-src0} (63%) rename tests/qemunbdkitdata/{disk-cdrom-network.args.disk1 => disk-cdrom-network.args.disk1-src0} (70%) rename tests/qemunbdkitdata/{disk-cdrom-network.args.disk1.pipe.778 => disk-cdrom-network.args.disk1-src0.pipe.778} (100%) rename tests/qemunbdkitdata/{disk-cdrom-network.args.disk2 => disk-cdrom-network.args.disk2-src0} (72%) rename tests/qemunbdkitdata/{disk-cdrom-network.args.disk2.pipe.780 => disk-cdrom-network.args.disk2-src0.pipe.780} (100%) rename tests/qemunbdkitdata/{disk-network-http.args.disk0 => disk-network-http.args.disk0-src0} (64%) rename tests/qemunbdkitdata/{disk-network-http.args.disk1 => disk-network-http.args.disk1-src0} (59%) rename tests/qemunbdkitdata/{disk-network-http.args.disk2 => disk-network-http.args.disk2-src0} (64%) rename tests/qemunbdkitdata/{disk-network-http.args.disk2.pipe.778 => disk-network-http.args.disk2-src0.pipe.778} (100%) rename tests/qemunbdkitdata/{disk-network-http.args.disk3 => disk-network-http.args.disk3-src0} (70%) rename tests/qemunbdkitdata/{disk-network-http.args.disk3.pipe.780 => disk-network-http.args.disk3-src0.pipe.780} (100%) rename tests/qemunbdkitdata/{disk-network-source-curl-nbdkit-backing.args.disk0 => disk-network-source-curl-nbdkit-backing.args.disk0-src0} (69%) rename tests/qemunbdkitdata/{disk-network-source-curl-nbdkit-backing.args.disk0.pipe.778 => disk-network-source-curl-nbdkit-backing.args.disk0-src0.pipe.778} (100%) create mode 100644 tests/qemunbdkitdata/disk-network-source-curl-nbdkit-backing.args.disk0-src1 create mode 100644 tests/qemunbdkitdata/disk-network-source-curl-nbdkit-backing.args.disk0-src1.pipe.780 rename tests/qemunbdkitdata/{disk-network-source-curl.args.disk0 => disk-network-source-curl.args.disk0-src0} (69%) rename tests/qemunbdkitdata/{disk-network-source-curl.args.disk0.pipe.778 => disk-network-source-curl.args.disk0-src0.pipe.778} (100%) rename tests/qemunbdkitdata/{disk-network-source-curl.args.disk1 => disk-network-source-curl.args.disk1-src0} (75%) rename tests/qemunbdkitdata/{disk-network-source-curl.args.disk1.pipe.780 => disk-network-source-curl.args.disk1-src0.pipe.780} (100%) rename tests/qemunbdkitdata/{disk-network-source-curl.args.disk1.pipe.782 => disk-network-source-curl.args.disk1-src0.pipe.782} (100%) rename tests/qemunbdkitdata/{disk-network-source-curl.args.disk2 => disk-network-source-curl.args.disk2-src0} (69%) rename tests/qemunbdkitdata/{disk-network-source-curl.args.disk2.pipe.784 => disk-network-source-curl.args.disk2-src0.pipe.784} (100%) rename tests/qemunbdkitdata/{disk-network-source-curl.args.disk3 => disk-network-source-curl.args.disk3-src0} (64%) rename tests/qemunbdkitdata/{disk-network-source-curl.args.disk4 => disk-network-source-curl.args.disk4-src0} (65%) rename tests/qemunbdkitdata/{disk-network-ssh-key.args.disk0 => disk-network-ssh-key.args.disk0-src0} (74%) rename tests/qemunbdkitdata/{disk-network-ssh-key.args.disk1 => disk-network-ssh-key.args.disk1-src0} (73%) rename tests/qemunbdkitdata/{disk-network-ssh-password.args.disk0 => disk-network-ssh-password.args.disk0-src0} (71%) rename tests/qemunbdkitdata/{disk-network-ssh-password.args.disk0.pipe.778 => disk-network-ssh-password.args.disk0-src0.pipe.778} (100%) rename tests/qemunbdkitdata/{disk-network-ssh.args.disk0 => disk-network-ssh.args.disk0-src0} (66%) diff --git a/tests/qemunbdkitdata/disk-cdrom-network.args.disk0 b/tests/qemunbdkitdata/disk-cdrom-network.args.disk0-src0 similarity index 63% rename from tests/qemunbdkitdata/disk-cdrom-network.args.disk0 rename to tests/qemunbdkitdata/disk-cdrom-network.args.disk0-src0 index b2f3be4cba..cec0c758cd 100644 --- a/tests/qemunbdkitdata/disk-cdrom-network.args.disk0 +++ b/tests/qemunbdkitdata/disk-cdrom-network.args.disk0-src0 @@ -1,5 +1,5 @@ nbdkit \ ---unix /tmp/statedir-0/nbdkit-test-disk-0.socket \ +--unix /tmp/domain-QEMUGuest1/nbdkit-disk0-src0.socket \ --foreground \ --readonly curl \ protocols=ftp \ diff --git a/tests/qemunbdkitdata/disk-cdrom-network.args.disk1 b/tests/qemunbdkitdata/disk-cdrom-network.args.disk1-src0 similarity index 70% rename from tests/qemunbdkitdata/disk-cdrom-network.args.disk1 rename to tests/qemunbdkitdata/disk-cdrom-network.args.disk1-src0 index a23f6573d6..62368ac3e6 100644 --- a/tests/qemunbdkitdata/disk-cdrom-network.args.disk1 +++ b/tests/qemunbdkitdata/disk-cdrom-network.args.disk1-src0 @@ -1,5 +1,5 @@ nbdkit \ ---unix /tmp/statedir-1/nbdkit-test-disk-1.socket \ +--unix /tmp/domain-QEMUGuest1/nbdkit-disk1-src0.socket \ --foreground \ --readonly curl \ protocols=ftps \ diff --git a/tests/qemunbdkitdata/disk-cdrom-network.args.disk1.pipe.778 b/tests/qemunbdkitdata/disk-cdrom-network.args.disk1-src0.pipe.778 similarity index 100% rename from tests/qemunbdkitdata/disk-cdrom-network.args.disk1.pipe.778 rename to tests/qemunbdkitdata/disk-cdrom-network.args.disk1-src0.pipe.778 diff --git a/tests/qemunbdkitdata/disk-cdrom-network.args.disk2 b/tests/qemunbdkitdata/disk-cdrom-network.args.disk2-src0 similarity index 72% rename from tests/qemunbdkitdata/disk-cdrom-network.args.disk2 rename to tests/qemunbdkitdata/disk-cdrom-network.args.disk2-src0 index 04e918609a..70bfa39252 100644 --- a/tests/qemunbdkitdata/disk-cdrom-network.args.disk2 +++ b/tests/qemunbdkitdata/disk-cdrom-network.args.disk2-src0 @@ -1,5 +1,5 @@ nbdkit \ ---unix /tmp/statedir-2/nbdkit-test-disk-2.socket \ +--unix /tmp/domain-QEMUGuest1/nbdkit-disk2-src0.socket \ --foreground \ --readonly curl \ protocols=https \ diff --git a/tests/qemunbdkitdata/disk-cdrom-network.args.disk2.pipe.780 b/tests/qemunbdkitdata/disk-cdrom-network.args.disk2-src0.pipe.780 similarity index 100% rename from tests/qemunbdkitdata/disk-cdrom-network.args.disk2.pipe.780 rename to tests/qemunbdkitdata/disk-cdrom-network.args.disk2-src0.pipe.780 diff --git a/tests/qemunbdkitdata/disk-network-http.args.disk0 b/tests/qemunbdkitdata/disk-network-http.args.disk0-src0 similarity index 64% rename from tests/qemunbdkitdata/disk-network-http.args.disk0 rename to tests/qemunbdkitdata/disk-network-http.args.disk0-src0 index 8316f353cb..a850610593 100644 --- a/tests/qemunbdkitdata/disk-network-http.args.disk0 +++ b/tests/qemunbdkitdata/disk-network-http.args.disk0-src0 @@ -1,5 +1,5 @@ nbdkit \ ---unix /tmp/statedir-0/nbdkit-test-disk-0.socket \ +--unix /tmp/domain-QEMUGuest1/nbdkit-disk0-src0.socket \ --foreground curl \ protocols=http,https \ url=http://example.org:80/test.img \ diff --git a/tests/qemunbdkitdata/disk-network-http.args.disk1 b/tests/qemunbdkitdata/disk-network-http.args.disk1-src0 similarity index 59% rename from tests/qemunbdkitdata/disk-network-http.args.disk1 rename to tests/qemunbdkitdata/disk-network-http.args.disk1-src0 index a546a68b27..0864840e41 100644 --- a/tests/qemunbdkitdata/disk-network-http.args.disk1 +++ b/tests/qemunbdkitdata/disk-network-http.args.disk1-src0 @@ -1,5 +1,5 @@ nbdkit \ ---unix /tmp/statedir-1/nbdkit-test-disk-1.socket \ +--unix /tmp/domain-QEMUGuest1/nbdkit-disk1-src0.socket \ --foreground curl \ protocols=https \ url=https://example.org:443/test2.img diff --git a/tests/qemunbdkitdata/disk-network-http.args.disk2 b/tests/qemunbdkitdata/disk-network-http.args.disk2-src0 similarity index 64% rename from tests/qemunbdkitdata/disk-network-http.args.disk2 rename to tests/qemunbdkitdata/disk-network-http.args.disk2-src0 index 1004547b3a..359767f20c 100644 --- a/tests/qemunbdkitdata/disk-network-http.args.disk2 +++ b/tests/qemunbdkitdata/disk-network-http.args.disk2-src0 @@ -1,5 +1,5 @@ nbdkit \ ---unix /tmp/statedir-2/nbdkit-test-disk-2.socket \ +--unix /tmp/domain-QEMUGuest1/nbdkit-disk2-src0.socket \ --foreground curl \ protocols=http,https \ url=http://example.org:1234/test3.img \ diff --git a/tests/qemunbdkitdata/disk-network-http.args.disk2.pipe.778 b/tests/qemunbdkitdata/disk-network-http.args.disk2-src0.pipe.778 similarity index 100% rename from tests/qemunbdkitdata/disk-network-http.args.disk2.pipe.778 rename to tests/qemunbdkitdata/disk-network-http.args.disk2-src0.pipe.778 diff --git a/tests/qemunbdkitdata/disk-network-http.args.disk3 b/tests/qemunbdkitdata/disk-network-http.args.disk3-src0 similarity index 70% rename from tests/qemunbdkitdata/disk-network-http.args.disk3 rename to tests/qemunbdkitdata/disk-network-http.args.disk3-src0 index e3c357b89a..6f2fa96b63 100644 --- a/tests/qemunbdkitdata/disk-network-http.args.disk3 +++ b/tests/qemunbdkitdata/disk-network-http.args.disk3-src0 @@ -1,5 +1,5 @@ nbdkit \ ---unix /tmp/statedir-3/nbdkit-test-disk-3.socket \ +--unix /tmp/domain-QEMUGuest1/nbdkit-disk3-src0.socket \ --foreground curl \ protocols=https \ 'url=https://example.org:1234/test4.img?par=val&other=ble' \ diff --git a/tests/qemunbdkitdata/disk-network-http.args.disk3.pipe.780 b/tests/qemunbdkitdata/disk-network-http.args.disk3-src0.pipe.780 similarity index 100% rename from tests/qemunbdkitdata/disk-network-http.args.disk3.pipe.780 rename to tests/qemunbdkitdata/disk-network-http.args.disk3-src0.pipe.780 diff --git a/tests/qemunbdkitdata/disk-network-source-curl-nbdkit-backing.args.disk0 b/tests/qemunbdkitdata/disk-network-source-curl-nbdkit-backing.args.disk0-src0 similarity index 69% rename from tests/qemunbdkitdata/disk-network-source-curl-nbdkit-backing.args.disk0 rename to tests/qemunbdkitdata/disk-network-source-curl-nbdkit-backing.args.disk0-src0 index 605354433b..ea54fb56d0 100644 --- a/tests/qemunbdkitdata/disk-network-source-curl-nbdkit-backing.args.disk0 +++ b/tests/qemunbdkitdata/disk-network-source-curl-nbdkit-backing.args.disk0-src0 @@ -1,5 +1,5 @@ nbdkit \ ---unix /tmp/statedir-0/nbdkit-test-disk-0.socket \ +--unix /tmp/domain-QEMUGuest1/nbdkit-disk0-src0.socket \ --foreground \ --readonly curl \ protocols=https \ diff --git a/tests/qemunbdkitdata/disk-network-source-curl-nbdkit-backing.args.disk0.pipe.778 b/tests/qemunbdkitdata/disk-network-source-curl-nbdkit-backing.args.disk0-src0.pipe.778 similarity index 100% rename from tests/qemunbdkitdata/disk-network-source-curl-nbdkit-backing.args.disk0.pipe.778 rename to tests/qemunbdkitdata/disk-network-source-curl-nbdkit-backing.args.disk0-src0.pipe.778 diff --git a/tests/qemunbdkitdata/disk-network-source-curl-nbdkit-backing.args.disk0-src1 b/tests/qemunbdkitdata/disk-network-source-curl-nbdkit-backing.args.disk0-src1 new file mode 100644 index 0000000000..f9e2d8b86f --- /dev/null +++ b/tests/qemunbdkitdata/disk-network-source-curl-nbdkit-backing.args.disk0-src1 @@ -0,0 +1,7 @@ +nbdkit \ +--unix /tmp/domain-QEMUGuest1/nbdkit-disk0-src1.socket \ +--foreground \ +--readonly curl \ +protocols=https \ +url=https://https.example2.org:8444/path/to/backing.qcow2 \ +cookie=-779 diff --git a/tests/qemunbdkitdata/disk-network-source-curl-nbdkit-backing.args.disk0-src1.pipe.780 b/tests/qemunbdkitdata/disk-network-source-curl-nbdkit-backing.args.disk0-src1.pipe.780 new file mode 100644 index 0000000000..0aafdfb733 --- /dev/null +++ b/tests/qemunbdkitdata/disk-network-source-curl-nbdkit-backing.args.disk0-src1.pipe.780 @@ -0,0 +1 @@ +cookie3=cookievalue3; cookie4=cookievalue4 diff --git a/tests/qemunbdkitdata/disk-network-source-curl.args.disk0 b/tests/qemunbdkitdata/disk-network-source-curl.args.disk0-src0 similarity index 69% rename from tests/qemunbdkitdata/disk-network-source-curl.args.disk0 rename to tests/qemunbdkitdata/disk-network-source-curl.args.disk0-src0 index 948dbfbe5a..ff3b06760d 100644 --- a/tests/qemunbdkitdata/disk-network-source-curl.args.disk0 +++ b/tests/qemunbdkitdata/disk-network-source-curl.args.disk0-src0 @@ -1,5 +1,5 @@ nbdkit \ ---unix /tmp/statedir-0/nbdkit-test-disk-0.socket \ +--unix /tmp/domain-QEMUGuest1/nbdkit-disk0-src0.socket \ --foreground \ --readonly curl \ protocols=https \ diff --git a/tests/qemunbdkitdata/disk-network-source-curl.args.disk0.pipe.778 b/tests/qemunbdkitdata/disk-network-source-curl.args.disk0-src0.pipe.778 similarity index 100% rename from tests/qemunbdkitdata/disk-network-source-curl.args.disk0.pipe.778 rename to tests/qemunbdkitdata/disk-network-source-curl.args.disk0-src0.pipe.778 diff --git a/tests/qemunbdkitdata/disk-network-source-curl.args.disk1 b/tests/qemunbdkitdata/disk-network-source-curl.args.disk1-src0 similarity index 75% rename from tests/qemunbdkitdata/disk-network-source-curl.args.disk1 rename to tests/qemunbdkitdata/disk-network-source-curl.args.disk1-src0 index d1288dd242..972b07b0e2 100644 --- a/tests/qemunbdkitdata/disk-network-source-curl.args.disk1 +++ b/tests/qemunbdkitdata/disk-network-source-curl.args.disk1-src0 @@ -1,5 +1,5 @@ nbdkit \ ---unix /tmp/statedir-1/nbdkit-test-disk-1.socket \ +--unix /tmp/domain-QEMUGuest1/nbdkit-disk1-src0.socket \ --foreground curl \ protocols=https \ 'url=https://https.example.org:8443/path/to/disk5.iso?foo=bar' \ diff --git a/tests/qemunbdkitdata/disk-network-source-curl.args.disk1.pipe.780 b/tests/qemunbdkitdata/disk-network-source-curl.args.disk1-src0.pipe.780 similarity index 100% rename from tests/qemunbdkitdata/disk-network-source-curl.args.disk1.pipe.780 rename to tests/qemunbdkitdata/disk-network-source-curl.args.disk1-src0.pipe.780 diff --git a/tests/qemunbdkitdata/disk-network-source-curl.args.disk1.pipe.782 b/tests/qemunbdkitdata/disk-network-source-curl.args.disk1-src0.pipe.782 similarity index 100% rename from tests/qemunbdkitdata/disk-network-source-curl.args.disk1.pipe.782 rename to tests/qemunbdkitdata/disk-network-source-curl.args.disk1-src0.pipe.782 diff --git a/tests/qemunbdkitdata/disk-network-source-curl.args.disk2 b/tests/qemunbdkitdata/disk-network-source-curl.args.disk2-src0 similarity index 69% rename from tests/qemunbdkitdata/disk-network-source-curl.args.disk2 rename to tests/qemunbdkitdata/disk-network-source-curl.args.disk2-src0 index f1d0e1929e..6cfa70ad36 100644 --- a/tests/qemunbdkitdata/disk-network-source-curl.args.disk2 +++ b/tests/qemunbdkitdata/disk-network-source-curl.args.disk2-src0 @@ -1,5 +1,5 @@ nbdkit \ ---unix /tmp/statedir-2/nbdkit-test-disk-2.socket \ +--unix /tmp/domain-QEMUGuest1/nbdkit-disk2-src0.socket \ --foreground \ --readonly curl \ protocols=http,https \ diff --git a/tests/qemunbdkitdata/disk-network-source-curl.args.disk2.pipe.784 b/tests/qemunbdkitdata/disk-network-source-curl.args.disk2-src0.pipe.784 similarity index 100% rename from tests/qemunbdkitdata/disk-network-source-curl.args.disk2.pipe.784 rename to tests/qemunbdkitdata/disk-network-source-curl.args.disk2-src0.pipe.784 diff --git a/tests/qemunbdkitdata/disk-network-source-curl.args.disk3 b/tests/qemunbdkitdata/disk-network-source-curl.args.disk3-src0 similarity index 64% rename from tests/qemunbdkitdata/disk-network-source-curl.args.disk3 rename to tests/qemunbdkitdata/disk-network-source-curl.args.disk3-src0 index f517baa948..2377d2e41b 100644 --- a/tests/qemunbdkitdata/disk-network-source-curl.args.disk3 +++ b/tests/qemunbdkitdata/disk-network-source-curl.args.disk3-src0 @@ -1,5 +1,5 @@ nbdkit \ ---unix /tmp/statedir-3/nbdkit-test-disk-3.socket \ +--unix /tmp/domain-QEMUGuest1/nbdkit-disk3-src0.socket \ --foreground \ --readonly curl \ protocols=ftp \ diff --git a/tests/qemunbdkitdata/disk-network-source-curl.args.disk4 b/tests/qemunbdkitdata/disk-network-source-curl.args.disk4-src0 similarity index 65% rename from tests/qemunbdkitdata/disk-network-source-curl.args.disk4 rename to tests/qemunbdkitdata/disk-network-source-curl.args.disk4-src0 index 1df47a9d54..584c30bee9 100644 --- a/tests/qemunbdkitdata/disk-network-source-curl.args.disk4 +++ b/tests/qemunbdkitdata/disk-network-source-curl.args.disk4-src0 @@ -1,5 +1,5 @@ nbdkit \ ---unix /tmp/statedir-4/nbdkit-test-disk-4.socket \ +--unix /tmp/domain-QEMUGuest1/nbdkit-disk4-src0.socket \ --foreground \ --readonly curl \ protocols=ftps \ diff --git a/tests/qemunbdkitdata/disk-network-ssh-key.args.disk0 b/tests/qemunbdkitdata/disk-network-ssh-key.args.disk0-src0 similarity index 74% rename from tests/qemunbdkitdata/disk-network-ssh-key.args.disk0 rename to tests/qemunbdkitdata/disk-network-ssh-key.args.disk0-src0 index f627700490..e16f2ca0c4 100644 --- a/tests/qemunbdkitdata/disk-network-ssh-key.args.disk0 +++ b/tests/qemunbdkitdata/disk-network-ssh-key.args.disk0-src0 @@ -1,6 +1,6 @@ SSH_AUTH_SOCK=/path/to/agent/socket \ nbdkit \ ---unix /tmp/statedir-0/nbdkit-test-disk-0.socket \ +--unix /tmp/domain-QEMUGuest1/nbdkit-disk0-src0.socket \ --foreground ssh \ host=example.org \ port=2222 \ diff --git a/tests/qemunbdkitdata/disk-network-ssh-key.args.disk1 b/tests/qemunbdkitdata/disk-network-ssh-key.args.disk1-src0 similarity index 73% rename from tests/qemunbdkitdata/disk-network-ssh-key.args.disk1 rename to tests/qemunbdkitdata/disk-network-ssh-key.args.disk1-src0 index 80df9c30c6..fbac8313d7 100644 --- a/tests/qemunbdkitdata/disk-network-ssh-key.args.disk1 +++ b/tests/qemunbdkitdata/disk-network-ssh-key.args.disk1-src0 @@ -1,5 +1,5 @@ nbdkit \ ---unix /tmp/statedir-1/nbdkit-test-disk-1.socket \ +--unix /tmp/domain-QEMUGuest1/nbdkit-disk1-src0.socket \ --foreground ssh \ host=example.org \ port=2222 \ diff --git a/tests/qemunbdkitdata/disk-network-ssh-password.args.disk0 b/tests/qemunbdkitdata/disk-network-ssh-password.args.disk0-src0 similarity index 71% rename from tests/qemunbdkitdata/disk-network-ssh-password.args.disk0 rename to tests/qemunbdkitdata/disk-network-ssh-password.args.disk0-src0 index ee2d7c3343..0da07e19f4 100644 --- a/tests/qemunbdkitdata/disk-network-ssh-password.args.disk0 +++ b/tests/qemunbdkitdata/disk-network-ssh-password.args.disk0-src0 @@ -1,5 +1,5 @@ nbdkit \ ---unix /tmp/statedir-0/nbdkit-test-disk-0.socket \ +--unix /tmp/domain-QEMUGuest1/nbdkit-disk0-src0.socket \ --foreground ssh \ host=example.org \ port=2222 \ diff --git a/tests/qemunbdkitdata/disk-network-ssh-password.args.disk0.pipe.778 b/tests/qemunbdkitdata/disk-network-ssh-password.args.disk0-src0.pipe.778 similarity index 100% rename from tests/qemunbdkitdata/disk-network-ssh-password.args.disk0.pipe.778 rename to tests/qemunbdkitdata/disk-network-ssh-password.args.disk0-src0.pipe.778 diff --git a/tests/qemunbdkitdata/disk-network-ssh.args.disk0 b/tests/qemunbdkitdata/disk-network-ssh.args.disk0-src0 similarity index 66% rename from tests/qemunbdkitdata/disk-network-ssh.args.disk0 rename to tests/qemunbdkitdata/disk-network-ssh.args.disk0-src0 index 481b218936..2c8f54d5ce 100644 --- a/tests/qemunbdkitdata/disk-network-ssh.args.disk0 +++ b/tests/qemunbdkitdata/disk-network-ssh.args.disk0-src0 @@ -1,5 +1,5 @@ nbdkit \ ---unix /tmp/statedir-0/nbdkit-test-disk-0.socket \ +--unix /tmp/domain-QEMUGuest1/nbdkit-disk0-src0.socket \ --foreground ssh \ host=example.org \ port=2222 \ diff --git a/tests/qemunbdkittest.c b/tests/qemunbdkittest.c index 3f6bd09616..d0332a8e9f 100644 --- a/tests/qemunbdkittest.c +++ b/tests/qemunbdkittest.c @@ -174,7 +174,10 @@ testNbdkit(const void *data) const TestInfo *info = data; g_autoptr(virDomainDef) def = NULL; size_t i; + size_t n; int ret = 0; + virStorageSource *backing = NULL; + g_autofree char *statedir = NULL; /* restart mock pipe fds so tests are consistent */ mockpipefd = PIPE_FD_START; @@ -189,56 +192,61 @@ testNbdkit(const void *data) VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE))) return -1; + statedir = g_strdup_printf("/tmp/domain-%s", def->name); for (i = 0; i < def->ndisks; i++) { virDomainDiskDef *disk = def->disks[i]; - g_autofree char *statedir = g_strdup_printf("/tmp/statedir-%zi", i); - g_autofree char *alias = g_strdup_printf("test-disk-%zi", i); - g_autofree char *cmdfile = g_strdup_printf("%s.args.disk%zi", - info->outtemplate, i); - - if (qemuNbdkitInitStorageSource(info->nbdkitcaps, disk->src, statedir, - alias, 101, 101)) { - qemuDomainStorageSourcePrivate *srcPriv = - qemuDomainStorageSourcePrivateFetch(disk->src); - g_autoptr(virCommand) cmd = NULL; - g_autoptr(virCommandDryRunToken) dryRunToken = virCommandDryRunTokenNew(); - g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - g_autofree char *actualCmdline = NULL; - virCommandSendBuffer *sendbuffers; - int nsendbuffers; - size_t j; - - virCommandSetDryRun(dryRunToken, &buf, true, true, NULL, NULL); - cmd = qemuNbdkitProcessBuildCommand(srcPriv->nbdkitProcess); - - if (virCommandRun(cmd, NULL) < 0) { - ret = -1; - continue; - } - virCommandPeekSendBuffers(cmd, &sendbuffers, &nsendbuffers); - - if (!(actualCmdline = virBufferContentAndReset(&buf))) { - ret = -1; - continue; - } + for (n = 0, backing = disk->src; backing != NULL; n++, backing = backing->backingStore) { + g_autofree char *alias = g_strdup_printf("disk%zi-src%zi", i, n); + g_autofree char *cmdfile = g_strdup_printf("%s.args.%s", + info->outtemplate, alias); + + if (qemuNbdkitInitStorageSource(info->nbdkitcaps, backing, statedir, + alias, 101, 101)) { + qemuDomainStorageSourcePrivate *srcPriv = + qemuDomainStorageSourcePrivateFetch(backing); + g_autoptr(virCommand) cmd = NULL; + g_autoptr(virCommandDryRunToken) dryRunToken = virCommandDryRunTokenNew(); + g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; + g_autofree char *actualCmdline = NULL; + virCommandSendBuffer *sendbuffers; + int nsendbuffers; + size_t j; + + if (srcPriv->nbdkitProcess == NULL) + continue; + + virCommandSetDryRun(dryRunToken, &buf, true, true, NULL, NULL); + cmd = qemuNbdkitProcessBuildCommand(srcPriv->nbdkitProcess); + + if (virCommandRun(cmd, NULL) < 0) { + ret = -1; + continue; + } + virCommandPeekSendBuffers(cmd, &sendbuffers, &nsendbuffers); - if (virTestCompareToFileFull(actualCmdline, cmdfile, false) < 0) - ret = -1; + if (!(actualCmdline = virBufferContentAndReset(&buf))) { + ret = -1; + continue; + } - for (j = 0; j < nsendbuffers; j++) { - virCommandSendBuffer *buffer = &sendbuffers[j]; - g_autofree char *pipefile = g_strdup_printf("%s.pipe.%i", - cmdfile, - buffer->fd); + if (virTestCompareToFileFull(actualCmdline, cmdfile, false) < 0) + ret = -1; - if (virTestCompareToFile((const char*)buffer->buffer, pipefile) < 0) + for (j = 0; j < nsendbuffers; j++) { + virCommandSendBuffer *buffer = &sendbuffers[j]; + g_autofree char *pipefile = g_strdup_printf("%s.pipe.%i", + cmdfile, + buffer->fd); + + if (virTestCompareToFile((const char*)buffer->buffer, pipefile) < 0) + ret = -1; + } + } else { + if (virFileExists(cmdfile)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + "qemuNbdkitInitStorageSource() was not expected to fail"); ret = -1; - } - } else { - if (virFileExists(cmdfile)) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - "qemuNbdkitInitStorageSource() was not expected to fail"); - ret = -1; + } } } } -- 2.43.0

2 1

[PATCH 0/3] tests: Improve ABI_UPDATE macros
by Andrea Bolognani 26 Jan '24

26 Jan '24

Andrea Bolognani (3): tests: Drop ppc64-usb-controller-legacy tests: Use ABI_UPDATE macros more tests: Improve ABI_UPDATE macros ...fi-aarch64.aarch64-latest.abi-update.args} | 0 ...efi-aarch64.aarch64-latest.abi-update.xml} | 0 .../firmware-auto-efi-abi-update-aarch64.xml | 1 - .../firmware-auto-efi-abi-update.xml | 1 - ...-auto-efi-format-loader-raw-abi-update.xml | 1 - ...loader-raw.aarch64-latest.abi-update.args} | 0 ...-loader-raw.aarch64-latest.abi-update.xml} | 0 ...ware-auto-efi-loader-secure-abi-update.xml | 1 - ...ader-secure.x86_64-latest.abi-update.args} | 0 ...oader-secure.x86_64-latest.abi-update.xml} | 0 .../firmware-auto-efi-rw-abi-update.xml | 1 - ...-auto-efi-rw.x86_64-latest.abi-update.err} | 0 ...re-auto-efi.x86_64-latest.abi-update.args} | 0 ...are-auto-efi.x86_64-latest.abi-update.xml} | 0 ...efi-features.x86_64-latest.abi-update.err} | 0 ...memory-hotplug-nvdimm-ppc64-abi-update.xml | 1 - ...nvdimm-ppc64.ppc64-latest.abi-update.args} | 0 ...-nvdimm-ppc64.ppc64-latest.abi-update.xml} | 0 ...memory-hotplug-ppc64-nonuma-abi-update.xml | 1 - ...ppc64-nonuma.ppc64-latest.abi-update.args} | 0 ...-ppc64-nonuma.ppc64-latest.abi-update.xml} | 0 ...64-usb-controller-legacy.ppc64-latest.args | 33 ------------- ...c64-usb-controller-legacy.ppc64-latest.xml | 38 --------------- .../ppc64-usb-controller-legacy.xml | 1 - .../ppc64-usb-controller-qemu-xhci.xml | 1 - ...b-controller.ppc64-latest.abi-update.args} | 0 ...sb-controller.ppc64-latest.abi-update.xml} | 0 tests/qemuxmlconftest.c | 48 ++++++++++--------- 28 files changed, 26 insertions(+), 102 deletions(-) rename tests/qemuxmlconfdata/{firmware-auto-efi-abi-update-aarch64.aarch64-latest.args => firmware-auto-efi-aarch64.aarch64-latest.abi-update.args} (100%) rename tests/qemuxmlconfdata/{firmware-auto-efi-abi-update-aarch64.aarch64-latest.xml => firmware-auto-efi-aarch64.aarch64-latest.abi-update.xml} (100%) delete mode 120000 tests/qemuxmlconfdata/firmware-auto-efi-abi-update-aarch64.xml delete mode 120000 tests/qemuxmlconfdata/firmware-auto-efi-abi-update.xml delete mode 120000 tests/qemuxmlconfdata/firmware-auto-efi-format-loader-raw-abi-update.xml rename tests/qemuxmlconfdata/{firmware-auto-efi-format-loader-raw-abi-update.aarch64-latest.args => firmware-auto-efi-format-loader-raw.aarch64-latest.abi-update.args} (100%) rename tests/qemuxmlconfdata/{firmware-auto-efi-format-loader-raw-abi-update.aarch64-latest.xml => firmware-auto-efi-format-loader-raw.aarch64-latest.abi-update.xml} (100%) delete mode 120000 tests/qemuxmlconfdata/firmware-auto-efi-loader-secure-abi-update.xml rename tests/qemuxmlconfdata/{firmware-auto-efi-abi-update.x86_64-latest.args => firmware-auto-efi-loader-secure.x86_64-latest.abi-update.args} (100%) rename tests/qemuxmlconfdata/{firmware-auto-efi-abi-update.x86_64-latest.xml => firmware-auto-efi-loader-secure.x86_64-latest.abi-update.xml} (100%) delete mode 120000 tests/qemuxmlconfdata/firmware-auto-efi-rw-abi-update.xml rename tests/qemuxmlconfdata/{firmware-auto-efi-rw-abi-update.x86_64-latest.err => firmware-auto-efi-rw.x86_64-latest.abi-update.err} (100%) rename tests/qemuxmlconfdata/{firmware-auto-efi-loader-secure-abi-update.x86_64-latest.args => firmware-auto-efi.x86_64-latest.abi-update.args} (100%) rename tests/qemuxmlconfdata/{firmware-auto-efi-loader-secure-abi-update.x86_64-latest.xml => firmware-auto-efi.x86_64-latest.abi-update.xml} (100%) rename tests/qemuxmlconfdata/{firmware-manual-efi-features.x86_64-latest.err => firmware-manual-efi-features.x86_64-latest.abi-update.err} (100%) delete mode 120000 tests/qemuxmlconfdata/memory-hotplug-nvdimm-ppc64-abi-update.xml rename tests/qemuxmlconfdata/{memory-hotplug-nvdimm-ppc64-abi-update.ppc64-latest.args => memory-hotplug-nvdimm-ppc64.ppc64-latest.abi-update.args} (100%) rename tests/qemuxmlconfdata/{memory-hotplug-nvdimm-ppc64-abi-update.ppc64-latest.xml => memory-hotplug-nvdimm-ppc64.ppc64-latest.abi-update.xml} (100%) delete mode 120000 tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma-abi-update.xml rename tests/qemuxmlconfdata/{memory-hotplug-ppc64-nonuma-abi-update.ppc64-latest.args => memory-hotplug-ppc64-nonuma.ppc64-latest.abi-update.args} (100%) rename tests/qemuxmlconfdata/{memory-hotplug-ppc64-nonuma-abi-update.ppc64-latest.xml => memory-hotplug-ppc64-nonuma.ppc64-latest.abi-update.xml} (100%) delete mode 100644 tests/qemuxmlconfdata/ppc64-usb-controller-legacy.ppc64-latest.args delete mode 100644 tests/qemuxmlconfdata/ppc64-usb-controller-legacy.ppc64-latest.xml delete mode 120000 tests/qemuxmlconfdata/ppc64-usb-controller-legacy.xml delete mode 120000 tests/qemuxmlconfdata/ppc64-usb-controller-qemu-xhci.xml rename tests/qemuxmlconfdata/{ppc64-usb-controller-qemu-xhci.ppc64-latest.args => ppc64-usb-controller.ppc64-latest.abi-update.args} (100%) rename tests/qemuxmlconfdata/{ppc64-usb-controller-qemu-xhci.ppc64-latest.xml => ppc64-usb-controller.ppc64-latest.abi-update.xml} (100%) -- 2.43.0

2 4

QEMU Blocl librbd encryption bugfix
by Caleb Davis 26 Jan '24

26 Jan '24

Hello there, As users of libvirt and rbd, we've run into a bug when using encrypted images with libvirt where `engine=librbd`. This bug has been addressed by a patch submitted to the mailing list in January of 2023: https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/message/CQE… I've tested this fix myself and can confirm that it resolves our issue attempting to attach encrypted images using the librbd engine. I see that this fix has not made it into the master branch. How can my team and I go about pushing for this fix to be included? Thank you, Caleb Davis

2 1

[PATCH 0/4] vmx: A couple of disk related fixes
by Michal Privoznik 25 Jan '24

25 Jan '24

The first patch fixes an issue. The last one - I am not sure if it's not going to break something and thus it's optional. Michal Prívozník (4): vmx: Accept empty fileName for cdrom-image vmx2xmltest: Add another test case vmx: Separate disk target name generation into a function vmx: Ensure unique disk targets when parsing src/vmx/vmx.c | 199 +++++++++++++++-------- tests/vmx2xmldata/esx-in-the-wild-12.vmx | 86 ++++++++++ tests/vmx2xmldata/esx-in-the-wild-12.xml | 39 +++++ tests/vmx2xmldata/esx-in-the-wild-8.xml | 4 +- tests/vmx2xmltest.c | 1 + 5 files changed, 261 insertions(+), 68 deletions(-) create mode 100644 tests/vmx2xmldata/esx-in-the-wild-12.vmx create mode 100644 tests/vmx2xmldata/esx-in-the-wild-12.xml -- 2.41.0

3 9

[PATCH] qemu_hotplug: Don't lose 'created' flag in qemuDomainChangeNet()
by Michal Privoznik 25 Jan '24

25 Jan '24

After v9.1.0-rc1~116 we track whether it's us who created a macvtap or not. But when updating a vNIC its definition might be replaced with a new one (though, ifname is not allowed to change), e.g. to reflect new QoS, link state, etc. Now, the fact whether we created macvtap for given vNIC is stored in net->privateData->created. And replacing definition is done by simply freeing the old definition and making the pointer point to the new one. But this does not preserve the 'created' flag, which in turn means when a domain is shutting off, the macvtap is not removed (see loop inside of qemuProcessStop()). Copy this flag into new definition and leave a note in _qemuDomainNetworkPrivate struct. Fixes: 61d1b9e6592660121aeda66bf7adbcd39de06aa8 Resolves: https://issues.redhat.com/browse/RHEL-22714 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- I also contemplated idea of preserving whole privateData, e.g.: virObjectUnref(newdev->privateData); newdev->privateData = g_steal_pointer(&olddev->privateData); but then decided against it. Looks like a heavy gun, though in my debugging all members but 'created' were zero/NULL at point of calling qemuDomainChangeNet(). Then there is qemuDomainNetworkPrivateFormat() and qemuDomainNetworkPrivateParse() combo, but in order to use it I'd need to create and then parse an XML doc (to get 'ctxt') and that looks too much work for very little gain. Does somebody have any other idea? src/qemu/qemu_domain.h | 2 ++ src/qemu/qemu_hotplug.c | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index b4512cc80e..6ba3f10e8d 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -420,6 +420,8 @@ typedef struct _qemuDomainNetworkPrivate qemuDomainNetworkPrivate; struct _qemuDomainNetworkPrivate { virObject parent; + /* Don't forget to possibly copy these members in qemuDomainChangeNet(). */ + /* True if the device was created by us. Otherwise we should * avoid removing it. Currently only used for * VIR_DOMAIN_NET_TYPE_DIRECT. */ diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 0e45bd53e1..31b00e05ca 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -4166,6 +4166,11 @@ qemuDomainChangeNet(virQEMUDriver *driver, else VIR_WARN("Unable to release network device '%s'", NULLSTR(olddev->ifname)); } + + /* Carry over fact whether we created the device or not. */ + QEMU_DOMAIN_NETWORK_PRIVATE(newdev)->created = + QEMU_DOMAIN_NETWORK_PRIVATE(olddev)->created; + virDomainNetDefFree(olddev); /* move newdev into the nets list, and NULL it out from the * virDomainDeviceDef that we were given so that the caller -- 2.43.0

2 1

[PATCH] Add explanation about the attribute "delay"
by Yalan Zhang 25 Jan '24

25 Jan '24

The libvirt created linux bridge has a configurable value "delay", the default value is "0", but it will not take effect. That's because kernel has a minimum value for linux bridge. Add some explanation about it in the document. Signed-off-by: Yalan Zhang <yalzhang(a)redhat.com> --- docs/formatnetwork.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/formatnetwork.rst b/docs/formatnetwork.rst index 5335da5e11..aee70bbd0d 100644 --- a/docs/formatnetwork.rst +++ b/docs/formatnetwork.rst @@ -106,7 +106,8 @@ to the physical LAN (if at all). prefix "virbr" is recommended (and that is what is auto-generated), but not enforced. Attribute ``stp`` specifies if Spanning Tree Protocol is 'on' or 'off' (default is 'on'). Attribute ``delay`` sets the bridge's forward delay - value in seconds (default is 0). :since:`Since 0.3.0` + value in seconds (default is 0. As the kernel has a minimum delay, values + below it may not be counted). :since:`Since 0.3.0` The ``macTableManager`` attribute of the bridge element is used to tell libvirt how the bridge's MAC address table (used to determine the correct -- 2.43.0

2 1

[libvirt PATCH] build: Make daemons depend on generated *_protocol.[ch]
by Jiri Denemark 25 Jan '24

25 Jan '24

This should fix build failures when a daemon code is compiled before the included *_protocol.h headers are ready, such as: FAILED: src/virtqemud.p/remote_remote_daemon_config.c.o ../src/remote/remote_daemon_config.c: In function ‘daemonConfigNew’: ../src/remote/remote_daemon_config.c:111:30: error: ‘REMOTE_AUTH_POLKIT’ undeclared (first use in this function) 111 | data->auth_unix_rw = REMOTE_AUTH_POLKIT; | ^~~~~~~~~~~~~~~~~~ ../src/remote/remote_daemon_config.c:111:30: note: each undeclared identifier is reported only once for each function it appears in ../src/remote/remote_daemon_config.c:115:30: error: ‘REMOTE_AUTH_NONE’ undeclared (first use in this function) 115 | data->auth_unix_rw = REMOTE_AUTH_NONE; | ^~~~~~~~~~~~~~~~ ../src/remote/remote_daemon_config.c: In function ‘daemonConfigLoadOptions’: ../src/remote/remote_daemon_config.c:252:31: error: ‘REMOTE_AUTH_POLKIT’ undeclared (first use in this function) 252 | if (data->auth_unix_rw == REMOTE_AUTH_POLKIT) { | ^~~~~~~~~~~~~~~~~~ or FAILED: src/virtqemud.p/remote_remote_daemon_dispatch.c.o In file included from ../src/remote/remote_daemon.h:28, from ../src/remote/remote_daemon_dispatch.c:26: src/remote/lxc_protocol.h:13:5: error: unknown type name ‘remote_nonnull_domain’ 13 | remote_nonnull_domain dom; | ^~~~~~~~~~~~~~~~~~~~~ In file included from ../src/remote/remote_daemon.h:29, from ../src/remote/remote_daemon_dispatch.c:26: src/remote/qemu_protocol.h:13:5: error: unknown type name ‘remote_nonnull_domain’ 13 | remote_nonnull_domain dom; | ^~~~~~~~~~~~~~~~~~~~~ src/remote/qemu_protocol.h:14:5: error: unknown type name ‘remote_nonnull_string’ 14 | remote_nonnull_string cmd; | ^~~~~~~~~~~~~~~~~~~~~ ... Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- Notes: I couldn't check this patch actually fixes the error because the build failure is non-deterministic and I cannot reproduce the failure now. po/meson.build | 1 + src/meson.build | 6 +++++- src/remote/meson.build | 15 +++++++++++---- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/po/meson.build b/po/meson.build index a20877ad34..592b254447 100644 --- a/po/meson.build +++ b/po/meson.build @@ -20,6 +20,7 @@ potfiles_dep = [ access_gen_sources, admin_client_generated, admin_driver_generated, + remote_protocol_generated, remote_driver_generated, remote_daemon_generated, ] diff --git a/src/meson.build b/src/meson.build index 6538c43628..f52d2d5994 100644 --- a/src/meson.build +++ b/src/meson.build @@ -616,7 +616,11 @@ foreach daemon : virt_daemons bin = executable( daemon['name'], [ - daemon.get('sources', [ remote_daemon_sources, remote_daemon_generated ]), + daemon.get('sources', [ + remote_protocol_generated, + remote_daemon_sources, + remote_daemon_generated + ]), dtrace_gen_objects, ], c_args: [ diff --git a/src/remote/meson.build b/src/remote/meson.build index 681c709823..831acaaa01 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build @@ -7,8 +7,6 @@ remote_driver_generated = [] foreach name : [ 'remote', 'qemu', 'lxc' ] client_bodies_h = '@0@_client_bodies.h'.format(name) - protocol_c = '@0@_protocol.c'.format(name) - protocol_h = '@0@_protocol.h'.format(name) protocol_x = '@0@_protocol.x'.format(name) remote_driver_generated += custom_target( @@ -20,8 +18,16 @@ foreach name : [ 'remote', 'qemu', 'lxc' ] ], capture: true, ) +endforeach - remote_driver_generated += custom_target( +remote_protocol_generated = [] + +foreach name : [ 'remote', 'qemu', 'lxc' ] + protocol_c = '@0@_protocol.c'.format(name) + protocol_h = '@0@_protocol.h'.format(name) + protocol_x = '@0@_protocol.x'.format(name) + + remote_protocol_generated += custom_target( protocol_h, input: protocol_x, output: protocol_h, @@ -32,7 +38,7 @@ foreach name : [ 'remote', 'qemu', 'lxc' ] ], ) - remote_driver_generated += custom_target( + remote_protocol_generated += custom_target( protocol_c, input: protocol_x, output: protocol_c, @@ -143,6 +149,7 @@ if conf.has('WITH_REMOTE') remote_driver_lib = static_library( 'virt_remote_driver', [ + remote_protocol_generated, remote_driver_sources, remote_driver_generated, ], -- 2.43.0

3 2

[PATCH v2 0/2] qemu_process: Skip over non-virtio non-TAP NIC models when refreshing rx-filter
by Michal Privoznik 25 Jan '24

25 Jan '24

This was reported here: https://lists.libvirt.org/archives/list/users@lists.libvirt.org/thread/QZ43… and v1 was posted here: https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/AVRY… diff to v1: - Expanded commit message in 1/2 - Added NEWS entry - Expanded list of vNIC types for which query-rx-filter is issued to basically every TUN/TAP based type. Might be an overkill, but should keep us covered for foreseeable future (e.g. when we decide to report changed MAC address in domain XML). Michal Prívozník (2): qemu_process: Skip over non-virtio non-TAP NIC models when refreshing rx-filter NEWS: Document recent rx-filter bugfix NEWS.rst | 9 +++++++++ src/qemu/qemu_process.c | 27 +++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) -- 2.43.0

2 3

[PATCH 0/3] qemu: migration: Fix allocation and release of NBD port
by Peter Krempa 25 Jan '24

25 Jan '24

See 2/3 for the bugfix Peter Krempa (3): util: virtportallocator: Add VIR_DEBUG statements for port allocations and release qemu: migration: Properly handle reservation of manually specified NBD port qemuMigrationDstStartNBDServer: Refactor cleanup src/qemu/qemu_migration.c | 40 +++++++++++++------------------------ src/util/virportallocator.c | 9 +++++++++ 2 files changed, 23 insertions(+), 26 deletions(-) -- 2.43.0

2 6

[PATCH] qemu_process: Skip over non-virtio NIC models when refreshing rx-filter
by Michal Privoznik 25 Jan '24

25 Jan '24

After guest is started, or we are reconnecting to already running one (after daemon restart), qemuProcessRefreshRxFilters() is called to refresh rx-filters (basically MAC addresses of guest NICs) as they might have changed while we were not running (for the case when reconnecting to an already running guest), or we need to enable them by running a command (for freshly started guest - see processNicRxFilterChangedEvent()). Now, our XML parser allowed trustGuestRxFilters attribute for all types and models of <interface/> while in reality, only virtio model can see MAC address changes. Fixes: 060d4c83ef436cf56abfad51a4d64c39448e199d Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_process.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 3563ad215c..a736846588 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -7958,6 +7958,12 @@ qemuProcessRefreshRxFilters(virDomainObj *vm, if (!virDomainNetGetActualTrustGuestRxFilters(def)) continue; + /* rx-filters are supported only for virtio macvtaps */ + if (def->model != VIR_DOMAIN_NET_MODEL_VIRTIO || + virDomainNetGetActualType(def) != VIR_DOMAIN_NET_TYPE_DIRECT) { + continue; + } + if (qemuDomainSyncRxFilter(vm, def, asyncJob) < 0) return -1; } -- 2.43.0

3 3

[PATCH 0/3] Allow reserving more memory for PCI controllers
by Michal Privoznik 24 Jan '24

24 Jan '24

*** BLURB HERE *** Michal Prívozník (3): conf: Introduce @memReserve to <controller/> qemu_validate: Restrict setting @memReserve only to some controllers qemu_command: Generate mem-reserve for controllers docs/formatdomain.rst | 6 +++++ src/conf/domain_conf.c | 9 +++++++ src/conf/domain_conf.h | 3 +++ src/conf/schemas/domaincommon.rng | 5 ++++ src/qemu/qemu_command.c | 3 +++ src/qemu/qemu_validate.c | 25 +++++++++++++++++++ .../q35-usb2.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/q35-usb2.xml | 2 +- .../q35-usb2.x86_64-latest.xml | 2 +- 9 files changed, 54 insertions(+), 3 deletions(-) -- 2.41.0

3 5

[PATCH] Explicitly convert type to double to avoid losing precision
by Egor Makrushin 24 Jan '24

24 Jan '24

Division between integers will also be integer. Thus, to preserve fractional part explicitly convert first operand to double. Found by Linux Verification Center (linuxtesting.org) with SVACE. Fixes: 28d54aab05 ("examples: Introduce domtop") Signed-off-by: Egor Makrushin <emakrushin(a)astralinux.ru> --- examples/c/domain/domtop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/c/domain/domtop.c b/examples/c/domain/domtop.c index dd35ec8661..65663a1c39 100644 --- a/examples/c/domain/domtop.c +++ b/examples/c/domain/domtop.c @@ -224,7 +224,7 @@ print_cpu_usage(size_t cpu, * performed has a bad effect on the precision, so instead of dividing * @now_params and @then_params by 1000 and then multiplying again by * 100, we divide only once by 10 and get the same result. */ - usage = (now_params[pos].value.ul - then_params[pos].value.ul) / + usage = (double)(now_params[pos].value.ul - then_params[pos].value.ul) / (now - then) / 10; if (delim) -- 2.30.2

2 1