|
 |
218e99 |
From ece4ff225717364edc3136599113709dacdc5731 Mon Sep 17 00:00:00 2001
|
|
|
218e99 |
Message-Id: <ece4ff225717364edc3136599113709dacdc5731.1383564115.git.minovotn@redhat.com>
|
|
|
218e99 |
In-Reply-To: <5575e0aec51f40ebec46e98ec085cda053283aba.1383564115.git.minovotn@redhat.com>
|
|
|
218e99 |
References: <5575e0aec51f40ebec46e98ec085cda053283aba.1383564115.git.minovotn@redhat.com>
|
|
|
218e99 |
From: Kevin Wolf <kwolf@redhat.com>
|
|
|
218e99 |
Date: Thu, 31 Oct 2013 12:13:14 +0100
|
|
|
218e99 |
Subject: [PATCH 13/14] rbd: Only look for qemu-specific copy of librbd.so.1
|
|
|
218e99 |
|
|
|
218e99 |
RH-Author: Kevin Wolf <kwolf@redhat.com>
|
|
|
218e99 |
Message-id: <1383221595-24285-3-git-send-email-kwolf@redhat.com>
|
|
|
218e99 |
Patchwork-id: 55184
|
|
|
218e99 |
O-Subject: [RHEL-7.0 qemu-kvm PATCH 2/3] rbd: Only look for qemu-specific copy of librbd.so.1
|
|
|
218e99 |
Bugzilla: 989608
|
|
|
218e99 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Fam Zheng <famz@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
218e99 |
|
|
|
218e99 |
Bugzilla: 989608
|
|
|
218e99 |
Upstream status: n/a
|
|
|
218e99 |
Downstream status: Forward ported from RHEL 6
|
|
|
218e99 |
|
|
|
218e99 |
For non-technical reasons, we don't want to pick up a random librbd that
|
|
|
218e99 |
may be installed for other reasons on this system, but only a librbd
|
|
|
218e99 |
that was specificially installed in order to consciously extend qemu.
|
|
|
218e99 |
|
|
|
218e99 |
So change the gmodule_open() argument to an absolute path.
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
218e99 |
---
|
|
|
218e99 |
block/rbd.c | 2 +-
|
|
|
218e99 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Michal Novotny <minovotn@redhat.com>
|
|
|
218e99 |
---
|
|
|
218e99 |
block/rbd.c | 2 +-
|
|
|
218e99 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
218e99 |
|
|
|
218e99 |
diff --git a/block/rbd.c b/block/rbd.c
|
|
|
218e99 |
index 7f5cfca..7b6e03b 100644
|
|
|
218e99 |
--- a/block/rbd.c
|
|
|
218e99 |
+++ b/block/rbd.c
|
|
|
218e99 |
@@ -1122,7 +1122,7 @@ static int qemu_rbd_load_libs(void)
|
|
|
218e99 |
return -1;
|
|
|
218e99 |
}
|
|
|
218e99 |
|
|
|
218e99 |
- librbd_handle = g_module_open("librbd.so.1", 0);
|
|
|
218e99 |
+ librbd_handle = g_module_open("/usr/lib64/qemu/librbd.so.1", 0);
|
|
|
218e99 |
if (!librbd_handle) {
|
|
|
218e99 |
error_report("error loading librbd: %s", g_module_error());
|
|
|
218e99 |
return -1;
|
|
|
218e99 |
--
|
|
|
218e99 |
1.7.11.7
|
|
|
218e99 |
|