ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tap: use an exit notifier to call down_script 

We would like to move back net_cleanup() at the end of main function,
like it used to be until f30dbae63a, but minimum
tap cleanup is necessary regarless at exit() time. Use an exit notifier
to call TAP down_script. If net_cleanup() is called first, then remove
the exit notifier as it will become a dangling pointer otherwise.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20160711144847.16651-1-marcandre.lureau@redhat.com>
Reviewed-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Marc-André Lureau 2016-07-11 16:48:47 +02:00 committed by Paolo Bonzini
parent d27ba624aa
commit 9e32ff3299
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
net/tap.c
View File

@ -58,6 +58,7 @@ typedef struct TAPState {
bool enabled; bool enabled;
VHostNetState *vhost_net; VHostNetState *vhost_net;
unsigned host_vnet_hdr_len; unsigned host_vnet_hdr_len;
Notifier exit;
} TAPState; } TAPState;
static void launch_script(const char *setup_script, const char *ifname, static void launch_script(const char *setup_script, const char *ifname,
@ -292,10 +293,22 @@ static void tap_set_offload(NetClientState *nc, int csum, int tso4,
tap_fd_set_offload(s->fd, csum, tso4, tso6, ecn, ufo); tap_fd_set_offload(s->fd, csum, tso4, tso6, ecn, ufo);
} }
static void tap_exit_notify(Notifier *notifier, void *data)
{
TAPState *s = container_of(notifier, TAPState, exit);
Error *err = NULL;
if (s->down_script[0]) {
launch_script(s->down_script, s->down_script_arg, s->fd, &err);
if (err) {
error_report_err(err);
}
}
}
static void tap_cleanup(NetClientState *nc) static void tap_cleanup(NetClientState *nc)
{ {
TAPState *s = DO_UPCAST(TAPState, nc, nc); TAPState *s = DO_UPCAST(TAPState, nc, nc);
Error *err = NULL;
if (s->vhost_net) { if (s->vhost_net) {
vhost_net_cleanup(s->vhost_net); vhost_net_cleanup(s->vhost_net);
@ -304,12 +317,8 @@ static void tap_cleanup(NetClientState *nc)
qemu_purge_queued_packets(nc); qemu_purge_queued_packets(nc);
if (s->down_script[0]) { tap_exit_notify(&s->exit, NULL);
launch_script(s->down_script, s->down_script_arg, s->fd, &err); qemu_remove_exit_notifier(&s->exit);
if (err) {
error_report_err(err);
}
}
tap_read_poll(s, false); tap_read_poll(s, false);
tap_write_poll(s, false); tap_write_poll(s, false);
@ -379,6 +388,10 @@ static TAPState *net_tap_fd_init(NetClientState *peer,
} }
tap_read_poll(s, true); tap_read_poll(s, true);
s->vhost_net = NULL; s->vhost_net = NULL;
s->exit.notify = tap_exit_notify;
qemu_add_exit_notifier(&s->exit);
return s; return s;
} }