Commit eaf87a39 authored by David Gibson's avatar David Gibson
Browse files

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: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 5f3066d8

include/hw/ppc/pnv.h

+1 −2
Original line number Diff line number Diff line
@@ -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;

include/hw/ppc/pnv_lpc.h

+2 −2
Original line number Diff line number Diff line
@@ -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;

include/hw/ppc/pnv_occ.h

+2 −2
Original line number Diff line number Diff line
@@ -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;