X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fbochs_debug.c;h=7f2f3ba9440c3c250be406580162986c2ed5365a;hb=60ad6a41c6d0ee08ed689e8505eb0c3df0c2a289;hp=339999de341c695b85288e05761df56f83f9d409;hpb=6d6988cc9c8bac21d96afd800076afe0915cf2cd;p=palacios.git

diff --git a/palacios/src/devices/bochs_debug.c b/palacios/src/devices/bochs_debug.c
index 339999d..7f2f3ba 100644
--- a/palacios/src/devices/bochs_debug.c
+++ b/palacios/src/devices/bochs_debug.c
@@ -22,6 +22,7 @@
 #include <palacios/vmm.h>
 #include <palacios/vmm_dev_mgr.h>
 #include <palacios/vmm_io.h>
+#include <palacios/vm_guest.h>
 
 #define BUF_SIZE 1024
 
@@ -50,7 +51,7 @@ static int handle_info_write(struct guest_info * core, ushort_t port, void * src
     state->info_buf[state->info_offset++] = *(char*)src;
 
     if ((*(char*)src == 0xa) ||  (state->info_offset == (BUF_SIZE - 1))) {
-	PrintDebug("BOCHSINFO>%s", state->info_buf);
+	PrintDebug(core->vm_info, core, "BIOSINFO>%s", state->info_buf);
 	memset(state->info_buf, 0, BUF_SIZE);
 	state->info_offset = 0;
     }
@@ -65,7 +66,7 @@ static int handle_debug_write(struct guest_info * core, ushort_t port, void * sr
     state->debug_buf[state->debug_offset++] = *(char*)src;
 
     if ((*(char*)src == 0xa) ||  (state->debug_offset == (BUF_SIZE - 1))) {
-	PrintDebug("BOCHSDEBUG>%s", state->debug_buf);
+	PrintDebug(core->vm_info, core, "BIOSDEBUG>%s", state->debug_buf);
 	memset(state->debug_buf, 0, BUF_SIZE);
 	state->debug_offset = 0;
     }
@@ -80,7 +81,7 @@ static int handle_console_write(struct guest_info * core, ushort_t port, void *
     state->cons_buf[state->cons_offset++] = *(char *)src;
 
     if ((*(char *)src == 0xa) ||  (state->cons_offset == (BUF_SIZE - 1))) {
-	V3_Print("BOCHSCONSOLE>%s", state->cons_buf);
+	V3_Print(core->vm_info, core, "BIOSCONSOLE>%s", state->cons_buf);
 	memset(state->cons_buf, 0, BUF_SIZE);
 	state->cons_offset = 0;
     }
@@ -93,16 +94,16 @@ static int handle_gen_write(struct guest_info * core, ushort_t port, void * src,
     
     switch (length) {
 	case 1:
-	    PrintDebug(">0x%.2x\n", *(uchar_t*)src);
+	    PrintDebug(core->vm_info, core, ">0x%.2x\n", *(uchar_t*)src);
 	    break;
 	case 2:
-	    PrintDebug(">0x%.4x\n", *(ushort_t*)src);
+	    PrintDebug(core->vm_info, core, ">0x%.4x\n", *(ushort_t*)src);
 	    break;
 	case 4:
-	    PrintDebug(">0x%.8x\n", *(uint_t*)src);
+	    PrintDebug(core->vm_info, core, ">0x%.8x\n", *(uint_t*)src);
 	    break;
 	default:
-	    PrintError("Invalid length in handle_gen_write\n");
+	    PrintError(core->vm_info, core, "Invalid length in handle_gen_write\n");
 	    return -1;
 	    break;
     }
@@ -138,15 +139,15 @@ static int debug_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     state = (struct debug_state *)V3_Malloc(sizeof(struct debug_state));
 
     if (state == NULL) {
-	PrintError("Could not allocate bochs debug state\n");
+	PrintError(vm, VCORE_NONE, "Could not allocate bochs debug state\n");
 	return -1;
     }
 
-    PrintDebug("Creating Bochs Debug Device\n");
+    PrintDebug(vm, VCORE_NONE, "Creating Bochs 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;
     }
@@ -166,7 +167,7 @@ static int debug_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     ret |= v3_dev_hook_io(dev, BOCHS_CONSOLE_PORT, NULL, &handle_console_write);
     
     if (ret != 0) {
-	PrintError("Could not hook Bochs Debug IO Ports\n");
+	PrintError(vm, VCORE_NONE, "Could not hook Bochs Debug IO Ports\n");
 	v3_remove_device(dev);
 	return -1;
     }