| Message ID | 42c13eb02928b113fd6f4b5c013648d266e1ff4c.1299233998.git.jan.kiszka@siemens.com |
|---|---|
| State | New |
| Headers | show |
On 04.03.2011, at 11:20, Jan Kiszka wrote: > 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> Looks good, haven't tested it though. Do you have a git tree for all this? Alex
On 2011-03-11 07:50, Alexander Graf wrote: > > On 04.03.2011, at 11:20, Jan Kiszka wrote: > >> 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> > > Looks good, haven't tested it though. Do you have a git tree for all this? > See git://git.kiszka.org/qemu-kvm.git queues/kvm-upstream for the latest version. Jan
On 11.03.2011, at 08:13, Jan Kiszka wrote: > On 2011-03-11 07:50, Alexander Graf wrote: >> >> On 04.03.2011, at 11:20, Jan Kiszka wrote: >> >>> 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> >> >> Looks good, haven't tested it though. Do you have a git tree for all this? >> > > See > > git://git.kiszka.org/qemu-kvm.git queues/kvm-upstream ppc64 book3s works just fine. Alex
diff --git a/kvm-all.c b/kvm-all.c index cc652cf..d643dc7 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -1007,11 +1007,6 @@ int kvm_cpu_exec(CPUState *env) default: DPRINTF("kvm_arch_handle_exit\n"); ret = kvm_arch_handle_exit(env, run); - if (ret == 0) { - ret = EXCP_INTERRUPT; - } else if (ret > 0) { - ret = 0; - } break; } } while (ret == 0); diff --git a/target-i386/kvm.c b/target-i386/kvm.c index bfc8d66..b43a85c 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -1618,10 +1618,10 @@ static int kvm_handle_halt(CPUState *env) (env->eflags & IF_MASK)) && !(env->interrupt_request & CPU_INTERRUPT_NMI)) { env->halted = 1; - return 0; + return EXCP_HLT; } - return 1; + return 0; } static bool host_supports_vmx(void) @@ -1637,7 +1637,7 @@ static bool host_supports_vmx(void) int kvm_arch_handle_exit(CPUState *env, struct kvm_run *run) { uint64_t code; - int ret = 0; + int ret; switch (run->exit_reason) { case KVM_EXIT_HLT: @@ -1645,7 +1645,7 @@ int kvm_arch_handle_exit(CPUState *env, struct kvm_run *run) ret = kvm_handle_halt(env); break; case KVM_EXIT_SET_TPR: - ret = 1; + ret = 0; break; case KVM_EXIT_FAIL_ENTRY: code = run->fail_entry.hardware_entry_failure_reason; 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: diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index 5673a95..4761d5d 100644 --- a/target-s390x/kvm.c +++ b/target-s390x/kvm.c @@ -496,6 +496,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; }
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> --- kvm-all.c | 5 ----- target-i386/kvm.c | 8 ++++---- target-ppc/kvm.c | 8 ++++---- target-s390x/kvm.c | 5 +++++ 4 files changed, 13 insertions(+), 13 deletions(-)