Patchwork [02/10] rtl8139: convert to pci_register_bar_simple()

login
register
mail settings
Submitter Avi Kivity
Date April 4, 2011, 3:27 p.m.
Message ID <1301930887-20705-3-git-send-email-avi@redhat.com>
Download mbox | patch
Permalink /patch/89652/
State New
Headers show

Comments

Avi Kivity - April 4, 2011, 3:27 p.m.
Signed-off-by: Avi Kivity <avi@redhat.com>
---
 hw/rtl8139.c |   11 +----------
 1 files changed, 1 insertions(+), 10 deletions(-)

Patch

diff --git a/hw/rtl8139.c b/hw/rtl8139.c
index d545933..822038d 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);