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: NAndrea Bolognani <abologna@redhat.com>

Makefile.am

@@ -97,11 +97,11 @@ dist-hook: gen-ChangeLog gen-AUTHORS
 gen_start_date = 2009-07-04
 .PHONY: gen-ChangeLog
 gen-ChangeLog:
-	$(AM_V_GEN)if test -d .git; then			\
-	  $(top_srcdir)/build-aux/gitlog-to-changelog		\
-	    --since=$(gen_start_date) > $(distdir)/cl-t;	\
-	  rm -f $(distdir)/ChangeLog;				\
-	  mv $(distdir)/cl-t $(distdir)/ChangeLog;		\
+	$(AM_V_GEN)if test -d .git; then \
+	  $(top_srcdir)/build-aux/gitlog-to-changelog \
+	    --since=$(gen_start_date) > $(distdir)/cl-t; \
+	  rm -f $(distdir)/ChangeLog; \
+	  mv $(distdir)/cl-t $(distdir)/ChangeLog; \
 	fi
 
 .PHONY: gen-AUTHORS

Makefile.nonreentrant

@@ -17,7 +17,7 @@
 #
 # Generated by running the following on Fedora 26:
 #
-#  nm -D --defined-only /lib64/libc.so.6  \
+#  nm -D --defined-only /lib64/libc.so.6 \
 #      | grep '_r$' \
 #      | awk '{print $3}' \
 #      | grep -v __ \

config-post.h

@@ -86,7 +86,7 @@
  * When __GNUC_PREREQ is not defined, gnulib defines it to 0, which breaks things.
  */
 #ifndef __GNUC_PREREQ
-# define __GNUC_PREREQ(maj, min)                                        \
+# define __GNUC_PREREQ(maj, min) \
     ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
 #endif
 

daemon/Makefile.am

@@ -33,17 +33,17 @@ CLEANFILES =
 
 WARN_CFLAGS += $(STRICT_FRAME_LIMIT_CFLAGS)
 
-DAEMON_GENERATED =			\
-		remote_dispatch.h	\
-		lxc_dispatch.h		\
-		qemu_dispatch.h		\
-		admin_dispatch.h	\
+DAEMON_GENERATED = \
+		remote_dispatch.h \
+		lxc_dispatch.h \
+		qemu_dispatch.h \
+		admin_dispatch.h \
 		$(NULL)
 
-DAEMON_SOURCES =					\
-		libvirtd.c libvirtd.h			\
-		remote.c remote.h			\
-		stream.c stream.h			\
+DAEMON_SOURCES = \
+		libvirtd.c libvirtd.h \
+		remote.c remote.h \
+		stream.c stream.h \
 		$(DAEMON_GENERATED)
 
 LIBVIRTD_CONF_SOURCES = libvirtd-config.c libvirtd-config.h
@@ -57,33 +57,33 @@ MANINFILES = \
 	$(NULL)
 
 DISTCLEANFILES =
-EXTRA_DIST =						\
-	remote_dispatch.h				\
-	lxc_dispatch.h					\
-	qemu_dispatch.h					\
-	admin_dispatch.h				\
-	libvirtd.conf					\
-	libvirtd.init.in				\
-	libvirtd.upstart				\
-	libvirtd.policy.in				\
-	libvirt.rules					\
-	libvirtd.sasl					\
-	libvirtd.service.in				\
-	virt-guest-shutdown.target		\
-	libvirtd.sysconf				\
-	libvirtd.sysctl					\
-	libvirtd.aug                                    \
-	libvirtd.logrotate.in                           \
-	libvirtd.qemu.logrotate.in                      \
-	libvirtd.lxc.logrotate.in                       \
-	libvirtd.libxl.logrotate.in                     \
-	libvirtd.uml.logrotate.in                       \
-	test_libvirtd.aug.in                             \
-	THREADS.txt					\
-	$(PODFILES)					\
-	$(MANINFILES)					\
-	$(DAEMON_SOURCES)				\
-	$(LIBVIRTD_CONF_SOURCES)			\
+EXTRA_DIST = \
+	remote_dispatch.h \
+	lxc_dispatch.h \
+	qemu_dispatch.h \
+	admin_dispatch.h \
+	libvirtd.conf \
+	libvirtd.init.in \
+	libvirtd.upstart \
+	libvirtd.policy.in \
+	libvirt.rules \
+	libvirtd.sasl \
+	libvirtd.service.in \
+	virt-guest-shutdown.target \
+	libvirtd.sysconf \
+	libvirtd.sysctl \
+	libvirtd.aug \
+	libvirtd.logrotate.in \
+	libvirtd.qemu.logrotate.in \
+	libvirtd.lxc.logrotate.in \
+	libvirtd.libxl.logrotate.in \
+	libvirtd.uml.logrotate.in \
+	test_libvirtd.aug.in \
+	THREADS.txt \
+	$(PODFILES) \
+	$(MANINFILES) \
+	$(DAEMON_SOURCES) \
+	$(LIBVIRTD_CONF_SOURCES) \
 	$(NULL)
 
 BUILT_SOURCES =
@@ -128,11 +128,11 @@ libvirtd_conf_la_CFLAGS = \
 	$(WARN_CFLAGS) $(PIE_CFLAGS) \
 	$(COVERAGE_CFLAGS) \
 	$(NULL)
-libvirtd_conf_la_LDFLAGS =				\
-	$(RELRO_LDFLAGS)				\
-	$(PIE_LDFLAGS)					\
-	$(COVERAGE_LDFLAGS)				\
-	$(NO_INDIRECT_LDFLAGS)				\
+libvirtd_conf_la_LDFLAGS = \
+	$(RELRO_LDFLAGS) \
+	$(PIE_LDFLAGS) \
+	$(COVERAGE_LDFLAGS) \
+	$(NO_INDIRECT_LDFLAGS) \
 	$(NULL)
 libvirtd_conf_la_LIBADD = $(LIBXML_LIBS)
 
@@ -141,20 +141,20 @@ libvirtd_admin_la_SOURCES = \
 		admin.c admin.h admin_server.c admin_server.h
 
 libvirtd_admin_la_CFLAGS = \
-		$(AM_CFLAGS)		\
-		$(XDR_CFLAGS)		\
-		$(PIE_CFLAGS)		\
-		$(WARN_CFLAGS)		\
-		$(LIBXML_CFLAGS)	\
-		$(COVERAGE_CFLAGS)	\
+		$(AM_CFLAGS) \
+		$(XDR_CFLAGS) \
+		$(PIE_CFLAGS) \
+		$(WARN_CFLAGS) \
+		$(LIBXML_CFLAGS) \
+		$(COVERAGE_CFLAGS) \
 		$(NULL)
 libvirtd_admin_la_LDFLAGS = \
-		$(PIE_LDFLAGS)		\
-		$(RELRO_LDFLAGS)	\
-		$(COVERAGE_LDFLAGS)	\
-		$(NO_INDIRECT_LDFLAGS)  \
+		$(PIE_LDFLAGS) \
+		$(RELRO_LDFLAGS) \
+		$(COVERAGE_LDFLAGS) \
+		$(NO_INDIRECT_LDFLAGS) \
 		$(NULL)
-libvirtd_admin_la_LIBADD =	\
+libvirtd_admin_la_LIBADD = \
 		../src/libvirt-admin.la
 
 man8_MANS = libvirtd.8
@@ -182,18 +182,18 @@ libvirtd_CFLAGS = \
 	$(COVERAGE_CFLAGS) \
 	-DQEMUD_PID_FILE="\"$(QEMUD_PID_FILE)\""
 
-libvirtd_LDFLAGS =					\
-	$(RELRO_LDFLAGS)				\
-	$(PIE_LDFLAGS)					\
-	$(COVERAGE_LDFLAGS)				\
-	$(NO_INDIRECT_LDFLAGS)				\
+libvirtd_LDFLAGS = \
+	$(RELRO_LDFLAGS) \
+	$(PIE_LDFLAGS) \
+	$(COVERAGE_LDFLAGS) \
+	$(NO_INDIRECT_LDFLAGS) \
 	$(NULL)
 
-libvirtd_LDADD =					\
-	$(LIBXML_LIBS)					\
-	$(GNUTLS_LIBS)					\
-	$(SASL_LIBS)					\
-	$(DBUS_LIBS)					\
+libvirtd_LDADD = \
+	$(LIBXML_LIBS) \
+	$(GNUTLS_LIBS) \
+	$(SASL_LIBS) \
+	$(DBUS_LIBS) \
 	$(LIBNL_LIBS)
 
 if WITH_DTRACE_PROBES
@@ -279,33 +279,33 @@ LOGROTATE_CONFS = libvirtd.qemu.logrotate libvirtd.lxc.logrotate \
 BUILT_SOURCES += $(LOGROTATE_CONFS)
 
 libvirtd.logrotate: libvirtd.logrotate.in
-	$(AM_V_GEN)sed						\
-	    -e 's|[@]localstatedir[@]|$(localstatedir)|g'	\
+	$(AM_V_GEN)sed \
+	    -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
 	    < $< > $@-t && \
 	mv $@-t $@
 
 libvirtd.qemu.logrotate: libvirtd.qemu.logrotate.in
-	$(AM_V_GEN)sed						\
-	    -e 's|[@]localstatedir[@]|$(localstatedir)|g'	\
+	$(AM_V_GEN)sed \
+	    -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
 	    < $< > $@-t && \
 	mv $@-t $@
 
 libvirtd.lxc.logrotate: libvirtd.lxc.logrotate.in
-	$(AM_V_GEN)sed						\
-	    -e 's|[@]localstatedir[@]|$(localstatedir)|g'	\
-	    < $< > $@-t &&					\
+	$(AM_V_GEN)sed \
+	    -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
+	    < $< > $@-t && \
 	    mv $@-t $@
 
 libvirtd.libxl.logrotate: libvirtd.libxl.logrotate.in
-	$(AM_V_GEN)sed						\
-	    -e 's|[@]localstatedir[@]|$(localstatedir)|g'	\
-	    < $< > $@-t &&					\
+	$(AM_V_GEN)sed \
+	    -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
+	    < $< > $@-t && \
 	    mv $@-t $@
 
 libvirtd.uml.logrotate: libvirtd.uml.logrotate.in
-	$(AM_V_GEN)sed						\
-	    -e 's|[@]localstatedir[@]|$(localstatedir)|g'	\
-	    < $< > $@-t &&					\
+	$(AM_V_GEN)sed \
+	    -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
+	    < $< > $@-t && \
 	    mv $@-t $@
 
 install-logrotate: $(LOGROTATE_CONFS)
@@ -415,20 +415,20 @@ uninstall-init-systemd:
 endif ! LIBVIRT_INIT_SCRIPT_SYSTEMD
 
 libvirtd.init: libvirtd.init.in $(top_builddir)/config.status
-	$(AM_V_GEN)sed						\
-	    -e 's|[@]localstatedir[@]|$(localstatedir)|g'	\
-	    -e 's|[@]sbindir[@]|$(sbindir)|g'			\
-	    -e 's|[@]sysconfdir[@]|$(sysconfdir)|g'		\
-	    < $< > $@-t &&					\
-	    chmod a+x $@-t &&					\
+	$(AM_V_GEN)sed \
+	    -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
+	    -e 's|[@]sbindir[@]|$(sbindir)|g' \
+	    -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \
+	    < $< > $@-t && \
+	    chmod a+x $@-t && \
 	    mv $@-t $@
 
 libvirtd.service: libvirtd.service.in $(top_builddir)/config.status
-	$(AM_V_GEN)sed						\
-	    -e 's|[@]localstatedir[@]|$(localstatedir)|g'	\
-	    -e 's|[@]sbindir[@]|$(sbindir)|g'			\
-	    -e 's|[@]sysconfdir[@]|$(sysconfdir)|g'		\
-	    < $< > $@-t &&					\
+	$(AM_V_GEN)sed \
+	    -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
+	    -e 's|[@]sbindir[@]|$(sbindir)|g' \
+	    -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \
+	    < $< > $@-t && \
 	    mv $@-t $@
 
 

daemon/remote.c

@@ -58,15 +58,15 @@
 VIR_LOG_INIT("daemon.remote");
 
 #if SIZEOF_LONG < 8
-# define HYPER_TO_TYPE(_type, _to, _from)                               \
-    do {                                                                \
-        if ((_from) != (_type)(_from)) {                                \
-            virReportError(VIR_ERR_OVERFLOW,                            \
+# define HYPER_TO_TYPE(_type, _to, _from) \
+    do { \
+        if ((_from) != (_type)(_from)) { \
+            virReportError(VIR_ERR_OVERFLOW, \
                            _("conversion from hyper to %s overflowed"), \
-                           #_type);                                     \
-            goto cleanup;                                               \
-        }                                                               \
-        (_to) = (_from);                                                \
+                           #_type); \
+            goto cleanup; \
+        } \
+        (_to) = (_from); \
     } while (0)
 
 # define HYPER_TO_LONG(_to, _from) HYPER_TO_TYPE(long, _to, _from)
@@ -1670,22 +1670,22 @@ void remoteRelayConnectionClosedEvent(virConnectPtr conn ATTRIBUTE_UNUSED, int r
                                   &msg);
 }
 
-#define DEREG_CB(conn, eventCallbacks, neventCallbacks, deregFcn, name)     \
-    do {                                                                    \
-        size_t i;                                                           \
-        for (i = 0; i < neventCallbacks; i++) {                             \
-            int callbackID = eventCallbacks[i]->callbackID;                 \
-            if (callbackID < 0) {                                           \
+#define DEREG_CB(conn, eventCallbacks, neventCallbacks, deregFcn, name) \
+    do { \
+        size_t i; \
+        for (i = 0; i < neventCallbacks; i++) { \
+            int callbackID = eventCallbacks[i]->callbackID; \
+            if (callbackID < 0) { \
                 VIR_WARN("unexpected incomplete %s callback %zu", name, i); \
-                continue;                                                   \
-            }                                                               \
-            VIR_DEBUG("Deregistering remote %s event relay %d",             \
-                      name, callbackID);                                    \
-            eventCallbacks[i]->callbackID = -1;                             \
-            if (deregFcn(conn, callbackID) < 0)                             \
-                VIR_WARN("unexpected %s event deregister failure", name);   \
-        }                                                                   \
-        VIR_FREE(eventCallbacks);                                           \
+                continue; \
+            } \
+            VIR_DEBUG("Deregistering remote %s event relay %d", \
+                      name, callbackID); \
+            eventCallbacks[i]->callbackID = -1; \
+            if (deregFcn(conn, callbackID) < 0) \
+                VIR_WARN("unexpected %s event deregister failure", name); \
+        } \
+        VIR_FREE(eventCallbacks); \
     } while (0);
 
 /*

docs/Makefile.am

@@ -18,38 +18,38 @@
 
 DEVHELP_DIR=$(datadir)/gtk-doc/html/libvirt
 
-apihtml =					\
-  html/index.html				\
+apihtml = \
+  html/index.html \
   $(apihtml_generated)
 
 apihtml_generated = \
-  html/libvirt-libvirt-common.html		\
-  html/libvirt-libvirt-domain.html		\
-  html/libvirt-libvirt-domain-snapshot.html	\
-  html/libvirt-libvirt-event.html		\
-  html/libvirt-libvirt-host.html		\
-  html/libvirt-libvirt-interface.html		\
-  html/libvirt-libvirt-network.html		\
-  html/libvirt-libvirt-nodedev.html		\
-  html/libvirt-libvirt-nwfilter.html		\
-  html/libvirt-libvirt-secret.html		\
-  html/libvirt-libvirt-storage.html		\
-  html/libvirt-libvirt-stream.html		\
+  html/libvirt-libvirt-common.html \
+  html/libvirt-libvirt-domain.html \
+  html/libvirt-libvirt-domain-snapshot.html \
+  html/libvirt-libvirt-event.html \
+  html/libvirt-libvirt-host.html \
+  html/libvirt-libvirt-interface.html \
+  html/libvirt-libvirt-network.html \
+  html/libvirt-libvirt-nodedev.html \
+  html/libvirt-libvirt-nwfilter.html \
+  html/libvirt-libvirt-secret.html \
+  html/libvirt-libvirt-storage.html \
+  html/libvirt-libvirt-stream.html \
   html/libvirt-virterror.html
 
-apipng =	\
-  html/left.png	\
-  html/up.png	\
-  html/home.png	\
+apipng = \
+  html/left.png \
+  html/up.png \
+  html/home.png \
   html/right.png
 
-devhelphtml =			\
-  devhelp/libvirt.devhelp	\
-  devhelp/index.html		\
-  devhelp/general.html		\
+devhelphtml = \
+  devhelp/libvirt.devhelp \
+  devhelp/index.html \
+  devhelp/general.html \
   devhelp/libvirt-virterror.html
 
-css =         \
+css = \
   generic.css \
   libvirt.css \
   mobile.css \
@@ -69,10 +69,10 @@ fonts = \
   fonts/overpass-mono-semibold.woff \
   fonts/overpass-regular.woff
 
-devhelppng =		\
-  devhelp/home.png	\
-  devhelp/left.png	\
-  devhelp/right.png	\
+devhelppng = \
+  devhelp/home.png \
+  devhelp/left.png \
+  devhelp/right.png \
   devhelp/up.png
 
 devhelpcss = devhelp/style.css
@@ -170,7 +170,7 @@ fig = \
 schemadir = $(pkgdatadir)/schemas
 schema_DATA = $(wildcard $(srcdir)/schemas/*.rng)
 
-EXTRA_DIST=					\
+EXTRA_DIST= \
   apibuild.py genaclperms.pl \
   site.xsl subsite.xsl newapi.xsl page.xsl \
   wrapstring.xsl \

examples/Makefile.am

@@ -52,7 +52,7 @@ domtop_domtop_SOURCES = domtop/domtop.c
 hellolibvirt_hellolibvirt_SOURCES = hellolibvirt/hellolibvirt.c
 
 object_events_event_test_CFLAGS = \
-		$(WARN_CFLAGS)						\
+		$(WARN_CFLAGS) \
 		$(NULL)
 object_events_event_test_SOURCES = object-events/event-test.c
 

examples/domsuspend/suspend.c

@@ -39,7 +39,7 @@ static int debug;
  *
  *  CC       domtop.o
  *domtop.c:40:0: warning: "ERROR" redefined [enabled by default]
- * #define ERROR(...)                                              \
+ * #define ERROR(...) \
  * ^
  *In file included from /usr/i686-w64-mingw32/sys-root/mingw/include/windows.h:71:0,
  *                 from /usr/i686-w64-mingw32/sys-root/mingw/include/winsock2.h:23,
@@ -49,20 +49,20 @@ static int debug;
  * #define ERROR 0
  */
 #undef ERROR
-#define ERROR(...)                                              \
-do {                                                            \
-    fprintf(stderr, "ERROR %s:%d : ", __FUNCTION__, __LINE__);  \
-    fprintf(stderr, __VA_ARGS__);                               \
-    fprintf(stderr, "\n");                                      \
+#define ERROR(...) \
+do { \
+    fprintf(stderr, "ERROR %s:%d : ", __FUNCTION__, __LINE__); \
+    fprintf(stderr, __VA_ARGS__); \
+    fprintf(stderr, "\n"); \
 } while (0)
 
-#define DEBUG(...)                                              \
-do {                                                            \
-    if (!debug)                                                 \
-        break;                                                  \
-    fprintf(stderr, "DEBUG %s:%d : ", __FUNCTION__, __LINE__);  \
-    fprintf(stderr, __VA_ARGS__);                               \
-    fprintf(stderr, "\n");                                      \
+#define DEBUG(...) \
+do { \
+    if (!debug) \
+        break; \
+    fprintf(stderr, "DEBUG %s:%d : ", __FUNCTION__, __LINE__); \
+    fprintf(stderr, __VA_ARGS__); \
+    fprintf(stderr, "\n"); \
 } while (0)
 
 static void

examples/domtop/domtop.c

@@ -42,7 +42,7 @@ static bool run_top;
  *
  *  CC       domtop.o
  *domtop.c:40:0: warning: "ERROR" redefined [enabled by default]
- * #define ERROR(...)                                              \
+ * #define ERROR(...) \
  * ^
  *In file included from /usr/i686-w64-mingw32/sys-root/mingw/include/windows.h:71:0,
  *                 from /usr/i686-w64-mingw32/sys-root/mingw/include/winsock2.h:23,
@@ -52,20 +52,20 @@ static bool run_top;
  * #define ERROR 0
  */
 #undef ERROR
-#define ERROR(...)                                              \
-do {                                                            \
-    fprintf(stderr, "ERROR %s:%d : ", __FUNCTION__, __LINE__);  \
-    fprintf(stderr, __VA_ARGS__);                               \
-    fprintf(stderr, "\n");                                      \
+#define ERROR(...) \
+do { \
+    fprintf(stderr, "ERROR %s:%d : ", __FUNCTION__, __LINE__); \
+    fprintf(stderr, __VA_ARGS__); \
+    fprintf(stderr, "\n"); \
 } while (0)
 
-#define DEBUG(...)                                              \
-do {                                                            \
-    if (!debug)                                                 \
-        break;                                                  \
-    fprintf(stderr, "DEBUG %s:%d : ", __FUNCTION__, __LINE__);  \
-    fprintf(stderr, __VA_ARGS__);                               \
-    fprintf(stderr, "\n");                                      \
+#define DEBUG(...) \
+do { \
+    if (!debug) \
+        break; \
+    fprintf(stderr, "DEBUG %s:%d : ", __FUNCTION__, __LINE__); \
+    fprintf(stderr, __VA_ARGS__); \
+    fprintf(stderr, "\n"); \
 } while (0)
 
 #define STREQ(a, b) (strcmp(a, b) == 0)

examples/object-events/event-test.c

@@ -1053,7 +1053,7 @@ struct domainEventData {
 };
 
 
-#define DOMAIN_EVENT(event, callback)                                          \
+#define DOMAIN_EVENT(event, callback) \
     {event, -1, VIR_DOMAIN_EVENT_CALLBACK(callback), #event}
 
 struct domainEventData domainEvents[] = {
@@ -1091,7 +1091,7 @@ struct storagePoolEventData {
     const char *name;
 };
 
-#define STORAGE_POOL_EVENT(event, callback)                                          \
+#define STORAGE_POOL_EVENT(event, callback) \
     {event, -1, VIR_STORAGE_POOL_EVENT_CALLBACK(callback), #event}
 
 struct storagePoolEventData storagePoolEvents[] = {
@@ -1106,7 +1106,7 @@ struct nodeDeviceEventData {
     const char *name;
 };
 
-#define NODE_DEVICE_EVENT(event, callback)                                          \
+#define NODE_DEVICE_EVENT(event, callback) \
     {event, -1, VIR_NODE_DEVICE_EVENT_CALLBACK(callback), #event}
 
 struct nodeDeviceEventData nodeDeviceEvents[] = {
@@ -1121,7 +1121,7 @@ struct secretEventData {
     const char *name;
 };
 
-#define SECRET_EVENT(event, callback)                                          \
+#define SECRET_EVENT(event, callback) \
     {event, -1, VIR_SECRET_EVENT_CALLBACK(callback), #event}
 
 struct secretEventData secretEvents[] = {

src/access/viraccessdriverpolkit.c

@@ -33,8 +33,8 @@
 
 VIR_LOG_INIT("access.accessdriverpolkit");
 
-#define virAccessError(code, ...)                                       \
-    virReportErrorHelper(VIR_FROM_THIS, code, __FILE__,                 \
+#define virAccessError(code, ...) \
+    virReportErrorHelper(VIR_FROM_THIS, code, __FILE__, \
                          __FUNCTION__, __LINE__, __VA_ARGS__)
 
 #define VIR_ACCESS_DRIVER_POLKIT_ACTION_PREFIX "org.libvirt.api"

src/access/viraccessmanager.c

@@ -36,8 +36,8 @@
 
 VIR_LOG_INIT("access.accessmanager");
 
-#define virAccessError(code, ...)                                       \
-    virReportErrorHelper(VIR_FROM_THIS, code, __FILE__,                 \
+#define virAccessError(code, ...) \
+    virReportErrorHelper(VIR_FROM_THIS, code, __FILE__, \
                          __FUNCTION__, __LINE__, __VA_ARGS__)
 
 struct _virAccessManager {

src/conf/cpu_conf.c

@@ -847,8 +847,8 @@ virCPUDefIsEqual(virCPUDefPtr src,
     if (!src && !dst)
         return true;
 
-#define MISMATCH(fmt, ...)                                              \
-    if (reportError)                                                    \
+#define MISMATCH(fmt, ...) \
+    if (reportError) \
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, fmt, __VA_ARGS__)
 
     if ((src && !dst) || (!src && dst)) {

src/conf/domain_capabilities.c

@@ -363,26 +363,26 @@ virDomainCapsStringValuesFormat(virBufferPtr buf,
 }
 
 
-#define FORMAT_PROLOGUE(item)                                       \
-    do {                                                            \
-        virBufferAsprintf(buf, "<" #item " supported='%s'%s\n",     \
-                          item->supported ? "yes" : "no",           \
-                          item->supported ? ">" : "/>");            \
-        if (!item->supported)                                       \
-            return;                                                 \
-        virBufferAdjustIndent(buf, 2);                              \
+#define FORMAT_PROLOGUE(item) \
+    do { \
+        virBufferAsprintf(buf, "<" #item " supported='%s'%s\n", \
+                          item->supported ? "yes" : "no", \
+                          item->supported ? ">" : "/>"); \
+        if (!item->supported) \
+            return; \
+        virBufferAdjustIndent(buf, 2); \
     } while (0)
 
-#define FORMAT_EPILOGUE(item)                                       \
-    do {                                                            \
-        virBufferAdjustIndent(buf, -2);                             \
-        virBufferAddLit(buf, "</" #item ">\n");                     \
+#define FORMAT_EPILOGUE(item) \
+    do { \
+        virBufferAdjustIndent(buf, -2); \
+        virBufferAddLit(buf, "</" #item ">\n"); \
     } while (0)
 
-#define ENUM_PROCESS(master, capsEnum, valToStr)                    \
-    do {                                                            \
-        virDomainCapsEnumFormat(buf, &master->capsEnum,             \
-                                #capsEnum, valToStr);               \
+#define ENUM_PROCESS(master, capsEnum, valToStr) \
+    do { \
+        virDomainCapsEnumFormat(buf, &master->capsEnum, \
+                                #capsEnum, valToStr); \
     } while (0)
 
 

src/conf/domain_capabilities.h

@@ -184,12 +184,12 @@ virDomainCapsCPUModelsGet(virDomainCapsCPUModelsPtr cpuModels,
                           const char *name);
 
 
-# define VIR_DOMAIN_CAPS_ENUM_SET(capsEnum, ...)            \
-    do {                                                    \
-        unsigned int __values[] = {__VA_ARGS__};            \
-        size_t __nvalues = ARRAY_CARDINALITY(__values);     \
-        virDomainCapsEnumSet(&(capsEnum), #capsEnum,        \
-                             __nvalues, __values);          \
+# define VIR_DOMAIN_CAPS_ENUM_SET(capsEnum, ...) \
+    do { \
+        unsigned int __values[] = {__VA_ARGS__}; \
+        size_t __nvalues = ARRAY_CARDINALITY(__values); \
+        virDomainCapsEnumSet(&(capsEnum), #capsEnum, \
+                             __nvalues, __values); \
     } while (0)
 
 int virDomainCapsEnumSet(virDomainCapsEnumPtr capsEnum,

src/conf/domain_conf.c

@@ -85,9 +85,9 @@ struct _virDomainXMLOption {
     virSaveCookieCallbacks saveCookie;
 };
 
-#define VIR_DOMAIN_DEF_FORMAT_COMMON_FLAGS             \
-    (VIR_DOMAIN_DEF_FORMAT_SECURE |                    \
-     VIR_DOMAIN_DEF_FORMAT_INACTIVE |                  \
+#define VIR_DOMAIN_DEF_FORMAT_COMMON_FLAGS \
+    (VIR_DOMAIN_DEF_FORMAT_SECURE | \
+     VIR_DOMAIN_DEF_FORMAT_INACTIVE | \
      VIR_DOMAIN_DEF_FORMAT_MIGRATABLE)
 
 VIR_ENUM_IMPL(virDomainTaint, VIR_DOMAIN_TAINT_LAST,
@@ -8604,12 +8604,12 @@ virDomainDiskBackingStoreParse(xmlXPathContextPtr ctxt,
     return ret;
 }
 
-#define PARSE_IOTUNE(val)                                                      \
-    if (virXPathULongLong("string(./iotune/" #val ")",                         \
-                          ctxt, &def->blkdeviotune.val) == -2) {               \
-        virReportError(VIR_ERR_XML_ERROR,                                      \
-                       _("disk iotune field '%s' must be an integer"), #val);  \
-        return -1;                                                             \
+#define PARSE_IOTUNE(val) \
+    if (virXPathULongLong("string(./iotune/" #val ")", \
+                          ctxt, &def->blkdeviotune.val) == -2) { \
+        virReportError(VIR_ERR_XML_ERROR, \
+                       _("disk iotune field '%s' must be an integer"), #val); \
+        return -1; \
     }
 
 static int
@@ -22348,10 +22348,10 @@ virDomainDiskBackingStoreFormat(virBufferPtr buf,
 }
 
 
-#define FORMAT_IOTUNE(val)                                                     \
-        if (def->blkdeviotune.val) {                                           \
-            virBufferAsprintf(buf, "<" #val ">%llu</" #val ">\n",              \
-                              def->blkdeviotune.val);                          \
+#define FORMAT_IOTUNE(val) \
+        if (def->blkdeviotune.val) { \
+            virBufferAsprintf(buf, "<" #val ">%llu</" #val ">\n", \
+                              def->blkdeviotune.val); \
         }
 
 static int
@@ -27946,23 +27946,23 @@ virDomainGetBlkioParametersAssignFromDef(virDomainDefPtr def,
     char *data = NULL;
     size_t i;
 
-#define VIR_BLKIO_ASSIGN(param, format, name)                                  \
-    if (*nparams < maxparams) {                                                \
-        for (i = 0; i < def->blkio.ndevices; i++) {                            \
-            if (!def->blkio.devices[i].param)                                  \
-                continue;                                                      \
-            virBufferAsprintf(&buf, "%s," format ",",                          \
-                              def->blkio.devices[i].path,                      \
-                              def->blkio.devices[i].param);                    \
-        }                                                                      \
-        virBufferTrim(&buf, ",", -1);                                          \
-        if (virBufferCheckError(&buf) < 0)                                     \
-            goto error;                                                        \
-        data = virBufferContentAndReset(&buf);                                 \
-        if (virTypedParameterAssign(&(params[(*nparams)++]), name,             \
-                                    VIR_TYPED_PARAM_STRING, data) < 0)         \
-            goto error;                                                        \
-        data = NULL;                                                           \
+#define VIR_BLKIO_ASSIGN(param, format, name) \
+    if (*nparams < maxparams) { \
+        for (i = 0; i < def->blkio.ndevices; i++) { \
+            if (!def->blkio.devices[i].param) \
+                continue; \
+            virBufferAsprintf(&buf, "%s," format ",", \
+                              def->blkio.devices[i].path, \
+                              def->blkio.devices[i].param); \
+        } \
+        virBufferTrim(&buf, ",", -1); \
+        if (virBufferCheckError(&buf) < 0) \
+            goto error; \
+        data = virBufferContentAndReset(&buf); \
+        if (virTypedParameterAssign(&(params[(*nparams)++]), name, \
+                                    VIR_TYPED_PARAM_STRING, data) < 0) \
+            goto error; \
+        data = NULL; \
     }
 
     /* blkiotune.device_weight */
@@ -28023,7 +28023,7 @@ virDomainDiskSetBlockIOTune(virDomainDiskDefPtr disk,
     return 0;
 }
 
-#define HOSTNAME_CHARS                                                  \
+#define HOSTNAME_CHARS \
     "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-"
 
 static void

src/conf/interface_conf.h

@@ -177,7 +177,7 @@ virInterfaceDefParseNode(xmlDocPtr xml,
 char *
 virInterfaceDefFormat(const virInterfaceDef *def);
 
-# define VIR_CONNECT_LIST_INTERFACES_FILTERS_ACTIVE   \
+# define VIR_CONNECT_LIST_INTERFACES_FILTERS_ACTIVE \
                 (VIR_CONNECT_LIST_INTERFACES_ACTIVE | \
                  VIR_CONNECT_LIST_INTERFACES_INACTIVE)
 

src/conf/network_conf.h

@@ -358,19 +358,19 @@ virNetworkSetBridgeMacAddr(virNetworkDefPtr def);
 
 VIR_ENUM_DECL(virNetworkForward)
 
-# define VIR_CONNECT_LIST_NETWORKS_FILTERS_ACTIVE   \
+# define VIR_CONNECT_LIST_NETWORKS_FILTERS_ACTIVE \
                 (VIR_CONNECT_LIST_NETWORKS_ACTIVE | \
                  VIR_CONNECT_LIST_NETWORKS_INACTIVE)
 
-# define VIR_CONNECT_LIST_NETWORKS_FILTERS_PERSISTENT   \
+# define VIR_CONNECT_LIST_NETWORKS_FILTERS_PERSISTENT \
                 (VIR_CONNECT_LIST_NETWORKS_PERSISTENT | \
                  VIR_CONNECT_LIST_NETWORKS_TRANSIENT)
 
-# define VIR_CONNECT_LIST_NETWORKS_FILTERS_AUTOSTART    \
-                (VIR_CONNECT_LIST_NETWORKS_AUTOSTART |  \
+# define VIR_CONNECT_LIST_NETWORKS_FILTERS_AUTOSTART \
+                (VIR_CONNECT_LIST_NETWORKS_AUTOSTART | \
                  VIR_CONNECT_LIST_NETWORKS_NO_AUTOSTART)
 
-# define VIR_CONNECT_LIST_NETWORKS_FILTERS_ALL                  \
+# define VIR_CONNECT_LIST_NETWORKS_FILTERS_ALL \
                 (VIR_CONNECT_LIST_NETWORKS_FILTERS_ACTIVE     | \
                  VIR_CONNECT_LIST_NETWORKS_FILTERS_PERSISTENT | \
                  VIR_CONNECT_LIST_NETWORKS_FILTERS_AUTOSTART)

src/conf/secret_conf.h

@@ -42,15 +42,15 @@ virSecretDefPtr virSecretDefParseString(const char *xml);
 virSecretDefPtr virSecretDefParseFile(const char *filename);
 char *virSecretDefFormat(const virSecretDef *def);
 
-# define VIR_CONNECT_LIST_SECRETS_FILTERS_EPHEMERAL       \
+# define VIR_CONNECT_LIST_SECRETS_FILTERS_EPHEMERAL \
                 (VIR_CONNECT_LIST_SECRETS_EPHEMERAL     | \
                  VIR_CONNECT_LIST_SECRETS_NO_EPHEMERAL)
 
-# define VIR_CONNECT_LIST_SECRETS_FILTERS_PRIVATE       \
+# define VIR_CONNECT_LIST_SECRETS_FILTERS_PRIVATE \
                 (VIR_CONNECT_LIST_SECRETS_PRIVATE     | \
                  VIR_CONNECT_LIST_SECRETS_NO_PRIVATE)
 
-# define VIR_CONNECT_LIST_SECRETS_FILTERS_ALL                  \
+# define VIR_CONNECT_LIST_SECRETS_FILTERS_ALL \
                 (VIR_CONNECT_LIST_SECRETS_FILTERS_EPHEMERAL  | \
                  VIR_CONNECT_LIST_SECRETS_FILTERS_PRIVATE)
 

src/conf/snapshot_conf.h

@@ -148,24 +148,24 @@ int virDomainSnapshotForEachDescendant(virDomainSnapshotObjPtr snapshot,
 int virDomainSnapshotUpdateRelations(virDomainSnapshotObjListPtr snapshots);
 void virDomainSnapshotDropParent(virDomainSnapshotObjPtr snapshot);
 
-# define VIR_DOMAIN_SNAPSHOT_FILTERS_METADATA           \
+# define VIR_DOMAIN_SNAPSHOT_FILTERS_METADATA \
                (VIR_DOMAIN_SNAPSHOT_LIST_METADATA     | \
                 VIR_DOMAIN_SNAPSHOT_LIST_NO_METADATA)
 
-# define VIR_DOMAIN_SNAPSHOT_FILTERS_LEAVES             \
+# define VIR_DOMAIN_SNAPSHOT_FILTERS_LEAVES \
                (VIR_DOMAIN_SNAPSHOT_LIST_LEAVES       | \
                 VIR_DOMAIN_SNAPSHOT_LIST_NO_LEAVES)
 
-# define VIR_DOMAIN_SNAPSHOT_FILTERS_STATUS             \
+# define VIR_DOMAIN_SNAPSHOT_FILTERS_STATUS \
                (VIR_DOMAIN_SNAPSHOT_LIST_INACTIVE     | \
                 VIR_DOMAIN_SNAPSHOT_LIST_ACTIVE       | \
                 VIR_DOMAIN_SNAPSHOT_LIST_DISK_ONLY)
 
-# define VIR_DOMAIN_SNAPSHOT_FILTERS_LOCATION           \
+# define VIR_DOMAIN_SNAPSHOT_FILTERS_LOCATION \
                (VIR_DOMAIN_SNAPSHOT_LIST_INTERNAL     | \
                 VIR_DOMAIN_SNAPSHOT_LIST_EXTERNAL)
 
-# define VIR_DOMAIN_SNAPSHOT_FILTERS_ALL                \
+# define VIR_DOMAIN_SNAPSHOT_FILTERS_ALL \
                (VIR_DOMAIN_SNAPSHOT_FILTERS_METADATA  | \
                 VIR_DOMAIN_SNAPSHOT_FILTERS_LEAVES    | \
                 VIR_DOMAIN_SNAPSHOT_FILTERS_STATUS    | \

src/conf/storage_conf.h

@@ -410,19 +410,19 @@ typedef enum {
 } virStoragePartedFsType;
 VIR_ENUM_DECL(virStoragePartedFs)
 
-# define VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_ACTIVE   \
+# define VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_ACTIVE \
                 (VIR_CONNECT_LIST_STORAGE_POOLS_ACTIVE | \
                  VIR_CONNECT_LIST_STORAGE_POOLS_INACTIVE)
 
-# define VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_PERSISTENT   \
+# define VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_PERSISTENT \
                 (VIR_CONNECT_LIST_STORAGE_POOLS_PERSISTENT | \
                  VIR_CONNECT_LIST_STORAGE_POOLS_TRANSIENT)
 
-# define VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_AUTOSTART    \
-                (VIR_CONNECT_LIST_STORAGE_POOLS_AUTOSTART |  \
+# define VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_AUTOSTART \
+                (VIR_CONNECT_LIST_STORAGE_POOLS_AUTOSTART | \
                  VIR_CONNECT_LIST_STORAGE_POOLS_NO_AUTOSTART)
 
-# define VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_POOL_TYPE  \
+# define VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_POOL_TYPE \
                 (VIR_CONNECT_LIST_STORAGE_POOLS_DIR      | \
                  VIR_CONNECT_LIST_STORAGE_POOLS_FS       | \
                  VIR_CONNECT_LIST_STORAGE_POOLS_NETFS    | \
@@ -437,7 +437,7 @@ VIR_ENUM_DECL(virStoragePartedFs)
                  VIR_CONNECT_LIST_STORAGE_POOLS_ZFS      | \
                  VIR_CONNECT_LIST_STORAGE_POOLS_VSTORAGE)
 
-# define VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_ALL                  \
+# define VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_ALL \
                 (VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_ACTIVE     | \
                  VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_PERSISTENT | \
                  VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_AUTOSTART  | \

src/conf/virdomainobjlist.h

@@ -101,33 +101,33 @@ int virDomainObjListForEach(virDomainObjListPtr doms,
                             virDomainObjListIterator callback,
                             void *opaque);
 
-# define VIR_CONNECT_LIST_DOMAINS_FILTERS_ACTIVE   \
+# define VIR_CONNECT_LIST_DOMAINS_FILTERS_ACTIVE \
                 (VIR_CONNECT_LIST_DOMAINS_ACTIVE | \
                  VIR_CONNECT_LIST_DOMAINS_INACTIVE)
 
-# define VIR_CONNECT_LIST_DOMAINS_FILTERS_PERSISTENT   \
+# define VIR_CONNECT_LIST_DOMAINS_FILTERS_PERSISTENT \
                 (VIR_CONNECT_LIST_DOMAINS_PERSISTENT | \
                  VIR_CONNECT_LIST_DOMAINS_TRANSIENT)
 
-# define VIR_CONNECT_LIST_DOMAINS_FILTERS_STATE     \
+# define VIR_CONNECT_LIST_DOMAINS_FILTERS_STATE \
                 (VIR_CONNECT_LIST_DOMAINS_RUNNING | \
                  VIR_CONNECT_LIST_DOMAINS_PAUSED  | \
                  VIR_CONNECT_LIST_DOMAINS_SHUTOFF | \
                  VIR_CONNECT_LIST_DOMAINS_OTHER)
 
-# define VIR_CONNECT_LIST_DOMAINS_FILTERS_MANAGEDSAVE   \
+# define VIR_CONNECT_LIST_DOMAINS_FILTERS_MANAGEDSAVE \
                 (VIR_CONNECT_LIST_DOMAINS_MANAGEDSAVE | \
                  VIR_CONNECT_LIST_DOMAINS_NO_MANAGEDSAVE)
 
-# define VIR_CONNECT_LIST_DOMAINS_FILTERS_AUTOSTART   \
+# define VIR_CONNECT_LIST_DOMAINS_FILTERS_AUTOSTART \
                 (VIR_CONNECT_LIST_DOMAINS_AUTOSTART | \
                  VIR_CONNECT_LIST_DOMAINS_NO_AUTOSTART)
 
-# define VIR_CONNECT_LIST_DOMAINS_FILTERS_SNAPSHOT       \
+# define VIR_CONNECT_LIST_DOMAINS_FILTERS_SNAPSHOT \
                 (VIR_CONNECT_LIST_DOMAINS_HAS_SNAPSHOT | \
                  VIR_CONNECT_LIST_DOMAINS_NO_SNAPSHOT)
 
-# define VIR_CONNECT_LIST_DOMAINS_FILTERS_ALL                   \
+# define VIR_CONNECT_LIST_DOMAINS_FILTERS_ALL \
                 (VIR_CONNECT_LIST_DOMAINS_FILTERS_ACTIVE      | \
                  VIR_CONNECT_LIST_DOMAINS_FILTERS_PERSISTENT  | \
                  VIR_CONNECT_LIST_DOMAINS_FILTERS_STATE       | \

src/cpu/cpu_x86.c

@@ -60,18 +60,18 @@ struct _virCPUx86Feature {
 };
 
 
-#define KVM_FEATURE_DEF(Name, Eax_in, Eax)                          \
-    static virCPUx86CPUID Name ## _cpuid[] = {                      \
-        { .eax_in = Eax_in, .eax = Eax },                           \
+#define KVM_FEATURE_DEF(Name, Eax_in, Eax) \
+    static virCPUx86CPUID Name ## _cpuid[] = { \
+        { .eax_in = Eax_in, .eax = Eax }, \
     }
 
-#define KVM_FEATURE(Name)                                           \
-    {                                                               \
-        .name = (char *) Name,                                      \
-        .data = {                                                   \
-            .len = ARRAY_CARDINALITY(Name ## _cpuid),               \
-            .data = Name ## _cpuid                                  \
-        }                                                           \
+#define KVM_FEATURE(Name) \
+    { \
+        .name = (char *) Name, \
+        .data = { \
+            .len = ARRAY_CARDINALITY(Name ## _cpuid), \
+            .data = Name ## _cpuid \
+        } \
     }
 
 KVM_FEATURE_DEF(VIR_CPU_x86_KVM_CLOCKSOURCE,
@@ -1497,21 +1497,21 @@ virCPUx86DataParse(xmlXPathContextPtr ctxt)
  *
  * This macro generates the error string outputs it into logs.
  */
-#define virX86CpuIncompatible(MSG, CPU_DEF)                             \
-        do {                                                            \
-            char *flagsStr = NULL;                                      \
-            if (!(flagsStr = x86FeatureNames(map, ", ", (CPU_DEF)))) {  \
-                virReportOOMError();                                    \
-                goto error;                                             \
-            }                                                           \
-            if (message &&                                              \
+#define virX86CpuIncompatible(MSG, CPU_DEF) \
+        do { \
+            char *flagsStr = NULL; \
+            if (!(flagsStr = x86FeatureNames(map, ", ", (CPU_DEF)))) { \
+                virReportOOMError(); \
+                goto error; \
+            } \
+            if (message && \
                 virAsprintf(message, "%s: %s", _(MSG), flagsStr) < 0) { \
-                VIR_FREE(flagsStr);                                     \
-                goto error;                                             \
-            }                                                           \
-            VIR_DEBUG("%s: %s", MSG, flagsStr);                         \
-            VIR_FREE(flagsStr);                                         \
-            ret = VIR_CPU_COMPARE_INCOMPATIBLE;                         \
+                VIR_FREE(flagsStr); \
+                goto error; \
+            } \
+            VIR_DEBUG("%s: %s", MSG, flagsStr); \
+            VIR_FREE(flagsStr); \
+            ret = VIR_CPU_COMPARE_INCOMPATIBLE; \
         } while (0)
 
 

src/datatypes.c

@@ -73,15 +73,15 @@ static void virAdmClientDispose(void *obj);
 static int
 virDataTypesOnceInit(void)
 {
-#define DECLARE_CLASS_COMMON(basename, parent)                   \
-    if (!(basename ## Class = virClassNew(parent,                \
-                                          #basename,             \
-                                          sizeof(basename),      \
+#define DECLARE_CLASS_COMMON(basename, parent) \
+    if (!(basename ## Class = virClassNew(parent, \
+                                          #basename, \
+                                          sizeof(basename), \
                                           basename ## Dispose))) \
         return -1;
-#define DECLARE_CLASS(basename)                                  \
+#define DECLARE_CLASS(basename) \
     DECLARE_CLASS_COMMON(basename, virClassForObject())
-#define DECLARE_CLASS_LOCKABLE(basename)                         \
+#define DECLARE_CLASS_LOCKABLE(basename) \
     DECLARE_CLASS_COMMON(basename, virClassForObjectLockable())
 
     DECLARE_CLASS_LOCKABLE(virConnect);

src/driver.h

@@ -56,8 +56,8 @@ typedef enum {
  *   != 0  Feature is supported.
  *   0     Feature is not supported.
  */
-# define VIR_DRV_SUPPORTS_FEATURE(drv, conn, feature)                   \
-    ((drv)->connectSupportsFeature ?                                    \
+# define VIR_DRV_SUPPORTS_FEATURE(drv, conn, feature) \
+    ((drv)->connectSupportsFeature ? \
         (drv)->connectSupportsFeature((conn), (feature)) > 0 : 0)
 
 

src/esx/esx_driver.c

@@ -3779,10 +3779,10 @@ esxDomainSetSchedulerParameters(virDomainPtr domain,
 }
 
 /* The subset of migration flags we are able to support.  */
-#define ESX_MIGRATION_FLAGS                     \
-    (VIR_MIGRATE_PERSIST_DEST |                 \
-     VIR_MIGRATE_UNDEFINE_SOURCE |              \
-     VIR_MIGRATE_LIVE |                         \
+#define ESX_MIGRATION_FLAGS \
+    (VIR_MIGRATE_PERSIST_DEST | \
+     VIR_MIGRATE_UNDEFINE_SOURCE | \
+     VIR_MIGRATE_LIVE | \
      VIR_MIGRATE_PAUSED)
 
 static int

src/esx/esx_vi.h

@@ -38,39 +38,39 @@
 
 
 
-# define ESX_VI__SOAP__REQUEST_HEADER                                         \
-    "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"                            \
-    "<soapenv:Envelope\n"                                                     \
-    " xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\"\n"          \
-    " xmlns:soapenc=\"http://schemas.xmlsoap.org/soap/encoding/\"\n"          \
-    " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"              \
-    " xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">\n"                      \
+# define ESX_VI__SOAP__REQUEST_HEADER \
+    "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" \
+    "<soapenv:Envelope\n" \
+    " xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\"\n" \
+    " xmlns:soapenc=\"http://schemas.xmlsoap.org/soap/encoding/\"\n" \
+    " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" \
+    " xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">\n" \
     "<soapenv:Body>\n"
 
 
 
-# define ESX_VI__SOAP__REQUEST_FOOTER                                         \
-    "</soapenv:Body>\n"                                                       \
+# define ESX_VI__SOAP__REQUEST_FOOTER \
+    "</soapenv:Body>\n" \
     "</soapenv:Envelope>"
 
 
 
-# define ESV_VI__XML_TAG__OPEN(_buffer, _element, _type)                      \
-    do {                                                                      \
-        virBufferAddLit(_buffer, "<");                                        \
-        virBufferAdd(_buffer, _element, -1);                                  \
-        virBufferAddLit(_buffer, " xmlns=\"urn:vim25\" xsi:type=\"");         \
-        virBufferAdd(_buffer, _type, -1);                                     \
-        virBufferAddLit(_buffer, "\">");                                      \
+# define ESV_VI__XML_TAG__OPEN(_buffer, _element, _type) \
+    do { \
+        virBufferAddLit(_buffer, "<"); \
+        virBufferAdd(_buffer, _element, -1); \
+        virBufferAddLit(_buffer, " xmlns=\"urn:vim25\" xsi:type=\""); \
+        virBufferAdd(_buffer, _type, -1); \
+        virBufferAddLit(_buffer, "\">"); \
     } while (0)
 
 
 
-# define ESV_VI__XML_TAG__CLOSE(_buffer, _element)                            \
-    do {                                                                      \
-        virBufferAddLit(_buffer, "</");                                       \
-        virBufferAdd(_buffer, _element, -1);                                  \
-        virBufferAddLit(_buffer, ">");                                        \
+# define ESV_VI__XML_TAG__CLOSE(_buffer, _element) \
+    do { \
+        virBufferAddLit(_buffer, "</"); \
+        virBufferAdd(_buffer, _element, -1); \
+        virBufferAddLit(_buffer, ">"); \
     } while (0)
 
 

src/libxl/libxl_domain.h

@@ -31,8 +31,8 @@
 # include "virchrdev.h"
 
 # define JOB_MASK(job)                  (job == 0 ? 0 : 1 << (job - 1))
-# define DEFAULT_JOB_MASK               \
-    (JOB_MASK(LIBXL_JOB_DESTROY) |      \
+# define DEFAULT_JOB_MASK \
+    (JOB_MASK(LIBXL_JOB_DESTROY) | \
      JOB_MASK(LIBXL_JOB_ABORT))
 
 /* Only 1 job is allowed at any time

src/libxl/libxl_driver.c

@@ -83,13 +83,13 @@ VIR_LOG_INIT("libxl.libxl_driver");
 /* Number of Xen scheduler parameters */
 #define XEN_SCHED_CREDIT_NPARAM   2
 
-#define LIBXL_CHECK_DOM0_GOTO(name, label)                               \
-    do {                                                                  \
-        if (STREQ_NULLABLE(name, "Domain-0")) {                           \
-            virReportError(VIR_ERR_OPERATION_INVALID, "%s",               \
+#define LIBXL_CHECK_DOM0_GOTO(name, label) \
+    do { \
+        if (STREQ_NULLABLE(name, "Domain-0")) { \
+            virReportError(VIR_ERR_OPERATION_INVALID, "%s", \
                            _("Domain-0 does not support requested operation")); \
-            goto label;                                                   \
-        }                                                                 \
+            goto label; \
+        } \
     } while (0)
 
 
@@ -5392,16 +5392,16 @@ libxlDomainBlockStatsVBD(virDomainObjPtr vm,
         goto cleanup;
     }
 
-# define LIBXL_SET_VBDSTAT(FIELD, VAR, MUL)           \
+# define LIBXL_SET_VBDSTAT(FIELD, VAR, MUL) \
     if ((virAsprintf(&name, "%s/"FIELD, path) < 0) || \
-        (virFileReadAll(name, 256, &val) < 0) ||      \
-        (sscanf(val, "%llu", &status) != 1)) {        \
-        virReportError(VIR_ERR_OPERATION_FAILED,      \
-                       _("cannot read %s"), name);    \
-        goto cleanup;                                 \
-    }                                                 \
-    VAR += (status * MUL);                            \
-    VIR_FREE(name);                                   \
+        (virFileReadAll(name, 256, &val) < 0) || \
+        (sscanf(val, "%llu", &status) != 1)) { \
+        virReportError(VIR_ERR_OPERATION_FAILED, \
+                       _("cannot read %s"), name); \
+        goto cleanup; \
+    } \
+    VAR += (status * MUL); \
+    VIR_FREE(name); \
     VIR_FREE(val);
 
     LIBXL_SET_VBDSTAT("f_req",  stats->f_req,  1)
@@ -5584,12 +5584,12 @@ libxlDomainBlockStatsFlags(virDomainPtr dom,
 
     nstats = 0;
 
-#define LIBXL_BLKSTAT_ASSIGN_PARAM(VAR, NAME)                              \
-    if (nstats < *nparams && (blkstats.VAR) != -1) {                       \
-        if (virTypedParameterAssign(params + nstats, NAME,                 \
+#define LIBXL_BLKSTAT_ASSIGN_PARAM(VAR, NAME) \
+    if (nstats < *nparams && (blkstats.VAR) != -1) { \
+        if (virTypedParameterAssign(params + nstats, NAME, \
                                     VIR_TYPED_PARAM_LLONG, (blkstats.VAR)) < 0) \
-            goto endjob;                                                   \
-        nstats++;                                                          \
+            goto endjob; \
+        nstats++; \
     }
 
     LIBXL_BLKSTAT_ASSIGN_PARAM(wr_bytes, VIR_DOMAIN_BLOCK_STATS_WRITE_BYTES);

src/libxl/libxl_migration.h

@@ -26,16 +26,16 @@
 
 # include "libxl_conf.h"
 
-# define LIBXL_MIGRATION_FLAGS                  \
-    (VIR_MIGRATE_LIVE |                         \
-     VIR_MIGRATE_PEER2PEER |                    \
-     VIR_MIGRATE_TUNNELLED |                    \
-     VIR_MIGRATE_PERSIST_DEST |                 \
-     VIR_MIGRATE_UNDEFINE_SOURCE |              \
+# define LIBXL_MIGRATION_FLAGS \
+    (VIR_MIGRATE_LIVE | \
+     VIR_MIGRATE_PEER2PEER | \
+     VIR_MIGRATE_TUNNELLED | \
+     VIR_MIGRATE_PERSIST_DEST | \
+     VIR_MIGRATE_UNDEFINE_SOURCE | \
      VIR_MIGRATE_PAUSED)
 
 /* All supported migration parameters and their types. */
-# define LIBXL_MIGRATION_PARAMETERS                             \
+# define LIBXL_MIGRATION_PARAMETERS \
     VIR_MIGRATE_PARAM_URI,              VIR_TYPED_PARAM_STRING, \
     VIR_MIGRATE_PARAM_DEST_NAME,        VIR_TYPED_PARAM_STRING, \
     VIR_MIGRATE_PARAM_DEST_XML,         VIR_TYPED_PARAM_STRING, \

src/locking/lock_driver.h

@@ -106,9 +106,9 @@ struct _virLockManagerParam {
 # define VIR_LOCK_MANAGER_VERSION_MINOR 0
 # define VIR_LOCK_MANAGER_VERSION_MICRO 0
 
-# define VIR_LOCK_MANAGER_VERSION                           \
-    ((VIR_LOCK_MANAGER_VERSION_MAJOR * 1000 * 1000) +       \
-     (VIR_LOCK_MANAGER_VERSION_MINOR * 1000) +              \
+# define VIR_LOCK_MANAGER_VERSION \
+    ((VIR_LOCK_MANAGER_VERSION_MAJOR * 1000 * 1000) + \
+     (VIR_LOCK_MANAGER_VERSION_MINOR * 1000) + \
      (VIR_LOCK_MANAGER_VERSION_MICRO))
 
 

src/node_device/node_device_udev.c

@@ -401,16 +401,16 @@ udevFillMdevType(struct udev_device *device,
     int ret = -1;
     char *attrpath = NULL;
 
-#define MDEV_GET_SYSFS_ATTR(attr_name, cb, ...)                             \
-    do {                                                                    \
-        if (virAsprintf(&attrpath, "%s/%s", dir, #attr_name) < 0)           \
-            goto cleanup;                                                   \
-                                                                            \
-        if (cb(device, attrpath, __VA_ARGS__) < 0)                          \
-            goto cleanup;                                                   \
-                                                                            \
-        VIR_FREE(attrpath);                                                 \
-    } while (0)                                                             \
+#define MDEV_GET_SYSFS_ATTR(attr_name, cb, ...) \
+    do { \
+        if (virAsprintf(&attrpath, "%s/%s", dir, #attr_name) < 0) \
+            goto cleanup; \
+ \
+        if (cb(device, attrpath, __VA_ARGS__) < 0) \
+            goto cleanup; \
+ \
+        VIR_FREE(attrpath); \
+    } while (0) \
 
     if (VIR_STRDUP(type->id, last_component(dir)) < 0)
         goto cleanup;