ia64/xen-unstable

changeset 2913:79d8674c230f

bitkeeper revision 1.1159.1.390 (418ea00dKzy4t1zq4CRkHKJwX2Ruxw)

Merge freefall.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-2.0-testing.bk
into freefall.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-unstable.bk
author kaf24@freefall.cl.cam.ac.uk
date Sun Nov 07 22:22:05 2004 +0000 (2004-11-07)
parents c3682eb26b1b 1c0b0d49f291
children 2a69594a92dc
files xen/arch/x86/domain.c xen/common/kernel.c
line diff
     1.1 --- a/xen/arch/x86/domain.c	Sat Nov 06 14:19:45 2004 +0000
     1.2 +++ b/xen/arch/x86/domain.c	Sun Nov 07 22:22:05 2004 +0000
     1.3 @@ -895,9 +895,6 @@ int construct_dom0(struct domain *p,
     1.4              l2start[i] = mk_l2_pgentry(0);
     1.5      zap_low_mappings(); /* Do the same for the idle page tables. */
     1.6      
     1.7 -    /* Give up the VGA console if DOM0 is configured to grab it. */
     1.8 -    console_endboot(cmdline && strstr(cmdline, "tty0"));
     1.9 -
    1.10      /* DOM0 gets access to everything. */
    1.11      physdev_init_dom0(p);
    1.12  
     2.1 --- a/xen/common/kernel.c	Sat Nov 06 14:19:45 2004 +0000
     2.2 +++ b/xen/common/kernel.c	Sun Nov 07 22:22:05 2004 +0000
     2.3 @@ -349,6 +349,9 @@ void cmain(multiboot_info_t *mbi)
     2.4  
     2.5      init_trace_bufs();
     2.6  
     2.7 +    /* Give up the VGA console if DOM0 is configured to grab it. */
     2.8 +    console_endboot(cmdline && strstr(cmdline, "tty0"));
     2.9 +
    2.10      domain_unpause_by_systemcontroller(current);
    2.11      domain_unpause_by_systemcontroller(dom0);
    2.12      startup_cpu_idle_loop();