diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-01-08 10:36:13 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-01-08 10:36:13 -0600 |
| commit | c3dd94b129e222e00a4ed00689e11afdd85c740f (patch) | |
| tree | b189ff27f0ce3ae57887515fb5b4f9d6eea1127f /vl.c | |
| parent | da1a4cef9e125a866f4ef9a39b342c2913727f70 (diff) | |
| parent | 83f58e570f21c3e7227e7fbef1fc0e18b5ed7ea9 (diff) | |
| download | focaccia-qemu-c3dd94b129e222e00a4ed00689e11afdd85c740f.tar.gz focaccia-qemu-c3dd94b129e222e00a4ed00689e11afdd85c740f.zip | |
Merge remote-tracking branch 'stefanha/net' into staging
* stefanha/net: rtl8139: preserve link state across device reset e1000: no need auto-negotiation if link was down net: clean up network at qemu process termination e1000: Discard oversized packets based on SBP|LPE Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'vl.c')
| -rw-r--r-- | vl.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/vl.c b/vl.c index f056c95807..79e5122393 100644 --- a/vl.c +++ b/vl.c @@ -3762,6 +3762,9 @@ int main(int argc, char **argv, char **envp) } configure_icount(icount_option); + /* clean up network at qemu process termination */ + atexit(&net_cleanup); + if (net_init_clients() < 0) { exit(1); } @@ -4014,7 +4017,6 @@ int main(int argc, char **argv, char **envp) main_loop(); bdrv_close_all(); pause_all_vcpus(); - net_cleanup(); res_free(); return 0; |