@@ -87,7 +87,6 @@ typedef struct PCMachineClass {
X86MachineClass parent_class;
/* Device configuration: */
- bool pci_enabled;
const char *default_south_bridge;
/* Compat options: */
@@ -1740,7 +1740,6 @@ static void pc_machine_class_init(ObjectClass *oc, void *data)
PCMachineClass *pcmc = PC_MACHINE_CLASS(oc);
HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(oc);
- pcmc->pci_enabled = true;
pcmc->has_acpi_build = true;
pcmc->smbios_defaults = true;
pcmc->gigabyte_align = true;
@@ -1830,7 +1829,7 @@ static void pc_pci_machine_class_init(ObjectClass *oc, void *data)
bool pc_machine_is_pci_enabled(PCMachineState *pcms)
{
- return PC_MACHINE_GET_CLASS(pcms)->pci_enabled;
+ return !!object_dynamic_cast(OBJECT(pcms), TYPE_PC_PCI_MACHINE);
}
static const TypeInfo pc_machine_types[] = {
@@ -813,7 +813,6 @@ static void isapc_machine_options(MachineClass *m)
m->max_cpus = 1;
m->option_rom_has_mr = true;
m->rom_file_has_mr = false;
- pcmc->pci_enabled = false;
pcmc->has_acpi_build = false;
pcmc->smbios_defaults = false;
pcmc->gigabyte_align = false;
All TYPE_PC_PCI_MACHINE-based machines have pci_enabled set to %true. By checking a TYPE_PC_MACHINE inherits the TYPE_PC_PCI_MACHINE base class, we don't need this field anymore. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- include/hw/i386/pc.h | 1 - hw/i386/pc.c | 3 +-- hw/i386/pc_piix.c | 1 - 3 files changed, 1 insertion(+), 4 deletions(-)