]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu: monitor: assume JSON in QEMU_CHECK_MONITOR macro
authorJán Tomko <jtomko@redhat.com>
Fri, 14 Jun 2019 18:05:44 +0000 (20:05 +0200)
committerJán Tomko <jtomko@redhat.com>
Thu, 20 Jun 2019 11:47:41 +0000 (13:47 +0200)
In preparation to removing the json field from qemuMonitor,
stop checking for it in QEMU_CHECK_MONITOR.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
src/qemu/qemu_monitor.c

index de4c31bc5094ef8a62d59ab17733adb9f1e12928..f62913550311813e08c28b7406e2f2bfeee0b99b 100644 (file)
@@ -133,13 +133,7 @@ struct _qemuMonitor {
                            _("monitor must not be NULL")); \
             exit; \
         } \
-        VIR_DEBUG("mon:%p vm:%p json:%d fd:%d", \
-                  mon, mon->vm, mon->json, mon->fd); \
-        if (!mon->json) { \
-            virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", \
-                           _("JSON monitor is required")); \
-            exit; \
-        } \
+        VIR_DEBUG("mon:%p vm:%p fd:%d", mon, mon->vm, mon->fd); \
     } while (0)
 
 /* Check monitor and return NULL on error */