Commit 1e39101c authored by Avi Kivity's avatar Avi Kivity Committed by Anthony Liguori
Browse files

pci: pass address space to pci bus when created 



This is now done sloppily, via get_system_memory().  Eventually callers
will be converted to stop using that.

Reviewed-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent 6bd10515

hw/apb_pci.c

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include "rwhandler.h"

#include "apb_pci.h"

#include "sysemu.h"

#include "exec-memory.h"



/* debug APB */

//#define DEBUG_APB
@@ -346,6 +347,7 @@ PCIBus *pci_apb_init(target_phys_addr_t special_base, 


    d->bus = pci_register_bus(&d->busdev.qdev, "pci",

                                         pci_apb_set_irq, pci_pbm_map_irq, d,

                                         get_system_memory(),

                                         0, 32);

    pci_bus_set_mem_base(d->bus, mem_base);

hw/bonito.c

+3 −1
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
#include "mips.h"

#include "pci_host.h"

#include "sysemu.h"

#include "exec-memory.h"



//#define DEBUG_BONITO
@@ -773,7 +774,8 @@ PCIBus *bonito_init(qemu_irq *pic) 
    dev = qdev_create(NULL, "Bonito-pcihost");

    pcihost = FROM_SYSBUS(BonitoState, sysbus_from_qdev(dev));

    b = pci_register_bus(&pcihost->busdev.qdev, "pci", pci_bonito_set_irq,

                         pci_bonito_map_irq, pic, 0x28, 32);

                         pci_bonito_map_irq, pic, get_system_memory(),

                         0x28, 32);

    pcihost->bus = b;

    qdev_init_nofail(dev);

hw/grackle_pci.c

+3 −2
Original line number Diff line number Diff line
@@ -61,7 +61,8 @@ static void pci_grackle_reset(void *opaque) 
{

}



PCIBus *pci_grackle_init(uint32_t base, qemu_irq *pic)

PCIBus *pci_grackle_init(uint32_t base, qemu_irq *pic,

                         MemoryRegion *address_space)

{

    DeviceState *dev;

    SysBusDevice *s;
@@ -74,7 +75,7 @@ PCIBus *pci_grackle_init(uint32_t base, qemu_irq *pic) 
    d->host_state.bus = pci_register_bus(&d->busdev.qdev, "pci",

                                         pci_grackle_set_irq,

                                         pci_grackle_map_irq,

                                         pic, 0, 4);

                                         pic, address_space, 0, 4);



    pci_create_simple(d->host_state.bus, 0, "grackle");

hw/gt64xxx.c

+3 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include "pci.h"

#include "pci_host.h"

#include "pc.h"

#include "exec-memory.h"



//#define DEBUG
@@ -1092,7 +1093,8 @@ PCIBus *gt64120_register(qemu_irq *pic) 
    d = FROM_SYSBUS(GT64120State, s);

    d->pci.bus = pci_register_bus(&d->busdev.qdev, "pci",

                                  gt64120_pci_set_irq, gt64120_pci_map_irq,

                                  pic, PCI_DEVFN(18, 0), 4);

                                  pic, get_system_memory(),

                                  PCI_DEVFN(18, 0), 4);

    d->ISD_handle = cpu_register_io_memory(gt64120_read, gt64120_write, d,

                                           DEVICE_NATIVE_ENDIAN);

hw/pc.h

+3 −1
Original line number Diff line number Diff line
@@ -178,7 +178,9 @@ int pcspk_audio_init(qemu_irq *pic); 
struct PCII440FXState;

typedef struct PCII440FXState PCII440FXState;



PCIBus *i440fx_init(PCII440FXState **pi440fx_state, int *piix_devfn, qemu_irq *pic, ram_addr_t ram_size);

PCIBus *i440fx_init(PCII440FXState **pi440fx_state, int *piix_devfn,

                    qemu_irq *pic, MemoryRegion *address_space,

                    ram_addr_t ram_size);

void i440fx_init_memory_mappings(PCII440FXState *d);



/* piix4.c */