From patchwork Fri Jan 13 14:11:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 641958 Delivered-To: patch@linaro.org Received: by 2002:a17:522:f3c4:b0:4b4:3859:abed with SMTP id in4csp236824pvb; Fri, 13 Jan 2023 06:34:43 -0800 (PST) X-Google-Smtp-Source: AMrXdXsExzfwuxH/VzxVrh/Dyaa+XaABaqFgvUfK8y4mtBMxolF+Btc2CY2+xrOseJui4p2it4a0 X-Received: by 2002:a81:110d:0:b0:48d:e644:e0af with SMTP id 13-20020a81110d000000b0048de644e0afmr8585671ywr.17.1673620483619; Fri, 13 Jan 2023 06:34:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673620483; cv=none; d=google.com; s=arc-20160816; b=sXwWbG46Ax/URWFOc4pLE9JQN8TQGaaqpK5EtEkdWM0tXNnP0M1p+FmrxvE6SXNSFH sHPOQRcpioZjfoEBAo1dhWnCwtmwmy79yXTrhSOQByqHPLlZo+FyEYOzjasEEJA4GjSU 9YbMwOhdsMpjX8jUTZKVfML0bMqTD8Tixui5+7YYmttL5Oy4o9cbk6Ac8YOxBZtshclT pDnCfQOZDI1KkBZW+2y+N2Aur/NfYNfByNTvAilVGyQnPRgGSAKaezAHbuCiEDccdoNR u4vS+/ObKu1TkV/+mFFGUwGozrQF7Qz4CqbBkgZoe23fHXaEx7b/m1vBYBaH646VBwua /NYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=CkFzzLkhlrLOuC53SyPlsstsHQP1png5eWd8aBX/7JQ=; b=mzdCSn0RsZymW6a+CcKtgqqkeZdPaUT4QereG5idfsYxnPYPBaFImEnaeQ8Bx+8kui 84sp+b3vG+jZBh1tFruD1NXg823w7/8b7NnPdq51SX5Ycl4IOLcPsIGttC4q/Fgz7HsJ GcCX3i0K99hCAdP2AIHjhgRC6ZjrcCRDPAoSD1QDO8GxJKrxfKuR5p1cK3bJTwDWs62v edVGpS/hHENUH35wNKw6QfaRDPBSnW6b/Clu1Wyq7N45cAYypdSD621dAzFgGVIsJLN1 +LRlbnvKYbslBrJhNADUBYLgFQRF0bWUjyrNpHHWFzABk7C4D3s16l0qE4PaZTLMPQFL TdGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=m5zI9E8S; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id p16-20020a05620a057000b006feba0ab910si11525113qkp.609.2023.01.13.06.34.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 13 Jan 2023 06:34:43 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=m5zI9E8S; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pGKnM-0001aP-3M; Fri, 13 Jan 2023 09:12:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pGKn2-0001GE-JW for qemu-devel@nongnu.org; Fri, 13 Jan 2023 09:12:18 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pGKml-0003ra-5v for qemu-devel@nongnu.org; Fri, 13 Jan 2023 09:12:05 -0500 Received: by mail-wm1-x32f.google.com with SMTP id ay40so15364310wmb.2 for ; Fri, 13 Jan 2023 06:11:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=CkFzzLkhlrLOuC53SyPlsstsHQP1png5eWd8aBX/7JQ=; b=m5zI9E8SQdQhB2Q5EZ/xy091uBW9QT1EyLcPcdW2AKfDYClv11MgQpAyUAppnbzJct rpGVm4fEEfbgsMX1DNoX5eSIvpfUY7k9n2ZSrXSxXKrdDq568h9iuWLy+fv344Yo4n/U 4HFp1dTwevtW/0cYlSetJqYyyYZbt+QNqq2vDZP4eHF6BB7wP3E/uZoA7dfYXNHyKWG+ R0G3S1VgwIvrQ7bM4U/dOREYTVs1dM7f6W84DgCh9b12frBHxrHvhrG+DDPyniSWtym4 y1tawIhdcs8JYPfSceY+sds87L+icNRj8jZLqpyN6ouXNI1sghq+s1ICYqecHXbGjMcq o97g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CkFzzLkhlrLOuC53SyPlsstsHQP1png5eWd8aBX/7JQ=; b=HAGb1goYiV28T6vLaFPgc0LFcQmtpFhkI15YylN/AS2MjI/XBDN6eY60NIQrat4O2P 05f7elfMdNIXAg5hVaPqDLn5YlMNzJnCXZVl5HOKVPQmc0PwqAz9rlFPluUP6S9L2QG5 nxGINZeH00THcaTmfFD1/mwy7WLz0aQ/fH2ydCSyzJC5mArg6Byila62bqoTAEeN7yHz L/8TYHCtLnLz7Biv/BFBJEscw/eP/R1sWK+zUvWRyaf2svU/QRzU/an6b2VieDJc3GtO NC/kVLyOjoBlVrS1AqL2WuF0HJ8UCbbhbcTinTSfWI9WDyJt4LuG4i3maWjltLW/lZr2 cCgg== X-Gm-Message-State: AFqh2kqlCXE2xv4wdDW4mCTSAIgFt3S3JzE/1COOtlMBWWepO1aZ7yqW Tqpvr5fU1tUDe17DetuOu6LQAkAXZuGPgdKA X-Received: by 2002:a7b:c447:0:b0:3c6:e63d:adaf with SMTP id l7-20020a7bc447000000b003c6e63dadafmr59429537wmi.31.1673619117938; Fri, 13 Jan 2023 06:11:57 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id n36-20020a05600c502400b003da0b75de94sm5334464wmr.8.2023.01.13.06.11.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Jan 2023 06:11:57 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 35/38] hw/misc/sbsa_ec: Declare QOM macros using OBJECT_DECLARE_SIMPLE_TYPE() Date: Fri, 13 Jan 2023 14:11:23 +0000 Message-Id: <20230113141126.535646-36-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230113141126.535646-1-peter.maydell@linaro.org> References: <20230113141126.535646-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé This model was merged few days before the QOM cleanup from commit 8063396bf3 ("Use OBJECT_DECLARE_SIMPLE_TYPE when possible") was pulled and merged. Manually adapt. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-id: 20230109140306.23161-13-philmd@linaro.org Signed-off-by: Peter Maydell --- hw/misc/sbsa_ec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/misc/sbsa_ec.c b/hw/misc/sbsa_ec.c index 6f19c21195a..86b23a5372f 100644 --- a/hw/misc/sbsa_ec.c +++ b/hw/misc/sbsa_ec.c @@ -21,8 +21,7 @@ typedef struct SECUREECState { } SECUREECState; #define TYPE_SBSA_SECURE_EC "sbsa-ec" -#define SBSA_SECURE_EC(obj) \ - OBJECT_CHECK(SECUREECState, (obj), TYPE_SBSA_SECURE_EC) +OBJECT_DECLARE_SIMPLE_TYPE(SECUREECState, SBSA_SECURE_EC) enum sbsa_ec_powerstates { SBSA_EC_CMD_POWEROFF = 0x01,