From: John Ferlan <jferlan@redhat.com>
Date: Mon, 14 Jul 2014 16:17:44 +0000 (-0400)
Subject: GetBlockInfo: Use the correct path to qemuOpenFile
X-Git-Tag: v1.2.7-rc1~130
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=54d4619cdab6b9c80cd0f76408b44841775f06ea;p=thirdparty%2Flibvirt.git

GetBlockInfo: Use the correct path to qemuOpenFile

Commit id '3ea661de' refactored the code to use the 'disk->src->path'
instead of getting the path from virDomainDiskGetSource().  The one
call to qemuOpenFile() didn't use the disk source path, rather it used
the path as passed from the caller (in this case 'vda') - this caused
a failure with the virt-test/tp-libvirt as follows:

$ virsh domblkinfo virt-tests-vm1 vda
error: cannot stat file '/home/virt-test/shared/data/images/jeos-20-64.qcow2': Bad file descriptor

$
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index ecccf6ca09..8d40bc9d0e 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -10370,7 +10370,8 @@ qemuDomainGetBlockInfo(virDomainPtr dom,
             goto cleanup;
         }
 
-        if ((fd = qemuOpenFile(driver, vm, path, O_RDONLY, NULL, NULL)) == -1)
+        if ((fd = qemuOpenFile(driver, vm, disk->src->path, O_RDONLY,
+                               NULL, NULL)) == -1)
             goto cleanup;
 
         if (fstat(fd, &sb) < 0) {