Re-indent libxc to avoid hard tabs. Also, fix the PAE

domain builder to correctly write PTEs that map pages
above 4GB.

Signed-off-by: Keir Fraser <keir@xensource.com>

1 files changed, 92 insertions, 82 deletions

diff --git a/tools/libxc/xc_core.c b/tools/libxc/xc_core.c
index 1bf034a27a..dc0387129d 100644
--- a/tools/libxc/xc_core.c
+++ b/tools/libxc/xc_core.c
@@ -11,10 +11,10 @@
 
 static int
 copy_from_domain_page(int xc_handle,
-		      u32 domid,
-		      unsigned long *page_array,
-		      unsigned long src_pfn,
-		      void *dst_page)
+                      u32 domid,
+                      unsigned long *page_array,
+                      unsigned long src_pfn,
+                      void *dst_page)
 {
     void *vaddr = xc_map_foreign_range(
         xc_handle, domid, PAGE_SIZE, PROT_READ, page_array[src_pfn]);
@@ -27,90 +27,100 @@ copy_from_domain_page(int xc_handle,
 
 int 
 xc_domain_dumpcore(int xc_handle,
-		   u32 domid,
-		   const char *corename)
+                   u32 domid,
+                   const char *corename)
 {
-	unsigned long nr_pages;
-	unsigned long *page_array;
-	xc_dominfo_t info;
-	int i, j, vcpu_map_size, dump_fd;
-	char *dump_mem, *dump_mem_start = NULL;
-	struct xc_core_header header;
-	vcpu_guest_context_t     ctxt[MAX_VIRT_CPUS];
+    unsigned long nr_pages;
+    unsigned long *page_array;
+    xc_dominfo_t info;
+    int i, j, vcpu_map_size, dump_fd;
+    char *dump_mem, *dump_mem_start = NULL;
+    struct xc_core_header header;
+    vcpu_guest_context_t     ctxt[MAX_VIRT_CPUS];
 
-	
-	if ((dump_fd = open(corename, O_CREAT|O_RDWR, S_IWUSR|S_IRUSR)) < 0) {
-		PERROR("Could not open corefile %s: %s", corename, strerror(errno));
-		goto error_out;
-	}
-	
-	if ((dump_mem_start = malloc(DUMP_INCREMENT*PAGE_SIZE)) == NULL) {
-		PERROR("Could not allocate dump_mem");
-		goto error_out;
-	}
-	
-	if (xc_domain_getinfo(xc_handle, domid, 1, &info) != 1) {
-		PERROR("Could not get info for domain");
-		goto error_out;
-	}
-	
-	vcpu_map_size =  sizeof(info.vcpu_to_cpu) / sizeof(info.vcpu_to_cpu[0]);
+ 
+    if ((dump_fd = open(corename, O_CREAT|O_RDWR, S_IWUSR|S_IRUSR)) < 0) {
+        PERROR("Could not open corefile %s: %s", corename, strerror(errno));
+        goto error_out;
+    }
+ 
+    if ((dump_mem_start = malloc(DUMP_INCREMENT*PAGE_SIZE)) == NULL) {
+        PERROR("Could not allocate dump_mem");
+        goto error_out;
+    }
+ 
+    if (xc_domain_getinfo(xc_handle, domid, 1, &info) != 1) {
+        PERROR("Could not get info for domain");
+        goto error_out;
+    }
+ 
+    vcpu_map_size =  sizeof(info.vcpu_to_cpu) / sizeof(info.vcpu_to_cpu[0]);
 
-	for (i = 0, j = 0; i < vcpu_map_size; i++) {
-		if (info.vcpu_to_cpu[i] == -1) {
-			continue;
-		}
-		if (xc_domain_get_vcpu_context(xc_handle, domid, i, &ctxt[j])) {
-			PERROR("Could not get all vcpu contexts for domain");
-			goto error_out;
-		}
-		j++;
-	}
-	
-	nr_pages = info.nr_pages;
+    for (i = 0, j = 0; i < vcpu_map_size; i++) {
+        if (info.vcpu_to_cpu[i] == -1) {
+            continue;
+        }
+        if (xc_domain_get_vcpu_context(xc_handle, domid, i, &ctxt[j])) {
+            PERROR("Could not get all vcpu contexts for domain");
+            goto error_out;
+        }
+        j++;
+    }
+ 
+    nr_pages = info.nr_pages;
 
-	header.xch_magic = 0xF00FEBED; 
-	header.xch_nr_vcpus = info.vcpus;
-	header.xch_nr_pages = nr_pages;
-	header.xch_ctxt_offset = sizeof(struct xc_core_header);
-	header.xch_index_offset = sizeof(struct xc_core_header) +
-	    sizeof(vcpu_guest_context_t)*info.vcpus;
-	header.xch_pages_offset = round_pgup(sizeof(struct xc_core_header) +
-	    (sizeof(vcpu_guest_context_t) * info.vcpus) + 
-	    (nr_pages * sizeof(unsigned long)));
+    header.xch_magic = 0xF00FEBED; 
+    header.xch_nr_vcpus = info.vcpus;
+    header.xch_nr_pages = nr_pages;
+    header.xch_ctxt_offset = sizeof(struct xc_core_header);
+    header.xch_index_offset = sizeof(struct xc_core_header) +
+        sizeof(vcpu_guest_context_t)*info.vcpus;
+    header.xch_pages_offset = round_pgup(sizeof(struct xc_core_header) +
+                                         (sizeof(vcpu_guest_context_t) * info.vcpus) + 
+                                         (nr_pages * sizeof(unsigned long)));
 
-	write(dump_fd, &header, sizeof(struct xc_core_header));
-	write(dump_fd, &ctxt, sizeof(ctxt[0]) * info.vcpus);
+    write(dump_fd, &header, sizeof(struct xc_core_header));
+    write(dump_fd, &ctxt, sizeof(ctxt[0]) * info.vcpus);
 
-	if ((page_array = malloc(nr_pages * sizeof(unsigned long))) == NULL) {
-	    printf("Could not allocate memory\n");
-	    goto error_out;
-	}
-	if (xc_get_pfn_list(xc_handle, domid, page_array, nr_pages) != nr_pages) {
-	    printf("Could not get the page frame list\n");
-	    goto error_out;
-	}
-	write(dump_fd, page_array, nr_pages * sizeof(unsigned long));
-	lseek(dump_fd, header.xch_pages_offset, SEEK_SET);
-	for (dump_mem = dump_mem_start, i = 0; i < nr_pages; i++) {
-		copy_from_domain_page(xc_handle, domid, page_array, i, dump_mem);
-		dump_mem += PAGE_SIZE;
-		if (((i + 1) % DUMP_INCREMENT == 0) || (i + 1) == nr_pages) {
-			if (write(dump_fd, dump_mem_start, dump_mem - dump_mem_start) < 
-			    dump_mem - dump_mem_start) {
-				PERROR("Partial write, file system full?");
-				goto error_out;
-			}
-			dump_mem = dump_mem_start;
-		}
-	}
+    if ((page_array = malloc(nr_pages * sizeof(unsigned long))) == NULL) {
+        printf("Could not allocate memory\n");
+        goto error_out;
+    }
+    if (xc_get_pfn_list(xc_handle, domid, page_array, nr_pages) != nr_pages) {
+        printf("Could not get the page frame list\n");
+        goto error_out;
+    }
+    write(dump_fd, page_array, nr_pages * sizeof(unsigned long));
+    lseek(dump_fd, header.xch_pages_offset, SEEK_SET);
+    for (dump_mem = dump_mem_start, i = 0; i < nr_pages; i++) {
+        copy_from_domain_page(xc_handle, domid, page_array, i, dump_mem);
+        dump_mem += PAGE_SIZE;
+        if (((i + 1) % DUMP_INCREMENT == 0) || (i + 1) == nr_pages) {
+            if (write(dump_fd, dump_mem_start, dump_mem - dump_mem_start) < 
+                dump_mem - dump_mem_start) {
+                PERROR("Partial write, file system full?");
+                goto error_out;
+            }
+            dump_mem = dump_mem_start;
+        }
+    }
 
-	close(dump_fd);
-	free(dump_mem_start);
-	return 0;
+    close(dump_fd);
+    free(dump_mem_start);
+    return 0;
  error_out:
-	if (dump_fd != -1)
-		close(dump_fd);
-	free(dump_mem_start);
-	return -1;
+    if (dump_fd != -1)
+        close(dump_fd);
+    free(dump_mem_start);
+    return -1;
 }
+
+/*
+ * Local variables:
+ * mode: C
+ * c-set-style: "BSD"
+ * c-basic-offset: 4
+ * tab-width: 4
+ * indent-tabs-mode: nil
+ * End:
+ */