[PATCH 46/80] qemu: monitor: Remove unused arguments of qemuMonitorBlockStream

[Peter Krempa]

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_driver.c       |  2 --
 src/qemu/qemu_monitor.c      | 15 +++------------
 src/qemu/qemu_monitor.h      |  2 --
 src/qemu/qemu_monitor_json.c | 12 ++----------
 src/qemu/qemu_monitor_json.h |  2 --
 tests/qemumonitorjsontest.c  |  2 +-
 6 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 7a2d8dde5e..e4caccfbd9 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -14547,8 +14547,6 @@ qemuDomainBlockPullCommon(virDomainObj *vm,
     ret = qemuMonitorBlockStream(priv->mon,
                                  disk->src->nodeformat,
                                  job->name,
-                                 true,
-                                 NULL,
                                  nodebase,
                                  backingPath,
                                  speed);
diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 1453181f94..15fe6690e9 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -3016,26 +3016,17 @@ int
 qemuMonitorBlockStream(qemuMonitor *mon,
                        const char *device,
                        const char *jobname,
-                       bool persistjob,
-                       const char *base,
                        const char *baseNode,
                        const char *backingName,
                        unsigned long long bandwidth)
 {
-    VIR_DEBUG("device=%s, jobname=%s, persistjob=%d, base=%s, baseNode=%s, "
-              "backingName=%s, bandwidth=%lluB",
-              device, NULLSTR(jobname), persistjob, NULLSTR(base),
+    VIR_DEBUG("device=%s, jobname=%s, baseNode=%s, backingName=%s, bandwidth=%lluB",
+              device, NULLSTR(jobname),
               NULLSTR(baseNode), NULLSTR(backingName), bandwidth);

     QEMU_CHECK_MONITOR(mon);

-    if (base && baseNode) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                       _("'base' and 'baseNode' can't be used together"));
-        return -1;
-    }
-
-    return qemuMonitorJSONBlockStream(mon, device, jobname, persistjob, base,
+    return qemuMonitorJSONBlockStream(mon, device, jobname,
                                       baseNode, backingName, bandwidth);
 }

diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 7aed4ffd4f..89b2348775 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -1029,8 +1029,6 @@ int qemuMonitorSendKey(qemuMonitor *mon,
 int qemuMonitorBlockStream(qemuMonitor *mon,
                            const char *device,
                            const char *jobname,
-                           bool persistjob,
-                           const char *base,
                            const char *baseNode,
                            const char *backingName,
                            unsigned long long bandwidth)
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index e6eb41d85b..e569cf27be 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -4531,27 +4531,19 @@ int
 qemuMonitorJSONBlockStream(qemuMonitor *mon,
                            const char *device,
                            const char *jobname,
-                           bool persistjob,
-                           const char *base,
                            const char *baseNode,
                            const char *backingName,
                            unsigned long long speed)
 {
     g_autoptr(virJSONValue) cmd = NULL;
     g_autoptr(virJSONValue) reply = NULL;
-    virTristateBool autofinalize = VIR_TRISTATE_BOOL_ABSENT;
-    virTristateBool autodismiss = VIR_TRISTATE_BOOL_ABSENT;
-
-    if (persistjob) {
-        autofinalize = VIR_TRISTATE_BOOL_YES;
-        autodismiss = VIR_TRISTATE_BOOL_NO;
-    }
+    virTristateBool autofinalize = VIR_TRISTATE_BOOL_YES;
+    virTristateBool autodismiss = VIR_TRISTATE_BOOL_NO;

     if (!(cmd = qemuMonitorJSONMakeCommand("block-stream",
                                            "s:device", device,
                                            "S:job-id", jobname,
                                            "Y:speed", speed,
-                                           "S:base", base,
                                            "S:base-node", baseNode,
                                            "S:backing-file", backingName,
                                            "T:auto-finalize", autofinalize,
diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index 9da26ca646..4f780e02aa 100644
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -367,8 +367,6 @@ int
 qemuMonitorJSONBlockStream(qemuMonitor *mon,
                            const char *device,
                            const char *jobname,
-                           bool persistjob,
-                           const char *base,
                            const char *baseNode,
                            const char *backingName,
                            unsigned long long speed)
diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
index d5915720c8..f1c403d5b3 100644
--- a/tests/qemumonitorjsontest.c
+++ b/tests/qemumonitorjsontest.c
@@ -1214,7 +1214,7 @@ GEN_TEST_FUNC(qemuMonitorJSONGraphicsRelocate, VIR_DOMAIN_GRAPHICS_TYPE_SPICE,
 GEN_TEST_FUNC(qemuMonitorJSONRemoveNetdev, "net0")
 GEN_TEST_FUNC(qemuMonitorJSONDelDevice, "ide0")
 GEN_TEST_FUNC(qemuMonitorJSONBlockdevMirror, "jobname", true, "vdb", "targetnode", 1024, 1234, 31234, true, true)
-GEN_TEST_FUNC(qemuMonitorJSONBlockStream, "vdb", "jobname", true, "/foo/bar1", "backingnode", "backingfilename", 1024)
+GEN_TEST_FUNC(qemuMonitorJSONBlockStream, "vdb", "jobname", "backingnode", "backingfilename", 1024)
 GEN_TEST_FUNC(qemuMonitorJSONBlockCommit, "vdb", "jobname", "topnode", "basenode", "backingfilename", 1024)
 GEN_TEST_FUNC(qemuMonitorJSONDrivePivot, "vdb")
 GEN_TEST_FUNC(qemuMonitorJSONScreendump, "devicename", 1, "/foo/bar")
-- 
2.36.1