diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2010-12-02 14:16:40 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-12-02 14:16:40 -0600 |
| commit | 19c71ff41c029517c11ae67d6fbcb093a5d1150f (patch) | |
| tree | c33443ac97aeb57341c2f24626cbc6d809fcdaca /hw/lsi53c895a.c | |
| parent | 393f398b69f9baadc3f29d822a0b5b74ca63b919 (diff) | |
| parent | 0c600ce2a7a419c7247b2ac63327dea5daa3d5a2 (diff) | |
| download | focaccia-qemu-19c71ff41c029517c11ae67d6fbcb093a5d1150f.tar.gz focaccia-qemu-19c71ff41c029517c11ae67d6fbcb093a5d1150f.zip | |
Merge remote branch 'mst/for_anthony' into staging
Diffstat (limited to 'hw/lsi53c895a.c')
| -rw-r--r-- | hw/lsi53c895a.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/hw/lsi53c895a.c b/hw/lsi53c895a.c index f97335eaa9..1aef62f9a6 100644 --- a/hw/lsi53c895a.c +++ b/hw/lsi53c895a.c @@ -2177,12 +2177,11 @@ static int lsi_scsi_init(PCIDevice *dev) s->ram_io_addr = cpu_register_io_memory(lsi_ram_readfn, lsi_ram_writefn, s); - /* TODO: use dev and get rid of cast below */ - pci_register_bar((struct PCIDevice *)s, 0, 256, + pci_register_bar(&s->dev, 0, 256, PCI_BASE_ADDRESS_SPACE_IO, lsi_io_mapfunc); - pci_register_bar((struct PCIDevice *)s, 1, 0x400, + pci_register_bar(&s->dev, 1, 0x400, PCI_BASE_ADDRESS_SPACE_MEMORY, lsi_mmio_mapfunc); - pci_register_bar((struct PCIDevice *)s, 2, 0x2000, + pci_register_bar(&s->dev, 2, 0x2000, PCI_BASE_ADDRESS_SPACE_MEMORY, lsi_ram_mapfunc); QTAILQ_INIT(&s->queue); |