From: Jack Lange <jacklange@cs.pitt.edu>
Date: Tue, 8 Mar 2011 03:01:20 +0000 (-0600)
Subject: added null library files to fix linking
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=95198dcc4738a80a85422cd912170ced9acb81a5;p=palacios.git

added null library files to fix linking
---

diff --git a/palacios/lib/i386/Makefile b/palacios/lib/i386/Makefile
index 439cd66..593cb48 100644
--- a/palacios/lib/i386/Makefile
+++ b/palacios/lib/i386/Makefile
@@ -1,2 +1,4 @@
+obj-y := null.o
+
 obj-$(CONFIG_XED) :=	libxed.a \
 			v3-xed-compat.o 
diff --git a/palacios/lib/i386/null.c b/palacios/lib/i386/null.c
new file mode 100644
index 0000000..1828c44
--- /dev/null
+++ b/palacios/lib/i386/null.c
@@ -0,0 +1,6 @@
+/** \file
+ * Do nothing module.
+ *
+ * This file only exists to appease the kbuild gods.
+ */
+
diff --git a/palacios/lib/x86_64/Makefile b/palacios/lib/x86_64/Makefile
index c77a270..2d97a1b 100644
--- a/palacios/lib/x86_64/Makefile
+++ b/palacios/lib/x86_64/Makefile
@@ -1,2 +1,4 @@
+obj-y := null.o
+
 obj-$(CONFIG_XED) := 	libxed32e.a \
 			v3-xed-compat.o
diff --git a/palacios/lib/x86_64/null.c b/palacios/lib/x86_64/null.c
new file mode 100644
index 0000000..1828c44
--- /dev/null
+++ b/palacios/lib/x86_64/null.c
@@ -0,0 +1,6 @@
+/** \file
+ * Do nothing module.
+ *
+ * This file only exists to appease the kbuild gods.
+ */
+
diff --git a/palacios/src/palacios/vmm_v3dec.c b/palacios/src/palacios/vmm_v3dec.c
index 47a2487..d3a59d1 100644
--- a/palacios/src/palacios/vmm_v3dec.c
+++ b/palacios/src/palacios/vmm_v3dec.c
@@ -281,11 +281,11 @@ static int parse_operands(struct guest_info * core, uint8_t * instr_ptr,
 
 	    instr->src_operand.type = MEM_OPERAND;
 	    instr->src_operand.size = operand_width;
-	    instr->src_operand.operand = core->segments.ds.base + MASK(core->vm_regs.rsi, addr_width);
+	    instr->src_operand.operand = get_addr_linear(core,  MASK(core->vm_regs.rsi, addr_width), &(core->segments.ds));
 
 	    instr->src_operand.type = MEM_OPERAND;
 	    instr->src_operand.size = operand_width;
-	    instr->src_operand.operand = core->segments.es.base + MASK(core->vm_regs.rdi, addr_width);
+	    instr->src_operand.operand = get_addr_linear(core, MASK(core->vm_regs.rdi, addr_width), &(core->segments.es));
 
 	    instr->num_operands = 2;