david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ppc/pnv: fix compile breakage on old gcc

Browse Source 
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: Cédric Le Goater <clg@kaod.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Cédric Le Goater 2016-11-07 19:03:02 +01:00 committed by David Gibson
parent 8bd9530e13
commit ec575aa0ae
5 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/ppc/pnv_core.c
View File

@ -24,6 +24,7 @@
#include "hw/ppc/ppc.h" #include "hw/ppc/ppc.h"
#include "hw/ppc/pnv.h" #include "hw/ppc/pnv.h"
#include "hw/ppc/pnv_core.h" #include "hw/ppc/pnv_core.h"
#include "hw/ppc/pnv_xscom.h"
static void powernv_cpu_reset(void *opaque) static void powernv_cpu_reset(void *opaque)
{ {

3
hw/ppc/pnv_lpc.c
View File

@ -23,8 +23,9 @@
#include "qapi/error.h" #include "qapi/error.h"
#include "qemu/log.h" #include "qemu/log.h"
#include "hw/ppc/pnv_lpc.h"
#include "hw/ppc/pnv.h" #include "hw/ppc/pnv.h"
#include "hw/ppc/pnv_lpc.h"
#include "hw/ppc/pnv_xscom.h"
#include "hw/ppc/fdt.h" #include "hw/ppc/fdt.h"
#include <libfdt.h> #include <libfdt.h>

2
hw/ppc/pnv_xscom.c
View File

@ -25,8 +25,8 @@
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "hw/ppc/fdt.h" #include "hw/ppc/fdt.h"
#include "hw/ppc/pnv_xscom.h"
#include "hw/ppc/pnv.h" #include "hw/ppc/pnv.h"
#include "hw/ppc/pnv_xscom.h"
#include <libfdt.h> #include <libfdt.h>

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

@ -21,7 +21,6 @@
#include "hw/boards.h" #include "hw/boards.h"
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "hw/ppc/pnv_xscom.h"
#include "hw/ppc/pnv_lpc.h" #include "hw/ppc/pnv_lpc.h"
#define TYPE_PNV_CHIP "powernv-chip" #define TYPE_PNV_CHIP "powernv-chip"

2
include/hw/ppc/pnv_xscom.h
View File

@ -21,8 +21,6 @@
#include "qom/object.h" #include "qom/object.h"
typedef struct PnvChip PnvChip;
typedef struct PnvXScomInterface { typedef struct PnvXScomInterface {
Object parent; Object parent;
} PnvXScomInterface; } PnvXScomInterface;