[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 10/12] pc_sysfw: Pass PCMachineState to pc_system
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v2 10/12] pc_sysfw: Pass PCMachineState to pc_system_firmware_init() |
Date: |
Thu, 7 Mar 2019 18:23:59 +0100 |
From: Philippe Mathieu-Daudé <address@hidden>
pc_system_firmware_init() parameter @isapc_ram_fw is PCMachineState
member pci_enabled negated. The next commit will need more of
PCMachineState. To prepare for that, pass a PCMachineState *, and
drop the now redundant parameter @isapc_ram_fw.
Signed-off-by: Markus Armbruster <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/i386/pc.c | 2 +-
hw/i386/pc_sysfw.c | 5 ++++-
include/hw/i386/pc.h | 3 +--
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 3889eccdc3..3cd8ed1794 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1830,7 +1830,7 @@ void pc_memory_init(PCMachineState *pcms,
}
/* Initialize PC system firmware */
- pc_system_firmware_init(rom_memory, !pcmc->pci_enabled);
+ pc_system_firmware_init(pcms, rom_memory);
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_sysfw.c b/hw/i386/pc_sysfw.c
index 46b87afe23..785123252c 100644
--- a/hw/i386/pc_sysfw.c
+++ b/hw/i386/pc_sysfw.c
@@ -231,8 +231,11 @@ static void old_pc_system_rom_init(MemoryRegion
*rom_memory, bool isapc_ram_fw)
bios);
}
-void pc_system_firmware_init(MemoryRegion *rom_memory, bool isapc_ram_fw)
+void pc_system_firmware_init(PCMachineState *pcms,
+ MemoryRegion *rom_memory)
{
+ PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pcms);
+ bool isapc_ram_fw = !pcmc->pci_enabled;
DriveInfo *pflash_drv;
pflash_drv = drive_get(IF_PFLASH, 0, 0);
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 3ff127ebd0..eb7360feac 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -278,8 +278,7 @@ extern PCIDevice *piix4_dev;
int piix4_init(PCIBus *bus, ISABus **isa_bus, int devfn);
/* pc_sysfw.c */
-void pc_system_firmware_init(MemoryRegion *rom_memory,
- bool isapc_ram_fw);
+void pc_system_firmware_init(PCMachineState *pcms, MemoryRegion *rom_memory);
/* acpi-build.c */
void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid,
--
2.17.2
- [Qemu-devel] [PATCH v2 01/12] qdev: Fix latent bug with compat_props and onboard devices, (continued)
- [Qemu-devel] [PATCH v2 11/12] pc: Support firmware configuration with -blockdev, Markus Armbruster, 2019/03/07
- [Qemu-devel] [PATCH v2 10/12] pc_sysfw: Pass PCMachineState to pc_system_firmware_init(),
Markus Armbruster <=
- [Qemu-devel] [PATCH v2 12/12] docs/interop/firmware.json: Prefer -machine to if=pflash, Markus Armbruster, 2019/03/07
- [Qemu-devel] [PATCH v2 05/12] vl: Improve legibility of BlockdevOptions queue, Markus Armbruster, 2019/03/07
- [Qemu-devel] [PATCH v2 08/12] pflash_cfi01: Add pflash_cfi01_get_blk() helper, Markus Armbruster, 2019/03/07
- [Qemu-devel] [PATCH v2 07/12] vl: Create block backends before setting machine properties, Markus Armbruster, 2019/03/07
- [Qemu-devel] [PATCH v2 09/12] pc_sysfw: Remove unused PcSysFwDevice, Markus Armbruster, 2019/03/07
- Re: [Qemu-devel] [PATCH v2 00/12] pc: Support firmware configuration with -blockdev, no-reply, 2019/03/07