From patchwork Sun Jan 31 14:24:14 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Blue Swirl X-Patchwork-Id: 44120 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 C30E3B7D6F for ; Mon, 1 Feb 2010 01:33:21 +1100 (EST) Received: from localhost ([127.0.0.1]:55818 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NbakI-0001F5-I3 for incoming@patchwork.ozlabs.org; Sun, 31 Jan 2010 09:25:50 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nbaj6-0001DK-SS for qemu-devel@nongnu.org; Sun, 31 Jan 2010 09:24:36 -0500 Received: from [199.232.76.173] (port=46557 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nbaj6-0001Cv-9J for qemu-devel@nongnu.org; Sun, 31 Jan 2010 09:24:36 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1Nbaj5-0001fg-Me for qemu-devel@nongnu.org; Sun, 31 Jan 2010 09:24:36 -0500 Received: from mail-pz0-f186.google.com ([209.85.222.186]:54010) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Nbaj5-0001fa-Aq for qemu-devel@nongnu.org; Sun, 31 Jan 2010 09:24:35 -0500 Received: by pzk16 with SMTP id 16so3214767pzk.18 for ; Sun, 31 Jan 2010 06:24:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:from:date:message-id :subject:to:content-type; bh=9r1Vxl4uoUdCa1ZRbDX/L5BB72keuYchBpZtn64FipM=; b=YYpsvn+eCPhZt0qkkUIvXcdMeHizMohdMRhIskQTqq05VNKoA2uCldyITFLpqsSac1 ahz8EqVDvfDxFAQsbkm4xpz2tBOtx+V3acvqloMkqwwcESYzWVk1jfdWr42eVYoF1GsQ W2vsOIYXE7o7nQUvN4llgxQQYEzxBMbR4FJB4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:from:date:message-id:subject:to:content-type; b=oxBUC6ofb4zsj21PfQxkl5pODmop6pbHoIkhzhIdILfUFJRmUCBcxYcfNR9ce8xBCe wF1RdDsRDXDCluJnIZIc9H/+PaTsgf+Yx2SNFpQ1TEoQ9VPs/wbv0wcRPczuOR3hEUtr rkv36bloklDWtJe5D90zp8nRIF9qJI0S+hYWA= MIME-Version: 1.0 Received: by 10.140.58.14 with SMTP id g14mr2297761rva.114.1264947874133; Sun, 31 Jan 2010 06:24:34 -0800 (PST) From: Blue Swirl Date: Sun, 31 Jan 2010 16:24:14 +0200 Message-ID: To: qemu-devel X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [Qemu-devel] [PATCH] Remove conditional rom loading support 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 Commit c2039bd0ffce8807e0eaac55254fde790825fa92 made rom loading automatic for non-PC architectures. Remove now mostly unused conditional rom loading support. Signed-off-by: Blue Swirl --- hw/loader.c | 5 ----- hw/loader.h | 1 - hw/pc.c | 3 --- 3 files changed, 0 insertions(+), 9 deletions(-) option_rom_offset); diff --git a/hw/loader.c b/hw/loader.c index b3bbd77..1448887 100644 --- a/hw/loader.c +++ b/hw/loader.c @@ -537,7 +537,6 @@ struct Rom { static FWCfgState *fw_cfg; static QTAILQ_HEAD(, Rom) roms = QTAILQ_HEAD_INITIALIZER(roms); -int rom_enable_driver_roms; static void rom_insert(Rom *rom) { @@ -624,15 +623,11 @@ int rom_add_blob(const char *name, const void *blob, size_t len, int rom_add_vga(const char *file) { - if (!rom_enable_driver_roms) - return 0; return rom_add_file(file, "vgaroms", 0); } int rom_add_option(const char *file) { - if (!rom_enable_driver_roms) - return 0; return rom_add_file(file, "genroms", 0); } diff --git a/hw/loader.h b/hw/loader.h index 8ff3c94..56676e1 100644 --- a/hw/loader.h +++ b/hw/loader.h @@ -41,7 +41,6 @@ void do_info_roms(Monitor *mon); #define PC_ROM_ALIGN 0x800 #define PC_ROM_SIZE (PC_ROM_MAX - PC_ROM_MIN_VGA) -extern int rom_enable_driver_roms; int rom_add_vga(const char *file); int rom_add_option(const char *file); diff --git a/hw/pc.c b/hw/pc.c index a674dbf..176d3cc 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -855,9 +855,6 @@ static void pc_init1(ram_addr_t ram_size, isa_bios_size, (bios_offset + bios_size - isa_bios_size) | IO_MEM_ROM); - - - rom_enable_driver_roms = 1; option_rom_offset = qemu_ram_alloc(PC_ROM_SIZE); cpu_register_physical_memory(PC_ROM_MIN_VGA, PC_ROM_SIZE,