fix conflicts when merging no-thread to master

2016-04-23 10:06:57 +08:00
parent bb80e699b2 ba31be79f4
commit 3a742fb6f6
32 changed files with 27 additions and 322 deletions
--- a/qemu/hw/intc/apic.c
+++ b/qemu/hw/intc/apic.c
@ -70,7 +70,6 @@ static void apic_sync_vapic(APICCommonState *s, int sync_type)
        //length = offsetof(VAPICState, enabled) - offsetof(VAPICState, isr);

        if (sync_type & SYNC_TO_VAPIC) {
-            assert(qemu_cpu_is_self(CPU(s->cpu)));

            vapic_state.tpr = s->tpr;
            vapic_state.enabled = 1;