From mboxrd@z Thu Jan 1 00:00:00 1970 From: Anthony Liguori Subject: Re: [Xen-changelog] [xen-unstable] [IA64][HVM] Enable CGA acceleration for VTI. Date: Fri, 02 Jun 2006 15:06:28 -0500 Message-ID: <44809A44.6060200@us.ibm.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org I assume this commit message was supposed to be "Enable VGA acceleration for VTI" right? We're not actually accelerating CGA right? Regards, Anthony Liguori Xen patchbot-unstable wrote: > # HG changeset patch > # User kaf24@firebug.cl.cam.ac.uk > # Node ID e67432187b88ee60433779ad0f004b532ed378c8 > # Parent 639ad22eb7c80ac21c3958747b879892680bdaba > [IA64][HVM] Enable CGA acceleration for VTI. > Signed-off-by: Kevin Tian > --- > tools/ioemu/hw/cirrus_vga.c | 5 ----- > tools/ioemu/hw/vga.c | 2 +- > tools/ioemu/vl.c | 2 +- > 3 files changed, 2 insertions(+), 7 deletions(-) > > diff -r 639ad22eb7c8 -r e67432187b88 tools/ioemu/hw/cirrus_vga.c > --- a/tools/ioemu/hw/cirrus_vga.c Fri Jun 02 09:15:51 2006 +0100 > +++ b/tools/ioemu/hw/cirrus_vga.c Fri Jun 02 09:20:58 2006 +0100 > @@ -2460,7 +2460,6 @@ static CPUWriteMemoryFunc *cirrus_linear > }; > > extern FILE *logfile; > -#if defined(__i386__) || defined (__x86_64__) > static void * set_vram_mapping(unsigned long begin, unsigned long end) > { > unsigned long * extent_start = NULL; > @@ -2540,10 +2539,6 @@ static int unset_vram_mapping(unsigned l > return 0; > } > > -#elif defined(__ia64__) > -static void * set_vram_mapping(unsigned long addr, unsigned long end) {} > -static int unset_vram_mapping(unsigned long addr, unsigned long end) {} > -#endif > extern int vga_accelerate; > > /* Compute the memory access functions */ > diff -r 639ad22eb7c8 -r e67432187b88 tools/ioemu/hw/vga.c > --- a/tools/ioemu/hw/vga.c Fri Jun 02 09:15:51 2006 +0100 > +++ b/tools/ioemu/hw/vga.c Fri Jun 02 09:20:58 2006 +0100 > @@ -1995,6 +1995,7 @@ void vga_common_init(VGAState *s, Displa > s->get_resolution = vga_get_resolution; > /* XXX: currently needed for display */ > vga_state = s; > + vga_bios_init(s); > } > > > @@ -2082,7 +2083,6 @@ int vga_initialize(PCIBus *bus, DisplayS > #endif > } > > - vga_bios_init(s); > return 0; > } > > diff -r 639ad22eb7c8 -r e67432187b88 tools/ioemu/vl.c > --- a/tools/ioemu/vl.c Fri Jun 02 09:15:51 2006 +0100 > +++ b/tools/ioemu/vl.c Fri Jun 02 09:20:58 2006 +0100 > @@ -2499,7 +2499,7 @@ int set_mm_mapping(int xc_handle, > xc_domain_getinfo(xc_handle, domid, 1, &info); > > if ( xc_domain_setmaxmem(xc_handle, domid, > - (info.nr_pages + nr_pages) * PAGE_SIZE/1024) != 0) > + info.max_memkb + nr_pages * PAGE_SIZE/1024) !=0) > { > fprintf(logfile, "set maxmem returned error %d\n", errno); > return -1; > > _______________________________________________ > Xen-changelog mailing list > Xen-changelog@lists.xensource.com > http://lists.xensource.com/xen-changelog >