From patchwork Fri Jan 13 14:11:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 641981 Delivered-To: patch@linaro.org Received: by 2002:a17:522:f3c4:b0:4b4:3859:abed with SMTP id in4csp263936pvb; Fri, 13 Jan 2023 07:23:16 -0800 (PST) X-Google-Smtp-Source: AMrXdXvZu5fYgzBteRUljYoyex6AWXBZU4TvzRbHGIuCEMxSnrwhAl0GXKmFHIk6UQoHgZXWF4nf X-Received: by 2002:a05:6214:247:b0:4c6:a49e:c255 with SMTP id k7-20020a056214024700b004c6a49ec255mr104635637qvt.35.1673623396773; Fri, 13 Jan 2023 07:23:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673623396; cv=none; d=google.com; s=arc-20160816; b=EE0e2sd4BgCjd07RWMNS7TEfbsd4s2jckiCNWXwFYf+JIpf60y6VIVqFF2qxYzx2co 28+dup+Yxc3n6aB69iBZxPOys7UMVT5ANUHClKJkPq/kogOrcF68lSsgObG8O2Mrhj29 1hLLltwvJXAeGNJ/gF9iX2+HgB06Fag3WRe8OFlOXp/UxZdmaWxtCsnKiMH+T49rOAeK xTFodAeA+hhbp5PJWP8PHNGzpV+KlZ79ECa4d0TuoIGwXD7P0cmLB3t0iTBFRNSVTbel iInfcMiIAUXAHrKR6vDGf6yUvG0EzJ5RICLK40QEO6IizHhff0+zXM/n69PSJGzLcyQW Mkqg== 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=U0jVYGVtaVuDTvfYQzXO//xeUpfHpnJsdSaFt2/PTJ4=; b=DtmaFst3G6qgPxfiqasV+CL99um1j9XKQwe+3i6Ty5G6Kr6ew88h5QV6zI6cPI9tSY ddwAc/UyglOBUD5zPALvVf77OG/s0YjZjbgoUXExsgnY58w9kB5LYCzQvPMvXW38qq4Q DZyWtai2fQ3HQz73rtwLgSd0wGu/+5tSyy4nOpwNoREByv0CLgA79Kzadcdck3z8aQGJ 5dyc47aheGg3drCVT/wrARTsl+7LtDKGfiAfpG3nvrogUsY+noBb4s/aI3pThKMP+CyF PeDwdrYKeu84T49IgaxgNZ3Ib3Mqapi5uvSKSVAWnOoZZXRC1H4pihZen+qvk89Yw3Zc hQww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ICOMjXzB; 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 ESMTP id gm1-20020a056214268100b0053230da892csi9273184qvb.468.2023.01.13.07.23.16 for ; Fri, 13 Jan 2023 07:23:16 -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=ICOMjXzB; 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 1pGKnT-0001mz-RV; Fri, 13 Jan 2023 09:12:43 -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-0001G7-E3 for qemu-devel@nongnu.org; Fri, 13 Jan 2023 09:12:17 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pGKmk-0003qZ-Fs for qemu-devel@nongnu.org; Fri, 13 Jan 2023 09:12:04 -0500 Received: by mail-wm1-x331.google.com with SMTP id g19-20020a05600c4ed300b003d9eb1dbc0aso14475072wmq.3 for ; Fri, 13 Jan 2023 06:11:57 -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=U0jVYGVtaVuDTvfYQzXO//xeUpfHpnJsdSaFt2/PTJ4=; b=ICOMjXzB7d6oz4aeLRktJwpkU7OC6LyMj0cY8KavUYnfooxUPC6Nsm7yq6GAySvjV0 opgCuRdzaqkePWXm2EzNc8jy23vZw/dEIo4HFnPd/MckTjI3zesG+a/JXDukArFKJCwh NIc3QbrvIvDb976fdqkZPbZAK1UNDOasFKK0YCh0B9qsjk1eC6FQUPIRUqL8rwyM5Tmf Nzg902Rwyu3E3U8+iw1gjCoyXAL4ReQq6hMz+irRPSAdxeJ6YYREgbH7OVSf6GQ6+fgK oSyWpru6lqq31ABk0YwcKte0JrGd1MhlZouNbDFtmlOIJC/OCyo5TzkEiNP+fGA71uwY RmFw== 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=U0jVYGVtaVuDTvfYQzXO//xeUpfHpnJsdSaFt2/PTJ4=; b=bVNnG3CB35q6YqGIL61XczqXVeVv5ktcaAFX8uNvUW5xf6YfHoAV30roKgxp9QaZEn KTNJI4aTsu/gSwNbzyJgu0K/szBV0Z0xYgOWYxbtIQBsg6cEdUc31gV8quya9/Px3G74 S8vtP6q5oEFPgKY3ddG/zXYL/DcjiiL5P6mxqm4nEVI4lQigk5IxS2rEnXo4g9khSqyq hE5YFq6kqdWlFEXi1l9bu1H+QBLml5EM5TvvhrQMfmbnaFbbUn8i1vHN22j8vF35ET9j FnmxK3rm6SCRY6LT/mESkx7GyLNJU+hLoFLYISdx5IdZ1dP7mtT39OMzWzuJli/yuPhY AmLQ== X-Gm-Message-State: AFqh2kpu2k6R8z5FOqYVx6hh16OPWhNB/TmoplOvgH4ydaVQeRzfQUdV 9TEAocN9DQFS5FSKgksWUIGjF/H0IZmFXjVG X-Received: by 2002:a05:600c:1603:b0:3d1:c895:930c with SMTP id m3-20020a05600c160300b003d1c895930cmr58302550wmn.35.1673619117052; 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.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Jan 2023 06:11:56 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 34/38] hw/misc/sbsa_ec: Rename TYPE_SBSA_EC -> TYPE_SBSA_SECURE_EC Date: Fri, 13 Jan 2023 14:11:22 +0000 Message-Id: <20230113141126.535646-35-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::331; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x331.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é The structure is named SECUREECState. Rename the type accordingly. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-id: 20230109140306.23161-12-philmd@linaro.org Signed-off-by: Peter Maydell --- hw/misc/sbsa_ec.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/hw/misc/sbsa_ec.c b/hw/misc/sbsa_ec.c index 8d939fe31b1..6f19c21195a 100644 --- a/hw/misc/sbsa_ec.c +++ b/hw/misc/sbsa_ec.c @@ -15,13 +15,14 @@ #include "hw/sysbus.h" #include "sysemu/runstate.h" -typedef struct { +typedef struct SECUREECState { SysBusDevice parent_obj; MemoryRegion iomem; } SECUREECState; -#define TYPE_SBSA_EC "sbsa-ec" -#define SECURE_EC(obj) OBJECT_CHECK(SECUREECState, (obj), TYPE_SBSA_EC) +#define TYPE_SBSA_SECURE_EC "sbsa-ec" +#define SBSA_SECURE_EC(obj) \ + OBJECT_CHECK(SECUREECState, (obj), TYPE_SBSA_SECURE_EC) enum sbsa_ec_powerstates { SBSA_EC_CMD_POWEROFF = 0x01, @@ -36,7 +37,7 @@ static uint64_t sbsa_ec_read(void *opaque, hwaddr offset, unsigned size) } static void sbsa_ec_write(void *opaque, hwaddr offset, - uint64_t value, unsigned size) + uint64_t value, unsigned size) { if (offset == 0) { /* PSCI machine power command register */ switch (value) { @@ -65,7 +66,7 @@ static const MemoryRegionOps sbsa_ec_ops = { static void sbsa_ec_init(Object *obj) { - SECUREECState *s = SECURE_EC(obj); + SECUREECState *s = SBSA_SECURE_EC(obj); SysBusDevice *dev = SYS_BUS_DEVICE(obj); memory_region_init_io(&s->iomem, obj, &sbsa_ec_ops, s, "sbsa-ec", @@ -82,7 +83,7 @@ static void sbsa_ec_class_init(ObjectClass *klass, void *data) } static const TypeInfo sbsa_ec_info = { - .name = TYPE_SBSA_EC, + .name = TYPE_SBSA_SECURE_EC, .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(SECUREECState), .instance_init = sbsa_ec_init,