summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2014-03-13 03:40:13 +0100
committerAndreas Färber <afaerber@suse.de>2014-03-13 03:49:48 +0100
commit7a1a4dac94e5dea21ecc404f362ef2c62f9f089c (patch)
tree02d4a10a22650a2bfd369d8b622b5776f899ca0a
parent602a3921ffd62a08c29750d123e0d5d96acc84ee (diff)
downloadfocaccia-qemu-7a1a4dac94e5dea21ecc404f362ef2c62f9f089c.tar.gz
focaccia-qemu-7a1a4dac94e5dea21ecc404f362ef2c62f9f089c.zip
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>
-rw-r--r--include/hw/boards.h2
-rw-r--r--include/qemu/typedefs.h1
2 files changed, 1 insertions, 2 deletions
diff --git a/include/hw/boards.h b/include/hw/boards.h
index 89eb6651e2..fd9388c695 100644
--- 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 83c9b1675d..bf8daac659 100644
--- 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;