rpms
/
nbdkit
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Rebase to new stable branch version 1.28.4 

related: rhbz#2011709
This commit is contained in:
Richard W.M. Jones 2022-01-04 14:17:44 +00:00
parent b5f8430a27
commit 752d86cd28
36 changed files with 72 additions and 472 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
0005-vddk-Refactor-how-D-vddk.stats-1-is-collected.patch → 0001-vddk-Refactor-how-D-vddk.stats-1-is-collected.patch
View File

@ -1,4 +1,4 @@
From 140943f47363e16373364864ab7cbff95cd5397e Mon Sep 17 00:00:00 2001
From 1d9a1341c6d9b0f2150a37ec3617eeee01bbfee2 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 21 Oct 2021 14:49:52 +0100
Subject: [PATCH] vddk: Refactor how -D vddk.stats=1 is collected

41
0001-windows-Use-replacement-pread-and-pwrite-functions.patch
View File

@ -1,41 +0,0 @@
From 340bab208735d6c725045f043fcd1757d15dd6cc Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 9 Dec 2021 18:09:59 +0000
Subject: [PATCH] windows: Use replacement pread and pwrite functions
Fixes: commit ce0db9d7736dd28dd0f10951ce65853e50b35e41
(cherry picked from commit aaca7cfaede90c681265f8a413e250accbf1d5f6)
---
common/utils/Makefile.am | 1 +
common/utils/full-rw.c | 3 +++
2 files changed, 4 insertions(+)
diff --git a/common/utils/Makefile.am b/common/utils/Makefile.am
index 14e9dfc4..c33811fc 100644
--- a/common/utils/Makefile.am
+++ b/common/utils/Makefile.am
@@ -52,6 +52,7 @@ libutils_la_SOURCES = \
$(NULL)
libutils_la_CPPFLAGS = \
-I$(top_srcdir)/include \
+ -I$(top_srcdir)/common/replacements \
$(NULL)
libutils_la_CFLAGS = \
$(WARNINGS_CFLAGS) \
diff --git a/common/utils/full-rw.c b/common/utils/full-rw.c
index 55b32cdd..4b4d1b1a 100644
--- a/common/utils/full-rw.c
+++ b/common/utils/full-rw.c
@@ -41,6 +41,9 @@
#include <unistd.h>
#include <errno.h>
+#include "pread.h"
+#include "pwrite.h"
+
ssize_t
full_pread (int fd, void *buf, size_t count, off_t offset)
{
--
2.31.1

2
0006-vddk-Extend-D-vddk.stats-1-to-show-number-of-calls-a.patch → 0002-vddk-Extend-D-vddk.stats-1-to-show-number-of-calls-a.patch
View File

@ -1,4 +1,4 @@
From f90ad1745e44ef8ecc6b5ae87d1a3811697492e3 Mon Sep 17 00:00:00 2001
From 3c72e2d273fd446905086c6611ca11bd7dace149 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 21 Oct 2021 15:10:00 +0100
Subject: [PATCH] vddk: Extend -D vddk.stats=1 to show number of calls and

236
0002-windows-Link-plugins-filters-that-use-utils-pread-pw.patch
View File

@ -1,236 +0,0 @@
From f768c949fdd01722ba79da7a1b2c55de75ef450a Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 9 Dec 2021 18:23:32 +0000
Subject: [PATCH] windows: Link plugins/filters that use utils + pread/pwrite
with libcompat
Fixes: commit ce0db9d7736dd28dd0f10951ce65853e50b35e41
Fixes: commit aaca7cfaede90c681265f8a413e250accbf1d5f6
(cherry picked from commit dd9ba851c18527f70036317c71672161517577ec)
---
filters/blocksize/Makefile.am | 1 +
filters/cacheextents/Makefile.am | 1 +
filters/checkwrite/Makefile.am | 1 +
filters/error/Makefile.am | 1 +
filters/ip/Makefile.am | 1 +
filters/limit/Makefile.am | 1 +
filters/multi-conn/Makefile.am | 1 +
filters/offset/Makefile.am | 1 +
filters/partition/Makefile.am | 1 +
filters/readahead/Makefile.am | 1 +
filters/retry/Makefile.am | 1 +
filters/stats/Makefile.am | 1 +
filters/swab/Makefile.am | 1 +
filters/truncate/Makefile.am | 1 +
filters/xz/Makefile.am | 1 +
plugins/random/Makefile.am | 1 +
plugins/sparse-random/Makefile.am | 1 +
17 files changed, 17 insertions(+)
diff --git a/filters/blocksize/Makefile.am b/filters/blocksize/Makefile.am
index 5cda19bd..d09e595b 100644
--- a/filters/blocksize/Makefile.am
+++ b/filters/blocksize/Makefile.am
@@ -52,6 +52,7 @@ nbdkit_blocksize_filter_la_LDFLAGS = \
$(NULL)
nbdkit_blocksize_filter_la_LIBADD = \
$(top_builddir)/common/utils/libutils.la \
+ $(top_builddir)/common/replacements/libcompat.la \
$(IMPORT_LIBRARY_ON_WINDOWS) \
$(NULL)
diff --git a/filters/cacheextents/Makefile.am b/filters/cacheextents/Makefile.am
index 5ddffe98..40498416 100644
--- a/filters/cacheextents/Makefile.am
+++ b/filters/cacheextents/Makefile.am
@@ -52,6 +52,7 @@ nbdkit_cacheextents_filter_la_LDFLAGS = \
$(NULL)
nbdkit_cacheextents_filter_la_LIBADD = \
$(top_builddir)/common/utils/libutils.la \
+ $(top_builddir)/common/replacements/libcompat.la \
$(IMPORT_LIBRARY_ON_WINDOWS) \
$(NULL)
diff --git a/filters/checkwrite/Makefile.am b/filters/checkwrite/Makefile.am
index 2171b989..b53a5c0a 100644
--- a/filters/checkwrite/Makefile.am
+++ b/filters/checkwrite/Makefile.am
@@ -52,6 +52,7 @@ nbdkit_checkwrite_filter_la_LDFLAGS = \
$(NULL)
nbdkit_checkwrite_filter_la_LIBADD = \
$(top_builddir)/common/utils/libutils.la \
+ $(top_builddir)/common/replacements/libcompat.la \
$(IMPORT_LIBRARY_ON_WINDOWS) \
$(NULL)
diff --git a/filters/error/Makefile.am b/filters/error/Makefile.am
index 8ce8dc32..3174c3f9 100644
--- a/filters/error/Makefile.am
+++ b/filters/error/Makefile.am
@@ -52,6 +52,7 @@ nbdkit_error_filter_la_LDFLAGS = \
$(NULL)
nbdkit_error_filter_la_LIBADD = \
$(top_builddir)/common/utils/libutils.la \
+ $(top_builddir)/common/replacements/libcompat.la \
$(IMPORT_LIBRARY_ON_WINDOWS) \
$(NULL)
diff --git a/filters/ip/Makefile.am b/filters/ip/Makefile.am
index d09cd1e0..42fa6407 100644
--- a/filters/ip/Makefile.am
+++ b/filters/ip/Makefile.am
@@ -52,6 +52,7 @@ nbdkit_ip_filter_la_LDFLAGS = \
$(NULL)
nbdkit_ip_filter_la_LIBADD = \
$(top_builddir)/common/utils/libutils.la \
+ $(top_builddir)/common/replacements/libcompat.la \
$(IMPORT_LIBRARY_ON_WINDOWS) \
$(NULL)
diff --git a/filters/limit/Makefile.am b/filters/limit/Makefile.am
index b4951ace..364965ff 100644
--- a/filters/limit/Makefile.am
+++ b/filters/limit/Makefile.am
@@ -51,6 +51,7 @@ nbdkit_limit_filter_la_LDFLAGS = \
$(NULL)
nbdkit_limit_filter_la_LIBADD = \
$(top_builddir)/common/utils/libutils.la \
+ $(top_builddir)/common/replacements/libcompat.la \
$(IMPORT_LIBRARY_ON_WINDOWS) \
$(NULL)
diff --git a/filters/multi-conn/Makefile.am b/filters/multi-conn/Makefile.am
index 778b8947..2289e24e 100644
--- a/filters/multi-conn/Makefile.am
+++ b/filters/multi-conn/Makefile.am
@@ -48,6 +48,7 @@ nbdkit_multi_conn_filter_la_CPPFLAGS = \
nbdkit_multi_conn_filter_la_CFLAGS = $(WARNINGS_CFLAGS)
nbdkit_multi_conn_filter_la_LIBADD = \
$(top_builddir)/common/utils/libutils.la \
+ $(top_builddir)/common/replacements/libcompat.la \
$(IMPORT_LIBRARY_ON_WINDOWS) \
$(NULL)
nbdkit_multi_conn_filter_la_LDFLAGS = \
diff --git a/filters/offset/Makefile.am b/filters/offset/Makefile.am
index 5437e700..68986e37 100644
--- a/filters/offset/Makefile.am
+++ b/filters/offset/Makefile.am
@@ -51,6 +51,7 @@ nbdkit_offset_filter_la_LDFLAGS = \
$(NULL)
nbdkit_offset_filter_la_LIBADD = \
$(top_builddir)/common/utils/libutils.la \
+ $(top_builddir)/common/replacements/libcompat.la \
$(IMPORT_LIBRARY_ON_WINDOWS) \
$(NULL)
diff --git a/filters/partition/Makefile.am b/filters/partition/Makefile.am
index e8a20c68..d9500794 100644
--- a/filters/partition/Makefile.am
+++ b/filters/partition/Makefile.am
@@ -56,6 +56,7 @@ nbdkit_partition_filter_la_LDFLAGS = \
$(NULL)
nbdkit_partition_filter_la_LIBADD = \
$(top_builddir)/common/utils/libutils.la \
+ $(top_builddir)/common/replacements/libcompat.la \
$(IMPORT_LIBRARY_ON_WINDOWS) \
$(NULL)
diff --git a/filters/readahead/Makefile.am b/filters/readahead/Makefile.am
index 3d2c507d..65ad03b5 100644
--- a/filters/readahead/Makefile.am
+++ b/filters/readahead/Makefile.am
@@ -52,6 +52,7 @@ nbdkit_readahead_filter_la_LDFLAGS = \
$(NULL)
nbdkit_readahead_filter_la_LIBADD = \
$(top_builddir)/common/utils/libutils.la \
+ $(top_builddir)/common/replacements/libcompat.la \
$(IMPORT_LIBRARY_ON_WINDOWS) \
$(NULL)
diff --git a/filters/retry/Makefile.am b/filters/retry/Makefile.am
index 14d83cf1..522c0816 100644
--- a/filters/retry/Makefile.am
+++ b/filters/retry/Makefile.am
@@ -52,6 +52,7 @@ nbdkit_retry_filter_la_LDFLAGS = \
$(NULL)
nbdkit_retry_filter_la_LIBADD = \
$(top_builddir)/common/utils/libutils.la \
+ $(top_builddir)/common/replacements/libcompat.la \
$(IMPORT_LIBRARY_ON_WINDOWS) \
$(NULL)
diff --git a/filters/stats/Makefile.am b/filters/stats/Makefile.am
index ccfeb3e7..e81aa973 100644
--- a/filters/stats/Makefile.am
+++ b/filters/stats/Makefile.am
@@ -52,6 +52,7 @@ nbdkit_stats_filter_la_LDFLAGS = \
$(NULL)
nbdkit_stats_filter_la_LIBADD = \
$(top_builddir)/common/utils/libutils.la \
+ $(top_builddir)/common/replacements/libcompat.la \
$(IMPORT_LIBRARY_ON_WINDOWS) \
$(NULL)
diff --git a/filters/swab/Makefile.am b/filters/swab/Makefile.am
index 07aefe88..3388b7da 100644
--- a/filters/swab/Makefile.am
+++ b/filters/swab/Makefile.am
@@ -57,6 +57,7 @@ nbdkit_swab_filter_la_LDFLAGS = \
$(NULL)
nbdkit_swab_filter_la_LIBADD = \
$(top_builddir)/common/utils/libutils.la \
+ $(top_builddir)/common/replacements/libcompat.la \
$(IMPORT_LIBRARY_ON_WINDOWS) \
$(GNUTLS_LIBS) \
$(NULL)
diff --git a/filters/truncate/Makefile.am b/filters/truncate/Makefile.am
index 3240e46d..0940b96f 100644
--- a/filters/truncate/Makefile.am
+++ b/filters/truncate/Makefile.am
@@ -52,6 +52,7 @@ nbdkit_truncate_filter_la_LDFLAGS = \
$(NULL)
nbdkit_truncate_filter_la_LIBADD = \
$(top_builddir)/common/utils/libutils.la \
+ $(top_builddir)/common/replacements/libcompat.la \
$(IMPORT_LIBRARY_ON_WINDOWS) \
$(NULL)
diff --git a/filters/xz/Makefile.am b/filters/xz/Makefile.am
index ce6bc342..393ff142 100644
--- a/filters/xz/Makefile.am
+++ b/filters/xz/Makefile.am
@@ -57,6 +57,7 @@ nbdkit_xz_filter_la_CFLAGS = \
nbdkit_xz_filter_la_LIBADD = \
$(LIBLZMA_LIBS) \
$(top_builddir)/common/utils/libutils.la \
+ $(top_builddir)/common/replacements/libcompat.la \
$(IMPORT_LIBRARY_ON_WINDOWS) \
$(NULL)
nbdkit_xz_filter_la_LDFLAGS = \
diff --git a/plugins/random/Makefile.am b/plugins/random/Makefile.am
index b29e06ad..4ad854f9 100644
--- a/plugins/random/Makefile.am
+++ b/plugins/random/Makefile.am
@@ -48,6 +48,7 @@ nbdkit_random_plugin_la_CPPFLAGS = \
nbdkit_random_plugin_la_CFLAGS = $(WARNINGS_CFLAGS)
nbdkit_random_plugin_la_LIBADD = \
$(top_builddir)/common/utils/libutils.la \
+ $(top_builddir)/common/replacements/libcompat.la \
$(IMPORT_LIBRARY_ON_WINDOWS) \
$(NULL)
nbdkit_random_plugin_la_LDFLAGS = \
diff --git a/plugins/sparse-random/Makefile.am b/plugins/sparse-random/Makefile.am
index d9d24fbe..b3ff0b86 100644
--- a/plugins/sparse-random/Makefile.am
+++ b/plugins/sparse-random/Makefile.am
@@ -50,6 +50,7 @@ nbdkit_sparse_random_plugin_la_CFLAGS = $(WARNINGS_CFLAGS)
nbdkit_sparse_random_plugin_la_LIBADD = \
$(top_builddir)/common/bitmap/libbitmap.la \
$(top_builddir)/common/utils/libutils.la \
+ $(top_builddir)/common/replacements/libcompat.la \
$(IMPORT_LIBRARY_ON_WINDOWS) \
$(NULL)
nbdkit_sparse_random_plugin_la_LDFLAGS = \
--
2.31.1

80
0003-tests-Use-mke2fs-d-to-create-ext4-test-image.patch
View File

@ -1,80 +0,0 @@
From 771a8c9386893f3c908dae5a551121db02b1f96c Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sat, 18 Dec 2021 20:21:26 +0000
Subject: [PATCH] tests: Use mke2fs -d to create ext4 test image
We used guestfish for this, but that was very slow (albeit working) on
armv7. Since this is a plain ext4 filesystem without wrapper, we can
use mke2fs -d. That was already a dependency so this doesn't change
anything.
After this change, configure tests for GUESTFISH and HAVE_GUESTFISH
are no longer used so we can remove them.
(cherry picked from commit 9b1476895a060c562e67b59a3d1aee16efafaff9)
---
configure.ac | 4 ----
tests/Makefile.am | 22 +++++++++-------------
2 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/configure.ac b/configure.ac
index 19514ef6..b194da61 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1173,10 +1173,6 @@ AS_IF([test "$with_libguestfs" != "no"],[
])
AM_CONDITIONAL([HAVE_LIBGUESTFS],[test "x$LIBGUESTFS_LIBS" != "x"])
-dnl Check for guestfish (only needed for some of the tests).
-AC_CHECK_PROG([GUESTFISH], [guestfish], [guestfish], [no])
-AM_CONDITIONAL([HAVE_GUESTFISH], [test "x$GUESTFISH" != "xno"])
-
dnl Check for ext2fs and com_err, for the ext2 filter.
AC_ARG_WITH([ext2],
[AS_HELP_STRING([--without-ext2],
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5ef90b6f..2b7ae9f3 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1506,7 +1506,6 @@ EXTRA_DIST += test-exportname.sh
# ext2 filter test.
if HAVE_MKE2FS_WITH_D
if HAVE_EXT2
-if HAVE_GUESTFISH
LIBGUESTFS_TESTS += test-ext2
@@ -1520,21 +1519,18 @@ EXTRA_DIST += test-ext2-exportname.sh
check_DATA += ext2.img
CLEANFILES += ext2.img
+# NB: truncate + explicit size is required because of a bug in mke2fs:
+# https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg1813759.html
ext2.img: disk test-ext2-exportname.sh
- rm -f $@ $@-t
- echo /disks/disk.img > manifest
- guestfish \
- sparse $@-t 2G : \
- run : \
- mkfs ext4 /dev/sda : \
- mount /dev/sda / : \
- mkdir /disks : \
- upload $< /disks/disk.img : \
- upload manifest /manifest
- rm manifest
+ rm -rf $@ $@-t ext2.img.d
+ mkdir -p ext2.img.d/disks
+ cp $< ext2.img.d/disks/disk.img
+ echo /disks/disk.img > ext2.img.d/manifest
+ truncate -s 2147483648 $@-t
+ mke2fs -q -F -t ext4 -d ext2.img.d $@-t 2147483648
+ rm -r ext2.img.d
mv $@-t $@
-endif HAVE_GUESTFISH
endif HAVE_EXT2
endif HAVE_MKE2FS_WITH_D
--
2.31.1

2
0007-vddk-Simplify-and-consolidate-VDDK_CALL_START-END-ma.patch → 0003-vddk-Simplify-and-consolidate-VDDK_CALL_START-END-ma.patch
View File

@ -1,4 +1,4 @@
From 06accfab1f9dde2f30e8fa5edce11f77b78e5d12 Mon Sep 17 00:00:00 2001
From a87b9b1ecd0b98ffb9e04d7de525952962875ec2 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 21 Oct 2021 22:55:17 +0100
Subject: [PATCH] vddk: Simplify and consolidate VDDK_CALL_START/END macros

35
0004-plugins-python-Fix-extents-count-format-string.patch
View File

@ -1,35 +0,0 @@
From 79a8b12a1fea3803e09c0d6fc587a09f03023ac8 Mon Sep 17 00:00:00 2001
From: Nir Soffer <nsoffer@redhat.com>
Date: Sun, 19 Dec 2021 09:09:39 +0200
Subject: [PATCH] plugins/python: Fix extents() count format string
The plugin used "i" (int32) instead of "I" (uint32) for the count, so
when the client asks for 4294966784 bytes, the python plugin got -512.
nbdkit: python.0: debug: python: extents count=4294966784 offset=0 req_one=0
...
nbdkit: python.0: debug: extents: count=-512 offset=0 flags=0
With this fix I can get extents from rhv-upload-plugin using nbdinfo.
(cherry picked from commit 715e9c238650e5f60b50a7c87c76037c0a4d4bfe)
---
plugins/python/plugin.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plugins/python/plugin.c b/plugins/python/plugin.c
index f85512b4..366619f9 100644
--- a/plugins/python/plugin.c
+++ b/plugins/python/plugin.c
@@ -964,7 +964,7 @@ py_extents (void *handle, uint32_t count, uint64_t offset,
if (callback_defined ("extents", &fn)) {
PyErr_Clear ();
- r = PyObject_CallFunction (fn, "OiLI", h->py_h, count, offset, flags);
+ r = PyObject_CallFunction (fn, "OILI", h->py_h, count, offset, flags);
Py_DECREF (fn);
if (check_python_failure ("extents") == -1)
return -1;
--
2.31.1

2
0008-vddk-Document-troubleshooting-performance-problems.patch → 0004-vddk-Document-troubleshooting-performance-problems.patch
View File

@ -1,4 +1,4 @@
From a6f17fd4c7850384e523ead0b6754dc494533505 Mon Sep 17 00:00:00 2001
From ae618b75f2b158b4563ab94371b01b2951b1bfec Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 22 Oct 2021 18:00:27 +0100
Subject: [PATCH] vddk: Document troubleshooting performance problems

2
0009-vddk-Include-VDDK-major-library-version-in-dump-plug.patch → 0005-vddk-Include-VDDK-major-library-version-in-dump-plug.patch
View File

@ -1,4 +1,4 @@
From 88a28a4fe04e17bfecce9909485334bf5962386e Mon Sep 17 00:00:00 2001
From 01f3fb69c8cdb730b74c36d0e5909adc7c50b35e Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sat, 23 Oct 2021 16:16:39 +0100
Subject: [PATCH] vddk: Include VDDK major library version in --dump-plugin

2
0010-vddk-Add-logical-and-physical-sector-size-to-D-vddk..patch → 0006-vddk-Add-logical-and-physical-sector-size-to-D-vddk..patch
View File

@ -1,4 +1,4 @@
From 320af82b1a46bf41b6a42fab63c070fa84cdee15 Mon Sep 17 00:00:00 2001
From 8b62059a60444f2e85b0cdfc34cbe7e123796fc8 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sat, 23 Oct 2021 16:24:27 +0100
Subject: [PATCH] vddk: Add logical and physical sector size to -D

2
0011-vddk-Fix-typo-in-debug-message.patch → 0007-vddk-Fix-typo-in-debug-message.patch
View File

@ -1,4 +1,4 @@
From b14e229d037fd229d63a0192941e6087168e8337 Mon Sep 17 00:00:00 2001
From a7e524ffec7c144d45838f4c2e9e311c0a0f4d01 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sat, 23 Oct 2021 19:41:07 +0100
Subject: [PATCH] vddk: Fix typo in debug message

2
0012-vddk-Only-print-vddk_library_version-when-we-managed.patch → 0008-vddk-Only-print-vddk_library_version-when-we-managed.patch
View File

@ -1,4 +1,4 @@
From cb80e8224799f3b056917892c6a054c72b8bd2ed Mon Sep 17 00:00:00 2001
From 4c451e9e8f0916c319f6a89ef5ecbb0536cb36c0 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sat, 23 Oct 2021 19:50:52 +0100
Subject: [PATCH] vddk: Only print vddk_library_version when we managed to load

2
0013-vddk-Print-one-line-in-dump-plugin-output-for-each-V.patch → 0009-vddk-Print-one-line-in-dump-plugin-output-for-each-V.patch
View File

@ -1,4 +1,4 @@
From 6bed3c33da51acd829fe043874e5a1506a3a0ff8 Mon Sep 17 00:00:00 2001
From 11bb4d037a9a14537cde30cef4e6a17cec2d47b8 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 25 Oct 2021 08:36:53 +0100
Subject: [PATCH] vddk: Print one line in --dump-plugin output for each VDDK

2
0014-vddk-Move-minimum-version-to-VDDK-6.5.patch → 0010-vddk-Move-minimum-version-to-VDDK-6.5.patch
View File

@ -1,4 +1,4 @@
From 1acf8d122df2311610d81230fa5463ba41605cc9 Mon Sep 17 00:00:00 2001
From 498b4210c1f1a4b4d6cdc09ae354b86522e1d536 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 26 Oct 2021 19:46:32 +0100
Subject: [PATCH] vddk: Move minimum version to VDDK 6.5

2
0015-vddk-Add-read-write-and-wait-asynchronous-functions.patch → 0011-vddk-Add-read-write-and-wait-asynchronous-functions.patch
View File

@ -1,4 +1,4 @@
From 49a064299fa14d3433c57ac55bb8c377b6e0619f Mon Sep 17 00:00:00 2001
From b6e9c0ad8d498d5f50ca0aa4f05530709349adea Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 27 Oct 2021 11:57:35 +0100
Subject: [PATCH] vddk: Add read, write and wait asynchronous functions

2
0016-vddk-Start-to-split-VDDK-over-several-files.patch → 0012-vddk-Start-to-split-VDDK-over-several-files.patch
View File

@ -1,4 +1,4 @@
From 2c9527d1247875c26c861ebf361f9352c7b3d9b6 Mon Sep 17 00:00:00 2001
From 6d720b2ca5a63fa6782b2b4a2183d336269cc98e Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 27 Oct 2021 12:20:31 +0100
Subject: [PATCH] vddk: Start to split VDDK over several files

2
0017-vddk-Refactor-D-vddk.stats-1-into-a-new-file.patch → 0013-vddk-Refactor-D-vddk.stats-1-into-a-new-file.patch
View File

@ -1,4 +1,4 @@
From 9e8e16af56e168affa1573aefa39fec5ac87106f Mon Sep 17 00:00:00 2001
From 78acd88165f3dfc5eb05c2204b270a01ed15e8a6 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 27 Oct 2021 12:30:41 +0100
Subject: [PATCH] vddk: Refactor -D vddk.stats=1 into a new file

2
0018-vddk-Implement-parallel-thread-model.patch → 0014-vddk-Implement-parallel-thread-model.patch
View File

@ -1,4 +1,4 @@
From c9a1f167f1433b21e04c41415356592e4811e34f Mon Sep 17 00:00:00 2001
From 13223e8e3219d0310ce4d94093bbdb7732a891fb Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 27 Oct 2021 10:17:22 +0100
Subject: [PATCH] vddk: Implement parallel thread model

2
0019-vddk-Assume-that-VixDiskLib_Flush-is-available.patch → 0015-vddk-Assume-that-VixDiskLib_Flush-is-available.patch
View File

@ -1,4 +1,4 @@
From 8556fa5388a0b809545d87c069b700281d129c1c Mon Sep 17 00:00:00 2001
From 6a61ddd5a57e75fd1c76d3e61d746964d925b608 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 29 Oct 2021 20:56:55 +0100
Subject: [PATCH] vddk: Assume that VixDiskLib_Flush is available

2
0020-vddk-Simplify-detection-of-VDDK-symbols-and-baseline.patch → 0016-vddk-Simplify-detection-of-VDDK-symbols-and-baseline.patch
View File

@ -1,4 +1,4 @@
From b154902bcf935def2ca8cee70b00b8da37835316 Mon Sep 17 00:00:00 2001
From fd3632aaa6528d1164f729442bd2f104d18bb941 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 29 Oct 2021 21:02:54 +0100
Subject: [PATCH] vddk: Simplify detection of VDDK symbols and baseline 6.5

2
0021-vddk-Remove-some-whitespace-from-a-couple-of-functio.patch → 0017-vddk-Remove-some-whitespace-from-a-couple-of-functio.patch
View File

@ -1,4 +1,4 @@
From 1095c3255820efaad5f448ffbecf331134dd0b4d Mon Sep 17 00:00:00 2001
From 7ae399e41e20b7684f475d67311f4ed02039374a Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sat, 30 Oct 2021 08:34:28 +0100
Subject: [PATCH] vddk: Remove some whitespace from a couple of functions

2
0022-vddk-Move-config-debug-error-and-utility-functions-a.patch → 0018-vddk-Move-config-debug-error-and-utility-functions-a.patch
View File

@ -1,4 +1,4 @@
From 4aa2334a7c986cf062b1a2d792c056165e8e3b59 Mon Sep 17 00:00:00 2001
From acf05e6d431c29ac8adc56a2680771c5051edb09 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sat, 30 Oct 2021 08:27:39 +0100
Subject: [PATCH] vddk: Move config, debug/error and utility functions around

2
0023-common-utils-test-vector.c-Add-vector-benchmarks.patch → 0019-common-utils-test-vector.c-Add-vector-benchmarks.patch
View File

@ -1,4 +1,4 @@
From 523c3d9e83202e49740e65bb5ae1593be6c24569 Mon Sep 17 00:00:00 2001
From 0106334335271ad35e1be041492f2e9795a97a60 Mon Sep 17 00:00:00 2001
From: Nir Soffer <nsoffer@redhat.com>
Date: Fri, 5 Nov 2021 20:36:42 +0200
Subject: [PATCH] common/utils/test-vector.c: Add vector benchmarks

2
0024-common-urils-vector.c-Optimize-vector-append.patch → 0020-common-urils-vector.c-Optimize-vector-append.patch
View File

@ -1,4 +1,4 @@
From 444362449c6fc6c109a98268275c6b4c42ae2afb Mon Sep 17 00:00:00 2001
From 58f10b380d63b061b71ad0b3e8462e9ef7f1d49a Mon Sep 17 00:00:00 2001
From: Nir Soffer <nsoffer@redhat.com>
Date: Fri, 5 Nov 2021 22:16:26 +0200
Subject: [PATCH] common/urils/vector.c: Optimize vector append

2
0025-common-utils-vector-Rename-alloc-to-cap.patch → 0021-common-utils-vector-Rename-alloc-to-cap.patch
View File

@ -1,4 +1,4 @@
From 73d69d2dd75952e79c8ccaba2212632e84f8e459 Mon Sep 17 00:00:00 2001
From a3e28d8cfa2d3252ec6bd348b2f15fd9e0c81329 Mon Sep 17 00:00:00 2001
From: Nir Soffer <nsoffer@redhat.com>
Date: Fri, 5 Nov 2021 22:59:38 +0200
Subject: [PATCH] common/utils/vector: Rename `alloc` to `cap`

2
0026-common-utils-vector-Rename-size-to-len.patch → 0022-common-utils-vector-Rename-size-to-len.patch
View File

@ -1,4 +1,4 @@
From 62cae5465fe9b560ddd0b8d9f3fbcf738ab6daf3 Mon Sep 17 00:00:00 2001
From e06b90e7609a1f107d4e21467e84a300666e2d91 Mon Sep 17 00:00:00 2001
From: Nir Soffer <nsoffer@redhat.com>
Date: Sat, 6 Nov 2021 00:03:11 +0200
Subject: [PATCH] common/utils/vector: Rename `size` to `len`

2
0027-podwrapper.pl.in-Use-short-commit-date.patch → 0023-podwrapper.pl.in-Use-short-commit-date.patch
View File

@ -1,4 +1,4 @@
From 913158a00a906604a29d204f25b048625d272597 Mon Sep 17 00:00:00 2001
From 4e49f3c9c122458f318d94dfe0549cabdf24aede Mon Sep 17 00:00:00 2001
From: Nir Soffer <nsoffer@redhat.com>
Date: Mon, 8 Nov 2021 19:47:57 +0200
Subject: [PATCH] podwrapper.pl.in: Use short commit date

15
0028-ocaml-Replace-noalloc-with-noalloc-annotation.patch → 0024-ocaml-Replace-noalloc-with-noalloc-annotation.patch
View File

@ -1,4 +1,4 @@
From 6213bd05d6f017582915ea0f0e4f9018497694b8 Mon Sep 17 00:00:00 2001
From ca7dbd9c37b3b80ee33e3dae7a29c122f5b5d2ff Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 9 Nov 2021 09:07:42 +0000
Subject: [PATCH] ocaml: Replace "noalloc" with [@@noalloc] annotation
@ -9,9 +9,9 @@ minimum version was 4.02.2.
(cherry picked from commit d15dd73845065cc9ca04aa785e2be994f76bf832)
---
README | 2 +-
plugins/ocaml/NBDKit.ml | 18 +++++++++---------
plugins/ocaml/NBDKit.ml | 16 ++++++++--------
plugins/ocaml/nbdkit-ocaml-plugin.pod | 5 +----
3 files changed, 11 insertions(+), 14 deletions(-)
3 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/README b/README
index b001620c..160856b6 100644
@ -27,10 +27,10 @@ index b001620c..160856b6 100644
For the Tcl plugin:
diff --git a/plugins/ocaml/NBDKit.ml b/plugins/ocaml/NBDKit.ml
index ecdc00c1..c9ce31b5 100644
index 75823ba5..4d45cc0c 100644
--- a/plugins/ocaml/NBDKit.ml
+++ b/plugins/ocaml/NBDKit.ml
@@ -152,13 +152,13 @@ let default_callbacks = {
@@ -152,11 +152,11 @@ let default_callbacks = {
export_description = None;
}
@ -45,11 +45,8 @@ index ecdc00c1..c9ce31b5 100644
+external set_description : string -> unit = "ocaml_nbdkit_set_description" [@@noalloc]
+external set_config_help : string -> unit = "ocaml_nbdkit_set_config_help" [@@noalloc]
-external set_field : string -> 'a -> unit = "ocaml_nbdkit_set_field" "noalloc"
+external set_field : string -> 'a -> unit = "ocaml_nbdkit_set_field" [@@noalloc]
external set_field : string -> 'a -> unit = "ocaml_nbdkit_set_field"
let register_plugin plugin =
(* Check the required fields have been set by the caller. *)
@@ -220,7 +220,7 @@ let register_plugin plugin =
(* Bindings to nbdkit server functions. *)

2
0029-vddk-Drop-obsolete-documentation-related-to-thread-m.patch → 0025-vddk-Drop-obsolete-documentation-related-to-thread-m.patch
View File

@ -1,4 +1,4 @@
From 5ed87ffb4f59aafc4e636dd041e62050e457251e Mon Sep 17 00:00:00 2001
From a18e18b3a50476a5364b32dd62d162a641fd0fd8 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sat, 27 Nov 2021 16:44:41 +0000
Subject: [PATCH] vddk: Drop obsolete documentation related to thread model

2
0030-Revert-podwrapper.pl.in-Use-short-commit-date.patch → 0026-Revert-podwrapper.pl.in-Use-short-commit-date.patch
View File

@ -1,4 +1,4 @@
From a93085886d44f4d667e69994827ee443607f9085 Mon Sep 17 00:00:00 2001
From 9678df33ecb45f7943acf3e485efed061ea4b856 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sat, 20 Nov 2021 17:50:25 +0000
Subject: [PATCH] Revert "podwrapper.pl.in: Use short commit date"

2
0031-Fix-podwrapper.pl.in-Use-short-commit-date.patch → 0027-Fix-podwrapper.pl.in-Use-short-commit-date.patch
View File

@ -1,4 +1,4 @@
From 1bbaf3129a130e7d74a3c8a7045eb829bff1ccbe Mon Sep 17 00:00:00 2001
From 38948544e6e12091506b658ab10ff1b0a5bf36b5 Mon Sep 17 00:00:00 2001
From: Eric Blake <eblake@redhat.com>
Date: Tue, 30 Nov 2021 12:42:01 -0600
Subject: [PATCH] Fix "podwrapper.pl.in: Use short commit date"

4
0032-scripts-Add-simple-script-for-automating-VDDK-disk-c.patch → 0028-scripts-Add-simple-script-for-automating-VDDK-disk-c.patch
View File

@ -1,4 +1,4 @@
From 620f44faac50d25f60182a7beb11f43c8e944516 Mon Sep 17 00:00:00 2001
From f8d649063edb9744c98aca17c6c82e5fce0a4be7 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 30 Nov 2021 17:56:02 +0000
Subject: [PATCH] scripts: Add simple script for automating VDDK disk
@ -42,7 +42,7 @@ index 49f5d91c..6df5eba0 100644
if !ENABLE_LIBFUZZER
# NB: This is not the real nbdkit binary. It's a wrapper that allows
diff --git a/configure.ac b/configure.ac
index b194da61..88d3de68 100644
index 263714f0..60e7cce2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1249,6 +1249,8 @@ dnl Produce output files.

2
0033-file-Fix-implementation-of-cache-none-for-writes.patch → 0029-file-Fix-implementation-of-cache-none-for-writes.patch
View File

@ -1,4 +1,4 @@
From 9337139bc51ad06756dee9d606a6b35cf42275b2 Mon Sep 17 00:00:00 2001
From aaead0f62b190f0686f86d825c698f9cd3e803c6 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 7 Dec 2021 21:08:26 +0000
Subject: [PATCH] file: Fix implementation of cache=none for writes

4
0034-tests-Add-configure-disable-libguestfs-tests-flag.patch → 0030-tests-Add-configure-disable-libguestfs-tests-flag.patch
View File

@ -1,4 +1,4 @@
From 997a064534f14dcb57ce2ba039f5274d13abba8f Mon Sep 17 00:00:00 2001
From a6c8f5123bd19941658f8395b4a119a37d6cf69e Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sat, 18 Dec 2021 20:31:10 +0000
Subject: [PATCH] tests: Add configure --disable-libguestfs-tests flag
@ -36,7 +36,7 @@ expressions like:
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 88d3de68..6f73a3b8 100644
index 60e7cce2..7a672cbf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1146,7 +1146,8 @@ AS_IF([test "$with_libzstd" != "no"],[

71
nbdkit.spec
View File

@ -51,8 +51,8 @@ ExclusiveArch: x86_64
%global source_directory 1.28-stable
Name: nbdkit
Version: 1.28.3
Release: 3%{?dist}
Version: 1.28.4
Release: 1%{?dist}
Summary: NBD server
License: BSD
@ -77,40 +77,35 @@ Source3: copy-patches.sh
# https://gitlab.com/nbdkit/nbdkit/-/commits/rhel-9.0/
# Patches.
Patch0001: 0001-windows-Use-replacement-pread-and-pwrite-functions.patch
Patch0002: 0002-windows-Link-plugins-filters-that-use-utils-pread-pw.patch
Patch0003: 0003-tests-Use-mke2fs-d-to-create-ext4-test-image.patch
Patch0004: 0004-plugins-python-Fix-extents-count-format-string.patch
Patch0005: 0005-vddk-Refactor-how-D-vddk.stats-1-is-collected.patch
Patch0006: 0006-vddk-Extend-D-vddk.stats-1-to-show-number-of-calls-a.patch
Patch0007: 0007-vddk-Simplify-and-consolidate-VDDK_CALL_START-END-ma.patch
Patch0008: 0008-vddk-Document-troubleshooting-performance-problems.patch
Patch0009: 0009-vddk-Include-VDDK-major-library-version-in-dump-plug.patch
Patch0010: 0010-vddk-Add-logical-and-physical-sector-size-to-D-vddk..patch
Patch0011: 0011-vddk-Fix-typo-in-debug-message.patch
Patch0012: 0012-vddk-Only-print-vddk_library_version-when-we-managed.patch
Patch0013: 0013-vddk-Print-one-line-in-dump-plugin-output-for-each-V.patch
Patch0014: 0014-vddk-Move-minimum-version-to-VDDK-6.5.patch
Patch0015: 0015-vddk-Add-read-write-and-wait-asynchronous-functions.patch
Patch0016: 0016-vddk-Start-to-split-VDDK-over-several-files.patch
Patch0017: 0017-vddk-Refactor-D-vddk.stats-1-into-a-new-file.patch
Patch0018: 0018-vddk-Implement-parallel-thread-model.patch
Patch0019: 0019-vddk-Assume-that-VixDiskLib_Flush-is-available.patch
Patch0020: 0020-vddk-Simplify-detection-of-VDDK-symbols-and-baseline.patch
Patch0021: 0021-vddk-Remove-some-whitespace-from-a-couple-of-functio.patch
Patch0022: 0022-vddk-Move-config-debug-error-and-utility-functions-a.patch
Patch0023: 0023-common-utils-test-vector.c-Add-vector-benchmarks.patch
Patch0024: 0024-common-urils-vector.c-Optimize-vector-append.patch
Patch0025: 0025-common-utils-vector-Rename-alloc-to-cap.patch
Patch0026: 0026-common-utils-vector-Rename-size-to-len.patch
Patch0027: 0027-podwrapper.pl.in-Use-short-commit-date.patch
Patch0028: 0028-ocaml-Replace-noalloc-with-noalloc-annotation.patch
Patch0029: 0029-vddk-Drop-obsolete-documentation-related-to-thread-m.patch
Patch0030: 0030-Revert-podwrapper.pl.in-Use-short-commit-date.patch
Patch0031: 0031-Fix-podwrapper.pl.in-Use-short-commit-date.patch
Patch0032: 0032-scripts-Add-simple-script-for-automating-VDDK-disk-c.patch
Patch0033: 0033-file-Fix-implementation-of-cache-none-for-writes.patch
Patch0034: 0034-tests-Add-configure-disable-libguestfs-tests-flag.patch
Patch0001: 0001-vddk-Refactor-how-D-vddk.stats-1-is-collected.patch
Patch0002: 0002-vddk-Extend-D-vddk.stats-1-to-show-number-of-calls-a.patch
Patch0003: 0003-vddk-Simplify-and-consolidate-VDDK_CALL_START-END-ma.patch
Patch0004: 0004-vddk-Document-troubleshooting-performance-problems.patch
Patch0005: 0005-vddk-Include-VDDK-major-library-version-in-dump-plug.patch
Patch0006: 0006-vddk-Add-logical-and-physical-sector-size-to-D-vddk..patch
Patch0007: 0007-vddk-Fix-typo-in-debug-message.patch
Patch0008: 0008-vddk-Only-print-vddk_library_version-when-we-managed.patch
Patch0009: 0009-vddk-Print-one-line-in-dump-plugin-output-for-each-V.patch
Patch0010: 0010-vddk-Move-minimum-version-to-VDDK-6.5.patch
Patch0011: 0011-vddk-Add-read-write-and-wait-asynchronous-functions.patch
Patch0012: 0012-vddk-Start-to-split-VDDK-over-several-files.patch
Patch0013: 0013-vddk-Refactor-D-vddk.stats-1-into-a-new-file.patch
Patch0014: 0014-vddk-Implement-parallel-thread-model.patch
Patch0015: 0015-vddk-Assume-that-VixDiskLib_Flush-is-available.patch
Patch0016: 0016-vddk-Simplify-detection-of-VDDK-symbols-and-baseline.patch
Patch0017: 0017-vddk-Remove-some-whitespace-from-a-couple-of-functio.patch
Patch0018: 0018-vddk-Move-config-debug-error-and-utility-functions-a.patch
Patch0019: 0019-common-utils-test-vector.c-Add-vector-benchmarks.patch
Patch0020: 0020-common-urils-vector.c-Optimize-vector-append.patch
Patch0021: 0021-common-utils-vector-Rename-alloc-to-cap.patch
Patch0022: 0022-common-utils-vector-Rename-size-to-len.patch
Patch0023: 0023-podwrapper.pl.in-Use-short-commit-date.patch
Patch0024: 0024-ocaml-Replace-noalloc-with-noalloc-annotation.patch
Patch0025: 0025-vddk-Drop-obsolete-documentation-related-to-thread-m.patch
Patch0026: 0026-Revert-podwrapper.pl.in-Use-short-commit-date.patch
Patch0027: 0027-Fix-podwrapper.pl.in-Use-short-commit-date.patch
Patch0028: 0028-scripts-Add-simple-script-for-automating-VDDK-disk-c.patch
Patch0029: 0029-file-Fix-implementation-of-cache-none-for-writes.patch
BuildRequires: make
%if 0%{patches_touch_autotools}
@ -1219,8 +1214,8 @@ export LIBGUESTFS_TRACE=1
%changelog
* Sun Dec 19 2021 Richard W.M. Jones <rjones@redhat.com> - 1.28.3-3
- Rebase to new stable branch version 1.28.3
* Tue Jan 04 2022 Richard W.M. Jones <rjones@redhat.com> - 1.28.4-1
- Rebase to new stable branch version 1.28.4
resolves: rhbz#2011709
- Move nbdkit-null-plugin to nbdkit-server package
resolves: rhbz#2021154

4
sources
View File

@ -1,2 +1,2 @@
SHA512 (nbdkit-1.28.3.tar.gz) = d0d6ba08a438da8b3dbcadb0504ff8a69f50a7d1494688b4fe404672a89fd8063a27720d04ada284469999afbf3928a7c69a093db3858b3eaa063ccce913e59a
SHA512 (nbdkit-1.28.3.tar.gz.sig) = d5a1d1cd79dddf58b5c8c2c89326d31e1c0434cf59e98303bf5e08153a8b3f05899724340591712060bb2d9339437e3308dcc5ec9ddd490390b7a81b2589769b
SHA512 (nbdkit-1.28.4.tar.gz) = bd9ecc24bffbe2aa8a78e21953b01b853876fe916eee2b592780126b80611c539921ca46749197a0f531b017c4002aa8e7b6db2a5caf0510ba27f2d29e589906
SHA512 (nbdkit-1.28.4.tar.gz.sig) = da2b5fde026e862c3a3f874743b71ecd3f2f155d740b35921c971ac104eb4e23b3683e6fa9447be53763f4887c16986ab25a94a7bc2631ca1f010bc8c91d1429