diff options
| author | David Gibson | 2019-09-26 15:02:41 +0200 |
|---|---|---|
| committer | David Gibson | 2019-10-24 00:36:55 +0200 |
| commit | 0a17e0c39f73080e6d5c4d9a2033a5bd475c416c (patch) | |
| tree | 975154567929a2b8ad2ea251a9782331b8ed8612 /include/hw/ppc/spapr_irq.h | |
| parent | spapr, xics, xive: Match signatures for XICS and XIVE KVM connect routines (diff) | |
| download | qemu-0a17e0c39f73080e6d5c4d9a2033a5bd475c416c.tar.gz qemu-0a17e0c39f73080e6d5c4d9a2033a5bd475c416c.tar.xz qemu-0a17e0c39f73080e6d5c4d9a2033a5bd475c416c.zip | |
spapr: Remove SpaprIrq::init_kvm hook
This hook is a bit odd. The only caller is spapr_irq_init_kvm(), but
it explicitly takes an SpaprIrq *, so it's never really called through the
current SpaprIrq. Essentially this is just a way of passing through a
function pointer so that spapr_irq_init_kvm() can handle some
configuration and error handling logic without duplicating it between the
xics and xive reset paths.
So, make it just take that function pointer. Because of earlier reworks
to the KVM connect/disconnect code in the xics and xive backends we can
also eliminate some wrapper functions and streamline error handling a bit.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Greg Kurz <groug@kaod.org>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Diffstat (limited to 'include/hw/ppc/spapr_irq.h')
| -rw-r--r-- | include/hw/ppc/spapr_irq.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/hw/ppc/spapr_irq.h b/include/hw/ppc/spapr_irq.h index 0df95e1b5a..06179b271f 100644 --- a/include/hw/ppc/spapr_irq.h +++ b/include/hw/ppc/spapr_irq.h @@ -85,7 +85,6 @@ typedef struct SpaprIrq { int (*post_load)(SpaprMachineState *spapr, int version_id); void (*reset)(SpaprMachineState *spapr, Error **errp); - void (*init_kvm)(SpaprMachineState *spapr, Error **errp); } SpaprIrq; extern SpaprIrq spapr_irq_xics; |