* daemon/Makefile.am: Avoid spurious space before tabs. * src/Makefile.am: Likewise. * examples/dominfo/Makefile.am: Likewise. * examples/domsuspend/Makefile.am: Likewise. * tools/Makefile.am: Likewise. * src/datatypes.h (VIR_CONNECT_MAGIC): Likewise. * src/internal.h (TODO): Likewise. * src/qemu/qemu_monitor.h (QEMU_MONITOR_MIGRATE): Likewise. * src/xen/xen_hypervisor.c (XEN_V2_OP_GETAVAILHEAP): Likewise. * src/xen/xs_internal.h: Likewise. --- Pushing this under the trivial rule - I've got my editor set up to highlight suspicious spacing, and when I noticed it in one file, I decided to scrub the rest of the source tree. There are also space-tab instances in a binary blob and in docs/api_extension (where there are literal patchsets containing doc changes that end up creating space-tab), but those instances obviously should not be changed. daemon/Makefile.am | 4 ++-- examples/dominfo/Makefile.am | 3 ++- examples/domsuspend/Makefile.am | 3 ++- src/Makefile.am | 4 ++-- src/datatypes.h | 4 ++-- src/internal.h | 2 +- src/qemu/qemu_monitor.h | 2 +- src/xen/xen_hypervisor.c | 2 +- src/xen/xs_internal.h | 14 +++++++------- tools/Makefile.am | 6 +++--- 10 files changed, 23 insertions(+), 21 deletions(-) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 72778e5..3ffb7be 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -90,8 +90,8 @@ libvirtd_CFLAGS = \ -DQEMUD_PID_FILE="\"$(QEMUD_PID_FILE)\"" \ -DREMOTE_PID_FILE="\"$(REMOTE_PID_FILE)\"" -libvirtd_LDFLAGS = \ - $(WARN_CFLAGS) \ +libvirtd_LDFLAGS = \ + $(WARN_CFLAGS) \ $(COVERAGE_LDFLAGS) libvirtd_LDADD = \ diff --git a/examples/dominfo/Makefile.am b/examples/dominfo/Makefile.am index 2913e5b..678de68 100644 --- a/examples/dominfo/Makefile.am +++ b/examples/dominfo/Makefile.am @@ -1,6 +1,7 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I@srcdir@/include -LDADDS = $(STATIC_BINARIES) $(WARN_CFLAGS) $(top_builddir)/src/libvirt.la $(COVERAGE_LDFLAGS) +LDADDS = $(STATIC_BINARIES) $(WARN_CFLAGS) $(top_builddir)/src/libvirt.la \ + $(COVERAGE_LDFLAGS) noinst_PROGRAMS=info1 diff --git a/examples/domsuspend/Makefile.am b/examples/domsuspend/Makefile.am index 14b4205..2c277a4 100644 --- a/examples/domsuspend/Makefile.am +++ b/examples/domsuspend/Makefile.am @@ -1,6 +1,7 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I@srcdir@/include -LDADDS = $(STATIC_BINARIES) $(WARN_CFLAGS) $(top_builddir)/src/libvirt.la $(COVERAGE_LDFLAGS) +LDADDS = $(STATIC_BINARIES) $(WARN_CFLAGS) $(top_builddir)/src/libvirt.la \ + $(COVERAGE_LDFLAGS) noinst_PROGRAMS=suspend diff --git a/src/Makefile.am b/src/Makefile.am index fe34b7b..10c3c7e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -254,7 +254,7 @@ OPENVZ_DRIVER_SOURCES = \ openvz/openvz_conf.c openvz/openvz_conf.h \ openvz/openvz_driver.c openvz/openvz_driver.h -VMWARE_DRIVER_SOURCES = \ +VMWARE_DRIVER_SOURCES = \ vmware/vmware_driver.c vmware/vmware_driver.h \ vmware/vmware_conf.c vmware/vmware_conf.h @@ -266,7 +266,7 @@ VBOX_DRIVER_SOURCES = \ vbox/vbox_V3_1.c vbox/vbox_CAPI_v3_1.h \ vbox/vbox_V3_2.c vbox/vbox_CAPI_v3_2.h -VBOX_DRIVER_EXTRA_DIST = \ +VBOX_DRIVER_EXTRA_DIST = \ vbox/vbox_tmpl.c vbox/README \ vbox/vbox_MSCOMGlue.c vbox/vbox_MSCOMGlue.h \ vbox/vbox_XPCOMCGlue.c vbox/vbox_XPCOMCGlue.h diff --git a/src/datatypes.h b/src/datatypes.h index bbeb7cf..07fa582 100644 --- a/src/datatypes.h +++ b/src/datatypes.h @@ -1,7 +1,7 @@ /* * datatypes.h: management of structs for public data types * - * Copyright (C) 2006-2008 Red Hat, Inc. + * Copyright (C) 2006-2008, 2010 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -34,7 +34,7 @@ * magic value used to protect the API when pointers to connection structures * are passed down by the uers. */ -# define VIR_CONNECT_MAGIC 0x4F23DEAD +# define VIR_CONNECT_MAGIC 0x4F23DEAD # define VIR_IS_CONNECT(obj) ((obj) && (obj)->magic==VIR_CONNECT_MAGIC) diff --git a/src/internal.h b/src/internal.h index 8473c3c..038b862 100644 --- a/src/internal.h +++ b/src/internal.h @@ -200,7 +200,7 @@ * * macro to flag unimplemented blocks */ -# define TODO \ +# define TODO \ fprintf(stderr, "Unimplemented block at %s:%d\n", \ __FILE__, __LINE__); diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 4d7aaf7..3ac5024 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -247,7 +247,7 @@ int qemuMonitorGetMigrationStatus(qemuMonitorPtr mon, unsigned long long *total); typedef enum { - QEMU_MONITOR_MIGRATE_BACKGROUND = 1 << 0, + QEMU_MONITOR_MIGRATE_BACKGROUND = 1 << 0, QEMU_MONITOR_MIGRATE_NON_SHARED_DISK = 1 << 1, /* migration with non-shared storage with full disk copy */ QEMU_MONITOR_MIGRATE_NON_SHARED_INC = 1 << 2, /* migration with non-shared storage with incremental copy */ QEMU_MONITOR_MIGRATION_FLAGS_LAST diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c index b7661c0..ead8ee9 100644 --- a/src/xen/xen_hypervisor.c +++ b/src/xen/xen_hypervisor.c @@ -647,7 +647,7 @@ typedef struct xen_v2d5_setvcpumap xen_v2d5_getvcpumap; /* * from V2 we get the available heap information */ -#define XEN_V2_OP_GETAVAILHEAP 9 +#define XEN_V2_OP_GETAVAILHEAP 9 /* * from V2 we get the scheduler parameter diff --git a/src/xen/xs_internal.h b/src/xen/xs_internal.h index afbc15a..d58e6c0 100644 --- a/src/xen/xs_internal.h +++ b/src/xen/xs_internal.h @@ -1,7 +1,7 @@ /* * xs_internal.h: internal API for access to XenStore * - * Copyright (C) 2006 Red Hat, Inc. + * Copyright (C) 2006, 2010 Red Hat, Inc. * * See COPYING.LIB for the License of this software * @@ -24,17 +24,17 @@ int xenStoreClose (virConnectPtr conn); int xenStoreGetDomainInfo (virDomainPtr domain, virDomainInfoPtr info); int xenStoreNumOfDomains (virConnectPtr conn); -int xenStoreListDomains (virConnectPtr conn, +int xenStoreListDomains (virConnectPtr conn, int *ids, int maxids); -virDomainPtr xenStoreLookupByName(virConnectPtr conn, +virDomainPtr xenStoreLookupByName(virConnectPtr conn, const char *name); -unsigned long xenStoreGetMaxMemory (virDomainPtr domain); +unsigned long xenStoreGetMaxMemory (virDomainPtr domain); int xenStoreDomainSetMemory (virDomainPtr domain, unsigned long memory); -unsigned long xenStoreDomainGetMaxMemory(virDomainPtr domain); -int xenStoreDomainShutdown (virDomainPtr domain); -int xenStoreDomainReboot (virDomainPtr domain, +unsigned long xenStoreDomainGetMaxMemory(virDomainPtr domain); +int xenStoreDomainShutdown (virDomainPtr domain); +int xenStoreDomainReboot (virDomainPtr domain, unsigned int flags); int xenStoreDomainGetVNCPort(virConnectPtr conn, diff --git a/tools/Makefile.am b/tools/Makefile.am index 8a5fb52..271c11b 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -9,9 +9,9 @@ ICON_FILES = \ virsh_win_icon.rc EXTRA_DIST = \ - $(ICON_FILES) \ - virt-xml-validate.in \ - virt-pki-validate.in \ + $(ICON_FILES) \ + virt-xml-validate.in \ + virt-pki-validate.in \ virsh.pod \ libvirt-guests.init.in \ libvirt-guests.sysconf -- 1.7.3.3