From 05fbe728ee6d4a609d62825702219a19bce01e0b Mon Sep 17 00:00:00 2001
From: Osier Yang <jyang@redhat.com>
Date: Mon, 27 Feb 2012 18:20:21 +0800
Subject: [PATCH] qemu: New cap flag to indicate if channel is supported by
 scsi-disk

---
 src/qemu/qemu_capabilities.c | 4 ++++
 src/qemu/qemu_capabilities.h | 1 +
 2 files changed, 5 insertions(+)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 6d35676b0b..64a45463cb 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -153,6 +153,7 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST,
 
               "drive-iotune", /* 85 */
               "system_wakeup",
+              "scsi-disk.channel",
     );
 
 struct qemu_feature_flags {
@@ -1363,6 +1364,7 @@ qemuCapsExtractDeviceStr(const char *qemu,
                                "-device", "pci-assign,?",
                                "-device", "virtio-blk-pci,?",
                                "-device", "virtio-net-pci,?",
+                               "-device", "scsi-disk,?",
                                NULL);
     virCommandAddEnvPassCommon(cmd);
     /* qemu -help goes to stdout, but qemu -device ? goes to stderr.  */
@@ -1440,6 +1442,8 @@ qemuCapsParseDeviceStr(const char *str, virBitmapPtr flags)
         qemuCapsSet(flags, QEMU_CAPS_VIRTIO_NET_EVENT_IDX);
     if (strstr(str, "virtio-blk-pci.scsi"))
         qemuCapsSet(flags, QEMU_CAPS_VIRTIO_BLK_SCSI);
+    if (strstr(str, "scsi-disk.channel"))
+        qemuCapsSet(flags, QEMU_CAPS_SCSI_DISK_CHANNEL);
 
     return 0;
 }
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index b9666e12fe..db584ce9c2 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -121,6 +121,7 @@ enum qemuCapsFlags {
     QEMU_CAPS_FSDEV_WRITEOUT     = 84, /* -fsdev writeout supported */
     QEMU_CAPS_DRIVE_IOTUNE       = 85, /* -drive bps= and friends */
     QEMU_CAPS_WAKEUP             = 86, /* system_wakeup monitor command */
+    QEMU_CAPS_SCSI_DISK_CHANNEL  = 87, /* Is scsi-disk.channel available? */
 
     QEMU_CAPS_LAST,                   /* this must always be the last item */
 };