X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fos_debug.c;h=f27dca31322da1d5a0381ed7b94f1b80960cd95e;hb=60ad6a41c6d0ee08ed689e8505eb0c3df0c2a289;hp=f821415696780efb494578813dc93f9d10ef3d14;hpb=5d1bbcc86de011e3f0d115b6f10fd8645cdf855e;p=palacios.git

diff --git a/palacios/src/devices/os_debug.c b/palacios/src/devices/os_debug.c
index f821415..f27dca3 100644
--- a/palacios/src/devices/os_debug.c
+++ b/palacios/src/devices/os_debug.c
@@ -26,6 +26,7 @@
 #define BUF_SIZE 1024
 
 #define DEBUG_PORT1 0xc0c0
+#define HEARTBEAT_PORT 0x99
 
 struct debug_state {
     char debug_buf[BUF_SIZE];
@@ -40,7 +41,7 @@ static int handle_gen_write(struct guest_info * core, ushort_t port, void * src,
     state->debug_buf[state->debug_offset++] = *(char*)src;
 
     if ((*(char*)src == 0xa) ||  (state->debug_offset == (BUF_SIZE - 1))) {
-	PrintDebug("VM_CONSOLE>%s", state->debug_buf);
+	PrintDebug(core->vm_info, core, "VM_CONSOLE>%s", state->debug_buf);
 	memset(state->debug_buf, 0, BUF_SIZE);
 	state->debug_offset = 0;
     }
@@ -48,6 +49,22 @@ static int handle_gen_write(struct guest_info * core, ushort_t port, void * src,
     return length;
 }
 
+static int handle_hb_write(struct guest_info * core, ushort_t port, void * src, uint_t length, void * priv_data) {
+    uint32_t val = 0;
+
+    if (length == 1) {
+	val = *(uint8_t *)src;
+    } else if (length == 2) {
+	val = *(uint16_t *)src;
+    } else {
+	val = *(uint32_t *)src;
+    }
+
+    V3_Print(core->vm_info, core, "HEARTBEAT> %x (%d)\n", val, val);
+
+    return length;
+}
+
 static int handle_hcall(struct guest_info * info, uint_t hcall_id, void * priv_data) {
     struct debug_state * state = (struct debug_state *)priv_data;
 
@@ -56,25 +73,25 @@ static int handle_hcall(struct guest_info * info, uint_t hcall_id, void * priv_d
     int buf_is_va = info->vm_regs.rdx;
 
     if (msg_len >= BUF_SIZE) {
-	PrintError("Console message too large for buffer (len=%d)\n", msg_len);
+	PrintError(info->vm_info, info, "Console message too large for buffer (len=%d)\n", msg_len);
 	return -1;
     }
 
     if (buf_is_va == 1) {
 	if (v3_read_gva_memory(info, msg_gpa, msg_len, (uchar_t *)state->debug_buf) != msg_len) {
-	    PrintError("Could not read debug message\n");
+	    PrintError(info->vm_info, info, "Could not read debug message\n");
 	    return -1;
 	}
     } else {
 	if (v3_read_gpa_memory(info, msg_gpa, msg_len, (uchar_t *)state->debug_buf) != msg_len) {
-	    PrintError("Could not read debug message\n");
+	    PrintError(info->vm_info, info, "Could not read debug message\n");
 	    return -1;
 	}
     }	
 
     state->debug_buf[msg_len] = 0;
 
-    PrintDebug("VM_CONSOLE>%s\n", state->debug_buf);
+    PrintDebug(info->vm_info, info, "VM_CONSOLE>%s\n", state->debug_buf);
 
     return 0;
 }
@@ -93,20 +110,29 @@ static int debug_free(struct debug_state * state) {
 static int debug_save(struct v3_chkpt_ctx * ctx, void * private_data) {
     struct debug_state * dbg = (struct debug_state *)private_data;
     
-    V3_CHKPT_STD_SAVE(ctx, dbg->debug_buf);
-    V3_CHKPT_STD_SAVE(ctx, dbg->debug_offset);
+    V3_CHKPT_SAVE_AUTOTAG(ctx, dbg->debug_buf, savefailout);
+    V3_CHKPT_SAVE_AUTOTAG(ctx, dbg->debug_offset, savefailout);
     
     return 0;
+
+ savefailout:
+    PrintError(VM_NONE,VCORE_NONE, "Failed to save debug\n");
+    return -1;
+
 }
 
 
 static int debug_load(struct v3_chkpt_ctx * ctx, void * private_data) {
     struct debug_state * dbg = (struct debug_state *)private_data;
     
-    V3_CHKPT_STD_LOAD(ctx, dbg->debug_buf);
-    V3_CHKPT_STD_LOAD(ctx, dbg->debug_offset);
+    V3_CHKPT_LOAD_AUTOTAG(ctx, dbg->debug_buf,loadfailout);
+    V3_CHKPT_LOAD_AUTOTAG(ctx, dbg->debug_offset,loadfailout);
     
     return 0;
+
+ loadfailout:
+    PrintError(VM_NONE, VCORE_NONE, "Failed to load debug\n");
+    return -1;
 }
 
 #endif
@@ -130,18 +156,30 @@ static int debug_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
 
     state = (struct debug_state *)V3_Malloc(sizeof(struct debug_state));
 
-    PrintDebug("Creating OS Debug Device\n");
+    if (!state) {
+	PrintError(vm, VCORE_NONE, "Cannot allocate in init\n");
+	return -1;
+    }
+
+    PrintDebug(vm, VCORE_NONE, "Creating OS Debug Device\n");
 
     struct vm_device * dev = v3_add_device(vm, dev_id, &dev_ops, state);
 
     if (dev == NULL) {
-	PrintError("Could not attach device %s\n", dev_id);
+	PrintError(vm, VCORE_NONE, "Could not attach device %s\n", dev_id);
 	V3_Free(state);
 	return -1;
     }
 
     if (v3_dev_hook_io(dev, DEBUG_PORT1,  NULL, &handle_gen_write) == -1) {
-	PrintError("Error hooking OS debug IO port\n");
+	PrintError(vm, VCORE_NONE, "Error hooking OS debug IO port\n");
+	v3_remove_device(dev);
+	return -1;
+    }
+
+
+    if (v3_dev_hook_io(dev, HEARTBEAT_PORT, NULL, &handle_hb_write) == -1) {
+	PrintError(vm, VCORE_NONE, "error hooking OS heartbeat port\n");
 	v3_remove_device(dev);
 	return -1;
     }