Re: [libvirt] [PATCH v2 1/5] qemu: change the logic of setting default USB controller

@@ -3200,11 +3200,17 @@ qemuDomainControllerDefPostParse(virDomainControllerDefPtr cont,                * when the relevant device is not available.                *                * See qemuBuildControllerDevCommandLine() */ -            if (ARCH_IS_S390(def->os.arch) && -                cont->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { -                /* set the default USB model to none for s390 unless an -                 * address is found */ -                cont->model = VIR_DOMAIN_CONTROLLER_MODEL_USB_NONE; + +            /* Default USB controller is piix3-uhci if available. */ +            if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_PIIX3_USB_UHCI)) +                cont->model = VIR_DOMAIN_CONTROLLER_MODEL_USB_PIIX3_UHCI; + +            if (ARCH_IS_S390(def->os.arch)) { +                if (cont->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { +                    /* set the default USB model to none for s390 unless an +                     * address is found */ +                    cont->model = VIR_DOMAIN_CONTROLLER_MODEL_USB_NONE; +                }