From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: quintela@redhat.com, peterx@redhat.com, farosas@suse.de,
leobras@redhat.com
Subject: [PATCH 14/71] target/ppc: Constify VMState in machine.c
Date: Sun, 5 Nov 2023 22:57:30 -0800 [thread overview]
Message-ID: <20231106065827.543129-15-richard.henderson@linaro.org> (raw)
In-Reply-To: <20231106065827.543129-1-richard.henderson@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/ppc/machine.c | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/target/ppc/machine.c b/target/ppc/machine.c
index 68cbdffecd..203fe28e01 100644
--- a/target/ppc/machine.c
+++ b/target/ppc/machine.c
@@ -351,7 +351,7 @@ static const VMStateDescription vmstate_fpu = {
.version_id = 1,
.minimum_version_id = 1,
.needed = fpu_needed,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_FPR_ARRAY(env.vsr, PowerPCCPU, 32),
VMSTATE_UINTTL(env.fpscr, PowerPCCPU),
VMSTATE_END_OF_LIST()
@@ -392,7 +392,7 @@ static const VMStateDescription vmstate_altivec = {
.version_id = 1,
.minimum_version_id = 1,
.needed = altivec_needed,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_AVR_ARRAY(env.vsr, PowerPCCPU, 32),
/*
* Save the architecture value of the vscr, not the internally
@@ -425,7 +425,7 @@ static const VMStateDescription vmstate_vsx = {
.version_id = 1,
.minimum_version_id = 1,
.needed = vsx_needed,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_VSR_ARRAY(env.vsr, PowerPCCPU, 32),
VMSTATE_END_OF_LIST()
},
@@ -445,7 +445,7 @@ static const VMStateDescription vmstate_tm = {
.version_id = 1,
.minimum_version_id = 1,
.needed = tm_needed,
- .fields = (VMStateField []) {
+ .fields = (const VMStateField []) {
VMSTATE_UINTTL_ARRAY(env.tm_gpr, PowerPCCPU, 32),
VMSTATE_AVR_ARRAY(env.tm_vsr, PowerPCCPU, 64),
VMSTATE_UINT64(env.tm_cr, PowerPCCPU),
@@ -479,7 +479,7 @@ static const VMStateDescription vmstate_sr = {
.version_id = 1,
.minimum_version_id = 1,
.needed = sr_needed,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_UINTTL_ARRAY(env.sr, PowerPCCPU, 32),
VMSTATE_END_OF_LIST()
},
@@ -553,7 +553,7 @@ static const VMStateDescription vmstate_slb = {
.minimum_version_id = 1,
.needed = slb_needed,
.post_load = slb_post_load,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_INT32_TEST(mig_slb_nr, PowerPCCPU, cpu_pre_3_0_migration),
VMSTATE_SLB_ARRAY(env.slb, PowerPCCPU, MAX_SLB_ENTRIES),
VMSTATE_END_OF_LIST()
@@ -565,7 +565,7 @@ static const VMStateDescription vmstate_tlb6xx_entry = {
.name = "cpu/tlb6xx_entry",
.version_id = 1,
.minimum_version_id = 1,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_UINTTL(pte0, ppc6xx_tlb_t),
VMSTATE_UINTTL(pte1, ppc6xx_tlb_t),
VMSTATE_UINTTL(EPN, ppc6xx_tlb_t),
@@ -586,7 +586,7 @@ static const VMStateDescription vmstate_tlb6xx = {
.version_id = 1,
.minimum_version_id = 1,
.needed = tlb6xx_needed,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_INT32_EQUAL(env.nb_tlb, PowerPCCPU, NULL),
VMSTATE_STRUCT_VARRAY_POINTER_INT32(env.tlb.tlb6, PowerPCCPU,
env.nb_tlb,
@@ -601,7 +601,7 @@ static const VMStateDescription vmstate_tlbemb_entry = {
.name = "cpu/tlbemb_entry",
.version_id = 1,
.minimum_version_id = 1,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_UINT64(RPN, ppcemb_tlb_t),
VMSTATE_UINTTL(EPN, ppcemb_tlb_t),
VMSTATE_UINTTL(PID, ppcemb_tlb_t),
@@ -625,7 +625,7 @@ static const VMStateDescription vmstate_tlbemb = {
.version_id = 1,
.minimum_version_id = 1,
.needed = tlbemb_needed,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_INT32_EQUAL(env.nb_tlb, PowerPCCPU, NULL),
VMSTATE_STRUCT_VARRAY_POINTER_INT32(env.tlb.tlbe, PowerPCCPU,
env.nb_tlb,
@@ -639,7 +639,7 @@ static const VMStateDescription vmstate_tlbmas_entry = {
.name = "cpu/tlbmas_entry",
.version_id = 1,
.minimum_version_id = 1,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_UINT32(mas8, ppcmas_tlb_t),
VMSTATE_UINT32(mas1, ppcmas_tlb_t),
VMSTATE_UINT64(mas2, ppcmas_tlb_t),
@@ -661,7 +661,7 @@ static const VMStateDescription vmstate_tlbmas = {
.version_id = 1,
.minimum_version_id = 1,
.needed = tlbmas_needed,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_INT32_EQUAL(env.nb_tlb, PowerPCCPU, NULL),
VMSTATE_STRUCT_VARRAY_POINTER_INT32(env.tlb.tlbm, PowerPCCPU,
env.nb_tlb,
@@ -684,7 +684,7 @@ static const VMStateDescription vmstate_compat = {
.version_id = 1,
.minimum_version_id = 1,
.needed = compat_needed,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_UINT32(compat_pvr, PowerPCCPU),
VMSTATE_END_OF_LIST()
}
@@ -700,7 +700,7 @@ static const VMStateDescription vmstate_reservation = {
.version_id = 1,
.minimum_version_id = 1,
.needed = reservation_needed,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_UINTTL(env.reserve_addr, PowerPCCPU),
VMSTATE_UINTTL(env.reserve_length, PowerPCCPU),
VMSTATE_UINTTL(env.reserve_val, PowerPCCPU),
@@ -717,7 +717,7 @@ const VMStateDescription vmstate_ppc_cpu = {
.minimum_version_id = 5,
.pre_save = cpu_pre_save,
.post_load = cpu_post_load,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_UNUSED(sizeof(target_ulong)), /* was _EQUAL(env.spr[SPR_PVR]) */
/* User mode architected state */
@@ -748,7 +748,7 @@ const VMStateDescription vmstate_ppc_cpu = {
VMSTATE_UINT32_TEST(mig_nb_BATs, PowerPCCPU, cpu_pre_2_8_migration),
VMSTATE_END_OF_LIST()
},
- .subsections = (const VMStateDescription*[]) {
+ .subsections = (const VMStateDescription * const []) {
&vmstate_fpu,
&vmstate_altivec,
&vmstate_vsx,
--
2.34.1
next prev parent reply other threads:[~2023-11-06 6:59 UTC|newest]
Thread overview: 102+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-06 6:57 [PATCH 00/71] *: Constify VMState Richard Henderson
2023-11-06 6:57 ` [PATCH 01/71] migration: Make VMStateDescription.subsections const Richard Henderson
2023-11-06 11:17 ` Juan Quintela
2023-11-06 11:48 ` Philippe Mathieu-Daudé
2023-11-06 6:57 ` [PATCH 02/71] target/arm: Constify VMState in machine.c Richard Henderson
2023-11-06 11:54 ` Philippe Mathieu-Daudé
2023-11-06 6:57 ` [PATCH 03/71] targt/arm: Constify hvf/hvf.c Richard Henderson
2023-11-06 11:54 ` Philippe Mathieu-Daudé
2023-11-08 10:15 ` Philippe Mathieu-Daudé
2023-11-06 6:57 ` [PATCH 04/71] target/alpha: Constify VMState in machine.c Richard Henderson
2023-11-06 6:57 ` [PATCH 05/71] target/avr: " Richard Henderson
2023-11-06 11:53 ` Philippe Mathieu-Daudé
2023-11-06 6:57 ` [PATCH 06/71] target/cris: " Richard Henderson
2023-11-08 10:12 ` Philippe Mathieu-Daudé
2023-11-06 6:57 ` [PATCH 07/71] target/hppa: " Richard Henderson
2023-11-08 10:13 ` Philippe Mathieu-Daudé
2023-11-06 6:57 ` [PATCH 08/71] target/i386: " Richard Henderson
2023-11-06 6:57 ` [PATCH 09/71] target/loongarch: " Richard Henderson
2023-11-06 6:57 ` [PATCH 10/71] target/m68k: " Richard Henderson
2023-11-06 6:57 ` [PATCH 11/71] target/microblaze: " Richard Henderson
2023-11-06 6:57 ` [PATCH 12/71] target/mips: " Richard Henderson
2023-11-06 11:49 ` Philippe Mathieu-Daudé
2023-11-06 6:57 ` [PATCH 13/71] target/openrisc: " Richard Henderson
2023-11-06 6:57 ` Richard Henderson [this message]
2023-11-06 6:57 ` [PATCH 15/71] target/riscv: " Richard Henderson
2023-11-06 9:28 ` Alistair Francis
2023-11-06 6:57 ` [PATCH 16/71] target/s390x: " Richard Henderson
2023-11-06 6:57 ` [PATCH 17/71] target/sparc: " Richard Henderson
2023-11-06 22:05 ` Mark Cave-Ayland
2023-11-06 6:57 ` [PATCH 18/71] hw/arm: Constify VMState Richard Henderson
2023-11-06 11:53 ` Philippe Mathieu-Daudé
2023-11-06 6:57 ` [PATCH 19/71] hw/core: " Richard Henderson
2023-11-06 11:49 ` Philippe Mathieu-Daudé
2023-11-06 6:57 ` [PATCH 20/71] hw/9pfs: " Richard Henderson
2023-11-06 7:53 ` Greg Kurz
2023-11-06 11:44 ` Christian Schoenebeck
2023-11-06 6:57 ` [PATCH 21/71] hw/acpi: " Richard Henderson
2023-11-06 6:57 ` [PATCH 22/71] hw/adc: " Richard Henderson
2023-11-08 10:13 ` Philippe Mathieu-Daudé
2023-11-06 6:57 ` [PATCH 23/71] hw/audio: " Richard Henderson
2023-11-06 6:57 ` [PATCH 24/71] hw/block: " Richard Henderson
2023-11-06 6:57 ` [PATCH 25/71] hw/char: " Richard Henderson
2023-11-06 6:57 ` [PATCH 26/71] hw/display: " Richard Henderson
2023-11-06 6:57 ` [PATCH 27/71] hw/dma: " Richard Henderson
2023-11-06 6:57 ` [PATCH 28/71] hw/gpio: " Richard Henderson
2023-11-06 6:57 ` [PATCH 29/71] hw/hyperv: " Richard Henderson
2023-11-06 6:57 ` [PATCH 30/71] hw/i2c: " Richard Henderson
2023-11-06 6:57 ` [PATCH 31/71] hw/i386: " Richard Henderson
2023-11-06 6:57 ` [PATCH 32/71] hw/ide: " Richard Henderson
2023-11-06 6:57 ` [PATCH 33/71] hw/input: " Richard Henderson
2023-11-06 6:57 ` [PATCH 34/71] hw/intc: " Richard Henderson
2023-11-06 6:57 ` [PATCH 35/71] hw/ipack: " Richard Henderson
2023-11-06 6:57 ` [PATCH 36/71] hw/ipmi: " Richard Henderson
2023-11-06 6:57 ` [PATCH 37/71] hw/isa: " Richard Henderson
2023-11-08 10:14 ` Philippe Mathieu-Daudé
2023-11-06 6:57 ` [PATCH 38/71] hw/loongarch: " Richard Henderson
2023-11-06 6:57 ` [PATCH 39/71] hw/m68k: " Richard Henderson
2023-11-06 6:57 ` [PATCH 40/71] hw/misc: " Richard Henderson
2023-11-06 6:57 ` [PATCH 41/71] hw/net: " Richard Henderson
2023-11-06 6:57 ` [PATCH 42/71] hw/nvram: " Richard Henderson
2023-11-06 6:57 ` [PATCH 43/71] hw/openrisc: " Richard Henderson
2023-11-06 6:58 ` [PATCH 44/71] hw/pci: " Richard Henderson
2023-11-06 6:58 ` [PATCH 45/71] hw/pci-bridge: " Richard Henderson
2023-11-06 6:58 ` [PATCH 46/71] hw/pci-host: " Richard Henderson
2023-11-06 11:52 ` Philippe Mathieu-Daudé
2023-11-06 6:58 ` [PATCH 47/71] hw/ppc: " Richard Henderson
2023-11-06 6:58 ` [PATCH 48/71] hw/riscv: " Richard Henderson
2023-11-06 9:26 ` Alistair Francis
2023-11-06 6:58 ` [PATCH 49/71] hw/rtc: " Richard Henderson
2023-11-08 10:14 ` Philippe Mathieu-Daudé
2023-11-06 6:58 ` [PATCH 50/71] hw/s390x: " Richard Henderson
2023-11-06 6:58 ` [PATCH 51/71] hw/scsi: " Richard Henderson
2023-11-06 6:58 ` [PATCH 52/71] hw/sd: " Richard Henderson
2023-11-06 11:50 ` Philippe Mathieu-Daudé
2023-11-06 6:58 ` [PATCH 53/71] hw/sensor: " Richard Henderson
2023-11-06 11:55 ` Philippe Mathieu-Daudé
2023-11-06 16:08 ` Richard Henderson
2023-11-06 6:58 ` [PATCH 54/71] hw/sparc: " Richard Henderson
2023-11-06 6:58 ` [PATCH 55/71] hw/ssi: " Richard Henderson
2023-11-06 6:58 ` [PATCH 56/71] hw/timer: " Richard Henderson
2023-11-06 6:58 ` [PATCH 57/71] hw/tpm: " Richard Henderson
2023-11-06 6:58 ` [PATCH 58/71] hw/usb: " Richard Henderson
2023-11-06 6:58 ` [PATCH 59/71] hw/vfio: " Richard Henderson
2023-11-06 6:58 ` [PATCH 60/71] hw/virtio: " Richard Henderson
2023-11-06 6:58 ` [PATCH 61/71] hw/watchdog: " Richard Henderson
2023-11-06 6:58 ` [PATCH 62/71] hw/misc/macio: " Richard Henderson
2023-11-06 6:58 ` [PATCH 63/71] audio: " Richard Henderson
2023-11-06 6:58 ` [PATCH 64/71] backends: " Richard Henderson
2023-11-06 6:58 ` [PATCH 65/71] cpu-target: " Richard Henderson
2023-11-08 10:16 ` Philippe Mathieu-Daudé
2023-11-06 6:58 ` [PATCH 66/71] migration: " Richard Henderson
2023-11-06 11:18 ` Juan Quintela
2023-11-06 6:58 ` [PATCH 67/71] system: " Richard Henderson
2023-11-06 11:51 ` Philippe Mathieu-Daudé
2023-11-06 6:58 ` [PATCH 68/71] replay: " Richard Henderson
2023-11-06 6:58 ` [PATCH 69/71] util/fifo8: " Richard Henderson
2023-11-08 10:16 ` Philippe Mathieu-Daudé
2023-11-06 6:58 ` [PATCH 70/71] tests/unit/test-vmstate: " Richard Henderson
2023-11-06 11:24 ` Juan Quintela
2023-11-06 6:58 ` [PATCH 71/71] docs: Constify VMstate in examples Richard Henderson
2023-11-06 11:24 ` Juan Quintela
2023-11-06 11:51 ` Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231106065827.543129-15-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=farosas@suse.de \
--cc=leobras@redhat.com \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).