Merge branch 'memleak' into m2

2016-04-18 12:48:13 +08:00
parent a015ddc348 fb1ebac000
commit cc6cbc5cf7
40 changed files with 1225 additions and 66 deletions
--- a/include/uc_priv.h
+++ b/include/uc_priv.h
@ -199,10 +199,12 @@ struct uc_struct {
    QemuMutex flat_view_mutex;
    QTAILQ_HEAD(memory_listeners, MemoryListener) memory_listeners;
    QTAILQ_HEAD(, AddressSpace) address_spaces;
+    MachineState *machine_state;
    // qom/object.c
    GHashTable *type_table;
    Type type_interface;
    Object *root;
+    Object *owner;
    bool enumerating_types;
    // util/module.c
    ModuleTypeList init_type_list[MODULE_INIT_MAX];