[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 28/43] hw/isa/piix4: Move pci_ide_create_devs() call to board
From: |
Bernhard Beschow |
Subject: |
[PATCH v2 28/43] hw/isa/piix4: Move pci_ide_create_devs() call to board code |
Date: |
Sat, 22 Oct 2022 17:04:53 +0200 |
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>
---
hw/isa/piix4.c | 1 -
hw/mips/malta.c | 10 ++++++----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c
index 4b8dece257..a7389ff193 100644
--- a/hw/isa/piix4.c
+++ b/hw/isa/piix4.c
@@ -257,7 +257,6 @@ static void piix4_realize(PCIDevice *dev, Error **errp)
if (!qdev_realize(DEVICE(&s->ide), BUS(pci_bus), errp)) {
return;
}
- pci_ide_create_devs(PCI_DEVICE(&s->ide));
/* USB */
qdev_prop_set_int32(DEVICE(&s->uhci), "addr", dev->devfn + 2);
diff --git a/hw/mips/malta.c b/hw/mips/malta.c
index 0ec2ac2eaf..a4b866a2cf 100644
--- a/hw/mips/malta.c
+++ b/hw/mips/malta.c
@@ -39,7 +39,7 @@
#include "hw/pci/pci.h"
#include "qemu/log.h"
#include "hw/mips/bios.h"
-#include "hw/ide.h"
+#include "hw/ide/pci.h"
#include "hw/irq.h"
#include "hw/loader.h"
#include "elf.h"
@@ -1402,11 +1402,13 @@ void mips_malta_init(MachineState *machine)
/* Southbridge */
piix4 = pci_create_simple_multifunction(pci_bus, PCI_DEVFN(10, 0), true,
TYPE_PIIX4_PCI_DEVICE);
- dev = DEVICE(piix4);
- isa_bus = ISA_BUS(qdev_get_child_bus(dev, "isa.0"));
+ isa_bus = ISA_BUS(qdev_get_child_bus(DEVICE(piix4), "isa.0"));
+
+ dev = DEVICE(object_resolve_path_component(OBJECT(piix4), "ide"));
+ pci_ide_create_devs(PCI_DEVICE(dev));
/* 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 */
dev = DEVICE(object_resolve_path_component(OBJECT(piix4), "pm"));
--
2.38.1
- [PATCH v2 22/43] hw/isa/piix3: Rename piix3_reset() for sharing with PIIX4, (continued)
- [PATCH v2 22/43] hw/isa/piix3: Rename piix3_reset() for sharing with PIIX4, Bernhard Beschow, 2022/10/22
- [PATCH v2 23/43] hw/isa/piix3: Prefix pci_slot_get_pirq() with "piix3_", Bernhard Beschow, 2022/10/22
- [PATCH v2 24/43] hw/isa/piix3: Rename typedef PIIX3State to PIIXState, Bernhard Beschow, 2022/10/22
- [PATCH v2 25/43] hw/mips/malta: Reuse dev variable, Bernhard Beschow, 2022/10/22
- [PATCH v2 26/43] meson: Fix dependencies of piix4 southbridge, Bernhard Beschow, 2022/10/22
- [PATCH v2 27/43] hw/isa/piix4: Add missing initialization, Bernhard Beschow, 2022/10/22
- [PATCH v2 28/43] hw/isa/piix4: Move pci_ide_create_devs() call to board code,
Bernhard Beschow <=
- [PATCH v2 29/43] hw/isa/piix4: Make PIIX4's ACPI and USB functions optional, Bernhard Beschow, 2022/10/22
- [PATCH v2 30/43] hw/isa/piix4: Allow board to provide PCI interrupt routes, Bernhard Beschow, 2022/10/22
- [PATCH v2 31/43] hw/isa/piix4: Remove unused code, Bernhard Beschow, 2022/10/22
- [PATCH v2 32/43] hw/isa/piix4: Use ISA PIC device, Bernhard Beschow, 2022/10/22
- [PATCH v2 33/43] hw/isa/piix4: Reuse struct PIIXState from PIIX3, Bernhard Beschow, 2022/10/22
- [PATCH v2 34/43] hw/isa/piix4: Rename reset control operations to match PIIX3, Bernhard Beschow, 2022/10/22
- [PATCH v2 35/43] hw/isa/piix4: Prefix pci_slot_get_pirq() with "piix4_", Bernhard Beschow, 2022/10/22
- [PATCH v2 37/43] hw/isa/piix: Harmonize names of reset control memory regions, Bernhard Beschow, 2022/10/22