From 2dcac0c2263ee391c2e8cb700353a167181a51b9 Mon Sep 17 00:00:00 2001 From: "kaf24@scramble.cl.cam.ac.uk" Date: Fri, 12 Mar 2004 13:36:55 +0000 Subject: bitkeeper revision 1.781.1.1 (4051bcf71wSVHdhOOqsU19dm2FSXDQ) physdev.c, xc_physdev.c: new file Many files: First half of Rolf's IO-virtualisation patch. --- xenolinux-2.4.25-sparse/arch/xeno/drivers/console/console.c | 4 ++-- xenolinux-2.4.25-sparse/include/asm-xeno/hypervisor.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'xenolinux-2.4.25-sparse') diff --git a/xenolinux-2.4.25-sparse/arch/xeno/drivers/console/console.c b/xenolinux-2.4.25-sparse/arch/xeno/drivers/console/console.c index f0c475200d..2e18d72854 100644 --- a/xenolinux-2.4.25-sparse/arch/xeno/drivers/console/console.c +++ b/xenolinux-2.4.25-sparse/arch/xeno/drivers/console/console.c @@ -79,7 +79,7 @@ static void priv_conwrite(const char *s, unsigned int count) while ( count > 0 ) { - if ( (rc = HYPERVISOR_serial_io(SERIALIO_write, count, s)) > 0 ) + if ( (rc = HYPERVISOR_console_io(CONSOLEIO_write, count, s)) > 0 ) { count -= rc; s += rc; @@ -174,7 +174,7 @@ static void __do_console_io(void) if ( start_info.flags & SIF_INITDOMAIN ) { /* Receive work. */ - while ( (len = HYPERVISOR_serial_io(SERIALIO_read, 16, rbuf)) > 0 ) + while ( (len = HYPERVISOR_console_io(CONSOLEIO_read, 16, rbuf)) > 0 ) for ( i = 0; i < len; i++ ) tty_insert_flip_char(xeno_console_tty, rbuf[i], 0); if ( xeno_console_tty->flip.count != 0 ) diff --git a/xenolinux-2.4.25-sparse/include/asm-xeno/hypervisor.h b/xenolinux-2.4.25-sparse/include/asm-xeno/hypervisor.h index c6959e107b..8a25957722 100644 --- a/xenolinux-2.4.25-sparse/include/asm-xeno/hypervisor.h +++ b/xenolinux-2.4.25-sparse/include/asm-xeno/hypervisor.h @@ -440,12 +440,12 @@ static inline int HYPERVISOR_xen_version(int cmd) return ret; } -static inline int HYPERVISOR_serial_io(int cmd, int count, char *str) +static inline int HYPERVISOR_console_io(int cmd, int count, char *str) { int ret; __asm__ __volatile__ ( TRAP_INSTR - : "=a" (ret) : "0" (__HYPERVISOR_serial_io), + : "=a" (ret) : "0" (__HYPERVISOR_console_io), "b" (cmd), "c" (count), "d" (str) : "memory" ); return ret; -- cgit v1.2.3