[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/3] Convert RTL8139 to use PCI memory regitration f
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH 3/3] Convert RTL8139 to use PCI memory regitration facility |
Date: |
Sun, 24 May 2009 12:29:35 +0300 |
Signed-off-by: Avi Kivity <address@hidden>
---
hw/rtl8139.c | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/hw/rtl8139.c b/hw/rtl8139.c
index c0be1de..f2bc072 100644
--- a/hw/rtl8139.c
+++ b/hw/rtl8139.c
@@ -467,6 +467,7 @@ typedef struct RTL8139State {
VLANClientState *vc;
uint8_t macaddr[6];
int rtl8139_mmio_io_addr;
+ PCIIORegionComponent *pci_mem;
/* C ring mode */
uint32_t currTxDesc;
@@ -3324,15 +3325,6 @@ typedef struct PCIRTL8139State {
RTL8139State rtl8139;
} PCIRTL8139State;
-static void rtl8139_mmio_map(PCIDevice *pci_dev, int region_num,
- uint32_t addr, uint32_t size, int type)
-{
- PCIRTL8139State *d = (PCIRTL8139State *)pci_dev;
- RTL8139State *s = &d->rtl8139;
-
- cpu_register_physical_memory(addr + 0, 0x100, s->rtl8139_mmio_io_addr);
-}
-
static void rtl8139_ioport_map(PCIDevice *pci_dev, int region_num,
uint32_t addr, uint32_t size, int type)
{
@@ -3476,7 +3468,10 @@ PCIDevice *pci_rtl8139_init(PCIBus *bus, NICInfo *nd,
int devfn)
PCI_ADDRESS_SPACE_IO, rtl8139_ioport_map);
pci_register_io_region(&d->dev, 1, 0x100,
- PCI_ADDRESS_SPACE_MEM, rtl8139_mmio_map);
+ PCI_ADDRESS_SPACE_MEM, NULL);
+
+ s->pci_mem = pci_register_physical_memory(&d->dev, 1, 0x100,
+ s->rtl8139_mmio_io_addr);
s->pci_dev = (PCIDevice *)d;
memcpy(s->macaddr, nd->macaddr, 6);
--
1.6.0.6
- Re: [Qemu-devel] [PATCH 2/3] Add PCI memory region registration, (continued)
- Re: [Qemu-devel] [PATCH 2/3] Add PCI memory region registration, Anthony Liguori, 2009/05/27
- Re: [Qemu-devel] [PATCH 2/3] Add PCI memory region registration, Avi Kivity, 2009/05/27
- Re: [Qemu-devel] [PATCH 2/3] Add PCI memory region registration, Anthony Liguori, 2009/05/27
- Re: [Qemu-devel] [PATCH 2/3] Add PCI memory region registration, Avi Kivity, 2009/05/27
- Re: [Qemu-devel] [PATCH 2/3] Add PCI memory region registration, Anthony Liguori, 2009/05/27
- Re: [Qemu-devel] [PATCH 2/3] Add PCI memory region registration, Christoph Hellwig, 2009/05/31
- Re: [Qemu-devel] [PATCH 2/3] Add PCI memory region registration, Avi Kivity, 2009/05/31
- Re: [Qemu-devel] [PATCH 2/3] Add PCI memory region registration, Avi Kivity, 2009/05/31
- Re: [Qemu-devel] [PATCH 2/3] Add PCI memory region registration, Anthony Liguori, 2009/05/31
- Re: [Qemu-devel] [PATCH 2/3] Add PCI memory region registration, Avi Kivity, 2009/05/31
[Qemu-devel] [PATCH 3/3] Convert RTL8139 to use PCI memory regitration facility,
Avi Kivity <=
Re: [Qemu-devel] [PATCH 0/3] Object-based physical memory management, Anthony Liguori, 2009/05/27