From nobody Tue Nov 18 06:04:48 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.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=1607922187; cv=none; d=zohomail.com; s=zohoarc; b=CKLN0m0E39RMbt2lM8SCX5cQ/UfAgEXHHsFVCUTMUhcZIFrLKstowKOAwjm6yx5YLUmhfOgLUl7WAsfDkr5SzT4+CLPVEGU7Ia7jfcswOjY/NHgn3BomAfsdePPC7tXRFZuQJ/gLtXpoz/K3n9Ug4Q2e06BT8MHKY0CtuG60zRI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607922187; h=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; bh=aT6jIOYPuQcsLftsWcgb40IoMT0ejVTU5pttbvvD9vQ=; b=QJjuyz1bQUWnxDRK/lQLT+sX/4ef5G/xJCjaYjjoaiV25YzvhW7yijbHyhU3hpreXs+Dhb4Zwr8WdcXKDwOWvo7qKGeNcAeSuLCPdswPhV9VXRGg4k3GZpqNi/hyg2zJPnfjZIi6+zCb+fygiy07BOFq7z+vD7G14K7/MdWz57I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 1607922187862976.5187374604786; Sun, 13 Dec 2020 21:03:07 -0800 (PST) Received: from localhost ([::1]:49614 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kog0o-0002BR-P1 for importer@patchew.org; Mon, 14 Dec 2020 00:03:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39278) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kofwQ-0005Ay-8E; Sun, 13 Dec 2020 23:58:34 -0500 Received: from ozlabs.org ([2401:3900:2:1::2]:44725) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kofwO-0004qX-JM; Sun, 13 Dec 2020 23:58:34 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 4CvTfr0KZbz9sVp; Mon, 14 Dec 2020 15:58:11 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1607921892; bh=VD+J1hXhDdr3pT9HMohEBgqU/0c2VCxHCWGNmfo7B6o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ben9RVrIr9aEprqwWXgRFm1MqTTDJjUO4zAdC7BfLt4VA+n83YIukKWMXvqtoE705 VzT3eRJiX2x4oEXYrIXSGQhj61ik+TYVbFtFZrWx+MCHebJUhDtmbba1u/Qqt0kMpL +g99eyWVEURKysuZj4SiKo8OffEUZ/Hd9FNZWUjw= From: David Gibson To: peter.maydell@linaro.org Subject: [PULL 07/30] spapr: Do TPM proxy hotplug sanity checks at pre-plug Date: Mon, 14 Dec 2020 15:57:44 +1100 Message-Id: <20201214045807.41003-8-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201214045807.41003-1-david@gibson.dropbear.id.au> References: <20201214045807.41003-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=2401:3900:2:1::2; envelope-from=dgibson@ozlabs.org; helo=ozlabs.org X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.249, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: David Gibson , qemu-ppc@nongnu.org, qemu-devel@nongnu.org, groug@kaod.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 There can be only one TPM proxy at a time. This is currently checked at plug time. But this can be detected at pre-plug in order to error out earlier. This allows to get rid of error handling in the plug handler. Signed-off-by: Greg Kurz Message-Id: <20201120234208.683521-9-groug@kaod.org> Signed-off-by: David Gibson --- hw/ppc/spapr.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index ac115b0987..d51c550288 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -3971,17 +3971,28 @@ static void spapr_phb_unplug_request(HotplugHandler= *hotplug_dev, } } =20 -static void spapr_tpm_proxy_plug(HotplugHandler *hotplug_dev, DeviceState = *dev, - Error **errp) +static +bool spapr_tpm_proxy_pre_plug(HotplugHandler *hotplug_dev, DeviceState *de= v, + Error **errp) { SpaprMachineState *spapr =3D SPAPR_MACHINE(OBJECT(hotplug_dev)); - SpaprTpmProxy *tpm_proxy =3D SPAPR_TPM_PROXY(dev); =20 if (spapr->tpm_proxy !=3D NULL) { error_setg(errp, "Only one TPM proxy can be specified for this mac= hine"); - return; + return false; } =20 + return true; +} + +static void spapr_tpm_proxy_plug(HotplugHandler *hotplug_dev, DeviceState = *dev) +{ + SpaprMachineState *spapr =3D SPAPR_MACHINE(OBJECT(hotplug_dev)); + SpaprTpmProxy *tpm_proxy =3D SPAPR_TPM_PROXY(dev); + + /* Already checked in spapr_tpm_proxy_pre_plug() */ + g_assert(spapr->tpm_proxy =3D=3D NULL); + spapr->tpm_proxy =3D tpm_proxy; } =20 @@ -4004,7 +4015,7 @@ static void spapr_machine_device_plug(HotplugHandler = *hotplug_dev, } else if (object_dynamic_cast(OBJECT(dev), TYPE_SPAPR_PCI_HOST_BRIDGE= )) { spapr_phb_plug(hotplug_dev, dev); } else if (object_dynamic_cast(OBJECT(dev), TYPE_SPAPR_TPM_PROXY)) { - spapr_tpm_proxy_plug(hotplug_dev, dev, errp); + spapr_tpm_proxy_plug(hotplug_dev, dev); } } =20 @@ -4067,6 +4078,8 @@ static void spapr_machine_device_pre_plug(HotplugHand= ler *hotplug_dev, spapr_core_pre_plug(hotplug_dev, dev, errp); } else if (object_dynamic_cast(OBJECT(dev), TYPE_SPAPR_PCI_HOST_BRIDGE= )) { spapr_phb_pre_plug(hotplug_dev, dev, errp); + } else if (object_dynamic_cast(OBJECT(dev), TYPE_SPAPR_TPM_PROXY)) { + spapr_tpm_proxy_pre_plug(hotplug_dev, dev, errp); } } =20 --=20 2.29.2