Skip to contentSkip to conversation

qemu/rbd: fixes for kevin's comments

PATCH New Christian Brunner 1 participant 1 message May 28, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 qemu/rbd: fixes for kevin's comments

Hi Yehuda,

here are fixes for the comments kevin made after my posting to the qemu/kvm list. The only file I haven't changed yet is the rbd_types header.

Regards,
Christian

---
 Makefile    |    3 -
 block/rbd.c |  190 ++++++++++++++++++++++++++++++++---------------------------
 configure   |   10 ++-
 3 files changed, 110 insertions(+), 93 deletions(-)
Makefile +0 -3
index b96743d..c6c11a5 100644
@@ -27,9 +27,6 @@ configure: ;
 $(call set-vpath, $(SRC_PATH):$(SRC_PATH)/hw)
 
 LIBS+=-lz $(LIBS_TOOLS)
-ifdef CONFIG_RBD
-LIBS+=-lrados
-endif
 
 ifdef BUILD_DOCS
 DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8
block/rbd.c +103 -87

359 lines not on this page · raw message

configure +7 -3
index 29e75d2..b437680 100755
@@ -314,7 +314,7 @@ kvm_kmod="no"
 check_utests="no"
 user_pie="no"
 zero_malloc=""
-rbd="no"
+rbd=""
 
 # OS specific
 if check_define __linux__ ; then
@@ -695,6 +695,8 @@ for opt do
   ;;
   --enable-vhost-net) vhost_net="yes"
   ;;
+  --disable-rbd) rbd="no"
+  ;;
   --enable-rbd) rbd="yes"
   ;;
   *) echo "ERROR: unknown option $opt"; show_help="yes"
@@ -1703,9 +1705,11 @@ if test "$rbd" != "no" ; then
 #include <rados/librados.h>
 int main(void) { rados_initialize(0, NULL); return 0; }
 EOF
-  if compile_prog "" "-lrados -lcrypto" ; then
+  rbd_libs="-lrados -lcrypto"
+  if compile_prog "" "$rbd_libs" ; then
     rbd=yes
-    LIBS="$LIBS -lrados -lcrypto"
+    libs_tools="$rbd_libs $libs_tools"
+    libs_softmmu="$rbd_libs $libs_softmmu"
   else
     if test "$rbd" = "yes" ; then
       feature_not_found "rados block device"
Signature · 1 line
1.7.0.4