|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH XEN v8 19/29] tools/libs: Clean up hard tabs.
These were wrong in the context of libxc before this code was
extracted, clean them up.
Also add some emacs magic blocks
Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Acked-by: Wei Liu <wei.liu2@xxxxxxxxxx>
---
tools/libs/call/buffer.c | 4 ++--
tools/libs/call/core.c | 2 +-
tools/libs/call/minios.c | 4 ++--
tools/libs/evtchn/minios.c | 28 ++++++++++++++--------------
tools/libs/evtchn/netbsd.c | 12 ++++++------
tools/libs/foreignmemory/freebsd.c | 2 +-
tools/libs/foreignmemory/minios.c | 6 +++---
tools/libs/foreignmemory/netbsd.c | 2 +-
tools/libs/foreignmemory/private.h | 2 +-
tools/libs/foreignmemory/solaris.c | 12 +++++++++++-
tools/libs/gnttab/include/xengnttab.h | 4 ++--
tools/libs/gnttab/linux.c | 6 +++---
tools/libs/toollog/xtl_logger_stdio.c | 2 +-
13 files changed, 48 insertions(+), 38 deletions(-)
diff --git a/tools/libs/call/buffer.c b/tools/libs/call/buffer.c
index 1a1b27a..2d8fc29 100644
--- a/tools/libs/call/buffer.c
+++ b/tools/libs/call/buffer.c
@@ -20,7 +20,7 @@
#include "private.h"
#define DBGPRINTF(_m...) \
- xtl_log(xcall->logger, XTL_DEBUG, -1, "xencall:buffer", _m)
+ xtl_log(xcall->logger, XTL_DEBUG, -1, "xencall:buffer", _m)
#define ROUNDUP(_x,_w) (((unsigned long)(_x)+(1UL<<(_w))-1) & ~((1UL<<(_w))-1))
@@ -86,7 +86,7 @@ static int cache_free(xencall_handle *xcall, void *p, size_t
nr_pages)
xcall->buffer_current_allocations--;
if ( nr_pages == 1 &&
- xcall->buffer_cache_nr < BUFFER_CACHE_SIZE )
+ xcall->buffer_cache_nr < BUFFER_CACHE_SIZE )
{
xcall->buffer_cache[xcall->buffer_cache_nr++] = p;
rc = 1;
diff --git a/tools/libs/call/core.c b/tools/libs/call/core.c
index a342871..bbf88de 100644
--- a/tools/libs/call/core.c
+++ b/tools/libs/call/core.c
@@ -19,7 +19,7 @@
xencall_handle *xencall_open(xentoollog_logger *logger, unsigned open_flags)
{
- xencall_handle *xcall = malloc(sizeof(*xcall));
+ xencall_handle *xcall = malloc(sizeof(*xcall));
int rc;
if (!xcall) return NULL;
diff --git a/tools/libs/call/minios.c b/tools/libs/call/minios.c
index 3bee7be..f04688f 100644
--- a/tools/libs/call/minios.c
+++ b/tools/libs/call/minios.c
@@ -50,8 +50,8 @@ int osdep_hypercall(xencall_handle *xcall,
privcmd_hypercall_t *hypercall)
ret = HYPERVISOR_multicall(&call, 1);
if (ret < 0) {
- errno = -ret;
- return -1;
+ errno = -ret;
+ return -1;
}
if ((long) call.result < 0) {
errno = - (long) call.result;
diff --git a/tools/libs/evtchn/minios.c b/tools/libs/evtchn/minios.c
index 773942d..2c89952 100644
--- a/tools/libs/evtchn/minios.c
+++ b/tools/libs/evtchn/minios.c
@@ -103,8 +103,8 @@ int xenevtchn_notify(xenevtchn_handle *xce, evtchn_port_t
port)
ret = notify_remote_via_evtchn(port);
if (ret < 0) {
- errno = -ret;
- ret = -1;
+ errno = -ret;
+ ret = -1;
}
return ret;
}
@@ -138,16 +138,16 @@ evtchn_port_or_error_t
xenevtchn_bind_unbound_port(xenevtchn_handle *xce, uint32
assert(get_current() == main_thread);
port_info = port_alloc(fd);
if (port_info == NULL)
- return -1;
+ return -1;
printf("xenevtchn_bind_unbound_port(%d)", domid);
ret = evtchn_alloc_unbound(domid, evtchn_handler, (void*)(intptr_t)fd,
&port);
printf(" = %d\n", ret);
if (ret < 0) {
- port_dealloc(port_info);
- errno = -ret;
- return -1;
+ port_dealloc(port_info);
+ errno = -ret;
+ return -1;
}
port_info->bound = 1;
port_info->port = port;
@@ -166,16 +166,16 @@ evtchn_port_or_error_t
xenevtchn_bind_interdomain(xenevtchn_handle *xce, uint32_
assert(get_current() == main_thread);
port_info = port_alloc(fd);
if (port_info == NULL)
- return -1;
+ return -1;
printf("xenevtchn_bind_interdomain(%d, %"PRId32")", domid, remote_port);
ret = evtchn_bind_interdomain(domid, remote_port, evtchn_handler,
(void*)(intptr_t)fd, &local_port);
printf(" = %d\n", ret);
if (ret < 0) {
- port_dealloc(port_info);
- errno = -ret;
- return -1;
+ port_dealloc(port_info);
+ errno = -ret;
+ return -1;
}
port_info->bound = 1;
port_info->port = local_port;
@@ -208,15 +208,15 @@ evtchn_port_or_error_t
xenevtchn_bind_virq(xenevtchn_handle *xce, unsigned int v
assert(get_current() == main_thread);
port_info = port_alloc(fd);
if (port_info == NULL)
- return -1;
+ return -1;
printf("xenevtchn_bind_virq(%d)", virq);
port = bind_virq(virq, evtchn_handler, (void*)(intptr_t)fd);
if (port < 0) {
- port_dealloc(port_info);
- errno = -port;
- return -1;
+ port_dealloc(port_info);
+ errno = -port;
+ return -1;
}
port_info->bound = 1;
port_info->port = port;
diff --git a/tools/libs/evtchn/netbsd.c b/tools/libs/evtchn/netbsd.c
index 1472ca6..77ae51f 100644
--- a/tools/libs/evtchn/netbsd.c
+++ b/tools/libs/evtchn/netbsd.c
@@ -72,9 +72,9 @@ evtchn_port_or_error_t
xenevtchn_bind_unbound_port(xenevtchn_handle * xce, uint3
ret = ioctl(fd, IOCTL_EVTCHN_BIND_UNBOUND_PORT, &bind);
if (ret == 0)
- return bind.port;
+ return bind.port;
else
- return -1;
+ return -1;
}
evtchn_port_or_error_t xenevtchn_bind_interdomain(xenevtchn_handle *xce,
uint32_t domid,
@@ -89,9 +89,9 @@ evtchn_port_or_error_t
xenevtchn_bind_interdomain(xenevtchn_handle *xce, uint32_
ret = ioctl(fd, IOCTL_EVTCHN_BIND_INTERDOMAIN, &bind);
if (ret == 0)
- return bind.port;
+ return bind.port;
else
- return -1;
+ return -1;
}
int xenevtchn_unbind(xenevtchn_handle *xce, evtchn_port_t port)
@@ -114,9 +114,9 @@ evtchn_port_or_error_t xenevtchn_bind_virq(xenevtchn_handle
*xce, unsigned int v
err = ioctl(fd, IOCTL_EVTCHN_BIND_VIRQ, &bind);
if (err)
- return -1;
+ return -1;
else
- return bind.port;
+ return bind.port;
}
evtchn_port_or_error_t xenevtchn_pending(xenevtchn_handle *xce)
diff --git a/tools/libs/foreignmemory/freebsd.c
b/tools/libs/foreignmemory/freebsd.c
index 703754f..38138dc 100644
--- a/tools/libs/foreignmemory/freebsd.c
+++ b/tools/libs/foreignmemory/freebsd.c
@@ -121,7 +121,7 @@ void *osdep_xenforeignmemory_map(xenforeignmemory_handle
*fmem,
int osdep_xenforeignmemory_unmap(xenforeignmemory_handle *fmem,
void *addr, size_t num)
{
- return munmap(addr, num << PAGE_SHIFT);
+ return munmap(addr, num << PAGE_SHIFT);
}
/*
diff --git a/tools/libs/foreignmemory/minios.c
b/tools/libs/foreignmemory/minios.c
index ca5ba71..6dc97bd 100644
--- a/tools/libs/foreignmemory/minios.c
+++ b/tools/libs/foreignmemory/minios.c
@@ -46,16 +46,16 @@ void *osdep_xenforeignmemory_map(xenforeignmemory_handle
*fmem,
{
unsigned long pt_prot = 0;
if (prot & PROT_READ)
- pt_prot = L1_PROT_RO;
+ pt_prot = L1_PROT_RO;
if (prot & PROT_WRITE)
- pt_prot = L1_PROT;
+ pt_prot = L1_PROT;
return map_frames_ex(arr, num, 1, 0, 1, dom, err, pt_prot);
}
int osdep_xenforeignmemory_unmap(xenforeignmemory_handle *fmem,
void *addr, size_t num)
{
- return munmap(addr, num << PAGE_SHIFT);
+ return munmap(addr, num << PAGE_SHIFT);
}
/*
diff --git a/tools/libs/foreignmemory/netbsd.c
b/tools/libs/foreignmemory/netbsd.c
index d0d233a..08f4964 100644
--- a/tools/libs/foreignmemory/netbsd.c
+++ b/tools/libs/foreignmemory/netbsd.c
@@ -97,7 +97,7 @@ void *osdep_map_foreign_batch(xenforeignmem_handle *fmem,
uint32_t dom,
int osdep_xenforeignmemory_unmap(xenforeignmemory_handle *fmem,
void *addr, size_t num)
{
- return munmap(addr, num*XC_PAGE_SIZE);
+ return munmap(addr, num*XC_PAGE_SIZE);
}
/*
diff --git a/tools/libs/foreignmemory/private.h
b/tools/libs/foreignmemory/private.h
index cd732fd..9cc7814 100644
--- a/tools/libs/foreignmemory/private.h
+++ b/tools/libs/foreignmemory/private.h
@@ -39,7 +39,7 @@ void *compat_mapforeign_batch(xenforeignmem_handle *fmem,
uint32_t dom,
#endif
#define PERROR(_f...) \
- xtl_log(fmem->logger, XTL_ERROR, errno, "xenforeignmemory", _f)
+ xtl_log(fmem->logger, XTL_ERROR, errno, "xenforeignmemory", _f)
#endif
diff --git a/tools/libs/foreignmemory/solaris.c
b/tools/libs/foreignmemory/solaris.c
index f1c44bc..e925a29 100644
--- a/tools/libs/foreignmemory/solaris.c
+++ b/tools/libs/foreignmemory/solaris.c
@@ -95,5 +95,15 @@ void *osdep_map_foreign_batch(xenforeignmem_handle *fmem,
uint32_t dom,
int osdep_xenforeignmemory_unmap(xenforeignmemory_handle *fmem,
void *addr, size_t num)
{
- return munmap(addr, num*XC_PAGE_SIZE);
+ return munmap(addr, num*XC_PAGE_SIZE);
}
+
+/*
+ * Local variables:
+ * mode: C
+ * c-file-style: "BSD"
+ * c-basic-offset: 4
+ * tab-width: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
diff --git a/tools/libs/gnttab/include/xengnttab.h
b/tools/libs/gnttab/include/xengnttab.h
index 700a5f1..1e07672 100644
--- a/tools/libs/gnttab/include/xengnttab.h
+++ b/tools/libs/gnttab/include/xengnttab.h
@@ -142,7 +142,7 @@ int xengnttab_unmap(xengnttab_handle *xgt, void
*start_address, uint32_t count);
* of grants.
*/
int xengnttab_set_max_grants(xengnttab_handle *xgt,
- uint32_t count);
+ uint32_t count);
/*
* Grant Sharing Interface (allocating and granting pages)
@@ -160,7 +160,7 @@ typedef struct xengntdev_handle xengntshr_handle;
*
*/
xengntshr_handle *xengntshr_open(xentoollog_logger *logger,
- unsigned open_flags);
+ unsigned open_flags);
/*
* Close a handle previously allocated with xengntshr_open().
diff --git a/tools/libs/gnttab/linux.c b/tools/libs/gnttab/linux.c
index 768119a..8dbdff8 100644
--- a/tools/libs/gnttab/linux.c
+++ b/tools/libs/gnttab/linux.c
@@ -294,9 +294,9 @@ void *osdep_gntshr_share_pages(xengntshr_handle *xgs,
err = ioctl(fd, IOCTL_GNTALLOC_SET_UNMAP_NOTIFY, ¬ify);
if (err) {
GSERROR(xgs->logger, "ioctl SET_UNMAP_NOTIFY failed");
- munmap(area, count * PAGE_SIZE);
- area = NULL;
- }
+ munmap(area, count * PAGE_SIZE);
+ area = NULL;
+ }
memcpy(refs, gref_info->gref_ids, count * sizeof(uint32_t));
diff --git a/tools/libs/toollog/xtl_logger_stdio.c
b/tools/libs/toollog/xtl_logger_stdio.c
index f9c5bd8..52dfbf5 100644
--- a/tools/libs/toollog/xtl_logger_stdio.c
+++ b/tools/libs/toollog/xtl_logger_stdio.c
@@ -135,7 +135,7 @@ static void stdiostream_progress(struct xentoollog_logger
*logger_in,
newpel = fprintf(lg->f, "%s%s" "%s: %lu/%lu %3d%%%s",
context?context:"", context?": ":"",
doing_what, done, total, percent,
- done == total ? "\n" : "");
+ done == total ? "\n" : "");
extra_erase = lg->progress_erase_len - newpel;
if (extra_erase > 0)
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |