From d926d7b4c9b15740c34426e73b792d97d38cc002 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Wed, 20 Jul 2022 12:39:43 +0200 Subject: [PATCH] qemu: monitor: Remove unused arguments of qemuMonitorBlockStream MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina Reviewed-by: Ján Tomko --- 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 1f796b9d08..8f60e714c0 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -14493,8 +14493,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 113c541531..55e09e4063 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -2966,26 +2966,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 253e61cbcc..0c8e3d606e 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -1025,8 +1025,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 e59402b685..da22db45fb 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -4503,27 +4503,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 4cbd389a61..5d66aa1391 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -366,8 +366,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 db7478fb2e..06a1386454 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")