b987bd37c9
- fix I2C slave addressing (Juha Riihimaki) - Revert "vga: do not resize the screen on hw_invalidate" (Aurelien Jarno) - slirp: fix use-after-free (Mark McLoughlin) - Fix sparc.ld (Blue Swirl) - ELF codedump build failures (Laurent Desnogues) - kvm: Move KVM mp_state accessors to i386-specific code (Hollis Blanchard) - fix configure script with armv4l cpu (Laurent Desnogues) - net: disable draining tap queue in one go (Mark McLoughlin) - pcnet: Restart poll timer on pcnet_start (Jan Kiszka) - Sparc32: Fix lance (Blue Swirl) - mac99: fix segmentation fault on startup (Aurelien Jarno) - usb-linux.c: fix buffer overflow (Jim Paris) - ARM host: fix generated blocks linking (Laurent Desnogues) - qemu serial: lost tx irqs (affecting FreeBSD's new uart(4) driver) (Juergen Lock) - exec-all.h: increase MAX_OP_PER_INSTR to 96 from 64 (Aurelien Jarno) - Added a cherry picked commit from stable branch that fixes qcow2.
18 lines
412 B
Text
18 lines
412 B
Text
Index: qemu/net.c
|
|
@@ -1643,12 +1643,13 @@ static void tap_cleanup(VLANClientState
|
|
|
|
qemu_purge_queued_packets(vc);
|
|
|
|
- if (s->down_script[0])
|
|
- launch_script(s->down_script, s->down_script_arg, s->fd);
|
|
-
|
|
tap_read_poll(s, 0);
|
|
tap_write_poll(s, 0);
|
|
close(s->fd);
|
|
+
|
|
+ if (s->down_script[0])
|
|
+ launch_script(s->down_script, s->down_script_arg, -1);
|
|
+
|
|
qemu_free(s);
|
|
}
|
|
|