From nobody Tue Nov 26 22:22:51 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1703885225; cv=none; d=zohomail.com; s=zohoarc; b=BuHa2Kua6hV5vwp3Cx2vQORxAe5Ujg2uXL25PrCtKLCus5r/ZyUmzNyhHawZZfbospnBw9vOABI9zmZxoMlocHnCvpErtAo5A+4UcA2FEb4c72dv2pO4rHILjDjExOUV76C6eBezxnCyRbW4ps+mNePkhSEtqZ3tDHzjhNXDeYc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1703885225; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=CWWqpcyXTMz7Xz2FP1em44VzN8AMs3WMuNzELPAxUXs=; b=RWe9Zw9rLhcjjRqozhJNLsCA80ZhNqb0GDoktuPSGZ6xD8lWHICtCtDdWEudWveWTB5iSlGPbupkZ1aRr5Hbl+7fCw66ShxFiL6gLSgDk/Vt3lOqZv/qN1B/GWn/DacubQ7+VVS2kQQ7H0GphEIhfTf1OQK8B9ZwTneEryZkq98= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1703885225456333.83322810995753; Fri, 29 Dec 2023 13:27:05 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rJKLN-00076L-QZ; Fri, 29 Dec 2023 16:24:37 -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 1rJKLL-00075R-Mm for qemu-devel@nongnu.org; Fri, 29 Dec 2023 16:24:35 -0500 Received: from mail-pg1-x52f.google.com ([2607:f8b0:4864:20::52f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rJKLJ-0006iY-1R for qemu-devel@nongnu.org; Fri, 29 Dec 2023 16:24:35 -0500 Received: by mail-pg1-x52f.google.com with SMTP id 41be03b00d2f7-5cdfed46372so4075063a12.3 for ; Fri, 29 Dec 2023 13:24:32 -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 a34-20020a631a22000000b005c65e82a0cbsm15016237pga.17.2023.12.29.13.24.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 13:24:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1703885072; x=1704489872; 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=CWWqpcyXTMz7Xz2FP1em44VzN8AMs3WMuNzELPAxUXs=; b=nuRG0sELlKyURlE6DWlxfWPCVx8KKKiYVtnSrMUmCKixunW197g2CP+c+PYjKx7zU+ tVVvtizm85Klny6nGxwxq1VYv221etCvncxc77mEqjBZZZhNBYur0oOY/kwtzKxYVYPV Rgzi0mshwyzaCZ0gOSh3vsACZR6HZych+w6KRD0vg2zopbqEuTvtiEXiB3ngvQ04UZlJ jMO6zvMkih0L2nL/OrEE1YLemHNEYkWL0dA0JdRJ+3KYqp1ZdXjVVIGlz2ZjS2laqqX4 SqJkegta1o+YJtzqFdZwLkpXuNaU+pV3qpID9GR70rLp5QyZngqiQlr+O87WPfAotvPE ht/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703885072; x=1704489872; 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=CWWqpcyXTMz7Xz2FP1em44VzN8AMs3WMuNzELPAxUXs=; b=Dfypk8F7DZcwGA44/iRfvSHibz41U3DZRMhX/svOki1RLInZO+anAJhzwQrQTfGNZ8 JS9a8fbxip59lLIMH5GHQIRMlerpihj5aQFkh6gD88jZq5UwW+tHiUw1z/9NiwReEqAe TjtTkQ0I817axWBZt4rzTDyHZqOVvxWcuINEGTar33WQ4La+m7ahiKP+vJFidTpJG55U SSIRPODRk6G3nF2W+ZV5eGfbWvNloto8v8iht++lBWZq3WGyocVS9xzaAo+8CA34JokB 6fzKqVCo5/lzfCJjwQC85wJ54ccG7v1CTiN8g129HLmEK68c1hmozxEELoDV+sEe4Gg0 g8Wg== X-Gm-Message-State: AOJu0YxI6iGE2DL4Kje9tNbtii0RI9NWSXq3FCNoRd9Lo7NcdcYL1h2Z ptdaLkIMmVJ+/vB+nse3a03Gvor0/Vfm6bw76hnQXbQL3FT/eg== X-Google-Smtp-Source: AGHT+IHQno1zufSBtbssHdZ6d92z1j6M1E01PE1o/dqyvjZKRmfkT7jQQQuDh2I4jcY/FEdu55vWsQ== X-Received: by 2002:a05:6a20:6311:b0:18c:2d7:c4b0 with SMTP id h17-20020a056a20631100b0018c02d7c4b0mr11389742pzf.4.1703885071718; Fri, 29 Dec 2023 13:24:31 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 16/71] target/s390x: Constify VMState in machine.c Date: Sat, 30 Dec 2023 08:22:51 +1100 Message-Id: <20231229212346.147149-17-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 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::52f; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52f.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1703885226022100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Richard Henderson Message-Id: <20231221031652.119827-17-richard.henderson@linaro.org> --- target/s390x/machine.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/target/s390x/machine.c b/target/s390x/machine.c index 37a076858c..a125ebcc2f 100644 --- a/target/s390x/machine.c +++ b/target/s390x/machine.c @@ -66,7 +66,7 @@ static const VMStateDescription vmstate_fpu =3D { .version_id =3D 1, .minimum_version_id =3D 1, .needed =3D fpu_needed, - .fields =3D (VMStateField[]) { + .fields =3D (const VMStateField[]) { VMSTATE_UINT64(env.vregs[0][0], S390CPU), VMSTATE_UINT64(env.vregs[1][0], S390CPU), VMSTATE_UINT64(env.vregs[2][0], S390CPU), @@ -98,7 +98,7 @@ static const VMStateDescription vmstate_vregs =3D { .version_id =3D 1, .minimum_version_id =3D 1, .needed =3D vregs_needed, - .fields =3D (VMStateField[]) { + .fields =3D (const VMStateField[]) { /* vregs[0][0] -> vregs[15][0] and fregs are overlays */ VMSTATE_UINT64(env.vregs[16][0], S390CPU), VMSTATE_UINT64(env.vregs[17][0], S390CPU), @@ -157,12 +157,12 @@ static bool riccb_needed(void *opaque) return s390_has_feat(S390_FEAT_RUNTIME_INSTRUMENTATION); } =20 -const VMStateDescription vmstate_riccb =3D { +static const VMStateDescription vmstate_riccb =3D { .name =3D "cpu/riccb", .version_id =3D 1, .minimum_version_id =3D 1, .needed =3D riccb_needed, - .fields =3D (VMStateField[]) { + .fields =3D (const VMStateField[]) { VMSTATE_UINT8_ARRAY(env.riccb, S390CPU, 64), VMSTATE_END_OF_LIST() } @@ -174,12 +174,12 @@ static bool exval_needed(void *opaque) return cpu->env.ex_value !=3D 0; } =20 -const VMStateDescription vmstate_exval =3D { +static const VMStateDescription vmstate_exval =3D { .name =3D "cpu/exval", .version_id =3D 1, .minimum_version_id =3D 1, .needed =3D exval_needed, - .fields =3D (VMStateField[]) { + .fields =3D (const VMStateField[]) { VMSTATE_UINT64(env.ex_value, S390CPU), VMSTATE_END_OF_LIST() } @@ -190,12 +190,12 @@ static bool gscb_needed(void *opaque) return s390_has_feat(S390_FEAT_GUARDED_STORAGE); } =20 -const VMStateDescription vmstate_gscb =3D { +static const VMStateDescription vmstate_gscb =3D { .name =3D "cpu/gscb", .version_id =3D 1, .minimum_version_id =3D 1, .needed =3D gscb_needed, - .fields =3D (VMStateField[]) { + .fields =3D (const VMStateField[]) { VMSTATE_UINT64_ARRAY(env.gscb, S390CPU, 4), VMSTATE_END_OF_LIST() } @@ -206,12 +206,12 @@ static bool bpbc_needed(void *opaque) return s390_has_feat(S390_FEAT_BPB); } =20 -const VMStateDescription vmstate_bpbc =3D { +static const VMStateDescription vmstate_bpbc =3D { .name =3D "cpu/bpbc", .version_id =3D 1, .minimum_version_id =3D 1, .needed =3D bpbc_needed, - .fields =3D (VMStateField[]) { + .fields =3D (const VMStateField[]) { VMSTATE_BOOL(env.bpbc, S390CPU), VMSTATE_END_OF_LIST() } @@ -222,12 +222,12 @@ static bool etoken_needed(void *opaque) return s390_has_feat(S390_FEAT_ETOKEN); } =20 -const VMStateDescription vmstate_etoken =3D { +static const VMStateDescription vmstate_etoken =3D { .name =3D "cpu/etoken", .version_id =3D 1, .minimum_version_id =3D 1, .needed =3D etoken_needed, - .fields =3D (VMStateField[]) { + .fields =3D (const VMStateField[]) { VMSTATE_UINT64(env.etoken, S390CPU), VMSTATE_UINT64(env.etoken_extension, S390CPU), VMSTATE_END_OF_LIST() @@ -239,12 +239,12 @@ static bool diag318_needed(void *opaque) return s390_has_feat(S390_FEAT_DIAG_318); } =20 -const VMStateDescription vmstate_diag318 =3D { +static const VMStateDescription vmstate_diag318 =3D { .name =3D "cpu/diag318", .version_id =3D 1, .minimum_version_id =3D 1, .needed =3D diag318_needed, - .fields =3D (VMStateField[]) { + .fields =3D (const VMStateField[]) { VMSTATE_UINT64(env.diag318_info, S390CPU), VMSTATE_END_OF_LIST() } @@ -256,7 +256,7 @@ const VMStateDescription vmstate_s390_cpu =3D { .pre_save =3D cpu_pre_save, .version_id =3D 4, .minimum_version_id =3D 3, - .fields =3D (VMStateField[]) { + .fields =3D (const VMStateField[]) { VMSTATE_UINT64_ARRAY(env.regs, S390CPU, 16), VMSTATE_UINT64(env.psw.mask, S390CPU), VMSTATE_UINT64(env.psw.addr, S390CPU), @@ -278,7 +278,7 @@ const VMStateDescription vmstate_s390_cpu =3D { irqstate_saved_size), VMSTATE_END_OF_LIST() }, - .subsections =3D (const VMStateDescription*[]) { + .subsections =3D (const VMStateDescription * const []) { &vmstate_fpu, &vmstate_vregs, &vmstate_riccb, --=20 2.34.1