From: Jack Lange <jarusl@cs.northwestern.edu>
Date: Thu, 4 Feb 2010 01:17:31 +0000 (-0600)
Subject: symswal telemetry fixes
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=b8e77690b473b3ac50c5fef0a32d1710a2e8a1d9;p=palacios.git

symswal telemetry fixes
---

diff --git a/palacios/src/devices/sym_swap.c b/palacios/src/devices/sym_swap.c
index ac0f0c9..85936d0 100644
--- a/palacios/src/devices/sym_swap.c
+++ b/palacios/src/devices/sym_swap.c
@@ -254,7 +254,7 @@ static struct v3_device_ops dev_ops = {
 
 
 #ifdef CONFIG_SYMBIOTIC_SWAP_TELEMETRY
-static void telemetry_cb(struct guest_info * info, void * private_data, char * hdr) {
+static void telemetry_cb(struct v3_vm_info * vm, void * private_data, char * hdr) {
     struct vm_device * dev = (struct vm_device *)private_data;
     struct swap_state * swap = (struct swap_state *)(dev->private_data);
 
diff --git a/palacios/src/devices/sym_swap2.c b/palacios/src/devices/sym_swap2.c
index bb2fd3d..0fbc53b 100644
--- a/palacios/src/devices/sym_swap2.c
+++ b/palacios/src/devices/sym_swap2.c
@@ -507,7 +507,7 @@ static struct v3_device_ops dev_ops = {
 
 
 #ifdef CONFIG_SYMBIOTIC_SWAP_TELEMETRY
-static void telemetry_cb(struct guest_info * info, void * private_data, char * hdr) {
+static void telemetry_cb(struct v3_vm_info * vm, void * private_data, char * hdr) {
     struct swap_state * swap = (struct swap_state *)private_data;
 
     V3_Print("%sSwap Device:\n", hdr);
diff --git a/palacios/src/palacios/vmm_sym_swap.c b/palacios/src/palacios/vmm_sym_swap.c
index 3cbc5c3..72a8b43 100644
--- a/palacios/src/palacios/vmm_sym_swap.c
+++ b/palacios/src/palacios/vmm_sym_swap.c
@@ -70,8 +70,8 @@ static inline uint32_t get_dev_index(pte32_t * pte) {
 
 
 #ifdef CONFIG_SYMBIOTIC_SWAP_TELEMETRY
-static void telemetry_cb(struct guest_info * info, void * private_data, char * hdr) {
-    struct v3_sym_swap_state * swap_state = &(info->vm_info->swap_state);
+static void telemetry_cb(struct v3_vm_info * vm, void * private_data, char * hdr) {
+    struct v3_sym_swap_state * swap_state = &(vm->swap_state);
 
     V3_Print("%sSymbiotic Swap:\n", hdr);
     V3_Print("%s\tRead faults=%d\n", hdr, swap_state->read_faults);
@@ -90,7 +90,7 @@ int v3_init_sym_swap(struct v3_vm_info * vm) {
     swap_state->shdw_ptr_ht = v3_create_htable(0, swap_hash_fn, swap_eq_fn);
 
 #ifdef CONFIG_SYMBIOTIC_SWAP_TELEMETRY
-    if (info->enable_telemetry) {
+    if (vm->enable_telemetry) {
 	v3_add_telemetry_cb(vm, telemetry_cb, NULL);
     }
 #endif
@@ -251,7 +251,7 @@ addr_t v3_map_swp_page(struct v3_vm_info * vm, pte32_t * shadow_pte, pte32_t * g
     if (shdw_ptr == NULL) {
 	PrintError("MEMORY LEAK\n");
 #ifdef CONFIG_SYMBIOTIC_SWAP_TELEMETRY
-	telemetry_cb(info, NULL, "");
+	telemetry_cb(vm, NULL, "");
 #endif
 	return 0;
     }