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 27/71] hw/dma: Constify VMState
Date: Sun, 5 Nov 2023 22:57:43 -0800 [thread overview]
Message-ID: <20231106065827.543129-28-richard.henderson@linaro.org> (raw)
In-Reply-To: <20231106065827.543129-1-richard.henderson@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
hw/dma/bcm2835_dma.c | 4 ++--
hw/dma/i82374.c | 2 +-
hw/dma/i8257.c | 4 ++--
hw/dma/pl080.c | 4 ++--
hw/dma/pl330.c | 10 +++++-----
hw/dma/pxa2xx_dma.c | 4 ++--
hw/dma/rc4030.c | 2 +-
hw/dma/sparc32_dma.c | 2 +-
hw/dma/xlnx-zdma.c | 2 +-
hw/dma/xlnx-zynq-devcfg.c | 4 ++--
hw/dma/xlnx_csu_dma.c | 2 +-
hw/dma/xlnx_dpdma.c | 2 +-
12 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/hw/dma/bcm2835_dma.c b/hw/dma/bcm2835_dma.c
index 5e9306110d..9bda45072b 100644
--- a/hw/dma/bcm2835_dma.c
+++ b/hw/dma/bcm2835_dma.c
@@ -311,7 +311,7 @@ static const VMStateDescription vmstate_bcm2835_dma_chan = {
.name = TYPE_BCM2835_DMA "-chan",
.version_id = 1,
.minimum_version_id = 1,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_UINT32(cs, BCM2835DMAChan),
VMSTATE_UINT32(conblk_ad, BCM2835DMAChan),
VMSTATE_UINT32(ti, BCM2835DMAChan),
@@ -329,7 +329,7 @@ static const VMStateDescription vmstate_bcm2835_dma = {
.name = TYPE_BCM2835_DMA,
.version_id = 1,
.minimum_version_id = 1,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_STRUCT_ARRAY(chan, BCM2835DMAState, BCM2835_DMA_NCHANS, 1,
vmstate_bcm2835_dma_chan, BCM2835DMAChan),
VMSTATE_UINT32(int_status, BCM2835DMAState),
diff --git a/hw/dma/i82374.c b/hw/dma/i82374.c
index 63734c22c9..f6ddfc51c5 100644
--- a/hw/dma/i82374.c
+++ b/hw/dma/i82374.c
@@ -58,7 +58,7 @@ static const VMStateDescription vmstate_i82374 = {
.name = "i82374",
.version_id = 0,
.minimum_version_id = 0,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_UINT8_ARRAY(commands, I82374State, 8),
VMSTATE_END_OF_LIST()
},
diff --git a/hw/dma/i8257.c b/hw/dma/i8257.c
index de5f696919..de1d5b110c 100644
--- a/hw/dma/i8257.c
+++ b/hw/dma/i8257.c
@@ -517,7 +517,7 @@ static const VMStateDescription vmstate_i8257_regs = {
.name = "dma_regs",
.version_id = 1,
.minimum_version_id = 1,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_INT32_ARRAY(now, I8257Regs, 2),
VMSTATE_UINT16_ARRAY(base, I8257Regs, 2),
VMSTATE_UINT8(mode, I8257Regs),
@@ -542,7 +542,7 @@ static const VMStateDescription vmstate_i8257 = {
.version_id = 1,
.minimum_version_id = 1,
.post_load = i8257_post_load,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_UINT8(command, I8257State),
VMSTATE_UINT8(mask, I8257State),
VMSTATE_UINT8(flip_flop, I8257State),
diff --git a/hw/dma/pl080.c b/hw/dma/pl080.c
index 2627307cc8..1e49c22e93 100644
--- a/hw/dma/pl080.c
+++ b/hw/dma/pl080.c
@@ -39,7 +39,7 @@ static const VMStateDescription vmstate_pl080_channel = {
.name = "pl080_channel",
.version_id = 1,
.minimum_version_id = 1,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_UINT32(src, pl080_channel),
VMSTATE_UINT32(dest, pl080_channel),
VMSTATE_UINT32(lli, pl080_channel),
@@ -53,7 +53,7 @@ static const VMStateDescription vmstate_pl080 = {
.name = "pl080",
.version_id = 1,
.minimum_version_id = 1,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_UINT8(tc_int, PL080State),
VMSTATE_UINT8(tc_mask, PL080State),
VMSTATE_UINT8(err_int, PL080State),
diff --git a/hw/dma/pl330.c b/hw/dma/pl330.c
index e7e67dd8b6..70a502d245 100644
--- a/hw/dma/pl330.c
+++ b/hw/dma/pl330.c
@@ -139,7 +139,7 @@ static const VMStateDescription vmstate_pl330_chan = {
.name = "pl330_chan",
.version_id = 1,
.minimum_version_id = 1,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_UINT32(src, PL330Chan),
VMSTATE_UINT32(dst, PL330Chan),
VMSTATE_UINT32(pc, PL330Chan),
@@ -170,7 +170,7 @@ static const VMStateDescription vmstate_pl330_fifo = {
.name = "pl330_chan",
.version_id = 1,
.minimum_version_id = 1,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_VBUFFER_UINT32(buf, PL330Fifo, 1, NULL, buf_size),
VMSTATE_VBUFFER_UINT32(tag, PL330Fifo, 1, NULL, buf_size),
VMSTATE_UINT32(head, PL330Fifo),
@@ -194,7 +194,7 @@ static const VMStateDescription vmstate_pl330_queue_entry = {
.name = "pl330_queue_entry",
.version_id = 1,
.minimum_version_id = 1,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_UINT32(addr, PL330QueueEntry),
VMSTATE_UINT32(len, PL330QueueEntry),
VMSTATE_UINT8(n, PL330QueueEntry),
@@ -216,7 +216,7 @@ static const VMStateDescription vmstate_pl330_queue = {
.name = "pl330_queue",
.version_id = 2,
.minimum_version_id = 2,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_STRUCT_VARRAY_POINTER_UINT32(queue, PL330Queue, queue_size,
vmstate_pl330_queue_entry,
PL330QueueEntry),
@@ -280,7 +280,7 @@ static const VMStateDescription vmstate_pl330 = {
.name = "pl330",
.version_id = 2,
.minimum_version_id = 2,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_STRUCT(manager, PL330State, 0, vmstate_pl330_chan, PL330Chan),
VMSTATE_STRUCT_VARRAY_POINTER_UINT32(chan, PL330State, num_chnls,
vmstate_pl330_chan, PL330Chan),
diff --git a/hw/dma/pxa2xx_dma.c b/hw/dma/pxa2xx_dma.c
index fa896f7edf..9f62f0b633 100644
--- a/hw/dma/pxa2xx_dma.c
+++ b/hw/dma/pxa2xx_dma.c
@@ -529,7 +529,7 @@ static const VMStateDescription vmstate_pxa2xx_dma_chan = {
.name = "pxa2xx_dma_chan",
.version_id = 1,
.minimum_version_id = 1,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_UINT32(descr, PXA2xxDMAChannel),
VMSTATE_UINT32(src, PXA2xxDMAChannel),
VMSTATE_UINT32(dest, PXA2xxDMAChannel),
@@ -544,7 +544,7 @@ static const VMStateDescription vmstate_pxa2xx_dma = {
.name = "pxa2xx_dma",
.version_id = 1,
.minimum_version_id = 0,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_UNUSED_TEST(is_version_0, 4),
VMSTATE_UINT32(stopintr, PXA2xxDMAState),
VMSTATE_UINT32(eorintr, PXA2xxDMAState),
diff --git a/hw/dma/rc4030.c b/hw/dma/rc4030.c
index aa1d323a36..915284194f 100644
--- a/hw/dma/rc4030.c
+++ b/hw/dma/rc4030.c
@@ -568,7 +568,7 @@ static const VMStateDescription vmstate_rc4030 = {
.name = "rc4030",
.version_id = 3,
.post_load = rc4030_post_load,
- .fields = (VMStateField []) {
+ .fields = (const VMStateField []) {
VMSTATE_UINT32(config, rc4030State),
VMSTATE_UINT32(invalid_address_register, rc4030State),
VMSTATE_UINT32_2DARRAY(dma_regs, rc4030State, 8, 4),
diff --git a/hw/dma/sparc32_dma.c b/hw/dma/sparc32_dma.c
index 0ef13c5e9a..8019641942 100644
--- a/hw/dma/sparc32_dma.c
+++ b/hw/dma/sparc32_dma.c
@@ -249,7 +249,7 @@ static const VMStateDescription vmstate_sparc32_dma_device = {
.name ="sparc32_dma",
.version_id = 2,
.minimum_version_id = 2,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_UINT32_ARRAY(dmaregs, DMADeviceState, DMA_REGS),
VMSTATE_END_OF_LIST()
}
diff --git a/hw/dma/xlnx-zdma.c b/hw/dma/xlnx-zdma.c
index 84c0083013..670c956866 100644
--- a/hw/dma/xlnx-zdma.c
+++ b/hw/dma/xlnx-zdma.c
@@ -801,7 +801,7 @@ static const VMStateDescription vmstate_zdma = {
.name = TYPE_XLNX_ZDMA,
.version_id = 1,
.minimum_version_id = 1,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_UINT32_ARRAY(regs, XlnxZDMA, ZDMA_R_MAX),
VMSTATE_UINT32(state, XlnxZDMA),
VMSTATE_UINT32_ARRAY(dsc_src.words, XlnxZDMA, 4),
diff --git a/hw/dma/xlnx-zynq-devcfg.c b/hw/dma/xlnx-zynq-devcfg.c
index f5ad1a0d22..e901f68ff3 100644
--- a/hw/dma/xlnx-zynq-devcfg.c
+++ b/hw/dma/xlnx-zynq-devcfg.c
@@ -333,7 +333,7 @@ static const VMStateDescription vmstate_xlnx_zynq_devcfg_dma_cmd = {
.name = "xlnx_zynq_devcfg_dma_cmd",
.version_id = 1,
.minimum_version_id = 1,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_UINT32(src_addr, XlnxZynqDevcfgDMACmd),
VMSTATE_UINT32(dest_addr, XlnxZynqDevcfgDMACmd),
VMSTATE_UINT32(src_len, XlnxZynqDevcfgDMACmd),
@@ -346,7 +346,7 @@ static const VMStateDescription vmstate_xlnx_zynq_devcfg = {
.name = "xlnx_zynq_devcfg",
.version_id = 1,
.minimum_version_id = 1,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_STRUCT_ARRAY(dma_cmd_fifo, XlnxZynqDevcfg,
XLNX_ZYNQ_DEVCFG_DMA_CMD_FIFO_LEN, 0,
vmstate_xlnx_zynq_devcfg_dma_cmd,
diff --git a/hw/dma/xlnx_csu_dma.c b/hw/dma/xlnx_csu_dma.c
index e89089821a..3a38fc8330 100644
--- a/hw/dma/xlnx_csu_dma.c
+++ b/hw/dma/xlnx_csu_dma.c
@@ -677,7 +677,7 @@ static const VMStateDescription vmstate_xlnx_csu_dma = {
.name = TYPE_XLNX_CSU_DMA,
.version_id = 0,
.minimum_version_id = 0,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_PTIMER(src_timer, XlnxCSUDMA),
VMSTATE_UINT16(width, XlnxCSUDMA),
VMSTATE_BOOL(is_dst, XlnxCSUDMA),
diff --git a/hw/dma/xlnx_dpdma.c b/hw/dma/xlnx_dpdma.c
index dd66be5265..1f5cd64ed1 100644
--- a/hw/dma/xlnx_dpdma.c
+++ b/hw/dma/xlnx_dpdma.c
@@ -277,7 +277,7 @@ static inline bool xlnx_dpdma_desc_ignore_done_bit(DPDMADescriptor *desc)
static const VMStateDescription vmstate_xlnx_dpdma = {
.name = TYPE_XLNX_DPDMA,
.version_id = 1,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_UINT32_ARRAY(registers, XlnxDPDMAState,
XLNX_DPDMA_REG_ARRAY_SIZE),
VMSTATE_BOOL_ARRAY(operation_finished, XlnxDPDMAState, 6),
--
2.34.1
next prev parent reply other threads:[~2023-11-06 7:01 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 ` [PATCH 14/71] target/ppc: " Richard Henderson
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 ` Richard Henderson [this message]
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-28-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).