| commit | c14e7543ccbc101eeb00629230df804d291f053a | |
| author | Avi Kivity <avi@redhat.com> | |
| Tue, 30 Jun 2009 10:00:16 +0000 (30 13:00 +0300) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Tue, 30 Jun 2009 10:00:16 +0000 (30 13:00 +0300) | ||
| tree | 329897f0761a93dc3c3c1485835c70975516d92c | treesnapshot (tar.gz zip) |
| parent | a8b7f959d1fd97c4ccaf08ce750020ecd08b4c88 | commitdiff |
| parent | d918f23efaf486293b96418fe5deaff8a5583304 | commitdiff |
Merge commit 'd918f23efaf486293b96418fe5deaff8a5583304' into upstream-merge
* commit 'd918f23efaf486293b96418fe5deaff8a5583304':
slirp: Kill slirp_is_inited
slirp: Clean up updtime
slirp: Make IP packet ID consistent
slirp: Factor out one-time initialization
slirp: tftp: Rework filename handling
slirp: tftp: Refactor tftp_handle_rrq
slirp: tftp: Clean up tftp_send_error
slirp: tftp: Cleanup tftp_prefix check
slirp: Drop unused icmp_var.h
slirp: Cleanup and basic reanimation of debug code
slirp: Drop statistic code
slirp: Drop dead code
Conflicts:
vl.c
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit 'd918f23efaf486293b96418fe5deaff8a5583304':
slirp: Kill slirp_is_inited
slirp: Clean up updtime
slirp: Make IP packet ID consistent
slirp: Factor out one-time initialization
slirp: tftp: Rework filename handling
slirp: tftp: Refactor tftp_handle_rrq
slirp: tftp: Clean up tftp_send_error
slirp: tftp: Cleanup tftp_prefix check
slirp: Drop unused icmp_var.h
slirp: Cleanup and basic reanimation of debug code
slirp: Drop statistic code
slirp: Drop dead code
Conflicts:
vl.c
Signed-off-by: Avi Kivity <avi@redhat.com>
| Makefile | diff1 | diff2 | blobhistory |
| monitor.c | diff1 | diff2 | blobhistory |
| net.c | diff1 | diff2 | blobhistory |
| net.h | diff1 | diff2 | blobhistory |
| qemu-monitor.hx | diff1 | diff2 | blobhistory |
| vl.c | diff1 | diff2 | blobhistory |