Commit a51d5afc authored by Thomas Huth's avatar Thomas Huth
Browse files

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: default avatarGreg Kurz <groug@kaod.org>
Reviewed-by: default avatarCédric Le Goater <clg@kaod.org>
Reviewed-by: default avatarDaniel P. Berrangé <berrange@redhat.com>
Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
parent 0a323e66

hw/intc/xics_kvm.c

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include "sysemu/kvm.h"

#include "hw/ppc/spapr.h"

#include "hw/ppc/xics.h"

#include "hw/ppc/xics_spapr.h"

#include "kvm_ppc.h"

#include "qemu/config-file.h"

#include "qemu/error-report.h"

hw/intc/xics_spapr.c

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include "qemu/timer.h"

#include "hw/ppc/spapr.h"

#include "hw/ppc/xics.h"

#include "hw/ppc/xics_spapr.h"

#include "hw/ppc/fdt.h"

#include "qapi/visitor.h"

hw/ppc/spapr_irq.c

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

#include "hw/ppc/spapr_xive.h"

#include "hw/ppc/xics.h"

#include "hw/ppc/xics_spapr.h"

#include "sysemu/kvm.h"



#include "trace.h"

include/hw/ppc/xics.h

+0 −7
Original line number Diff line number Diff line
@@ -200,13 +200,6 @@ void ics_pic_print_info(ICSState *ics, Monitor *mon); 
void ics_resend(ICSState *ics);

void icp_resend(ICPState *ss);



typedef struct sPAPRMachineState sPAPRMachineState;



void spapr_dt_xics(sPAPRMachineState *spapr, uint32_t nr_servers, void *fdt,

                   uint32_t phandle);

int xics_kvm_init(sPAPRMachineState *spapr, Error **errp);

void xics_spapr_init(sPAPRMachineState *spapr);



Object *icp_create(Object *cpu, const char *type, XICSFabric *xi,

                   Error **errp);

include/hw/ppc/xics_spapr.h

0 → 100644
+37 −0
Original line number Diff line number Diff line 
/*

 * QEMU PowerPC pSeries Logical Partition (aka sPAPR) hardware System Emulator

 *

 * PAPR Virtualized Interrupt System, aka ICS/ICP aka xics

 *

 * Copyright (c) 2010, 2011 David Gibson, IBM Corporation.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a copy

 * of this software and associated documentation files (the "Software"), to deal

 * in the Software without restriction, including without limitation the rights

 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

 * copies of the Software, and to permit persons to whom the Software is

 * furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

 * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 * THE SOFTWARE.

 */



#ifndef XICS_SPAPR_H

#define XICS_SPAPR_H



#include "hw/ppc/spapr.h"



void spapr_dt_xics(sPAPRMachineState *spapr, uint32_t nr_servers, void *fdt,

                   uint32_t phandle);

int xics_kvm_init(sPAPRMachineState *spapr, Error **errp);

void xics_spapr_init(sPAPRMachineState *spapr);



#endif /* XICS_SPAPR_H */