[Qemu-devel] [PULL 23/49] xics/kvm: Skip rollback when KVM XICS is absent

[David Gibson]

From: Greg Kurz <gr...@kaod.org>

There is no need to rollback anything at this point, so just return an
error.

Signed-off-by: Greg Kurz <gr...@kaod.org>
Message-Id: <156077920657.433243.13541093940589972734.st...@bahia.lan>
Reviewed-by: Cédric Le Goater <c...@kaod.org>
Signed-off-by: David Gibson <da...@gibson.dropbear.id.au>
---
 hw/intc/xics_kvm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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");
-- 
2.21.0