From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 2 May 2016 11:08:53 +0000 (+0200)
Subject: lxc: Fix wrong error message on disk hotplug
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=5e9d56f83fad5cb80ae14567577b02a492c90a7d;p=libvirt.git

lxc: Fix wrong error message on disk hotplug

Commit 36025c552 tried to improve error reporting for <disk type="lun">
but reused the code in LXC which doesn't care about the actual disk
type. The error messages would then contain a bogous hint that the
config for the 'lun' device is invalid which might not be the case.

Re-do the relevant portion of the commit with the original message.
---

diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index 1dfbde3330..a2268504dd 100644
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -4106,9 +4106,6 @@ lxcDomainAttachDeviceDiskLive(virLXCDriverPtr driver,
         goto cleanup;
     }
 
-    if (!virDomainDiskSourceIsBlockType(def->src, true))
-        goto cleanup;
-
     src = virDomainDiskGetSource(def);
     if (src == NULL) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
@@ -4116,6 +4113,12 @@ lxcDomainAttachDeviceDiskLive(virLXCDriverPtr driver,
         goto cleanup;
     }
 
+    if (!virStorageSourceIsBlockLocal(def->src)) {
+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                       _("Can't setup disk for non-block device"));
+        goto cleanup;
+    }
+
     if (virDomainDiskIndexByName(vm->def, def->dst, true) >= 0) {
         virReportError(VIR_ERR_OPERATION_FAILED,
                        _("target %s already exists"), def->dst);