From: Scott Sullivan <ssullivan@liquidweb.com>
Date: Wed, 21 Nov 2012 18:06:25 +0000 (-0500)
Subject: qemu: fix RBD attach regression
X-Git-Tag: CVE-2012-3411~94
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f0e72b2f5c675f927d04545dc5095f9e5998f171;p=thirdparty%2Flibvirt.git

qemu: fix RBD attach regression

I have been testing libvirt v1.0.0 for deployment within my
organization, and in the process discovered what appears to be a bug
that breaks virsh attach-device, when attaching an RBD volume to an
instance. First, here is the error presented, with v1.0.0 (this worked
in v0.10.2):

[root@host ~]# virsh attach-device W5APQ8  G84VV1.xml
error: Failed to attach device from G84VV1.xml
error: cannot open file 'dc3-1-test/G84VV1': No such file or directory

Using git bisect, I narrowed the problem down to this as the first
commit to break this setup:

4d34c92947e8cf9e9bedfa227ada1d2dba92d68a is the first bad commit
---

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index e0d6951e86..92f4a3ed7f 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -2028,7 +2028,7 @@ qemuDomainDetermineDiskChain(struct qemud_driver *driver,
 {
     bool probe = driver->allowDiskFormatProbing;
 
-    if (!disk->src)
+    if (!disk->src || disk->type == VIR_DOMAIN_DISK_TYPE_NETWORK)
         return 0;
 
     if (disk->backingChain) {