From 850f15a69626f43bf39671171bb929ec1f472ebe Mon Sep 17 00:00:00 2001 From: Antti Kantee Date: Mon, 4 May 2015 19:08:22 +0200 Subject: [PATCH] initialize xen printf at the start of bootstrap --- platform/xen/xen/console/console.c | 3 +-- platform/xen/xen/include/mini-os/console.h | 1 + platform/xen/xen/kernel.c | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/platform/xen/xen/console/console.c b/platform/xen/xen/console/console.c index ffacda5..a5b3760 100644 --- a/platform/xen/xen/console/console.c +++ b/platform/xen/xen/console/console.c @@ -143,7 +143,7 @@ void print(int direct, const char *fmt, va_list args) } /* XXX: should use a putc/flush combo ... later */ -static void minios_putc(int c) +void minios_putc(int c) { minios_printk("%c", c); @@ -166,7 +166,6 @@ void xprintk(const char *fmt, ...) } void init_console(void) { - bmk_printf_init(minios_putc, NULL); minios_printk("Initialising console ... "); xencons_ring_init(); console_initialised = 1; diff --git a/platform/xen/xen/include/mini-os/console.h b/platform/xen/xen/include/mini-os/console.h index efb633c..d67b5e2 100644 --- a/platform/xen/xen/include/mini-os/console.h +++ b/platform/xen/xen/include/mini-os/console.h @@ -64,6 +64,7 @@ struct consfront_dev { void print(int direct, const char *fmt, va_list args); void minios_printk(const char *fmt, ...); +void minios_putc(int); void xprintk(const char *fmt, ...); void panic(const char *fmt, ...); diff --git a/platform/xen/xen/kernel.c b/platform/xen/xen/kernel.c index 3ad7d03..b65738b 100644 --- a/platform/xen/xen/kernel.c +++ b/platform/xen/xen/kernel.c @@ -44,6 +44,7 @@ #include #include +#include uint8_t _minios_xen_features[XENFEAT_NR_SUBMAPS * 32]; @@ -129,6 +130,7 @@ bmk_platform_splx(unsigned long x) void _minios_start_kernel(start_info_t *si) { + bmk_printf_init(minios_putc, NULL); bmk_core_init(STACK_SIZE_PAGE_ORDER, PAGE_SIZE); arch_init(si); -- 2.39.5