Received: from [140.186.70.92] (port=38554 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OHW3h-0003dT-Fp for qemu-devel@nongnu.org; Thu, 27 May 2010 01:55:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OHVqG-0003g6-I2 for qemu-devel@nongnu.org; Thu, 27 May 2010 01:41:17 -0400 Received: from mail.valinux.co.jp ([210.128.90.3]:36997) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OHVqG-0003fv-5J for qemu-devel@nongnu.org; Thu, 27 May 2010 01:41:16 -0400 Date: Thu, 27 May 2010 14:37:53 +0900 From: Isaku Yamahata Message-ID: <20100527053753.GC31807@valinux.co.jp> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Subject: [Qemu-devel] [PATCH] vga-isa-mm: remove one #ifdef CONFIG_BOCHS_VBE. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org remove one #ifdef CONFIG_BOCHS_VBE. Call vga_init_vbe() instead. Signed-off-by: Isaku Yamahata --- hw/vga-isa-mm.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/hw/vga-isa-mm.c b/hw/vga-isa-mm.c index 2faefa5..8e31e36 100644 --- a/hw/vga-isa-mm.c +++ b/hw/vga-isa-mm.c @@ -121,10 +121,6 @@ int isa_vga_mm_init(target_phys_addr_t vram_base, s->vga.ds = graphic_console_init(s->vga.update, s->vga.invalidate, s->vga.screen_dump, s->vga.text_update, s); -#ifdef CONFIG_BOCHS_VBE - /* XXX: use optimized standard vga accesses */ - cpu_register_physical_memory(VBE_DISPI_LFB_PHYSICAL_ADDRESS, - VGA_RAM_SIZE, s->vga.vram_offset); -#endif + vga_init_vbe(&s->vga); return 0; } -- 1.6.6.1