| commit | be7d41f80ad956221c2fdcb715e3f6ee9d2356d6 | |
| author | Avi Kivity <avi@redhat.com> | |
| Thu, 25 Jun 2009 15:27:05 +0000 (25 18:27 +0300) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Thu, 25 Jun 2009 15:27:05 +0000 (25 18:27 +0300) | ||
| tree | b3a651ec1b64ed80f4e6c56f384d9ad5a29b4e35 | treesnapshot (tar.gz zip) |
| parent | 65ffa56daaf804474d837631732be30fa58a6b88 | commitdiff |
| parent | 4a77b25e2af0ccfa637c963f64a01468edcf94ac | commitdiff |
Merge commit '4a77b25e2af0ccfa637c963f64a01468edcf94ac' into upstream-merge
* commit '4a77b25e2af0ccfa637c963f64a01468edcf94ac':
net: return TAPState from net_tap_init()
Conflicts:
net.c
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit '4a77b25e2af0ccfa637c963f64a01468edcf94ac':
net: return TAPState from net_tap_init()
Conflicts:
net.c
Signed-off-by: Avi Kivity <avi@redhat.com>
| net.c | diff1 | diff2 | blobhistory |