diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-03-21 17:42:20 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-03-21 17:42:20 -0500 |
| commit | 31b7c261a207e1e670d737ec78a87dd031bd8f73 (patch) | |
| tree | ef070dd56c118c8761df7baf0a457fc2c5ff9dfa /target-s390x/kvm.c | |
| parent | 8b06c62ae48b67b320f7420dcd4854c5559e1532 (diff) | |
| parent | dc7a09cfe47679d89289101cc9eb387c45e48fe7 (diff) | |
Merge remote branch 'qemu-kvm/uq/master' into staging
Diffstat (limited to 'target-s390x/kvm.c')
| -rw-r--r-- | target-s390x/kvm.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index 6e9427431d..91232038ea 100644 --- a/target-s390x/kvm.c +++ b/target-s390x/kvm.c @@ -177,7 +177,7 @@ void kvm_arch_post_run(CPUState *env, struct kvm_run *run) { } -int kvm_arch_process_irqchip_events(CPUState *env) +int kvm_arch_process_async_events(CPUState *env) { return 0; } @@ -497,6 +497,11 @@ int kvm_arch_handle_exit(CPUState *env, struct kvm_run *run) break; } + if (ret == 0) { + ret = EXCP_INTERRUPT; + } else if (ret > 0) { + ret = 0; + } return ret; } |