Message ID | 20181116105729.23240-30-clg@kaod.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org> Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D737214BD for <patchwork-qemu-devel@patchwork.kernel.org>; Fri, 16 Nov 2018 11:28:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C1D4E2B55E for <patchwork-qemu-devel@patchwork.kernel.org>; Fri, 16 Nov 2018 11:28:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B1BB22CA9D; Fri, 16 Nov 2018 11:28:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 691942B55E for <patchwork-qemu-devel@patchwork.kernel.org>; Fri, 16 Nov 2018 11:28:34 +0000 (UTC) Received: from localhost ([::1]:44216 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org>) id 1gNcIb-0008Ge-Jo for patchwork-qemu-devel@patchwork.kernel.org; Fri, 16 Nov 2018 06:28:33 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34585) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <clg@kaod.org>) id 1gNbrq-0000bV-Bt for qemu-devel@nongnu.org; Fri, 16 Nov 2018 06:01:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <clg@kaod.org>) id 1gNbrl-00019T-9g for qemu-devel@nongnu.org; Fri, 16 Nov 2018 06:00:54 -0500 Received: from 6.mo2.mail-out.ovh.net ([87.98.165.38]:50952) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from <clg@kaod.org>) id 1gNbrj-0000nO-04 for qemu-devel@nongnu.org; Fri, 16 Nov 2018 06:00:49 -0500 Received: from player734.ha.ovh.net (unknown [10.109.146.53]) by mo2.mail-out.ovh.net (Postfix) with ESMTP id 689F51739A8 for <qemu-devel@nongnu.org>; Fri, 16 Nov 2018 12:00:23 +0100 (CET) Received: from kaod.org (lfbn-1-10605-110.w90-89.abo.wanadoo.fr [90.89.196.110]) (Authenticated sender: clg@kaod.org) by player734.ha.ovh.net (Postfix) with ESMTPSA id 2FA29280100; Fri, 16 Nov 2018 12:00:18 +0100 (CET) From: =?utf-8?q?C=C3=A9dric_Le_Goater?= <clg@kaod.org> To: David Gibson <david@gibson.dropbear.id.au> Date: Fri, 16 Nov 2018 11:57:22 +0100 Message-Id: <20181116105729.23240-30-clg@kaod.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181116105729.23240-1-clg@kaod.org> References: <20181116105729.23240-1-clg@kaod.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Ovh-Tracer-Id: 11765372553808874470 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedtkedrleejgddvudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 87.98.165.38 Subject: [Qemu-devel] [PATCH v5 29/36] ppc/xics: remove abort() in icp_kvm_init() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, =?utf-8?q?C=C3=A9dric_Le_Goa?= =?utf-8?q?ter?= <clg@kaod.org> Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org> X-Virus-Scanned: ClamAV using ClamSMTP |
Series |
ppc: support for the XIVE interrupt controller (POWER9)
|
expand
|
diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c index efad1b19d821..9662e208fa81 100644 --- a/hw/intc/xics_kvm.c +++ b/hw/intc/xics_kvm.c @@ -131,7 +131,8 @@ static void icp_kvm_init(ICPState *icp, Error **errp) int ret; if (kernel_xics_fd == -1) { - abort(); + error_setg(errp, "KVM XICS device is not initialized"); + return; } cs = icp->cs;
Replace the abort with an error report which will be handled by the caller. Signed-off-by: Cédric Le Goater <clg@kaod.org> --- hw/intc/xics_kvm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)