X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fcga.c;h=79978189269f99972398ca6a3c07b7553ae527ad;hb=ef9b4151c09c67502de3720b8fb8f42c10edd073;hp=7dd2bdd44fb204e473bf380e1622317de14074e8;hpb=5b1f618cf74dbcd7e490fa3fe4da5a4c53d79b5d;p=palacios-OLD.git

diff --git a/palacios/src/devices/cga.c b/palacios/src/devices/cga.c
index 7dd2bdd..7997818 100644
--- a/palacios/src/devices/cga.c
+++ b/palacios/src/devices/cga.c
@@ -31,12 +31,12 @@
 #include <devices/console.h>
 
 
-#if CONFIG_DEBUG_CGA >= 2
+#if V3_CONFIG_DEBUG_CGA >= 2
 #define PrintVerbose PrintDebug
 #else
 #define PrintVerbose(fmt, args...)
 #endif
-#ifndef CONFIG_DEBUG_CGA
+#if V3_CONFIG_DEBUG_CGA == 0
 #undef PrintDebug
 #define PrintDebug(fmt, args...)
 #endif
@@ -443,7 +443,7 @@ static void passthrough_out(uint16_t port, const void * src, uint_t length) {
     }
 }
 
-#if CONFIG_DEBUG_CGA >= 2
+#if V3_CONFIG_DEBUG_CGA >= 2
 static unsigned long get_value(const void *ptr, int len) {
   unsigned long value = 0;
 
@@ -1153,12 +1153,14 @@ static int cga_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
 	PrintDebug("Enabling CGA Passthrough\n");
 	if (v3_hook_write_mem(vm, V3_MEM_CORE_ANY, START_ADDR, END_ADDR, 
 			      START_ADDR, &video_write_mem, dev) == -1) {
-	    PrintDebug("\n\nVideo Hook failed.\n\n");
+	    PrintError("\n\nVideo Hook failed.\n\n");
+	    return -1;
 	}
     } else {
 	if (v3_hook_write_mem(vm, V3_MEM_CORE_ANY, START_ADDR, END_ADDR, 
 			      video_state->framebuf_pa, &video_write_mem, dev) == -1) {
-	    PrintDebug("\n\nVideo Hook failed.\n\n");
+	    PrintError("\n\nVideo Hook failed.\n\n");
+	    return -1;
 	}
     }