aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorIan Campbell <ian.campbell@citrix.com>2011-10-11 14:34:07 +0100
committerIan Campbell <ian.campbell@citrix.com>2011-10-11 14:34:07 +0100
commitf9b2c2750ee1563fb47803d2b1e9dd85447479f0 (patch)
tree89836a7ea05c252ec08b6cd4d1a4dbdd6a3f998e /tools
parentc90bc4db252cf5d759ab335d10dd48033485ac26 (diff)
downloadxen-f9b2c2750ee1563fb47803d2b1e9dd85447479f0.tar.gz
xen-f9b2c2750ee1563fb47803d2b1e9dd85447479f0.tar.bz2
xen-f9b2c2750ee1563fb47803d2b1e9dd85447479f0.zip
libxl: fixup incorrect indentation
Several places which were previsously indented using hard tabs are now incorrectly indented. Fix them up. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/libxl/libxl.c14
-rw-r--r--tools/libxl/libxl_bootloader.c10
-rw-r--r--tools/libxl/libxl_internal.c64
-rw-r--r--tools/libxl/libxl_pci.c2
-rw-r--r--tools/libxl/libxl_utils.c4
5 files changed, 47 insertions, 47 deletions
diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c
index 61450ee70b..4645e035a6 100644
--- a/tools/libxl/libxl.c
+++ b/tools/libxl/libxl.c
@@ -696,13 +696,13 @@ int libxl_event_get_disk_eject_info(libxl_ctx *ctx, uint32_t domid, libxl_event
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 --git a/tools/libxl/libxl_bootloader.c b/tools/libxl/libxl_bootloader.c
index a88907e45f..886c57821d 100644
--- a/tools/libxl/libxl_bootloader.c
+++ b/tools/libxl/libxl_bootloader.c
@@ -81,14 +81,14 @@ static int open_xenconsoled_pty(int *master, int *slave, char *slave_path, size_
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 --git a/tools/libxl/libxl_internal.c b/tools/libxl/libxl_internal.c
index 08cb943e61..b27efc2ef0 100644
--- a/tools/libxl/libxl_internal.c
+++ b/tools/libxl/libxl_internal.c
@@ -228,53 +228,53 @@ char *libxl__abs_path(libxl__gc *gc, const char *s, const char *path)
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 --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c
index c1a62ceee7..26530bc4df 100644
--- a/tools/libxl/libxl_pci.c
+++ b/tools/libxl/libxl_pci.c
@@ -1113,7 +1113,7 @@ static int e820_sanitize(libxl_ctx *ctx, struct e820entry src[],
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 ?
diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c
index 4b4c38574f..a1fc848157 100644
--- a/tools/libxl/libxl_utils.c
+++ b/tools/libxl/libxl_utils.c
@@ -457,7 +457,7 @@ int libxl_mac_to_device_nic(libxl_ctx *ctx, uint32_t domid,
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 *ctx, uint32_t domid,
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;