| Message ID | 20191115162436.30548-20-clg@kaod.org |
|---|---|
| State | New |
| Headers | show |
| Series | ppc/pnv: add XIVE support for KVM guests | expand |
On Fri, 15 Nov 2019 17:24:32 +0100 Cédric Le Goater <clg@kaod.org> wrote: > It is now unused. > > Signed-off-by: Cédric Le Goater <clg@kaod.org> > --- Reviewed-by: Greg Kurz <groug@kaod.org> > include/hw/ppc/xive.h | 2 -- > hw/intc/pnv_xive.c | 13 ------------- > hw/intc/spapr_xive.c | 8 -------- > hw/intc/xive.c | 7 ------- > 4 files changed, 30 deletions(-) > > diff --git a/include/hw/ppc/xive.h b/include/hw/ppc/xive.h > index dcf897451589..24315480e7c2 100644 > --- a/include/hw/ppc/xive.h > +++ b/include/hw/ppc/xive.h > @@ -351,7 +351,6 @@ typedef struct XiveRouterClass { > XiveNVT *nvt); > int (*write_nvt)(XiveRouter *xrtr, uint8_t nvt_blk, uint32_t nvt_idx, > XiveNVT *nvt, uint8_t word_number); > - XiveTCTX *(*get_tctx)(XiveRouter *xrtr, CPUState *cs); > } XiveRouterClass; > > int xive_router_get_eas(XiveRouter *xrtr, uint8_t eas_blk, uint32_t eas_idx, > @@ -364,7 +363,6 @@ int xive_router_get_nvt(XiveRouter *xrtr, uint8_t nvt_blk, uint32_t nvt_idx, > XiveNVT *nvt); > int xive_router_write_nvt(XiveRouter *xrtr, uint8_t nvt_blk, uint32_t nvt_idx, > XiveNVT *nvt, uint8_t word_number); > -XiveTCTX *xive_router_get_tctx(XiveRouter *xrtr, CPUState *cs); > void xive_router_notify(XiveNotifier *xn, uint32_t lisn); > > /* > diff --git a/hw/intc/pnv_xive.c b/hw/intc/pnv_xive.c > index 4501c671d8df..2e568721b44e 100644 > --- a/hw/intc/pnv_xive.c > +++ b/hw/intc/pnv_xive.c > @@ -467,18 +467,6 @@ static PnvXive *pnv_xive_tm_get_xive(PowerPCCPU *cpu) > return xive; > } > > -static XiveTCTX *pnv_xive_get_tctx(XiveRouter *xrtr, CPUState *cs) > -{ > - PowerPCCPU *cpu = POWERPC_CPU(cs); > - PnvXive *xive = pnv_xive_tm_get_xive(cpu); > - > - if (!xive) { > - return NULL; > - } > - > - return XIVE_TCTX(pnv_cpu_state(cpu)->intc); > -} > - > /* > * The internal sources (IPIs) of the interrupt controller have no > * knowledge of the XIVE chip on which they reside. Encode the block > @@ -1936,7 +1924,6 @@ static void pnv_xive_class_init(ObjectClass *klass, void *data) > xrc->write_end = pnv_xive_write_end; > xrc->get_nvt = pnv_xive_get_nvt; > xrc->write_nvt = pnv_xive_write_nvt; > - xrc->get_tctx = pnv_xive_get_tctx; > > xnc->notify = pnv_xive_notify; > xpc->match_nvt = pnv_xive_match_nvt; > diff --git a/hw/intc/spapr_xive.c b/hw/intc/spapr_xive.c > index 6292da58f62c..1542cef91878 100644 > --- a/hw/intc/spapr_xive.c > +++ b/hw/intc/spapr_xive.c > @@ -427,13 +427,6 @@ static int spapr_xive_write_nvt(XiveRouter *xrtr, uint8_t nvt_blk, > g_assert_not_reached(); > } > > -static XiveTCTX *spapr_xive_get_tctx(XiveRouter *xrtr, CPUState *cs) > -{ > - PowerPCCPU *cpu = POWERPC_CPU(cs); > - > - return spapr_cpu_state(cpu)->tctx; > -} > - > static int spapr_xive_match_nvt(XivePresenter *xptr, uint8_t format, > uint8_t nvt_blk, uint32_t nvt_idx, > bool cam_ignore, uint8_t priority, > @@ -771,7 +764,6 @@ static void spapr_xive_class_init(ObjectClass *klass, void *data) > xrc->write_end = spapr_xive_write_end; > xrc->get_nvt = spapr_xive_get_nvt; > xrc->write_nvt = spapr_xive_write_nvt; > - xrc->get_tctx = spapr_xive_get_tctx; > > sicc->activate = spapr_xive_activate; > sicc->deactivate = spapr_xive_deactivate; > diff --git a/hw/intc/xive.c b/hw/intc/xive.c > index ab779c4c2a0f..e576a1e4ba9c 100644 > --- a/hw/intc/xive.c > +++ b/hw/intc/xive.c > @@ -1317,13 +1317,6 @@ int xive_router_write_nvt(XiveRouter *xrtr, uint8_t nvt_blk, uint32_t nvt_idx, > return xrc->write_nvt(xrtr, nvt_blk, nvt_idx, nvt, word_number); > } > > -XiveTCTX *xive_router_get_tctx(XiveRouter *xrtr, CPUState *cs) > -{ > - XiveRouterClass *xrc = XIVE_ROUTER_GET_CLASS(xrtr); > - > - return xrc->get_tctx(xrtr, cs); > -} > - > /* > * Encode the HW CAM line in the block group mode format : > *
diff --git a/include/hw/ppc/xive.h b/include/hw/ppc/xive.h index dcf897451589..24315480e7c2 100644 --- a/include/hw/ppc/xive.h +++ b/include/hw/ppc/xive.h @@ -351,7 +351,6 @@ typedef struct XiveRouterClass { XiveNVT *nvt); int (*write_nvt)(XiveRouter *xrtr, uint8_t nvt_blk, uint32_t nvt_idx, XiveNVT *nvt, uint8_t word_number); - XiveTCTX *(*get_tctx)(XiveRouter *xrtr, CPUState *cs); } XiveRouterClass; int xive_router_get_eas(XiveRouter *xrtr, uint8_t eas_blk, uint32_t eas_idx, @@ -364,7 +363,6 @@ int xive_router_get_nvt(XiveRouter *xrtr, uint8_t nvt_blk, uint32_t nvt_idx, XiveNVT *nvt); int xive_router_write_nvt(XiveRouter *xrtr, uint8_t nvt_blk, uint32_t nvt_idx, XiveNVT *nvt, uint8_t word_number); -XiveTCTX *xive_router_get_tctx(XiveRouter *xrtr, CPUState *cs); void xive_router_notify(XiveNotifier *xn, uint32_t lisn); /* diff --git a/hw/intc/pnv_xive.c b/hw/intc/pnv_xive.c index 4501c671d8df..2e568721b44e 100644 --- a/hw/intc/pnv_xive.c +++ b/hw/intc/pnv_xive.c @@ -467,18 +467,6 @@ static PnvXive *pnv_xive_tm_get_xive(PowerPCCPU *cpu) return xive; } -static XiveTCTX *pnv_xive_get_tctx(XiveRouter *xrtr, CPUState *cs) -{ - PowerPCCPU *cpu = POWERPC_CPU(cs); - PnvXive *xive = pnv_xive_tm_get_xive(cpu); - - if (!xive) { - return NULL; - } - - return XIVE_TCTX(pnv_cpu_state(cpu)->intc); -} - /* * The internal sources (IPIs) of the interrupt controller have no * knowledge of the XIVE chip on which they reside. Encode the block @@ -1936,7 +1924,6 @@ static void pnv_xive_class_init(ObjectClass *klass, void *data) xrc->write_end = pnv_xive_write_end; xrc->get_nvt = pnv_xive_get_nvt; xrc->write_nvt = pnv_xive_write_nvt; - xrc->get_tctx = pnv_xive_get_tctx; xnc->notify = pnv_xive_notify; xpc->match_nvt = pnv_xive_match_nvt; diff --git a/hw/intc/spapr_xive.c b/hw/intc/spapr_xive.c index 6292da58f62c..1542cef91878 100644 --- a/hw/intc/spapr_xive.c +++ b/hw/intc/spapr_xive.c @@ -427,13 +427,6 @@ static int spapr_xive_write_nvt(XiveRouter *xrtr, uint8_t nvt_blk, g_assert_not_reached(); } -static XiveTCTX *spapr_xive_get_tctx(XiveRouter *xrtr, CPUState *cs) -{ - PowerPCCPU *cpu = POWERPC_CPU(cs); - - return spapr_cpu_state(cpu)->tctx; -} - static int spapr_xive_match_nvt(XivePresenter *xptr, uint8_t format, uint8_t nvt_blk, uint32_t nvt_idx, bool cam_ignore, uint8_t priority, @@ -771,7 +764,6 @@ static void spapr_xive_class_init(ObjectClass *klass, void *data) xrc->write_end = spapr_xive_write_end; xrc->get_nvt = spapr_xive_get_nvt; xrc->write_nvt = spapr_xive_write_nvt; - xrc->get_tctx = spapr_xive_get_tctx; sicc->activate = spapr_xive_activate; sicc->deactivate = spapr_xive_deactivate; diff --git a/hw/intc/xive.c b/hw/intc/xive.c index ab779c4c2a0f..e576a1e4ba9c 100644 --- a/hw/intc/xive.c +++ b/hw/intc/xive.c @@ -1317,13 +1317,6 @@ int xive_router_write_nvt(XiveRouter *xrtr, uint8_t nvt_blk, uint32_t nvt_idx, return xrc->write_nvt(xrtr, nvt_blk, nvt_idx, nvt, word_number); } -XiveTCTX *xive_router_get_tctx(XiveRouter *xrtr, CPUState *cs) -{ - XiveRouterClass *xrc = XIVE_ROUTER_GET_CLASS(xrtr); - - return xrc->get_tctx(xrtr, cs); -} - /* * Encode the HW CAM line in the block group mode format : *
It is now unused. Signed-off-by: Cédric Le Goater <clg@kaod.org> --- include/hw/ppc/xive.h | 2 -- hw/intc/pnv_xive.c | 13 ------------- hw/intc/spapr_xive.c | 8 -------- hw/intc/xive.c | 7 ------- 4 files changed, 30 deletions(-)