shaba/virt-manager
1
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2024-10-27 01:55:20 +03:00
Code Issues Projects Releases Wiki Activity

guest: Prefer virtio-scsi for arm mach-virt

Browse Source 
Since it gives us disk hotplug, and CDROM devices, etc.

This requires fairly recent patches to UEFI/OVMF/AAVMF
This commit is contained in:
Cole Robinson 2014-11-20 15:39:53 -05:00
parent cbe5ca4c7d
commit aa772f01e1
6 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/cli-test-xml/compare/virt-install-aarch64-cdrom.xml
View File

@ -28,12 +28,12 @@
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<target dev="vda" bus="virtio"/>
<target dev="sda" bus="scsi"/>
</disk>
<disk type="file" device="cdrom">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol2.img"/>
<target dev="sda" bus="scsi"/>
<target dev="sdb" bus="scsi"/>
<readonly/>
</disk>
<controller type="scsi" index="0" model="virtio-scsi"/>
@ -74,10 +74,10 @@
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<target dev="vda" bus="virtio"/>
<target dev="sda" bus="scsi"/>
</disk>
<disk type="block" device="cdrom">
<target dev="sda" bus="scsi"/>
<target dev="sdb" bus="scsi"/>
<readonly/>
</disk>
<controller type="scsi" index="0" model="virtio-scsi"/>

3
tests/cli-test-xml/compare/virt-install-aarch64-machdefault.xml
View File

@ -27,8 +27,9 @@
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<target dev="vda" bus="virtio"/>
<target dev="sda" bus="scsi"/>
</disk>
<controller type="scsi" index="0" model="virtio-scsi"/>
<interface type="bridge">
<source bridge="eth0"/>
<mac address="00:11:22:33:44:55"/>

3
tests/cli-test-xml/compare/virt-install-aarch64-machvirt.xml
View File

@ -27,8 +27,9 @@
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<target dev="vda" bus="virtio"/>
<target dev="sda" bus="scsi"/>
</disk>
<controller type="scsi" index="0" model="virtio-scsi"/>
<interface type="bridge">
<source bridge="eth0"/>
<mac address="00:11:22:33:44:55"/>

3
tests/cli-test-xml/compare/virt-install-arm-defaultmach-f20.xml
View File

@ -24,8 +24,9 @@
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<target dev="vda" bus="virtio"/>
<target dev="sda" bus="scsi"/>
</disk>
<controller type="scsi" index="0" model="virtio-scsi"/>
<interface type="bridge">
<source bridge="eth0"/>
<mac address="00:11:22:33:44:55"/>

3
tests/cli-test-xml/compare/virt-install-arm-virt-f20.xml
View File

@ -24,8 +24,9 @@
<disk type="file" device="disk">
<driver name="qemu" type="qcow2"/>
<source file="/dev/default-pool/testvol1.img"/>
<target dev="vda" bus="virtio"/>
<target dev="sda" bus="scsi"/>
</disk>
<controller type="scsi" index="0" model="virtio-scsi"/>
<interface type="bridge">
<source bridge="eth0"/>
<mac address="00:11:22:33:44:55"/>

7
virtinst/guest.py
View File

@ -901,12 +901,13 @@ class Guest(XMLBuilder):
d.bus = "ide"
return
if self._can_virtio("virtiodisk") and d.is_disk():
if self.os.is_arm_machvirt():
# We prefer virtio-scsi for machvirt, gets us hotplug
d.bus = "scsi"
elif self._can_virtio("virtiodisk") and d.is_disk():
d.bus = "virtio"
elif self.os.is_pseries():
d.bus = "scsi"
elif self.os.is_arm_machvirt() and d.is_cdrom():
d.bus = "scsi"
elif self.os.is_arm():
d.bus = "sd"
else: