Commit ec575aa0 authored by Cédric Le Goater's avatar Cédric Le Goater Committed by David Gibson
Browse files

ppc/pnv: fix compile breakage on old gcc 



PnvChip is defined twice and this can confuse old compilers :

  CC      ppc64-softmmu/hw/ppc/pnv_xscom.o
In file included from qemu.git/hw/ppc/pnv.c:29:
qemu.git/include/hw/ppc/pnv.h:60: error: redefinition of typedef ‘PnvChip’
qemu.git/include/hw/ppc/pnv_xscom.h:24: note: previous declaration of ‘PnvChip’ was here
make[1]: *** [hw/ppc/pnv.o] Error 1
make[1]: *** Waiting for unfinished jobs....

Signed-off-by: default avatarCédric Le Goater <clg@kaod.org>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 8bd9530e

hw/ppc/pnv_core.c

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include "hw/ppc/ppc.h"

#include "hw/ppc/pnv.h"

#include "hw/ppc/pnv_core.h"

#include "hw/ppc/pnv_xscom.h"



static void powernv_cpu_reset(void *opaque)

{

hw/ppc/pnv_lpc.c

+2 −1
Original line number Diff line number Diff line
@@ -23,8 +23,9 @@ 
#include "qapi/error.h"

#include "qemu/log.h"



#include "hw/ppc/pnv_lpc.h"

#include "hw/ppc/pnv.h"

#include "hw/ppc/pnv_lpc.h"

#include "hw/ppc/pnv_xscom.h"

#include "hw/ppc/fdt.h"



#include <libfdt.h>

hw/ppc/pnv_xscom.c

+1 −1
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ 
#include "hw/sysbus.h"



#include "hw/ppc/fdt.h"

#include "hw/ppc/pnv_xscom.h"

#include "hw/ppc/pnv.h"

#include "hw/ppc/pnv_xscom.h"



#include <libfdt.h>

include/hw/ppc/pnv.h

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 


#include "hw/boards.h"

#include "hw/sysbus.h"

#include "hw/ppc/pnv_xscom.h"

#include "hw/ppc/pnv_lpc.h"



#define TYPE_PNV_CHIP "powernv-chip"

include/hw/ppc/pnv_xscom.h

+0 −2
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ 


#include "qom/object.h"



typedef struct PnvChip PnvChip;



typedef struct PnvXScomInterface {

    Object parent;

} PnvXScomInterface;