From nobody Mon Feb 9 19:37:28 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1562049369; cv=none; d=zoho.com; s=zohoarc; b=G9qQaOsAx4Bm92I1WbdHZCXdT1B4QDPe9HDJgN5QvhKEdfErRR43W2aTbTmcqAjmFI7jD8SmKKD7E/LV2PKCVsu97v0/bwgFz0ClqWLznOVHhyWXMSCF2o5Fs6gBawlMjO0wO5hCWMZN2diHqBAut+egUpyDQJB0/TiJMT/1dYo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562049369; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=8VBGt/E0ecvUkMfqmzL9Fd+EjkBUEhEXtvtqwi94mbQ=; b=fM3vKGnvZGFACJPV8vkDgGnd4KjLLnGHN2s2bxiCCfJyEeeYk9CZoSUl3wUO3+W0MAbbr+fW+xx1BkroKKrmQZkP1C7ymNJM8fMPyqqF8eu0Cb3wqCPbLQCMdN1Qo5x5sx7uL2x/bosiB0lD9OjmHt3T/z0gTuN5D+Wn41lY+tY= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1562049353961371.77982786402174; Mon, 1 Jul 2019 23:35:53 -0700 (PDT) Received: from localhost ([::1]:49546 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hiCOM-0002HG-PT for importer@patchew.org; Tue, 02 Jul 2019 02:35:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58821) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hiBzK-0005Ng-FI for qemu-devel@nongnu.org; Tue, 02 Jul 2019 02:10:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hiBzI-0003GD-JH for qemu-devel@nongnu.org; Tue, 02 Jul 2019 02:09:58 -0400 Received: from ozlabs.org ([203.11.71.1]:53127) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hiBzH-0002wG-Cc; Tue, 02 Jul 2019 02:09:55 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 45dDMk4QNRz9sQx; Tue, 2 Jul 2019 16:09:05 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1562047746; bh=aYdVUD9TY91wmtYbmrNUJyyN1R8X32PzBPjRraQ5umg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nHVmeTsykqw+0dp5LcMmWra0pHOk3thuAv0vCnLt5xzBEKp3HiFEcSYSh0g6fCKu9 i7FyUWGb5QFm+/sZ/x0Z3fJNgU6eCsHM+4etTLP93uTpQoRGizJCHPSdd4Osf/sRb2 P3WciNswYQmaSu/XH+y4dGRUiuaeb1h6sK90gI5U= From: David Gibson To: peter.maydell@linaro.org Date: Tue, 2 Jul 2019 16:08:31 +1000 Message-Id: <20190702060857.3926-24-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190702060857.3926-1-david@gibson.dropbear.id.au> References: <20190702060857.3926-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 203.11.71.1 Subject: [Qemu-devel] [PULL 23/49] xics/kvm: Skip rollback when KVM XICS is absent X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, aik@ozlabs.ru, qemu-devel@nongnu.org, groug@kaod.org, qemu-ppc@nongnu.org, clg@kaod.org, David Gibson , rth@twiddle.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Greg Kurz There is no need to rollback anything at this point, so just return an error. Signed-off-by: Greg Kurz Message-Id: <156077920657.433243.13541093940589972734.stgit@bahia.lan> Reviewed-by: C=C3=A9dric Le Goater Signed-off-by: David Gibson --- 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-ker= nel XICS"); - goto fail; + return -1; } =20 rc =3D kvmppc_define_rtas_kernel_token(RTAS_IBM_SET_XIVE, "ibm,set-xiv= e"); --=20 2.21.0