| commit | 65ffa56daaf804474d837631732be30fa58a6b88 | |
| author | Avi Kivity <avi@redhat.com> | |
| Thu, 25 Jun 2009 15:22:43 +0000 (25 18:22 +0300) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Thu, 25 Jun 2009 15:22:43 +0000 (25 18:22 +0300) | ||
| tree | b6ee543bf5f87754ef7c786ca1ade3eecaec43f0 | treesnapshot (tar.gz zip) |
| parent | 4462fb53f65928ea19250b92428f0e55c0e2d65c | commitdiff |
| parent | 1f7babf6d5ca24460694556d617cd17ae8be2ed4 | commitdiff |
Merge commit '1f7babf6d5ca24460694556d617cd17ae8be2ed4' into upstream-merge
* commit '1f7babf6d5ca24460694556d617cd17ae8be2ed4':
net: handle EAGAIN from tapfd write()
Conflicts:
net.c
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit '1f7babf6d5ca24460694556d617cd17ae8be2ed4':
net: handle EAGAIN from tapfd write()
Conflicts:
net.c
Signed-off-by: Avi Kivity <avi@redhat.com>
| net.c | diff1 | diff2 | blobhistory |