67 lines
2.3 KiB
Diff
67 lines
2.3 KiB
Diff
From 717b22f34cf5ce58be5a5223a29546e8c46e0365 Mon Sep 17 00:00:00 2001
|
|
From: Peter Krempa <pkrempa@redhat.com>
|
|
Date: Mon, 30 Nov 2020 15:32:14 +0100
|
|
Subject: [PATCH 02/16] qemuMonitorJSONAddObject: Take double pointer for
|
|
@props
|
|
|
|
Prepare for a refactor of qemuMonitorJSONMakeCommandInternal.
|
|
|
|
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
|
|
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
|
|
---
|
|
src/qemu/qemu_monitor.c | 3 +--
|
|
src/qemu/qemu_monitor_json.c | 5 +++--
|
|
src/qemu/qemu_monitor_json.h | 2 +-
|
|
3 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
|
|
index 58a8741bb8..0447b609fd 100644
|
|
--- a/src/qemu/qemu_monitor.c
|
|
+++ b/src/qemu/qemu_monitor.c
|
|
@@ -2966,8 +2966,7 @@ qemuMonitorAddObject(qemuMonitorPtr mon,
|
|
if (alias)
|
|
tmp = g_strdup(id);
|
|
|
|
- ret = qemuMonitorJSONAddObject(mon, *props);
|
|
- *props = NULL;
|
|
+ ret = qemuMonitorJSONAddObject(mon, props);
|
|
|
|
if (alias)
|
|
*alias = g_steal_pointer(&tmp);
|
|
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
|
|
index 03af998cb0..ce7f35e2ca 100644
|
|
--- a/src/qemu/qemu_monitor_json.c
|
|
+++ b/src/qemu/qemu_monitor_json.c
|
|
@@ -4427,12 +4427,13 @@ qemuMonitorJSONAddDevice(qemuMonitorPtr mon,
|
|
|
|
int
|
|
qemuMonitorJSONAddObject(qemuMonitorPtr mon,
|
|
- virJSONValuePtr props)
|
|
+ virJSONValuePtr *props)
|
|
{
|
|
g_autoptr(virJSONValue) cmd = NULL;
|
|
g_autoptr(virJSONValue) reply = NULL;
|
|
+ virJSONValuePtr pr = g_steal_pointer(props);
|
|
|
|
- if (!(cmd = qemuMonitorJSONMakeCommandInternal("object-add", props)))
|
|
+ if (!(cmd = qemuMonitorJSONMakeCommandInternal("object-add", pr)))
|
|
return -1;
|
|
|
|
if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
|
|
diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
|
|
index af52372a93..2c0e3ec07a 100644
|
|
--- a/src/qemu/qemu_monitor_json.h
|
|
+++ b/src/qemu/qemu_monitor_json.h
|
|
@@ -234,7 +234,7 @@ int qemuMonitorJSONDelDevice(qemuMonitorPtr mon,
|
|
const char *devalias);
|
|
|
|
int qemuMonitorJSONAddObject(qemuMonitorPtr mon,
|
|
- virJSONValuePtr props);
|
|
+ virJSONValuePtr *props);
|
|
|
|
int qemuMonitorJSONDelObject(qemuMonitorPtr mon,
|
|
const char *objalias,
|
|
--
|
|
2.27.0
|
|
|