Merge remote-tracking branch 'unicorn-engine/master' into msvc_native

2017-01-20 22:37:51 +11:00
parent 1fea4e6d87 ac68745a9c
commit b0ae2138fb
32 changed files with 7 additions and 1189 deletions
--- a/qemu/hw/intc/apic_common.c
+++ b/qemu/hw/intc/apic_common.c
@@ -152,7 +152,7 @@ void apic_init_reset(struct uc_struct *uc, DeviceState *dev)
    s->wait_for_sipi = !cpu_is_bsp(s->cpu);

    if (s->timer) {
-        timer_del(s->timer);
+        // timer_del(s->timer);
    }
    s->timer_expiry = -1;