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

[Pavel Hrdina]

On Tue, Jul 26, 2022 at 04:37:24PM +0200, Peter Krempa wrote:
> Signed-off-by: Peter Krempa 
> ---
>  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(-)

Reviewed-by: Pavel Hrdina 


signature.asc
Description: PGP signature

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

[Peter Krempa]

Signed-off-by: Peter Krempa 
---
 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,