diff options
| author |   Avi Kivity <avi@qumranet.com> | 2008-06-05 15:19:41 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@qumranet.com> | 2008-06-05 15:19:41 +0300 |
| commit | 273e9ef0226e8fd40e0a6d36a8a5fcfc25065f3d (patch) | |
| tree | bd0a25d1aece9b54f11c8da95464d671b1ad6b9f /qemu-kvm-x86.c | |
| parent | Avoid deadlock in qemu_cond_wait() (diff) | |
| parent | Free constant temporaries. (diff) | |
| download | qemu-kvm-273e9ef0226e8fd40e0a6d36a8a5fcfc25065f3d.tar.gz qemu-kvm-273e9ef0226e8fd40e0a6d36a8a5fcfc25065f3d.tar.bz2 qemu-kvm-273e9ef0226e8fd40e0a6d36a8a5fcfc25065f3d.zip | |
Merge branch 'qemu-cvs'
Conflicts:
qemu/Makefile.target
qemu/configure
qemu/cpu-exec.c
qemu/exec.c
qemu/hw/apic.c
qemu/hw/boards.h
qemu/hw/pc.c
qemu/monitor.c
qemu/sysemu.h
qemu/target-i386/cpu.h
qemu/target-i386/helper2.c
qemu/target-i386/machine.c
qemu/vl.c
Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'qemu-kvm-x86.c')
| -rw-r--r-- | qemu-kvm-x86.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qemu-kvm-x86.c b/qemu-kvm-x86.c index 197d7614f..5e43a448b 100644 --- a/qemu-kvm-x86.c +++ b/qemu-kvm-x86.c @@ -599,7 +599,7 @@ int kvm_arch_halt(void *opaque, int vcpu) if (!((env->interrupt_request & CPU_INTERRUPT_HARD) && (env->eflags & IF_MASK))) { - env->hflags |= HF_HALTED_MASK; + env->halted = 1; env->exception_index = EXCP_HLT; } return 1; @@ -682,7 +682,7 @@ void kvm_arch_cpu_reset(CPUState *env) #endif } else { env->interrupt_request &= ~CPU_INTERRUPT_HARD; - env->hflags |= HF_HALTED_MASK; + env->halted = 1; env->exception_index = EXCP_HLT; } } |