qemu: Improve handling of architecture-specific defaults (USB and PCI)

[PATCH 21/31] qemu: Drop skip for USB controllers on s390x

Posted by Andrea Bolognani via Devel 2 weeks, 5 days ago

We have just changed PostParse so that MODEL_USB_NONE will be
used instead of MODEL_USB_DEFAULT, so this code is no longer
doing anything.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
---
 src/qemu/qemu_command.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index f5a80f6955..aabc3d773f 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -3086,11 +3086,6 @@ qemuBuildControllersByTypeCommandLine(virCommand *cmd,
             /* skip USB controllers with type none*/
             if (cont->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_NONE)
                 continue;
-
-            /* skip 'default' controllers on s390 for legacy reasons */
-            if (ARCH_IS_S390(def->os.arch) &&
-                cont->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_DEFAULT)
-                continue;
         }
 
         if (qemuBuildControllerDevProps(def, cont, qemuCaps, &props) < 0)
-- 
2.50.1

Re: [PATCH 21/31] qemu: Drop skip for USB controllers on s390x

Posted by Boris Fiuczynski 2 weeks, 4 days ago

On 8/19/25 18:22, Andrea Bolognani via Devel wrote:
> We have just changed PostParse so that MODEL_USB_NONE will be
> used instead of MODEL_USB_DEFAULT, so this code is no longer
> doing anything.
> 
> Signed-off-by: Andrea Bolognani <abologna@redhat.com>
> ---
>   src/qemu/qemu_command.c | 5 -----
>   1 file changed, 5 deletions(-)
> 
> diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
> index f5a80f6955..aabc3d773f 100644
> --- a/src/qemu/qemu_command.c
> +++ b/src/qemu/qemu_command.c
> @@ -3086,11 +3086,6 @@ qemuBuildControllersByTypeCommandLine(virCommand *cmd,
>               /* skip USB controllers with type none*/
>               if (cont->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_NONE)
>                   continue;
> -
> -            /* skip 'default' controllers on s390 for legacy reasons */
> -            if (ARCH_IS_S390(def->os.arch) &&
> -                cont->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_DEFAULT)
> -                continue;
>           }
>   
>           if (qemuBuildControllerDevProps(def, cont, qemuCaps, &props) < 0)

Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>

-- 
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

Re: [PATCH 21/31] qemu: Drop skip for USB controllers on s390x

Posted by Thomas Huth via Devel 2 weeks, 4 days ago

On 19/08/2025 18.22, Andrea Bolognani via Devel wrote:
> We have just changed PostParse so that MODEL_USB_NONE will be
> used instead of MODEL_USB_DEFAULT, so this code is no longer
> doing anything.
> 
> Signed-off-by: Andrea Bolognani <abologna@redhat.com>
> ---
>   src/qemu/qemu_command.c | 5 -----
>   1 file changed, 5 deletions(-)
> 
> diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
> index f5a80f6955..aabc3d773f 100644
> --- a/src/qemu/qemu_command.c
> +++ b/src/qemu/qemu_command.c
> @@ -3086,11 +3086,6 @@ qemuBuildControllersByTypeCommandLine(virCommand *cmd,
>               /* skip USB controllers with type none*/
>               if (cont->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_NONE)
>                   continue;
> -
> -            /* skip 'default' controllers on s390 for legacy reasons */
> -            if (ARCH_IS_S390(def->os.arch) &&
> -                cont->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_DEFAULT)
> -                continue;
>           }
>   
>           if (qemuBuildControllerDevProps(def, cont, qemuCaps, &props) < 0)

Reviewed-by: Thomas Huth <thuth@redhat.com>