LGTM
On 9/25/25 20:07, Andrea Bolognani via Devel wrote:
> That obviously doesn't make sense, since the value is used
> to indicate the absence of a USB controller.
>
> Signed-off-by: Andrea Bolognani <abologna@redhat.com>
> ---
> src/qemu/qemu_alias.c | 3 +++
> .../qemuhotplug-base-ccw-live+ccw-virtio.xml | 4 +---
> ...g-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml | 4 +---
> .../qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml | 4 +---
> ...ug-base-ccw-live-with-ccw-virtio+ccw-virtio-2-explicit.xml | 4 +---
> ...qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml | 4 +---
> .../qemuhotplug-base-ccw-live-with-ccw-virtio.xml | 4 +---
> tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml | 4 +---
> 8 files changed, 10 insertions(+), 21 deletions(-)
>
> diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c
> index a27c688d79..b0bc057bd1 100644
> --- a/src/qemu/qemu_alias.c
> +++ b/src/qemu/qemu_alias.c
> @@ -184,6 +184,9 @@ qemuAssignDeviceControllerAlias(virDomainDef *domainDef,
> return;
> }
> } else if (controller->type == VIR_DOMAIN_CONTROLLER_TYPE_USB) {
> + if (controller->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_NONE)
> + return;
> +
> /* first USB device is "usb", others are normal "usb%d" */
> if (controller->idx == 0) {
> controller->info.alias = g_strdup("usb");
> diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio.xml
> index 300dea1382..4b1c7ca6b4 100644
> --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio.xml
> +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio.xml
> @@ -29,9 +29,7 @@
> <alias name='virtio-disk4'/>
> <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/>
> </disk>
> - <controller type='usb' index='0' model='none'>
> - <alias name='usb'/>
> - </controller>
> + <controller type='usb' index='0' model='none'/>
> <controller type='scsi' index='0' model='virtio-scsi'>
> <alias name='scsi0'/>
> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'>
> diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml
> index 882a509eeb..ae4b1e48a7 100644
> --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml
> +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml
> @@ -39,9 +39,7 @@
> <alias name='virtio-disk1'/>
> <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/>
> </disk>
> - <controller type='usb' index='0' model='none'>
> - <alias name='usb'/>
> - </controller>
> + <controller type='usb' index='0' model='none'/>
> <controller type='scsi' index='0' model='virtio-scsi'>
> <alias name='scsi0'/>
> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'>
> diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml
> index 6167d54bd2..428b8a41fa 100644
> --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml
> +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml
> @@ -29,9 +29,7 @@
> <alias name='virtio-disk0'/>
> <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0001'/>
> </disk>
> - <controller type='usb' index='0' model='none'>
> - <alias name='usb'/>
> - </controller>
> + <controller type='usb' index='0' model='none'/>
> <controller type='scsi' index='0' model='virtio-scsi'>
> <alias name='scsi0'/>
> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'>
> diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2-explicit.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2-explicit.xml
> index 67a5c84a6c..ca6faf615a 100644
> --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2-explicit.xml
> +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2-explicit.xml
> @@ -38,9 +38,7 @@
> <alias name='virtio-disk4'/>
> <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/>
> </disk>
> - <controller type='usb' index='0' model='none'>
> - <alias name='usb'/>
> - </controller>
> + <controller type='usb' index='0' model='none'/>
> <controller type='scsi' index='0' model='virtio-scsi'>
> <alias name='scsi0'/>
> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'>
> diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml
> index 67a5c84a6c..ca6faf615a 100644
> --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml
> +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml
> @@ -38,9 +38,7 @@
> <alias name='virtio-disk4'/>
> <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/>
> </disk>
> - <controller type='usb' index='0' model='none'>
> - <alias name='usb'/>
> - </controller>
> + <controller type='usb' index='0' model='none'/>
> <controller type='scsi' index='0' model='virtio-scsi'>
> <alias name='scsi0'/>
> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'>
> diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio.xml
> index 07bbfa24a2..a2ec796490 100644
> --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio.xml
> +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio.xml
> @@ -28,9 +28,7 @@
> <alias name='virtio-disk4'/>
> <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/>
> </disk>
> - <controller type='usb' index='0' model='none'>
> - <alias name='usb'/>
> - </controller>
> + <controller type='usb' index='0' model='none'/>
> <controller type='scsi' index='0' model='virtio-scsi'>
> <alias name='scsi0'/>
> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'>
> diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml
> index 4869103a06..1d1e5eb142 100644
> --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml
> +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml
> @@ -19,9 +19,7 @@
> <on_crash>restart</on_crash>
> <devices>
> <emulator>/usr/bin/qemu-system-s390x</emulator>
> - <controller type='usb' index='0' model='none'>
> - <alias name='usb'/>
> - </controller>
> + <controller type='usb' index='0' model='none'/>
> <controller type='scsi' index='0' model='virtio-scsi'>
> <alias name='scsi0'/>
> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'>
--
Mit freundlichen Grüßen/Kind regards
Boris Fiuczynski
IBM Deutschland Research & Development GmbH
Vorsitzender des Aufsichtsrats: Wolfgang Wendt
Geschäftsführung: David Faller
Sitz der Gesellschaft: Böblingen
Registergericht: Amtsgericht Stuttgart, HRB 243294