Skip to contentSkip to conversation

Use upstream QEMU apic init/sipi handling

PATCH Applied Gleb Natapov 2 participants 2 messages Jun 28, 2009 – Jun 29, 2009 KVM

lore
Share & tools
lore

Gleb Natapov

author
#0 lore raw

PATCH 1/1 Use upstream QEMU apic init/sipi handling

Remove KVM specific init/sipi handling from hw/apic.c. Now when upstream QEMU handles init/sipi in a cpu loop KVM can do the same.

Signed-off-by Gleb Natapov <[email protected]>
cpu-defs.h +0 -2
index e17209a..7570096 100644
@@ -140,8 +140,6 @@ typedef struct CPUWatchpoint {
 struct qemu_work_item;
 
 struct KVMCPUState {
-    int sipi_needed;
-    int init;
     pthread_t thread;
     int signalled;
     int stop;
hw/apic.c +0 -5
index 7ac926a..1a0d38b 100644
@@ -492,9 +492,6 @@ void apic_init_reset(CPUState *env)
     s->wait_for_sipi = 1;
 
     env->halted = !(s->apicbase & MSR_IA32_APICBASE_BSP);
-
-    if (kvm_enabled() && !qemu_kvm_irqchip_in_kernel())
-        kvm_apic_init(s->cpu_env);
 }
 
 static void apic_startup(APICState *s, int vector_num)

@@ -517,8 +514,6 @@ void apic_sipi(CPUState *env)
                            0xffff, 0);
     env->halted = 0;
     s->wait_for_sipi = 0;
-    if (kvm_enabled() && !qemu_kvm_irqchip_in_kernel())
-	kvm_update_after_sipi(env);
 }
 
 static void apic_deliver(APICState *s, uint8_t dest, uint8_t dest_mode,
qemu-kvm-x86.c +4 -39

49 lines not on this page · raw message

--
Gleb.

Applied
#1 lore raw
Quoted 4 lines · Gleb Natapov

Remove KVM specific init/sipi handling from hw/apic.c. Now when upstream QEMU handles init/sipi in a cpu loop KVM can do the same.

Applied, thanks.

Signature · 1 line
error compiling committee.c: too many arguments to function