[PATCH 1/4] qemu: block: Always assume support for 'block-export-add'

From: Peter Krempa <pkrempa(a)redhat.com&gt; '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&gt; --- 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