shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-10 05:17:59 +03:00
Code Releases Activity

Fix parted check & disable storage driver if daemon isn't present

Browse Source
This commit is contained in:
Daniel P. Berrange 2008-05-29 19:23:17 +00:00
parent 895d0fdf5b
commit 5e124764c1
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Thu May 29 15:17:00 EST 2008 Daniel P. Berrange <berrange@redhat.com>
* src/libvirt.c: Don't register storage API if daemon is
disabled.
* configure.in: Fix check for parted to deal with missing
devel package correctly
Thu May 29 15:17:00 EST 2008 Daniel P. Berrange <berrange@redhat.com> Thu May 29 15:17:00 EST 2008 Daniel P. Berrange <berrange@redhat.com>
* src/conf.c, src/conf.h, src/qemu_conf.c, src/qemu_driver.c, * src/conf.c, src/conf.h, src/qemu_conf.c, src/qemu_driver.c,

8
configure.in
View File

@ -745,9 +745,13 @@ LIBPARTED_CFLAGS=
LIBPARTED_LIBS= LIBPARTED_LIBS=
if test "$with_storage_disk" = "yes" -o "$with_storage_disk" = "check"; then if test "$with_storage_disk" = "yes" -o "$with_storage_disk" = "check"; then
AC_PATH_PROG([PARTED], [parted], [], [$PATH:/sbin:/usr/sbin]) AC_PATH_PROG([PARTED], [parted], [], [$PATH:/sbin:/usr/sbin])
if test -z "$PARTED" ; then with_storage_disk=no ; fi if test -z "$PARTED" ; then
with_storage_disk=no
PARTED_FOUND=no
else
PARTED_FOUND=yes PARTED_FOUND=yes
fi
if test "$with_storage_disk" != "no" -a "x$PKG_CONFIG" != "x" ; then if test "$with_storage_disk" != "no" -a "x$PKG_CONFIG" != "x" ; then
PKG_CHECK_MODULES(LIBPARTED, libparted >= $PARTED_REQUIRED, [], [PARTED_FOUND=no]) PKG_CHECK_MODULES(LIBPARTED, libparted >= $PARTED_REQUIRED, [], [PARTED_FOUND=no])
fi fi

2
src/libvirt.c
View File

@ -283,7 +283,9 @@ virInitialize(void)
#ifdef WITH_LXC #ifdef WITH_LXC
if (lxcRegister() == -1) return -1; if (lxcRegister() == -1) return -1;
#endif #endif
#ifdef WITH_LIBVIRTD
if (storageRegister() == -1) return -1; if (storageRegister() == -1) return -1;
#endif
#ifdef WITH_REMOTE #ifdef WITH_REMOTE
if (remoteRegister () == -1) return -1; if (remoteRegister () == -1) return -1;
#endif #endif