diff options
| author |   Gleb Natapov <gleb@redhat.com> | 2008-10-22 14:48:01 +0200 |
|---|---|---|
| committer |   Avi Kivity <avi@redhat.com> | 2008-10-23 08:50:45 +0200 |
| commit | 97de80377c68ed98cde403cbe7d396e858edfbe5 (patch) | |
| tree | 75d56dc50ea99e3040a9907a2b2a4f73aa5efc93 | |
| parent | ed3ae31a7be272c4196f528ecb3fe36a96ea29b3 (diff) | |
Fix ia64 breakage due to sipi changeskvm-78rc1
Solve this by ifdefs for now. For better solution cleanup of SMP
handling is needed.
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
| -rw-r--r-- | qemu-kvm.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/qemu-kvm.c b/qemu-kvm.c index 67d1de9aa..c5f3f29f9 100644 --- a/qemu-kvm.c +++ b/qemu-kvm.c @@ -353,16 +353,20 @@ static void update_regs_for_sipi(CPUState *env) static void update_regs_for_init(CPUState *env) { +#ifdef TARGET_I386 SegmentCache cs = env->segs[R_CS]; +#endif cpu_reset(env); +#ifdef TARGET_I386 /* restore SIPI vector */ if(vcpu_info[env->cpu_index].sipi_needed) env->segs[R_CS] = cs; - kvm_arch_load_regs(env); vcpu_info[env->cpu_index].init = 0; +#endif + kvm_arch_load_regs(env); } static void setup_kernel_sigmask(CPUState *env) |