| commit | e1484cdeae83253e1ae743855710c1d2ced75ec6 | |
| author | Marcelo Tosatti <mtosatti@redhat.com> | |
| Thu, 23 Sep 2010 21:12:04 +0000 (23 18:12 -0300) | ||
| committer | Marcelo Tosatti <mtosatti@redhat.com> | |
| Thu, 23 Sep 2010 21:12:04 +0000 (23 18:12 -0300) | ||
| tree | 18ca43354f37a2caae6ec3f26798d836881ebe7b | treesnapshot (tar.gz zip) |
| parent | ecc7eb87fb3a26131df8b0687a5dc5d726428080 | commitdiff |
| parent | 6b37c87c96a5b148685e8e6bf09d0aca953cb1a8 | commitdiff |
Merge commit '6b37c87c96a5b148685e8e6bf09d0aca953cb1a8' into upstream-merge
* commit '6b37c87c96a5b148685e8e6bf09d0aca953cb1a8':
vhost: fix infinite loop on error path
Conflicts:
hw/vhost_net.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
* commit '6b37c87c96a5b148685e8e6bf09d0aca953cb1a8':
vhost: fix infinite loop on error path
Conflicts:
hw/vhost_net.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>