From nobody Fri Apr 26 19:21:14 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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=fail(p=none dis=none) header.from=huawei.com ARC-Seal: i=1; a=rsa-sha256; t=1617890922; cv=none; d=zohomail.com; s=zohoarc; b=H2ULzpNuyfsOLLnQP7S0CpSQWYyZpI5Brho/hj2KTvrOdk4FyfCXQ0q4UXUVpHy7zshtEN0pdnIqF2LlvzZbjkkVTjCG1BP6g0nj3zADkvJtdmB4Puz4nfdWL7/kq+z5JEyoDcIpPpTyvEQsr9kYJOdBFakTmIwcvzDtgW0zJtY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617890922; h=Content-Type:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=zMW8j3HqEoFQk9Sn5hRF9LrKTzGeQ1JHu4WXB4rGWa8=; b=H2paTFw8v+VS0W/XmTwGFh2i1Vh+wrhqTKqoKPFiUhP6ovTKL+p/NxjcV9yrd5n745jvw5ZSAlUMd3vQ7NVgpqwH8smvnkVL6krk1humycFbPROa14UlXvwOVZgrCk5Bz2JZNbaPGmlfwsQY9nbXyF/irgJOgwzAZqpfSh0phRU= ARC-Authentication-Results: i=1; mx.zohomail.com; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1617890922007653.8710061694069; Thu, 8 Apr 2021 07:08:42 -0700 (PDT) Received: from localhost ([::1]:36780 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lUVKo-0004Vg-7s for importer@patchew.org; Thu, 08 Apr 2021 10:08:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39856) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUVJk-0003c7-0U; Thu, 08 Apr 2021 10:07:32 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:4973) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUVJg-0001FD-UN; Thu, 08 Apr 2021 10:07:31 -0400 Received: from DGGEMS401-HUB.china.huawei.com (unknown [172.30.72.60]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4FGNLp00BNzyNj8; Thu, 8 Apr 2021 22:05:05 +0800 (CST) Received: from DESKTOP-5IS4806.china.huawei.com (10.174.184.42) by DGGEMS401-HUB.china.huawei.com (10.3.19.201) with Microsoft SMTP Server id 14.3.498.0; Thu, 8 Apr 2021 22:07:07 +0800 From: Keqian Zhu To: , , Subject: [PATCH] vmstate: Constify some VMStateDescriptions Date: Thu, 8 Apr 2021 22:07:06 +0800 Message-ID: <20210408140706.23412-1-zhukeqian1@huawei.com> X-Mailer: git-send-email 2.8.4.windows.1 MIME-Version: 1.0 X-Originating-IP: [10.174.184.42] X-CFilter-Loop: Reflected 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=45.249.212.191; envelope-from=zhukeqian1@huawei.com; helo=szxga05-in.huawei.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , wanghaibin.wang@huawei.com, Peter Maydell Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Constify vmstate_ecc_state and vmstate_x86_cpu. Signed-off-by: Keqian Zhu Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/block/ecc.c | 2 +- include/hw/block/flash.h | 2 +- target/i386/cpu.h | 2 +- target/i386/machine.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/block/ecc.c b/hw/block/ecc.c index 1a182367ee..6e0d63842c 100644 --- a/hw/block/ecc.c +++ b/hw/block/ecc.c @@ -78,7 +78,7 @@ void ecc_reset(ECCState *s) } =20 /* Save/restore */ -VMStateDescription vmstate_ecc_state =3D { +const VMStateDescription vmstate_ecc_state =3D { .name =3D "ecc-state", .version_id =3D 0, .minimum_version_id =3D 0, diff --git a/include/hw/block/flash.h b/include/hw/block/flash.h index 7dde0adcee..86d8363bb0 100644 --- a/include/hw/block/flash.h +++ b/include/hw/block/flash.h @@ -74,6 +74,6 @@ typedef struct { =20 uint8_t ecc_digest(ECCState *s, uint8_t sample); void ecc_reset(ECCState *s); -extern VMStateDescription vmstate_ecc_state; +extern const VMStateDescription vmstate_ecc_state; =20 #endif diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 570f916878..1bc300ce85 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1786,7 +1786,7 @@ struct X86CPU { =20 =20 #ifndef CONFIG_USER_ONLY -extern VMStateDescription vmstate_x86_cpu; +extern const VMStateDescription vmstate_x86_cpu; #endif =20 int x86_cpu_pending_interrupt(CPUState *cs, int interrupt_request); diff --git a/target/i386/machine.c b/target/i386/machine.c index 137604ddb8..f6f094f1c9 100644 --- a/target/i386/machine.c +++ b/target/i386/machine.c @@ -1396,7 +1396,7 @@ static const VMStateDescription vmstate_msr_tsx_ctrl = =3D { } }; =20 -VMStateDescription vmstate_x86_cpu =3D { +const VMStateDescription vmstate_x86_cpu =3D { .name =3D "cpu", .version_id =3D 12, .minimum_version_id =3D 11, --=20 2.19.1