From: Jack Lange <jarusl@cs.northwestern.edu>
Date: Thu, 29 Jul 2010 17:57:42 +0000 (-0500)
Subject: Merge branch 'devel' of ssh://palacios@newskysaw.cs.northwestern.edu/home/palacios... 
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=1753dc6b8b9621b4bb996554bd806361a34c5b9f;hp=6a686aa0cf80126e77d4f0f3a0eb882a7d302ae0;p=palacios.releases.git

Merge branch 'devel' of ssh://palacios@newskysaw.cs.northwestern.edu/home/palacios/palacios into devel
---

diff --git a/palacios/src/palacios/svm_io.c b/palacios/src/palacios/svm_io.c
index aaa6101..93038c6 100644
--- a/palacios/src/palacios/svm_io.c
+++ b/palacios/src/palacios/svm_io.c
@@ -359,12 +359,13 @@ int v3_handle_svm_io_outs(struct guest_info * core, struct svm_io_info * io_info
     PrintDebug("OUTS size=%d for %d steps\n", write_size, rep_num);
 
     while (rep_num > 0) {
-	addr_t host_addr;
+	addr_t host_addr = 0;
 
 	dst_addr = get_addr_linear(core, (core->vm_regs.rsi & mask), theseg);
     
 	if (v3_gva_to_hva(core, dst_addr, &host_addr) == -1) {
-	    // either page fault or gpf...
+	    PrintError("Could not translate outs dest addr, either page fault or gpf...\n");
+	    return -1;
 	}
 
 	if (hook->write(core, io_info->port, (char*)host_addr, write_size, hook->priv_data) != write_size) {
diff --git a/utils/format/astyle_1.24_linux.tar.gz b/utils/format/astyle_1.24_linux.tar.gz
new file mode 100644
index 0000000..1a68e35
Binary files /dev/null and b/utils/format/astyle_1.24_linux.tar.gz differ
diff --git a/utils/format/astyle_cmd b/utils/format/astyle_cmd
new file mode 100644
index 0000000..4ace790
--- /dev/null
+++ b/utils/format/astyle_cmd
@@ -0,0 +1 @@
+astyle -T4 -a -S -w -y -M79 -p  < vmm_mptable.c | less 
diff --git a/utils/format/bin/astyle b/utils/format/bin/astyle
new file mode 100755
index 0000000..57733ed
Binary files /dev/null and b/utils/format/bin/astyle differ
diff --git a/utils/format/indent_cmd b/utils/format/indent_cmd
new file mode 100644
index 0000000..d7ac479
--- /dev/null
+++ b/utils/format/indent_cmd
@@ -0,0 +1,3 @@
+indent -br  -bap -ce -cdw -cli4 -npcs -saf -sai -saw -ncs -nbc -npsl -hnl -di1 -brs -brf -i4 -l256 -lp -T uint8_t -T uint16_t -T uint32_t -T addr_t -T uint64_t vmm_
+mptable.c -o test.out.c
+