qemu: monitor: Remove qemuMonitorJobCancel

The API is unused since last commit. Remove it.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index fa8a027aa643d48a5a129afbd1089fc3f606ba1f..23161a0088358c67fa4d8aa8246bf1381d84146a 100644 (file)
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -3448,19 +3448,6 @@ qemuMonitorJobDismiss(qemuMonitor *mon,
 }
 
 
-int
-qemuMonitorJobCancel(qemuMonitor *mon,
-                     const char *jobname,
-                     bool quiet)
-{
-    VIR_DEBUG("jobname='%s' quiet=%d", jobname, quiet);
-
-    QEMU_CHECK_MONITOR(mon);
-
-    return qemuMonitorJSONJobCancel(mon, jobname, quiet);
-}
-
-
 int
 qemuMonitorJobComplete(qemuMonitor *mon,
                        const char *jobname)

diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 95f1a10e315513d1fe88c684923078dbf058a4f6..420a85942a5bfb55f5a45b37a8f08b1cfeb5a36a 100644 (file)
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -1106,11 +1106,6 @@ int qemuMonitorJobDismiss(qemuMonitor *mon,
                           const char *jobname)
     ATTRIBUTE_NONNULL(2);
 
-int qemuMonitorJobCancel(qemuMonitor *mon,
-                         const char *jobname,
-                         bool quiet)
-    ATTRIBUTE_NONNULL(2);
-
 int qemuMonitorJobComplete(qemuMonitor *mon,
                            const char *jobname)
     ATTRIBUTE_NONNULL(2);

diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index dc74c86158cda502d0a4df2fcbabab29dc5158dd..8de0e4b638043e66da7ed3177dceab7cb1a21a6c 100644 (file)
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -5319,34 +5319,6 @@ qemuMonitorJSONJobDismiss(qemuMonitor *mon,
 }
 
 
-int
-qemuMonitorJSONJobCancel(qemuMonitor *mon,
-                         const char *jobname,
-                         bool quiet)
-{
-    g_autoptr(virJSONValue) cmd = NULL;
-    g_autoptr(virJSONValue) reply = NULL;
-
-    if (!(cmd = qemuMonitorJSONMakeCommand("job-cancel",
-                                           "s:id", jobname,
-                                           NULL)))
-        return -1;
-
-    if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
-        return -1;
-
-    if (quiet) {
-        if (virJSONValueObjectHasKey(reply, "error") != 0)
-            return -1;
-    } else {
-        if (qemuMonitorJSONBlockJobError(cmd, reply, jobname) < 0)
-            return -1;
-    }
-
-    return 0;
-}
-
-
 int
 qemuMonitorJSONJobComplete(qemuMonitor *mon,
                            const char *jobname)

diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index 486ba5a593a39f3ab6ca9112261f9e028f2f00a1..8d8f2de479f40273e1cc1b7fe0fe8eb6f01b2f89 100644 (file)
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -348,11 +348,6 @@ int qemuMonitorJSONJobDismiss(qemuMonitor *mon,
                               const char *jobname)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
 
-int qemuMonitorJSONJobCancel(qemuMonitor *mon,
-                             const char *jobname,
-                             bool quiet)
-    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
-
 int qemuMonitorJSONJobComplete(qemuMonitor *mon,
                                const char *jobname)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);

diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
index 9e53b652894e9e94d4432f10a31e91c9b6054dd3..e36036e0d23ae5ec7c849833bbb4426ee380f964 100644 (file)
--- a/tests/qemumonitorjsontest.c
+++ b/tests/qemumonitorjsontest.c
@@ -1216,7 +1216,6 @@ GEN_TEST_FUNC(qemuMonitorJSONBlockdevMediumRemove, "foodev")
 GEN_TEST_FUNC(qemuMonitorJSONBlockdevMediumInsert, "foodev", "newnode")
 GEN_TEST_FUNC(qemuMonitorJSONBitmapRemove, "foodev", "newnode")
 GEN_TEST_FUNC(qemuMonitorJSONJobDismiss, "jobname")
-GEN_TEST_FUNC(qemuMonitorJSONJobCancel, "jobname", false)
 GEN_TEST_FUNC(qemuMonitorJSONJobComplete, "jobname")
 GEN_TEST_FUNC(qemuMonitorJSONBlockJobCancel, "jobname", true)
 
@@ -3121,7 +3120,6 @@ mymain(void)
     DO_TEST_GEN(qemuMonitorJSONBlockdevMediumInsert);
     DO_TEST_GEN(qemuMonitorJSONBitmapRemove);
     DO_TEST_GEN(qemuMonitorJSONJobDismiss);
-    DO_TEST_GEN(qemuMonitorJSONJobCancel);
     DO_TEST_GEN(qemuMonitorJSONJobComplete);
     DO_TEST_GEN(qemuMonitorJSONBlockJobCancel);
     DO_TEST(qemuMonitorJSONGetBalloonInfo);