openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

pc: give ISA bus to ISA methods 

Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Hervé Poussineau 2011-12-15 22:09:54 +01:00 committed by Anthony Liguori
parent a811f53ccb
commit 605730793d
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/pc.h
View File

@ -183,7 +183,7 @@ struct PCII440FXState;
typedef struct PCII440FXState PCII440FXState; typedef struct PCII440FXState PCII440FXState;
PCIBus *i440fx_init(PCII440FXState **pi440fx_state, int *piix_devfn, PCIBus *i440fx_init(PCII440FXState **pi440fx_state, int *piix_devfn,
qemu_irq *pic, ISABus **isa_bus, qemu_irq *pic,
MemoryRegion *address_space_mem, MemoryRegion *address_space_mem,
MemoryRegion *address_space_io, MemoryRegion *address_space_io,
ram_addr_t ram_size, ram_addr_t ram_size,

3
hw/pc_piix.c
View File

@ -137,7 +137,7 @@ static void pc_init1(MemoryRegion *system_memory,
gsi = qemu_allocate_irqs(gsi_handler, gsi_state, GSI_NUM_PINS); gsi = qemu_allocate_irqs(gsi_handler, gsi_state, GSI_NUM_PINS);
if (pci_enabled) { if (pci_enabled) {
pci_bus = i440fx_init(&i440fx_state, &piix3_devfn, gsi, pci_bus = i440fx_init(&i440fx_state, &piix3_devfn, &isa_bus, gsi,
system_memory, system_io, ram_size, system_memory, system_io, ram_size,
below_4g_mem_size, below_4g_mem_size,
0x100000000ULL - below_4g_mem_size, 0x100000000ULL - below_4g_mem_size,
@ -146,7 +146,6 @@ static void pc_init1(MemoryRegion *system_memory,
? 0 ? 0
: ((uint64_t)1 << 62)), : ((uint64_t)1 << 62)),
pci_memory, ram_memory); pci_memory, ram_memory);
isa_bus = NULL;
} else { } else {
pci_bus = NULL; pci_bus = NULL;
i440fx_state = NULL; i440fx_state = NULL;

8
hw/piix_pci.c
View File

@ -252,7 +252,7 @@ static int i440fx_initfn(PCIDevice *dev)
static PCIBus *i440fx_common_init(const char *device_name, static PCIBus *i440fx_common_init(const char *device_name,
PCII440FXState **pi440fx_state, PCII440FXState **pi440fx_state,
int *piix3_devfn, int *piix3_devfn,
qemu_irq *pic, ISABus **isa_bus, qemu_irq *pic,
MemoryRegion *address_space_mem, MemoryRegion *address_space_mem,
MemoryRegion *address_space_io, MemoryRegion *address_space_io,
ram_addr_t ram_size, ram_addr_t ram_size,
@ -318,6 +318,8 @@ static PCIBus *i440fx_common_init(const char *device_name,
} }
qdev_property_add_child(dev, "piix3", &piix3->dev.qdev, NULL); qdev_property_add_child(dev, "piix3", &piix3->dev.qdev, NULL);
piix3->pic = pic; piix3->pic = pic;
*isa_bus = DO_UPCAST(ISABus, qbus,
qdev_get_child_bus(&piix3->dev.qdev, "isa.0"));
*piix3_devfn = piix3->dev.devfn; *piix3_devfn = piix3->dev.devfn;
@ -332,7 +334,7 @@ static PCIBus *i440fx_common_init(const char *device_name,
} }
PCIBus *i440fx_init(PCII440FXState **pi440fx_state, int *piix3_devfn, PCIBus *i440fx_init(PCII440FXState **pi440fx_state, int *piix3_devfn,
qemu_irq *pic, ISABus **isa_bus, qemu_irq *pic,
MemoryRegion *address_space_mem, MemoryRegion *address_space_mem,
MemoryRegion *address_space_io, MemoryRegion *address_space_io,
ram_addr_t ram_size, ram_addr_t ram_size,
@ -345,7 +347,7 @@ PCIBus *i440fx_init(PCII440FXState **pi440fx_state, int *piix3_devfn,
{ {
PCIBus *b; PCIBus *b;
b = i440fx_common_init("i440FX", pi440fx_state, piix3_devfn, pic, b = i440fx_common_init("i440FX", pi440fx_state, piix3_devfn, isa_bus, pic,
address_space_mem, address_space_io, ram_size, address_space_mem, address_space_io, ram_size,
pci_hole_start, pci_hole_size, pci_hole_start, pci_hole_size,
pci_hole64_size, pci_hole64_size, pci_hole64_size, pci_hole64_size,