From: Peter Dinda <pdinda@northwestern.edu>
Date: Wed, 19 May 2010 16:14:41 +0000 (-0500)
Subject: Fixed minor compilation problems
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=afed1e7a0d44d1fd59816e1ccf9563caceee0fcc;p=palacios.git

Fixed minor compilation problems
Moved to v3_get_mem_region() from v3_get_shadow_region() where these were still using the old function
---

diff --git a/palacios/include/palacios/vmm.h b/palacios/include/palacios/vmm.h
index b10795c..1ef6cb1 100644
--- a/palacios/include/palacios/vmm.h
+++ b/palacios/include/palacios/vmm.h
@@ -141,7 +141,7 @@ struct guest_info;
 
 #define V3_CREATE_THREAD(fn, arg, name)				\
     do {							\
-	extern struct v3_os_hooks * os_hooks;			\ 
+	extern struct v3_os_hooks * os_hooks;			\
 	if ((os_hooks) && (os_hooks)->start_kernel_thread) {	\
 	    (os_hooks)->start_kernel_thread(fn, arg, name);	\
 	}							\
diff --git a/palacios/src/devices/apic.c b/palacios/src/devices/apic.c
index 7aea038..6fceccf 100644
--- a/palacios/src/devices/apic.c
+++ b/palacios/src/devices/apic.c
@@ -258,7 +258,7 @@ static int write_apic_msr(struct guest_info * core, uint_t msr, v3_msr_t src, vo
     struct vm_device * dev = (struct vm_device *)priv_data;
     struct apic_state * apics = (struct apic_state *)(dev->private_data);
     struct apic_state * apic = &(apics[core->cpu_id]);
-    struct v3_shadow_region * old_reg = v3_get_shadow_region(dev->vm, core->cpu_id, apic->base_addr);
+    struct v3_mem_region * old_reg = v3_get_mem_region(dev->vm, core->cpu_id, apic->base_addr);
 
 
     if (old_reg == NULL) {
@@ -269,7 +269,7 @@ static int write_apic_msr(struct guest_info * core, uint_t msr, v3_msr_t src, vo
     
     v3_lock(apic->lock);
 
-    v3_delete_shadow_region(dev->vm, old_reg);
+    v3_delete_mem_region(dev->vm, old_reg);
 
     apic->base_addr = src.value;
 
diff --git a/palacios/src/palacios/mmu/vmm_shdw_pg_kvm_64.h b/palacios/src/palacios/mmu/vmm_shdw_pg_kvm_64.h
index 16db158..c369418 100644
--- a/palacios/src/palacios/mmu/vmm_shdw_pg_kvm_64.h
+++ b/palacios/src/palacios/mmu/vmm_shdw_pg_kvm_64.h
@@ -551,7 +551,7 @@ static int handle_pte_shadow_pagefault_64(struct guest_info * core, addr_t fault
 
     PrintDebug("Handling PTE fault\n");
 
-    struct v3_shadow_region * shdw_reg =  v3_get_shadow_region(core->vm_info, core->cpu_id, guest_pa);
+    struct v3_mem_region * shdw_reg =  v3_get_mem_region(core->vm_info, core->cpu_id, guest_pa);
 
 
 
@@ -739,7 +739,7 @@ static int handle_2MB_shadow_pagefault_64(struct guest_info * core,
     PrintDebug("Handling 2MB fault (guest_fault_pa=%p) (error_code=%x)\n", (void *)guest_fault_pa, *(uint_t*)&error_code);
     PrintDebug("ShadowPT=%p, LargeGuestPDE=%p\n", shadow_pt, large_guest_pde);
 
-    struct v3_shadow_region * shdw_reg = v3_get_shadow_region(core->vm_info, core->cpu_id, guest_fault_pa);
+    struct v3_mem_region * shdw_reg = v3_get_mem_region(core->vm_info, core->cpu_id, guest_fault_pa);
 
     int fixed = 0;
     int write_pt = 0;