CentOS Sources
2 years ago
committed by
MSVSphere Packaging Team
parent
7f0989e95e
commit
f03e352787
@ -0,0 +1,53 @@
|
||||
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
|
||||
|
||||
@ -0,0 +1,30 @@
|
||||
From 750e4c9e4ba438c2092dc66046d7a87df3886457 Mon Sep 17 00:00:00 2001
|
||||
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||||
Date: Tue, 29 Nov 2022 08:26:46 +0000
|
||||
Subject: [PATCH] vddk: Document that 8.0.0 has now been tested
|
||||
|
||||
I forgot to update the man page.
|
||||
|
||||
Thanks: Alice Frosi
|
||||
Fixes: commit dbe12ed499baeea94d603db55cad9e971e0ebcf0
|
||||
(cherry picked from commit f0ed40307a2a0b873e4271e90f6e9c2e50c75017)
|
||||
---
|
||||
plugins/vddk/nbdkit-vddk-plugin.pod | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/plugins/vddk/nbdkit-vddk-plugin.pod b/plugins/vddk/nbdkit-vddk-plugin.pod
|
||||
index 4d6040be..988413cf 100644
|
||||
--- a/plugins/vddk/nbdkit-vddk-plugin.pod
|
||||
+++ b/plugins/vddk/nbdkit-vddk-plugin.pod
|
||||
@@ -672,7 +672,7 @@ server, which can also be very slow.
|
||||
This plugin requires VDDK E<ge> 6.5 (released Nov 2016). It is only
|
||||
supported on the x64-64 archtecture.
|
||||
|
||||
-It has been tested with all versions up to 7.0.3 (but should work with
|
||||
+It has been tested with all versions up to 8.0.0 (but should work with
|
||||
future versions).
|
||||
|
||||
VDDK 6.7 was the first version that supported the
|
||||
--
|
||||
2.31.1
|
||||
|
||||
Loading…
Reference in new issue