From ffe1eaa11c68009ab8ac43317203a69489282f6a Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Mon, 20 Jan 2014 16:04:48 +0100 Subject: [PATCH] Revert "Minimum libvirt version is >= 1.1.1." 0.10.2+ is still available on some recent-ish stable distros (like Fedora 19, Ubuntu 13.04), and should work fine for guestfs. This reverts commit 6b3e05e8da490fc11a2f07f0cc9022216a744ac7. --- README | 2 +- src/launch-libvirt.c | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/README b/README index 7307ac53a..81920861b 100644 --- a/README +++ b/README @@ -118,7 +118,7 @@ The full requirements are described below. +--------------+-------------+---+-----------------------------------------+ | libmagic | | O | The library used by the 'file' command. | +--------------+-------------+---+-----------------------------------------+ -| libvirt | | O | >= 1.1.1 is needed if you want to use | +| libvirt | | O | >= 0.10.2 is needed if you want to use | | | | | libvirt to manage transient VMs. | +--------------+-------------+---+-----------------------------------------+ | xmllint | | O | Part of libxml2. Used for tests only. | diff --git a/src/launch-libvirt.c b/src/launch-libvirt.c index 9b47d305a..8cc261df4 100644 --- a/src/launch-libvirt.c +++ b/src/launch-libvirt.c @@ -63,14 +63,15 @@ * This is also checked at runtime because you can dynamically link * with a different version from what you were compiled with. */ -#define MIN_LIBVIRT_MAJOR 1 -#define MIN_LIBVIRT_MINOR 1 -#define MIN_LIBVIRT_MICRO 1 +#define MIN_LIBVIRT_MAJOR 0 +#define MIN_LIBVIRT_MINOR 10 +#define MIN_LIBVIRT_MICRO 2 /* XXX patches in > 2 already */ #define MIN_LIBVIRT_VERSION (MIN_LIBVIRT_MAJOR * 1000000 + \ MIN_LIBVIRT_MINOR * 1000 + \ MIN_LIBVIRT_MICRO) -#if defined(HAVE_LIBVIRT) && LIBVIR_VERSION_NUMBER >= MIN_LIBVIRT_VERSION +#if defined(HAVE_LIBVIRT) && \ + LIBVIR_VERSION_NUMBER >= MIN_LIBVIRT_VERSION #ifndef HAVE_XMLBUFFERDETACH /* Added in libxml2 2.8.0. This is mostly a copy of the function from @@ -1843,4 +1844,4 @@ init_backend (void) guestfs___register_backend ("libvirt", &backend_libvirt_ops); } -#endif /* libvirt is new enough */ +#endif