openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

pnv: Fix build failures on some host platforms 

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 <david@gibson.dropbear.id.au>
This commit is contained in:
David Gibson 2017-05-10 16:46:01 +10:00
parent 5f3066d8b1
commit eaf87a3976
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/hw/ppc/pnv.h
View File

@ -21,6 +21,7 @@
#include "hw/boards.h" #include "hw/boards.h"
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "hw/ipmi/ipmi.h"
#include "hw/ppc/pnv_lpc.h" #include "hw/ppc/pnv_lpc.h"
#include "hw/ppc/pnv_psi.h" #include "hw/ppc/pnv_psi.h"
#include "hw/ppc/pnv_occ.h" #include "hw/ppc/pnv_occ.h"
@ -118,8 +119,6 @@ typedef struct PnvChipClass {
#define POWERNV_MACHINE(obj) \ #define POWERNV_MACHINE(obj) \
OBJECT_CHECK(PnvMachineState, (obj), TYPE_POWERNV_MACHINE) OBJECT_CHECK(PnvMachineState, (obj), TYPE_POWERNV_MACHINE)
typedef struct IPMIBmc IPMIBmc;
typedef struct PnvMachineState { typedef struct PnvMachineState {
/*< private >*/ /*< private >*/
MachineState parent_obj; MachineState parent_obj;

4
include/hw/ppc/pnv_lpc.h
View File

@ -19,12 +19,12 @@
#ifndef _PPC_PNV_LPC_H #ifndef _PPC_PNV_LPC_H
#define _PPC_PNV_LPC_H #define _PPC_PNV_LPC_H
#include "hw/ppc/pnv_psi.h"
#define TYPE_PNV_LPC "pnv-lpc" #define TYPE_PNV_LPC "pnv-lpc"
#define PNV_LPC(obj) \ #define PNV_LPC(obj) \
OBJECT_CHECK(PnvLpcController, (obj), TYPE_PNV_LPC) OBJECT_CHECK(PnvLpcController, (obj), TYPE_PNV_LPC)
typedef struct PnvPsi PnvPsi;
typedef struct PnvLpcController { typedef struct PnvLpcController {
DeviceState parent; DeviceState parent;

4
include/hw/ppc/pnv_occ.h
View File

@ -19,11 +19,11 @@
#ifndef _PPC_PNV_OCC_H #ifndef _PPC_PNV_OCC_H
#define _PPC_PNV_OCC_H #define _PPC_PNV_OCC_H
#include "hw/ppc/pnv_psi.h"
#define TYPE_PNV_OCC "pnv-occ" #define TYPE_PNV_OCC "pnv-occ"
#define PNV_OCC(obj) OBJECT_CHECK(PnvOCC, (obj), TYPE_PNV_OCC) #define PNV_OCC(obj) OBJECT_CHECK(PnvOCC, (obj), TYPE_PNV_OCC)
typedef struct PnvPsi PnvPsi;
typedef struct PnvOCC { typedef struct PnvOCC {
DeviceState xd; DeviceState xd;