Message ID | 54909B80.4030602@gmail.com |
---|---|
State | New |
Headers | show |
On Wed, Dec 17, 2014 at 04:52:16AM +0800, Chen Gang wrote: > net_init() and net_free() are pairs, net_connect() and net_disconnect() > are pairs. net_init() creates 'netdev->nic', so also need free it in > net_free(). > > Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com> > --- > hw/net/xen_nic.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) Thanks, applied to my net tree: https://github.com/stefanha/qemu/commits/net Stefan
diff --git a/hw/net/xen_nic.c b/hw/net/xen_nic.c index 7a57feb..8eaa77b 100644 --- a/hw/net/xen_nic.c +++ b/hw/net/xen_nic.c @@ -410,10 +410,6 @@ static void net_disconnect(struct XenDevice *xendev) xc_gnttab_munmap(netdev->xendev.gnttabdev, netdev->rxs, 1); netdev->rxs = NULL; } - if (netdev->nic) { - qemu_del_nic(netdev->nic); - netdev->nic = NULL; - } } static void net_event(struct XenDevice *xendev) @@ -427,6 +423,10 @@ static int net_free(struct XenDevice *xendev) { struct XenNetDev *netdev = container_of(xendev, struct XenNetDev, xendev); + if (netdev->nic) { + qemu_del_nic(netdev->nic); + netdev->nic = NULL; + } g_free(netdev->mac); return 0; }
net_init() and net_free() are pairs, net_connect() and net_disconnect() are pairs. net_init() creates 'netdev->nic', so also need free it in net_free(). Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com> --- hw/net/xen_nic.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)