mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dp8393x: convert to memory API

Browse Source 
Fixes address space leak on hotunplug.

Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Avi Kivity 2011-11-09 18:22:37 +02:00
parent df182043ab
commit 024e5bb664
3 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
hw/dp8393x.c
View File

@ -156,7 +156,8 @@ typedef struct dp8393xState {
int64_t wt_last_update; int64_t wt_last_update;
NICConf conf; NICConf conf;
NICState *nic; NICState *nic;
int mmio_index; MemoryRegion *address_space;
MemoryRegion mmio;
/* Registers */ /* Registers */
uint8_t cam[16][6]; uint8_t cam[16][6];
@ -664,16 +665,12 @@ static void dp8393x_writel(void *opaque, target_phys_addr_t addr, uint32_t val)
dp8393x_writew(opaque, addr + 2, (val >> 16) & 0xffff); dp8393x_writew(opaque, addr + 2, (val >> 16) & 0xffff);
} }
static CPUReadMemoryFunc * const dp8393x_read[3] = { static const MemoryRegionOps dp8393x_ops = {
dp8393x_readb, .old_mmio = {
dp8393x_readw, .read = { dp8393x_readb, dp8393x_readw, dp8393x_readl, },
dp8393x_readl, .write = { dp8393x_writeb, dp8393x_writew, dp8393x_writel, },
}; },
.endianness = DEVICE_NATIVE_ENDIAN,
static CPUWriteMemoryFunc * const dp8393x_write[3] = {
dp8393x_writeb,
dp8393x_writew,
dp8393x_writel,
}; };
static int nic_can_receive(VLANClientState *nc) static int nic_can_receive(VLANClientState *nc)
@ -865,7 +862,8 @@ static void nic_cleanup(VLANClientState *nc)
{ {
dp8393xState *s = DO_UPCAST(NICState, nc, nc)->opaque; dp8393xState *s = DO_UPCAST(NICState, nc, nc)->opaque;
cpu_unregister_io_memory(s->mmio_index); memory_region_del_subregion(s->address_space, &s->mmio);
memory_region_destroy(&s->mmio);
qemu_del_timer(s->watchdog); qemu_del_timer(s->watchdog);
qemu_free_timer(s->watchdog); qemu_free_timer(s->watchdog);
@ -882,6 +880,7 @@ static NetClientInfo net_dp83932_info = {
}; };
void dp83932_init(NICInfo *nd, target_phys_addr_t base, int it_shift, void dp83932_init(NICInfo *nd, target_phys_addr_t base, int it_shift,
MemoryRegion *address_space,
qemu_irq irq, void* mem_opaque, qemu_irq irq, void* mem_opaque,
void (*memory_rw)(void *opaque, target_phys_addr_t addr, uint8_t *buf, int len, int is_write)) void (*memory_rw)(void *opaque, target_phys_addr_t addr, uint8_t *buf, int len, int is_write))
{ {
@ -891,6 +890,7 @@ void dp83932_init(NICInfo *nd, target_phys_addr_t base, int it_shift,
s = g_malloc0(sizeof(dp8393xState)); s = g_malloc0(sizeof(dp8393xState));
s->address_space = address_space;
s->mem_opaque = mem_opaque; s->mem_opaque = mem_opaque;
s->memory_rw = memory_rw; s->memory_rw = memory_rw;
s->it_shift = it_shift; s->it_shift = it_shift;
@ -908,7 +908,7 @@ void dp83932_init(NICInfo *nd, target_phys_addr_t base, int it_shift,
qemu_register_reset(nic_reset, s); qemu_register_reset(nic_reset, s);
nic_reset(s); nic_reset(s);
s->mmio_index = cpu_register_io_memory(dp8393x_read, dp8393x_write, s, memory_region_init_io(&s->mmio, &dp8393x_ops, s,
DEVICE_NATIVE_ENDIAN); "dp8393x", 0x40 << it_shift);
cpu_register_physical_memory(base, 0x40 << it_shift, s->mmio_index); memory_region_add_subregion(address_space, base, &s->mmio);
} }

1
hw/mips.h
View File

@ -25,6 +25,7 @@ void *rc4030_init(qemu_irq timer, qemu_irq jazz_bus,
/* dp8393x.c */ /* dp8393x.c */
void dp83932_init(NICInfo *nd, target_phys_addr_t base, int it_shift, void dp83932_init(NICInfo *nd, target_phys_addr_t base, int it_shift,
MemoryRegion *address_space,
qemu_irq irq, void* mem_opaque, qemu_irq irq, void* mem_opaque,
void (*memory_rw)(void *opaque, target_phys_addr_t addr, uint8_t *buf, int len, int is_write)); void (*memory_rw)(void *opaque, target_phys_addr_t addr, uint8_t *buf, int len, int is_write));

2
hw/mips_jazz.c
View File

@ -227,7 +227,7 @@ static void mips_jazz_init(MemoryRegion *address_space,
if (!nd->model) if (!nd->model)
nd->model = g_strdup("dp83932"); nd->model = g_strdup("dp83932");
if (strcmp(nd->model, "dp83932") == 0) { if (strcmp(nd->model, "dp83932") == 0) {
dp83932_init(nd, 0x80001000, 2, rc4030[4], dp83932_init(nd, 0x80001000, 2, get_system_memory(), rc4030[4],
rc4030_opaque, rc4030_dma_memory_rw); rc4030_opaque, rc4030_dma_memory_rw);
break; break;
} else if (strcmp(nd->model, "?") == 0) { } else if (strcmp(nd->model, "?") == 0) {