That version depends on libexpat.so but does not ship it, and it appears that VMware no longer supports it. Since VDDK 5.5.5 (the next oldest version) dropped support for 32-bit platforms, we can slightly simplify our code by documenting our minimum supported version. Signed-off-by: Eric Blake <eblake@redhat.com> --- As discussed in the libdir= thread. I'm not sure if I overlooked any other spots that can be simplified or where we need to call out this change to the end user. plugins/vddk/nbdkit-vddk-plugin.pod | 3 ++- plugins/vddk/vddk.c | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/plugins/vddk/nbdkit-vddk-plugin.pod b/plugins/vddk/nbdkit-vddk-plugin.pod index 7ea2e797..766db302 100644 --- a/plugins/vddk/nbdkit-vddk-plugin.pod +++ b/plugins/vddk/nbdkit-vddk-plugin.pod @@ -451,7 +451,8 @@ For more information see L<https://bugzilla.redhat.com/1614276>. =head1 SUPPORTED VERSIONS OF VDDK -This plugin requires VDDK E<ge> 5.1.1. +This plugin requires VDDK E<ge> 5.5.5, which in turn means that it +is only supported on 64-bit platforms. It has been tested with all versions up to 6.7 (but should work with future versions). diff --git a/plugins/vddk/vddk.c b/plugins/vddk/vddk.c index 1beecabc..4bfcdea7 100644 --- a/plugins/vddk/vddk.c +++ b/plugins/vddk/vddk.c @@ -71,7 +71,7 @@ int vddk_debug_extents; /* Parameters passed to InitEx. */ #define VDDK_MAJOR 5 -#define VDDK_MINOR 1 +#define VDDK_MINOR 5 static void *dl; /* dlopen handle */ static bool init_called; /* was InitEx called */ @@ -361,14 +361,14 @@ load_library (void) static const char *sonames[] = { /* Prefer the newest library in case multiple exist. Check two * possible directories: the usual VDDK installation puts .so - * files in an arch-specific subdirectory of $libdir (although - * only VDDK 5 supported 32-bit); but our testsuite is easier - * to write if we point libdir directly to a stub .so. + * files in an arch-specific subdirectory of $libdir (our minimum + * supported version is VDDK 5.5.5, which only supports 64-bit); + * but our testsuite is easier to write if we point libdir + * directly to a stub .so. */ "lib64/libvixDiskLib.so.6", "libvixDiskLib.so.6", "lib64/libvixDiskLib.so.5", - "lib32/libvixDiskLib.so.5", "libvixDiskLib.so.5", }; size_t i; -- 2.24.1