7:09 a.m.
Peter Krempa (4):
qemu: block: Always assume support for 'block-export-add'
qemu: monitor: Drop wrappers for 'nbd-server-add'
qemu: capabilities: Retire QEMU_CAPS_BLOCK_EXPORT_ADD
qemu: capabilities: Retire QEMU_CAPS_NBD_BITMAP
src/qemu/qemu_block.c | 7 -----
src/qemu/qemu_capabilities.c | 6 ++--
src/qemu/qemu_capabilities.h | 4 +--
src/qemu/qemu_monitor.c | 17 -----------
src/qemu/qemu_monitor.h | 5 ----
src/qemu/qemu_monitor_json.c | 28 -------------------
src/qemu/qemu_monitor_json.h | 6 ----
.../caps_10.0.0_s390x.xml | 2 --
.../caps_10.0.0_x86_64+amdsev.xml | 2 --
.../caps_10.0.0_x86_64.xml | 2 --
.../qemucapabilitiesdata/caps_6.2.0_ppc64.xml | 2 --
.../caps_6.2.0_x86_64.xml | 2 --
.../qemucapabilitiesdata/caps_7.0.0_ppc64.xml | 2 --
.../caps_7.0.0_x86_64.xml | 2 --
.../qemucapabilitiesdata/caps_7.1.0_ppc64.xml | 2 --
.../caps_7.1.0_x86_64.xml | 2 --
tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml | 2 --
.../caps_7.2.0_x86_64+hvf.xml | 2 --
.../caps_7.2.0_x86_64.xml | 2 --
.../caps_8.0.0_x86_64.xml | 2 --
.../qemucapabilitiesdata/caps_8.1.0_s390x.xml | 2 --
.../caps_8.1.0_x86_64.xml | 2 --
.../caps_8.2.0_aarch64.xml | 2 --
.../caps_8.2.0_armv7l.xml | 2 --
.../caps_8.2.0_loongarch64.xml | 2 --
.../qemucapabilitiesdata/caps_8.2.0_s390x.xml | 2 --
.../caps_8.2.0_x86_64.xml | 2 --
.../qemucapabilitiesdata/caps_9.0.0_sparc.xml | 2 --
.../caps_9.0.0_x86_64.xml | 2 --
.../caps_9.1.0_riscv64.xml | 2 --
.../qemucapabilitiesdata/caps_9.1.0_s390x.xml | 2 --
.../caps_9.1.0_x86_64.xml | 2 --
.../caps_9.2.0_aarch64+hvf.xml | 2 --
.../qemucapabilitiesdata/caps_9.2.0_s390x.xml | 2 --
.../caps_9.2.0_x86_64+amdsev.xml | 2 --
.../caps_9.2.0_x86_64.xml | 2 --
tests/qemumonitorjsontest.c | 2 --
37 files changed, 4 insertions(+), 129 deletions(-)
--
2.49.0
7:09 a.m.
New subject: [PATCH 1/4] qemu: block: Always assume support for 'block-export-add'
From: Peter Krempa <pkrempa(a)redhat.com>
'block-export-add' QMP command which replaces 'nbd-server-add' was
introduced in qemu-5.2. We can thus drop the old code now.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_block.c | 7 -------
1 file changed, 7 deletions(-)
diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
index 3ed279af28..27ef1b8375 100644
--- a/src/qemu/qemu_block.c
+++ b/src/qemu/qemu_block.c
@@ -3642,9 +3642,6 @@ qemuBlockExportGetNBDProps(const char *nodename,
* @writable: whether the NBD export allows writes
* @bitmap: (optional) block dirty bitmap to export along
*
- * This function automatically selects the proper invocation of exporting a
- * block backend via NBD in qemu.
- *
* This function must be called while in the monitor context.
*/
int
@@ -3658,10 +3655,6 @@ qemuBlockExportAddNBD(virDomainObj *vm,
g_autoptr(virJSONValue) nbdprops = NULL;
const char *bitmaps[2] = { bitmap, NULL };
- if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCK_EXPORT_ADD))
- return qemuMonitorNBDServerAdd(priv->mon,
qemuBlockStorageSourceGetEffectiveNodename(src),
- exportname, writable, bitmap);
-
if (!(nbdprops =
qemuBlockExportGetNBDProps(qemuBlockStorageSourceGetEffectiveNodename(src),
exportname, writable, bitmaps)))
return -1;
--
2.49.0
7:09 a.m.
New subject: [PATCH 2/4] qemu: monitor: Drop wrappers for 'nbd-server-add'
From: Peter Krempa <pkrempa(a)redhat.com>
The code is no longer used.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_monitor.c | 17 -----------------
src/qemu/qemu_monitor.h | 5 -----
src/qemu/qemu_monitor_json.c | 28 ----------------------------
src/qemu/qemu_monitor_json.h | 6 ------
tests/qemumonitorjsontest.c | 2 --
5 files changed, 58 deletions(-)
diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 6340f437dd..8262e3a8b2 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -3512,23 +3512,6 @@ qemuMonitorNBDServerStart(qemuMonitor *mon,
}
-int
-qemuMonitorNBDServerAdd(qemuMonitor *mon,
- const char *deviceID,
- const char *export,
- bool writable,
- const char *bitmap)
-{
- VIR_DEBUG("deviceID=%s, export=%s, bitmap=%s", deviceID, NULLSTR(export),
- NULLSTR(bitmap));
-
- QEMU_CHECK_MONITOR(mon);
-
- return qemuMonitorJSONNBDServerAdd(mon, deviceID, export, writable,
- bitmap);
-}
-
-
int
qemuMonitorNBDServerStop(qemuMonitor *mon)
{
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index db451c448b..4acf50a166 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -1218,11 +1218,6 @@ int qemuMonitorNBDServerStart(qemuMonitor *mon,
const virStorageNetHostDef *server,
const char *tls_alias)
ATTRIBUTE_NONNULL(2);
-int qemuMonitorNBDServerAdd(qemuMonitor *mon,
- const char *deviceID,
- const char *export,
- bool writable,
- const char *bitmap);
int qemuMonitorNBDServerStop(qemuMonitor *mon);
int qemuMonitorBlockExportAdd(qemuMonitor *mon,
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 34ed42b004..6fa301577d 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -6386,34 +6386,6 @@ qemuMonitorJSONNBDServerStart(qemuMonitor *mon,
return 0;
}
-int
-qemuMonitorJSONNBDServerAdd(qemuMonitor *mon,
- const char *deviceID,
- const char *export,
- bool writable,
- const char *bitmap)
-{
- g_autoptr(virJSONValue) cmd = NULL;
- g_autoptr(virJSONValue) reply = NULL;
-
- /* Note: bitmap must be NULL if QEMU_CAPS_NBD_BITMAP is lacking */
- if (!(cmd = qemuMonitorJSONMakeCommand("nbd-server-add",
- "s:device", deviceID,
- "S:name", export,
- "b:writable", writable,
- "S:bitmap", bitmap,
- NULL)))
- return -1;
-
- if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
- return -1;
-
- if (qemuMonitorJSONCheckError(cmd, reply) < 0)
- return -1;
-
- return 0;
-}
-
int
qemuMonitorJSONNBDServerStop(qemuMonitor *mon)
{
diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index c97080f236..cec4fb387e 100644
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -541,12 +541,6 @@ qemuMonitorJSONNBDServerStart(qemuMonitor *mon,
const virStorageNetHostDef *server,
const char *tls_alias);
int
-qemuMonitorJSONNBDServerAdd(qemuMonitor *mon,
- const char *deviceID,
- const char *export,
- bool writable,
- const char *bitmap);
-int
qemuMonitorJSONNBDServerStop(qemuMonitor *mon);
int
diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
index d309b7d3d7..7485f683fb 100644
--- a/tests/qemumonitorjsontest.c
+++ b/tests/qemumonitorjsontest.c
@@ -1160,7 +1160,6 @@ GEN_TEST_FUNC(qemuMonitorJSONBlockStream, "vdb",
"jobname", "backingnode", "back
GEN_TEST_FUNC(qemuMonitorJSONBlockCommit, "vdb", "jobname",
"topnode", "basenode", "backingfilename", 1024,
VIR_TRISTATE_BOOL_YES)
GEN_TEST_FUNC(qemuMonitorJSONScreendump, "devicename", 1, NULL,
"/foo/bar")
GEN_TEST_FUNC(qemuMonitorJSONOpenGraphics, "spice", "spicefd",
false)
-GEN_TEST_FUNC(qemuMonitorJSONNBDServerAdd, "vda", "export", true,
"bitmap")
GEN_TEST_FUNC(qemuMonitorJSONDetachCharDev, "serial1")
GEN_TEST_FUNC(qemuMonitorJSONBlockdevTrayOpen, "foodev", true)
GEN_TEST_FUNC(qemuMonitorJSONBlockdevTrayClose, "foodev")
@@ -3042,7 +3041,6 @@ mymain(void)
DO_TEST_GEN(qemuMonitorJSONBlockCommit);
DO_TEST_GEN(qemuMonitorJSONScreendump);
DO_TEST_GEN(qemuMonitorJSONOpenGraphics);
- DO_TEST_GEN_DEPRECATED(qemuMonitorJSONNBDServerAdd, true);
DO_TEST_GEN(qemuMonitorJSONDetachCharDev);
DO_TEST_GEN(qemuMonitorJSONBlockdevTrayOpen);
DO_TEST_GEN(qemuMonitorJSONBlockdevTrayClose);
--
2.49.0
7:09 a.m.
New subject: [PATCH 3/4] qemu: capabilities: Retire QEMU_CAPS_BLOCK_EXPORT_ADD
From: Peter Krempa <pkrempa(a)redhat.com>
The 'block-export-add' command was added in qemu-5.2 so we now use it
unconditionally.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 3 +--
src/qemu/qemu_capabilities.h | 2 +-
tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml | 1 -
tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml | 1 -
tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml | 1 -
tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml | 1 -
tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml | 1 -
tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml | 1 -
tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml | 1 -
tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml | 1 -
tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml | 1 -
31 files changed, 2 insertions(+), 32 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 665f5e225e..76e9337f09 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -600,7 +600,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
/* 380 */
"usb-host.hostdevice", /* QEMU_CAPS_USB_HOST_HOSTDEVICE */
"virtio-balloon.free-page-reporting", /*
QEMU_CAPS_VIRTIO_BALLOON_FREE_PAGE_REPORTING */
- "block-export-add", /* QEMU_CAPS_BLOCK_EXPORT_ADD */
+ "block-export-add", /* X_QEMU_CAPS_BLOCK_EXPORT_ADD */
"netdev.vhost-vdpa", /* QEMU_CAPS_NETDEV_VHOST_VDPA */
"fsdev.createmode", /* X_QEMU_CAPS_FSDEV_CREATEMODE */
@@ -1243,7 +1243,6 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = {
{ "query-cpu-definitions", QEMU_CAPS_QUERY_CPU_DEFINITIONS },
{ "query-cpu-model-baseline", QEMU_CAPS_QUERY_CPU_MODEL_BASELINE },
{ "query-cpu-model-comparison", QEMU_CAPS_QUERY_CPU_MODEL_COMPARISON },
- { "block-export-add", QEMU_CAPS_BLOCK_EXPORT_ADD },
{ "set-action", QEMU_CAPS_SET_ACTION },
{ "query-dirty-rate", QEMU_CAPS_QUERY_DIRTY_RATE },
{ "sev-inject-launch-secret", QEMU_CAPS_SEV_INJECT_LAUNCH_SECRET },
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 685a938bbc..aa7274203e 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -581,7 +581,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check
*/
/* 380 */
QEMU_CAPS_USB_HOST_HOSTDEVICE, /* -device usb-host.hostdevice */
QEMU_CAPS_VIRTIO_BALLOON_FREE_PAGE_REPORTING, /*virtio balloon free-page-reporting
*/
- QEMU_CAPS_BLOCK_EXPORT_ADD, /* 'block-export-add' command is supported */
+ X_QEMU_CAPS_BLOCK_EXPORT_ADD, /* 'block-export-add' command is supported */
QEMU_CAPS_NETDEV_VHOST_VDPA, /* -netdev vhost-vdpa*/
X_QEMU_CAPS_FSDEV_CREATEMODE, /* fsdev.createmode */
diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml
b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml
index 4f3669ebb7..e0ce0f4a4b 100644
--- a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml
@@ -72,7 +72,6 @@
<flag name='numa.hmat'/>
<flag name='usb-host.hostdevice'/>
<flag name='virtio-balloon.free-page-reporting'/>
- <flag name='block-export-add'/>
<flag name='netdev.vhost-vdpa'/>
<flag name='vhost-user-fs.bootindex'/>
<flag name='vhost-user-blk'/>
diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml
b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml
index eaf35bb703..df84533c9e 100644
--- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml
+++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml
@@ -133,7 +133,6 @@
<flag name='numa.hmat'/>
<flag name='usb-host.hostdevice'/>
<flag name='virtio-balloon.free-page-reporting'/>
- <flag name='block-export-add'/>
<flag name='netdev.vhost-vdpa'/>
<flag name='dc390'/>
<flag name='am53c974'/>
diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml
index dea2e3fc89..a92eeee3bc 100644
--- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml
@@ -133,7 +133,6 @@
<flag name='numa.hmat'/>
<flag name='usb-host.hostdevice'/>
<flag name='virtio-balloon.free-page-reporting'/>
- <flag name='block-export-add'/>
<flag name='netdev.vhost-vdpa'/>
<flag name='dc390'/>
<flag name='am53c974'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
index cf5fc6b017..d22ab20368 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
@@ -100,7 +100,6 @@
<flag name='spapr-tpm-proxy'/>
<flag name='numa.hmat'/>
<flag name='virtio-balloon.free-page-reporting'/>
- <flag name='block-export-add'/>
<flag name='netdev.vhost-vdpa'/>
<flag name='dc390'/>
<flag name='am53c974'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
index ed43c4767f..5106109419 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
@@ -135,7 +135,6 @@
<flag name='numa.hmat'/>
<flag name='usb-host.hostdevice'/>
<flag name='virtio-balloon.free-page-reporting'/>
- <flag name='block-export-add'/>
<flag name='netdev.vhost-vdpa'/>
<flag name='dc390'/>
<flag name='am53c974'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
index 9a273e531e..6fceaa3477 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
@@ -111,7 +111,6 @@
<flag name='numa.hmat'/>
<flag name='usb-host.hostdevice'/>
<flag name='virtio-balloon.free-page-reporting'/>
- <flag name='block-export-add'/>
<flag name='netdev.vhost-vdpa'/>
<flag name='dc390'/>
<flag name='am53c974'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
index 3214f50be6..232ae833b8 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
@@ -135,7 +135,6 @@
<flag name='numa.hmat'/>
<flag name='usb-host.hostdevice'/>
<flag name='virtio-balloon.free-page-reporting'/>
- <flag name='block-export-add'/>
<flag name='netdev.vhost-vdpa'/>
<flag name='dc390'/>
<flag name='am53c974'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
index 46a93cadbc..a152693f49 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
@@ -108,7 +108,6 @@
<flag name='numa.hmat'/>
<flag name='usb-host.hostdevice'/>
<flag name='virtio-balloon.free-page-reporting'/>
- <flag name='block-export-add'/>
<flag name='netdev.vhost-vdpa'/>
<flag name='dc390'/>
<flag name='am53c974'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
index eb5e35b904..cf47c29e71 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
@@ -135,7 +135,6 @@
<flag name='numa.hmat'/>
<flag name='usb-host.hostdevice'/>
<flag name='virtio-balloon.free-page-reporting'/>
- <flag name='block-export-add'/>
<flag name='netdev.vhost-vdpa'/>
<flag name='dc390'/>
<flag name='am53c974'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
index f8b79cc751..3615cc28fd 100644
--- a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
@@ -100,7 +100,6 @@
<flag name='numa.hmat'/>
<flag name='usb-host.hostdevice'/>
<flag name='virtio-balloon.free-page-reporting'/>
- <flag name='block-export-add'/>
<flag name='netdev.vhost-vdpa'/>
<flag name='dc390'/>
<flag name='am53c974'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
index 6ea91329bc..c6f1957842 100644
--- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
@@ -134,7 +134,6 @@
<flag name='numa.hmat'/>
<flag name='usb-host.hostdevice'/>
<flag name='virtio-balloon.free-page-reporting'/>
- <flag name='block-export-add'/>
<flag name='netdev.vhost-vdpa'/>
<flag name='dc390'/>
<flag name='am53c974'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
index dfecf16eaf..06b4c62fc6 100644
--- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
@@ -135,7 +135,6 @@
<flag name='numa.hmat'/>
<flag name='usb-host.hostdevice'/>
<flag name='virtio-balloon.free-page-reporting'/>
- <flag name='block-export-add'/>
<flag name='netdev.vhost-vdpa'/>
<flag name='dc390'/>
<flag name='am53c974'/>
diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
index 09c9fbe17e..b5e5b794a6 100644
--- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
@@ -135,7 +135,6 @@
<flag name='numa.hmat'/>
<flag name='usb-host.hostdevice'/>
<flag name='virtio-balloon.free-page-reporting'/>
- <flag name='block-export-add'/>
<flag name='netdev.vhost-vdpa'/>
<flag name='dc390'/>
<flag name='am53c974'/>
diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
index 4127437fcc..d8988eafd7 100644
--- a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
@@ -69,7 +69,6 @@
<flag name='virtio-blk-pci.scsi.default.disabled'/>
<flag name='numa.hmat'/>
<flag name='virtio-balloon.free-page-reporting'/>
- <flag name='block-export-add'/>
<flag name='netdev.vhost-vdpa'/>
<flag name='vhost-user-fs.bootindex'/>
<flag name='vhost-user-blk'/>
diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
index eb03dd891a..4a1c99641b 100644
--- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
@@ -135,7 +135,6 @@
<flag name='numa.hmat'/>
<flag name='usb-host.hostdevice'/>
<flag name='virtio-balloon.free-page-reporting'/>
- <flag name='block-export-add'/>
<flag name='netdev.vhost-vdpa'/>
<flag name='dc390'/>
<flag name='am53c974'/>
diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml
b/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml
index 31757fcc4f..122e6daa08 100644
--- a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml
@@ -106,7 +106,6 @@
<flag name='numa.hmat'/>
<flag name='usb-host.hostdevice'/>
<flag name='virtio-balloon.free-page-reporting'/>
- <flag name='block-export-add'/>
<flag name='netdev.vhost-vdpa'/>
<flag name='dc390'/>
<flag name='am53c974'/>
diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml
b/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml
index af50e1acd2..6dcd1889a9 100644
--- a/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml
@@ -110,7 +110,6 @@
<flag name='numa.hmat'/>
<flag name='usb-host.hostdevice'/>
<flag name='virtio-balloon.free-page-reporting'/>
- <flag name='block-export-add'/>
<flag name='netdev.vhost-vdpa'/>
<flag name='dc390'/>
<flag name='am53c974'/>
diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml
b/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml
index 067526a4f1..fc3c0df99a 100644
--- a/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml
@@ -99,7 +99,6 @@
<flag name='numa.hmat'/>
<flag name='usb-host.hostdevice'/>
<flag name='virtio-balloon.free-page-reporting'/>
- <flag name='block-export-add'/>
<flag name='netdev.vhost-vdpa'/>
<flag name='dc390'/>
<flag name='am53c974'/>
diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml
b/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml
index 9b0b5bdd9d..e536d75215 100644
--- a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml
@@ -69,7 +69,6 @@
<flag name='virtio-blk-pci.scsi.default.disabled'/>
<flag name='numa.hmat'/>
<flag name='virtio-balloon.free-page-reporting'/>
- <flag name='block-export-add'/>
<flag name='netdev.vhost-vdpa'/>
<flag name='vhost-user-fs.bootindex'/>
<flag name='vhost-user-blk'/>
diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml
index e786f16ec1..8b771baf55 100644
--- a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml
@@ -135,7 +135,6 @@
<flag name='numa.hmat'/>
<flag name='usb-host.hostdevice'/>
<flag name='virtio-balloon.free-page-reporting'/>
- <flag name='block-export-add'/>
<flag name='netdev.vhost-vdpa'/>
<flag name='dc390'/>
<flag name='am53c974'/>
diff --git a/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml
b/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml
index 74d10dc744..a5baecfb5c 100644
--- a/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml
@@ -33,7 +33,6 @@
<flag name='aio.io_uring'/>
<flag name='tcg'/>
<flag name='numa.hmat'/>
- <flag name='block-export-add'/>
<flag name='netdev.vhost-vdpa'/>
<flag name='ncr53c90'/>
<flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
diff --git a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml
index ec71682150..1e211a6ab1 100644
--- a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml
@@ -135,7 +135,6 @@
<flag name='numa.hmat'/>
<flag name='usb-host.hostdevice'/>
<flag name='virtio-balloon.free-page-reporting'/>
- <flag name='block-export-add'/>
<flag name='netdev.vhost-vdpa'/>
<flag name='dc390'/>
<flag name='am53c974'/>
diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml
b/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml
index 2fa5d84c24..61c9029ed9 100644
--- a/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml
@@ -102,7 +102,6 @@
<flag name='numa.hmat'/>
<flag name='usb-host.hostdevice'/>
<flag name='virtio-balloon.free-page-reporting'/>
- <flag name='block-export-add'/>
<flag name='netdev.vhost-vdpa'/>
<flag name='dc390'/>
<flag name='am53c974'/>
diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml
b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml
index f2fb085af3..5f22c0be87 100644
--- a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml
@@ -72,7 +72,6 @@
<flag name='numa.hmat'/>
<flag name='usb-host.hostdevice'/>
<flag name='virtio-balloon.free-page-reporting'/>
- <flag name='block-export-add'/>
<flag name='netdev.vhost-vdpa'/>
<flag name='vhost-user-fs.bootindex'/>
<flag name='vhost-user-blk'/>
diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml
index 08a4b24ae7..cbeccccb4e 100644
--- a/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml
@@ -133,7 +133,6 @@
<flag name='numa.hmat'/>
<flag name='usb-host.hostdevice'/>
<flag name='virtio-balloon.free-page-reporting'/>
- <flag name='block-export-add'/>
<flag name='netdev.vhost-vdpa'/>
<flag name='dc390'/>
<flag name='am53c974'/>
diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml
b/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml
index 7c9d245099..144d7411e7 100644
--- a/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml
+++ b/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml
@@ -81,7 +81,6 @@
<flag name='numa.hmat'/>
<flag name='usb-host.hostdevice'/>
<flag name='virtio-balloon.free-page-reporting'/>
- <flag name='block-export-add'/>
<flag name='netdev.vhost-vdpa'/>
<flag name='dc390'/>
<flag name='am53c974'/>
diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml
b/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml
index 572e829208..e831f64a12 100644
--- a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml
@@ -72,7 +72,6 @@
<flag name='numa.hmat'/>
<flag name='usb-host.hostdevice'/>
<flag name='virtio-balloon.free-page-reporting'/>
- <flag name='block-export-add'/>
<flag name='netdev.vhost-vdpa'/>
<flag name='vhost-user-fs.bootindex'/>
<flag name='vhost-user-blk'/>
diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml
b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml
index be235051e2..ff996730b3 100644
--- a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml
+++ b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml
@@ -134,7 +134,6 @@
<flag name='numa.hmat'/>
<flag name='usb-host.hostdevice'/>
<flag name='virtio-balloon.free-page-reporting'/>
- <flag name='block-export-add'/>
<flag name='netdev.vhost-vdpa'/>
<flag name='dc390'/>
<flag name='am53c974'/>
diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml
index 73b2897c22..0d1db857f7 100644
--- a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml
@@ -133,7 +133,6 @@
<flag name='numa.hmat'/>
<flag name='usb-host.hostdevice'/>
<flag name='virtio-balloon.free-page-reporting'/>
- <flag name='block-export-add'/>
<flag name='netdev.vhost-vdpa'/>
<flag name='dc390'/>
<flag name='am53c974'/>
--
2.49.0
7:09 a.m.
New subject: [PATCH 4/4] qemu: capabilities: Retire QEMU_CAPS_NBD_BITMAP
From: Peter Krempa <pkrempa(a)redhat.com>
The capability wasn't used since it's inception. It now refers to a
deprecated QMP command. Drop it.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 3 +--
src/qemu/qemu_capabilities.h | 2 +-
tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml | 1 -
tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml | 1 -
tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml | 1 -
tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml | 1 -
tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml | 1 -
tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml | 1 -
tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml | 1 -
tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml | 1 -
tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml | 1 -
31 files changed, 2 insertions(+), 32 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 76e9337f09..a804335c85 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -529,7 +529,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
/* 330 */
"bitmap-merge", /* X_QEMU_CAPS_BITMAP_MERGE */
- "nbd-bitmap", /* QEMU_CAPS_NBD_BITMAP */
+ "nbd-bitmap", /* X_QEMU_CAPS_NBD_BITMAP */
"x86-max-cpu", /* QEMU_CAPS_X86_MAX_CPU */
"cpu-unavailable-features", /* QEMU_CAPS_CPU_UNAVAILABLE_FEATURES
*/
"canonical-cpu-features", /* QEMU_CAPS_CANONICAL_CPU_FEATURES */
@@ -1581,7 +1581,6 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] =
{
{ "chardev-add/arg-type/backend/+qemu-vdagent",
QEMU_CAPS_CHARDEV_QEMU_VDAGENT },
{ "device_add/$json-cli-hotplug", QEMU_CAPS_DEVICE_JSON },
{ "nbd-server-start/arg-type/tls-creds", QEMU_CAPS_NBD_TLS },
- { "nbd-server-add/arg-type/bitmap", QEMU_CAPS_NBD_BITMAP },
{ "netdev_add/arg-type/+stream", QEMU_CAPS_NETDEV_STREAM },
{ "netdev_add/arg-type/+stream/reconnect",
QEMU_CAPS_NETDEV_STREAM_RECONNECT },
{ "netdev_add/arg-type/+vhost-vdpa", QEMU_CAPS_NETDEV_VHOST_VDPA },
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index aa7274203e..ea7c14daa9 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -510,7 +510,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check
*/
/* 330 */
X_QEMU_CAPS_BITMAP_MERGE, /* block-dirty-bitmap-merge */
- QEMU_CAPS_NBD_BITMAP, /* nbd-server-add supports bitmap */
+ X_QEMU_CAPS_NBD_BITMAP, /* nbd-server-add supports bitmap */
QEMU_CAPS_X86_MAX_CPU, /* max-x86_64-cpu type exists */
QEMU_CAPS_CPU_UNAVAILABLE_FEATURES, /* "unavailable-features" CPU property
*/
QEMU_CAPS_CANONICAL_CPU_FEATURES, /* avoid CPU feature aliases */
diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml
b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml
index e0ce0f4a4b..be2e91ed92 100644
--- a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml
@@ -56,7 +56,6 @@
<flag name='memory-backend-memfd.hugetlb'/>
<flag name='egl-headless.rendernode'/>
<flag name='virtio-pci-non-transitional'/>
- <flag name='nbd-bitmap'/>
<flag name='migration-file-drop-cache'/>
<flag name='dbus-vmstate'/>
<flag name='vhost-user-gpu'/>
diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml
b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml
index df84533c9e..12825aabe6 100644
--- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml
+++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml
@@ -108,7 +108,6 @@
<flag name='egl-headless.rendernode'/>
<flag name='nvdimm.unarmed'/>
<flag name='virtio-pci-non-transitional'/>
- <flag name='nbd-bitmap'/>
<flag name='x86-max-cpu'/>
<flag name='cpu-unavailable-features'/>
<flag name='canonical-cpu-features'/>
diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml
index a92eeee3bc..4b0ef38e6a 100644
--- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml
@@ -108,7 +108,6 @@
<flag name='memory-backend-file.pmem'/>
<flag name='nvdimm.unarmed'/>
<flag name='virtio-pci-non-transitional'/>
- <flag name='nbd-bitmap'/>
<flag name='x86-max-cpu'/>
<flag name='cpu-unavailable-features'/>
<flag name='canonical-cpu-features'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
index d22ab20368..f61d2263c7 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
@@ -80,7 +80,6 @@
<flag name='memory-backend-memfd.hugetlb'/>
<flag name='nvdimm.unarmed'/>
<flag name='virtio-pci-non-transitional'/>
- <flag name='nbd-bitmap'/>
<flag name='bochs-display'/>
<flag name='migration-file-drop-cache'/>
<flag name='dbus-vmstate'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
index 5106109419..e780850c8d 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
@@ -109,7 +109,6 @@
<flag name='memory-backend-file.pmem'/>
<flag name='nvdimm.unarmed'/>
<flag name='virtio-pci-non-transitional'/>
- <flag name='nbd-bitmap'/>
<flag name='x86-max-cpu'/>
<flag name='cpu-unavailable-features'/>
<flag name='canonical-cpu-features'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
index 6fceaa3477..d78c239372 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
@@ -89,7 +89,6 @@
<flag name='memory-backend-file.pmem'/>
<flag name='nvdimm.unarmed'/>
<flag name='virtio-pci-non-transitional'/>
- <flag name='nbd-bitmap'/>
<flag name='bochs-display'/>
<flag name='migration-file-drop-cache'/>
<flag name='dbus-vmstate'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
index 232ae833b8..f8fab98961 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
@@ -109,7 +109,6 @@
<flag name='memory-backend-file.pmem'/>
<flag name='nvdimm.unarmed'/>
<flag name='virtio-pci-non-transitional'/>
- <flag name='nbd-bitmap'/>
<flag name='x86-max-cpu'/>
<flag name='cpu-unavailable-features'/>
<flag name='canonical-cpu-features'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
index a152693f49..d6edb65e96 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
@@ -86,7 +86,6 @@
<flag name='memory-backend-file.pmem'/>
<flag name='nvdimm.unarmed'/>
<flag name='virtio-pci-non-transitional'/>
- <flag name='nbd-bitmap'/>
<flag name='bochs-display'/>
<flag name='migration-file-drop-cache'/>
<flag name='dbus-vmstate'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
index cf47c29e71..17c662421d 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
@@ -109,7 +109,6 @@
<flag name='memory-backend-file.pmem'/>
<flag name='nvdimm.unarmed'/>
<flag name='virtio-pci-non-transitional'/>
- <flag name='nbd-bitmap'/>
<flag name='x86-max-cpu'/>
<flag name='cpu-unavailable-features'/>
<flag name='canonical-cpu-features'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
index 3615cc28fd..fe318e0a52 100644
--- a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
@@ -81,7 +81,6 @@
<flag name='egl-headless.rendernode'/>
<flag name='memory-backend-file.pmem'/>
<flag name='virtio-pci-non-transitional'/>
- <flag name='nbd-bitmap'/>
<flag name='bochs-display'/>
<flag name='migration-file-drop-cache'/>
<flag name='dbus-vmstate'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
index c6f1957842..0dd9d60be3 100644
--- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
@@ -108,7 +108,6 @@
<flag name='memory-backend-file.pmem'/>
<flag name='nvdimm.unarmed'/>
<flag name='virtio-pci-non-transitional'/>
- <flag name='nbd-bitmap'/>
<flag name='x86-max-cpu'/>
<flag name='cpu-unavailable-features'/>
<flag name='canonical-cpu-features'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
index 06b4c62fc6..1f526ebc54 100644
--- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
@@ -109,7 +109,6 @@
<flag name='memory-backend-file.pmem'/>
<flag name='nvdimm.unarmed'/>
<flag name='virtio-pci-non-transitional'/>
- <flag name='nbd-bitmap'/>
<flag name='x86-max-cpu'/>
<flag name='cpu-unavailable-features'/>
<flag name='canonical-cpu-features'/>
diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
index b5e5b794a6..44ff63d236 100644
--- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
@@ -109,7 +109,6 @@
<flag name='memory-backend-file.pmem'/>
<flag name='nvdimm.unarmed'/>
<flag name='virtio-pci-non-transitional'/>
- <flag name='nbd-bitmap'/>
<flag name='x86-max-cpu'/>
<flag name='cpu-unavailable-features'/>
<flag name='canonical-cpu-features'/>
diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
index d8988eafd7..51e27e08c4 100644
--- a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
@@ -53,7 +53,6 @@
<flag name='memory-backend-memfd.hugetlb'/>
<flag name='egl-headless.rendernode'/>
<flag name='virtio-pci-non-transitional'/>
- <flag name='nbd-bitmap'/>
<flag name='migration-file-drop-cache'/>
<flag name='dbus-vmstate'/>
<flag name='vhost-user-gpu'/>
diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
index 4a1c99641b..eee166b1ea 100644
--- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
@@ -109,7 +109,6 @@
<flag name='memory-backend-file.pmem'/>
<flag name='nvdimm.unarmed'/>
<flag name='virtio-pci-non-transitional'/>
- <flag name='nbd-bitmap'/>
<flag name='x86-max-cpu'/>
<flag name='cpu-unavailable-features'/>
<flag name='canonical-cpu-features'/>
diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml
b/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml
index 122e6daa08..837502c336 100644
--- a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml
@@ -85,7 +85,6 @@
<flag name='nvdimm.unarmed'/>
<flag name='virtio-pci-non-transitional'/>
<flag name='machine.virt.iommu'/>
- <flag name='nbd-bitmap'/>
<flag name='bochs-display'/>
<flag name='migration-file-drop-cache'/>
<flag name='dbus-vmstate'/>
diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml
b/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml
index 6dcd1889a9..f062f31abc 100644
--- a/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml
@@ -90,7 +90,6 @@
<flag name='nvdimm.unarmed'/>
<flag name='virtio-pci-non-transitional'/>
<flag name='machine.virt.iommu'/>
- <flag name='nbd-bitmap'/>
<flag name='bochs-display'/>
<flag name='migration-file-drop-cache'/>
<flag name='dbus-vmstate'/>
diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml
b/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml
index fc3c0df99a..2a37631381 100644
--- a/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml
@@ -79,7 +79,6 @@
<flag name='memory-backend-memfd.hugetlb'/>
<flag name='nvdimm.unarmed'/>
<flag name='virtio-pci-non-transitional'/>
- <flag name='nbd-bitmap'/>
<flag name='bochs-display'/>
<flag name='migration-file-drop-cache'/>
<flag name='dbus-vmstate'/>
diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml
b/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml
index e536d75215..086fa2c715 100644
--- a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml
@@ -53,7 +53,6 @@
<flag name='memory-backend-memfd.hugetlb'/>
<flag name='egl-headless.rendernode'/>
<flag name='virtio-pci-non-transitional'/>
- <flag name='nbd-bitmap'/>
<flag name='migration-file-drop-cache'/>
<flag name='dbus-vmstate'/>
<flag name='vhost-user-gpu'/>
diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml
index 8b771baf55..3f8fa926c8 100644
--- a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml
@@ -109,7 +109,6 @@
<flag name='memory-backend-file.pmem'/>
<flag name='nvdimm.unarmed'/>
<flag name='virtio-pci-non-transitional'/>
- <flag name='nbd-bitmap'/>
<flag name='x86-max-cpu'/>
<flag name='cpu-unavailable-features'/>
<flag name='canonical-cpu-features'/>
diff --git a/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml
b/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml
index a5baecfb5c..38835ba0cb 100644
--- a/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml
@@ -23,7 +23,6 @@
<flag name='memory-backend-memfd.hugetlb'/>
<flag name='egl-headless.rendernode'/>
<flag name='memory-backend-file.pmem'/>
- <flag name='nbd-bitmap'/>
<flag name='migration-file-drop-cache'/>
<flag name='dbus-vmstate'/>
<flag name='drive-nvme'/>
diff --git a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml
index 1e211a6ab1..7824fd3f5e 100644
--- a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml
@@ -109,7 +109,6 @@
<flag name='memory-backend-file.pmem'/>
<flag name='nvdimm.unarmed'/>
<flag name='virtio-pci-non-transitional'/>
- <flag name='nbd-bitmap'/>
<flag name='x86-max-cpu'/>
<flag name='cpu-unavailable-features'/>
<flag name='canonical-cpu-features'/>
diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml
b/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml
index 61c9029ed9..3b1445718a 100644
--- a/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml
@@ -83,7 +83,6 @@
<flag name='egl-headless.rendernode'/>
<flag name='memory-backend-file.pmem'/>
<flag name='virtio-pci-non-transitional'/>
- <flag name='nbd-bitmap'/>
<flag name='bochs-display'/>
<flag name='migration-file-drop-cache'/>
<flag name='dbus-vmstate'/>
diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml
b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml
index 5f22c0be87..0d566d13d5 100644
--- a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml
@@ -56,7 +56,6 @@
<flag name='memory-backend-memfd.hugetlb'/>
<flag name='egl-headless.rendernode'/>
<flag name='virtio-pci-non-transitional'/>
- <flag name='nbd-bitmap'/>
<flag name='migration-file-drop-cache'/>
<flag name='dbus-vmstate'/>
<flag name='vhost-user-gpu'/>
diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml
index cbeccccb4e..f2207ee5e3 100644
--- a/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml
@@ -108,7 +108,6 @@
<flag name='memory-backend-file.pmem'/>
<flag name='nvdimm.unarmed'/>
<flag name='virtio-pci-non-transitional'/>
- <flag name='nbd-bitmap'/>
<flag name='x86-max-cpu'/>
<flag name='cpu-unavailable-features'/>
<flag name='canonical-cpu-features'/>
diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml
b/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml
index 144d7411e7..ac25159eff 100644
--- a/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml
+++ b/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml
@@ -66,7 +66,6 @@
<flag name='nvdimm.unarmed'/>
<flag name='virtio-pci-non-transitional'/>
<flag name='machine.virt.iommu'/>
- <flag name='nbd-bitmap'/>
<flag name='bochs-display'/>
<flag name='dbus-vmstate'/>
<flag name='ramfb'/>
diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml
b/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml
index e831f64a12..e1323f9b72 100644
--- a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml
@@ -56,7 +56,6 @@
<flag name='memory-backend-memfd.hugetlb'/>
<flag name='egl-headless.rendernode'/>
<flag name='virtio-pci-non-transitional'/>
- <flag name='nbd-bitmap'/>
<flag name='migration-file-drop-cache'/>
<flag name='dbus-vmstate'/>
<flag name='vhost-user-gpu'/>
diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml
b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml
index ff996730b3..7f6316941b 100644
--- a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml
+++ b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml
@@ -109,7 +109,6 @@
<flag name='memory-backend-file.pmem'/>
<flag name='nvdimm.unarmed'/>
<flag name='virtio-pci-non-transitional'/>
- <flag name='nbd-bitmap'/>
<flag name='x86-max-cpu'/>
<flag name='cpu-unavailable-features'/>
<flag name='canonical-cpu-features'/>
diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml
b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml
index 0d1db857f7..12d1928bb7 100644
--- a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml
@@ -108,7 +108,6 @@
<flag name='memory-backend-file.pmem'/>
<flag name='nvdimm.unarmed'/>
<flag name='virtio-pci-non-transitional'/>
- <flag name='nbd-bitmap'/>
<flag name='x86-max-cpu'/>
<flag name='cpu-unavailable-features'/>
<flag name='canonical-cpu-features'/>
--
2.49.0
7:36 a.m.
New subject: [PATCH 0/4] qemu: Remove legacy 'nbd-export-add' code and
deprecate corresponding capabilities
On a Tuesday in 2025, Peter Krempa via Devel wrote:
Peter Krempa (4):
qemu: block: Always assume support for 'block-export-add'
qemu: monitor: Drop wrappers for 'nbd-server-add'
qemu: capabilities: Retire QEMU_CAPS_BLOCK_EXPORT_ADD
qemu: capabilities: Retire QEMU_CAPS_NBD_BITMAP
src/qemu/qemu_block.c | 7 -----
src/qemu/qemu_capabilities.c | 6 ++--
[..]
.../caps_9.2.0_x86_64.xml | 2 --
tests/qemumonitorjsontest.c | 2 --
37 files changed, 4 insertions(+), 129 deletions(-)
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
116
days inactive
116
days old
5 comments
2 participants
participants (2)
-
Ján Tomko -
Peter Krempa