consolidated hypercall numbers\030

[palacios.git] / palacios / src / devices / os_debug.c

diff --git a/palacios/src/devices/os_debug.c b/palacios/src/devices/os_debug.c
index a51dc19..53346a2 100644 (file)
--- a/palacios/src/devices/os_debug.c
+++ b/palacios/src/devices/os_debug.c
@@ -26,7 +26,6 @@
 #define BUF_SIZE 1024
 
 #define DEBUG_PORT1 0xc0c0
-#define DEBUG_HCALL 0xc0c0
 
 struct debug_state {
     char debug_buf[BUF_SIZE];
@@ -35,7 +34,7 @@ struct debug_state {
 };
 
 
-static int handle_gen_write(ushort_t port, void * src, uint_t length, struct vm_device * dev) {
+static int handle_gen_write(struct guest_info * core, ushort_t port, void * src, uint_t length, struct vm_device * dev) {
     struct debug_state * state = (struct debug_state *)dev->private_data;
 
     state->debug_buf[state->debug_offset++] = *(char*)src;
@@ -103,7 +102,7 @@ static struct v3_device_ops dev_ops = {
 
 
 
-static int debug_init(struct guest_info * vm, v3_cfg_tree_t * cfg) {
+static int debug_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     struct debug_state * state = NULL;
     char * name = v3_cfg_val(cfg, "name");
 
@@ -120,7 +119,7 @@ static int debug_init(struct guest_info * vm, v3_cfg_tree_t * cfg) {
     }
 
     v3_dev_hook_io(dev, DEBUG_PORT1,  NULL, &handle_gen_write);
-    v3_register_hypercall(vm, DEBUG_HCALL, handle_hcall, dev);
+    v3_register_hypercall(vm, OS_DEBUG_HCALL, handle_hcall, dev);
 
     state->debug_offset = 0;
     memset(state->debug_buf, 0, BUF_SIZE);