54 lines
2.0 KiB
Diff
54 lines
2.0 KiB
Diff
From b1023cdc159ed852baf1b43e58e95b011df09182 Mon Sep 17 00:00:00 2001
|
|
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
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 3991e86b..4d6040be 100644
|
|
--- a/plugins/vddk/nbdkit-vddk-plugin.pod
|
|
+++ b/plugins/vddk/nbdkit-vddk-plugin.pod
|
|
@@ -526,7 +526,7 @@ by this build.
|
|
|
|
=item C<vddk_library_version=...>
|
|
|
|
-The VDDK major library version: 6, 7, ...
|
|
+The VDDK major library version: 6, 7, 8, ...
|
|
If this is omitted it means the library could not be loaded.
|
|
|
|
=item C<vddk_dll=...>
|
|
diff --git a/plugins/vddk/vddk.c b/plugins/vddk/vddk.c
|
|
index 35697bc1..9e29075f 100644
|
|
--- a/plugins/vddk/vddk.c
|
|
+++ b/plugins/vddk/vddk.c
|
|
@@ -77,7 +77,7 @@ NBDKIT_DLL_PUBLIC int vddk_debug_datapath = 1;
|
|
void *dl; /* dlopen handle */
|
|
bool init_called; /* was InitEx called */
|
|
__thread int error_suppression; /* threadlocal error suppression */
|
|
-int library_version; /* VDDK major: 6, 7, ... */
|
|
+int library_version; /* VDDK major: 6, 7, 8, ... */
|
|
bool is_remote; /* true if remote connection */
|
|
|
|
enum compression_type compression; /* compression */
|
|
@@ -403,6 +403,8 @@ load_library (bool load_error_is_fatal)
|
|
* 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
|
|
|