diff options
| author | Greg Kurz <groug@kaod.org> | 2019-06-17 15:46:46 +0200 |
|---|---|---|
| committer | David Gibson <david@gibson.dropbear.id.au> | 2019-07-02 09:43:58 +1000 |
| commit | 64fb96214c4c0f107fa3b53878779217826b8f48 (patch) | |
| tree | 1588a1fafd025167ac27f509505a436f0ae5f0e5 /hw/intc | |
| parent | eab9f191a064913bb0011894143ed6053ecbdf69 (diff) | |
| download | focaccia-qemu-64fb96214c4c0f107fa3b53878779217826b8f48.tar.gz focaccia-qemu-64fb96214c4c0f107fa3b53878779217826b8f48.zip | |
xics/kvm: Skip rollback when KVM XICS is absent
There is no need to rollback anything at this point, so just return an error. Signed-off-by: Greg Kurz <groug@kaod.org> Message-Id: <156077920657.433243.13541093940589972734.stgit@bahia.lan> Reviewed-by: Cédric Le Goater <clg@kaod.org> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'hw/intc')
| -rw-r--r-- | hw/intc/xics_kvm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c index 534515143e..377ff88701 100644 --- a/hw/intc/xics_kvm.c +++ b/hw/intc/xics_kvm.c @@ -348,7 +348,7 @@ int xics_kvm_connect(SpaprMachineState *spapr, Error **errp) if (!kvm_enabled() || !kvm_check_extension(kvm_state, KVM_CAP_IRQ_XICS)) { error_setg(errp, "KVM and IRQ_XICS capability must be present for in-kernel XICS"); - goto fail; + return -1; } rc = kvmppc_define_rtas_kernel_token(RTAS_IBM_SET_XIVE, "ibm,set-xive"); |