Context-based output infrastructure (V3_Print, etc) and modifications to use it

[palacios.git] / palacios / src / interfaces / vmm_console.c

diff --git a/palacios/src/interfaces/vmm_console.c b/palacios/src/interfaces/vmm_console.c
index 244fbf6..b987f24 100644 (file)
--- a/palacios/src/interfaces/vmm_console.c
+++ b/palacios/src/interfaces/vmm_console.c
@@ -29,58 +29,58 @@
 struct v3_console_hooks * console_hooks = 0;
 
 v3_console_t v3_console_open(struct v3_vm_info * vm, uint32_t width, uint32_t height) {
-    V3_ASSERT(console_hooks != NULL);
-    V3_ASSERT(console_hooks->open != NULL);
+    V3_ASSERT(vm, VCORE_NONE, console_hooks != NULL);
+    V3_ASSERT(vm, VCORE_NONE, console_hooks->open != NULL);
 
     return console_hooks->open(vm->host_priv_data, width, height);
 }
 
 void v3_console_close(v3_console_t cons) {
-    V3_ASSERT(console_hooks);
-    V3_ASSERT(console_hooks->close);
+    V3_ASSERT(VM_NONE, VCORE_NONE, console_hooks);
+    V3_ASSERT(VM_NONE, VCORE_NONE, console_hooks->close);
 
     console_hooks->close(cons);
 }
 
 int v3_console_set_cursor(v3_console_t cons, int x, int y) {
-    V3_ASSERT(console_hooks != NULL);
-    V3_ASSERT(console_hooks->set_cursor != NULL);
+    V3_ASSERT(VM_NONE, VCORE_NONE, console_hooks != NULL);
+    V3_ASSERT(VM_NONE, VCORE_NONE, console_hooks->set_cursor != NULL);
 
     return console_hooks->set_cursor(cons, x, y);
 }
 
 int v3_console_set_char(v3_console_t cons, int x, int y, char c, uint8_t style) {
-    V3_ASSERT(console_hooks != NULL);
-    V3_ASSERT(console_hooks->set_character != NULL);
+    V3_ASSERT(VM_NONE, VCORE_NONE, console_hooks != NULL);
+    V3_ASSERT(VM_NONE, VCORE_NONE, console_hooks->set_character != NULL);
 
     return console_hooks->set_character(cons, x, y, c, style);    
 }
 
     
 int v3_console_scroll(v3_console_t cons, int lines) {
-    V3_ASSERT(console_hooks != NULL);
-    V3_ASSERT(console_hooks->scroll != NULL);
+    V3_ASSERT(VM_NONE, VCORE_NONE, console_hooks != NULL);
+    V3_ASSERT(VM_NONE, VCORE_NONE, console_hooks->scroll != NULL);
     
     return console_hooks->scroll(cons, lines);
 }
 
 int v3_console_set_text_resolution(v3_console_t cons, int cols, int rows) {
-    V3_ASSERT(console_hooks != NULL);
-    V3_ASSERT(console_hooks->set_text_resolution != NULL);
+    V3_ASSERT(VM_NONE, VCORE_NONE, console_hooks != NULL);
+    V3_ASSERT(VM_NONE, VCORE_NONE, console_hooks->set_text_resolution != NULL);
     
     return console_hooks->set_text_resolution(cons, cols, rows);
 }
 
 int v3_console_update(v3_console_t cons) {
-    V3_ASSERT(console_hooks != NULL);
-    V3_ASSERT(console_hooks->update != NULL);
+    V3_ASSERT(VM_NONE, VCORE_NONE, console_hooks != NULL);
+    V3_ASSERT(VM_NONE, VCORE_NONE, console_hooks->update != NULL);
     
     return console_hooks->update(cons);
 }
 
 void V3_Init_Console(struct v3_console_hooks * hooks) {
     console_hooks = hooks;
-    PrintDebug("V3 console inited\n");
+    PrintDebug(VM_NONE, VCORE_NONE, "V3 console inited\n");
 
     return;
 }