mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-22 17:34:18 +03:00
c6d71bf813
The machine types historically have a default USB controller populated via '-usb' which libvirt assumed implicitly. Qemu will use 'pci-ohci' for both if '-usb' is used. Unfortunately an USB controller instantiated via '-usb' is unusable as the bus name libvirt generates doesn't reflect the real name qemu uses, and thus no libvirt-defined USB devices can be put on the controller. This patch will populate the default USB controller into the XML and select it's model to 'pci-ohci' unconditionally as the machine would fail to start with '-usb' if that controller model is not available. This patch doesn't try to make any other assumptions about auto-populated model of USB controllers, which means that for an explicit USB controller without model a different model will be picked. Note that this will likely cause ABI differences and break migration for the two machine types, in the corner case when the default USB controller would be populated, but given that both are obsolete board types and USB was unusable it doesn't make sense to keep supporting this specific case when '-usb' was formatted. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Andrea Bolognani <abologna@redhat.com>
33 lines
1.2 KiB
Plaintext
33 lines
1.2 KiB
Plaintext
LC_ALL=C \
|
|
PATH=/bin \
|
|
HOME=/var/lib/libvirt/qemu/domain--1-armv7ltest \
|
|
USER=test \
|
|
LOGNAME=test \
|
|
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-armv7ltest/.local/share \
|
|
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-armv7ltest/.cache \
|
|
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-armv7ltest/.config \
|
|
/usr/bin/qemu-system-armv7l \
|
|
-name guest=armv7ltest,debug-threads=on \
|
|
-S \
|
|
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-armv7ltest/master-key.aes"}' \
|
|
-machine versatilepb,usb=off,dump-guest-core=off,memory-backend=versatile.ram \
|
|
-accel tcg \
|
|
-cpu arm926 \
|
|
-m size=1048576k \
|
|
-object '{"qom-type":"memory-backend-ram","id":"versatile.ram","size":1073741824}' \
|
|
-overcommit mem-lock=off \
|
|
-smp 1,sockets=1,cores=1,threads=1 \
|
|
-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
|
|
-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":"pci-ohci","id":"usb","bus":"pci","addr":"0x1"}' \
|
|
-audiodev '{"id":"audio1","driver":"none"}' \
|
|
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
|
|
-msg timestamp=on
|