[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PULL for-2.0-rc0 2/6] Move QEMUMachine typedef to qemu/typed
From: |
Andreas Färber |
Subject: |
[Qemu-ppc] [PULL for-2.0-rc0 2/6] Move QEMUMachine typedef to qemu/typedefs.h |
Date: |
Thu, 13 Mar 2014 03:53:29 +0100 |
As reported in commit 9c06a1f79f959fffd09bfb7efc3d76051a6cd2da, xen.h is
not self-contained with regards to its use of QEMUMachine. Fix this.
Reported-by: Alexander Graf <address@hidden>
Suggested-by: Paolo Bonzini <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
include/hw/boards.h | 2 --
include/qemu/typedefs.h | 1 +
2 files changed, 1 insertion(+), 2 deletions(-)
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;
--
1.8.4.5
- [Qemu-ppc] [PULL for-2.0-rc0 0/6] PowerPC patch queue 2014-03-13, Andreas Färber, 2014/03/12
- [Qemu-ppc] [PULL for-2.0-rc0 1/6] Revert "KVM: Split QEMUMachine typedef into separate header", Andreas Färber, 2014/03/12
- [Qemu-ppc] [PULL for-2.0-rc0 2/6] Move QEMUMachine typedef to qemu/typedefs.h,
Andreas Färber <=
- [Qemu-ppc] [PULL for-2.0-rc0 4/6] xics-kvm: Fix reset function, Andreas Färber, 2014/03/12
- [Qemu-ppc] [PULL for-2.0-rc0 5/6] spapr-pci: Convert to QOM realize, Andreas Färber, 2014/03/12
- [Qemu-ppc] [PULL for-2.0-rc0 6/6] spapr-pci: Convert fprintf() to error_report(), Andreas Färber, 2014/03/12
- [Qemu-ppc] [PULL for-2.0-rc0 3/6] pseries: Update SLOF firmware image to qemu-slof-20140304, Andreas Färber, 2014/03/12
- Re: [Qemu-ppc] [PULL for-2.0-rc0 0/6] PowerPC patch queue 2014-03-13, Peter Maydell, 2014/03/13