summaryrefslogtreecommitdiff
path: root/src/qemu/qemu_monitor.c
diff options
context:
space:
mode:
authorAndrea Bolognani <abologna@redhat.com>2017-11-03 13:09:47 +0100
committerAndrea Bolognani <abologna@redhat.com>2017-11-03 13:24:12 +0100
commit3e7db8d3e8538bcd5deb1b111fb1233fc18831aa (patch)
tree33603505f2d95869500875a82cde7ebf847fe125 /src/qemu/qemu_monitor.c
parenta92c4f7537577f1443ddd6fef4e0dfcb054e5f08 (diff)
downloadlibvirt-3e7db8d3e8538bcd5deb1b111fb1233fc18831aa.tar.gz
Remove backslash alignment attempts
Right-aligning backslashes when defining macros or using complex commands in Makefiles looks cute, but as soon as any changes is required to the code you end up with either distractingly broken alignment or unnecessarily big diffs where most of the changes are just pushing all backslashes a few characters to one side. Generated using $ git grep -El '[[:blank:]][[:blank:]]\\$' | \ grep -E '*\.([chx]|am|mk)$$' | \ while read f; do \ sed -Ei 's/[[:blank:]]*[[:blank:]]\\$/ \\/g' "$f"; \ done Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Diffstat (limited to 'src/qemu/qemu_monitor.c')
-rw-r--r--src/qemu/qemu_monitor.c44
1 files changed, 22 insertions, 22 deletions
diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 611876ff89..473a527358 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -118,20 +118,20 @@ struct _qemuMonitor {
* the function if not. The macro also adds a debug statement regarding the
* monitor.
*/
-#define QEMU_CHECK_MONITOR_FULL(mon, force_json, 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; \
- } \
+#define QEMU_CHECK_MONITOR_FULL(mon, force_json, 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 */
@@ -1289,15 +1289,15 @@ qemuMonitorHMPCommandWithFd(qemuMonitorPtr mon,
/* Ensure proper locking around callbacks. */
-#define QEMU_MONITOR_CALLBACK(mon, ret, callback, ...) \
- do { \
- virObjectRef(mon); \
- virObjectUnlock(mon); \
- if ((mon)->cb && (mon)->cb->callback) \
- (ret) = (mon)->cb->callback(mon, __VA_ARGS__, \
+#define QEMU_MONITOR_CALLBACK(mon, ret, callback, ...) \
+ do { \
+ virObjectRef(mon); \
+ virObjectUnlock(mon); \
+ if ((mon)->cb && (mon)->cb->callback) \
+ (ret) = (mon)->cb->callback(mon, __VA_ARGS__, \
(mon)->callbackOpaque); \
- virObjectLock(mon); \
- virObjectUnref(mon); \
+ virObjectLock(mon); \
+ virObjectUnref(mon); \
} while (0)