[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PULL 22/22] pnv: Fix build failures on some host platforms
From: |
David Gibson |
Subject: |
[Qemu-ppc] [PULL 22/22] pnv: Fix build failures on some host platforms |
Date: |
Wed, 10 May 2017 17:01:15 +1000 |
This makes some changes to fix build failures on the 'min-glib' docker
image, and maybe other platforms with a buildchain that's less tolerant
about duplicated typedefs.
Signed-off-by: David Gibson <address@hidden>
---
include/hw/ppc/pnv.h | 3 +--
include/hw/ppc/pnv_lpc.h | 4 ++--
include/hw/ppc/pnv_occ.h | 4 ++--
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/include/hw/ppc/pnv.h b/include/hw/ppc/pnv.h
index c1288f9..9c5437d 100644
--- a/include/hw/ppc/pnv.h
+++ b/include/hw/ppc/pnv.h
@@ -21,6 +21,7 @@
#include "hw/boards.h"
#include "hw/sysbus.h"
+#include "hw/ipmi/ipmi.h"
#include "hw/ppc/pnv_lpc.h"
#include "hw/ppc/pnv_psi.h"
#include "hw/ppc/pnv_occ.h"
@@ -118,8 +119,6 @@ typedef struct PnvChipClass {
#define POWERNV_MACHINE(obj) \
OBJECT_CHECK(PnvMachineState, (obj), TYPE_POWERNV_MACHINE)
-typedef struct IPMIBmc IPMIBmc;
-
typedef struct PnvMachineState {
/*< private >*/
MachineState parent_obj;
diff --git a/include/hw/ppc/pnv_lpc.h b/include/hw/ppc/pnv_lpc.h
index ccf969a..023b4f0 100644
--- a/include/hw/ppc/pnv_lpc.h
+++ b/include/hw/ppc/pnv_lpc.h
@@ -19,12 +19,12 @@
#ifndef _PPC_PNV_LPC_H
#define _PPC_PNV_LPC_H
+#include "hw/ppc/pnv_psi.h"
+
#define TYPE_PNV_LPC "pnv-lpc"
#define PNV_LPC(obj) \
OBJECT_CHECK(PnvLpcController, (obj), TYPE_PNV_LPC)
-typedef struct PnvPsi PnvPsi;
-
typedef struct PnvLpcController {
DeviceState parent;
diff --git a/include/hw/ppc/pnv_occ.h b/include/hw/ppc/pnv_occ.h
index f8ec330..82f299d 100644
--- a/include/hw/ppc/pnv_occ.h
+++ b/include/hw/ppc/pnv_occ.h
@@ -19,11 +19,11 @@
#ifndef _PPC_PNV_OCC_H
#define _PPC_PNV_OCC_H
+#include "hw/ppc/pnv_psi.h"
+
#define TYPE_PNV_OCC "pnv-occ"
#define PNV_OCC(obj) OBJECT_CHECK(PnvOCC, (obj), TYPE_PNV_OCC)
-typedef struct PnvPsi PnvPsi;
-
typedef struct PnvOCC {
DeviceState xd;
--
2.9.3
- [Qemu-ppc] [PULL 19/22] ppc: xics: fix compilation with CentOS 6, (continued)
- [Qemu-ppc] [PULL 19/22] ppc: xics: fix compilation with CentOS 6, David Gibson, 2017/05/10
- [Qemu-ppc] [PULL 01/22] ppc/pnv: restrict BMC object to the BMC simulator, David Gibson, 2017/05/10
- [Qemu-ppc] [PULL 09/22] ppc/xics: preserve P and Q bits for KVM IRQs, David Gibson, 2017/05/10
- [Qemu-ppc] [PULL 10/22] Add QemuMacDrivers as submodule, David Gibson, 2017/05/10
- [Qemu-ppc] [PULL 12/22] ppc: add qemu_vga.ndrv ROM to fw_cfg interface for OldWorld Macs, David Gibson, 2017/05/10
- [Qemu-ppc] [PULL 14/22] target/ppc: Set UPRT and GTSE on all cpus in H_REGISTER_PROCESS_TABLE, David Gibson, 2017/05/10
- [Qemu-ppc] [PULL 20/22] spapr: Don't accidentally advertise HTM support on POWER9, David Gibson, 2017/05/10
- [Qemu-ppc] [PULL 17/22] target/ppc: Implement ISA V3.00 radix page fault handler, David Gibson, 2017/05/10
- [Qemu-ppc] [PULL 02/22] target/ppc: Emulate LL/SC using cmpxchg helpers, David Gibson, 2017/05/10
- [Qemu-ppc] [PULL 21/22] target/ppc: Allow workarounds for POWER9 DD1, David Gibson, 2017/05/10
- [Qemu-ppc] [PULL 22/22] pnv: Fix build failures on some host platforms,
David Gibson <=
- Re: [Qemu-ppc] [Qemu-devel] [PULL 00/22] ppc-for-2.10 queue 20170510, no-reply, 2017/05/10