From patchwork Thu Dec 21 03:15:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 756927 Delivered-To: patch@linaro.org Received: by 2002:a5d:67c6:0:b0:336:6142:bf13 with SMTP id n6csp686830wrw; Wed, 20 Dec 2023 19:22:07 -0800 (PST) X-Google-Smtp-Source: AGHT+IHpbmv1mcuPRmDeWq2XTqMI3/KloRLhzXVMRp2ahJJZOtNZARgHPeBIy0NGxf1WWoT7DBbG X-Received: by 2002:a05:622a:1a9d:b0:427:8436:5b53 with SMTP id s29-20020a05622a1a9d00b0042784365b53mr2916165qtc.27.1703128926950; Wed, 20 Dec 2023 19:22:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703128926; cv=none; d=google.com; s=arc-20160816; b=DTzo9qOSXUGP2Ge5N/Avnv/d4n38xepAt7Hqb70IRxfoY4H/nOMeH4QxZ2uuFKjt+X Uv1moZQQ2ZdaRr87ncqKwostRM4FJ8pA7TwCU7REzATNa0VfxtPdfUEU4Ai7aTmmEhwB gUg3WO7PRGcBUt4cIV5Rc+963YV4zzaS6cNBQSN9X2a2/mmfW8oVb0MPkrs3+oFVrb1n pqxBdFSya/52T8vMvExcbI4Wggpxoe6CilM83D56QGadsyVV0Z7WxnAaIE/OIBeJbhWu EZ7wv61m+RbzdLTHOuLVgaJ5louabdx8I/ATbIXNyR9IQRS2n6wPt4/XLQ/dCb1SY9O3 WpuA== 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=vhaDOlXqK723HSaocfjU1ZCevxhmhF4yuGDJMeM3d5I=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=lC4VJ2aaOoii8UaR1ykkpowd/rgwRyN5ySPPPI9tP+7kRFPcExeWoIGsurauNSSglR +BaXesXeqHG3tEmQLER9ncPSAJ6jtF/dPyY+VMOsIOpbg1IcVm50GsJ8U2YL0y1eDJYl T+D9JFfT+ouLr9wBHVdF6yLt1lzlYr+w+UjVktRd2gSlVpx2VDCP7sKxC1eo0whnUnQ6 cDPCfBMIE/3UuK4/+xtEPRyVG3bY76HNtqI4C9ZxMHNfjQSXuZUnV96Da/E5HO3XMXXl P6fuvo8AfpLNXzGGPbIgaJnp+AQpe1nmOtBBTnBC5zmb1vOQRK3Bal7lul+TTpYsLydP Apjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jL5AfgEm; 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 y13-20020a05622a164d00b004257cb76e26si1186339qtj.664.2023.12.20.19.22.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 20 Dec 2023 19:22:06 -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=jL5AfgEm; 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 1rG9Zg-0007ao-OM; Wed, 20 Dec 2023 22:18:16 -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 1rG9Zf-0007aV-HD for qemu-devel@nongnu.org; Wed, 20 Dec 2023 22:18:15 -0500 Received: from mail-qk1-x72f.google.com ([2607:f8b0:4864:20::72f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rG9Zd-0003pH-Tc for qemu-devel@nongnu.org; Wed, 20 Dec 2023 22:18:15 -0500 Received: by mail-qk1-x72f.google.com with SMTP id af79cd13be357-7811b05d23bso20297285a.0 for ; Wed, 20 Dec 2023 19:18:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1703128692; x=1703733492; 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=vhaDOlXqK723HSaocfjU1ZCevxhmhF4yuGDJMeM3d5I=; b=jL5AfgEm4k7OiY/+dVcslWF1V5eGUuFBSJIxs+f8UCAsYTpxT4sHITiRxqP54ngi69 cRiQBIfeN6BB8ar3qMZ7Q/fii8dhSdRumKgiWAlfbeKBs+9pf5XT3kgKJXQfQvdESTGD uLR5NNEoDCZWx58niRf6O6JQ76+0bj7fvTkqSO1FnurHwiaiIBg6A2u5+8CRXp6o1AG0 KMkTBV+6psiNJfnutI+E4dPIFYPhJjmccHIpg9Wg/ju5gbEBIoKT3y8wzuaxa6vrKk8B DHZjH/dlmpQcs2rhRIH5PHLHjWcvI2zF2z8UGhxHK/OaXciOUbJkjD474qIytz/sRwOm Hf4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703128692; x=1703733492; 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=vhaDOlXqK723HSaocfjU1ZCevxhmhF4yuGDJMeM3d5I=; b=LSEWUSPqRbyX+C1ca4ffnP6u8NFAWttVj8eH+VnWxharBkHGZBEr9Frjo2XzPjsFc3 MJGkvBUJIirNOH5JcINqzqUT9HISDcdPjWiQDY7RRjvKNbo45rtaTeeIsKqLfsm+5v+G Lsd3ZbUTEhkNWRbx2ft6xnizbdSIXFn+NebhlsoR3Qh7lpUvndLhIiRdcQpcPf4koU8b OGeFW457xK92ssDLizJ0REOeHsQkwubkon9ViqtFbSF+elV1mS1VBd6YlZE+2qvxm12o 8nwkpUvMHg4IMG2ssxQuVv7x2MfgFxIaaLUgITqU8OGs0m7C1N0EZlUolCUNE+5IVgR/ 7xgw== X-Gm-Message-State: AOJu0YzG9SYAETz63v2xXtFb54pjSXOPGH9Ju+g+//UGoKeD80BZcxxA bMee3Nk7sFi2vFeXEDnDzqTTMJ3AnbIYMFEJ7xsEbs7M X-Received: by 2002:a05:620a:31a7:b0:77f:5694:a03 with SMTP id bi39-20020a05620a31a700b0077f56940a03mr26876561qkb.111.1703128692095; Wed, 20 Dec 2023 19:18:12 -0800 (PST) Received: from stoup.. ([172.58.139.164]) by smtp.gmail.com with ESMTPSA id n8-20020a05620a294800b0078116d55191sm360808qkp.130.2023.12.20.19.18.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Dec 2023 19:18:11 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 16/71] target/s390x: Constify VMState in machine.c Date: Thu, 21 Dec 2023 14:15:57 +1100 Message-Id: <20231221031652.119827-17-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231221031652.119827-1-richard.henderson@linaro.org> References: <20231221031652.119827-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::72f; envelope-from=richard.henderson@linaro.org; helo=mail-qk1-x72f.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 --- 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 = { .version_id = 1, .minimum_version_id = 1, .needed = fpu_needed, - .fields = (VMStateField[]) { + .fields = (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 = { .version_id = 1, .minimum_version_id = 1, .needed = vregs_needed, - .fields = (VMStateField[]) { + .fields = (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); } -const VMStateDescription vmstate_riccb = { +static const VMStateDescription vmstate_riccb = { .name = "cpu/riccb", .version_id = 1, .minimum_version_id = 1, .needed = riccb_needed, - .fields = (VMStateField[]) { + .fields = (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 != 0; } -const VMStateDescription vmstate_exval = { +static const VMStateDescription vmstate_exval = { .name = "cpu/exval", .version_id = 1, .minimum_version_id = 1, .needed = exval_needed, - .fields = (VMStateField[]) { + .fields = (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); } -const VMStateDescription vmstate_gscb = { +static const VMStateDescription vmstate_gscb = { .name = "cpu/gscb", .version_id = 1, .minimum_version_id = 1, .needed = gscb_needed, - .fields = (VMStateField[]) { + .fields = (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); } -const VMStateDescription vmstate_bpbc = { +static const VMStateDescription vmstate_bpbc = { .name = "cpu/bpbc", .version_id = 1, .minimum_version_id = 1, .needed = bpbc_needed, - .fields = (VMStateField[]) { + .fields = (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); } -const VMStateDescription vmstate_etoken = { +static const VMStateDescription vmstate_etoken = { .name = "cpu/etoken", .version_id = 1, .minimum_version_id = 1, .needed = etoken_needed, - .fields = (VMStateField[]) { + .fields = (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); } -const VMStateDescription vmstate_diag318 = { +static const VMStateDescription vmstate_diag318 = { .name = "cpu/diag318", .version_id = 1, .minimum_version_id = 1, .needed = diag318_needed, - .fields = (VMStateField[]) { + .fields = (const VMStateField[]) { VMSTATE_UINT64(env.diag318_info, S390CPU), VMSTATE_END_OF_LIST() } @@ -256,7 +256,7 @@ const VMStateDescription vmstate_s390_cpu = { .pre_save = cpu_pre_save, .version_id = 4, .minimum_version_id = 3, - .fields = (VMStateField[]) { + .fields = (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 = { irqstate_saved_size), VMSTATE_END_OF_LIST() }, - .subsections = (const VMStateDescription*[]) { + .subsections = (const VMStateDescription * const []) { &vmstate_fpu, &vmstate_vregs, &vmstate_riccb,