[libvirt] [PATCH 5/5] virsh: Don't open-code virJSONStringReformat in cmdQemuMonitorCommand

Peter Krempa pkrempa at redhat.com
Mon Sep 16 12:45:36 UTC 2019


Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 tools/virsh-domain.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 8c24935938..fbfdc09c0d 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -9512,7 +9512,6 @@ cmdQemuMonitorCommand(vshControl *ctl, const vshCmd *cmd)
     unsigned int flags = 0;
     const vshCmdOpt *opt = NULL;
     virBuffer buf = VIR_BUFFER_INITIALIZER;
-    VIR_AUTOPTR(virJSONValue) pretty = NULL;

     VSH_EXCLUSIVE_OPTIONS("hmp", "pretty");

@@ -9538,8 +9537,7 @@ cmdQemuMonitorCommand(vshControl *ctl, const vshCmd *cmd)

     if (vshCommandOptBool(cmd, "pretty")) {
         char *tmp;
-        pretty = virJSONValueFromString(result);
-        if (pretty && (tmp = virJSONValueToString(pretty, true))) {
+        if ((tmp = virJSONStringReformat(result, true))) {
             VIR_FREE(result);
             result = tmp;
             virTrimSpaces(result, NULL);
-- 
2.21.0




More information about the libvir-list mailing list