| commit | 4462fb53f65928ea19250b92428f0e55c0e2d65c | |
| author | Avi Kivity <avi@redhat.com> | |
| Thu, 25 Jun 2009 15:19:35 +0000 (25 18:19 +0300) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Thu, 25 Jun 2009 15:19:35 +0000 (25 18:19 +0300) | ||
| tree | fae74ed3a010bca4bd0f129207cc1fdeb41c2442 | treesnapshot (tar.gz zip) |
| parent | b9bcc6d62c42721fde82d3204601bd6ceac40c57 | commitdiff |
| parent | b664e3673c6c2ca228ce025292e32b34f73df5f5 | commitdiff |
Merge commit 'b664e3673c6c2ca228ce025292e32b34f73df5f5' into upstream-merge
* commit 'b664e3673c6c2ca228ce025292e32b34f73df5f5':
net: add tap_read_poll() helper
net: purge queued packets in tap_cleanup()
net: add qemu_purge_queued_packets()
Fix build on Mac OS X
Conflicts:
net.c
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit 'b664e3673c6c2ca228ce025292e32b34f73df5f5':
net: add tap_read_poll() helper
net: purge queued packets in tap_cleanup()
net: add qemu_purge_queued_packets()
Fix build on Mac OS X
Conflicts:
net.c
Signed-off-by: Avi Kivity <avi@redhat.com>
| configure | diff1 | diff2 | blobhistory |
| net.c | diff1 | diff2 | blobhistory |
| net.h | diff1 | diff2 | blobhistory |