[virt-tools-list] [PATCH v1] virtinst: Use virtio bus type for cdrom disk on s390x

[Cole Robinson]

On 05/05/2016 01:59 PM, Leno Hou wrote:
> s390x doesn't support scsi and so was changed to use the scsi. virtio works
> better on s390x with better performance outcomes. Change the default to
> virtio for cdrom disks
> 

Hmm, this is definitely supposed to be bus=virtio, and not bus=scsi with a
virtio-scsi controller? I didn't know bus=virtio could work with cdrom devices...

- Cole

> Signed-off-by: Leno Hou <lenohou at gmail.com>
> ---
>  tests/cli-test-xml/compare/virt-install-s390x-cdrom.xml | 2 +-
>  virtinst/devicedisk.py                                  | 3 ---
>  2 files changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/tests/cli-test-xml/compare/virt-install-s390x-cdrom.xml b/tests/cli-test-xml/compare/virt-install-s390x-cdrom.xml
> index 0083dc0..a4d6fcc 100644
> --- a/tests/cli-test-xml/compare/virt-install-s390x-cdrom.xml
> +++ b/tests/cli-test-xml/compare/virt-install-s390x-cdrom.xml
> @@ -23,7 +23,7 @@
>      <disk type="file" device="cdrom">
>        <driver name="qemu"/>
>        <source file="/tmp/__virtinst_cli_exist1.img"/>
> -      <target dev="sda" bus="scsi"/>
> +      <target dev="vdb" bus="virtio"/>
>        <readonly/>
>      </disk>
>      <interface type="bridge">
> diff --git a/virtinst/devicedisk.py b/virtinst/devicedisk.py
> index c7cd04d..7367074 100644
> --- a/virtinst/devicedisk.py
> +++ b/virtinst/devicedisk.py
> @@ -870,9 +870,6 @@ class VirtualDisk(VirtualDevice):
>          if self.is_cdrom():
>              self.read_only = True
>  
> -        if self.is_cdrom() and guest.os.is_s390x():
> -            self.bus = "scsi"
> -
>          if not self.conn.is_qemu():
>              return
>          if not self.is_disk():
>