From patchwork Thu May 27 05:37:53 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 53689 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 09BBEB7D2E for ; Thu, 27 May 2010 16:10:55 +1000 (EST) Received: from localhost ([127.0.0.1]:39694 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OHWIu-0004IQ-5h for incoming@patchwork.ozlabs.org; Thu, 27 May 2010 02:10:52 -0400 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 Received: from ps.local.valinux.co.jp (vagw.valinux.co.jp [210.128.90.14]) by mail.valinux.co.jp (Postfix) with SMTP id 37EC91867D; Thu, 27 May 2010 14:41:15 +0900 (JST) Received: (nullmailer pid 13241 invoked by uid 1000); Thu, 27 May 2010 05:37:53 -0000 Date: Thu, 27 May 2010 14:37:53 +0900 From: Isaku Yamahata To: qemu-devel@nongnu.org Message-ID: <20100527053753.GC31807@valinux.co.jp> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.19 (2009-01-05) X-Virus-Scanned: clamav-milter 0.95.2 at va-mail.local.valinux.co.jp X-Virus-Status: Clean X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) Subject: [Qemu-devel] [PATCH] vga-isa-mm: remove one #ifdef CONFIG_BOCHS_VBE. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@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; }