From f5de212c4c022dd5eb49e9223201bb702d9f33ab Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Mon, 4 Apr 2011 18:27:59 +0300 Subject: [PATCH] rtl8139: convert to pci_register_bar_simple() Signed-off-by: Avi Kivity Signed-off-by: Michael S. Tsirkin --- hw/rtl8139.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/hw/rtl8139.c b/hw/rtl8139.c index d5459336e5..822038daae 100644 --- a/hw/rtl8139.c +++ b/hw/rtl8139.c @@ -3341,14 +3341,6 @@ static const VMStateDescription vmstate_rtl8139 = { /***********************************************************/ /* PCI RTL8139 definitions */ -static void rtl8139_mmio_map(PCIDevice *pci_dev, int region_num, - pcibus_t addr, pcibus_t size, int type) -{ - RTL8139State *s = DO_UPCAST(RTL8139State, dev, pci_dev); - - cpu_register_physical_memory(addr + 0, 0x100, s->rtl8139_mmio_io_addr); -} - static void rtl8139_ioport_map(PCIDevice *pci_dev, int region_num, pcibus_t addr, pcibus_t size, int type) { @@ -3444,8 +3436,7 @@ static int pci_rtl8139_init(PCIDevice *dev) pci_register_bar(&s->dev, 0, 0x100, PCI_BASE_ADDRESS_SPACE_IO, rtl8139_ioport_map); - pci_register_bar(&s->dev, 1, 0x100, - PCI_BASE_ADDRESS_SPACE_MEMORY, rtl8139_mmio_map); + pci_register_bar_simple(&s->dev, 1, 0x100, 0, s->rtl8139_mmio_io_addr); qemu_macaddr_default_if_unset(&s->conf.macaddr);