diff options
| author | Greg Kurz <groug@kaod.org> | 2017-06-07 19:17:00 +0200 |
|---|---|---|
| committer | David Gibson <david@gibson.dropbear.id.au> | 2017-06-08 14:38:27 +1000 |
| commit | a4d4edce7ae23b9136cb9e243d6eab866609315d (patch) | |
| tree | 7cb070fc4ffa6f08cf969c754a8043c5dd649d1a /hw/intc/xics.c | |
| parent | 67b544d65f92b9987bc05b9da7e6269af48f1b69 (diff) | |
| download | qemu-a4d4edce7ae23b9136cb9e243d6eab866609315d.zip qemu-a4d4edce7ae23b9136cb9e243d6eab866609315d.tar.gz qemu-a4d4edce7ae23b9136cb9e243d6eab866609315d.tar.bz2 | |
xics: add reset() handler to ICPStateClass
Taking into account that qemu_set_irq() returns immediatly if its first
argument is NULL, icp_kvm_reset() largely duplicates icp_reset().
This patch introduces a reset() handler, so that the common logic can
be implemented in icp_reset() only.
While there we can also drop icp_kvm_realize() and icp_kvm_unrealize(). This
causes icp-kvm to be realized in icp_realize(), which sets icp->xics, but
it has no impact.
Signed-off-by: Greg Kurz <groug@kaod.org>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'hw/intc/xics.c')
| -rw-r--r-- | hw/intc/xics.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/hw/intc/xics.c b/hw/intc/xics.c index ea35167..ec73f02 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -325,6 +325,7 @@ static const VMStateDescription vmstate_icp_server = { static void icp_reset(void *dev) { ICPState *icp = ICP(dev); + ICPStateClass *icpc = ICP_GET_CLASS(icp); icp->xirr = 0; icp->pending_priority = 0xff; @@ -332,6 +333,10 @@ static void icp_reset(void *dev) /* Make all outputs are deasserted */ qemu_set_irq(icp->output, 0); + + if (icpc->reset) { + icpc->reset(icp); + } } static void icp_realize(DeviceState *dev, Error **errp) |