@@ -180,6 +180,9 @@ CONFIG_XENBUS ?= y
CONFIG_XC ?=y
CONFIG_LWIP ?= $(lwip)
CONFIG_BALLOON ?= n
+# Setting CONFIG_USE_XEN_CONSOLE copies all print output to the Xen emergency
+# console apart of standard dom0 handled console.
+CONFIG_USE_XEN_CONSOLE ?= n
# Export config items as compiler directives
DEFINES-$(CONFIG_PARAVIRT) += -DCONFIG_PARAVIRT
@@ -197,6 +200,7 @@ DEFINES-$(CONFIG_FBFRONT) += -DCONFIG_FBFRONT
DEFINES-$(CONFIG_CONSFRONT) += -DCONFIG_CONSFRONT
DEFINES-$(CONFIG_XENBUS) += -DCONFIG_XENBUS
DEFINES-$(CONFIG_BALLOON) += -DCONFIG_BALLOON
+DEFINES-$(CONFIG_USE_XEN_CONSOLE) += -DCONFIG_USE_XEN_CONSOLE
DEFINES-y += -D__XEN_INTERFACE_VERSION__=$(XEN_INTERFACE_VERSION)
@@ -16,3 +16,4 @@ CONFIG_XENBUS = n
CONFIG_XC = n
CONFIG_LWIP = n
CONFIG_BALLOON = n
+CONFIG_USE_XEN_CONSOLE = n
@@ -17,3 +17,4 @@ CONFIG_XC = y
# LWIP is special: it needs support from outside
CONFIG_LWIP = n
CONFIG_BALLOON = y
+CONFIG_USE_XEN_CONSOLE = y
@@ -17,4 +17,5 @@ CONFIG_XC = y
# LWIP is special: it needs support from outside
CONFIG_LWIP = n
CONFIG_BALLOON = y
+CONFIG_USE_XEN_CONSOLE = y
XEN_INTERFACE_VERSION=__XEN_LATEST_INTERFACE_VERSION__
@@ -45,11 +45,6 @@
#include <xen/io/console.h>
-/* Copies all print output to the Xen emergency console apart
- of standard dom0 handled console */
-#define USE_XEN_CONSOLE
-
-
/* If console not initialised the printk will be sent to xen serial line
NOTE: you need to enable verbose in xen/Rules.mk for it to work. */
static int console_initialised = 0;
@@ -135,7 +130,7 @@ void print(int direct, const char *fmt, va_list args)
(void)HYPERVISOR_console_io(CONSOLEIO_write, strlen(buf), buf);
return;
} else {
-#ifndef USE_XEN_CONSOLE
+#ifndef CONFIG_USE_XEN_CONSOLE
if(!console_initialised)
#endif
(void)HYPERVISOR_console_io(CONSOLEIO_write, strlen(buf), buf);