ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/isa/piix4: Move pci_ide_create_devs() call to board code 

For the VIA south bridges there was a comment to have the call in board code.
Move it there for PIIX4 as well for consistency.

Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20221022150508.26830-29-shentey@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
This commit is contained in:
Bernhard Beschow 2022-10-22 17:04:53 +02:00 committed by Philippe Mathieu-Daudé
parent a1c100d0fb
commit d240d3fb14
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/isa/piix4.c
View File

@ -257,7 +257,6 @@ static void piix4_realize(PCIDevice *dev, Error **errp)
if (!qdev_realize(DEVICE(&s->ide), BUS(pci_bus), errp)) { if (!qdev_realize(DEVICE(&s->ide), BUS(pci_bus), errp)) {
return; return;
} }
pci_ide_create_devs(PCI_DEVICE(&s->ide));
/* USB */ /* USB */
qdev_prop_set_int32(DEVICE(&s->uhci), "addr", dev->devfn + 2); qdev_prop_set_int32(DEVICE(&s->uhci), "addr", dev->devfn + 2);

10
hw/mips/malta.c
View File

@ -40,7 +40,7 @@
#include "hw/pci/pci.h" #include "hw/pci/pci.h"
#include "qemu/log.h" #include "qemu/log.h"
#include "hw/mips/bios.h" #include "hw/mips/bios.h"
#include "hw/ide.h" #include "hw/ide/pci.h"
#include "hw/irq.h" #include "hw/irq.h"
#include "hw/loader.h" #include "hw/loader.h"
#include "elf.h" #include "elf.h"
@ -1427,11 +1427,13 @@ void mips_malta_init(MachineState *machine)
/* Southbridge */ /* Southbridge */
piix4 = pci_create_simple_multifunction(pci_bus, PCI_DEVFN(10, 0), true, piix4 = pci_create_simple_multifunction(pci_bus, PCI_DEVFN(10, 0), true,
TYPE_PIIX4_PCI_DEVICE); TYPE_PIIX4_PCI_DEVICE);
dev = DEVICE(piix4); isa_bus = ISA_BUS(qdev_get_child_bus(DEVICE(piix4), "isa.0"));
isa_bus = ISA_BUS(qdev_get_child_bus(dev, "isa.0"));
dev = DEVICE(object_resolve_path_component(OBJECT(piix4), "ide"));
pci_ide_create_devs(PCI_DEVICE(dev));
/* Interrupt controller */ /* Interrupt controller */
qdev_connect_gpio_out_named(dev, "intr", 0, i8259_irq); qdev_connect_gpio_out_named(DEVICE(piix4), "intr", 0, i8259_irq);
/* generate SPD EEPROM data */ /* generate SPD EEPROM data */
dev = DEVICE(object_resolve_path_component(OBJECT(piix4), "pm")); dev = DEVICE(object_resolve_path_component(OBJECT(piix4), "pm"));