direct-io.hg

changeset 10254:e67432187b88

[IA64][HVM] Enable CGA acceleration for VTI.
Signed-off-by: Kevin Tian <kevin.tian@intel.com>
author kaf24@firebug.cl.cam.ac.uk
date Fri Jun 02 09:20:58 2006 +0100 (2006-06-02)
parents 639ad22eb7c8
children 4122e88b6c75
files tools/ioemu/hw/cirrus_vga.c tools/ioemu/hw/vga.c tools/ioemu/vl.c
line diff
     1.1 --- a/tools/ioemu/hw/cirrus_vga.c	Fri Jun 02 09:15:51 2006 +0100
     1.2 +++ b/tools/ioemu/hw/cirrus_vga.c	Fri Jun 02 09:20:58 2006 +0100
     1.3 @@ -2460,7 +2460,6 @@ static CPUWriteMemoryFunc *cirrus_linear
     1.4  };
     1.5  
     1.6  extern FILE *logfile;
     1.7 -#if defined(__i386__) || defined (__x86_64__)
     1.8  static void * set_vram_mapping(unsigned long begin, unsigned long end)
     1.9  {
    1.10      unsigned long * extent_start = NULL;
    1.11 @@ -2540,10 +2539,6 @@ static int unset_vram_mapping(unsigned l
    1.12      return 0;
    1.13  }
    1.14  
    1.15 -#elif defined(__ia64__)
    1.16 -static void * set_vram_mapping(unsigned long addr, unsigned long end) {}
    1.17 -static int unset_vram_mapping(unsigned long addr, unsigned long end) {}
    1.18 -#endif
    1.19  extern int vga_accelerate;
    1.20  
    1.21  /* Compute the memory access functions */
     2.1 --- a/tools/ioemu/hw/vga.c	Fri Jun 02 09:15:51 2006 +0100
     2.2 +++ b/tools/ioemu/hw/vga.c	Fri Jun 02 09:20:58 2006 +0100
     2.3 @@ -1995,6 +1995,7 @@ void vga_common_init(VGAState *s, Displa
     2.4      s->get_resolution = vga_get_resolution;
     2.5      /* XXX: currently needed for display */
     2.6      vga_state = s;
     2.7 +    vga_bios_init(s);
     2.8  }
     2.9  
    2.10  
    2.11 @@ -2082,7 +2083,6 @@ int vga_initialize(PCIBus *bus, DisplayS
    2.12  #endif
    2.13      }
    2.14  
    2.15 -    vga_bios_init(s);
    2.16      return 0;
    2.17  }
    2.18  
     3.1 --- a/tools/ioemu/vl.c	Fri Jun 02 09:15:51 2006 +0100
     3.2 +++ b/tools/ioemu/vl.c	Fri Jun 02 09:20:58 2006 +0100
     3.3 @@ -2499,7 +2499,7 @@ int set_mm_mapping(int xc_handle,
     3.4      xc_domain_getinfo(xc_handle, domid, 1, &info);
     3.5  
     3.6      if ( xc_domain_setmaxmem(xc_handle, domid,
     3.7 -                             (info.nr_pages + nr_pages) * PAGE_SIZE/1024) != 0)
     3.8 +                             info.max_memkb + nr_pages * PAGE_SIZE/1024) !=0)
     3.9      {
    3.10          fprintf(logfile, "set maxmem returned error %d\n", errno);
    3.11          return -1;