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/e1000.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/e1000.c')
| -rw-r--r-- | hw/e1000.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/e1000.c b/hw/e1000.c index 7811699ea9..57d08cfa35 100644 --- a/hw/e1000.c +++ b/hw/e1000.c @@ -1133,10 +1133,10 @@ static int pci_e1000_init(PCIDevice *pci_dev) d->mmio_index = cpu_register_io_memory(e1000_mmio_read, e1000_mmio_write, d); - pci_register_bar((PCIDevice *)d, 0, PNPMMIO_SIZE, + pci_register_bar(&d->dev, 0, PNPMMIO_SIZE, PCI_BASE_ADDRESS_SPACE_MEMORY, e1000_mmio_map); - pci_register_bar((PCIDevice *)d, 1, IOPORT_SIZE, + pci_register_bar(&d->dev, 1, IOPORT_SIZE, PCI_BASE_ADDRESS_SPACE_IO, ioport_map); memmove(d->eeprom_data, e1000_eeprom_template, |