[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 35/35] target-i386: Pass X86CPU to kvm_handle_halt()
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH 35/35] target-i386: Pass X86CPU to kvm_handle_halt() |
Date: |
Wed, 31 Oct 2012 02:00:06 +0100 |
Needed for moving interrupt_request and halted fields to CPUState.
Signed-off-by: Andreas Färber <address@hidden>
---
target-i386/kvm.c | 7 +++++--
1 Datei geändert, 5 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-)
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 7da816f..9ccbcb5 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -1786,8 +1786,10 @@ int kvm_arch_process_async_events(CPUX86State *env)
return env->halted;
}
-static int kvm_handle_halt(CPUX86State *env)
+static int kvm_handle_halt(X86CPU *cpu)
{
+ CPUX86State *env = &cpu->env;
+
if (!((env->interrupt_request & CPU_INTERRUPT_HARD) &&
(env->eflags & IF_MASK)) &&
!(env->interrupt_request & CPU_INTERRUPT_NMI)) {
@@ -2001,13 +2003,14 @@ static bool host_supports_vmx(void)
int kvm_arch_handle_exit(CPUX86State *env, struct kvm_run *run)
{
+ X86CPU *cpu = x86_env_get_cpu(env);
uint64_t code;
int ret;
switch (run->exit_reason) {
case KVM_EXIT_HLT:
DPRINTF("handle_hlt\n");
- ret = kvm_handle_halt(env);
+ ret = kvm_handle_halt(cpu);
break;
case KVM_EXIT_SET_TPR:
ret = 0;
--
1.7.10.4
- [Qemu-devel] [PATCH 26/35] target-ppc: Pass PowerPCCPU to cpu_ppc_hypercall, (continued)
- [Qemu-devel] [PATCH 26/35] target-ppc: Pass PowerPCCPU to cpu_ppc_hypercall, Andreas Färber, 2012/10/30
- [Qemu-devel] [PATCH 20/35] cpus: Pass CPUState to qemu_cpu_kick(), Andreas Färber, 2012/10/30
- [Qemu-devel] [PATCH 25/35] target-ppc: Pass PowerPCCPU to powerpc_excp(), Andreas Färber, 2012/10/30
- [Qemu-devel] [PATCH 27/35] spapr: Pass PowerPCCPU to spapr_hypercall(), Andreas Färber, 2012/10/30
- [Qemu-devel] [PATCH 28/35] spapr: Pass PowerPCCPU to hypercalls, Andreas Färber, 2012/10/30
- [Qemu-devel] [PATCH 30/35] target-i386: Pass X86CPU to kvm_mce_inject(), Andreas Färber, 2012/10/30
- [Qemu-devel] [PATCH 29/35] cpus: Pass CPUState to [qemu_]cpu_has_work(), Andreas Färber, 2012/10/30
- [Qemu-devel] [PATCH 31/35] target-i386: Pass X86CPU to cpu_x86_inject_mce(), Andreas Färber, 2012/10/30
- [Qemu-devel] [PATCH 32/35] cpus: Pass CPUState to run_on_cpu(), Andreas Färber, 2012/10/30
- [Qemu-devel] [PATCH 35/35] target-i386: Pass X86CPU to kvm_handle_halt(),
Andreas Färber <=
- [Qemu-devel] [PATCH 34/35] target-i386: Pass X86CPU to kvm_get_mp_state(), Andreas Färber, 2012/10/30
- [Qemu-devel] [PATCH 33/35] cpu: Move thread_id to CPUState, Andreas Färber, 2012/10/30
- Re: [Qemu-devel] [PULL] QOM CPUState patch queue 2012-10-31, Andreas Färber, 2012/10/30