From patchwork Tue Apr 17 10:11:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 153110 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B41C1B706F for ; Tue, 17 Apr 2012 20:12:11 +1000 (EST) Received: from localhost ([::1]:40966 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SK5OK-0006Vx-CO for incoming@patchwork.ozlabs.org; Tue, 17 Apr 2012 06:12:08 -0400 Received: from eggs.gnu.org ([208.118.235.92]:38637) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SK5O2-0006DM-GB for qemu-devel@nongnu.org; Tue, 17 Apr 2012 06:11:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SK5Nu-0000aJ-JD for qemu-devel@nongnu.org; Tue, 17 Apr 2012 06:11:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:32439) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SK5Nu-0000Zo-AU for qemu-devel@nongnu.org; Tue, 17 Apr 2012 06:11:42 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q3HABe1Y006241 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 17 Apr 2012 06:11:41 -0400 Received: from rincewind.home.kraxel.org (ovpn-116-48.ams2.redhat.com [10.36.116.48]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q3HABdU8023396; Tue, 17 Apr 2012 06:11:40 -0400 Received: by rincewind.home.kraxel.org (Postfix, from userid 500) id A2231404E0; Tue, 17 Apr 2012 12:11:39 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 17 Apr 2012 12:11:39 +0200 Message-Id: <1334657499-20105-4-git-send-email-kraxel@redhat.com> In-Reply-To: <1334657499-20105-1-git-send-email-kraxel@redhat.com> References: <1334657499-20105-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 3/3] Switch isa vga to seavgabios too. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Note: untested as 'qemu -M isapc' is broken. Signed-off-by: Gerd Hoffmann --- hw/vga-isa.c | 2 +- hw/vga_int.h | 1 - pc-bios/vgabios-isavga.bin | Bin 0 -> 37888 bytes 3 files changed, 1 insertions(+), 2 deletions(-) create mode 100644 pc-bios/vgabios-isavga.bin diff --git a/pc-bios/vgabios-isavga.bin b/pc-bios/vgabios-isavga.bin new file mode 100644 index 0000000000000000000000000000000000000000..eb50c59c50373fcfe28bf0ccb861bdb2176afb95 GIT binary patch [ zapped to not spam the list ] diff --git a/hw/vga-isa.c b/hw/vga-isa.c index 4bcc4db..6dfc28d 100644 --- a/hw/vga-isa.c +++ b/hw/vga-isa.c @@ -65,7 +65,7 @@ static int vga_initfn(ISADevice *dev) vga_init_vbe(s, isa_address_space(dev)); /* ROM BIOS */ - rom_add_vga(VGABIOS_FILENAME); + rom_add_vga("vgabios-isavga.bin"); return 0; } diff --git a/hw/vga_int.h b/hw/vga_int.h index 7685b2b..ab5826f 100644 --- a/hw/vga_int.h +++ b/hw/vga_int.h @@ -209,7 +209,6 @@ extern const uint8_t sr_mask[8]; extern const uint8_t gr_mask[16]; #define VGA_RAM_SIZE (8192 * 1024) -#define VGABIOS_FILENAME "vgabios.bin" #define VGABIOS_CIRRUS_FILENAME "vgabios-cirrus.bin" extern const MemoryRegionOps vga_mem_ops;