[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/11] malta: give ISA bus to ISA methods
From: |
Hervé Poussineau |
Subject: |
[Qemu-devel] [PATCH 08/11] malta: give ISA bus to ISA methods |
Date: |
Mon, 24 Oct 2011 22:18:22 +0200 |
Signed-off-by: Hervé Poussineau <address@hidden>
---
hw/mips_malta.c | 3 +--
hw/pc.h | 2 +-
hw/piix4.c | 3 ++-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/mips_malta.c b/hw/mips_malta.c
index 98177f3..78d99e7 100644
--- a/hw/mips_malta.c
+++ b/hw/mips_malta.c
@@ -941,8 +941,7 @@ void mips_malta_init (ram_addr_t ram_size,
/* Southbridge */
ide_drive_get(hd, MAX_IDE_BUS);
- piix4_devfn = piix4_init(pci_bus, 80);
- isa_bus = NULL;
+ piix4_devfn = piix4_init(pci_bus, &isa_bus, 80);
/* Interrupt controller */
/* The 8259 is attached to the MIPS CPU INT0 pin, ie interrupt 2 */
diff --git a/hw/pc.h b/hw/pc.h
index 127940c..bc67b2b 100644
--- a/hw/pc.h
+++ b/hw/pc.h
@@ -194,7 +194,7 @@ PCIBus *i440fx_init(PCII440FXState **pi440fx_state, int
*piix_devfn,
/* piix4.c */
extern PCIDevice *piix4_dev;
-int piix4_init(PCIBus *bus, int devfn);
+int piix4_init(PCIBus *bus, ISABus **isa_bus, int devfn);
/* vga.c */
enum vga_retrace_method {
diff --git a/hw/piix4.c b/hw/piix4.c
index 2fd1171..51af459 100644
--- a/hw/piix4.c
+++ b/hw/piix4.c
@@ -93,11 +93,12 @@ static int piix4_initfn(PCIDevice *dev)
return 0;
}
-int piix4_init(PCIBus *bus, int devfn)
+int piix4_init(PCIBus *bus, ISABus **isa_bus, int devfn)
{
PCIDevice *d;
d = pci_create_simple_multifunction(bus, devfn, true, "PIIX4");
+ *isa_bus = DO_UPCAST(ISABus, qbus, qdev_get_child_bus(&d->qdev, "isa.0"));
return d->devfn;
}
--
1.7.6.3
- [Qemu-devel] [PATCH 00/11] isa: preliminary work for multiple buses, Hervé Poussineau, 2011/10/24
- [Qemu-devel] [PATCH 02/11] isa: move ISABus structure definition to header file, Hervé Poussineau, 2011/10/24
- [Qemu-devel] [PATCH 04/11] pc: give ISA bus to ISA methods, Hervé Poussineau, 2011/10/24
- [Qemu-devel] [PATCH 08/11] malta: give ISA bus to ISA methods,
Hervé Poussineau <=
- [Qemu-devel] [PATCH 07/11] fulong2e: give ISA bus to ISA methods, Hervé Poussineau, 2011/10/24
- [Qemu-devel] [PATCH 06/11] sun4u: give ISA bus to ISA methods, Hervé Poussineau, 2011/10/24
- [Qemu-devel] [PATCH 05/11] alpha: give ISA bus to ISA methods, Hervé Poussineau, 2011/10/24
- [Qemu-devel] [PATCH 03/11] i8259: give ISA device to isa_register_ioport(), Hervé Poussineau, 2011/10/24
- [Qemu-devel] [PATCH 09/11] isa: always use provided ISA bus when creating an isa device, Hervé Poussineau, 2011/10/24
- [Qemu-devel] [PATCH 01/11] isa: give ISABus/ISADevice to isa_create(), isa_bus_irqs() and isa_get_irq() functions, Hervé Poussineau, 2011/10/24
- [Qemu-devel] [PATCH 11/11] audio: remove unused parameter isa_pic, Hervé Poussineau, 2011/10/24
- [Qemu-devel] [PATCH 10/11] isa: always use provided ISA bus in isa_bus_irqs(), Hervé Poussineau, 2011/10/24
- Re: [Qemu-devel] [PATCH 00/11] isa: preliminary work for multiple buses, Hervé Poussineau, 2011/10/28