From 0f889e725e2e132e1eed62de38995677abc5da41 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Fri, 29 Jul 2016 09:04:34 +0200 Subject: [PATCH] qemu: monitor: Add do-while block to QEMU_CHECK_MONITOR_FULL Assure that it's just one statement to avoid problems when used with conditions. --- src/qemu/qemu_monitor.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 3e80376b82..3455590f20 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -112,17 +112,20 @@ struct _qemuMonitor { * monitor. */ #define QEMU_CHECK_MONITOR_FULL(mon, force_json, exit) \ - if (!mon) { \ - virReportError(VIR_ERR_INVALID_ARG, "%s", \ - _("monitor must not be NULL")); \ - exit; \ - } \ - VIR_DEBUG("mon:%p vm:%p json:%d fd:%d", mon, mon->vm, mon->json, mon->fd); \ - if (force_json && !mon->json) { \ - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", \ - _("JSON monitor is required")); \ - exit; \ - } + do { \ + if (!mon) { \ + virReportError(VIR_ERR_INVALID_ARG, "%s", \ + _("monitor must not be NULL")); \ + exit; \ + } \ + VIR_DEBUG("mon:%p vm:%p json:%d fd:%d", \ + mon, mon->vm, mon->json, mon->fd); \ + if (force_json && !mon->json) { \ + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", \ + _("JSON monitor is required")); \ + exit; \ + } \ + } while (0) /* Check monitor and return NULL on error */ #define QEMU_CHECK_MONITOR_NULL(mon) \ -- GitLab