diff options
| author | Jan Kiszka <jan.kiszka@siemens.com> | 2011-03-15 12:26:28 +0100 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2011-03-16 17:11:06 -0300 |
| commit | bb4ea39329d6c3de4c10034621781f703d095699 (patch) | |
| tree | 9627e9893b96c6b3aba7f804484a08e584309ff6 /target-ppc | |
| parent | d73cd8f4ea1c2944bd16f7a1c445eaa25c9e6e26 (diff) | |
| download | qemu-bb4ea39329d6c3de4c10034621781f703d095699.zip qemu-bb4ea39329d6c3de4c10034621781f703d095699.tar.gz qemu-bb4ea39329d6c3de4c10034621781f703d095699.tar.bz2 | |
kvm: Align kvm_arch_handle_exit to kvm_cpu_exec changes
Make the return code of kvm_arch_handle_exit directly usable for
kvm_cpu_exec. This is straightforward for x86 and ppc, just s390
would require more work. Avoid this for now by pushing the return code
translation logic into s390's kvm_arch_handle_exit.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
CC: Alexander Graf <agraf@suse.de>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'target-ppc')
| -rw-r--r-- | target-ppc/kvm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c index 6c99a16..593eb98 100644 --- a/target-ppc/kvm.c +++ b/target-ppc/kvm.c @@ -271,7 +271,7 @@ static int kvmppc_handle_halt(CPUState *env) env->exception_index = EXCP_HLT; } - return 1; + return 0; } /* map dcr access to existing qemu dcr emulation */ @@ -280,7 +280,7 @@ static int kvmppc_handle_dcr_read(CPUState *env, uint32_t dcrn, uint32_t *data) if (ppc_dcr_read(env->dcr_env, dcrn, data) < 0) fprintf(stderr, "Read to unhandled DCR (0x%x)\n", dcrn); - return 1; + return 0; } static int kvmppc_handle_dcr_write(CPUState *env, uint32_t dcrn, uint32_t data) @@ -288,12 +288,12 @@ static int kvmppc_handle_dcr_write(CPUState *env, uint32_t dcrn, uint32_t data) if (ppc_dcr_write(env->dcr_env, dcrn, data) < 0) fprintf(stderr, "Write to unhandled DCR (0x%x)\n", dcrn); - return 1; + return 0; } int kvm_arch_handle_exit(CPUState *env, struct kvm_run *run) { - int ret = 0; + int ret; switch (run->exit_reason) { case KVM_EXIT_DCR: |