Initial overlay of HQEMU 2.5.2 changes onto underlying 2.5.0 QEMU GIT tree2.5_overlay

2 files changed, 13 insertions, 1 deletions

diff --git a/include/qom/cpu.h b/include/qom/cpu.h
index 51a1323..4b005ff 100644
--- a/include/qom/cpu.h
+++ b/include/qom/cpu.h
@@ -30,6 +30,8 @@
 #include "qemu/thread.h"
 #include "qemu/typedefs.h"
 
+#define typename QEMUtypename
+
 typedef int (*WriteCoreDumpFunction)(const void *buf, size_t size,
                                      void *opaque);
 
@@ -196,7 +198,7 @@ typedef struct CPUBreakpoint {
 } CPUBreakpoint;
 
 typedef struct CPUWatchpoint {
-    vaddr vaddr;
+    vaddr addr;
     vaddr len;
     vaddr hitaddr;
     MemTxAttrs hitattrs;
@@ -775,4 +777,7 @@ extern const struct VMStateDescription vmstate_cpu_common;
     .offset = 0,                                                            \
 }
 
+CPUState *cpu_create(void);
+#undef typename
+
 #endif
diff --git a/include/qom/object.h b/include/qom/object.h
index 4509166..118c227 100644
--- a/include/qom/object.h
+++ b/include/qom/object.h
@@ -20,6 +20,10 @@
 #include "qemu/queue.h"
 #include "qapi/error.h"
 
+#define Type     QEMUType
+#define class    QEMUclass
+#define typename QEMUtypename
+
 struct Visitor;
 
 struct TypeImpl;
@@ -1570,5 +1574,8 @@ int object_child_foreach_recursive(Object *obj,
  */
 Object *container_get(Object *root, const char *path);
 
+#undef Type
+#undef class
+#undef typename
 
 #endif