Initialize global variables separately from net_init_clients, so that calling net_cleanup does not crash miserably.
Signed-off-by: Paolo Bonzini <[email protected]> --- hw/net/xen_nic.c | 20 ++++++++++---------- include/net/net.h | 1 + net/net.c | 5 ++++- softmmu/runstate.c | 1 + 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/hw/net/xen_nic.c b/hw/net/xen_nic.c index 5c815b4f0c..cd8f1edb29 100644 --- a/hw/net/xen_nic.c +++ b/hw/net/xen_nic.c @@ -275,7 +275,7 @@ static NetClientInfo net_xen_info = { .receive = net_rx_packet, }; -static int net_init(struct XenLegacyDevice *xendev) +static int xen_net_init(struct XenLegacyDevice *xendev) { struct XenNetDev *netdev = container_of(xendev, struct XenNetDev, xendev); @@ -307,7 +307,7 @@ static int net_init(struct XenLegacyDevice *xendev) return 0; } -static int net_connect(struct XenLegacyDevice *xendev) +static int xen_net_connect(struct XenLegacyDevice *xendev) { struct XenNetDev *netdev = container_of(xendev, struct XenNetDev, xendev); int rx_copy; @@ -362,7 +362,7 @@ static int net_connect(struct XenLegacyDevice *xendev) return 0; } -static void net_disconnect(struct XenLegacyDevice *xendev) +static void xen_net_disconnect(struct XenLegacyDevice *xendev) { struct XenNetDev *netdev = container_of(xendev, struct XenNetDev, xendev); @@ -378,14 +378,14 @@ static void net_disconnect(struct XenLegacyDevice *xendev) } } -static void net_event(struct XenLegacyDevice *xendev) +static void xen_net_event(struct XenLegacyDevice *xendev) { struct XenNetDev *netdev = container_of(xendev, struct XenNetDev, xendev); net_tx_packets(netdev); qemu_flush_queued_packets(qemu_get_queue(netdev->nic)); } -static int net_free(struct XenLegacyDevice *xendev) +static int xen_net_free(struct XenLegacyDevice *xendev) { struct XenNetDev *netdev = container_of(xendev, struct XenNetDev, xendev); @@ -403,9 +403,9 @@ static int net_free(struct XenLegacyDevice *xendev) struct XenDevOps xen_netdev_ops = { .size = sizeof(struct XenNetDev), .flags = DEVOPS_FLAG_NEED_GNTDEV, - .init = net_init, - .initialise = net_connect, - .event = net_event, - .disconnect = net_disconnect, - .free = net_free, + .init = xen_net_init, + .initialise = xen_net_connect, + .event = xen_net_event, + .disconnect = xen_net_disconnect, + .free = xen_net_free, }; diff --git a/include/net/net.h b/include/net/net.h index 523136c7ac..463a2c6de5 100644 --- a/include/net/net.h +++ b/include/net/net.h @@ -216,6 +216,7 @@ extern const char *host_net_devices[]; /* from net.c */ int net_client_parse(QemuOptsList *opts_list, const char *str); void show_netdevs(void); +void net_init(void); int net_init_clients(Error **errp); void net_check_clients(void); void net_cleanup(void); diff --git a/net/net.c b/net/net.c index f0d14dbfc1..82406a1851 100644 --- a/net/net.c +++ b/net/net.c @@ -1551,13 +1551,16 @@ out: return ret; } -int net_init_clients(Error **errp) +void net_init(void) { net_change_state_entry = qemu_add_vm_change_state_handler(net_vm_change_state_handler, NULL); QTAILQ_INIT(&net_clients); +} +int net_init_clients(Error **errp) +{ if (qemu_opts_foreach(qemu_find_opts("netdev"), net_init_netdev, NULL, errp)) { return -1; diff --git a/softmmu/runstate.c b/softmmu/runstate.c index 10d9b7365a..0ba7828155 100644 --- a/softmmu/runstate.c +++ b/softmmu/runstate.c @@ -776,6 +776,7 @@ void qemu_init_subsystems(void) bdrv_init_with_whitelist(); socket_init(); + net_init(); } -- 2.31.1
