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>
This commit is contained in:
parent
ad37168cbd
commit
eed7930950
|
@ -863,9 +863,6 @@ static void nic_cleanup(NetClientState *nc)
|
||||||
{
|
{
|
||||||
dp8393xState *s = qemu_get_nic_opaque(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_del(s->watchdog);
|
||||||
timer_free(s->watchdog);
|
timer_free(s->watchdog);
|
||||||
|
|
||||||
|
|
|
@ -443,9 +443,6 @@ static void mcf_fec_cleanup(NetClientState *nc)
|
||||||
{
|
{
|
||||||
mcf_fec_state *s = qemu_get_nic_opaque(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);
|
g_free(s);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue