*/
-#include <devices/os_debug.h>
+
#include <palacios/vmm.h>
+#include <palacios/vmm_dev_mgr.h>
+#include <palacios/vm_guest_mem.h>
#define BUF_SIZE 1024
#define DEBUG_PORT1 0xc0c0
-
struct debug_state {
char debug_buf[BUF_SIZE];
uint_t debug_offset;
};
-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;
return length;
}
-
-static int debug_init(struct vm_device * dev) {
+static int handle_hcall(struct guest_info * info, uint_t hcall_id, void * priv_data) {
+ struct vm_device * dev = (struct vm_device *)priv_data;
struct debug_state * state = (struct debug_state *)dev->private_data;
- v3_dev_hook_io(dev, DEBUG_PORT1, NULL, &handle_gen_write);
+ int msg_len = info->vm_regs.rcx;
+ addr_t msg_gpa = info->vm_regs.rbx;
+ 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);
+ 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");
+ 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");
+ return -1;
+ }
+ }
+
+ state->debug_buf[msg_len] = 0;
+
+ PrintDebug("VM_CONSOLE>%s\n", state->debug_buf);
- state->debug_offset = 0;
- memset(state->debug_buf, 0, BUF_SIZE);
-
return 0;
}
-static int debug_deinit(struct vm_device * dev) {
+
+
+static int debug_free(struct vm_device * dev) {
v3_dev_unhook_io(dev, DEBUG_PORT1);
-static struct vm_device_ops dev_ops = {
- .init = debug_init,
- .deinit = debug_deinit,
+static struct v3_device_ops dev_ops = {
+ .free = debug_free,
.reset = NULL,
.start = NULL,
.stop = NULL,
};
-struct vm_device * v3_create_os_debug() {
+
+
+static int debug_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
struct debug_state * state = NULL;
+ char * dev_id = v3_cfg_val(cfg, "ID");
state = (struct debug_state *)V3_Malloc(sizeof(struct debug_state));
PrintDebug("Creating OS Debug Device\n");
- struct vm_device * device = v3_create_device("OS Debug", &dev_ops, state);
+
+ struct vm_device * dev = v3_allocate_device(dev_id, &dev_ops, state);
+ if (v3_attach_device(vm, dev) == -1) {
+ PrintError("Could not attach device %s\n", dev_id);
+ return -1;
+ }
+
+ v3_dev_hook_io(dev, DEBUG_PORT1, NULL, &handle_gen_write);
+ v3_register_hypercall(vm, OS_DEBUG_HCALL, handle_hcall, dev);
- return device;
+ state->debug_offset = 0;
+ memset(state->debug_buf, 0, BUF_SIZE);
+
+ return 0;
}
+
+
+device_register("OS_DEBUG", debug_init)