OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

hw/isa/piix3: Factor out ISABus retrieval from piix3_create() 

Modernizes the code.

Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-Id: <20220603185045.143789-11-shentey@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
This commit is contained in:
Bernhard Beschow 2022-06-03 20:50:44 +02:00 committed by Philippe Mathieu-Daudé
parent fe3055d292
commit 6e8791fb61
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/i386/pc_piix.c
View File

@ -207,9 +207,10 @@ static void pc_init1(MachineState *machine,
pci_memory, ram_memory); pci_memory, ram_memory);
pcms->bus = pci_bus; pcms->bus = pci_bus;
piix3 = piix3_create(pci_bus, &isa_bus); piix3 = piix3_create(pci_bus);
piix3->pic = x86ms->gsi; piix3->pic = x86ms->gsi;
piix3_devfn = piix3->dev.devfn; piix3_devfn = piix3->dev.devfn;
isa_bus = ISA_BUS(qdev_get_child_bus(DEVICE(piix3), "isa.0"));
} else { } else {
pci_bus = NULL; pci_bus = NULL;
i440fx_state = NULL; i440fx_state = NULL;

3
hw/isa/piix3.c
View File

@ -417,7 +417,7 @@ static void piix3_register_types(void)
type_init(piix3_register_types) type_init(piix3_register_types)
PIIX3State *piix3_create(PCIBus *pci_bus, ISABus **isa_bus) PIIX3State *piix3_create(PCIBus *pci_bus)
{ {
PIIX3State *piix3; PIIX3State *piix3;
PCIDevice *pci_dev; PCIDevice *pci_dev;
@ -426,7 +426,6 @@ PIIX3State *piix3_create(PCIBus *pci_bus, ISABus **isa_bus)
pci_dev = pci_create_simple_multifunction(pci_bus, -1, true, type); pci_dev = pci_create_simple_multifunction(pci_bus, -1, true, type);
piix3 = PIIX3_PCI_DEVICE(pci_dev); piix3 = PIIX3_PCI_DEVICE(pci_dev);
*isa_bus = ISA_BUS(qdev_get_child_bus(DEVICE(piix3), "isa.0"));
return piix3; return piix3;
} }

2
include/hw/southbridge/piix.h
View File

@ -68,6 +68,6 @@ DECLARE_INSTANCE_CHECKER(PIIX3State, PIIX3_PCI_DEVICE,
#define TYPE_PIIX3_XEN_DEVICE "PIIX3-xen" #define TYPE_PIIX3_XEN_DEVICE "PIIX3-xen"
#define TYPE_PIIX4_PCI_DEVICE "piix4-isa" #define TYPE_PIIX4_PCI_DEVICE "piix4-isa"
PIIX3State *piix3_create(PCIBus *pci_bus, ISABus **isa_bus); PIIX3State *piix3_create(PCIBus *pci_bus);
#endif #endif