From nobody Wed Feb 11 06:50:26 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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=1605916109; cv=none; d=zohomail.com; s=zohoarc; b=P1a8ZHRGaPnYUQY6mXSS4vidx0wsc7aJ2VKZWUZcT9XJLrrkRcbvl7Xy5y8TWUOXwwLrp5eNm1eVrsxhkhfQjSbC5Ibaj60VefUjCcUwNIrrbVfIkstD+Itpf32p41Y9XHBOILwdoy0DeyLWBWrqzeOsmpk6QjVrUlRQVsHB+5U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605916109; 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; bh=GuDEmZ40+380i8LP/tXZWPlqNcMq8TrKCGuD6OguxeY=; b=gD0J96a8IO/1sbxmXbZgKPQOC8tLmC9Hfjr7P86t7ZI2mM3azDQy7UL2QLasJFPpz/8GhZPyfG82WLISKAiwz9Fcan5O/vlvdbGrKC1rf5KhRKXIOnHZ6uqwL2WKX7Kn+y5G/X1T+vN0kOFatdiXPX2bhFWVfLp0NdBFeN0qWB8= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 160591610955091.8057900473924; Fri, 20 Nov 2020 15:48:29 -0800 (PST) Received: from localhost ([::1]:49882 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kgG8i-0004jc-Hl for importer@patchew.org; Fri, 20 Nov 2020 18:48:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42968) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kgG31-00068T-02 for qemu-devel@nongnu.org; Fri, 20 Nov 2020 18:42:35 -0500 Received: from us-smtp-delivery-44.mimecast.com ([207.211.30.44]:44215) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kgG2x-0003qg-3n for qemu-devel@nongnu.org; Fri, 20 Nov 2020 18:42:34 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-427-WnjQsAg_M9eiGMbRVaTiLQ-1; Fri, 20 Nov 2020 18:42:26 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 518C88030BF; Fri, 20 Nov 2020 23:42:25 +0000 (UTC) Received: from bahia.redhat.com (ovpn-112-44.ams2.redhat.com [10.36.112.44]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1C92F60BFA; Fri, 20 Nov 2020 23:42:21 +0000 (UTC) X-MC-Unique: WnjQsAg_M9eiGMbRVaTiLQ-1 From: Greg Kurz To: qemu-devel@nongnu.org Subject: [PATCH for-6.0 8/9] spapr: Do TPM proxy hotplug sanity checks at pre-plug Date: Sat, 21 Nov 2020 00:42:07 +0100 Message-Id: <20201120234208.683521-9-groug@kaod.org> In-Reply-To: <20201120234208.683521-1-groug@kaod.org> References: <20201120234208.683521-1-groug@kaod.org> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=groug@kaod.org X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: kaod.org 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: softfail client-ip=207.211.30.44; envelope-from=groug@kaod.org; helo=us-smtp-delivery-44.mimecast.com X-Spam_score_int: -11 X-Spam_score: -1.2 X-Spam_bar: - X-Spam_report: (-1.2 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_SOFTFAIL=0.665 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: Igor Mammedov , qemu-ppc@nongnu.org, Greg Kurz , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" 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 --- 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 bded059d59c8..5e32d1d396b4 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -3957,17 +3957,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 @@ -3990,7 +4001,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 @@ -4053,6 +4064,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.26.2