The architecture was introduced at a time when USB3 in
general, and qemu-xhci in particular, had already been
well established for years. Having USB1 controllers as a
fallback was something that happened by mistake due to
the way the pre-existing code was organized rather than
because of a conscious decision. Make things work the
way they should have in the first place.
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
---
src/qemu/qemu_domain.c | 8 +---
...k-virt-loongarch64.loongarch64-latest.args | 35 ----------------
...ck-virt-loongarch64.loongarch64-latest.xml | 40 -------------------
...ller-default-fallback-virt-loongarch64.xml | 1 -
tests/qemuxmlconftest.c | 5 ---
5 files changed, 1 insertion(+), 88 deletions(-)
delete mode 100644 tests/qemuxmlconfdata/usb-controller-default-fallback-virt-loongarch64.loongarch64-latest.args
delete mode 100644 tests/qemuxmlconfdata/usb-controller-default-fallback-virt-loongarch64.loongarch64-latest.xml
delete mode 120000 tests/qemuxmlconfdata/usb-controller-default-fallback-virt-loongarch64.xml
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 370831fa48..39a54b8009 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -4323,16 +4323,10 @@ qemuDomainDefaultUSBControllerModel(const virDomainDef *def,
bool abiUpdate = !!(parseFlags & VIR_DOMAIN_DEF_PARSE_ABI_UPDATE);
if (ARCH_IS_LOONGARCH(def->os.arch)) {
- /* Prefer qemu-xhci (USB3) */
+ /* Use qemu-xhci (USB3) with no fallback */
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_QEMU_XHCI))
return VIR_DOMAIN_CONTROLLER_MODEL_USB_QEMU_XHCI;
- /* Allow piix3-uhci and pci-ohci (USB1) as fallback */
- if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_PIIX3_USB_UHCI))
- return VIR_DOMAIN_CONTROLLER_MODEL_USB_PIIX3_UHCI;
- if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_PCI_OHCI))
- return VIR_DOMAIN_CONTROLLER_MODEL_USB_PCI_OHCI;
-
return VIR_DOMAIN_CONTROLLER_MODEL_USB_DEFAULT;
}
diff --git a/tests/qemuxmlconfdata/usb-controller-default-fallback-virt-loongarch64.loongarch64-latest.args b/tests/qemuxmlconfdata/usb-controller-default-fallback-virt-loongarch64.loongarch64-latest.args
deleted file mode 100644
index 94e4e871b0..0000000000
--- a/tests/qemuxmlconfdata/usb-controller-default-fallback-virt-loongarch64.loongarch64-latest.args
+++ /dev/null
@@ -1,35 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/var/lib/libvirt/qemu/domain--1-test \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-test/.local/share \
-XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-test/.cache \
-XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
-/usr/bin/qemu-system-loongarch64 \
--name guest=test,debug-threads=on \
--S \
--object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-test/master-key.aes"}' \
--machine virt,usb=off,dump-guest-core=off,memory-backend=loongarch.ram,acpi=off \
--accel tcg \
--cpu la464 \
--m size=2097152k \
--object '{"qom-type":"memory-backend-ram","id":"loongarch.ram","size":2147483648}' \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--boot strict=on \
--device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x1"}' \
--device '{"driver":"pcie-pci-bridge","id":"pci.2","bus":"pci.1","addr":"0x0"}' \
--device '{"driver":"pcie-root-port","port":9,"chassis":3,"id":"pci.3","bus":"pcie.0","addr":"0x1.0x1"}' \
--device '{"driver":"pci-ohci","id":"usb","bus":"pci.2","addr":"0x1"}' \
--audiodev '{"id":"audio1","driver":"none"}' \
--sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
--msg timestamp=on
diff --git a/tests/qemuxmlconfdata/usb-controller-default-fallback-virt-loongarch64.loongarch64-latest.xml b/tests/qemuxmlconfdata/usb-controller-default-fallback-virt-loongarch64.loongarch64-latest.xml
deleted file mode 100644
index b7abdaa909..0000000000
--- a/tests/qemuxmlconfdata/usb-controller-default-fallback-virt-loongarch64.loongarch64-latest.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<domain type='qemu'>
- <name>test</name>
- <uuid>11dbdcdd-4c3b-482b-8903-9bdb8c0a2774</uuid>
- <memory unit='KiB'>2097152</memory>
- <currentMemory unit='KiB'>2097152</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type arch='loongarch64' machine='virt'>hvm</type>
- <boot dev='hd'/>
- </os>
- <cpu mode='custom' match='exact' check='none'>
- <model fallback='forbid'>la464</model>
- </cpu>
- <clock offset='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <emulator>/usr/bin/qemu-system-loongarch64</emulator>
- <controller type='usb' index='0' model='pci-ohci'>
- <address type='pci' domain='0x0000' bus='0x02' slot='0x01' function='0x0'/>
- </controller>
- <controller type='pci' index='0' model='pcie-root'/>
- <controller type='pci' index='1' model='pcie-root-port'>
- <model name='pcie-root-port'/>
- <target chassis='1' port='0x8'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0' multifunction='on'/>
- </controller>
- <controller type='pci' index='2' model='pcie-to-pci-bridge'>
- <model name='pcie-pci-bridge'/>
- <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
- </controller>
- <controller type='pci' index='3' model='pcie-root-port'>
- <model name='pcie-root-port'/>
- <target chassis='3' port='0x9'/>
- <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
- </controller>
- <audio id='1' type='none'/>
- </devices>
-</domain>
diff --git a/tests/qemuxmlconfdata/usb-controller-default-fallback-virt-loongarch64.xml b/tests/qemuxmlconfdata/usb-controller-default-fallback-virt-loongarch64.xml
deleted file mode 120000
index 1fce90cdc0..0000000000
--- a/tests/qemuxmlconfdata/usb-controller-default-fallback-virt-loongarch64.xml
+++ /dev/null
@@ -1 +0,0 @@
-usb-controller-default-virt-loongarch64.xml
\ No newline at end of file
diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c
index 03fc3b0fd8..1232892c9b 100644
--- a/tests/qemuxmlconftest.c
+++ b/tests/qemuxmlconftest.c
@@ -2114,11 +2114,6 @@ mymain(void)
DO_TEST_CAPS_ARCH_LATEST("usb-controller-default-s390x", "s390x");
DO_TEST_CAPS_ARCH_LATEST("usb-controller-default-virt-loongarch64", "loongarch64");
- DO_TEST_FULL("usb-controller-default-fallback-virt-loongarch64", ".loongarch64-latest",
- ARG_CAPS_ARCH, "loongarch64",
- ARG_CAPS_VER, "latest",
- 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-virt-loongarch64", ".loongarch64-latest",
ARG_CAPS_ARCH, "loongarch64",
ARG_CAPS_VER, "latest",
--
2.51.0