- Devel - libvirt List Archives

[PATCH] vmx: Fix a case with 64 disks on one SCSI controller
by Martin Kletzander 19 Jun '26

19 Jun '26

From: Martin Kletzander <mkletzan(a)redhat.com> The constants for maximum units on a bus are slightly tricky because for the narrow bus it does not need to account for the extra unit used by the controller, but the wide and super-wide ones need to. With this patch a VMX with 64 disks on a pvscsi controller can be properly parsed. To properly handle the maximum numbers one of the conditions also needs to be changed to not allow for units 16 and 65. This does not change various conditionals in XML parsing and VMX formatting as they need a significant rewrite. And since that is already working only with the wide scsi controller (and not the super-wide one) we leave that refactor for another day as it was done previously. Tests show this is now possible and they fail before this change. Resolves: https://redhat.atlassian.net/browse/RHEL-181350 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/conf/domain_conf.h | 16 +- src/vmx/vmx.c | 2 +- tests/vmx2xmldata/esx-in-the-wild-11.xml | 2 +- tests/vmx2xmldata/scsi-driver-max.vmx | 50 +++ tests/vmx2xmldata/scsi-driver-max.xml | 95 +++++ .../vmx2xmldata/scsi-driver-superwide-max.vmx | 197 ++++++++++ .../vmx2xmldata/scsi-driver-superwide-max.xml | 340 ++++++++++++++++++ tests/vmx2xmltest.c | 2 + 8 files changed, 701 insertions(+), 3 deletions(-) create mode 100644 tests/vmx2xmldata/scsi-driver-max.vmx create mode 100644 tests/vmx2xmldata/scsi-driver-max.xml create mode 100644 tests/vmx2xmldata/scsi-driver-superwide-max.vmx create mode 100644 tests/vmx2xmldata/scsi-driver-superwide-max.xml diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index bd360cd4a3da..0c6c79c41378 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3184,8 +3184,22 @@ struct _virDomainHypervFeatures { char *vendor_id; }; -#define SCSI_SUPER_WIDE_BUS_MAX_CONT_UNIT 64 +/* + * Beware, these numbers mean slightly different things. Because the unit + * number 7 is reserved for the controller, any higher limits must account for + * that fact. I.e. a super-wide bus can have at max 64 disks, but accounting + * for the controller occupying one of the units the number needs to be 65. + * + * The maximums are taken from the following page: + * https://configmax.broadcom.com/guest?vmwareproduct=vSphere + */ +#define SCSI_SUPER_WIDE_BUS_MAX_CONT_UNIT 65 #define SCSI_WIDE_BUS_MAX_CONT_UNIT 16 + +/* + * Since 7 unit numbers [0..7) do not interfere with the controller occupying + * unit number 7 it reflects the correct number of disks (targets). + */ #define SCSI_NARROW_BUS_MAX_CONT_UNIT 7 diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 572087341ae0..72ec1454aa95 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -2271,7 +2271,7 @@ virVMXGenerateDiskTarget(virDomainDiskDef *def, return -1; } - if (unit < 0 || unit > vmdef->scsiBusMaxUnit || unit == 7) { + if (unit < 0 || unit >= vmdef->scsiBusMaxUnit || unit == 7) { virReportError(VIR_ERR_INTERNAL_ERROR, _("SCSI unit index %1$d out of [0..6,8..%2$u] range"), unit, vmdef->scsiBusMaxUnit); diff --git a/tests/vmx2xmldata/esx-in-the-wild-11.xml b/tests/vmx2xmldata/esx-in-the-wild-11.xml index 981287bb4930..ded63c3345a4 100644 --- a/tests/vmx2xmldata/esx-in-the-wild-11.xml +++ b/tests/vmx2xmldata/esx-in-the-wild-11.xml @@ -29,7 +29,7 @@ </disk> <disk type='file' device='disk'> <source file='[datastore] directory/esx6.7-rhel7.7-x86_64_4.vmdk'/> - <target dev='sdbl' bus='scsi'/> + <target dev='sdbm' bus='scsi'/> <address type='drive' controller='1' bus='0' target='0' unit='0'/> </disk> <controller type='scsi' index='0' model='vmpvscsi'/> diff --git a/tests/vmx2xmldata/scsi-driver-max.vmx b/tests/vmx2xmldata/scsi-driver-max.vmx new file mode 100644 index 000000000000..eba4cefafcbb --- /dev/null +++ b/tests/vmx2xmldata/scsi-driver-max.vmx @@ -0,0 +1,50 @@ +config.version = "8" +virtualHW.version = "12" +scsi0.present = "true" +scsi0.virtualDev = "pvscsi" +scsi0:0.present = "true" +scsi0:0.deviceType = "scsi-hardDisk" +scsi0:0.fileName = "harddisk0.vmdk" +scsi0:1.present = "true" +scsi0:1.deviceType = "scsi-hardDisk" +scsi0:1.fileName = "harddisk1.vmdk" +scsi0:2.present = "true" +scsi0:2.deviceType = "scsi-hardDisk" +scsi0:2.fileName = "harddisk2.vmdk" +scsi0:3.present = "true" +scsi0:3.deviceType = "scsi-hardDisk" +scsi0:3.fileName = "harddisk3.vmdk" +scsi0:4.present = "true" +scsi0:4.deviceType = "scsi-hardDisk" +scsi0:4.fileName = "harddisk4.vmdk" +scsi0:5.present = "true" +scsi0:5.deviceType = "scsi-hardDisk" +scsi0:5.fileName = "harddisk5.vmdk" +scsi0:6.present = "true" +scsi0:6.deviceType = "scsi-hardDisk" +scsi0:6.fileName = "harddisk6.vmdk" +scsi0:8.present = "true" +scsi0:8.deviceType = "scsi-hardDisk" +scsi0:8.fileName = "harddisk8.vmdk" +scsi0:9.present = "true" +scsi0:9.deviceType = "scsi-hardDisk" +scsi0:9.fileName = "harddisk9.vmdk" +scsi0:10.present = "true" +scsi0:10.deviceType = "scsi-hardDisk" +scsi0:10.fileName = "harddisk10.vmdk" +scsi0:11.present = "true" +scsi0:11.deviceType = "scsi-hardDisk" +scsi0:11.fileName = "harddisk11.vmdk" +scsi0:12.present = "true" +scsi0:12.deviceType = "scsi-hardDisk" +scsi0:12.fileName = "harddisk12.vmdk" +scsi0:13.present = "true" +scsi0:13.deviceType = "scsi-hardDisk" +scsi0:13.fileName = "harddisk13.vmdk" +scsi0:14.present = "true" +scsi0:14.deviceType = "scsi-hardDisk" +scsi0:14.fileName = "harddisk14.vmdk" +scsi0:15.present = "true" +scsi0:15.deviceType = "scsi-hardDisk" +scsi0:15.fileName = "harddisk15.vmdk" +displayName = "test" diff --git a/tests/vmx2xmldata/scsi-driver-max.xml b/tests/vmx2xmldata/scsi-driver-max.xml new file mode 100644 index 000000000000..fa6c13396e2a --- /dev/null +++ b/tests/vmx2xmldata/scsi-driver-max.xml @@ -0,0 +1,95 @@ +<domain type='vmware'> + <name>test</name> + <uuid>00000000-0000-0000-0000-000000000000</uuid> + <memory unit='KiB'>32768</memory> + <currentMemory unit='KiB'>32768</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686'>hvm</type> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk0.vmdk'/> + <target dev='sda' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk1.vmdk'/> + <target dev='sdb' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='1'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk2.vmdk'/> + <target dev='sdc' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='2'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk3.vmdk'/> + <target dev='sdd' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='3'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk4.vmdk'/> + <target dev='sde' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='4'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk5.vmdk'/> + <target dev='sdf' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='5'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk6.vmdk'/> + <target dev='sdg' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='6'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk8.vmdk'/> + <target dev='sdh' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='8'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk9.vmdk'/> + <target dev='sdi' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='9'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk10.vmdk'/> + <target dev='sdj' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='10'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk11.vmdk'/> + <target dev='sdk' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='11'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk12.vmdk'/> + <target dev='sdl' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='12'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk13.vmdk'/> + <target dev='sdm' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='13'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk14.vmdk'/> + <target dev='sdn' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='14'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk15.vmdk'/> + <target dev='sdo' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='15'/> + </disk> + <controller type='scsi' index='0' model='vmpvscsi'/> + <video> + <model type='vmvga' vram='4096' primary='yes'/> + </video> + </devices> +</domain> diff --git a/tests/vmx2xmldata/scsi-driver-superwide-max.vmx b/tests/vmx2xmldata/scsi-driver-superwide-max.vmx new file mode 100644 index 000000000000..38df812be915 --- /dev/null +++ b/tests/vmx2xmldata/scsi-driver-superwide-max.vmx @@ -0,0 +1,197 @@ +config.version = "8" +virtualHW.version = "13" +scsi0.present = "true" +scsi0.virtualDev = "pvscsi" +scsi0:0.present = "true" +scsi0:0.deviceType = "scsi-hardDisk" +scsi0:0.fileName = "harddisk0.vmdk" +scsi0:1.present = "true" +scsi0:1.deviceType = "scsi-hardDisk" +scsi0:1.fileName = "harddisk1.vmdk" +scsi0:2.present = "true" +scsi0:2.deviceType = "scsi-hardDisk" +scsi0:2.fileName = "harddisk2.vmdk" +scsi0:3.present = "true" +scsi0:3.deviceType = "scsi-hardDisk" +scsi0:3.fileName = "harddisk3.vmdk" +scsi0:4.present = "true" +scsi0:4.deviceType = "scsi-hardDisk" +scsi0:4.fileName = "harddisk4.vmdk" +scsi0:5.present = "true" +scsi0:5.deviceType = "scsi-hardDisk" +scsi0:5.fileName = "harddisk5.vmdk" +scsi0:6.present = "true" +scsi0:6.deviceType = "scsi-hardDisk" +scsi0:6.fileName = "harddisk6.vmdk" +scsi0:8.present = "true" +scsi0:8.deviceType = "scsi-hardDisk" +scsi0:8.fileName = "harddisk8.vmdk" +scsi0:9.present = "true" +scsi0:9.deviceType = "scsi-hardDisk" +scsi0:9.fileName = "harddisk9.vmdk" +scsi0:10.present = "true" +scsi0:10.deviceType = "scsi-hardDisk" +scsi0:10.fileName = "harddisk10.vmdk" +scsi0:11.present = "true" +scsi0:11.deviceType = "scsi-hardDisk" +scsi0:11.fileName = "harddisk11.vmdk" +scsi0:12.present = "true" +scsi0:12.deviceType = "scsi-hardDisk" +scsi0:12.fileName = "harddisk12.vmdk" +scsi0:13.present = "true" +scsi0:13.deviceType = "scsi-hardDisk" +scsi0:13.fileName = "harddisk13.vmdk" +scsi0:14.present = "true" +scsi0:14.deviceType = "scsi-hardDisk" +scsi0:14.fileName = "harddisk14.vmdk" +scsi0:15.present = "true" +scsi0:15.deviceType = "scsi-hardDisk" +scsi0:15.fileName = "harddisk15.vmdk" +scsi0:16.present = "true" +scsi0:16.deviceType = "scsi-hardDisk" +scsi0:16.fileName = "harddisk16.vmdk" +scsi0:17.present = "true" +scsi0:17.deviceType = "scsi-hardDisk" +scsi0:17.fileName = "harddisk17.vmdk" +scsi0:18.present = "true" +scsi0:18.deviceType = "scsi-hardDisk" +scsi0:18.fileName = "harddisk18.vmdk" +scsi0:19.present = "true" +scsi0:19.deviceType = "scsi-hardDisk" +scsi0:19.fileName = "harddisk19.vmdk" +scsi0:20.present = "true" +scsi0:20.deviceType = "scsi-hardDisk" +scsi0:20.fileName = "harddisk20.vmdk" +scsi0:21.present = "true" +scsi0:21.deviceType = "scsi-hardDisk" +scsi0:21.fileName = "harddisk21.vmdk" +scsi0:22.present = "true" +scsi0:22.deviceType = "scsi-hardDisk" +scsi0:22.fileName = "harddisk22.vmdk" +scsi0:23.present = "true" +scsi0:23.deviceType = "scsi-hardDisk" +scsi0:23.fileName = "harddisk23.vmdk" +scsi0:24.present = "true" +scsi0:24.deviceType = "scsi-hardDisk" +scsi0:24.fileName = "harddisk24.vmdk" +scsi0:25.present = "true" +scsi0:25.deviceType = "scsi-hardDisk" +scsi0:25.fileName = "harddisk25.vmdk" +scsi0:26.present = "true" +scsi0:26.deviceType = "scsi-hardDisk" +scsi0:26.fileName = "harddisk26.vmdk" +scsi0:27.present = "true" +scsi0:27.deviceType = "scsi-hardDisk" +scsi0:27.fileName = "harddisk27.vmdk" +scsi0:28.present = "true" +scsi0:28.deviceType = "scsi-hardDisk" +scsi0:28.fileName = "harddisk28.vmdk" +scsi0:29.present = "true" +scsi0:29.deviceType = "scsi-hardDisk" +scsi0:29.fileName = "harddisk29.vmdk" +scsi0:30.present = "true" +scsi0:30.deviceType = "scsi-hardDisk" +scsi0:30.fileName = "harddisk30.vmdk" +scsi0:31.present = "true" +scsi0:31.deviceType = "scsi-hardDisk" +scsi0:31.fileName = "harddisk31.vmdk" +scsi0:32.present = "true" +scsi0:32.deviceType = "scsi-hardDisk" +scsi0:32.fileName = "harddisk32.vmdk" +scsi0:33.present = "true" +scsi0:33.deviceType = "scsi-hardDisk" +scsi0:33.fileName = "harddisk33.vmdk" +scsi0:34.present = "true" +scsi0:34.deviceType = "scsi-hardDisk" +scsi0:34.fileName = "harddisk34.vmdk" +scsi0:35.present = "true" +scsi0:35.deviceType = "scsi-hardDisk" +scsi0:35.fileName = "harddisk35.vmdk" +scsi0:36.present = "true" +scsi0:36.deviceType = "scsi-hardDisk" +scsi0:36.fileName = "harddisk36.vmdk" +scsi0:37.present = "true" +scsi0:37.deviceType = "scsi-hardDisk" +scsi0:37.fileName = "harddisk37.vmdk" +scsi0:38.present = "true" +scsi0:38.deviceType = "scsi-hardDisk" +scsi0:38.fileName = "harddisk38.vmdk" +scsi0:39.present = "true" +scsi0:39.deviceType = "scsi-hardDisk" +scsi0:39.fileName = "harddisk39.vmdk" +scsi0:40.present = "true" +scsi0:40.deviceType = "scsi-hardDisk" +scsi0:40.fileName = "harddisk40.vmdk" +scsi0:41.present = "true" +scsi0:41.deviceType = "scsi-hardDisk" +scsi0:41.fileName = "harddisk41.vmdk" +scsi0:42.present = "true" +scsi0:42.deviceType = "scsi-hardDisk" +scsi0:42.fileName = "harddisk42.vmdk" +scsi0:43.present = "true" +scsi0:43.deviceType = "scsi-hardDisk" +scsi0:43.fileName = "harddisk43.vmdk" +scsi0:44.present = "true" +scsi0:44.deviceType = "scsi-hardDisk" +scsi0:44.fileName = "harddisk44.vmdk" +scsi0:45.present = "true" +scsi0:45.deviceType = "scsi-hardDisk" +scsi0:45.fileName = "harddisk45.vmdk" +scsi0:46.present = "true" +scsi0:46.deviceType = "scsi-hardDisk" +scsi0:46.fileName = "harddisk46.vmdk" +scsi0:47.present = "true" +scsi0:47.deviceType = "scsi-hardDisk" +scsi0:47.fileName = "harddisk47.vmdk" +scsi0:48.present = "true" +scsi0:48.deviceType = "scsi-hardDisk" +scsi0:48.fileName = "harddisk48.vmdk" +scsi0:49.present = "true" +scsi0:49.deviceType = "scsi-hardDisk" +scsi0:49.fileName = "harddisk49.vmdk" +scsi0:50.present = "true" +scsi0:50.deviceType = "scsi-hardDisk" +scsi0:50.fileName = "harddisk50.vmdk" +scsi0:51.present = "true" +scsi0:51.deviceType = "scsi-hardDisk" +scsi0:51.fileName = "harddisk51.vmdk" +scsi0:52.present = "true" +scsi0:52.deviceType = "scsi-hardDisk" +scsi0:52.fileName = "harddisk52.vmdk" +scsi0:53.present = "true" +scsi0:53.deviceType = "scsi-hardDisk" +scsi0:53.fileName = "harddisk53.vmdk" +scsi0:54.present = "true" +scsi0:54.deviceType = "scsi-hardDisk" +scsi0:54.fileName = "harddisk54.vmdk" +scsi0:55.present = "true" +scsi0:55.deviceType = "scsi-hardDisk" +scsi0:55.fileName = "harddisk55.vmdk" +scsi0:56.present = "true" +scsi0:56.deviceType = "scsi-hardDisk" +scsi0:56.fileName = "harddisk56.vmdk" +scsi0:57.present = "true" +scsi0:57.deviceType = "scsi-hardDisk" +scsi0:57.fileName = "harddisk57.vmdk" +scsi0:58.present = "true" +scsi0:58.deviceType = "scsi-hardDisk" +scsi0:58.fileName = "harddisk58.vmdk" +scsi0:59.present = "true" +scsi0:59.deviceType = "scsi-hardDisk" +scsi0:59.fileName = "harddisk59.vmdk" +scsi0:60.present = "true" +scsi0:60.deviceType = "scsi-hardDisk" +scsi0:60.fileName = "harddisk60.vmdk" +scsi0:61.present = "true" +scsi0:61.deviceType = "scsi-hardDisk" +scsi0:61.fileName = "harddisk61.vmdk" +scsi0:62.present = "true" +scsi0:62.deviceType = "scsi-hardDisk" +scsi0:62.fileName = "harddisk62.vmdk" +scsi0:63.present = "true" +scsi0:63.deviceType = "scsi-hardDisk" +scsi0:63.fileName = "harddisk63.vmdk" +scsi0:64.present = "true" +scsi0:64.deviceType = "scsi-hardDisk" +scsi0:64.fileName = "harddisk63.vmdk" +displayName = "test" diff --git a/tests/vmx2xmldata/scsi-driver-superwide-max.xml b/tests/vmx2xmldata/scsi-driver-superwide-max.xml new file mode 100644 index 000000000000..2e4bc0b2ef67 --- /dev/null +++ b/tests/vmx2xmldata/scsi-driver-superwide-max.xml @@ -0,0 +1,340 @@ +<domain type='vmware'> + <name>test</name> + <uuid>00000000-0000-0000-0000-000000000000</uuid> + <memory unit='KiB'>32768</memory> + <currentMemory unit='KiB'>32768</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686'>hvm</type> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk0.vmdk'/> + <target dev='sda' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk1.vmdk'/> + <target dev='sdb' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='1'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk2.vmdk'/> + <target dev='sdc' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='2'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk3.vmdk'/> + <target dev='sdd' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='3'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk4.vmdk'/> + <target dev='sde' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='4'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk5.vmdk'/> + <target dev='sdf' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='5'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk6.vmdk'/> + <target dev='sdg' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='6'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk8.vmdk'/> + <target dev='sdh' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='8'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk9.vmdk'/> + <target dev='sdi' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='9'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk10.vmdk'/> + <target dev='sdj' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='10'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk11.vmdk'/> + <target dev='sdk' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='11'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk12.vmdk'/> + <target dev='sdl' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='12'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk13.vmdk'/> + <target dev='sdm' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='13'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk14.vmdk'/> + <target dev='sdn' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='14'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk15.vmdk'/> + <target dev='sdo' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='15'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk16.vmdk'/> + <target dev='sdp' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='16'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk17.vmdk'/> + <target dev='sdq' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='17'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk18.vmdk'/> + <target dev='sdr' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='18'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk19.vmdk'/> + <target dev='sds' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='19'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk20.vmdk'/> + <target dev='sdt' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='20'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk21.vmdk'/> + <target dev='sdu' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='21'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk22.vmdk'/> + <target dev='sdv' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='22'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk23.vmdk'/> + <target dev='sdw' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='23'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk24.vmdk'/> + <target dev='sdx' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='24'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk25.vmdk'/> + <target dev='sdy' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='25'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk26.vmdk'/> + <target dev='sdz' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='26'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk27.vmdk'/> + <target dev='sdaa' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='27'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk28.vmdk'/> + <target dev='sdab' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='28'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk29.vmdk'/> + <target dev='sdac' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='29'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk30.vmdk'/> + <target dev='sdad' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='30'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk31.vmdk'/> + <target dev='sdae' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='31'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk32.vmdk'/> + <target dev='sdaf' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='32'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk33.vmdk'/> + <target dev='sdag' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='33'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk34.vmdk'/> + <target dev='sdah' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='34'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk35.vmdk'/> + <target dev='sdai' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='35'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk36.vmdk'/> + <target dev='sdaj' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='36'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk37.vmdk'/> + <target dev='sdak' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='37'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk38.vmdk'/> + <target dev='sdal' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='38'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk39.vmdk'/> + <target dev='sdam' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='39'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk40.vmdk'/> + <target dev='sdan' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='40'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk41.vmdk'/> + <target dev='sdao' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='41'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk42.vmdk'/> + <target dev='sdap' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='42'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk43.vmdk'/> + <target dev='sdaq' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='43'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk44.vmdk'/> + <target dev='sdar' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='44'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk45.vmdk'/> + <target dev='sdas' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='45'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk46.vmdk'/> + <target dev='sdat' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='46'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk47.vmdk'/> + <target dev='sdau' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='47'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk48.vmdk'/> + <target dev='sdav' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='48'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk49.vmdk'/> + <target dev='sdaw' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='49'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk50.vmdk'/> + <target dev='sdax' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='50'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk51.vmdk'/> + <target dev='sday' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='51'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk52.vmdk'/> + <target dev='sdaz' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='52'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk53.vmdk'/> + <target dev='sdba' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='53'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk54.vmdk'/> + <target dev='sdbb' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='54'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk55.vmdk'/> + <target dev='sdbc' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='55'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk56.vmdk'/> + <target dev='sdbd' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='56'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk57.vmdk'/> + <target dev='sdbe' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='57'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk58.vmdk'/> + <target dev='sdbf' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='58'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk59.vmdk'/> + <target dev='sdbg' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='59'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk60.vmdk'/> + <target dev='sdbh' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='60'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk61.vmdk'/> + <target dev='sdbi' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='61'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk62.vmdk'/> + <target dev='sdbj' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='62'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk63.vmdk'/> + <target dev='sdbk' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='63'/> + </disk> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk63.vmdk'/> + <target dev='sdbl' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='64'/> + </disk> + <controller type='scsi' index='0' model='vmpvscsi'/> + <video> + <model type='vmvga' vram='4096' primary='yes'/> + </video> + </devices> +</domain> diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c index 3ffc04fda42f..585ef00bd654 100644 --- a/tests/vmx2xmltest.c +++ b/tests/vmx2xmltest.c @@ -151,6 +151,8 @@ mymain(void) DO_TEST("graphics-vnc"); DO_TEST("scsi-driver"); + DO_TEST("scsi-driver-max"); + DO_TEST("scsi-driver-superwide-max"); DO_TEST("scsi-writethrough"); DO_TEST("harddisk-scsi-file"); -- 2.54.0

2 1

[PATCH v3 00/35] monitor: turn QMP and HMP into QOM objects
by Daniel P. Berrangé 19 Jun '26

19 Jun '26

Conceptually -object and object_add/object_del should be sufficient for essentially all QEMU configuration....if only we ported all our internal custom backends/devices/etc to QOM. That is of course a big job which is why it hasn't happened. This series started with the premise that the monitor is one of the easier areas to convert since we have no more than three classes, a common base, and QMP and HMP subclasses[1]. So why not give it a go and thus unlock the ability to dynamically create/delete monitors in QMP/HMP. This series does the conversion in a great many small steps to better understand the implications at each stage. The high level outcome of this series is * HMP and QMP monitors are QOM objects, 'monitor-hmp' and 'monitor-qmp' respectively * Both can be cold plugged and hot plugged. QMP only, can also be hot unplugged. * '-mon' is obsolete, deprecated and replaced by '-object', but -monitor, -qmp and kept as high level syntax sugar * QMP gains a concept of "close-action" which makes it possible to mark a monitor for auto-delete. The monitor hot-unplug code and the qtest and functional testing code is heavily derived from a series sent by Christian Brauner which proposed new monitor_add/monitor_del commands: https://lists.nongnu.org/archive/html/qemu-devel/2026-04/msg01349.html I left Christian's authorship & SoB on the patches which were derived from his code, though the code has been refactored quite a bit in places, so bugs are quite possibly my own. Note that Christian's series allowed the use of "monitor_del" commands against the current monitor session. ie a client could delete the very monitor it was using. This is an awkward concept as it needs special casing to delay the deletion to happen in the background, such that that the QMP response to 'monitor_del' could still be sent back. This also left the chardev was orphaned as there's no way to run 'chardev_dev' in that usage pattern. To provide an alternative mechanism to address the same use case, this series introduces the 'close-action' concept mentioned above, that allows hotplugging a monitor to service a specific task, with the monitor being purged when the script closes its connection. This avoids the special casing that an explicit "self deletion" paradigm required. While supporting hotplug of HMP was trivial, I didn't do any work to think about hotunplug of HMP, since IMHO it is of limited value given HMP's typical use cases. [1] ~~~ we did all this not because it was easy, but because we thought it would be easy ~~~ Changed in v3: - Removed unused 'dead' struct field - Make use of 'setup_pending' struct field across BH - Add missing free of chardev_id - Add missnig ERRP_GUARD in monitor_new_qmp - Misc docs typos / rephrasing - Moved docs patch to the end - Fixed docs about the default QOM ID naming for legacy monitor syntax - Fixed random sleep time calculation in tests Christian Brauner (6): monitor: convert from oneshot BH to persistent BH monitor: reject attempts to delete the current monitor monitor: protect qemu_chr_fe_accept_input with monitor lock monitor: implement support for deleting QMP objects tests/qtest: add tests for dynamic monitor add/remove tests/functional: add e2e test for dynamic QMP monitor hotplug Daniel P. Berrangé (29): qom: replace 'can_be_deleted' with 'prepare_delete' monitor: replace 'common' with 'parent_obj' in MonitorHMP monitor: replace 'common' with 'parent_obj' in MonitorQMP monitor: rename monitor_init* to monitor_new* monitor: minimal conversion of monitors to QOM monitor: add 'chardev' property to Monitor base class monitor: add 'readline' property to HMP Monitor class monitor: add 'pretty' property to QMP Monitor class monitor: remove 'skip_flush' field monitor: move monitor_data_(init|destroy) into QOM init/finalize monitor: use class methods for monitor_vprintf monitor: use class methods for monitor_qapi_event_emit monitor: use class methods for monitor_accept_input monitor: use class method for I/O thread request monitor: use dynamic cast in monitor_qmp_requests_pop_any_with_lock util: use dynamic cast in error vreport monitor: drop unused monitor_cur_is_qmp monitor: use dynamic cast in QMP commands monitor: use dynamic cast in monitor_is_hmp_non_interactive monitor: drop unused monitor_is_qmp method monitor: eliminate monitor_is_hmp_non_interactive method monitor: implement "user creatable" interface for adding monitors tests/functional: add a stress test for monitor hot unplug qom: add method for getting the "id" of a QOM object qom: add trace events for user creatable create/delete APIs monitor: add support for auto-deleting monitors upon close tests: switch from -mon to -object monitor-qmp qemu-options: document new monitor-hmp and monitor-qmp objects docs: mark '-mon' as deprecated in favour of -object MAINTAINERS | 1 + backends/cryptodev.c | 10 +- backends/hostmem.c | 5 +- backends/iommufd.c | 10 +- block/throttle-groups.c | 10 +- chardev/char.c | 3 +- docs/about/deprecated.rst | 10 + docs/devel/writing-monitor-commands.rst | 4 +- docs/system/arm/xenpvh.rst | 4 +- docs/system/i386/xen.rst | 3 +- docs/system/i386/xenpvh.rst | 4 +- event-loop-base.c | 8 +- gdbstub/system.c | 4 +- include/monitor/monitor.h | 23 +- include/qom/object.h | 10 + include/qom/object_interfaces.h | 26 +- include/system/event-loop-base.h | 2 +- migration/migration-hmp-cmds.c | 5 +- monitor/hmp-cmds.c | 7 +- monitor/hmp.c | 181 +++++++++-- monitor/monitor-internal.h | 73 +++-- monitor/monitor.c | 262 +++++++-------- monitor/qmp-cmds-control.c | 12 +- monitor/qmp-cmds.c | 14 +- monitor/qmp.c | 303 +++++++++++++++--- net/can/can_core.c | 5 +- python/qemu/machine/machine.py | 4 +- qapi/qom.json | 62 ++++ qemu-options.hx | 57 +++- qom/object.c | 17 + qom/object_interfaces.c | 20 +- qom/trace-events | 5 + storage-daemon/qemu-storage-daemon.c | 2 +- stubs/monitor-core.c | 5 - stubs/monitor-internal.c | 3 +- system/vl.c | 12 +- tests/functional/generic/meson.build | 1 + .../generic/test_monitor_hotplug.py | 277 ++++++++++++++++ tests/qemu-iotests/245 | 4 +- tests/qtest/libqtest.c | 2 +- tests/qtest/qmp-test.c | 174 ++++++++++ tests/unit/test-util-sockets.c | 1 - tools/qemu-vnc/stubs.c | 5 - ui/ui-hmp-cmds.c | 2 +- util/error-report.c | 13 +- util/main-loop.c | 5 +- 46 files changed, 1343 insertions(+), 327 deletions(-) create mode 100755 tests/functional/generic/test_monitor_hotplug.py -- 2.54.0

2 43

[PATCH v3 0/8] API introspection and prevent accidental disk shrink via 'virDomainBlockResize'
by Peter Krempa 19 Jun '26

19 Jun '26

v2 got: Reviewed-by: Ján Tomko <jtomko(a)redhat.com> but I've made the following changes so I'm sending it out for review once again: - rebased on top of Laine's API - added a typed parameter argument for future expansion - added documentation for the XML Patches 1/8 and 8/8 are new in the series. The rest is v3 of the last posting with aforementioned changes and rebase. Peter Krempa (8): qemu: driver: Fix coding style after 'qemuDomainAnnounceInterface' API: Introduce 'virConnectGetIntrospection' virsh: Introduce 'introspection' command which uses 'virConnectGetIntrospection' scripts: Introduce 'getintrospection' script qemu: Implement 'virConnectGetIntrospection' introspection: Add introspection of input typed parameters virsh: blockresize: Use VIR_DOMAIN_BLOCK_RESIZE_EXTEND when available and introduce --allow-shrink docs: Add documentation for introspection XML docs/docs.rst | 1 + docs/formatintrospection.rst | 90 +++++++++ docs/manpages/virsh.rst | 30 ++- docs/meson.build | 1 + include/libvirt/libvirt-host.h | 5 + scripts/genintrospection.py | 345 +++++++++++++++++++++++++++++++++ scripts/meson.build | 1 + src/driver-hypervisor.h | 7 + src/libvirt-host.c | 48 +++++ src/libvirt_private.syms | 5 + src/libvirt_public.syms | 1 + src/qemu/meson.build | 18 ++ src/qemu/qemu_driver.c | 29 ++- src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 21 +- src/remote_protocol-structs | 11 ++ src/rpc/gendispatch.pl | 4 +- src/util/meson.build | 1 + src/util/virintrospection.c | 82 ++++++++ src/util/virintrospection.h | 20 ++ tools/virsh-domain.c | 59 ++++++ tools/virsh-host.c | 43 ++++ 22 files changed, 817 insertions(+), 6 deletions(-) create mode 100644 docs/formatintrospection.rst create mode 100755 scripts/genintrospection.py create mode 100644 src/util/virintrospection.c create mode 100644 src/util/virintrospection.h -- 2.54.0

1 8

[PATCH v3] lxc: Assign aliases to filesystem and network devices
by rsmigiel＠redhat.com 19 Jun '26

19 Jun '26

This patch addresses the missing device alias assignment for filesystem and network interface devices in LXC domains. Before this patch, virsh dumpxml showed filesystem and network devices without aliases: <filesystem type='mount' accessmode='passthrough'> <source dir='/shared6'/> <target dir='/shared6'/> </filesystem> <interface type='bridge'> <mac address='b8:3f:d2:c9:e8:bd'/> <source bridge='br0'/> <target dev='vnet8'/> <model type='virtio'/> </interface> After this patch, filesystem devices have auto-generated aliases: <filesystem type='mount' accessmode='passthrough'> <source dir='/shared6'/> <target dir='/shared6'/> <alias name='fs1'/>  </filesystem> <interface type='bridge'> <mac address='b8:3f:d2:c9:e8:bd'/> <source bridge='br0'/> <target dev='vnet8'/> <model type='virtio'/> <alias name='net4'/>  </interface> Changes in v3: - Implemented new index allocation algorithm, scans existing aliases before new index allocation - Added hotplug support in lxcDomainAttachDeviceNetLive() - Handles gaps in numbering after device detach/attach - Follows QEMU's qemuAssignDeviceNetAlias() pattern - Tested hotplug scenario The implementation follows the same pattern used by QEMU's qemuAssignDeviceNetAlias() and qemuAssignDeviceFSAlias(). This is needed as a prerequisite for fixing bug #63 (loop device path length limitation), where device aliases will be used to compose synthetic lo_file_name references in the format "libvirt-$UUID-$DEVALIAS".

1 1

[PATCH 00/14] qemu: fix lock/log daemon shutdown ordering and issues with locking in paused VMs
by Peter Krempa 18 Jun '26

18 Jun '26

Patch 1 fixes ordering of shutdown of the helper daemons virtlogd/virtlockd. The rest of the series addresses few issues with locking of disk images via lockd/sanlock in terms of hotplug to a paused VM. The patches also prevent combination of automatic disk locking and blockjobs because it was historically broken and the usage of that is minimal, we thus just enforce the safe state. Peter Krempa (14): qemu: Ensure proper shutdown ordering of virtlockd/virtlogd daemons qemuDomainAttachLease: Directly insert the lease Remove virDomainLeaseInsertPreAlloc/virDomainLeaseInsertPreAlloced qemu.conf: Explain that no locking happens if 'lock_manager' is unset virDomainLeaseDefParseXML: Report error if '<lockspace>' element is missing virDomainLeaseDefParseXML: Avoid unneeded temporary variables qemuxmlconftest: Add <lease> with missing offset locking: Debug lockspace creation lock_daemon: Log arguments for all dispatched APIs lockd driver: Allow registering additional lockspaces for manual <lease>s qemu: hotplug: Don't acquire lock on hotplugged <lease> when VM is paused locking: Add API to query whether automatic disk leases are enabled qemu: Refuse block jobs if automatic disk leases are enabled in the locking plugin qemu: Fix lock manager usage for disks src/conf/domain_conf.c | 38 ++++--------- src/conf/domain_conf.h | 4 +- src/libvirt_private.syms | 3 +- src/locking/libvirt_lockd.aug | 8 +++ src/locking/lock_daemon.c | 3 + src/locking/lock_daemon_dispatch.c | 24 +++++++- src/locking/lock_driver.h | 10 ++++ src/locking/lock_driver_lockd.c | 22 ++++++++ src/locking/lock_driver_sanlock.c | 9 +++ src/locking/lock_manager.c | 10 ++++ src/locking/lock_manager.h | 2 + src/locking/lockd.conf | 14 +++++ src/locking/sanlock.conf | 4 ++ src/locking/test_libvirt_lockd.aug.in | 4 ++ src/qemu/qemu.conf.in | 5 ++ src/qemu/qemu_backup.c | 2 +- src/qemu/qemu_block.c | 2 +- src/qemu/qemu_checkpoint.c | 2 +- src/qemu/qemu_domain.c | 21 +++---- src/qemu/qemu_domain.h | 3 +- src/qemu/qemu_driver.c | 4 +- src/qemu/qemu_hotplug.c | 56 +++++++++++++++---- src/qemu/qemu_snapshot.c | 25 +++++---- src/qemu/virtqemud.service.extra.in | 4 ++ src/remote/libvirtd.service.in | 4 ++ src/util/virlockspace.c | 6 +- tests/qemuxmlconfdata/lease.x86_64-latest.xml | 5 ++ tests/qemuxmlconfdata/lease.xml | 5 ++ 28 files changed, 221 insertions(+), 78 deletions(-) -- 2.54.0

2 20

[PATCH 1/1] qemu: stop silently narrowing the guest CPU during live migration
by Denis V. Lunev 18 Jun '26

18 Jun '26

qemuDomainMakeCPUMigratable() strips features marked added='yes' (in src/cpu_map/x86_*.xml) from the migration cookie when the source CPU was specified as host-model. The intent was libvirt-protocol compat with older destinations; the cost is guest CPU compat, paid silently on every migration. Every Intel x86 CPU model from Westmere through Sapphire Rapids carries 60+ added='yes' features, including vmx-exit-load-perf-global-ctrl and vmx-entry-load-perf-global-ctrl that control the LOAD_IA32_PERF_GLOBAL_CTRL allowed-1 bits of MSR_IA32_VMX_{EXIT,ENTRY}_CTLS. A host-model live migration on any of these models drops those features from the destination's qemu argv. Modern qemu gates the nested VMX capability MSRs on the explicit -cpu list, so the guest's MSR view shifts. Linux distributions that load kvm_intel by default snapshot those MSRs at module-load time and validate every newly online CPU against that snapshot. An automated test that boots a guest, live-migrates it, and hot-plugs additional vCPUs reliably trips kvm_intel: Inconsistent VMCS config on CPU N kvm: enabling virtualization on CPUN failed smpboot: CPU N is now offline the guest agent's online attempt returns -EIO and the hot-plug fails. Live migration must preserve the guest's CPU specification bit for bit -- this is a hard contract, not an optimisation target. Drop the strip. If a destination libvirt does not know a feature in the cookie, its parser rejects the migration with a precise unknown-feature error: operators can upgrade or narrow the source CPU definition. Either is visible; the status quo is not. This effectively reverts 14d3517410 ("qemu: domain: Drop added features from migratable CPU") together with its follow-up aae8a5774b ("qemu: Drop vmx-* from migratable CPU model only when origCPU is set"), and removes the now-unused origCPU plumbing in qemuDomainMakeCPUMigratable() and its callers. Signed-off-by: Denis V. Lunev <den(a)openvz.org> --- src/qemu/qemu_domain.c | 46 ++------------------------------ src/qemu/qemu_domain.h | 3 +-- src/qemu/qemu_migration_cookie.c | 5 +--- 3 files changed, 4 insertions(+), 50 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 84c8645259..eccd279bbe 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5307,36 +5307,10 @@ qemuDomainDefCopy(virQEMUDriver *driver, } -typedef struct { - const char * const *added; - GStrv keep; -} qemuDomainDropAddedCPUFeaturesData; - - -static bool -qemuDomainDropAddedCPUFeatures(const char *name, - virCPUFeaturePolicy policy G_GNUC_UNUSED, - void *opaque) -{ - qemuDomainDropAddedCPUFeaturesData *data = opaque; - - if (!g_strv_contains(data->added, name)) - return true; - - if (data->keep && g_strv_contains((const char **) data->keep, name)) - return true; - - return false; -} - - int qemuDomainMakeCPUMigratable(virArch arch, - virCPUDef *cpu, - virCPUDef *origCPU) + virCPUDef *cpu) { - qemuDomainDropAddedCPUFeaturesData data = { 0 }; - if (cpu->mode != VIR_CPU_MODE_CUSTOM || !cpu->model || !ARCH_IS_X86(arch)) @@ -5353,22 +5327,6 @@ qemuDomainMakeCPUMigratable(virArch arch, virCPUDefUpdateFeature(cpu, "pconfig", VIR_CPU_FEATURE_DISABLE); } - if (origCPU) { - if (virCPUx86GetAddedFeatures(cpu->model, &data.added) < 0) - return -1; - - /* Drop features marked as added in a cpu model, but only - * when they are not mentioned in origCPU, i.e., when they were not - * explicitly mentioned by the user. - */ - if (data.added) { - g_auto(GStrv) keep = virCPUDefListExplicitFeatures(origCPU); - data.keep = keep; - - virCPUDefFilterFeatures(cpu, qemuDomainDropAddedCPUFeatures, &data); - } - } - return 0; } @@ -5569,7 +5527,7 @@ qemuDomainDefFormatBufInternal(virQEMUDriver *driver, } if (def->cpu && - qemuDomainMakeCPUMigratable(def->os.arch, def->cpu, origCPU) < 0) + qemuDomainMakeCPUMigratable(def->os.arch, def->cpu) < 0) return -1; /* Old libvirt doesn't understand <audio> elements so diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index b321a64e96..0600af8b7c 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -1066,8 +1066,7 @@ qemuDomainValidateActualNetDef(const virDomainNetDef *net, int qemuDomainMakeCPUMigratable(virArch arch, - virCPUDef *cpu, - virCPUDef *origCPU); + virCPUDef *cpu); int qemuDomainInitializePflashStorageSource(virDomainObj *vm, diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_cookie.c index 7311a8294b..ebc2072ab0 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -535,15 +535,12 @@ static int qemuMigrationCookieAddCPU(qemuMigrationCookie *mig, virDomainObj *vm) { - qemuDomainObjPrivate *priv = vm->privateData; - if (mig->cpu) return 0; mig->cpu = virCPUDefCopy(vm->def->cpu); - if (qemuDomainMakeCPUMigratable(vm->def->os.arch, mig->cpu, - priv->origCPU) < 0) + if (qemuDomainMakeCPUMigratable(vm->def->os.arch, mig->cpu) < 0) return -1; mig->flags |= QEMU_MIGRATION_COOKIE_CPU; -- 2.51.0

4 7

[PATCH v2] qemu: stop silently narrowing the guest CPU during live migration
by Denis V. Lunev 18 Jun '26

18 Jun '26

qemuDomainMakeCPUMigratable() strips the features that a CPU model marks as added (in src/cpu_map/x86_*.xml) from the migratable definition unless the user requested them explicitly. This keeps a custom CPU migratable to an older destination libvirt whose copy of the model does not know those features yet. A host-model CPU gains nothing from this and is actively harmed by it. By the time it reaches this function host-model has already been expanded into an explicit custom model that is exactly what we ask QEMU for on the source, and host-model is not guaranteed to migrate to an older libvirt in the first place. Stripping the added features only narrows the guest CPU silently on the destination. Every Intel model from Westmere through Sapphire Rapids marks vmx-exit-load-perf-global-ctrl and vmx-entry-load-perf-global-ctrl as added. These control the LOAD_IA32_PERF_GLOBAL_CTRL allowed-1 bits of the MSR_IA32_VMX_{EXIT,ENTRY}_CTLS MSRs, which modern QEMU only advertises when the features are present on the -cpu command line. After a host-model live migration the destination QEMU is started without them, so a nested guest observes different VMX capability MSRs than it did before the migration. A guest that snapshots those MSRs at kvm_intel module load and validates every newly onlined CPU against the snapshot -- Linux does exactly that -- then refuses to bring up a vCPU hot-plugged after the migration: kvm_intel: Inconsistent VMCS config on CPU N kvm: enabling virtualization on CPUN failed smpboot: CPU N is now offline and the guest agent's online attempt returns -EIO. Treat a host-model CPU's features as explicitly requested by building the keep list from the already expanded definition rather than from origCPU. Custom CPUs are unaffected, so their migration compatibility with older destinations is preserved. Signed-off-by: Denis V. Lunev <den(a)openvz.org> --- v1 -> v2: instead of dropping the added-feature stripping altogether (v1), keep it and only stop applying it to a host-model CPU. Custom CPUs still rely on the stripping to stay migratable to an older destination libvirt, which v1 regressed. src/qemu/qemu_domain.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index a43a5c0e4f..e1b805d906 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5373,12 +5373,18 @@ qemuDomainMakeCPUMigratable(virArch arch, if (virCPUx86GetAddedFeatures(cpu->model, &data.added) < 0) return -1; - /* Drop features marked as added in a cpu model, but only - * when they are not mentioned in origCPU, i.e., when they were not - * explicitly mentioned by the user. - */ + /* Drop features marked as added in a CPU model unless they were + * explicitly requested, so the migratable definition stays + * compatible with destinations that do not know them. For host-model + * the expanded definition is itself the requested CPU, so keep all of + * its features; for a custom CPU keep only those listed in origCPU. */ if (data.added) { - g_auto(GStrv) keep = virCPUDefListExplicitFeatures(origCPU); + g_auto(GStrv) keep = NULL; + + if (origCPU->mode == VIR_CPU_MODE_HOST_MODEL) + keep = virCPUDefListExplicitFeatures(cpu); + else + keep = virCPUDefListExplicitFeatures(origCPU); data.keep = keep; virCPUDefFilterFeatures(cpu, qemuDomainDropAddedCPUFeatures, &data); -- 2.53.0

1 0

[PATCH 0/2] qemu: Fix error reporting when QEMU capability probing fails
by Peter Krempa 18 Jun '26

18 Jun '26

See both patches for explanation and examples. Peter Krempa (2): qemuProcessQMPStop: Preserve error when killing qemu used for capability probing virQEMUCapsLogProbeFailure: Reraise error with more information src/qemu/qemu_capabilities.c | 4 ++++ src/qemu/qemu_process.c | 4 ++++ 2 files changed, 8 insertions(+) -- 2.54.0

2 3

[PATCH v2 00/35] monitor: turn QMP and HMP into QOM objects
by Daniel P. Berrangé 18 Jun '26

18 Jun '26

Conceptually -object and object_add/object_del should be sufficient for essentially all QEMU configuration....if only we ported all our internal custom backends/devices/etc to QOM. That is of course a big job which is why it hasn't happened. This series started with the premise that the monitor is one of the easier areas to convert since we have no more than three classes, a common base, and QMP and HMP subclasses[1]. So why not give it a go and thus unlock the ability to dynamically create/delete monitors in QMP/HMP. This series does the conversion in a great many small steps to better understand the implications at each stage. The high level outcome of this series is * HMP and QMP monitors are QOM objects, 'monitor-hmp' and 'monitor-qmp' respectively * Both can be cold plugged and hot plugged. QMP only, can also be hot unplugged. * '-mon' is obsolete, deprecated and replaced by '-object', but -monitor, -qmp and kept as high level syntax sugar * QMP gains a concept of "close-action" which makes it possible to mark a monitor for auto-delete. The monitor hot-unplug code and the qtest and functional testing code is heavily derived from a series sent by Christian Brauner which proposed new monitor_add/monitor_del commands: https://lists.nongnu.org/archive/html/qemu-devel/2026-04/msg01349.html I left Christian's authorship & SoB on the patches which were derived from his code, though the code has been refactored quite a bit in places, so bugs are quite possibly my own. Christian, if you prefer any changes in attribution here let me know. Note that Christian's series allowed the use of "monitor_del" commands against the current monitor session. ie a client could delete the very monitor it was using. This is an awkward concept as it needs special casing to delay the deletion to happen in the background, such that that the QMP response to 'monitor_del' could still be sent back. This also left the chardev was orphaned as there's no way to run 'chardev_dev' in that usage pattern. To provide an alternative mechanism to address the same use case, this series introduces the 'close-action' concept mentioned above, that allows hotplugging a monitor to service a specific task, with the monitor being purged when the script closes its connection. This avoids the special casing that an explicit "self deletion" paradigm required. While supporting hotplug of HMP was trivial, I didn't do any work to think about hotunplug of HMP, since IMHO it is of limited value given HMP's typical use cases. While -mon is deprecated in favour of -object, given '-mon' is such a significant CLI option, it is likely wise to not remove it as quickly as our deprecation policy would otherwise allow given the disruption that's liable to cause. It isn't a big burden to keep it around for a long time. [1] ~~~ we did all this not because it was easy, but because we thought it would be easy ~~~ Christian Brauner (6): monitor: convert from oneshot BH to persistent BH monitor: reject attempts to delete the current monitor monitor: protect qemu_chr_fe_accept_input with monitor lock monitor: implement support for deleting QMP objects tests/qtest: add tests for dynamic monitor add/remove tests/functional: add e2e test for dynamic QMP monitor hotplug Daniel P. Berrangé (29): qom: replace 'can_be_deleted' with 'prepare_delete' monitor: replace 'common' with 'parent_obj' in MonitorHMP monitor: replace 'common' with 'parent_obj' in MonitorQMP monitor: rename monitor_init* to monitor_new* monitor: minimal conversion of monitors to QOM monitor: add 'chardev' property to Monitor base class monitor: add 'readline' property to HMP Monitor class monitor: add 'pretty' property to QMP Monitor class monitor: remove 'skip_flush' field monitor: move monitor_data_(init|destroy) into QOM init/finalize monitor: use class methods for monitor_vprintf monitor: use class methods for monitor_qapi_event_emit monitor: use class methods for monitor_accept_input monitor: use class method for I/O thread request monitor: use dynamic cast in monitor_qmp_requests_pop_any_with_lock util: use dynamic cast in error vreport monitor: drop unused monitor_cur_is_qmp monitor: use dynamic cast in QMP commands monitor: use dynamic cast in monitor_is_hmp_non_interactive monitor: drop unused monitor_is_qmp method monitor: eliminate monitor_is_hmp_non_interactive method monitor: implement "user creatable" interface for adding monitors qemu-options: document new monitor-hmp and monitor-qmp objects tests/functional: add a stress test for monitor hot unplug qom: add method for getting the "id" of a QOM object qom: add trace events for user creatable create/delete APIs monitor: add support for auto-deleting monitors upon close tests: switch from -mon to -object monitor-qmp docs: mark '-mon' as deprecated in favour of -object MAINTAINERS | 1 + backends/cryptodev.c | 10 +- backends/hostmem.c | 5 +- backends/iommufd.c | 10 +- block/throttle-groups.c | 10 +- chardev/char.c | 3 +- docs/about/deprecated.rst | 10 + docs/devel/writing-monitor-commands.rst | 4 +- docs/system/arm/xenpvh.rst | 4 +- docs/system/i386/xen.rst | 3 +- docs/system/i386/xenpvh.rst | 4 +- event-loop-base.c | 8 +- gdbstub/system.c | 4 +- include/monitor/monitor.h | 23 +- include/qom/object.h | 10 + include/qom/object_interfaces.h | 26 +- include/system/event-loop-base.h | 2 +- migration/migration-hmp-cmds.c | 5 +- monitor/hmp-cmds.c | 7 +- monitor/hmp.c | 181 +++++++++-- monitor/monitor-internal.h | 74 +++-- monitor/monitor.c | 261 +++++++-------- monitor/qmp-cmds-control.c | 12 +- monitor/qmp-cmds.c | 14 +- monitor/qmp.c | 301 +++++++++++++++--- net/can/can_core.c | 5 +- python/qemu/machine/machine.py | 4 +- qapi/qom.json | 62 ++++ qemu-options.hx | 53 ++- qom/object.c | 17 + qom/object_interfaces.c | 20 +- qom/trace-events | 5 + storage-daemon/qemu-storage-daemon.c | 2 +- stubs/monitor-core.c | 5 - stubs/monitor-internal.c | 3 +- system/vl.c | 12 +- tests/functional/generic/meson.build | 1 + .../generic/test_monitor_hotplug.py | 275 ++++++++++++++++ tests/qemu-iotests/245 | 4 +- tests/qtest/libqtest.c | 2 +- tests/qtest/qmp-test.c | 174 ++++++++++ tests/unit/test-util-sockets.c | 1 - tools/qemu-vnc/stubs.c | 5 - ui/ui-hmp-cmds.c | 2 +- util/error-report.c | 13 +- util/main-loop.c | 5 +- 46 files changed, 1335 insertions(+), 327 deletions(-) create mode 100755 tests/functional/generic/test_monitor_hotplug.py -- 2.54.0

2 76

[PATCH 0/3] lxc: Misc cleanups
by Michal Privoznik 18 Jun '26

18 Jun '26

While reviewing Radoslaw's patched [1] I've noticed some opportunities for improvement. 1: https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/2HH7… Michal Prívozník (3): lxc: Drop pointless g_free() from virLXCProcessStart() lxc: Don't leak @veth in lxcDomainAttachDeviceNetLive() lxc: Rework cleanup section in lxcDomainAttachDeviceNetLive() src/lxc/lxc_driver.c | 30 ++++++++++++++---------------- src/lxc/lxc_process.c | 1 - 2 files changed, 14 insertions(+), 17 deletions(-) -- 2.53.0

2 4