From: Osier Yang <jyang@redhat.com>
Date: Fri, 5 Apr 2013 17:07:13 +0000 (+0800)
Subject: qemu: Allow volume type disk for device 'lun'
X-Git-Tag: v1.0.5-rc1~201
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70bb34eb2e0c883eecf119030248123bc42d3682;p=thirdparty%2Flibvirt.git

qemu: Allow volume type disk for device 'lun'

This allows one use block type volume as the disk source for device
'lun'.
---

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 84f8756529..8f1d28e14b 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -3131,10 +3131,11 @@ qemuBuildDriveDevStr(virDomainDefPtr def,
                                virDomainDiskProtocolTypeToString(disk->protocol));
                 goto error;
             }
-        } else if (disk->type != VIR_DOMAIN_DISK_TYPE_BLOCK) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                           _("disk device='lun' is not supported for type='%s'"),
-                           virDomainDiskTypeToString(disk->type));
+        } else if (disk->type != VIR_DOMAIN_DISK_TYPE_BLOCK &&
+                   !(disk->type == VIR_DOMAIN_DISK_TYPE_VOLUME &&
+                     disk->srcpool->voltype == VIR_STORAGE_VOL_BLOCK)) {
+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                           _("disk device='lun' is only valid for block type disk source"));
             goto error;
         }
         if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_BLK_SG_IO)) {