Merge remote-tracking branch 'upstream/master' into change-handle-based-api

2015-09-02 21:04:43 -04:00
parent 2c802a3e4b 03683a7960
commit bd0a6921cc
11 changed files with 66 additions and 44 deletions
--- a/include/uc_priv.h
+++ b/include/uc_priv.h
@ -172,6 +172,8 @@ struct uc_struct {
    bool block_full;
    MemoryRegion **mapped_blocks;
    uint32_t mapped_block_count;
+
+    void *qemu_thread_data; // to support cross compile to Windows (qemu-thread-win32.c)
 };

 #include "qemu_macro.h"