|
 |
6d3351 |
From 09e42278625a78997f11ffe898e82684a6524131 Mon Sep 17 00:00:00 2001
|
|
|
6d3351 |
Message-Id: <09e42278625a78997f11ffe898e82684a6524131@dist-git>
|
|
|
6d3351 |
From: Pavel Hrdina <phrdina@redhat.com>
|
|
|
6d3351 |
Date: Fri, 28 Apr 2017 11:59:47 +0200
|
|
|
6d3351 |
Subject: [PATCH] qemu: change the logic of setting default USB controller
|
|
|
6d3351 |
|
|
|
6d3351 |
The new logic will set the piix3-uhci if available regardless of
|
|
|
6d3351 |
any architecture and it will be updated to better model based on
|
|
|
6d3351 |
architecture and device existence.
|
|
|
6d3351 |
|
|
|
6d3351 |
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
|
|
6d3351 |
Acked-by: Andrea Bolognani <abologna@redhat.com>
|
|
|
6d3351 |
(cherry picked from commit e69001b46448ae7e0f9f727965d4bea169ca2d9e)
|
|
|
6d3351 |
|
|
|
6d3351 |
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1438682
|
|
|
6d3351 |
|
|
|
6d3351 |
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
|
|
6d3351 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
6d3351 |
---
|
|
|
6d3351 |
src/qemu/qemu_domain.c | 23 ++++++++++++++---------
|
|
|
6d3351 |
1 file changed, 14 insertions(+), 9 deletions(-)
|
|
|
6d3351 |
|
|
|
6d3351 |
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
|
|
|
6d3351 |
index 53586878b..a1a4003af 100644
|
|
|
6d3351 |
--- a/src/qemu/qemu_domain.c
|
|
|
6d3351 |
+++ b/src/qemu/qemu_domain.c
|
|
|
6d3351 |
@@ -3223,11 +3223,17 @@ qemuDomainControllerDefPostParse(virDomainControllerDefPtr cont,
|
|
|
6d3351 |
* when the relevant device is not available.
|
|
|
6d3351 |
*
|
|
|
6d3351 |
* See qemuBuildControllerDevCommandLine() */
|
|
|
6d3351 |
- if (ARCH_IS_S390(def->os.arch) &&
|
|
|
6d3351 |
- cont->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) {
|
|
|
6d3351 |
- /* set the default USB model to none for s390 unless an
|
|
|
6d3351 |
- * address is found */
|
|
|
6d3351 |
- cont->model = VIR_DOMAIN_CONTROLLER_MODEL_USB_NONE;
|
|
|
6d3351 |
+
|
|
|
6d3351 |
+ /* Default USB controller is piix3-uhci if available. */
|
|
|
6d3351 |
+ if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_PIIX3_USB_UHCI))
|
|
|
6d3351 |
+ cont->model = VIR_DOMAIN_CONTROLLER_MODEL_USB_PIIX3_UHCI;
|
|
|
6d3351 |
+
|
|
|
6d3351 |
+ if (ARCH_IS_S390(def->os.arch)) {
|
|
|
6d3351 |
+ if (cont->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) {
|
|
|
6d3351 |
+ /* set the default USB model to none for s390 unless an
|
|
|
6d3351 |
+ * address is found */
|
|
|
6d3351 |
+ cont->model = VIR_DOMAIN_CONTROLLER_MODEL_USB_NONE;
|
|
|
6d3351 |
+ }
|
|
|
6d3351 |
} else if (ARCH_IS_PPC64(def->os.arch)) {
|
|
|
6d3351 |
/* To not break migration we need to set default USB controller
|
|
|
6d3351 |
* for ppc64 to pci-ohci if we cannot change ABI of the VM.
|
|
|
6d3351 |
@@ -3238,11 +3244,10 @@ qemuDomainControllerDefPostParse(virDomainControllerDefPtr cont,
|
|
|
6d3351 |
cont->model = VIR_DOMAIN_CONTROLLER_MODEL_USB_NEC_XHCI;
|
|
|
6d3351 |
} else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_PCI_OHCI)) {
|
|
|
6d3351 |
cont->model = VIR_DOMAIN_CONTROLLER_MODEL_USB_PCI_OHCI;
|
|
|
6d3351 |
+ } else {
|
|
|
6d3351 |
+ /* Explicitly fallback to legacy USB controller for PPC64. */
|
|
|
6d3351 |
+ cont->model = -1;
|
|
|
6d3351 |
}
|
|
|
6d3351 |
- } else {
|
|
|
6d3351 |
- /* Default USB controller for anything else is piix3-uhci */
|
|
|
6d3351 |
- if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_PIIX3_USB_UHCI))
|
|
|
6d3351 |
- cont->model = VIR_DOMAIN_CONTROLLER_MODEL_USB_PIIX3_UHCI;
|
|
|
6d3351 |
}
|
|
|
6d3351 |
}
|
|
|
6d3351 |
/* forbid usb model 'qusb1' and 'qusb2' in this kind of hyperviosr */
|
|
|
6d3351 |
--
|
|
|
6d3351 |
2.12.2
|
|
|
6d3351 |
|