[libvirt] [PATCH 06/10] qemu: monitor: assume JSON in QEMU_CHECK_MONITOR macro

Ján Tomko jtomko at redhat.com
Sat Jun 15 12:11:35 UTC 2019


In preparation to removing the json field from qemuMonitor,
stop checking for it in QEMU_CHECK_MONITOR.

Signed-off-by: Ján Tomko <jtomko at redhat.com>
---
 src/qemu/qemu_monitor.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 87804e0956..30c1b1e596 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -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 */
-- 
2.20.1




More information about the libvir-list mailing list