ppc: Move spapr-related prototypes from xics.h into a seperate header file
commita51d5afc6929e1d2b3473d331a52be8f350073f1
authorThomas Huth <thuth@redhat.com>
Thu, 10 Jan 2019 08:18:47 +0000 (10 09:18 +0100)
committerThomas Huth <thuth@redhat.com>
Tue, 22 Jan 2019 04:14:33 +0000 (22 05:14 +0100)
tree40d0bc949414035263ece3d94769bf5a172b3e07
parent0a323e66b509bf2a018ea6c17e9d5fd0da804c44
ppc: Move spapr-related prototypes from xics.h into a seperate header file

When compiling with Clang in -std=gnu99 mode, there is a warning/error:

  CC      ppc64-softmmu/hw/intc/xics_spapr.o
In file included from /home/thuth/devel/qemu/hw/intc/xics_spapr.c:34:
/home/thuth/devel/qemu/include/hw/ppc/xics.h:203:34: error: redefinition of typedef 'sPAPRMachineState' is a C11 feature
      [-Werror,-Wtypedef-redefinition]
typedef struct sPAPRMachineState sPAPRMachineState;
                                 ^
/home/thuth/devel/qemu/include/hw/ppc/spapr_irq.h:25:34: note: previous definition is here
typedef struct sPAPRMachineState sPAPRMachineState;
                                 ^

We have to remove the duplicated typedef here and include "spapr.h" instead.
But "spapr.h" should not be included for the pnv machine files. So move
the spapr-related prototypes into a new file called "xics_spapr.h" instead.

Reviewed-by: Greg Kurz <groug@kaod.org>
Reviewed-by: CĂ©dric Le Goater <clg@kaod.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
hw/intc/xics_kvm.c
hw/intc/xics_spapr.c
hw/ppc/spapr_irq.c
include/hw/ppc/xics.h
include/hw/ppc/xics_spapr.h [new file with mode: 0644]