ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/i386/pc: Confine system flash handling to pc_sysfw 

Rather than distributing PC system flash handling across three files, let's
confine it to one. Now, pc_system_firmware_init() creates, configures and cleans
up the system flash which makes the code easier to understand. It also avoids
the extra call to pc_system_flash_cleanup_unused() in the Xen case.

Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20240208220349.4948-7-shentey@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
This commit is contained in:
Bernhard Beschow 2024-02-08 23:03:46 +01:00 committed by Philippe Mathieu-Daudé
parent a0204a5ed0
commit 6f6ad2b245
4 changed files with 4 additions and 6 deletions
hw/i386
pc.cpc_piix.cpc_sysfw.c
include/hw/i386
pc.h

1
hw/i386/pc.c
View File

@ -1733,7 +1733,6 @@ static void pc_machine_initfn(Object *obj)
#endif #endif
pcms->default_bus_bypass_iommu = false; pcms->default_bus_bypass_iommu = false;
pc_system_flash_create(pcms);
pcms->pcspk = isa_new(TYPE_PC_SPEAKER); pcms->pcspk = isa_new(TYPE_PC_SPEAKER);
object_property_add_alias(OBJECT(pcms), "pcspk-audiodev", object_property_add_alias(OBJECT(pcms), "pcspk-audiodev",
OBJECT(pcms->pcspk), "audiodev"); OBJECT(pcms->pcspk), "audiodev");

1
hw/i386/pc_piix.c
View File

@ -231,7 +231,6 @@ static void pc_init1(MachineState *machine,
assert(machine->ram_size == x86ms->below_4g_mem_size + assert(machine->ram_size == x86ms->below_4g_mem_size +
x86ms->above_4g_mem_size); x86ms->above_4g_mem_size);
pc_system_flash_cleanup_unused(pcms);
if (machine->kernel_filename != NULL) { if (machine->kernel_filename != NULL) {
/* For xen HVM direct kernel boot, load linux here */ /* For xen HVM direct kernel boot, load linux here */
xen_load_linux(pcms); xen_load_linux(pcms);

6
hw/i386/pc_sysfw.c
View File

@ -91,7 +91,7 @@ static PFlashCFI01 *pc_pflash_create(PCMachineState *pcms,
return PFLASH_CFI01(dev); return PFLASH_CFI01(dev);
} }
void pc_system_flash_create(PCMachineState *pcms) static void pc_system_flash_create(PCMachineState *pcms)
{ {
PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pcms); PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pcms);
@ -103,7 +103,7 @@ void pc_system_flash_create(PCMachineState *pcms)
} }
} }
void pc_system_flash_cleanup_unused(PCMachineState *pcms) static void pc_system_flash_cleanup_unused(PCMachineState *pcms)
{ {
char *prop_name; char *prop_name;
int i; int i;
@ -212,6 +212,8 @@ void pc_system_firmware_init(PCMachineState *pcms,
return; return;
} }
pc_system_flash_create(pcms);
/* Map legacy -drive if=pflash to machine properties */ /* Map legacy -drive if=pflash to machine properties */
for (i = 0; i < ARRAY_SIZE(pcms->flash); i++) { for (i = 0; i < ARRAY_SIZE(pcms->flash); i++) {
pflash_cfi01_legacy_drive(pcms->flash[i], pflash_cfi01_legacy_drive(pcms->flash[i],

2
include/hw/i386/pc.h
View File

@ -193,8 +193,6 @@ void pc_i8259_create(ISABus *isa_bus, qemu_irq *i8259_irqs);
#define TYPE_PORT92 "port92" #define TYPE_PORT92 "port92"
/* pc_sysfw.c */ /* pc_sysfw.c */
void pc_system_flash_create(PCMachineState *pcms);
void pc_system_flash_cleanup_unused(PCMachineState *pcms);
void pc_system_firmware_init(PCMachineState *pcms, MemoryRegion *rom_memory); void pc_system_firmware_init(PCMachineState *pcms, MemoryRegion *rom_memory);
bool pc_system_ovmf_table_find(const char *entry, uint8_t **data, bool pc_system_ovmf_table_find(const char *entry, uint8_t **data,
int *data_len); int *data_len);