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

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

diff --git a/palacios/src/interfaces/vmm_graphics_console.c b/palacios/src/interfaces/vmm_graphics_console.c
index 3857f65..ab6ecd0 100644 (file)
--- a/palacios/src/interfaces/vmm_graphics_console.c
+++ b/palacios/src/interfaces/vmm_graphics_console.c
@@ -30,24 +30,24 @@ v3_graphics_console_t v3_graphics_console_open(struct v3_vm_info * vm,
                                               struct v3_frame_buffer_spec *desired_spec,
                                               struct v3_frame_buffer_spec *actual_spec)
 {                                             
-    V3_ASSERT(graphics_console_hooks != NULL);
-    V3_ASSERT(graphics_console_hooks->open != NULL);
+    V3_ASSERT(vm, VCORE_NONE, graphics_console_hooks != NULL);
+    V3_ASSERT(vm, VCORE_NONE, graphics_console_hooks->open != NULL);
 
     return graphics_console_hooks->open(vm->host_priv_data, desired_spec, actual_spec);
 }
 
 void v3_graphics_console_close(v3_graphics_console_t cons) 
 {
-    V3_ASSERT(graphics_console_hooks);
-    V3_ASSERT(graphics_console_hooks->close);
+    V3_ASSERT(VM_NONE, VCORE_NONE, graphics_console_hooks);
+    V3_ASSERT(VM_NONE, VCORE_NONE, graphics_console_hooks->close);
 
     graphics_console_hooks->close(cons);
 }
 
 void * v3_graphics_console_get_frame_buffer_data_read(v3_graphics_console_t cons, struct v3_frame_buffer_spec *spec) 
 {
-    V3_ASSERT(graphics_console_hooks != NULL);
-    V3_ASSERT(graphics_console_hooks->get_data_read != NULL);
+    V3_ASSERT(VM_NONE, VCORE_NONE, graphics_console_hooks != NULL);
+    V3_ASSERT(VM_NONE, VCORE_NONE, graphics_console_hooks->get_data_read != NULL);
     
     return graphics_console_hooks->get_data_read(cons, spec);
 }
@@ -55,24 +55,24 @@ void * v3_graphics_console_get_frame_buffer_data_read(v3_graphics_console_t cons
 
 void  v3_graphics_console_release_frame_buffer_data_read(v3_graphics_console_t cons)
 {
-    V3_ASSERT(graphics_console_hooks != NULL);
-    V3_ASSERT(graphics_console_hooks->release_data_read != NULL);
+    V3_ASSERT(VM_NONE, VCORE_NONE, graphics_console_hooks != NULL);
+    V3_ASSERT(VM_NONE, VCORE_NONE, graphics_console_hooks->release_data_read != NULL);
     
     return graphics_console_hooks->release_data_read(cons);
 }
 
 void * v3_graphics_console_get_frame_buffer_data_rw(v3_graphics_console_t cons, struct v3_frame_buffer_spec *spec) 
 {
-    V3_ASSERT(graphics_console_hooks != NULL);
-    V3_ASSERT(graphics_console_hooks->get_data_rw != NULL);
+    V3_ASSERT(VM_NONE, VCORE_NONE, graphics_console_hooks != NULL);
+    V3_ASSERT(VM_NONE, VCORE_NONE, graphics_console_hooks->get_data_rw != NULL);
     
     return graphics_console_hooks->get_data_rw(cons, spec);
 }
 
 void v3_graphics_console_release_frame_buffer_data_rw(v3_graphics_console_t cons)
 {
-    V3_ASSERT(graphics_console_hooks != NULL);
-    V3_ASSERT(graphics_console_hooks->release_data_rw != NULL);
+    V3_ASSERT(VM_NONE, VCORE_NONE, graphics_console_hooks != NULL);
+    V3_ASSERT(VM_NONE, VCORE_NONE, graphics_console_hooks->release_data_rw != NULL);
     
     return graphics_console_hooks->release_data_rw(cons);
 }
@@ -80,8 +80,8 @@ void v3_graphics_console_release_frame_buffer_data_rw(v3_graphics_console_t cons
 
 
 int v3_graphics_console_inform_update(v3_graphics_console_t cons) {
-    V3_ASSERT(graphics_console_hooks != NULL);
-    V3_ASSERT(graphics_console_hooks->changed != NULL);
+    V3_ASSERT(VM_NONE, VCORE_NONE, graphics_console_hooks != NULL);
+    V3_ASSERT(VM_NONE, VCORE_NONE, graphics_console_hooks->changed != NULL);
     
     return graphics_console_hooks->changed(cons);
 }
@@ -92,8 +92,8 @@ int   v3_graphics_console_register_render_request(
                                             void *priv_data),
                       void *priv_data)
 {
-  V3_ASSERT(graphics_console_hooks!=NULL);
-  V3_ASSERT(graphics_console_hooks->register_render_request!=NULL);
+  V3_ASSERT(VM_NONE, VCORE_NONE, graphics_console_hooks!=NULL);
+  V3_ASSERT(VM_NONE, VCORE_NONE, graphics_console_hooks->register_render_request!=NULL);
   
   return graphics_console_hooks->register_render_request(cons,render_request,priv_data);
 }
@@ -104,8 +104,8 @@ int   v3_graphics_console_register_update_inquire(
                                             void *priv_data),
                       void *priv_data)
 {
-  V3_ASSERT(graphics_console_hooks!=NULL);
-  V3_ASSERT(graphics_console_hooks->register_update_inquire!=NULL);
+  V3_ASSERT(VM_NONE, VCORE_NONE, graphics_console_hooks!=NULL);
+  V3_ASSERT(VM_NONE, VCORE_NONE, graphics_console_hooks->register_update_inquire!=NULL);
   
   return graphics_console_hooks->register_update_inquire(cons,update_inquire,priv_data);
 }
@@ -113,7 +113,7 @@ int   v3_graphics_console_register_update_inquire(
 
 void V3_Init_Graphics_Console(struct v3_graphics_console_hooks * hooks) {
     graphics_console_hooks = hooks;
-    PrintDebug("V3 graphics console inited\n");
+    PrintDebug(VM_NONE, VCORE_NONE, "V3 graphics console inited\n");
 
     return;
 }