From patchwork Mon Jan 9 14:03:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 640659 Delivered-To: patch@linaro.org Received: by 2002:a17:522:f3c4:b0:4b4:3859:abed with SMTP id in4csp2197636pvb; Mon, 9 Jan 2023 07:17:12 -0800 (PST) X-Google-Smtp-Source: AMrXdXs1c2SzehlRCJPrrSwnwxZyM7ky1jeZQfPOTwPF2ONOfqvio4QgeroTco73VWm2dNIoew00 X-Received: by 2002:a05:7500:4399:b0:f0:5ba6:27bc with SMTP id fn25-20020a057500439900b000f05ba627bcmr53076gab.29.1673277432387; Mon, 09 Jan 2023 07:17:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673277432; cv=none; d=google.com; s=arc-20160816; b=FwuuMwv7ihHZwszpKLowDMAHTFJBN4qL0ulroDh2gC4D5lCx1nE/YcaCuYRUOSDbz1 z8jFYY6Iqk4/9TA6Z8SsV1e1itKU1JJjHWpwHItjc7ZyNzUoRvHFRCiOTSdh7KhIeDAH TsFqm/d/FIgCc8fsXKU0KhUrKsVrx0WsTPpRXHx0iVtuWTlTRBeKyhXDHpTXNmXLwSPz ZDWmUb8QClo08fVYIXcGaB+lYi830+Wb7uAfDzR74gG5U4qL7ixH5tS8R43TDOok62vt C3q17IFO6CgGYbqp/wmvyR277+/sdR5C02zsiLfP8JVI8h++3CSEFgJIKknUX2ZzglJf XcYQ== 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:cc:to :from:dkim-signature; bh=7BFQYTotXMIsrw/hyKX+oi+c+rZBE8f8yezrJmKudvs=; b=gzO7S9hOhOI65AnUv2aHcYkQerwpaiJWe7jqfG9PT8/nr/HhiAArSaiJwWbsZ8Rq/d tS+iLzrbFAkQHZNHzDxZxdUIiz3eOwm0yyXXZ+ooE37MkKK7cjnpX+mq7tTJ5d5jCts0 JLQBBU6EfXCMmawxr0sICLv505mAuZJHrWquZaIbhQ7koROjfTFj0T8Fx4QGECbyWd47 gZMXegyJl07ShSzboriGdZwh93DZYulj5gkn12kx3HJQ7rHSYuJpZhF7dr+9fwQj7k40 NN+RfJAcrDMjCdKUzWrbhag6OaQbUCZeLaZ3GQ5g9qO0rOu6zvr1fSYWFLTXw0u3z9iO DrkA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=X0Lve+yN; 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 i17-20020a05620a249100b006feddfc8c14si5111287qkn.484.2023.01.09.07.17.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 09 Jan 2023 07:17:12 -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=X0Lve+yN; 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 1pEslC-0001qV-Ke; Mon, 09 Jan 2023 09:04:22 -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 1pEsl3-0001ml-7X for qemu-devel@nongnu.org; Mon, 09 Jan 2023 09:04:13 -0500 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pEskz-00075e-Np for qemu-devel@nongnu.org; Mon, 09 Jan 2023 09:04:11 -0500 Received: by mail-wm1-x32c.google.com with SMTP id ay40so6346058wmb.2 for ; Mon, 09 Jan 2023 06:04:09 -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:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7BFQYTotXMIsrw/hyKX+oi+c+rZBE8f8yezrJmKudvs=; b=X0Lve+yN2jV2HlrkcE0RiLBXetXm5XbVn/pIRfzyp5PEoxSgfn+Z1EJyezUwse8F2R zX8WgUuVM296gZSqJb3SxLK2xDjv0aQnKjm+cUXWKTgiyaTB7RDVreDMCf+iuHswCQGx EpKdqKzZcmglNXA0KQMXD2CXzMGOtYhsgGw68BDh2kc4ePoK5tvasKuaY6O/p1QWhS3Y s1Izai2Xsz8CBp9XpLvnsjqjPmiMY1b4P83BA1FJXLIX5jOwDXRAS/L+Z3djoSkLwrpY NeUslyD1we7hObvLTdk+yiv8Hpm8El1H7tlq8p1YVcAVZm0a2i7gYIsQYwEf3WgUT89I 9LCw== 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7BFQYTotXMIsrw/hyKX+oi+c+rZBE8f8yezrJmKudvs=; b=LAlJk8CWQrzkYUTWL4uLA8c0ROIaZJxi2vrkiCURMsMj0RBlCsWzfwu7kmBIxQMq78 dLmhUpn6YUaX+uveZJBwwUCABQypHPbiyhWLfObtAgSCd9+t515o7lmisP5Owf90+rx5 kWLEEQydY8t0g+8Uue9jpOXIusgvL1oSFO3J2eVicnSEVCEQStM/rA/h9YeslkU25T5W 47oPWWagDd0swWH42JljXKIAo4R+Io//OWcZwHmUj4XrUFOIf+6a7Oehd2AFxRLJxmPl itkl52jIXrMwwOHzUEUhx9t/i7vvneo01cA+kaB4pxkd92XnvbdyYLV91mMSvwyTNDJO K/jg== X-Gm-Message-State: AFqh2koCdislPzMQbuJJlw4M7HUBg/i4yPV6XQaqviqIzCmH5be18J6V /r9PkAV6adFuGw+8srIYy5WUaVUkQR546q0M X-Received: by 2002:a05:600c:5024:b0:3d3:55ad:a114 with SMTP id n36-20020a05600c502400b003d355ada114mr46999823wmr.38.1673273048229; Mon, 09 Jan 2023 06:04:08 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id h15-20020a05600c314f00b003d99469ece1sm17126842wmo.24.2023.01.09.06.04.07 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 09 Jan 2023 06:04:07 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Havard Skinnemoen , "Edgar E. Iglesias" , Alistair Francis , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Peter Maydell , Eduardo Habkost , Tyrone Ting Subject: [PATCH 12/14] hw/misc/sbsa_ec: Declare QOM macros using OBJECT_DECLARE_SIMPLE_TYPE() Date: Mon, 9 Jan 2023 15:03:04 +0100 Message-Id: <20230109140306.23161-13-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230109140306.23161-1-philmd@linaro.org> References: <20230109140306.23161-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.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=unavailable 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 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é --- 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 6f19c21195..86b23a5372 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,