From patchwork Fri Dec 29 21:23:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 758843 Delivered-To: patch@linaro.org Received: by 2002:a5d:67c6:0:b0:336:6142:bf13 with SMTP id n6csp4672414wrw; Fri, 29 Dec 2023 13:31:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IGitMS4i31rT2b7ipTNo03mgXdXjgOh3BZDeLUFElSLwz+6R6l2xGztj9Y+cCP1fXbJIG4O X-Received: by 2002:ac8:5896:0:b0:425:4043:189d with SMTP id t22-20020ac85896000000b004254043189dmr18947509qta.80.1703885496389; Fri, 29 Dec 2023 13:31:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703885496; cv=none; d=google.com; s=arc-20160816; b=bRxw17YhqA3VOAxRqTVwxnyAuhWn9OwR561wyONcV2A3MTmREZOTTAcjSocZlaqTw8 iViL5uGWX05SHDy8d45fbHlvlXwTH/InviTVZghts2wuuq6HVcbZyWQbzbKbLOJSCj64 uSWczkA+xg5YoRTpvYh7AGUQDIJt91Y1s3F/vQc5yqF+QC9ii+UYx00pSmiXq5oTtbLv cZLgOCKlSuJNC8aHmljhHvmxRlG3MdhIGEX0L2s5ltfz6fK8p6f3YNE0AxxmQZiz84aI xkfjOaXdvasmMY1+4iGO7eEjDxvOGdUaWuj6J/IA0vwXjrgqaY9B5OEYLYMX5P8yczQ+ BXOA== 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=t/iLSJsvUNqGmwk21ef6qw5I/mGLsPK8yQVUTzDeYUY=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=G+KGxZgy9tsq0O+WxhHy7Rj1gc8QOofS3wOpCdnqyzik3e8MMiDPU+bCVQGHW+1wH2 DOVn79E6NkQVLyTgCQxNHOStTJfzQ+Akwo0OQke7c7+seBekzQ12gFxbEwfnov3HftWr 4PDBmU8/0J/3buMEHsfBASxNSK6RR45uUAASr4Kb5lQo869Jr/TsyN8QBR0PFZ+A7Q96 UKSozVpttBDToh2f/BPoDb9fxYZGsMQ8QUaXospmslk23PBELyEtcwu3OmyTyvcb1ZdI Qxelzja9WSIUjHfjQj7rFWMVbjueCuAD2XaoDJ6CO16CLvBrFTCpmAdlWM8pUKRwIcKP dk+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=S+MPuuUU; 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 bz18-20020a05622a1e9200b004280d858cbasi650757qtb.412.2023.12.29.13.31.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Dec 2023 13:31:36 -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=S+MPuuUU; 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 1rJKQI-0000kS-OH; Fri, 29 Dec 2023 16:29:42 -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 1rJKPz-0008QI-J1 for qemu-devel@nongnu.org; Fri, 29 Dec 2023 16:29:25 -0500 Received: from mail-oi1-x230.google.com ([2607:f8b0:4864:20::230]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rJKPu-0000O6-7G for qemu-devel@nongnu.org; Fri, 29 Dec 2023 16:29:19 -0500 Received: by mail-oi1-x230.google.com with SMTP id 5614622812f47-3bbc648bed4so2175764b6e.3 for ; Fri, 29 Dec 2023 13:29:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1703885356; x=1704490156; darn=nongnu.org; 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=t/iLSJsvUNqGmwk21ef6qw5I/mGLsPK8yQVUTzDeYUY=; b=S+MPuuUUGb32+OfHpN6EfgOgAqOFvrJdt6a+7mH2i/W9z+iFXhfhu0IiTkvX4jQMY0 h9moJGZrJL/RLB5bBu9RwfzXA3FRf81fMAKGF/u56uhfrxLk4DjJr6c20kn1cRj0L9ss 6JCH3VhPEOptO3aP+vyM8D1VfCrp9esUvIQ66tVjEVv8Osj+DCTpmNXrQZhBFQCJHTrs V+PowtDckjdpUu71SlwoWLkjb47EIqULaQiC4Dhv0x0ycIY+06IrqjbqwKP+l3JFMoay WQoOoQ7VbBhJinbUkBNYsbDB476YX+9baMRTQveBp5rCiEMcaJz31z3VtuWEBO8TniYv 4EWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703885356; x=1704490156; 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=t/iLSJsvUNqGmwk21ef6qw5I/mGLsPK8yQVUTzDeYUY=; b=JZVFob8Ud+0CJ9SXuegYlXi3FPjOsRhQNFruRFqdlRrTWkwfIoKc4sjeE8qcxqFzk9 hk2P6oes92X8/ndsaP5Y5z3BZfebfXLP5cLtcgAtJi/ltRoFQyz5EQaMQt0+A/2HIClv e1S4aKcm3aUbQl3ynsT2cuPcVCG64wlYfKACgGYQDVsClEmk/fJ5XlMfXwvCYom9rcvt gq3LG2PB41f/WzG3RUhzkdkJHJcvpZ7m5lL/4PxzcvHraHBV6TmypjIu1mPgGMntaQ3w T/WPmf37Wih31dIEWp4fsSXcwIieYCSo5yXiA7f7uXkpMho9gt917KlLAXXBT1nm1ERQ QcUg== X-Gm-Message-State: AOJu0YzomSlBnvASmaBdhXAM248H6trcwyB/3NdioY+f5fu3MFLmECOQ 6boRk7XG0jmAEFT96egAhJyGEMR6eDRlD8ReL6EpX2Dimz5Bvg== X-Received: by 2002:a05:6808:338b:b0:3bb:c774:565e with SMTP id ce11-20020a056808338b00b003bbc774565emr4852067oib.24.1703885356114; Fri, 29 Dec 2023 13:29:16 -0800 (PST) Received: from stoup.lan (203-217-28-32.perm.iinet.net.au. [203.217.28.32]) by smtp.gmail.com with ESMTPSA id bd33-20020a056a0027a100b006d9a96b7d0dsm11285396pfb.208.2023.12.29.13.29.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 13:29:15 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 61/71] hw/watchdog: Constify VMState Date: Sat, 30 Dec 2023 08:23:36 +1100 Message-Id: <20231229212346.147149-62-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231229212346.147149-1-richard.henderson@linaro.org> References: <20231229212346.147149-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::230; envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x230.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, T_SCC_BODY_TEXT_LINE=-0.01 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 Signed-off-by: Richard Henderson Message-Id: <20231221031652.119827-62-richard.henderson@linaro.org> --- hw/watchdog/allwinner-wdt.c | 2 +- hw/watchdog/cmsdk-apb-watchdog.c | 2 +- hw/watchdog/sbsa_gwdt.c | 2 +- hw/watchdog/spapr_watchdog.c | 2 +- hw/watchdog/wdt_aspeed.c | 2 +- hw/watchdog/wdt_diag288.c | 2 +- hw/watchdog/wdt_i6300esb.c | 2 +- hw/watchdog/wdt_ib700.c | 2 +- hw/watchdog/wdt_imx2.c | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/hw/watchdog/allwinner-wdt.c b/hw/watchdog/allwinner-wdt.c index 6205765efe..d35711c7c5 100644 --- a/hw/watchdog/allwinner-wdt.c +++ b/hw/watchdog/allwinner-wdt.c @@ -313,7 +313,7 @@ static const VMStateDescription allwinner_wdt_vmstate = { .name = "allwinner-wdt", .version_id = 1, .minimum_version_id = 1, - .fields = (VMStateField[]) { + .fields = (const VMStateField[]) { VMSTATE_PTIMER(timer, AwWdtState), VMSTATE_UINT32_ARRAY(regs, AwWdtState, AW_WDT_REGS_NUM), VMSTATE_END_OF_LIST() diff --git a/hw/watchdog/cmsdk-apb-watchdog.c b/hw/watchdog/cmsdk-apb-watchdog.c index 5a2cd46eb7..3091e5c3d5 100644 --- a/hw/watchdog/cmsdk-apb-watchdog.c +++ b/hw/watchdog/cmsdk-apb-watchdog.c @@ -361,7 +361,7 @@ static const VMStateDescription cmsdk_apb_watchdog_vmstate = { .name = "cmsdk-apb-watchdog", .version_id = 2, .minimum_version_id = 2, - .fields = (VMStateField[]) { + .fields = (const VMStateField[]) { VMSTATE_CLOCK(wdogclk, CMSDKAPBWatchdog), VMSTATE_PTIMER(timer, CMSDKAPBWatchdog), VMSTATE_UINT32(control, CMSDKAPBWatchdog), diff --git a/hw/watchdog/sbsa_gwdt.c b/hw/watchdog/sbsa_gwdt.c index 7aa57a8c51..96895d7636 100644 --- a/hw/watchdog/sbsa_gwdt.c +++ b/hw/watchdog/sbsa_gwdt.c @@ -28,7 +28,7 @@ static const VMStateDescription vmstate_sbsa_gwdt = { .name = "sbsa-gwdt", .version_id = 1, .minimum_version_id = 1, - .fields = (VMStateField[]) { + .fields = (const VMStateField[]) { VMSTATE_TIMER_PTR(timer, SBSA_GWDTState), VMSTATE_UINT32(wcs, SBSA_GWDTState), VMSTATE_UINT32(worl, SBSA_GWDTState), diff --git a/hw/watchdog/spapr_watchdog.c b/hw/watchdog/spapr_watchdog.c index 55ff1f03c1..2bb1d3c532 100644 --- a/hw/watchdog/spapr_watchdog.c +++ b/hw/watchdog/spapr_watchdog.c @@ -226,7 +226,7 @@ static const VMStateDescription vmstate_wdt = { .version_id = 1, .minimum_version_id = 1, .needed = watchdog_needed, - .fields = (VMStateField[]) { + .fields = (const VMStateField[]) { VMSTATE_TIMER(timer, SpaprWatchdog), VMSTATE_UINT8(action, SpaprWatchdog), VMSTATE_UINT8(leave_others, SpaprWatchdog), diff --git a/hw/watchdog/wdt_aspeed.c b/hw/watchdog/wdt_aspeed.c index 273a49d360..d70b656f8e 100644 --- a/hw/watchdog/wdt_aspeed.c +++ b/hw/watchdog/wdt_aspeed.c @@ -218,7 +218,7 @@ static const VMStateDescription vmstate_aspeed_wdt = { .name = "vmstate_aspeed_wdt", .version_id = 0, .minimum_version_id = 0, - .fields = (VMStateField[]) { + .fields = (const VMStateField[]) { VMSTATE_TIMER_PTR(timer, AspeedWDTState), VMSTATE_UINT32_ARRAY(regs, AspeedWDTState, ASPEED_WDT_REGS_MAX), VMSTATE_END_OF_LIST() diff --git a/hw/watchdog/wdt_diag288.c b/hw/watchdog/wdt_diag288.c index 76d89fbf78..1b73b16fb3 100644 --- a/hw/watchdog/wdt_diag288.c +++ b/hw/watchdog/wdt_diag288.c @@ -23,7 +23,7 @@ static const VMStateDescription vmstate_diag288 = { .name = "vmstate_diag288", .version_id = 0, .minimum_version_id = 0, - .fields = (VMStateField[]) { + .fields = (const VMStateField[]) { VMSTATE_TIMER_PTR(timer, DIAG288State), VMSTATE_BOOL(enabled, DIAG288State), VMSTATE_END_OF_LIST() diff --git a/hw/watchdog/wdt_i6300esb.c b/hw/watchdog/wdt_i6300esb.c index 54c167cd35..8bce0509cd 100644 --- a/hw/watchdog/wdt_i6300esb.c +++ b/hw/watchdog/wdt_i6300esb.c @@ -418,7 +418,7 @@ static const VMStateDescription vmstate_i6300esb = { */ .version_id = 10000, .minimum_version_id = 1, - .fields = (VMStateField[]) { + .fields = (const VMStateField[]) { VMSTATE_PCI_DEVICE(dev, I6300State), VMSTATE_INT32(reboot_enabled, I6300State), VMSTATE_INT32(clock_scale, I6300State), diff --git a/hw/watchdog/wdt_ib700.c b/hw/watchdog/wdt_ib700.c index a1750a4957..eea8da6059 100644 --- a/hw/watchdog/wdt_ib700.c +++ b/hw/watchdog/wdt_ib700.c @@ -95,7 +95,7 @@ static const VMStateDescription vmstate_ib700 = { .name = "ib700_wdt", .version_id = 0, .minimum_version_id = 0, - .fields = (VMStateField[]) { + .fields = (const VMStateField[]) { VMSTATE_TIMER_PTR(timer, IB700State), VMSTATE_END_OF_LIST() } diff --git a/hw/watchdog/wdt_imx2.c b/hw/watchdog/wdt_imx2.c index 891d7beb2a..6452fc4721 100644 --- a/hw/watchdog/wdt_imx2.c +++ b/hw/watchdog/wdt_imx2.c @@ -234,7 +234,7 @@ static const MemoryRegionOps imx2_wdt_ops = { static const VMStateDescription vmstate_imx2_wdt = { .name = "imx2.wdt", - .fields = (VMStateField[]) { + .fields = (const VMStateField[]) { VMSTATE_PTIMER(timer, IMX2WdtState), VMSTATE_PTIMER(itimer, IMX2WdtState), VMSTATE_BOOL(wicr_locked, IMX2WdtState),