@@ -22,11 +22,8 @@
* @boot_cpus: number of present VCPUs
*/
typedef struct PCMachineState {
- /*< private >*/
X86MachineState parent_obj;
- /* <public> */
-
/* State for other subsystems/APIs: */
Notifier machine_done;
@@ -60,6 +57,12 @@ typedef struct PCMachineState {
CXLState cxl_devices_state;
} PCMachineState;
+typedef struct PcPciMachineState {
+ PCMachineState parent_obj;
+
+ Notifier machine_done;
+} PcPciMachineState;
+
#define PC_MACHINE_ACPI_DEVICE_PROP "acpi-device"
#define PC_MACHINE_MAX_RAM_BELOW_4G "max-ram-below-4g"
#define PC_MACHINE_VMPORT "vmport"
@@ -80,12 +83,9 @@ typedef struct PCMachineState {
* way we can use 1GByte pages in the host.
*
*/
-struct PCMachineClass {
- /*< private >*/
+typedef struct PCMachineClass {
X86MachineClass parent_class;
- /*< public >*/
-
/* Device configuration: */
bool pci_enabled;
const char *default_south_bridge;
@@ -124,13 +124,20 @@ struct PCMachineClass {
* check for memory.
*/
bool broken_32bit_mem_addr_check;
-};
+} PCMachineClass;
-#define TYPE_PC_MACHINE "generic-pc-machine"
+typedef struct PcPciMachineClass {
+ PCMachineClass parent_class;
+} PcPciMachineClass;
+
+#define TYPE_PC_MACHINE "common-pc-machine"
OBJECT_DECLARE_TYPE(PCMachineState, PCMachineClass, PC_MACHINE)
bool pc_machine_is_pci_enabled(PCMachineState *pcms);
+#define TYPE_PC_PCI_MACHINE "pci-pc-machine"
+OBJECT_DECLARE_TYPE(PcPciMachineState, PcPciMachineClass, PC_PCI_MACHINE)
+
/* ioapic.c */
GSIState *pc_gsi_create(qemu_irq **irqs, bool pci_enabled);
@@ -621,6 +621,10 @@ void pc_machine_done(Notifier *notifier, void *data)
pc_cmos_init_late(pcms);
}
+static void pc_pci_machine_done(Notifier *notifier, void *data)
+{
+}
+
/* setup pci memory address space mapping into system address space */
void pc_pci_as_mapping_init(MemoryRegion *system_memory,
MemoryRegion *pci_address_space)
@@ -1678,6 +1682,14 @@ static void pc_machine_initfn(Object *obj)
qemu_add_machine_init_done_notifier(&pcms->machine_done);
}
+static void pc_pci_machine_initfn(Object *obj)
+{
+ PcPciMachineState *ppms = PC_PCI_MACHINE(obj);
+
+ ppms->machine_done.notify = pc_pci_machine_done;
+ qemu_add_machine_init_done_notifier(&ppms->machine_done);
+}
+
static void pc_machine_reset(MachineState *machine, ShutdownCause reason)
{
CPUState *cs;
@@ -1812,6 +1824,10 @@ static void pc_machine_class_init(ObjectClass *oc, void *data)
pc_machine_set_fd_bootchk);
}
+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;
@@ -1831,6 +1847,15 @@ static const TypeInfo pc_machine_types[] = {
{ }
},
},
+ {
+ .name = TYPE_PC_PCI_MACHINE,
+ .parent = TYPE_PC_MACHINE,
+ .abstract = true,
+ .instance_size = sizeof(PcPciMachineState),
+ .instance_init = pc_pci_machine_initfn,
+ .class_size = sizeof(PcPciMachineClass),
+ .class_init = pc_pci_machine_class_init,
+ },
};
DEFINE_TYPES(pc_machine_types)
@@ -463,7 +463,7 @@ static void pc_xen_hvm_init(MachineState *machine)
pc_init1(machine, TYPE_I440FX_PCI_DEVICE); \
} \
DEFINE_PC_MACHINE(suffix, name, pc_init_##suffix, optionfn, \
- TYPE_PC_MACHINE)
+ TYPE_PC_PCI_MACHINE)
static void pc_i440fx_machine_options(MachineClass *m)
{
@@ -838,7 +838,7 @@ static void xenfv_4_2_machine_options(MachineClass *m)
}
DEFINE_PC_MACHINE(xenfv_4_2, "xenfv-4.2", pc_xen_hvm_init,
- xenfv_4_2_machine_options, TYPE_PC_MACHINE);
+ xenfv_4_2_machine_options, TYPE_PC_PCI_MACHINE);
static void xenfv_3_1_machine_options(MachineClass *m)
{
@@ -850,5 +850,5 @@ static void xenfv_3_1_machine_options(MachineClass *m)
}
DEFINE_PC_MACHINE(xenfv, "xenfv-3.1", pc_xen_hvm_init,
- xenfv_3_1_machine_options, TYPE_PC_MACHINE);
+ xenfv_3_1_machine_options, TYPE_PC_PCI_MACHINE);
#endif
@@ -339,7 +339,7 @@ static void pc_q35_init(MachineState *machine)
pc_q35_init(machine); \
} \
DEFINE_PC_MACHINE(suffix, name, pc_init_##suffix, optionfn, \
- TYPE_PC_MACHINE)
+ TYPE_PC_PCI_MACHINE)
static void pc_q35_machine_options(MachineClass *m)
Introduce TYPE_PC_PCI_MACHINE for machines where PCI is expected (as opposition to the ISA-only PC machine). This type inherits from the well known TYPE_PC_MACHINE. Convert I440FX/PIIX and Q35 machines to use it. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- include/hw/i386/pc.h | 25 ++++++++++++++++--------- hw/i386/pc.c | 25 +++++++++++++++++++++++++ hw/i386/pc_piix.c | 6 +++--- hw/i386/pc_q35.c | 2 +- 4 files changed, 45 insertions(+), 13 deletions(-)