- Devel - libvirt List Archives

[libvirt] Memory leak in virInitialize -> vboxRegister -> VBoxCGlueInit
by Richard W.M. Jones 13 Aug '12

13 Aug '12

https://bugzilla.redhat.com/show_bug.cgi?id=847429 Spotted by valgrind: ==2390== 45 bytes in 1 blocks are definitely lost in loss record 68 of 123 ==2390== at 0x4A086DC: malloc (vg_replace_malloc.c:270) ==2390== by 0x30D060EBA0: _dl_signal_error (in /usr/lib64/ld-2.16.so) ==2390== by 0x30D0612CF2: _dl_open (in /usr/lib64/ld-2.16.so) ==2390== by 0x30D1601025: dlopen_doit (in /usr/lib64/libdl-2.16.so) ==2390== by 0x30D060EDC5: _dl_catch_error (in /usr/lib64/ld-2.16.so) ==2390== by 0x30D160163B: _dlerror_run (in /usr/lib64/libdl-2.16.so) ==2390== by 0x30D16010C0: dlopen@@GLIBC_2.2.5 (in /usr/lib64/libdl-2.16.so) ==2390== by 0x5893994: tryLoadOne (vbox_XPCOMCGlue.c:127) ==2390== by 0x5893BE2: VBoxCGlueInit (vbox_XPCOMCGlue.c:230) ==2390== by 0x589407F: vboxRegister (vbox_driver.c:88) ==2390== by 0x5817568: virInitialize (libvirt.c:450) ==2390== by 0x5492C02: init_libguestfs (guestfs.c:108) libvirt-0.10.0-0rc0.fc18.x86_64 libguestfs calls virInitialize, but (since there is no cleanup function) doesn't do any corresponding cleanup. Is that correct? Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming blog: http://rwmj.wordpress.com Fedora now supports 80 OCaml packages (the OPEN alternative to F#) http://cocan.org/getting_started_with_ocaml_on_red_hat_and_fedora

3 3

[libvirt] [libvirt-snmp] [PATCH] Fix build rules to use LDADD to add libraries
by Doug Goldstein 13 Aug '12

13 Aug '12

Fix build rules to use LDADD to add libraries to support --as-needed. Also refactored some of the other automake variables in the same fashion of the libvirt's automake rules. Signed-off-by: Doug Goldstein <cardoe(a)cardoe.com> --- configure.ac | 4 ++++ src/Makefile.am | 31 ++++++++++++++++--------------- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/configure.ac b/configure.ac index a2bb1ac..9d7d03c 100644 --- a/configure.ac +++ b/configure.ac @@ -3,6 +3,10 @@ AM_INIT_AUTOMAKE([-Wall -Werror]) AC_CONFIG_HEADERS([config.h]) AC_PREREQ([2.50]) + +AC_PROG_CC +AM_PROG_CC_C_O + AC_CHECK_FUNCS([memset]) AC_CHECK_FUNCS([strdup]) AC_CHECK_HEADERS([stdlib.h]) diff --git a/src/Makefile.am b/src/Makefile.am index 6d27bf5..622a280 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,19 +1,5 @@ bin_PROGRAMS=libvirtMib_subagent -AM_CFLAGS = \ - $(COVERAGE_CFLAGS) \ - $(DRIVER_MODULE_CFLAGS) \ - $(SNMP_CFLAGS) \ - $(LIBVIRT_CFLAGS) \ - $(WARN_CFLAGS) \ - $(LOCK_CHECKING_CFLAGS) - -AM_LDFLAGS = \ - $(COVERAGE_LDFLAGS) \ - $(PTHREAD_LIBS) \ - $(LIBVIRT_LIBS) \ - $(SNMP_LIBS) - LIBVIRT_OLD_SRCS = \ threads.c \ event_poll.c \ @@ -58,7 +44,22 @@ HDRS = \ libvirtGuestTable.h libvirtMib_subagent_SOURCES=${SRCS} ${HDRS} -libvirtMib_subagent_LDFLAGS=${AM_LDFLAGS} + +libvirtMib_subagent_CFLAGS= \ + $(DRIVER_MODULE_CFLAGS) \ + $(SNMP_CFLAGS) \ + $(LIBVIRT_CFLAGS) \ + $(COVERAGE_CFLAGS) \ + $(WARN_CFLAGS) \ + $(LOCK_CHECKING_CFLAGS) + +libvirtMib_subagent_LDFLAGS= \ + $(COVERAGE_LDFLAGS) + +libvirtMib_subagent_LDADD= \ + $(PTHREAD_LIBS) \ + $(LIBVIRT_LIBS) \ + $(SNMP_LIBS) if LIBVIRT_OLD libvirtMib_subagent_SOURCES+=${LIBVIRT_OLD_SRCS} ${LIBVIRT_OLD_HDRS} -- 1.7.8.6

3 2

[libvirt] [PATCH v3] json: fix interface locale dependency
by Martin Kletzander 13 Aug '12

13 Aug '12

I'm trying to get a optimized and reusable version of the code fixing libvirt's locale dependency. This time I'm sending two versions of the patch: v1) adds static function virNumberToStr() that converts one number to string base on a parameter defining the format. For float, double and long double there are functions that should be used in the code. v2) adds function for converting only double to string. This version has also a little bit differently separated the conditional code. I personally like the second version better. for two reasons. 1) it looks better, 2) there is no need for special-formatting with C locale unless the result is being parsed by machine in which case the '%lf' is always sufficient. Martin Kletzander (1): json: fix interface locale dependency bootstrap.conf | 1 + configure.ac | 2 +- src/libvirt_private.syms | 3 + src/util/json.c | 2 +- src/util/util.c | 137 ++++++++++++++++++++++++++++++++++++++++++++++ src/util/util.h | 7 ++ 6 files changed, 150 insertions(+), 2 deletions(-) -- 1.7.8.6

2 4

[libvirt] [PATCH 0/1] Add VLAN capability to openvswitch virtualport types
by Kyle Mestery 13 Aug '12

13 Aug '12

With this change, it is now possible to support VLANs (both access and trunks) for openvswitch ports in libvirt. This also takes into account the profileid parameter, as the vlantag parameter is also optional. Examples of this configuration are below. Setup the port as an access port: <interface type='bridge'> <mac address='52:54:00:30:23:a6'/> <source bridge='data-br'/> <virtualport type='openvswitch'> <parameters interfaceid='cdbbbc31-b7fe-16ca-a715-cc7cc76e18b2' vlantag='70'/> </virtualport> <model type='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> Setup the port as an trunk port: <interface type='bridge'> <mac address='52:54:00:30:23:a6'/> <source bridge='data-br'/> <virtualport type='openvswitch'> <parameters interfaceid='cdbbbc31-b7fe-16ca-a715-cc7cc76e18b2' vlantag='70,71,72'/> </virtualport> <model type='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> src/conf/netdev_vport_profile_conf.c | 34 ++++++++++++++++++++++++++++++---- src/util/virnetdevopenvswitch.c | 23 +++++++++++++++++++++-- src/util/virnetdevvportprofile.h | 2 ++ 3 files changed, 53 insertions(+), 6 deletions(-) -- 1.7.11.2

5 10

[libvirt] [PATCH] Release only specific sanlock resource
by Frido Roose 13 Aug '12

13 Aug '12

This is a patch for bug 826704 All sanlock resources get released when hot-dettaching a disk from the domain because virLockManagerSanlockRelease uses the wrong function parameters/flags. With the patch only the resources that should be released are cleaned up. --- src/locking/lock_driver_sanlock.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index 7c71af3..0625d09 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -814,7 +814,7 @@ static int virLockManagerSanlockRelease(virLockManagerPtr lock, unsigned int flags) { virLockManagerSanlockPrivatePtr priv = lock->privateData; - int res_count; + int res_count=priv->res_count; int rv; virCheckFlags(0, -1); @@ -834,7 +834,7 @@ static int virLockManagerSanlockRelease(virLockManagerPtr lock, VIR_FREE(*state); } - if ((rv = sanlock_release(-1, priv->vm_pid, SANLK_REL_ALL, 0, NULL)) < 0) { + if ((rv = sanlock_release(-1, priv->vm_pid, 0, res_count, priv->res_args)) < 0) { if (rv <= -200) virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to release lock: error %d"), rv); -- 1.7.1

1 0

[libvirt] [PATCH] build: fix binary location in stap files --with-driver-modules
by Laine Stump 13 Aug '12

13 Aug '12

libvirt_qemu_probes.stp stopped working after switching to a build that used --with-driver-modules. This was because the symbols listed int libvirt_qemu_probes.stp are no longer in $(bindir)/libvirtd, but are now in $(libdir)/connection-driver/libvirt_driver_qemu.so. This patch enhances dtrace2systemtap.pl (which generates the .stp files from .d files) to look for a new "module" setting in the comments of the .d file (similar to the existing "binary" setting), and to look for a --with-modules option. If the --with-modules option is set *and* a "module" setting is present in the .d file, the process name for the stap line is set to $libdir/$module If either of these isn't true, it reverts to the old behavior. src/Makefile.am was also modified to add the --with-modules option when the build calls for it, and src/libvirt_qemu_probes.d has added a "module" line pointing to the correct .so file for the qemu driver. --- src/Makefile.am | 7 +++++-- src/dtrace2systemtap.pl | 12 ++++++++++++ src/libvirt_qemu_probes.d | 1 + 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 6ed4a41..79b4e59 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1393,6 +1393,9 @@ nodist_libvirt_la_SOURCES = libvirt_probes.h if WITH_REMOTE nodist_libvirt_driver_remote_la_SOURCES = libvirt_probes.h endif WITH_REMOTE +if WITH_DRIVER_MODULES +DTRACE2SYSTEMTAP_FLAGS = --with-modules +endif BUILT_SOURCES += libvirt_probes.h libvirt_probes.stp libvirt_functions.stp @@ -1429,9 +1432,9 @@ RPC_PROBE_FILES = $(srcdir)/rpc/virnetprotocol.x \ libvirt_functions.stp: $(RPC_PROBE_FILES) $(srcdir)/rpc/gensystemtap.pl $(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gensystemtap.pl $(RPC_PROBE_FILES) > $@ -%_probes.stp: %_probes.d $(srcdir)/dtrace2systemtap.pl +%_probes.stp: %_probes.d $(srcdir)/dtrace2systemtap.pl $(top_builddir)/config.status $(AM_V_GEN)$(PERL) -w $(srcdir)/dtrace2systemtap.pl \ - $(bindir) $(sbindir) $(libdir) $< > $@ + $(DTRACE2SYSTEMTAP_FLAGS) $(bindir) $(sbindir) $(libdir) $< > $@ CLEANFILES += libvirt_probes.h libvirt_probes.o libvirt_probes.lo \ libvirt_qemu_probes.h libvirt_qemu_probes.o \ diff --git a/src/dtrace2systemtap.pl b/src/dtrace2systemtap.pl index c8d42d7..d57de68 100755 --- a/src/dtrace2systemtap.pl +++ b/src/dtrace2systemtap.pl @@ -31,6 +31,13 @@ my $file; my @files; my %files; +my $with_modules = 0; +if ($ARGV[0] eq "--with-modules") { + # set if we want to honor the "module" setting in the .d file + $with_modules = 1; + shift @ARGV; +} + my $bindir = shift @ARGV; my $sbindir = shift @ARGV; my $libdir = shift @ARGV; @@ -54,6 +61,8 @@ while (<>) { $files{$file}->{prefix} = $1; } elsif (m,^\s*\#\s*binary:\s*(\S+)\s*$,) { $files{$file}->{binary} = $1; + } elsif (m,^\s*\#\s*module:\s*(\S+)\s*$,) { + $files{$file}->{module} = $1; } else { # ignore unknown comments } @@ -98,6 +107,9 @@ foreach my $file (@files) { if (exists $files{$file}->{binary}) { $binary = $sbindir . "/" . $files{$file}->{binary}; } + if ($with_modules && exists $files{$file}->{module}) { + $binary = $libdir . "/" . $files{$file}->{module}; + } print "probe $pname = process(\"$binary\").mark(\"$name\") {\n"; diff --git a/src/libvirt_qemu_probes.d b/src/libvirt_qemu_probes.d index 6916778..e4449a9 100644 --- a/src/libvirt_qemu_probes.d +++ b/src/libvirt_qemu_probes.d @@ -2,6 +2,7 @@ provider libvirt { # file: src/qemu/qemu_monitor.c # prefix: qemu # binary: libvirtd + # module: libvirt/connection-driver/libvirt_driver_qemu.so # Monitor lifecycle probe qemu_monitor_new(void *mon, int refs, int fd); probe qemu_monitor_ref(void *mon, int refs); -- 1.7.11.2

3 3

[libvirt] Proposal to add iSCSI support to esx storage driver
by Ata Bohra 13 Aug '12

13 Aug '12

Hi All, I just want to go over the design that I am working on to incorporate iSCSI support to libvirt ESX storage driver. The highlights are: Current Implementation At present esx_storage_driver supports only VMFS type datastore and does not provide much leeway to enhance or add other supported storage pools such as iSCSI. Proposal My proposal is: 1. Split the current code such as esx_storage_driver becomes more like a facade; this driver will use "backend" drivers to perform the request task (such as: esx_storage_backend_iscsi and esx_storage_backend_vmfs) 2. Based on the pool type (lookup can determine storage pool type), the base driver then invoke the appropriate backend driver routine to get the job done. 3. Backend driver shall implement same routines exposed by esx_storage_driver if needed, but the implementation will be pertinent to its specific type. The main intention is get early feedback w.r.t the above proposed design. This allows me to make changes quickly before I present the code for review and am sure will help expedite the overall review process as well. Thanks for your suggestions/comments. Thanks & Regards, Ata E Husain Bohra Appendex: Sample code to implement .lookupByName for esx storage driver static virStoragePoolPtr esxStoragePoolLookupByName(virConnectPtr conn, const char *name) { esxPrivate *priv = conn->storagePrivateData; virStoragePoolPtr pool = NULL; int i = 0; if (esxVI_EnsureSession(priv->primary) < 0) { return NULL; } for (i = 0; i < MAX_BACKEND_DRIVER; ++i) { pool = backendDrv[i]->poolLookupByName(conn, name); // backendDrv are pointer to backend storage drivers. if (pool != NULL) { break; } } return pool; }

2 4

[libvirt] [PATCH v2] json: fix interface locale dependency
by Martin Kletzander 11 Aug '12

11 Aug '12

libvirt creates invalid commands if wrong locale is selected. For example with locale that uses comma as a decimal point, JSON commands created with decimal numbers are invalid because comma separates the entries in JSON. Fortunately even when decimal point is affected, thousands grouping is not, because for grouping to be enabled with *printf, there has to be an apostrophe flag specified (and supported). This patch adds specific internal function for printing with C locale and a fallback for the particular case with double formatting in case these functions are not supported. --- v2: - added support for xlocale - fallback option kept, but main function moved to util.c src/libvirt_private.syms | 1 + src/util/json.c | 23 ++++++++++++++++++++++- src/util/util.c | 42 ++++++++++++++++++++++++++++++++++++++++++ src/util/util.h | 2 ++ 4 files changed, 67 insertions(+), 1 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 79b4a18..6ce87bf 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1138,6 +1138,7 @@ safezero; virArgvToString; virAsprintf; virBuildPathInternal; +virCasprintf; virDirCreate; virEnumFromString; virEnumToString; diff --git a/src/util/json.c b/src/util/json.c index 5132989..3dfa039 100644 --- a/src/util/json.c +++ b/src/util/json.c @@ -22,6 +22,7 @@ #include <config.h> +#include <locale.h> #include "json.h" #include "memory.h" @@ -201,8 +202,28 @@ virJSONValuePtr virJSONValueNewNumberDouble(double data) { virJSONValuePtr val = NULL; char *str; - if (virAsprintf(&str, "%lf", data) < 0) + + int ret = virCasprintf(&str, "%lf", data) + + if (ret == -1) { return NULL; + } else if (ret == -2) { + char *radix, *tmp; + struct lconv *lc; + + if ((ret = virAsprintf(&str, "%lf", data)) < 0) + return NULL; + + lc = localeconv(); + radix = lc->decimal_point; + tmp = strstr(str, radix); + if (tmp) { + *tmp = '.'; + if (strlen(radix) > 1) + memmove(tmp + 1, tmp + strlen(radix), strlen(str) - (tmp - str)); + } + } + val = virJSONValueNewNumber(str); VIR_FREE(str); return val; diff --git a/src/util/util.c b/src/util/util.c index e5bb27b..de090a6 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -44,6 +44,7 @@ #include <signal.h> #include <termios.h> #include <pty.h> +#include <locale.h> #if HAVE_LIBDEVMAPPER_H # include <libdevmapper.h> @@ -2003,6 +2004,47 @@ virAsprintf(char **strp, const char *fmt, ...) } /** + * virCasprintf + * + * the same as virAsprintf, but with C locale (thread-safe) + * + * If thread-safe locales aren't supported, then the return value is -2, + * no memory (or other vasnprintf errors) results in -1. + * When successful, the value returned by virAsprintf is passed. + */ +#if HAVE_XLOCALE_H +int +virCasprintf(char **strp, const char *fmt, ...) +{ + va_list ap; + int ret = -1; + locale_t c_loc, old_loc; + c_loc = newlocale(LC_ALL, "C", NULL); + if (!c_loc) + goto no_memory; + + old_loc = uselocale(c_loc); + + va_start(ap, fmt); + ret = virVasprintf(strp, fmt, ap); + va_end(ap); + + uselocale(old_loc); + + no_memory: + freelocale(c_loc); + return ret; +} +#else +int +virCasprintf(char **strp ATTRIBUTE_UNUSED, + const char *fmt ATTRIBUTE_UNUSED, ...) +{ + return -2; +} +#endif + +/** * virStrncpy * * A safe version of strncpy. The last parameter is the number of bytes diff --git a/src/util/util.h b/src/util/util.h index d151c27..4b7f286 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -201,6 +201,8 @@ int virParseVersionString(const char *str, unsigned long *version, bool allowMissing); int virAsprintf(char **strp, const char *fmt, ...) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_FMT_PRINTF(2, 3); +int virCasprintf(char **strp, const char *fmt, ...) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_FMT_PRINTF(2, 3); int virVasprintf(char **strp, const char *fmt, va_list list) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_FMT_PRINTF(2, 0); char *virStrncpy(char *dest, const char *src, size_t n, size_t destbytes) -- 1.7.8.6

2 4

[libvirt] [PATCH] virterror: Add error message for unsupported operations.
by Peter Krempa 11 Aug '12

11 Aug '12

This patch introduces a new error code VIR_ERR_OPERATION_UNSUPPORTED to mark error messages regarding operations that failed due to lack of support on the hypervisor or other than libvirt issues. The code is first used in reporting error if qemu does not support block IO tuning variables yielding error message: error: Unable to get block I/O throttle parameters error: Operation not supported: block_io_throttle field 'total_bytes_sec' missing in qemu's output instead of: error: Unable to get block I/O throttle parameters error: internal error cannot read total_bytes_sec --- include/libvirt/virterror.h | 2 ++ src/qemu/qemu_monitor_json.c | 4 ++-- src/util/virterror.c | 6 ++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/include/libvirt/virterror.h b/include/libvirt/virterror.h index ad8e101..913fc5d 100644 --- a/include/libvirt/virterror.h +++ b/include/libvirt/virterror.h @@ -277,6 +277,8 @@ typedef enum { VIR_ERR_MIGRATE_UNSAFE = 81, /* Migration is not safe */ VIR_ERR_OVERFLOW = 82, /* integer overflow */ VIR_ERR_BLOCK_COPY_ACTIVE = 83, /* action prevented by block copy job */ + VIR_ERR_OPERATION_UNSUPPORTED = 84, /* The requested operation is not + supported */ } virErrorNumber; /** diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 3ede88d..7e482d1 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -3652,11 +3652,11 @@ int qemuMonitorJSONOpenGraphics(qemuMonitorPtr mon, if (virJSONValueObjectGetNumberUlong(inserted, \ FIELD, \ &reply->STORE) < 0) { \ - virReportError(VIR_ERR_INTERNAL_ERROR, \ + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, \ _("block_io_throttle field '%s' missing " \ "in qemu's output"), \ #STORE); \ - goto cleanup; \ + goto cleanup; \ } static int qemuMonitorJSONBlockIoThrottleInfo(virJSONValuePtr result, diff --git a/src/util/virterror.c b/src/util/virterror.c index a40cfe0..c438de8 100644 --- a/src/util/virterror.c +++ b/src/util/virterror.c @@ -1185,6 +1185,12 @@ virErrorMsg(virErrorNumber error, const char *info) else errmsg = _("block copy still active: %s"); break; + case VIR_ERR_OPERATION_UNSUPPORTED: + if (!info) + errmsg = _("Operation not supported"); + else + errmsg = _("Operation not supported: %s"); + break; } return errmsg; } -- 1.7.8.6

3 5

[libvirt] [PATCH] Fix timebomb in LIBVIRT_VERSION_INFO calculation
by Daniel P. Berrange 10 Aug '12

10 Aug '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> The way LIBVIRT_VERSION_INFO is calculated has a timebomb that will cause us to accidentally break soname when we change the major version number to a non-zero value ! Given CURRENT:REVISION:AGE, libtool will generate libvirt.so.($CURRENT-$AGE).$AGE.$REVISION We set CURRENT to be MAJOR+MINOR and AGE to $MINOR, so as soon as MAJOR changes to non-zero, we get libvirt.so.1 as the soname, eg 1.3.9 would create libvirt.so.1.3.9 Looks natural but is not ABI compatible with libvirt.so.0.x.y The fix is to set CURRENT to always be exactly the same as AGE. We want to have the major version reflected in the so symlinks though. So then we set AGE to MAJOR*1000+MINOR eg, so 1.3.9 would create libvirt.so.0.1003.9 and libvirt 2.51.3 would create libvirt.so.0.2051.3 --- configure.ac | 41 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 8a04d91..8de2c6c 100644 --- a/configure.ac +++ b/configure.ac @@ -23,16 +23,55 @@ AM_SILENT_RULES([yes]) AC_CANONICAL_HOST +# First extract pieces from the version number string LIBVIRT_MAJOR_VERSION=`echo $VERSION | awk -F. '{print $1}'` LIBVIRT_MINOR_VERSION=`echo $VERSION | awk -F. '{print $2}'` LIBVIRT_MICRO_VERSION=`echo $VERSION | awk -F. '{print $3}'` LIBVIRT_VERSION=$LIBVIRT_MAJOR_VERSION.$LIBVIRT_MINOR_VERSION.$LIBVIRT_MICRO_VERSION$LIBVIRT_MICRO_VERSION_SUFFIX -LIBVIRT_VERSION_INFO=`expr $LIBVIRT_MAJOR_VERSION + $LIBVIRT_MINOR_VERSION`:$LIBVIRT_MICRO_VERSION:$LIBVIRT_MINOR_VERSION LIBVIRT_VERSION_NUMBER=`expr $LIBVIRT_MAJOR_VERSION \* 1000000 + $LIBVIRT_MINOR_VERSION \* 1000 + $LIBVIRT_MICRO_VERSION` +# In libtool terminology we need to figure out: +# +# CURRENT +# The most recent interface number that this library implements. +# +# REVISION +# The implementation number of the CURRENT interface. +# +# AGE +# The difference between the newest and oldest interfaces that this +# library implements. +# +# In other words, the library implements all the interface numbers +# in the range from number `CURRENT - AGE' to `CURRENT'. +# +# Libtool assigns the soname version from `CURRENT - AGE', and we +# don't want that to ever change in libvirt. ie it must always be +# zero, to produce libvirt.so.0. +# +# We would, however, like the libvirt version number reflected +# in the so version'd symlinks, and this is based on AGE.REVISION +# eg libvirt.so.0.AGE.REVISION +# +# Assuming we do ever want to break soname version, this can +# toggled. But seriously, don't ever touch this. +LIBVIRT_SONUM=0 + +# The following examples show what libtool will do +# +# Input: 0.9.14 -> libvirt.so.0.9.14 +# Input: 1.0.0 -> libvirt.so.0.1000.0 +# Input: 2.5.8 -> libvirt.so.0.2005.8 +# +AGE=`expr $LIBVIRT_MAJOR_VERSION '*' 1000 + $LIBVIRT_MINOR_VERSION` +REVISION=$LIBVIRT_MICRO_VERSION +CURRENT=`expr $LIBVIRT_SONUM + $AGE` +LIBVIRT_VERSION_INFO=$CURRENT:$REVISION:$AGE + AC_SUBST([LIBVIRT_MAJOR_VERSION]) AC_SUBST([LIBVIRT_MINOR_VERSION]) AC_SUBST([LIBVIRT_MICRO_VERSION]) +AC_SUBST([LIBVIRT_SONUM]) AC_SUBST([LIBVIRT_VERSION]) AC_SUBST([LIBVIRT_VERSION_INFO]) AC_SUBST([LIBVIRT_VERSION_NUMBER]) -- 1.7.11.2

2 1