# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1317995956 -3600
# Node ID a440b0ad413b88ef7814f407b2fc3b412d586e9b
# Parent 197e3be90f3245fb8f66281bf2759327bf051a9d
libxl: expand hard tabs stops
I ran the following and committed the result. ^I is an actual hard tab
for i in $(grep -l --exclude=*_[ly].\[ch\] '^I' tools/libxl/*.[ch]) ; do
cat $i | expand | sponge $i
done
There are some actually wrong indentations too, I'll fix thos up manually
Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
diff -r 197e3be90f32 -r a440b0ad413b tools/libxl/libxl.c
--- a/tools/libxl/libxl.c Fri Oct 07 13:24:44 2011 +0100
+++ b/tools/libxl/libxl.c Fri Oct 07 14:59:16 2011 +0100
@@ -696,13 +696,13 @@ int libxl_event_get_disk_eject_info(libx
sscanf(backend,
"/local/domain/%d/backend/%" TOSTRING(BACKEND_STRING_SIZE)
"[a-z]/%*d/%*d",
&disk->backend_domid, backend_type);
- if (!strcmp(backend_type, "tap") || !strcmp(backend_type, "vbd")) {
- disk->backend = LIBXL_DISK_BACKEND_TAP;
- } else if (!strcmp(backend_type, "qdisk")) {
- disk->backend = LIBXL_DISK_BACKEND_QDISK;
- } else {
- disk->backend = LIBXL_DISK_BACKEND_UNKNOWN;
- }
+ if (!strcmp(backend_type, "tap") || !strcmp(backend_type, "vbd")) {
+ disk->backend = LIBXL_DISK_BACKEND_TAP;
+ } else if (!strcmp(backend_type, "qdisk")) {
+ disk->backend = LIBXL_DISK_BACKEND_QDISK;
+ } else {
+ disk->backend = LIBXL_DISK_BACKEND_UNKNOWN;
+ }
disk->pdev_path = strdup("");
disk->format = LIBXL_DISK_FORMAT_EMPTY;
diff -r 197e3be90f32 -r a440b0ad413b tools/libxl/libxl.h
--- a/tools/libxl/libxl.h Fri Oct 07 13:24:44 2011 +0100
+++ b/tools/libxl/libxl.h Fri Oct 07 14:59:16 2011 +0100
@@ -420,7 +420,7 @@ int libxl_cpuid_parse_config_xend(libxl_
const char* str);
void libxl_cpuid_apply_policy(libxl_ctx *ctx, uint32_t domid);
void libxl_cpuid_set(libxl_ctx *ctx, uint32_t domid,
- libxl_cpuid_policy_list cpuid);
+ libxl_cpuid_policy_list cpuid);
/*
* Functions for allowing users of libxl to store private data
diff -r 197e3be90f32 -r a440b0ad413b tools/libxl/libxl_bootloader.c
--- a/tools/libxl/libxl_bootloader.c Fri Oct 07 13:24:44 2011 +0100
+++ b/tools/libxl/libxl_bootloader.c Fri Oct 07 14:59:16 2011 +0100
@@ -81,14 +81,14 @@ static int open_xenconsoled_pty(int *mas
ret = openpty(master, slave, NULL, NULL, NULL);
if (ret < 0)
- return -1;
+ return -1;
ret = ttyname_r(*slave, slave_path, slave_path_len);
if (ret == -1) {
- close(*master);
- close(*slave);
- *master = *slave = -1;
- return -1;
+ close(*master);
+ close(*slave);
+ *master = *slave = -1;
+ return -1;
}
/*
diff -r 197e3be90f32 -r a440b0ad413b tools/libxl/libxl_cpuid.c
--- a/tools/libxl/libxl_cpuid.c Fri Oct 07 13:24:44 2011 +0100
+++ b/tools/libxl/libxl_cpuid.c Fri Oct 07 14:59:16 2011 +0100
@@ -317,7 +317,7 @@ void libxl_cpuid_apply_policy(libxl_ctx
}
void libxl_cpuid_set(libxl_ctx *ctx, uint32_t domid,
- libxl_cpuid_policy_list cpuid)
+ libxl_cpuid_policy_list cpuid)
{
int i;
char *cpuid_res[4];
diff -r 197e3be90f32 -r a440b0ad413b tools/libxl/libxl_internal.c
--- a/tools/libxl/libxl_internal.c Fri Oct 07 13:24:44 2011 +0100
+++ b/tools/libxl/libxl_internal.c Fri Oct 07 14:59:16 2011 +0100
@@ -228,53 +228,53 @@ char *libxl__abs_path(libxl__gc *gc, con
int libxl__file_reference_map(libxl_file_reference *f)
{
- struct stat st_buf;
- int ret, fd;
- void *data;
+ struct stat st_buf;
+ int ret, fd;
+ void *data;
- if (f->mapped)
- return 0;
+ if (f->mapped)
+ return 0;
- fd = open(f->path, O_RDONLY);
- if (f < 0)
- return ERROR_FAIL;
+ fd = open(f->path, O_RDONLY);
+ if (f < 0)
+ return ERROR_FAIL;
- ret = fstat(fd, &st_buf);
- if (ret < 0)
- goto out;
+ ret = fstat(fd, &st_buf);
+ if (ret < 0)
+ goto out;
- ret = -1;
- data = mmap(NULL, st_buf.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
- if (data == NULL)
- goto out;
+ ret = -1;
+ data = mmap(NULL, st_buf.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
+ if (data == NULL)
+ goto out;
- f->mapped = 1;
- f->data = data;
- f->size = st_buf.st_size;
+ f->mapped = 1;
+ f->data = data;
+ f->size = st_buf.st_size;
- ret = 0;
+ ret = 0;
out:
- close(fd);
+ close(fd);
- return ret == 0 ? 0 : ERROR_FAIL;
+ return ret == 0 ? 0 : ERROR_FAIL;
}
int libxl__file_reference_unmap(libxl_file_reference *f)
{
- int ret;
+ int ret;
- if (!f->mapped)
- return 0;
+ if (!f->mapped)
+ return 0;
- ret = munmap(f->data, f->size);
- if (ret == 0) {
- f->mapped = 0;
- f->data = NULL;
- f->size = 0;
- return 0;
- }
+ ret = munmap(f->data, f->size);
+ if (ret == 0) {
+ f->mapped = 0;
+ f->data = NULL;
+ f->size = 0;
+ return 0;
+ }
- return ERROR_FAIL;
+ return ERROR_FAIL;
}
_hidden int libxl__parse_mac(const char *s, libxl_mac mac)
diff -r 197e3be90f32 -r a440b0ad413b tools/libxl/libxl_nocpuid.c
--- a/tools/libxl/libxl_nocpuid.c Fri Oct 07 13:24:44 2011 +0100
+++ b/tools/libxl/libxl_nocpuid.c Fri Oct 07 14:59:16 2011 +0100
@@ -32,6 +32,6 @@ void libxl_cpuid_apply_policy(libxl_ctx
}
void libxl_cpuid_set(libxl_ctx *ctx, uint32_t domid,
- libxl_cpuid_policy_list cpuid)
+ libxl_cpuid_policy_list cpuid)
{
}
diff -r 197e3be90f32 -r a440b0ad413b tools/libxl/libxl_pci.c
--- a/tools/libxl/libxl_pci.c Fri Oct 07 13:24:44 2011 +0100
+++ b/tools/libxl/libxl_pci.c Fri Oct 07 14:59:16 2011 +0100
@@ -1114,7 +1114,7 @@ static int e820_sanitize(libxl_ctx *ctx,
if ((src[i].type == E820_RAM) ||
(src[i].type == E820_UNUSABLE) ||
(src[i].type == 0))
- continue;
+ continue;
start = src[i].addr < start ? src[i].addr : start;
last = src[i].addr + src[i].size > last ?
@@ -1159,14 +1159,14 @@ static int e820_sanitize(libxl_ctx *ctx,
* to E820_UNUSED. We also need to move some of the E820_RAM regions if
* the overlap with ram_end. */
for (i = 0; i < nr; i++) {
- uint64_t end = src[i].addr + src[i].size;
+ uint64_t end = src[i].addr + src[i].size;
- /* We don't care about E820_UNUSABLE, but we need to
+ /* We don't care about E820_UNUSABLE, but we need to
* change the type to zero b/c the loop after this
* sticks E820_UNUSABLE on the guest's E820 but ignores
* the ones with type zero. */
if ((src[i].type == E820_UNUSABLE) ||
- /* Any region that is within the "RAM region" can
+ /* Any region that is within the "RAM region" can
* be safely ditched. */
(end < ram_end)) {
src[i].type = 0;
@@ -1174,15 +1174,15 @@ static int e820_sanitize(libxl_ctx *ctx,
}
/* Look only at RAM regions. */
- if (src[i].type != E820_RAM)
+ if (src[i].type != E820_RAM)
continue;
/* We only care about RAM regions below 4GB. */
if (src[i].addr >= (1ULL<<32))
continue;
- /* E820_RAM overlaps with our RAM region. Move it */
- if (src[i].addr < ram_end) {
+ /* E820_RAM overlaps with our RAM region. Move it */
+ if (src[i].addr < ram_end) {
uint64_t delta;
src[i].type = E820_UNUSABLE;
@@ -1236,8 +1236,8 @@ static int e820_sanitize(libxl_ctx *ctx,
/* Almost done: copy them over, ignoring the undesireable ones */
for (i = 0; i < nr; i++) {
if ((src[i].type == E820_RAM) ||
- (src[i].type == 0))
- continue;
+ (src[i].type == 0))
+ continue;
e820[idx].type = src[i].type;
e820[idx].addr = src[i].addr;
diff -r 197e3be90f32 -r a440b0ad413b tools/libxl/libxl_utils.c
--- a/tools/libxl/libxl_utils.c Fri Oct 07 13:24:44 2011 +0100
+++ b/tools/libxl/libxl_utils.c Fri Oct 07 14:59:16 2011 +0100
@@ -457,7 +457,7 @@ int libxl_mac_to_device_nic(libxl_ctx *c
rc = libxl__parse_mac(mac, mac_n);
if (rc)
- return rc;
+ return rc;
nics = libxl_list_nics(ctx, domid, &nb);
if (!nics)
@@ -509,7 +509,7 @@ int libxl_devid_to_device_nic(libxl_ctx
val = libxl__xs_read(&gc, XBT_NULL, libxl__sprintf(&gc, "%s/mac",
nic_path_fe));
rc = libxl__parse_mac(val, nic->mac);
if (rc)
- goto out;
+ goto out;
nic->script = xs_read(ctx->xsh, XBT_NULL, libxl__sprintf(&gc, "%s/script",
nic_path_be), NULL);
rc = 0;
diff -r 197e3be90f32 -r a440b0ad413b tools/libxl/libxlutil.h
--- a/tools/libxl/libxlutil.h Fri Oct 07 13:24:44 2011 +0100
+++ b/tools/libxl/libxlutil.h Fri Oct 07 14:59:16 2011 +0100
@@ -64,7 +64,7 @@ const char *xlu_cfg_get_listitem(const X
*/
int xlu_disk_parse(XLU_Config *cfg, int nspecs, const char *const *specs,
- libxl_device_disk *disk);
+ libxl_device_disk *disk);
/* disk must have been initialised.
*
* On error, returns errno value. Bad strings cause EINVAL and
diff -r 197e3be90f32 -r a440b0ad413b tools/libxl/xl_cmdimpl.c
--- a/tools/libxl/xl_cmdimpl.c Fri Oct 07 13:24:44 2011 +0100
+++ b/tools/libxl/xl_cmdimpl.c Fri Oct 07 14:59:16 2011 +0100
@@ -557,15 +557,15 @@ static void parse_disk_config_multistrin
memset(disk, 0, sizeof(*disk));
if (!*config) {
- *config = xlu_cfg_init(stderr, "command line");
- if (!*config) { perror("xlu_cfg_init"); exit(-1); }
+ *config = xlu_cfg_init(stderr, "command line");
+ if (!*config) { perror("xlu_cfg_init"); exit(-1); }
}
e = xlu_disk_parse(*config, nspecs, specs, disk);
if (e == EINVAL) exit(-1);
if (e) {
- fprintf(stderr,"xlu_disk_parse failed: %s\n",strerror(errno));
- exit(-1);
+ fprintf(stderr,"xlu_disk_parse failed: %s\n",strerror(errno));
+ exit(-1);
}
}
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
Home