hw/isa/piix3: Inline and remove piix3_create()
During the previous changesets piix3_create() became a trivial wrapper around more generic functions. Modernize the code. Signed-off-by: Bernhard Beschow <shentey@gmail.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Message-Id: <20220603185045.143789-12-shentey@gmail.com> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
This commit is contained in:
parent
6e8791fb61
commit
988fb61321
@ -197,6 +197,9 @@ static void pc_init1(MachineState *machine,
|
||||
|
||||
if (pcmc->pci_enabled) {
|
||||
PIIX3State *piix3;
|
||||
PCIDevice *pci_dev;
|
||||
const char *type = xen_enabled() ? TYPE_PIIX3_XEN_DEVICE
|
||||
: TYPE_PIIX3_DEVICE;
|
||||
|
||||
pci_bus = i440fx_init(host_type,
|
||||
pci_type,
|
||||
@ -207,7 +210,8 @@ static void pc_init1(MachineState *machine,
|
||||
pci_memory, ram_memory);
|
||||
pcms->bus = pci_bus;
|
||||
|
||||
piix3 = piix3_create(pci_bus);
|
||||
pci_dev = pci_create_simple_multifunction(pci_bus, -1, true, type);
|
||||
piix3 = PIIX3_PCI_DEVICE(pci_dev);
|
||||
piix3->pic = x86ms->gsi;
|
||||
piix3_devfn = piix3->dev.devfn;
|
||||
isa_bus = ISA_BUS(qdev_get_child_bus(DEVICE(piix3), "isa.0"));
|
||||
|
@ -416,16 +416,3 @@ static void piix3_register_types(void)
|
||||
}
|
||||
|
||||
type_init(piix3_register_types)
|
||||
|
||||
PIIX3State *piix3_create(PCIBus *pci_bus)
|
||||
{
|
||||
PIIX3State *piix3;
|
||||
PCIDevice *pci_dev;
|
||||
const char *type = xen_enabled() ? TYPE_PIIX3_XEN_DEVICE
|
||||
: TYPE_PIIX3_DEVICE;
|
||||
|
||||
pci_dev = pci_create_simple_multifunction(pci_bus, -1, true, type);
|
||||
piix3 = PIIX3_PCI_DEVICE(pci_dev);
|
||||
|
||||
return piix3;
|
||||
}
|
||||
|
@ -68,6 +68,4 @@ DECLARE_INSTANCE_CHECKER(PIIX3State, PIIX3_PCI_DEVICE,
|
||||
#define TYPE_PIIX3_XEN_DEVICE "PIIX3-xen"
|
||||
#define TYPE_PIIX4_PCI_DEVICE "piix4-isa"
|
||||
|
||||
PIIX3State *piix3_create(PCIBus *pci_bus);
|
||||
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user