diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2014-06-11 12:23:03 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-08-17 23:25:24 +0200 |
| commit | eed79309502034d348880414e1dc156c0c4b196c (patch) | |
| tree | 6d9fec77a7cac7a09a2143314ceabde24a4fe4cc | |
| parent | ad37168cbdaff061fd7c37be57de4692bd8c2c50 (diff) | |
| download | qemu-eed79309502034d348880414e1dc156c0c4b196c.zip qemu-eed79309502034d348880414e1dc156c0c4b196c.tar.gz qemu-eed79309502034d348880414e1dc156c0c4b196c.tar.bz2 | |
nic: do not destroy memory regions in cleanup functions
The memory regions should be destroyed in the unrealize function;
since these NICs are not even qdev-ified, they cannot be unplugged
and they do not have to do anything to destroy their memory regions.
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | hw/net/dp8393x.c | 3 | ||||
| -rw-r--r-- | hw/net/mcf_fec.c | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c index 789d385..7eab7ad 100644 --- a/hw/net/dp8393x.c +++ b/hw/net/dp8393x.c @@ -863,9 +863,6 @@ static void nic_cleanup(NetClientState *nc) { dp8393xState *s = qemu_get_nic_opaque(nc); - memory_region_del_subregion(s->address_space, &s->mmio); - memory_region_destroy(&s->mmio); - timer_del(s->watchdog); timer_free(s->watchdog); diff --git a/hw/net/mcf_fec.c b/hw/net/mcf_fec.c index 4bff3de..22cd7cf 100644 --- a/hw/net/mcf_fec.c +++ b/hw/net/mcf_fec.c @@ -443,9 +443,6 @@ static void mcf_fec_cleanup(NetClientState *nc) { mcf_fec_state *s = qemu_get_nic_opaque(nc); - memory_region_del_subregion(s->sysmem, &s->iomem); - memory_region_destroy(&s->iomem); - g_free(s); } |