From patchwork Thu Dec 21 03:15:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 756941 Delivered-To: patch@linaro.org Received: by 2002:a5d:67c6:0:b0:336:6142:bf13 with SMTP id n6csp687307wrw; Wed, 20 Dec 2023 19:24:01 -0800 (PST) X-Google-Smtp-Source: AGHT+IGgwwaS6Qis7/1amxlv6ncdaC8b3RmlQS9C+adAPHg6nqnaJ8ROcAvBa867B9SN43KWSFHe X-Received: by 2002:ac8:57ce:0:b0:425:4043:96c9 with SMTP id w14-20020ac857ce000000b00425404396c9mr29483486qta.86.1703129041545; Wed, 20 Dec 2023 19:24:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703129041; cv=none; d=google.com; s=arc-20160816; b=xRWMWDJ4AIqtIP73FySVwTn9PUMvpV2R6Vy3LRrnaozc8lXCqD48oz7fpKXJu16wDV bBT7Bhj6vxxOmXhbrhhEEAFCG1fucc96+z6D9OZr0AmQ3Ag+0N0MGoIezNWo9FDCUMz7 RSxpNX8NaAeCOZ3l8LXxo1EHK8W51C+WgwWRBTVzoys+PHudPqFr3i1xT6YYq8YALTBD ltsuNCkYoSsBv3RhREfMhkgIrqXiN4ej1ldY+7Y4niEjtkA5sg5IAhEWUNdwdIxMVFn0 XV21MehAjrgA+ca9FcI/6HPqXCvAFaf79szeb7P1glOhBZoqQt0yDaj0ZSRLmH37T8WV pprg== 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=+AFzh7chlq8L+JCC/XZfJPBd+42r5XtptQoNPZ9V4uc=; fh=kQadAhxV42GJ3cd2VUw1RyURv/zJQGvmUdF7iLEVTtc=; b=eZ9oa2R+5mRz+0I4fkfGpyq30aSIaaHlp4IGDJ5Mu4XuCyMuGgTgA0t9xPtzvqLU4j fKe4pUL0Gf2s6nQe9+6oRIAawcd55rlrPLwK3BbsHEUbDomEmbrC41PanwhQCylAvMK6 noF5gQo+HlSEg2eKRP3AsT7BRT/CiihOxdprcZndmtdVy8PQc9IEHE1b0CVCicFYlBp2 D2x+xchs/BZG04AMemTuZ6ntf+sf2MxRz0OU7o+B/WwJ3vo3Vo6JRI01SmBUAmD5qeGB GrIiEvEc4xji/8yGgyT92PY4uwAi/aVfQ5D6Qy8Ykya9cZx54WvpnV0t09UEaLsBQ1sN 18VQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hvhwipuv; 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 16-20020ac85750000000b00423a4f00384si1211951qtx.595.2023.12.20.19.24.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 20 Dec 2023 19:24:01 -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=hvhwipuv; 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 1rG9ZR-0007Wy-IZ; Wed, 20 Dec 2023 22:18:01 -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 1rG9ZQ-0007Uv-Ip for qemu-devel@nongnu.org; Wed, 20 Dec 2023 22:18:00 -0500 Received: from mail-qk1-x72c.google.com ([2607:f8b0:4864:20::72c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rG9ZP-0003nq-0A for qemu-devel@nongnu.org; Wed, 20 Dec 2023 22:18:00 -0500 Received: by mail-qk1-x72c.google.com with SMTP id af79cd13be357-7811dba1d5dso18163185a.3 for ; Wed, 20 Dec 2023 19:17:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1703128678; x=1703733478; 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=+AFzh7chlq8L+JCC/XZfJPBd+42r5XtptQoNPZ9V4uc=; b=hvhwipuv8pngnGVAev8AF/SjeC0h9+RO7wRA1mZwoT/NDV2VedFoMhsT9r7gDSitHR MzFcY1kOLlEuhERJFiBlbBanOWOyt/G0TJFzECxyuq5ZrnSf083scCJmtfHjhcSnOkgv JJfa++AVRyNa4LAFut0F0s+JwjYfK6ahfWehlZ8nbVCbPlx6R8vTUpuxg3IFwO8hLJ1n iRTqw8P7z4C4ZLP3qL2lB8KmFPmxF9gzwyEwQ9+D4jGFjt8ilKWv6XwhmsGRX1ElUYWp 0d8Z+2jS0gm+7E2gJdQvuF5YOzGqlYOqcMDLtcD3lTG7s1yeRRsx/w6vxU6mdYnIroLT KYCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703128678; x=1703733478; 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=+AFzh7chlq8L+JCC/XZfJPBd+42r5XtptQoNPZ9V4uc=; b=dFW+tIdnIC/6am+NViF6aORlmuuoLOfFXBMcT1pcQHhxhxYxQgb6kK9ECMIfLPLinR OwAda/bG7AFOPZ3DwJcGsyU3hWTkQNo0dFXMqqSzocAdSHf67CGsMVSAvXA0MMtgJYRQ u01j288yIkFdQVtjEhZHi0Rk1d6KwmU4EFeF+qAhAMQeOre3H76eLcXyJk4xLPPk8tPY rUnmARhuzmxrxMfHzYzr1ccH5znMqbSIlM0Utmql0wf8NVdv0AxGm+/8FBzB7JCXNipK fKgflch37yRq+nZRjQD/Gz3K7GSOBOo/lP26ygJ1zAKvMrpRH1Lb8lAv1DL9n46hARE4 d9vw== X-Gm-Message-State: AOJu0YzSyEXeQHg7Hbr1pcVNPtSyyaT29ZcRIJJS7Jrx4m6jLQqX6iEE XBkBEUKjEXoTW+MHRbUWTfbhUoCZDfF5IOSWXS0AlKUS X-Received: by 2002:a05:620a:2989:b0:77e:fba4:3a41 with SMTP id r9-20020a05620a298900b0077efba43a41mr28793365qkp.151.1703128677849; Wed, 20 Dec 2023 19:17:57 -0800 (PST) Received: from stoup.. ([172.58.139.164]) by smtp.gmail.com with ESMTPSA id n8-20020a05620a294800b0078116d55191sm360808qkp.130.2023.12.20.19.17.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Dec 2023 19:17:57 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 12/71] target/mips: Constify VMState in machine.c Date: Thu, 21 Dec 2023 14:15:53 +1100 Message-Id: <20231221031652.119827-13-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::72c; envelope-from=richard.henderson@linaro.org; helo=mail-qk1-x72c.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 Tested-by: Philippe Mathieu-Daudé Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- target/mips/sysemu/machine.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/target/mips/sysemu/machine.c b/target/mips/sysemu/machine.c index 80d37f9c2f..218f4c3a67 100644 --- a/target/mips/sysemu/machine.c +++ b/target/mips/sysemu/machine.c @@ -44,7 +44,7 @@ static int put_fpr(QEMUFile *f, void *pv, size_t size, return 0; } -const VMStateInfo vmstate_info_fpr = { +static const VMStateInfo vmstate_info_fpr = { .name = "fpr", .get = get_fpr, .put = put_fpr, @@ -56,21 +56,21 @@ const VMStateInfo vmstate_info_fpr = { #define VMSTATE_FPR_ARRAY(_f, _s, _n) \ VMSTATE_FPR_ARRAY_V(_f, _s, _n, 0) -static VMStateField vmstate_fpu_fields[] = { +static const VMStateField vmstate_fpu_fields[] = { VMSTATE_FPR_ARRAY(fpr, CPUMIPSFPUContext, 32), VMSTATE_UINT32(fcr0, CPUMIPSFPUContext), VMSTATE_UINT32(fcr31, CPUMIPSFPUContext), VMSTATE_END_OF_LIST() }; -const VMStateDescription vmstate_fpu = { +static const VMStateDescription vmstate_fpu = { .name = "cpu/fpu", .version_id = 1, .minimum_version_id = 1, .fields = vmstate_fpu_fields }; -const VMStateDescription vmstate_inactive_fpu = { +static const VMStateDescription vmstate_inactive_fpu = { .name = "cpu/inactive_fpu", .version_id = 1, .minimum_version_id = 1, @@ -79,7 +79,7 @@ const VMStateDescription vmstate_inactive_fpu = { /* TC state */ -static VMStateField vmstate_tc_fields[] = { +static const VMStateField vmstate_tc_fields[] = { VMSTATE_UINTTL_ARRAY(gpr, TCState, 32), #if defined(TARGET_MIPS64) VMSTATE_UINT64_ARRAY(gpr_hi, TCState, 32), @@ -103,14 +103,14 @@ static VMStateField vmstate_tc_fields[] = { VMSTATE_END_OF_LIST() }; -const VMStateDescription vmstate_tc = { +static const VMStateDescription vmstate_tc = { .name = "cpu/tc", .version_id = 2, .minimum_version_id = 2, .fields = vmstate_tc_fields }; -const VMStateDescription vmstate_inactive_tc = { +static const VMStateDescription vmstate_inactive_tc = { .name = "cpu/inactive_tc", .version_id = 2, .minimum_version_id = 2, @@ -119,11 +119,11 @@ const VMStateDescription vmstate_inactive_tc = { /* MVP state */ -const VMStateDescription vmstate_mvp = { +static const VMStateDescription vmstate_mvp = { .name = "cpu/mvp", .version_id = 1, .minimum_version_id = 1, - .fields = (VMStateField[]) { + .fields = (const VMStateField[]) { VMSTATE_INT32(CP0_MVPControl, CPUMIPSMVPContext), VMSTATE_INT32(CP0_MVPConf0, CPUMIPSMVPContext), VMSTATE_INT32(CP0_MVPConf1, CPUMIPSMVPContext), @@ -190,7 +190,7 @@ static int put_tlb(QEMUFile *f, void *pv, size_t size, return 0; } -const VMStateInfo vmstate_info_tlb = { +static const VMStateInfo vmstate_info_tlb = { .name = "tlb_entry", .get = get_tlb, .put = put_tlb, @@ -202,11 +202,11 @@ const VMStateInfo vmstate_info_tlb = { #define VMSTATE_TLB_ARRAY(_f, _s, _n) \ VMSTATE_TLB_ARRAY_V(_f, _s, _n, 0) -const VMStateDescription vmstate_tlb = { +static const VMStateDescription vmstate_tlb = { .name = "cpu/tlb", .version_id = 2, .minimum_version_id = 2, - .fields = (VMStateField[]) { + .fields = (const VMStateField[]) { VMSTATE_UINT32(nb_tlb, CPUMIPSTLBContext), VMSTATE_UINT32(tlb_in_use, CPUMIPSTLBContext), VMSTATE_TLB_ARRAY(mmu.r4k.tlb, CPUMIPSTLBContext, MIPS_TLB_MAX), @@ -221,7 +221,7 @@ const VMStateDescription vmstate_mips_cpu = { .version_id = 21, .minimum_version_id = 21, .post_load = cpu_post_load, - .fields = (VMStateField[]) { + .fields = (const VMStateField[]) { /* Active TC */ VMSTATE_STRUCT(env.active_tc, MIPSCPU, 1, vmstate_tc, TCState),