From: Jack Lange <jarusl@cs.northwestern.edu>
Date: Thu, 16 Jul 2009 02:14:16 +0000 (-0500)
Subject: fixed build error
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=f40ba895fdbe492f6e82bcf9995a61b95d128928

fixed build error
---

diff --git a/palacios/src/palacios/vmx.c b/palacios/src/palacios/vmx.c
index 5c11c45..a5bc97f 100644
--- a/palacios/src/palacios/vmx.c
+++ b/palacios/src/palacios/vmx.c
@@ -348,14 +348,14 @@ static int update_vmcs_host_state(struct guest_info * info) {
     addr_t tmp;
 
     struct {
-	uint16 limit;
+	uint16_t limit;
 	addr_t base;
     } __attribute__((packed)) tmp_seg;
 
 
     struct v3_msr tmp_msr;
 
-    __asm__ __volatile__ ( "movq    %%cr0, %1; "		
+    __asm__ __volatile__ ( "movq    %%cr0, %0; "		
 			   : "=q"(tmp)
 			   :
     );
@@ -393,14 +393,14 @@ static int update_vmcs_host_state(struct guest_info * info) {
 		  );
     vmcs_write(HOST_IDTR_BASE, tmp_seg.base);
 
-
+    /* How do we handle this...?
     __asm__ __volatile__ ("str (%0); "
 			  : 
 			  :"q"(&tmp_seg)
 			  : "memory"
 			  );
     vmcs_write(HOST_TR_BASE, tmp_seg.base);
-
+    */
 
 #define FS_BASE_MSR 0xc0000100
 #define GS_BASE_MSR 0xc0000101
@@ -445,7 +445,7 @@ static int update_vmcs_host_state(struct guest_info * info) {
     );
     vmcs_write(VMCS_HOST_GS_SELECTOR, tmp);
 
-    __asm__ __volatile__ ( "movq %%tr, %0; "		
+    __asm__ __volatile__ ( "str %0; "		
 			   : "=q"(tmp)
 			   :
     );
@@ -599,6 +599,9 @@ static int start_vmx_guest(struct guest_info *info) {
         return -1;
     }
 
+
+    update_vmcs_host_state(info);
+
     // Setup guest state
     return -1;
 }