qemu: monitor: Drop wrappers for 'nbd-server-add'

The code is no longer used.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 6340f437dd876580055a33fed92525c95041e3e4..8262e3a8b2ec65221dc931e3fb08f45bd722b492 100644 (file)
--- 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 db451c448b9f2d01cd3e966844c0e5edea90fb8a..4acf50a16661ef9b5f34279611f76a8550d883f5 100644 (file)
--- 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 34ed42b0043e9152270aa2f6b579ebc6555aff12..6fa301577d5ecc519767488d19163be6a6fd1cae 100644 (file)
--- 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 c97080f2369d8c051ae131fdd129c27311dca279..cec4fb387e0128f4a665082fa6cebf091362f5ed 100644 (file)
--- 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 d309b7d3d7cf9f2d2f20838eff28cc0411dc3f77..7485f683fb94950a323d08b6ca69f249c2a99635 100644 (file)
--- 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);