From 6799b5279597b5f9ac4c0aa55b56defb56b1075a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1n=20Tomko?= Date: Fri, 14 Jun 2019 20:05:44 +0200 Subject: [PATCH] qemu: monitor: assume JSON in QEMU_CHECK_MONITOR macro MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In preparation to removing the json field from qemuMonitor, stop checking for it in QEMU_CHECK_MONITOR. Signed-off-by: Ján Tomko Acked-by: Peter Krempa --- 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 de4c31bc50..f629135503 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 */