| commit | b6533d4e041a52276900ee45ba82803abb52eda0 | |
| author | Avi Kivity <avi@redhat.com> | |
| Sun, 16 May 2010 12:26:18 +0000 (16 15:26 +0300) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Sun, 16 May 2010 12:26:18 +0000 (16 15:26 +0300) | ||
| tree | ca33064ab5e17cceb3d319f0f611a4ead5091a41 | treesnapshot (tar.gz zip) |
| parent | 30fe50fd817f69334093db6a443c8fa0ab1b6424 | commitdiff |
| parent | 4513d9232badcc5039d69dae946054ba2682c258 | commitdiff |
Merge commit '4513d9232badcc5039d69dae946054ba2682c258' into upstream-merge
* commit '4513d9232badcc5039d69dae946054ba2682c258':
Do not stop VM if emulation failed in userspace.
Conflicts:
target-i386/kvm.c
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit '4513d9232badcc5039d69dae946054ba2682c258':
Do not stop VM if emulation failed in userspace.
Conflicts:
target-i386/kvm.c
Signed-off-by: Avi Kivity <avi@redhat.com>
| kvm-all.c | diff1 | diff2 | blobhistory |
| kvm.h | diff1 | diff2 | blobhistory |
| target-i386/kvm.c | diff1 | diff2 | blobhistory |