qemu: remove json fields from domain and monitor objects

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

Posted by Ján Tomko 6 years, 7 months ago

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>
---
 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

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

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

Posted by Peter Krempa 6 years, 7 months ago

On Sat, Jun 15, 2019 at 14:11:35 +0200, Ján Tomko wrote:
> 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>
> ---
>  src/qemu/qemu_monitor.c | 8 +-------
>  1 file changed, 1 insertion(+), 7 deletions(-)

ACK
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list