52 lines
1.4 KiB
Diff
52 lines
1.4 KiB
Diff
From bf1eabb211004f3dc74dd243e2adf52a13290377 Mon Sep 17 00:00:00 2001
|
|
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
Date: Wed, 6 May 2020 09:33:32 +0100
|
|
Subject: [PATCH 13/19] vddk: Update for VDDK 7.0 (RHBZ#1831969).
|
|
|
|
This version of VDDK changes the soname to libvixDiskLib.so.7.
|
|
|
|
Thanks: Ming Xie
|
|
(cherry picked from commit 7f53999179af98aa47569c6771517f7dfa08c5d0)
|
|
---
|
|
plugins/vddk/vddk-structs.h | 4 +++-
|
|
plugins/vddk/vddk.c | 1 +
|
|
2 files changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/plugins/vddk/vddk-structs.h b/plugins/vddk/vddk-structs.h
|
|
index 86087871..fff7201b 100644
|
|
--- a/plugins/vddk/vddk-structs.h
|
|
+++ b/plugins/vddk/vddk-structs.h
|
|
@@ -32,7 +32,7 @@
|
|
|
|
/* Types and structs that we pass to or return from the VDDK API.
|
|
*
|
|
- * Updated to VDDK 6.7
|
|
+ * Updated to VDDK 7.0
|
|
*/
|
|
|
|
#ifndef NBDKIT_VDDK_STRUCTS_H
|
|
@@ -127,6 +127,8 @@ typedef struct VixDiskLibInfo {
|
|
int numLinks;
|
|
char *parentFileNameHint;
|
|
char *uuid;
|
|
+ uint32_t logicalSectorSize; /* Added in 7.0. */
|
|
+ uint32_t physicalSectorSize; /* Added in 7.0. */
|
|
} VixDiskLibInfo;
|
|
|
|
typedef struct {
|
|
diff --git a/plugins/vddk/vddk.c b/plugins/vddk/vddk.c
|
|
index 5d3764d6..97ef5297 100644
|
|
--- a/plugins/vddk/vddk.c
|
|
+++ b/plugins/vddk/vddk.c
|
|
@@ -149,6 +149,7 @@ vddk_load (void)
|
|
{
|
|
static const char *sonames[] = {
|
|
/* Prefer the newest library in case multiple exist. */
|
|
+ "libvixDiskLib.so.7",
|
|
"libvixDiskLib.so.6",
|
|
"libvixDiskLib.so.5",
|
|
};
|
|
--
|
|
2.18.2
|
|
|