From nobody Thu Sep 19 02:00:51 2024 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; dkim=fail; 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 1550501378088968.149480989335; Mon, 18 Feb 2019 06:49:38 -0800 (PST) Received: from localhost ([127.0.0.1]:59815 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gvkEd-0003cO-Vh for importer@patchew.org; Mon, 18 Feb 2019 09:49:32 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38739) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gvjwv-0005cm-Md for qemu-devel@nongnu.org; Mon, 18 Feb 2019 09:31:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gvjwu-0002h7-5U for qemu-devel@nongnu.org; Mon, 18 Feb 2019 09:31:13 -0500 Received: from ozlabs.org ([2401:3900:2:1::2]:52251) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gvjws-0002b9-04; Mon, 18 Feb 2019 09:31:11 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 4435rd6vrRz9sP6; Tue, 19 Feb 2019 01:30:57 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1550500257; bh=Q7oLJ5chH6CvwChmQ/QusYiYOHv+JWPZJBoGvtnalJY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lXyOeCz8hZZuLv4D0IeCXrfiNGuM+cYRi5Z9AxWey5+sfxHlxGh5xrXRbqVdefE1V kjnbCMdyAz3EJ/63cVIm5fLCjezYsDPjgJFlN9QJLsdttLx3kwPGuD6oB55q+JsIN1 3MdOHLsPI/RginOISobbaeC2/oRONVdTVII6lnl4= From: David Gibson To: peter.maydell@linaro.org Date: Tue, 19 Feb 2019 01:30:13 +1100 Message-Id: <20190218143049.17142-8-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190218143049.17142-1-david@gibson.dropbear.id.au> References: <20190218143049.17142-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 Subject: [Qemu-devel] [PULL 07/43] spapr: Disallow unsupported kernel-irqchip settings X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: clg@kaod.org, David Gibson , qemu-ppc@nongnu.org, groug@kaod.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Greg Kurz Split mode doesn't make sense on pseries, neither with XICS nor XIVE. But passing kernel-irqchip=3Dsplit silently behaves like kernel-irqchip=3Don. Other architectures that support kernel-irqchip do terminate QEMU when split mode is requested but not available though. Do the same with pseries for consistency. Similarly, passing kernel-irqchip=3Don,accel=3Dtcg starts the machine with = the emulated interrupt controller, ie, behaves like kernel-irqchip=3Doff. Howev= er, when passing kernel-irqchip=3Don,accel=3Dkvm, if we can't initialize the K= VM XICS for some reason, ie, xics_kvm_init() fails, then QEMU is terminated. This is inconsistent. Terminate QEMU all the same when requesting the in-kernel interrupt controller without KVM. Signed-off-by: Greg Kurz Message-Id: <154964986747.291716.2679312373018476920.stgit@bahia.lan> Signed-off-by: David Gibson --- hw/ppc/spapr_irq.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c index 2d7a7c1638..80b0083b8e 100644 --- a/hw/ppc/spapr_irq.c +++ b/hw/ppc/spapr_irq.c @@ -600,6 +600,19 @@ sPAPRIrq spapr_irq_dual =3D { */ void spapr_irq_init(sPAPRMachineState *spapr, Error **errp) { + MachineState *machine =3D MACHINE(spapr); + + if (machine_kernel_irqchip_split(machine)) { + error_setg(errp, "kernel_irqchip split mode not supported on pseri= es"); + return; + } + + if (!kvm_enabled() && machine_kernel_irqchip_required(machine)) { + error_setg(errp, + "kernel_irqchip requested but only available with KVM"); + return; + } + /* Initialize the MSI IRQ allocator. */ if (!SPAPR_MACHINE_GET_CLASS(spapr)->legacy_irq_allocation) { spapr_irq_msi_init(spapr, spapr->irq->nr_msis); --=20 2.20.1