diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2012-06-24 10:45:55 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2012-06-24 10:45:55 +0000 |
| commit | 8dacfcb407aa83664bd875123d2ec86612758c22 (patch) | |
| tree | ead73c638c721ece4a56101e6eca2134e02bf01b /target-s390x | |
| parent | 99918cec1968b94c8ac3afe51b2a34e5c78c81b3 (diff) | |
| parent | 2fb70f6f1727e9696c703a47861d1173e2b2836f (diff) | |
Merge branch 's390-for-upstream' of git://repo.or.cz/qemu/agraf
* 's390-for-upstream' of git://repo.or.cz/qemu/agraf:
s390: stop target cpu on sigp initial reset
s390: make kvm_stat work on s390
kvm: Update kernel headers
s390x: fix s390 virtio aliases
Diffstat (limited to 'target-s390x')
| -rw-r--r-- | target-s390x/kvm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index 5800fd612c..ec08dd0474 100644 --- a/target-s390x/kvm.c +++ b/target-s390x/kvm.c @@ -314,6 +314,7 @@ static int s390_cpu_initial_reset(CPUS390XState *env) { int i; + s390_del_running_cpu(env); if (kvm_vcpu_ioctl(env, KVM_S390_INITIAL_RESET, NULL) < 0) { perror("cannot init reset vcpu"); } |