diff mbox

[PULL,for-2.0-rc0,2/6] Move QEMUMachine typedef to qemu/typedefs.h

Message ID 1394679213-1830-3-git-send-email-afaerber@suse.de
State New
Headers show

Commit Message

Andreas Färber March 13, 2014, 2:53 a.m. UTC 
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>
---
 include/hw/boards.h     | 2 --
 include/qemu/typedefs.h | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)
diff mbox

Patch

diff --git a/include/hw/boards.h b/include/hw/boards.h
index 89eb665..fd9388c 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 83c9b16..bf8daac 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;