| commit | f7c62532d07e65dde024bf3e016f86d6da273a87 | |
| author | Avi Kivity <avi@redhat.com> | |
| Thu, 25 Jun 2009 15:32:03 +0000 (25 18:32 +0300) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Thu, 25 Jun 2009 15:32:03 +0000 (25 18:32 +0300) | ||
| tree | 4eaaa3c57d38bb60fb4eded61097bd90f7bc6fef | treesnapshot (tar.gz zip) |
| parent | ad35b5fe688a420ed4705f41f7f1bddd6ab268c5 | commitdiff |
| parent | 6243375f9bba12d8871ac611ca8ce947c3e16c67 | commitdiff |
Merge commit '6243375f9bba12d8871ac611ca8ce947c3e16c67' into upstream-merge
* commit '6243375f9bba12d8871ac611ca8ce947c3e16c67':
virtio-net: implement async packet sending
net: add packet length to NetPacketSent callback
Conflicts:
hw/virtio-net.c
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit '6243375f9bba12d8871ac611ca8ce947c3e16c67':
virtio-net: implement async packet sending
net: add packet length to NetPacketSent callback
Conflicts:
hw/virtio-net.c
Signed-off-by: Avi Kivity <avi@redhat.com>
| hw/virtio-net.c | diff1 | diff2 | blobhistory |
| net.c | diff1 | diff2 | blobhistory |
| net.h | diff1 | diff2 | blobhistory |