diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2010-03-04 09:14:24 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-03-04 09:14:24 -0600 |
| commit | f374e826e340ea1e2de2e9b006b3ac5dbde1324f (patch) | |
| tree | b671d3bee2582bb9de531eaeb4724dfc8ddf8881 /hw/apic.c | |
| parent | 78728c92a4137a96f1d0c49496d02dd9aa9d71b6 (diff) | |
| parent | 6cb2996cef5e273ef370e690e84b5e1403f5c391 (diff) | |
| download | focaccia-qemu-f374e826e340ea1e2de2e9b006b3ac5dbde1324f.tar.gz focaccia-qemu-f374e826e340ea1e2de2e9b006b3ac5dbde1324f.zip | |
Merge remote branch 'qemu-kvm/uq/master' into pulls
Diffstat (limited to 'hw/apic.c')
| -rw-r--r-- | hw/apic.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/hw/apic.c b/hw/apic.c index 87e7dc0ba9..3c90f4c845 100644 --- a/hw/apic.c +++ b/hw/apic.c @@ -938,8 +938,6 @@ static void apic_reset(void *opaque) APICState *s = opaque; int bsp; - cpu_synchronize_state(s->cpu_env); - bsp = cpu_is_bsp(s->cpu_env); s->apicbase = 0xfee00000 | (bsp ? MSR_IA32_APICBASE_BSP : 0) | MSR_IA32_APICBASE_ENABLE; |