External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemu: change the logic of setting default USB controller

Browse Source 
The new logic will set the piix3-uhci if available regardless of
any architecture and it will be updated to better model based on
architecture and device existence.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Acked-by: Andrea Bolognani <abologna@redhat.com>
This commit is contained in:
Pavel Hrdina 2017-04-27 17:41:56 +02:00
parent ef0bb841c9
commit e69001b464
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/qemu/qemu_domain.c
View File

@ -3254,11 +3254,17 @@ qemuDomainControllerDefPostParse(virDomainControllerDefPtr cont,
* when the relevant device is not available. * when the relevant device is not available.
* *
* See qemuBuildControllerDevCommandLine() */ * See qemuBuildControllerDevCommandLine() */
if (ARCH_IS_S390(def->os.arch) &&
cont->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { /* Default USB controller is piix3-uhci if available. */
/* set the default USB model to none for s390 unless an if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_PIIX3_USB_UHCI))
* address is found */ cont->model = VIR_DOMAIN_CONTROLLER_MODEL_USB_PIIX3_UHCI;
cont->model = VIR_DOMAIN_CONTROLLER_MODEL_USB_NONE;
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;
}
} else if (ARCH_IS_PPC64(def->os.arch)) { } else if (ARCH_IS_PPC64(def->os.arch)) {
/* To not break migration we need to set default USB controller /* To not break migration we need to set default USB controller
* for ppc64 to pci-ohci if we cannot change ABI of the VM. * for ppc64 to pci-ohci if we cannot change ABI of the VM.
@ -3269,11 +3275,10 @@ qemuDomainControllerDefPostParse(virDomainControllerDefPtr cont,
cont->model = VIR_DOMAIN_CONTROLLER_MODEL_USB_NEC_XHCI; cont->model = VIR_DOMAIN_CONTROLLER_MODEL_USB_NEC_XHCI;
} else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_PCI_OHCI)) { } else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_PCI_OHCI)) {
cont->model = VIR_DOMAIN_CONTROLLER_MODEL_USB_PCI_OHCI; cont->model = VIR_DOMAIN_CONTROLLER_MODEL_USB_PCI_OHCI;
} else {
/* Explicitly fallback to legacy USB controller for PPC64. */
cont->model = -1;
} }
} else {
/* Default USB controller for anything else is piix3-uhci */
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_PIIX3_USB_UHCI))
cont->model = VIR_DOMAIN_CONTROLLER_MODEL_USB_PIIX3_UHCI;
} }
} }
/* forbid usb model 'qusb1' and 'qusb2' in this kind of hyperviosr */ /* forbid usb model 'qusb1' and 'qusb2' in this kind of hyperviosr */