diff options
| author | Avi Kivity <avi@redhat.com> | 2011-04-04 18:28:00 +0300 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2011-04-07 13:56:45 +0300 |
| commit | e30376da4b7ba5c5d0ea7ce49d775ce38e5194c8 (patch) | |
| tree | c076ca039b0b57741571e021838c4bf51bca1742 /hw/cirrus_vga.c | |
| parent | f5de212c4c022dd5eb49e9223201bb702d9f33ab (diff) | |
| download | qemu-e30376da4b7ba5c5d0ea7ce49d775ce38e5194c8.tar.gz | |
cirrus-vga: convert to pci_register_bar_simple()
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw/cirrus_vga.c')
| -rw-r--r-- | hw/cirrus_vga.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c index 7212849567..722cac7544 100644 --- a/hw/cirrus_vga.c +++ b/hw/cirrus_vga.c @@ -3081,15 +3081,6 @@ static void cirrus_pci_lfb_map(PCIDevice *d, int region_num, vga_dirty_log_start(&s->vga); } -static void cirrus_pci_mmio_map(PCIDevice *d, int region_num, - pcibus_t addr, pcibus_t size, int type) -{ - CirrusVGAState *s = &DO_UPCAST(PCICirrusVGAState, dev, d)->cirrus_vga; - - cpu_register_physical_memory(addr, CIRRUS_PNPMMIO_SIZE, - s->cirrus_mmio_io_addr); -} - static void pci_cirrus_write_config(PCIDevice *d, uint32_t address, uint32_t val, int len) { @@ -3128,8 +3119,8 @@ static int pci_cirrus_vga_initfn(PCIDevice *dev) pci_register_bar(&d->dev, 0, 0x2000000, PCI_BASE_ADDRESS_MEM_PREFETCH, cirrus_pci_lfb_map); if (device_id == CIRRUS_ID_CLGD5446) { - pci_register_bar(&d->dev, 1, CIRRUS_PNPMMIO_SIZE, - PCI_BASE_ADDRESS_SPACE_MEMORY, cirrus_pci_mmio_map); + pci_register_bar_simple(&d->dev, 1, CIRRUS_PNPMMIO_SIZE, 0, + s->cirrus_mmio_io_addr); } return 0; } |