OSDN Git Service

nic: do not destroy memory regions in cleanup functions
authorPaolo Bonzini <pbonzini@redhat.com>
Wed, 11 Jun 2014 10:23:03 +0000 (12:23 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Sun, 17 Aug 2014 21:25:24 +0000 (23:25 +0200)
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>
hw/net/dp8393x.c
hw/net/mcf_fec.c

index 789d385..7eab7ad 100644 (file)
@@ -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);
 
index 4bff3de..22cd7cf 100644 (file)
@@ -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);
 }