From e850f65053d89ad54c27280f48506da5eb631a68 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 18 Nov 2022 09:43:19 +0000 Subject: [PATCH] vddk: Add support for VDDK 8.0.0 There are no changes in any of the structures or enums that we rely on. Reported-by: Ming Xie Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2143889 (cherry picked from commit dbe12ed499baeea94d603db55cad9e971e0ebcf0) --- plugins/vddk/nbdkit-vddk-plugin.pod | 2 +- plugins/vddk/vddk.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/vddk/nbdkit-vddk-plugin.pod b/plugins/vddk/nbdkit-vddk-plugin.pod index c56faddc..c94c41eb 100644 --- a/plugins/vddk/nbdkit-vddk-plugin.pod +++ b/plugins/vddk/nbdkit-vddk-plugin.pod @@ -419,7 +419,7 @@ by this build. =item C -The VDDK major library version: 5, 6, 7, ... +The VDDK major library version: 5, 6, 7, 8, ... If this is omitted it means the library could not be loaded. =item C diff --git a/plugins/vddk/vddk.c b/plugins/vddk/vddk.c index 96615749..2140789a 100644 --- a/plugins/vddk/vddk.c +++ b/plugins/vddk/vddk.c @@ -77,7 +77,7 @@ int vddk_debug_datapath = 1; static void *dl; /* dlopen handle */ static bool init_called; /* was InitEx called */ static __thread int error_suppression; /* threadlocal error suppression */ -static int library_version; /* VDDK major: 5, 6, 7, ... */ +static int library_version; /* VDDK major: 5, 6, 7, 8, ... */ static enum { NONE = 0, ZLIB, FASTLZ, SKIPZ } compression; /* compression */ static char *config; /* config */ @@ -309,6 +309,8 @@ load_library (bool load_error_is_fatal) * but our testsuite is easier to write if we point libdir * directly to a stub .so. */ + { "lib64/libvixDiskLib.so.8", 8 }, + { "libvixDiskLib.so.8", 8 }, { "lib64/libvixDiskLib.so.7", 7 }, { "libvixDiskLib.so.7", 7 }, { "lib64/libvixDiskLib.so.6", 6 }, -- 2.31.1