[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [RFC PATCH-for-9.1 02/29] hw/i386/pc: Extract pc_machine_is_pci_enabled() helper
Introduce the pc_machine_is_pci_enabled() helper to be able to alter PCMachineClass fields later. Signed-off-by: Philippe Mathieu-Daudé <philmd@xxxxxxxxxx> --- include/hw/i386/pc.h | 2 ++ hw/i386/pc.c | 11 +++++++++-- hw/i386/pc_piix.c | 11 ++++++----- hw/i386/pc_q35.c | 2 +- hw/i386/pc_sysfw.c | 11 ++++------- 5 files changed, 22 insertions(+), 15 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 0ad971782c..6b885424bb 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -129,6 +129,8 @@ struct PCMachineClass { #define TYPE_PC_MACHINE "generic-pc-machine" OBJECT_DECLARE_TYPE(PCMachineState, PCMachineClass, PC_MACHINE) +bool pc_machine_is_pci_enabled(PCMachineState *pcms); + /* ioapic.c */ GSIState *pc_gsi_create(qemu_irq **irqs, bool pci_enabled); diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 2c41b08478..7065f11e97 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -814,6 +814,7 @@ void pc_memory_init(PCMachineState *pcms, hwaddr maxphysaddr, maxusedaddr; hwaddr cxl_base, cxl_resv_end = 0; X86CPU *cpu = X86_CPU(first_cpu); + bool pci_enabled = pc_machine_is_pci_enabled(pcms); assert(machine->ram_size == x86ms->below_4g_mem_size + x86ms->above_4g_mem_size); @@ -949,7 +950,7 @@ void pc_memory_init(PCMachineState *pcms, option_rom_mr = g_malloc(sizeof(*option_rom_mr)); memory_region_init_ram(option_rom_mr, NULL, "pc.rom", PC_ROM_SIZE, &error_fatal); - if (pcmc->pci_enabled) { + if (pci_enabled) { memory_region_set_readonly(option_rom_mr, true); } memory_region_add_subregion_overlap(rom_memory, @@ -1642,6 +1643,7 @@ static void pc_machine_initfn(Object *obj) { PCMachineState *pcms = PC_MACHINE(obj); PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pcms); + bool pci_enabled = pc_machine_is_pci_enabled(pcms); #ifdef CONFIG_VMPORT pcms->vmport = ON_OFF_AUTO_AUTO; @@ -1668,7 +1670,7 @@ static void pc_machine_initfn(Object *obj) pcms->pcspk = isa_new(TYPE_PC_SPEAKER); object_property_add_alias(OBJECT(pcms), "pcspk-audiodev", OBJECT(pcms->pcspk), "audiodev"); - if (pcmc->pci_enabled) { + if (pci_enabled) { cxl_machine_init(obj, &pcms->cxl_devices_state); } @@ -1810,6 +1812,11 @@ static void pc_machine_class_init(ObjectClass *oc, void *data) pc_machine_set_fd_bootchk); } +bool pc_machine_is_pci_enabled(PCMachineState *pcms) +{ + return PC_MACHINE_GET_CLASS(pcms)->pci_enabled; +} + static const TypeInfo pc_machine_types[] = { { .name = TYPE_PC_MACHINE, diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index c00d2a66a6..1be1e050c7 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -117,6 +117,7 @@ static void pc_init1(MachineState *machine, const char *pci_type) MemoryRegion *rom_memory = system_memory; ram_addr_t lowmem; uint64_t hole64_size = 0; + bool pci_enabled = pc_machine_is_pci_enabled(pcms); /* * Calculate ram split, for memory below and above 4G. It's a bit @@ -187,7 +188,7 @@ static void pc_init1(MachineState *machine, const char *pci_type) kvmclock_create(pcmc->kvmclock_create_always); } - if (pcmc->pci_enabled) { + if (pci_enabled) { pci_memory = g_new(MemoryRegion, 1); memory_region_init(pci_memory, NULL, "pci", UINT64_MAX); rom_memory = pci_memory; @@ -234,9 +235,9 @@ static void pc_init1(MachineState *machine, const char *pci_type) } } - gsi_state = pc_gsi_create(&x86ms->gsi, pcmc->pci_enabled); + gsi_state = pc_gsi_create(&x86ms->gsi, pci_enabled); - if (pcmc->pci_enabled) { + if (pci_enabled) { PCIDevice *pci_dev; DeviceState *dev; size_t i; @@ -308,7 +309,7 @@ static void pc_init1(MachineState *machine, const char *pci_type) x86_register_ferr_irq(x86ms->gsi[13]); } - pc_vga_init(isa_bus, pcmc->pci_enabled ? pcms->pcibus : NULL); + pc_vga_init(isa_bus, pci_enabled ? pcms->pcibus : NULL); assert(pcms->vmport != ON_OFF_AUTO__MAX); if (pcms->vmport == ON_OFF_AUTO_AUTO) { @@ -322,7 +323,7 @@ static void pc_init1(MachineState *machine, const char *pci_type) pc_nic_init(pcmc, isa_bus, pcms->pcibus); #ifdef CONFIG_IDE_ISA - if (!pcmc->pci_enabled) { + if (!pci_enabled) { DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; int i; diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index b5922b44af..43ee1e595c 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -145,7 +145,7 @@ static void pc_q35_init(MachineState *machine) bool keep_pci_slot_hpc; uint64_t pci_hole64_size = 0; - assert(pcmc->pci_enabled); + assert(pc_machine_is_pci_enabled(pcms)); /* Check whether RAM fits below 4G (leaving 1/2 GByte for IO memory * and 256 Mbytes for PCI Express Enhanced Configuration Access Mapping diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c index 3efabbbab2..862a082b0a 100644 --- a/hw/i386/pc_sysfw.c +++ b/hw/i386/pc_sysfw.c @@ -93,9 +93,7 @@ static PFlashCFI01 *pc_pflash_create(PCMachineState *pcms, void pc_system_flash_create(PCMachineState *pcms) { - PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pcms); - - if (pcmc->pci_enabled) { + if (pc_machine_is_pci_enabled(pcms)) { pcms->flash[0] = pc_pflash_create(pcms, "system.flash0", "pflash0"); pcms->flash[1] = pc_pflash_create(pcms, "system.flash1", @@ -108,7 +106,7 @@ void pc_system_flash_cleanup_unused(PCMachineState *pcms) char *prop_name; int i; - assert(PC_MACHINE_GET_CLASS(pcms)->pci_enabled); + assert(pc_machine_is_pci_enabled(pcms)); for (i = 0; i < ARRAY_SIZE(pcms->flash); i++) { if (!qdev_is_realized(DEVICE(pcms->flash[i]))) { @@ -146,7 +144,7 @@ static void pc_system_flash_map(PCMachineState *pcms, void *flash_ptr; int flash_size; - assert(PC_MACHINE_GET_CLASS(pcms)->pci_enabled); + assert(pc_machine_is_pci_enabled(pcms)); for (i = 0; i < ARRAY_SIZE(pcms->flash); i++) { system_flash = pcms->flash[i]; @@ -201,11 +199,10 @@ static void pc_system_flash_map(PCMachineState *pcms, void pc_system_firmware_init(PCMachineState *pcms, MemoryRegion *rom_memory) { - PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pcms); int i; BlockBackend *pflash_blk[ARRAY_SIZE(pcms->flash)]; - if (!pcmc->pci_enabled) { + if (!pc_machine_is_pci_enabled(pcms)) { x86_bios_rom_init(MACHINE(pcms), "bios.bin", rom_memory, true); return; } -- 2.41.0
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |