ia64/xen-unstable

changeset 2180:dc3ac4b676dd

bitkeeper revision 1.1159.17.6 (41193a207z6kESTDa2SXhULAPY-Bmw)

Fix the broken build. Also avoid floating-point code in Xen.
author kaf24@scramble.cl.cam.ac.uk
date Tue Aug 10 21:12:00 2004 +0000 (2004-08-10)
parents d7ed6fd183db
children 4f4a42993157
files tools/libxc/xc_linux_restore.c xen/arch/x86/Rules.mk xen/common/sched_fair_bvt.c
line diff
     1.1 --- a/tools/libxc/xc_linux_restore.c	Tue Aug 10 21:04:26 2004 +0000
     1.2 +++ b/tools/libxc/xc_linux_restore.c	Tue Aug 10 21:12:00 2004 +0000
     1.3 @@ -224,8 +224,7 @@ int xc_linux_restore(int xc_handle, XcIO
     1.4  
     1.5      /* XXX create domain on CPU=-1 so that in future it auto load ballances by default */
     1.6      if ( xc_domain_create( xc_handle,  nr_pfns * (PAGE_SIZE / 1024),
     1.7 -			   name,
     1.8 -			   -1, 1, &dom ) )
     1.9 +			   name, -1, &dom ) )
    1.10      {
    1.11  	xcio_error(ioctxt, "Could not create domain. pfns=%d, %dKB",
    1.12  		   nr_pfns,nr_pfns * (PAGE_SIZE / 1024));
     2.1 --- a/xen/arch/x86/Rules.mk	Tue Aug 10 21:04:26 2004 +0000
     2.2 +++ b/xen/arch/x86/Rules.mk	Tue Aug 10 21:12:00 2004 +0000
     2.3 @@ -8,6 +8,9 @@ CFLAGS  := -nostdinc -fno-builtin -fno-c
     2.4  CFLAGS  += -iwithprefix include -Wall -Werror -fomit-frame-pointer -pipe
     2.5  CFLAGS  += -I$(BASEDIR)/include -Wno-pointer-arith -Wredundant-decls
     2.6  
     2.7 +# Prevent floating-point variables from creeping into Xen.
     2.8 +CFLAGS  += -msoft-float
     2.9 +
    2.10  ifeq ($(TARGET_SUBARCH),x86_32)
    2.11  CFLAGS  += -m32 -march=i686
    2.12  LDFLAGS := --oformat elf32-i386 
     3.1 --- a/xen/common/sched_fair_bvt.c	Tue Aug 10 21:04:26 2004 +0000
     3.2 +++ b/xen/common/sched_fair_bvt.c	Tue Aug 10 21:12:00 2004 +0000
     3.3 @@ -252,7 +252,7 @@ static void fbvt_wake(struct domain *d)
     3.4           * values, the virtual time can be determined as:
     3.5           * SVT - const * TIME_SLEPT
     3.6           */
     3.7 -        io_warp = (int)(0.5 * inf->time_slept);
     3.8 +        io_warp = inf->time_slept/2;
     3.9          if ( io_warp > 1000 )
    3.10              io_warp = 1000;
    3.11  
    3.12 @@ -551,7 +551,7 @@ static task_slice_t fbvt_do_schedule(s_t
    3.13       * domains earlier in virtual time). Together this should give quite
    3.14       * good control both for CPU and IO-bound domains.
    3.15       */
    3.16 -    LAST_VTB(cpu) = (int)(0.2 * next_inf->time_slept);
    3.17 +    LAST_VTB(cpu) = next_inf->time_slept/5;
    3.18      if(LAST_VTB(cpu) / next_inf->mcu_advance > max_vtb / MCU) 
    3.19          LAST_VTB(cpu) = max_vtb * next_inf->mcu_advance / MCU;
    3.20