June 2026 - Devel - libvirt List Archives

[PATCH 0/7] qemu: add async vCPU unplug coverage
by Akash Kulhalli 10 Jun '26

10 Jun '26

This series adds qemuhotplugtest coverage for async vCPU unplug. Async vCPU unplug does not complete at the device_del reply. The guest CPU remains in a pending removal state until QEMU reports DEVICE_DELETED and the QEMU driver handles the resulting process event. The new harness support lets the tests observe that intermediate state and then complete the unplug through the same process-event path used by the driver. The setvcpu coverage exercises both a single-vCPU x86 hotplug entity and a grouped ppc64 hotplug entity. These cases check the pending live XML before completion and the final live/config XML after completion, while also validating the expected vcpu-removed domain events. The setvcpus coverage adds a separate count-based x86 downscale case. This keeps the independent count-to-entity selection path covered without duplicating the grouped-entity coverage from setvcpu. The series also includes a small domain API cleanup to use the vCPU-specific flag aliases consistently in the vCPU entry points. This keeps the implementation and diagnostics aligned with the API being handled. This is a cosmetic change only, since the underlying values are all mapped to their equivalent enums. While adding this coverage, I realised that virsh was being too restrictive in its parameter combination validation; only QEMU does not support both `--async` and `--guest`. Other drivers may wish to support this behaviour. Accordingly, I've changed the behaviour so that virsh now lets the drivers reject the combination if they're unsupported. The decision now rests with the driver, which is more appropriate. Akash Kulhalli (7): qemu: expose process event handler to tests tests: add helper for DEVICE_DELETED events qemuhotplugtest: support async vcpu unplug completion qemuhotplugtest: test setvcpu async unplug qemuhotplugtest: test setvcpus async downscale domain: use vcpu-specific flag aliases consistently virsh: allow async vcpu options to reach drivers -- 2.49.0

2 16

[PATCH 0/3] qemuxmlconftest: Error out if invalid FDs will be passed
by Peter Krempa 10 Jun '26

10 Jun '26

As promised in: [PATCH 00/30] qemuxmlconftest: Use real FDs in test cases these patches make qemuxmlconftest error out if fake FDs are passed to virCommandPassFD. Peter Krempa (3): testutils: Turn 'virTestDummyFDContext' into a proper type virTestDummyFDContext: Add fields to track errors and 'virTestDummyFDContextMarkError' qemuxmlconftest: Fail if test case tried to pass STDIO or invalid fds to 'virCommandPassFD' tests/qemuxml2argvmock.c | 3 +++ tests/qemuxmlconftest.c | 12 +++++++++- tests/testutils.c | 47 ++++++++++++++++++++++++++++++++++------ tests/testutils.h | 8 ++++++- tests/testutilsqemu.h | 4 +++- 5 files changed, 64 insertions(+), 10 deletions(-) -- 2.54.0

2 4

[PATCH] qemu: validate: treat only real backing chains as NVRAM backingStore
by Efim Shevrin 10 Jun '26

10 Jun '26

qemuDomainInitializePflashStorageSource() always attaches a non-NULL src->backingStore used as an empty virStorageSource chain terminator (type VIR_STORAGE_TYPE_NONE). qemuValidateDomainDefNvram() incorrectly interpreted every non-NULL backingStore as a genuine backing overlay and reported VIR_ERR_CONFIG_UNSUPPORTED, so legitimate UEFI/NVRAM setups were rejected. Check virStorageSourceIsBacking(src->backingStore) instead of a plain pointer test so only a real backing node is rejected. Regression introduced in commit bca731d0f562f0842f56ec2206fdbd721a468f5b. Signed-off-by: Fima Shevrin <efim.shevrin(a)virtuozzo.com> --- src/qemu/qemu_validate.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 642244b62e..d8347d1964 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -740,7 +740,14 @@ qemuValidateDomainDefNvram(const virDomainDef *def, return -1; } - if (src->backingStore) { + /* qemuDomainInitializePflashStorageSource() always sets + * src->backingStore to a fresh empty virStorageSource as a + * chain terminator, so a plain `if (src->backingStore)` check + * is always true and rejects every UEFI/NVRAM domain after + * upstream commit that introduced the terminator. Use + * virStorageSourceIsBacking() (type != VIR_STORAGE_TYPE_NONE) + * so we only reject genuine backing chains. */ + if (virStorageSourceIsBacking(src->backingStore)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("backingStore is not supported with NVRAM")); return -1; -- 2.47.1

2 3

[PATCH v2 03/16] migration/qapi: Rename MigrationStats to MigrationRAMStats
by Peter Xu 10 Jun '26

10 Jun '26

This stats is only about RAM, make it accurate. This paves way for statistics for all devices. Thanks to Markus, who pointed out that docs/devel/qapi-code-gen.rst has a section "Compatibility considerations" stated: Since type names are not visible in the Client JSON Protocol, types may be freely renamed. Even certain refactorings are invisible, such as splitting members from one type into a common base type. Hence this change is not ABI violation according to the document. While at it, touch up the lines to make it read better, correct the restriction on migration status being 'active' or 'completed': over time we grew too many new status that will also report "ram" section. Cc: Daniel P. Berrangé <berrange(a)redhat.com> Cc: devel(a)lists.libvirt.org Reviewed-by: Markus Armbruster <armbru(a)redhat.com> Reviewed-by: Juraj Marcin <jmarcin(a)redhat.com> Reviewed-by: Michal Privoznik <mprivozn(a)redhat.com> Signed-off-by: Peter Xu <peterx(a)redhat.com> --- docs/about/removed-features.rst | 2 +- qapi/migration.json | 10 +++++----- migration/migration-stats.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst index e75db08410..626162022a 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -699,7 +699,7 @@ was superseded by ``sections``. ``query-migrate`` return value member ``skipped`` (removed in 9.1) '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' -Member ``skipped`` of the ``MigrationStats`` struct hasn't been used +Member ``skipped`` of the ``MigrationRAMStats`` struct hasn't been used for more than 10 years. Removed with no replacement. ``migrate`` command option ``inc`` (removed in 9.1) diff --git a/qapi/migration.json b/qapi/migration.json index 7134d4ce47..e3ad3f0604 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -12,7 +12,7 @@ { 'include': 'sockets.json' } ## -# @MigrationStats: +# @MigrationRAMStats: # # Detailed migration status. # @@ -64,7 +64,7 @@ # # Since: 0.14 ## -{ 'struct': 'MigrationStats', +{ 'struct': 'MigrationRAMStats', 'data': {'transferred': 'int', 'remaining': 'int', 'total': 'int' , 'duplicate': 'int', 'normal': 'int', @@ -209,8 +209,8 @@ # If this field is not returned, no migration process has been # initiated # -# @ram: `MigrationStats` containing detailed migration status, only -# returned if status is 'active' or 'completed'(since 1.2) +# @ram: Detailed migration RAM statistics, only returned if migration +# is in progress or completed (since 1.2) # # @xbzrle-cache: `XBZRLECacheStats` containing detailed XBZRLE # migration statistics, only returned if XBZRLE feature is on and @@ -309,7 +309,7 @@ # Since: 0.14 ## { 'struct': 'MigrationInfo', - 'data': {'*status': 'MigrationStatus', '*ram': 'MigrationStats', + 'data': {'*status': 'MigrationStatus', '*ram': 'MigrationRAMStats', '*vfio': 'VfioStats', '*xbzrle-cache': 'XBZRLECacheStats', '*total-time': 'int', diff --git a/migration/migration-stats.h b/migration/migration-stats.h index c0f50144c9..1153520f7a 100644 --- a/migration/migration-stats.h +++ b/migration/migration-stats.h @@ -27,7 +27,7 @@ /* * These are the ram migration statistic counters. It is loosely - * based on MigrationStats. + * based on MigrationRAMStats. */ typedef struct { /* -- 2.53.0

4 5

Reboot events
by Marek Marczykowski-Górecki 10 Jun '26

10 Jun '26

Hi, What should be the events fired when VM requests reboot? Currently the libxl driver fires VIR_DOMAIN_EVENT_STOPPED, and if on_reboot is set to restart, it fires VIR_DOMAIN_EVENT_STARTED next to it (in fact, _STARTED gets fired before _STOPPED here, but it's another issue). What I'd like to do, is to set on_reboot to destroy, but still receive information whether VM requested just shutdown or reboot, so my application (qubesd daemon) can act on it. I see VIR_DOMAIN_EVENT_ID_REBOOT, but it's not used in libxl. What's the intended semantic of it? Should it be fired next to the lifecycle event (VIR_DOMAIN_EVENT_STOPPED/VIR_DOMAIN_EVENT_STARTED)? Or instead? Is it okay to fire it even if on_reboot=destroy? -- Best Regards, Marek Marczykowski-Górecki Invisible Things Lab

2 3

[PATCH] lxc: truncate LOOP_GET_STATUS64.lo_file_name for long loop backing paths
by Radoslaw Smigielski 10 Jun '26

10 Jun '26

LXC domains with long file-backed filesystem path fail to start when the backing image path is longer than LO_NAME_SIZE (64 bytes, 63 characters plus NUL). When long file path is passed, virFileLoopDeviceAssociate() -> virStrcpy() fails and user gets missleading error and domain fails to start. Example: <filesystem type='file' accessmode='passthrough'> <driver type='loop' format='raw'/> <source file='/root/demoaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.raw'/> <target dir='/'/> </filesystem> To match losetup behavior we copy the path with virStrcpy() and allow truncation of lo_file_name only if needed, while still calling open() on the unchanged path. Finally log VIR_WARN when the path is expected to be truncated. But still report VIR_ERR_INTERNAL_ERROR for all other virStrcpy() failures. Fixes: https://gitlab.com/libvirt/libvirt/-/work_items/63 Signed-off-by: Radoslaw Smigielski <rsmigiel(a)redhat.com> --- src/util/virfile.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index a0c6cb804862..ae33deb8d223 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -995,11 +995,18 @@ int virFileLoopDeviceAssociate(const char *file, lo.lo_flags = LO_FLAGS_AUTOCLEAR; - /* Set backing file name for LOOP_GET_STATUS64 queries */ + /* lo_file_name is loop device name, max length is LO_NAME_SIZE bytes. + * Truncate loop device name if file path is longer than LO_NAME_SIZE, + * and still use the full path to open backing file. */ if (virStrcpy((char *) lo.lo_file_name, file, LO_NAME_SIZE) < 0) { - virReportSystemError(errno, - _("Unable to set backing file %1$s"), file); - goto cleanup; + if (strlen(file) >= LO_NAME_SIZE) { + VIR_WARN("Loop backing device name %s truncated to %d bytes.", + file, LO_NAME_SIZE); + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unable to set loop lo_file_name for %1$s"), file); + goto cleanup; + } } if ((fsfd = open(file, O_RDWR)) < 0) { -- 2.54.0

3 7

[PATCH 1/2] bhyve: respect domain's on_poweroff action
by Roman Bogorodskiy 10 Jun '26

10 Jun '26

Currently, the bhyve driver shutdown implementation does not take into account domain's on_poweroff action. Update it so it reboots a domain on shutdown when it is configured this way. Signed-off-by: Roman Bogorodskiy <bogorodskiy(a)gmail.com> --- src/bhyve/bhyve_driver.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 2e7a534396..1f904d8958 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -1077,18 +1077,30 @@ bhyveDomainShutdownFlags(virDomainPtr dom, unsigned int flags) { virDomainObj *vm; int ret = -1; + bhyveDomainObjPrivate *priv; + bool isReboot = false; virCheckFlags(0, -1); if (!(vm = bhyveDomObjFromDomain(dom))) goto cleanup; + if (vm->def->onPoweroff == VIR_DOMAIN_LIFECYCLE_ACTION_RESTART || + vm->def->onPoweroff == VIR_DOMAIN_LIFECYCLE_ACTION_RESTART_RENAME) { + isReboot = true; + VIR_INFO("Domain on_poweroff setting overridden, attempting reboot"); + } + if (virDomainShutdownFlagsEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; if (virDomainObjCheckActive(vm) < 0) goto cleanup; + if (isReboot) { + priv = vm->privateData; + bhyveMonitorSetReboot(priv->mon); + } ret = virBhyveProcessShutdown(vm); cleanup: -- 2.52.0

2 3

[PATCH] virt-aa-helper: Prevent spurious denials for AoE disks
by PUSHKARAJ PATIL 10 Jun '26

10 Jun '26

virt-aa-helper calls virStorageSourceGetMetadata before adding a disk path to a domain's apparmor profile. This probes the device and may trigger an AppArmor denial when the disk is an AoE device under /dev/etherd/. The return value of virStorageSourceGetMetadata is not checked, so the denial has no functional impact but results in noisy dmesg logs. Explicitly deny read access to /dev/etherd/e*.* in the virt-aa-helper profile to avoid these spurious denials. Co-Authored-By: Peter Krempa <pkrempa(a)redhat.com> Signed-off-by: PUSHKARAJ PATIL <pushkaraj.patil(a)in.ibm.com> --- src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in | 1 + 1 file changed, 1 insertion(+) diff --git a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in b/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in index e209a8bff7..1f1b80b9f9 100644 --- a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in +++ b/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in @@ -38,6 +38,7 @@ profile virt-aa-helper @libexecdir@/virt-aa-helper { deny /dev/dm-* r, deny /dev/drbd[0-9]* r, deny /dev/dasd* r, + deny /dev/etherd/e*.* r, deny /dev/nvme* r, deny /dev/zd[0-9]* r, deny /dev/mapper/ r, -- 2.50.1 (Apple Git-155)

3 2

[PATCH] bhyve: support populating SMBIOS fields
by Roman Bogorodskiy 10 Jun '26

10 Jun '26

bhyve supports populating SMBIOS fields. Each field is set using the -o option, such as: -o system.product_name=Virt-Manager There are 4 groups of options: - bios.* - system.* - board.* - chassis.* As a side note, the '-o' option can be used for setting options not related to the SMBIOS fields. Extend virBhyveProcessBuildBhyveCmd() to build the appropriate arguments for what's specified in the domain's `<sysinfo type='smbios'>` section. Signed-off-by: Roman Bogorodskiy <bogorodskiy(a)gmail.com> --- src/bhyve/bhyve_command.c | 147 ++++++++++++++++++ .../x86_64/bhyvexml2argv-sysinfo-smbios.args | 29 ++++ .../bhyvexml2argv-sysinfo-smbios.ldargs | 4 + .../x86_64/bhyvexml2argv-sysinfo-smbios.xml | 52 +++++++ tests/bhyvexml2argvtest.c | 1 + 5 files changed, 233 insertions(+) create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-sysinfo-smbios.args create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-sysinfo-smbios.ldargs create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-sysinfo-smbios.xml diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index 1da344f503..941b48eb66 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -928,6 +928,148 @@ bhyveBuildFSArgStr(const virDomainDef *def G_GNUC_UNUSED, return 0; } +static void +bhyveBuildSysinfoBiosArgStr(virSysinfoBIOSDef *def, + virCommand *cmd) +{ + if (def->vendor) { + virCommandAddArg(cmd, "-o"); + virCommandAddArgPair(cmd, "bios.vendor", def->vendor); + } + + if (def->version) { + virCommandAddArg(cmd, "-o"); + virCommandAddArgPair(cmd, "bios.version", def->version); + } + + if (def->date) { + virCommandAddArg(cmd, "-o"); + virCommandAddArgPair(cmd, "bios.release_date", def->date); + } +} + +static void +bhyveBuildSysinfoSystemArgStr(virSysinfoSystemDef *def, + virCommand *cmd) +{ + if (def->manufacturer) { + virCommandAddArg(cmd, "-o"); + virCommandAddArgPair(cmd, "system.manufacturer", def->manufacturer); + } + + if (def->product) { + virCommandAddArg(cmd, "-o"); + virCommandAddArgPair(cmd, "system.product_name", def->product); + } + + if (def->serial) { + virCommandAddArg(cmd, "-o"); + virCommandAddArgPair(cmd, "system.serial_number", def->serial); + } + + if (def->sku) { + virCommandAddArg(cmd, "-o"); + virCommandAddArgPair(cmd, "system.sku", def->sku); + } + + if (def->version) { + virCommandAddArg(cmd, "-o"); + virCommandAddArgPair(cmd, "system.version", def->version); + } +} + +static void +bhyveBuildSysinfoBaseBoardArgStr(virSysinfoBaseBoardDef *def, + virCommand *cmd) +{ + if (def->manufacturer) { + virCommandAddArg(cmd, "-o"); + virCommandAddArgPair(cmd, "board.manufacturer", def->manufacturer); + } + + if (def->product) { + virCommandAddArg(cmd, "-o"); + virCommandAddArgPair(cmd, "board.product_name", def->product); + } + + if (def->version) { + virCommandAddArg(cmd, "-o"); + virCommandAddArgPair(cmd, "board.version", def->version); + } + + if (def->serial) { + virCommandAddArg(cmd, "-o"); + virCommandAddArgPair(cmd, "board.serial_number", def->serial); + } + + if (def->asset) { + virCommandAddArg(cmd, "-o"); + virCommandAddArgPair(cmd, "board.asset_tag", def->asset); + } + + if (def->location) { + virCommandAddArg(cmd, "-o"); + virCommandAddArgPair(cmd, "board.location", def->location); + } +} + +static void +bhyveBuildSysinfoChassisArgStr(virSysinfoChassisDef *def, + virCommand *cmd) +{ + if (def->manufacturer) { + virCommandAddArg(cmd, "-o"); + virCommandAddArgPair(cmd, "chassis.manufacturer", def->manufacturer); + } + + if (def->version) { + virCommandAddArg(cmd, "-o"); + virCommandAddArgPair(cmd, "chassis.version", def->version); + } + + if (def->serial) { + virCommandAddArg(cmd, "-o"); + virCommandAddArgPair(cmd, "chassis.serial_number", def->serial); + } + + if (def->asset) { + virCommandAddArg(cmd, "-o"); + virCommandAddArgPair(cmd, "chassis.asset_tag", def->asset); + } + + if (def->sku) { + virCommandAddArg(cmd, "-o"); + virCommandAddArgPair(cmd, "chassis.sku", def->sku); + } +} + +static int +bhyveBuildSysinfoArgStr(virSysinfoDef *sysinfo, + virCommand *cmd) +{ + size_t i; + + if (sysinfo->bios) + bhyveBuildSysinfoBiosArgStr(sysinfo->bios, cmd); + + if (sysinfo->system) + bhyveBuildSysinfoSystemArgStr(sysinfo->system, cmd); + + if (sysinfo->nbaseBoard > 1) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("bhyve does not support more than one entry to Type 2 in SMBIOS table")); + return -1; + } + + for (i = 0; i < sysinfo->nbaseBoard; i++) + bhyveBuildSysinfoBaseBoardArgStr(&sysinfo->baseBoard[i], cmd); + + if (sysinfo->chassis) + bhyveBuildSysinfoChassisArgStr(sysinfo->chassis, cmd); + + return 0; +} + virCommand * virBhyveProcessBuildBhyveCmd(struct _bhyveConn *driver, virDomainDef *def, bool dryRun) @@ -1164,6 +1306,11 @@ virBhyveProcessBuildBhyveCmd(struct _bhyveConn *driver, virDomainDef *def, if (bhyveBuildHostdevArgStr(def, cmd) < 0) return NULL; + for (i = 0; i < def->nsysinfo; i++) + if (def->sysinfo[i]->type == VIR_SYSINFO_SMBIOS) + if (bhyveBuildSysinfoArgStr(def->sysinfo[i], cmd) < 0) + return NULL; + virCommandAddArg(cmd, def->name); return g_steal_pointer(&cmd); diff --git a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-sysinfo-smbios.args b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-sysinfo-smbios.args new file mode 100644 index 0000000000..f4894a60b0 --- /dev/null +++ b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-sysinfo-smbios.args @@ -0,0 +1,29 @@ +bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ +-s 2:0,ahci,hd:/tmp/freebsd.img \ +-s 3:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 \ +-o bios.vendor=LENOVO \ +-o bios.version=14.1 \ +-o bios.release_date=11/24/2025 \ +-o system.manufacturer=Fedora \ +-o system.product_name=Virt-Manager \ +-o system.serial_number=xxx-yyy-zzz \ +-o system.sku=0000 \ +-o system.version=0.9.4 \ +-o board.manufacturer=LENOVO \ +-o board.product_name=20BE0061MC \ +-o 'board.version=0B98401 Pro' \ +-o board.serial_number=W1KS427111E \ +-o 'board.asset_tag=Asset Tag' \ +-o board.location=Nowhere \ +-o 'chassis.manufacturer=Dell Inc.' \ +-o chassis.version=2.12 \ +-o chassis.serial_number=65X0XF2 \ +-o chassis.asset_tag=40000101 \ +-o chassis.sku=Type3Sku1 \ +bhyve diff --git a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-sysinfo-smbios.ldargs b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-sysinfo-smbios.ldargs new file mode 100644 index 0000000000..5905f4b3e6 --- /dev/null +++ b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-sysinfo-smbios.ldargs @@ -0,0 +1,4 @@ +bhyveload \ +-m 214 \ +-d /tmp/freebsd.img \ +bhyve diff --git a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-sysinfo-smbios.xml b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-sysinfo-smbios.xml new file mode 100644 index 0000000000..111421211c --- /dev/null +++ b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-sysinfo-smbios.xml @@ -0,0 +1,52 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory>219136</memory> + <vcpu>1</vcpu> + <os> + <type>hvm</type> + </os> + <sysinfo type='smbios'> + <bios> + <entry name='vendor'>LENOVO</entry> + <entry name='version'>14.1</entry> + <entry name='date'>11/24/2025</entry> + </bios> + <system> + <entry name='manufacturer'>Fedora</entry> + <entry name='product'>Virt-Manager</entry> + <entry name='version'>0.9.4</entry> + <entry name='serial'>xxx-yyy-zzz</entry> + <entry name='sku'>0000</entry> + </system> + <baseBoard> + <entry name='manufacturer'>LENOVO</entry> + <entry name='product'>20BE0061MC</entry> + <entry name='version'>0B98401 Pro</entry> + <entry name='serial'>W1KS427111E</entry> + <entry name='asset'>Asset Tag</entry> + <entry name='location'>Nowhere</entry> + </baseBoard> + <chassis> + <entry name='manufacturer'>Dell Inc.</entry> + <entry name='version'>2.12</entry> + <entry name='serial'>65X0XF2</entry> + <entry name='asset'>40000101</entry> + <entry name='sku'>Type3Sku1</entry> + </chassis> + </sysinfo> + <devices> + <disk type='file'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='hda' bus='sata'/> + <address type='drive' controller='0' bus='0' target='2' unit='0'/> + </disk> + <interface type='bridge'> + <mac address='52:54:00:b9:94:02'/> + <model type='virtio'/> + <source bridge="virbr0"/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + </devices> +</domain> diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index 818b51e178..71322d1330 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -303,6 +303,7 @@ mymain(void) DO_TEST_FAILURE("virtio-console-invalid-path"); DO_TEST("memtune"); DO_TEST_FAILURE("memtune-unsupported-params"); + DO_TEST("sysinfo-smbios"); /* Address allocation tests */ DO_TEST("addr-single-sata-disk"); -- 2.52.0

2 1

[PATCH 1/1] qemu: Inherit SCSI controller model from existing peers
by Denis V. Lunev 09 Jun '26

09 Jun '26

virDomainDefMaybeAddHostdevSCSIcontroller() already inherits the model of an existing SCSI controller when auto-adding peers driven by a hostdev whose drive address overflows the highest declared idx. virDomainDefAddDiskControllersForType(), called for the disk-driven analogue, does not -- it passes model=-1 unconditionally. The unspecified peers then arrive at qemuDomainDefaultSCSIControllerModel() and pick up whichever model the capability cascade settles on (typically lsilogic). A user-declared virtio-scsi controller at idx 0 ends up alongside auto-added lsilogic peers at idx 1+. Plug the same inheritance into qemuDomainDefaultSCSIControllerModel() itself so it covers both the disk-driven path and any other caller that arrives with an unresolved model. The function already prefers architectural defaults (PSeries, ARM virt, RISC-V virt, LoongArch, s390, built-in ESP) over capabilities; peer inheritance slots in just before the capability cascade. A virtio-scsi domain keeps the new peers as virtio-scsi; an lsisas1068 domain stays lsisas1068; a fresh domain with no SCSI controllers still gets the cap-driven default. controller-scsi-auto, the only existing test that flows through this helper, is unaffected (it has no peers to inherit from). controller-scsi-inherit-model covers the new behavior. Signed-off-by: Denis V. Lunev <den(a)openvz.org> --- src/qemu/qemu_domain.c | 15 +++++++ ...ller-scsi-inherit-model.x86_64-latest.args | 38 ++++++++++++++++ ...oller-scsi-inherit-model.x86_64-latest.xml | 45 +++++++++++++++++++ .../controller-scsi-inherit-model.xml | 20 +++++++++ tests/qemuxmlconftest.c | 1 + 5 files changed, 119 insertions(+) create mode 100644 tests/qemuxmlconfdata/controller-scsi-inherit-model.x86_64-latest.args create mode 100644 tests/qemuxmlconfdata/controller-scsi-inherit-model.x86_64-latest.xml create mode 100644 tests/qemuxmlconfdata/controller-scsi-inherit-model.xml diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 84c8645259..21f2641521 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4289,6 +4289,8 @@ virDomainControllerModelSCSI qemuDomainDefaultSCSIControllerModel(const virDomainDef *def, virQEMUCaps *qemuCaps) { + size_t i; + /* For machine types with built-in SCSI controllers, the choice * of model is obvious */ if (qemuDomainHasBuiltinESP(def)) @@ -4305,6 +4307,19 @@ qemuDomainDefaultSCSIControllerModel(const virDomainDef *def, if (qemuDomainIsPSeries(def)) return VIR_DOMAIN_CONTROLLER_MODEL_SCSI_IBMVSCSI; + /* Inherit the model from any peer SCSI controller already + * resolved on this domain. */ + for (i = 0; i < def->ncontrollers; i++) { + const virDomainControllerDef *peer = def->controllers[i]; + + if (peer->type != VIR_DOMAIN_CONTROLLER_TYPE_SCSI) + continue; + if (peer->model == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_DEFAULT || + peer->model == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_AUTO) + continue; + return peer->model; + } + /* If there is no preference, base the choice on device * availability. In this case, lsilogic is favored over * virtio-scsi for backwards compatibility reasons */ diff --git a/tests/qemuxmlconfdata/controller-scsi-inherit-model.x86_64-latest.args b/tests/qemuxmlconfdata/controller-scsi-inherit-model.x86_64-latest.args new file mode 100644 index 0000000000..2bcd9ed92f --- /dev/null +++ b/tests/qemuxmlconfdata/controller-scsi-inherit-model.x86_64-latest.args @@ -0,0 +1,38 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-guest \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-guest/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-guest/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=guest,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ +-accel tcg \ +-cpu qemu64 \ +-m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ +-overcommit mem-lock=off \ +-smp 8,sockets=8,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=@mon-fd@,server=on,wait=off \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-boot strict=on \ +-device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.0","addr":"0x2"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi1","bus":"pci.0","addr":"0x3"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi2","bus":"pci.0","addr":"0x4"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi3","bus":"pci.0","addr":"0x5"}' \ +-blockdev '{"driver":"file","filename":"/tmp/data.qcow2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2","file":"libvirt-1-storage"}' \ +-device '{"driver":"scsi-hd","bus":"scsi3.0","channel":0,"scsi-id":0,"lun":3,"device_id":"drive-scsi3-0-0-3","drive":"libvirt-1-format","id":"scsi3-0-0-3","bootindex":1}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxmlconfdata/controller-scsi-inherit-model.x86_64-latest.xml b/tests/qemuxmlconfdata/controller-scsi-inherit-model.x86_64-latest.xml new file mode 100644 index 0000000000..b971c89a1b --- /dev/null +++ b/tests/qemuxmlconfdata/controller-scsi-inherit-model.x86_64-latest.xml @@ -0,0 +1,45 @@ +<domain type='qemu'> + <name>guest</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>8</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu64</model> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type='file' device='disk'> + <driver name='qemu' type='qcow2'/> + <source file='/tmp/data.qcow2'/> + <target dev='sdy' bus='scsi'/> + <address type='drive' controller='3' bus='0' target='0' unit='3'/> + </disk> + <controller type='scsi' index='0' model='virtio-scsi'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </controller> + <controller type='scsi' index='1' model='virtio-scsi'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </controller> + <controller type='scsi' index='2' model='virtio-scsi'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </controller> + <controller type='scsi' index='3' model='virtio-scsi'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> + </controller> + <controller type='usb' index='0' model='none'/> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <audio id='1' type='none'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxmlconfdata/controller-scsi-inherit-model.xml b/tests/qemuxmlconfdata/controller-scsi-inherit-model.xml new file mode 100644 index 0000000000..45e96b7ea1 --- /dev/null +++ b/tests/qemuxmlconfdata/controller-scsi-inherit-model.xml @@ -0,0 +1,20 @@ +<domain type='qemu'> + <name>guest</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <vcpu placement='static'>8</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + </os> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <controller type='scsi' index='0' model='virtio-scsi'/> + <disk type='file' device='disk'> + <driver name='qemu' type='qcow2'/> + <source file='/tmp/data.qcow2'/> + <target dev='sdy' bus='scsi'/> + </disk> + <controller type='usb' index='0' model='none'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index 8e0f4bcb4f..7a441c1fa2 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -1690,6 +1690,7 @@ mymain(void) DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-scsi-product-length"); DO_TEST_CAPS_LATEST("controller-virtio-scsi"); DO_TEST_CAPS_LATEST("controller-scsi-auto"); + DO_TEST_CAPS_LATEST("controller-scsi-inherit-model"); DO_TEST_FULL("controller-scsi-default-unavailable", ".x86_64-latest", ARG_CAPS_ARCH, "x86_64", ARG_CAPS_VER, "latest", -- 2.51.0

3 2