From: Andrea Bolognani <abologna@redhat.com>
Date: Thu, 3 Jul 2025 15:15:10 +0000 (+0200)
Subject: qemu: Drop skip for USB controllers on s390x
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=de797a86e1c99da99876ad96949992ac404f03e1;p=thirdparty%2Flibvirt.git

qemu: Drop skip for USB controllers on s390x

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>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 031f09b7a5..b48f7769b5 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -3079,11 +3079,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)