From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38439) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a3wWM-0004tX-Pv for qemu-devel@nongnu.org; Tue, 01 Dec 2015 20:47:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a3wWL-00023Q-TE for qemu-devel@nongnu.org; Tue, 01 Dec 2015 20:47:50 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60444) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a3wWL-00023M-OH for qemu-devel@nongnu.org; Tue, 01 Dec 2015 20:47:49 -0500 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 (Postfix) with ESMTPS id 6B835A1007 for ; Wed, 2 Dec 2015 01:47:49 +0000 (UTC) From: Eduardo Habkost Date: Tue, 1 Dec 2015 23:47:07 -0200 Message-Id: <1449020831-8414-13-git-send-email-ehabkost@redhat.com> In-Reply-To: <1449020831-8414-1-git-send-email-ehabkost@redhat.com> References: <1449020831-8414-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH 12/16] pc: Remove PcGuestInfo.isapc_ram_fw field List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Igor Mammedov , Marcel Apfelbaum , "Michael S. Tsirkin" The code can use the PCMachineClass.pci_enabled field directly. Signed-off-by: Eduardo Habkost --- hw/i386/pc.c | 2 +- hw/i386/pc_piix.c | 1 - hw/i386/pc_q35.c | 1 - include/hw/i386/pc.h | 1 - 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index a9ec402..82025e2 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1364,7 +1364,7 @@ FWCfgState *pc_memory_init(PCMachineState *pcms, } /* Initialize PC system firmware */ - pc_system_firmware_init(rom_memory, guest_info->isapc_ram_fw); + pc_system_firmware_init(rom_memory, !pcmc->pci_enabled); option_rom_mr = g_malloc(sizeof(*option_rom_mr)); memory_region_init_ram(option_rom_mr, NULL, "pc.rom", PC_ROM_SIZE, diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index f39c086..1828cf8 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -145,7 +145,6 @@ static void pc_init1(MachineState *machine, guest_info->has_acpi_build = pcmc->has_acpi_build; guest_info->legacy_acpi_table_size = pcmc->legacy_acpi_table_size; - guest_info->isapc_ram_fw = !pcmc->pci_enabled; guest_info->has_reserved_memory = pcmc->has_reserved_memory; guest_info->rsdp_in_ram = pcmc->rsdp_in_ram; diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 7563bca..f124e59 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -132,7 +132,6 @@ static void pc_q35_init(MachineState *machine) } guest_info = pc_guest_info_init(pcms); - guest_info->isapc_ram_fw = false; guest_info->has_acpi_build = pcmc->has_acpi_build; guest_info->has_reserved_memory = pcmc->has_reserved_memory; guest_info->rsdp_in_ram = pcmc->rsdp_in_ram; diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 2732a72..64f2b4b 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -22,7 +22,6 @@ /* Machine info for ACPI build: */ struct PcGuestInfo { - bool isapc_ram_fw; unsigned apic_id_limit; bool apic_xrupt_override; uint64_t numa_nodes; -- 2.1.0