External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-10 23:07:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Don't use legacy USB for aarch64 mach-virt guests

Browse Source 
The '-usb' option doesn't have any effect for aarch64 mach-virt
guests, so the fact that it's currently enabled by default is not
really causing any issue.

However, that might change in the future (although unlikely), and
having it as part of the QEMU command line can cause confusion to
someone looking through the process list.

Avoid it completely, like it's already happening for q35.
This commit is contained in:
Andrea Bolognani 2016-06-16 19:12:34 +02:00
parent ec3f07f0a7
commit dc5821d743
14 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/qemu/qemu_command.c
View File

@ -2875,6 +2875,7 @@ qemuBuildControllerDevCommandLine(virCommandPtr cmd,
if (usbcontroller == 0 && if (usbcontroller == 0 &&
!qemuDomainMachineIsQ35(def) && !qemuDomainMachineIsQ35(def) &&
!qemuDomainMachineIsVirt(def) &&
!ARCH_IS_S390(def->os.arch)) !ARCH_IS_S390(def->os.arch))
virCommandAddArg(cmd, "-usb"); virCommandAddArg(cmd, "-usb");

1
tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args
View File

@ -22,7 +22,6 @@ QEMU_AUDIO_DRV=none \
-append 'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \ -append 'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \
-dtb /aarch64.dtb \ -dtb /aarch64.dtb \
-device virtio-serial-device,id=virtio-serial0 \ -device virtio-serial-device,id=virtio-serial0 \
-usb \
-drive file=/aarch64.raw,format=raw,if=none,id=drive-virtio-disk0 \ -drive file=/aarch64.raw,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \ -device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \
-device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \ -device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \

1
tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.args
View File

@ -17,6 +17,5 @@ QEMU_AUDIO_DRV=none \
-nodefaults \ -nodefaults \
-monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ -monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \
-boot c \ -boot c \
-usb \
-drive file=/aarch64.raw,format=raw,if=none,id=drive-virtio-disk0 \ -drive file=/aarch64.raw,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 -device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0

3
tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-host.args
View File

@ -16,5 +16,4 @@ QEMU_AUDIO_DRV=none \
-nodefaults \ -nodefaults \
-monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ -monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \
-no-acpi \ -no-acpi \
-boot c \ -boot c
-usb

3
tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v2.args
View File

@ -16,5 +16,4 @@ QEMU_AUDIO_DRV=none \
-nodefaults \ -nodefaults \
-monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ -monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \
-no-acpi \ -no-acpi \
-boot c \ -boot c
-usb

3
tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v3.args
View File

@ -16,5 +16,4 @@ QEMU_AUDIO_DRV=none \
-nodefaults \ -nodefaults \
-monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ -monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \
-no-acpi \ -no-acpi \
-boot c \ -boot c
-usb

1
tests/qemuxml2argvdata/qemuxml2argv-aarch64-kvm-32-on-64.args
View File

@ -20,7 +20,6 @@ QEMU_AUDIO_DRV=none \
-kernel /arm.kernel \ -kernel /arm.kernel \
-initrd /arm.initrd \ -initrd /arm.initrd \
-append 'console=ttyAMA0,115200n8 rw root=/dev/vda rootwait physmap.enabled=0' \ -append 'console=ttyAMA0,115200n8 rw root=/dev/vda rootwait physmap.enabled=0' \
-usb \
-drive file=/arm.raw,format=raw,if=none,id=drive-virtio-disk0 \ -drive file=/arm.raw,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \ -device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \
-device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \ -device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \

1
tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.args
View File

@ -22,7 +22,6 @@ QEMU_AUDIO_DRV=none \
-append 'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \ -append 'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \
-dtb /aarch64.dtb \ -dtb /aarch64.dtb \
-device virtio-serial-device,id=virtio-serial0 \ -device virtio-serial-device,id=virtio-serial0 \
-usb \
-drive file=/aarch64.raw,format=raw,if=none,id=drive-virtio-disk0 \ -drive file=/aarch64.raw,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \ -device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \
-device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \ -device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \

1
tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.args
View File

@ -20,6 +20,5 @@ QEMU_AUDIO_DRV=none \
-kernel /aarch64.kernel \ -kernel /aarch64.kernel \
-initrd /aarch64.initrd \ -initrd /aarch64.initrd \
-append console=ttyAMA0 \ -append console=ttyAMA0 \
-usb \
-device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \ -device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \
-net user,vlan=0,name=hostnet0 -net user,vlan=0,name=hostnet0

1
tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.args
View File

@ -22,7 +22,6 @@ QEMU_AUDIO_DRV=none \
-append 'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \ -append 'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \
-dtb /aarch64.dtb \ -dtb /aarch64.dtb \
-device virtio-serial-device,id=virtio-serial0 \ -device virtio-serial-device,id=virtio-serial0 \
-usb \
-drive file=/aarch64.raw,format=raw,if=none,id=drive-virtio-disk0 \ -drive file=/aarch64.raw,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \ -device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \
-device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \ -device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \

1
tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-default.args
View File

@ -22,7 +22,6 @@ QEMU_AUDIO_DRV=none \
-append 'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \ -append 'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \
-dtb /aarch64.dtb \ -dtb /aarch64.dtb \
-device virtio-serial-device,id=virtio-serial0 \ -device virtio-serial-device,id=virtio-serial0 \
-usb \
-drive file=/aarch64.raw,format=raw,if=none,id=drive-virtio-disk0 \ -drive file=/aarch64.raw,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \ -device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \
-device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \ -device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \

1
tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-manual-addresses.args
View File

@ -25,7 +25,6 @@ QEMU_AUDIO_DRV=none \
-device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \ -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \
-device pci-bridge,chassis_nr=3,id=pci.3,bus=pci.1,addr=0x1 \ -device pci-bridge,chassis_nr=3,id=pci.3,bus=pci.1,addr=0x1 \
-device virtio-scsi-pci,id=scsi0,bus=pci.3,addr=0x1 \ -device virtio-scsi-pci,id=scsi0,bus=pci.3,addr=0x1 \
-usb \
-drive file=/aarch64.raw,format=raw,if=none,id=drive-scsi0-0-0-0 \ -drive file=/aarch64.raw,format=raw,if=none,id=drive-scsi0-0-0-0 \
-device scsi-disk,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,\ -device scsi-disk,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,\
id=scsi0-0-0-0 \ id=scsi0-0-0-0 \

1
tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.args
View File

@ -21,7 +21,6 @@ QEMU_AUDIO_DRV=none \
-append 'console=ttyAMA0,115200n8 rw root=/dev/vda rootwait physmap.enabled=0' \ -append 'console=ttyAMA0,115200n8 rw root=/dev/vda rootwait physmap.enabled=0' \
-dtb /arm.dtb \ -dtb /arm.dtb \
-device virtio-serial-device,id=virtio-serial0 \ -device virtio-serial-device,id=virtio-serial0 \
-usb \
-drive file=/arm.raw,format=raw,if=none,id=drive-virtio-disk0 \ -drive file=/arm.raw,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \ -device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \
-device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \ -device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \

1
tests/qemuxml2argvdata/qemuxml2argv-balloon-mmio-deflate.args
View File

@ -21,5 +21,4 @@ QEMU_AUDIO_DRV=none \
-initrd /aarch64.initrd \ -initrd /aarch64.initrd \
-append 'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \ -append 'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \
-dtb /aarch64.dtb \ -dtb /aarch64.dtb \
-usb \
-device virtio-balloon-device,id=balloon0,deflate-on-oom=on -device virtio-balloon-device,id=balloon0,deflate-on-oom=on