From patchwork Mon Nov 6 06:58:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 741279 Delivered-To: patch@linaro.org Received: by 2002:adf:fd90:0:b0:32d:baff:b0ca with SMTP id d16csp948843wrr; Sun, 5 Nov 2023 23:10:31 -0800 (PST) X-Google-Smtp-Source: AGHT+IHyrnBOUaNdgUZOkk4CglzHVu1Q0+poxaEs7UPTE4ujUh1N/rRiVuVSbvoEzGjG8Rg0+h34 X-Received: by 2002:a05:6214:76d:b0:66d:1d3f:17d7 with SMTP id f13-20020a056214076d00b0066d1d3f17d7mr42511738qvz.8.1699254631330; Sun, 05 Nov 2023 23:10:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699254631; cv=none; d=google.com; s=arc-20160816; b=beEwiVy0/wh+ycPjSZj8f9oCTac5r7sbtiMlCGExmjGt9tEhuLY2fIzdItC6sT3Br+ l6kObGG1qF4PyoM4NAzGwpm6glW9qUbdjJd3yRhK901fLZlR9+RtGxVjsClfvlJXttk9 UeBXrf6kM3xUUmmTOg3mYJmDEhAybtt4fBciI9dpFPSok6aY5uKY9bb7o5BGV030hLQi 2L30FeFI/+GqQYVXTaZn6nEIdPu4l/G0G5Wb7n69YZMDhixUdDzYRz+jfdytSnNU7hIf CNYcjHScjQPmyKYzLSxI6z9FOSjEzih0nokRogmJTzsBBcCp/ap3ReQ1vPXKwBigpkDF y+Ug== 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=Fy1/pxSKYPLnC7iC7jUDLvYtACSeBLVWlhtQd/mhggA=; fh=U+hGNjcWZPeyLe2bTdTFM68h7FRptferheHiMMFpeys=; b=DrnzAv3I7rNIgxZq40u1b+jZmbKjWWV/cDBKA1ghZcXZMMuPcJaMzlqJiJrnJEEdm1 gtjEv3bCTS1/rmyKGofVoEw9wLrMbImblIzNm48MnTcR9an/v+PpwxH4aE1y6gktzN2X 3tn1yRr0V8qFv17AVSoMtFstusWnG+GP24vARlLivsYRIVCKslypcLjJT5+GG+qUHUQj PHJOKSExwkoA/aSCGvDnFaLFRtKrAouowiuYTTpn004islo9JLwtor8F7sMZzjdxPxUZ xVMF/MBIHcIzLcHQp93kK5UNUqyFp7qIucpFuq5w58kefmMin9sl5sTnekEF4LYhWgGj 6Hjg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="cn/0zrav"; 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 u18-20020a0cea52000000b0066d06190561si5202036qvp.494.2023.11.05.23.10.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 05 Nov 2023 23:10:31 -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="cn/0zrav"; 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 1qztfz-0006EC-8o; Mon, 06 Nov 2023 02:05:35 -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 1qztd5-0000nS-Ix for qemu-devel@nongnu.org; Mon, 06 Nov 2023 02:02:44 -0500 Received: from mail-pf1-x435.google.com ([2607:f8b0:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qztcs-00021C-Vw for qemu-devel@nongnu.org; Mon, 06 Nov 2023 02:02:35 -0500 Received: by mail-pf1-x435.google.com with SMTP id d2e1a72fcca58-6b20577ef7bso3859604b3a.3 for ; Sun, 05 Nov 2023 23:02:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699254141; x=1699858941; darn=nongnu.org; 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=Fy1/pxSKYPLnC7iC7jUDLvYtACSeBLVWlhtQd/mhggA=; b=cn/0zravhpXGx7le9LSiqOR7OttSzv7401rty11a6P6K4ua7M/8VwV+ydWguxyXHIV 7wK7K5VaE0raMBtVUtVmmtZMwif48e0rIsIEl2OdGYyWst6und8aQ4AIkTNmBkLgAwvo IaImNlq8c1tKNHawFXeyMbLRJfe9M9SvBEqQVTbttHVgfgELdCWgkmKJo/+IRV0AqJAu o76AIFmkA3VlKtns+/ShffS/7hWBTeJ4ZtdqWFVnuP7aW8W0aFJ8zqRqkPi90iYhlEMS IHPgJD6HV/O2aDHfW8cJzFSbsJrigQBZ8JzC4EP0IiEa5rGIjF2Q7cAXsrlBse0gFMvg D2Aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699254141; x=1699858941; 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=Fy1/pxSKYPLnC7iC7jUDLvYtACSeBLVWlhtQd/mhggA=; b=POeqfsm0XP8RxBxBYlwBQYrZNFnyt+ohvBTfHn24VZQJjWy5n42BkpmvVVHZwe845q 7N0IhvxpTLhawjdBRX3Sgm9tYCHRNHvv3DZ1DjeXpppoAUujmuPoheUEnJMVjFGOp+g6 9mihMoXQCEmKlM2nBFNwsQ3ixTSuEAcZb/Lj1S52lDIHnuGrvsmV2MReC0Rfz2z0KgAC X9wiIgkTSUahXhyooQIXCcAWMJGE8uWbUAbNz/GVxp4EBvmr+lhLUGx5Rg0b+4iKNvJb 9a/nGhpHhxz9cAdDlSLytmMAw3Oqh2LpLtMKm0SeVayvuxa8pbZPpprQvC9c3sOrmnQG 7JmQ== X-Gm-Message-State: AOJu0Yz8lZZdCzTKKkwFumUzxi6CAqypgXy8s6CkWm+RxYOwwrBba6YO 4FwWR+kEgGmq8qssItaiVNgkxKBYfPSe6ngEHjU= X-Received: by 2002:a05:6a20:1454:b0:16b:80f2:f30c with SMTP id a20-20020a056a20145400b0016b80f2f30cmr26554092pzi.26.1699254141508; Sun, 05 Nov 2023 23:02:21 -0800 (PST) Received: from stoup.. ([71.212.149.95]) by smtp.gmail.com with ESMTPSA id 8-20020a17090a194800b0027d88387287sm5319650pjh.51.2023.11.05.23.02.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Nov 2023 23:02:21 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: quintela@redhat.com, peterx@redhat.com, farosas@suse.de, leobras@redhat.com Subject: [PATCH 61/71] hw/watchdog: Constify VMState Date: Sun, 5 Nov 2023 22:58:17 -0800 Message-Id: <20231106065827.543129-62-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231106065827.543129-1-richard.henderson@linaro.org> References: <20231106065827.543129-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::435; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x435.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 --- 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 d267aa185c..3888438dff 100644 --- a/hw/watchdog/wdt_aspeed.c +++ b/hw/watchdog/wdt_aspeed.c @@ -219,7 +219,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),