qemu: Fold check into qemuBuildSkipController()

Signed-off-by: Andrea Bolognani <abologna@redhat.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 b48f7769b53e2300d55882b1f8a43626195c6619..e57bbc3d9a0a1fe8b5165e20847affc9dc27c249 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -3036,6 +3036,11 @@ qemuBuildSkipController(const virDomainControllerDef *controller,
         return true;
     }
 
+    /* skip USB controllers with type none */
+    if (controller->type == VIR_DOMAIN_CONTROLLER_TYPE_USB &&
+        controller->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_NONE)
+        return true;
+
     return false;
 }
 
@@ -3074,13 +3079,6 @@ qemuBuildControllersByTypeCommandLine(virCommand *cmd,
         if (qemuBuildSkipController(cont, def))
             continue;
 
-        if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_USB) {
-
-            /* skip USB controllers with type none*/
-            if (cont->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_NONE)
-                continue;
-        }
-
         if (qemuBuildControllerDevProps(def, cont, qemuCaps, &props) < 0)
             return -1;