diff options
| author | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2006-03-24 10:47:48 +0100 |
|---|---|---|
| committer | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2006-03-24 10:47:48 +0100 |
| commit | c7b965a01c79f34586562d1e2b8eda2c00449bb2 (patch) | |
| tree | 9ed2a204c58fa4de41a0da4adb14d30a4ef7832f /extras/mini-os/console | |
| parent | 2acf021310aea3b5b45a82ba0c928cfe6738495a (diff) | |
| download | xen-c7b965a01c79f34586562d1e2b8eda2c00449bb2.tar.gz xen-c7b965a01c79f34586562d1e2b8eda2c00449bb2.tar.bz2 xen-c7b965a01c79f34586562d1e2b8eda2c00449bb2.zip | |
Fix mini-os xenbus.
From: Grzegorz Milos <gm281@cam.ac.uk>
Signed-off-by: Keir Fraser <keir@xensource.com>
Diffstat (limited to 'extras/mini-os/console')
| -rw-r--r-- | extras/mini-os/console/console.c | 10 | ||||
| -rw-r--r-- | extras/mini-os/console/xencons_ring.c | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/extras/mini-os/console/console.c b/extras/mini-os/console/console.c index c9ec60af8f..377fcee4df 100644 --- a/extras/mini-os/console/console.c +++ b/extras/mini-os/console/console.c @@ -116,12 +116,12 @@ void print(int direct, const char *fmt, va_list args) { (void)HYPERVISOR_console_io(CONSOLEIO_write, strlen(buf), buf); return; - } - - if(!console_initialised) - (void)HYPERVISOR_console_io(CONSOLEIO_write, strlen(buf), buf); + } else { + if(!console_initialised) + (void)HYPERVISOR_console_io(CONSOLEIO_write, strlen(buf), buf); - console_print(buf, strlen(buf)); + console_print(buf, strlen(buf)); + } } void printk(const char *fmt, ...) diff --git a/extras/mini-os/console/xencons_ring.c b/extras/mini-os/console/xencons_ring.c index da2fbac5bc..ff1bf519df 100644 --- a/extras/mini-os/console/xencons_ring.c +++ b/extras/mini-os/console/xencons_ring.c @@ -10,7 +10,6 @@ /* TODO - need to define BUG_ON for whole mini-os, need crash-dump as well */ -extern void do_exit(void); #define BUG_ON(_cond) do{if(_cond) do_exit();} while(0); static inline struct xencons_interface *xencons_interface(void) @@ -29,7 +28,6 @@ int xencons_ring_send_no_notify(const char *data, unsigned len) int sent = 0; struct xencons_interface *intf = xencons_interface(); XENCONS_RING_IDX cons, prod; - cons = intf->out_cons; prod = intf->out_prod; mb(); |