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.c
+++ b/qemu/hw/intc/apic.c
@@ -178,11 +178,13 @@ static void apic_pre_save(APICCommonState *s)

 static void apic_post_load(APICCommonState *s)
 {
+#if 0
    if (s->timer_expiry != -1) {
        timer_mod(s->timer, s->timer_expiry);
    } else {
        timer_del(s->timer);
    }
+#endif
 }

 static int apic_realize(struct uc_struct *uc, DeviceState *dev, Error **errp)