NuKVM/libvirt
3
0 Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2026-10-02 12:20:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Unify USB controllers across Arm architectures

Browse Source 
Currently we differentiate between 64-bit and 32-bit
architectures, which doesn't seem very reasonable
considering that the same machine types are available
in both cases. Remove this inconsistency.

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>
This commit is contained in:
Andrea Bolognani committed 2025-10-06 11:16:27 +02:00
1 parent d9add4c3f1
commit bfe1aca211
4 files changed
+4 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/qemu/qemu_domain.c
+1 -1
View File
@@ -4331,7 +4331,7 @@ qemuDomainDefaultUSBControllerModel(const virDomainDef *def,
return VIR_DOMAIN_CONTROLLER_MODEL_USB_DEFAULT;
}
if (def->os.arch == VIR_ARCH_AARCH64) {
if (ARCH_IS_ARM(def->os.arch)) {
/* Prefer qemu-xhci or nec-xhci (USB3) */
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_QEMU_XHCI))
return VIR_DOMAIN_CONTROLLER_MODEL_USB_QEMU_XHCI;
tests/qemuxmlconfdata/usb-controller-default-versatilepb.armv7l-latest.args
+1 -1
View File
@@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-armv7ltest/.config \
-rtc base=utc \
-no-shutdown \
-boot strict=on \
-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci","addr":"0x1"}' \
-device '{"driver":"qemu-xhci","id":"usb","bus":"pci","addr":"0x1"}' \
-audiodev '{"id":"audio1","driver":"none"}' \
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on
tests/qemuxmlconfdata/usb-controller-default-versatilepb.armv7l-latest.xml
+1 -1
View File
@@ -17,7 +17,7 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-armv7l</emulator>
<controller type='usb' index='0' model='piix3-uhci'>
<controller type='usb' index='0' model='qemu-xhci'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
tests/qemuxmlconftest.c
+1 -1
View File
@@ -2196,7 +2196,7 @@ mymain(void)
DO_TEST_FULL("usb-controller-default-fallback-versatilepb", ".armv7l-latest",
ARG_CAPS_ARCH, "armv7l",
ARG_CAPS_VER, "latest",
ARG_QEMU_CAPS_DEL, QEMU_CAPS_PIIX3_USB_UHCI, QEMU_CAPS_LAST,
ARG_QEMU_CAPS_DEL, QEMU_CAPS_DEVICE_QEMU_XHCI, QEMU_CAPS_NEC_USB_XHCI, QEMU_CAPS_PIIX3_USB_UHCI, QEMU_CAPS_LAST,
ARG_END);
DO_TEST_FULL("usb-controller-default-unavailable-versatilepb", ".armv7l-latest",
ARG_CAPS_ARCH, "armv7l",