[libvirt] [PATCH v2] qemu: Split scsi-disk into into scsi-hd and scsi-cd

[Daniel P. Berrange]

On Tue, Apr 17, 2012 at 04:56:33PM +0800, Osier Yang wrote:
> A "scsi-disk" device can be either a hard disk or a CD-ROM,
> if there is ",media=cdrom" specified for the backend, it's
> a CD-ROM, otherwise it's a hard disk.
> 
> But upstream qemu splitted "scsi-disk" into "scsi-hd" and
> "scsi-cd" since commit b443ae, and ",media=cdrom" is not
> required for scsi-cd anymore. "scsi-disk" is still supported
> for backwards compatibility, but no doubt we should go
> foward.
> 
> ---
> No changes since v1
> ---
>  src/qemu/qemu_capabilities.c |    3 +++
>  src/qemu/qemu_capabilities.h |    1 +
>  src/qemu/qemu_command.c      |   39 +++++++++++++++++++++++++++++++--------
>  tests/qemuhelptest.c         |    6 ++++--
>  tests/qemuxml2argvtest.c     |    3 +++
>  5 files changed, 42 insertions(+), 10 deletions(-)

[snip]

> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
> index fdbe95a..cc1ac44 100644
> --- a/tests/qemuxml2argvtest.c
> +++ b/tests/qemuxml2argvtest.c
> @@ -463,6 +463,9 @@ mymain(void)
>              QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
>      DO_TEST("disk-scsi-device-auto", false,
>              QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
> +    DO_TEST("disk-scsi-disk-split", false,
> +            QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
> +            QEMU_CAPS_SCSI_CD);
>      DO_TEST("disk-scsi-vscsi", false,
>              QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
>      DO_TEST("disk-scsi-virtio-scsi", false,

I think you're missing the 2 test data files for this addition.


Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|