Move QEMUMachine typedef to qemu/typedefs.h

As reported in commit 9c06a1f79f959fffd09bfb7efc3d76051a6cd2da, xen.h is
not self-contained with regards to its use of QEMUMachine. Fix this.

Reported-by: Alexander Graf <agraf@suse.de>
Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>

diff --git a/include/hw/boards.h b/include/hw/boards.h
index 89eb6651e2c76c09352b382cf4e9b2feb45893ee..fd9388c6956f52d37a613e4ffb8a768da9c2a698 100644 (file)
--- a/include/hw/boards.h
+++ b/include/hw/boards.h
@@ -6,8 +6,6 @@
 #include "sysemu/blockdev.h"
 #include "hw/qdev.h"
 
-typedef struct QEMUMachine QEMUMachine;
-
 typedef struct QEMUMachineInitArgs {
     const QEMUMachine *machine;
     ram_addr_t ram_size;

diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h
index 83c9b1675d3575fc6b3136a65153c9505679dd2c..bf8daac659894c84f859f0386a5dc87d5602822f 100644 (file)
--- a/include/qemu/typedefs.h
+++ b/include/qemu/typedefs.h
@@ -30,6 +30,7 @@ typedef struct MemoryListener MemoryListener;
 
 typedef struct MemoryMappingList MemoryMappingList;
 
+typedef struct QEMUMachine QEMUMachine;
 typedef struct NICInfo NICInfo;
 typedef struct HCIInfo HCIInfo;
 typedef struct AudioState AudioState;