From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PATCH v2 50/71] hw/s390x: Constify VMState
Date: Thu, 21 Dec 2023 14:16:31 +1100 [thread overview]
Message-ID: <20231221031652.119827-51-richard.henderson@linaro.org> (raw)
In-Reply-To: <20231221031652.119827-1-richard.henderson@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
hw/s390x/ccw-device.c | 2 +-
hw/s390x/css.c | 36 ++++++++++++++++++------------------
hw/s390x/event-facility.c | 8 ++++----
hw/s390x/ipl.c | 8 ++++----
hw/s390x/sclpquiesce.c | 2 +-
hw/s390x/virtio-ccw.c | 4 ++--
6 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/hw/s390x/ccw-device.c b/hw/s390x/ccw-device.c
index 95f269ab44..fb8c1acc64 100644
--- a/hw/s390x/ccw-device.c
+++ b/hw/s390x/ccw-device.c
@@ -66,7 +66,7 @@ const VMStateDescription vmstate_ccw_dev = {
.name = "s390_ccw_dev",
.version_id = 1,
.minimum_version_id = 1,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_STRUCT_POINTER(sch, CcwDevice, vmstate_subch_dev, SubchDev),
VMSTATE_END_OF_LIST()
}
diff --git a/hw/s390x/css.c b/hw/s390x/css.c
index bcedec2fc8..295530963a 100644
--- a/hw/s390x/css.c
+++ b/hw/s390x/css.c
@@ -32,7 +32,7 @@ static const VMStateDescription vmstate_crw = {
.name = "s390_crw",
.version_id = 1,
.minimum_version_id = 1,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_UINT16(flags, CRW),
VMSTATE_UINT16(rsid, CRW),
VMSTATE_END_OF_LIST()
@@ -43,7 +43,7 @@ static const VMStateDescription vmstate_crw_container = {
.name = "s390_crw_container",
.version_id = 1,
.minimum_version_id = 1,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_STRUCT(crw, CrwContainer, 0, vmstate_crw, CRW),
VMSTATE_END_OF_LIST()
},
@@ -59,7 +59,7 @@ static const VMStateDescription vmstate_chp_info = {
.name = "s390_chp_info",
.version_id = 1,
.minimum_version_id = 1,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_UINT8(in_use, ChpInfo),
VMSTATE_UINT8(type, ChpInfo),
VMSTATE_UINT8(is_virtual, ChpInfo),
@@ -77,7 +77,7 @@ static const VMStateDescription vmstate_scsw = {
.name = "s390_scsw",
.version_id = 1,
.minimum_version_id = 1,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_UINT16(flags, SCSW),
VMSTATE_UINT16(ctrl, SCSW),
VMSTATE_UINT32(cpa, SCSW),
@@ -92,7 +92,7 @@ static const VMStateDescription vmstate_pmcw = {
.name = "s390_pmcw",
.version_id = 1,
.minimum_version_id = 1,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_UINT32(intparm, PMCW),
VMSTATE_UINT16(flags, PMCW),
VMSTATE_UINT16(devno, PMCW),
@@ -113,7 +113,7 @@ static const VMStateDescription vmstate_schib = {
.name = "s390_schib",
.version_id = 1,
.minimum_version_id = 1,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_STRUCT(pmcw, SCHIB, 0, vmstate_pmcw, PMCW),
VMSTATE_STRUCT(scsw, SCHIB, 0, vmstate_scsw, SCSW),
VMSTATE_UINT64(mba, SCHIB),
@@ -127,7 +127,7 @@ static const VMStateDescription vmstate_ccw1 = {
.name = "s390_ccw1",
.version_id = 1,
.minimum_version_id = 1,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_UINT8(cmd_code, CCW1),
VMSTATE_UINT8(flags, CCW1),
VMSTATE_UINT16(count, CCW1),
@@ -140,7 +140,7 @@ static const VMStateDescription vmstate_ciw = {
.name = "s390_ciw",
.version_id = 1,
.minimum_version_id = 1,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_UINT8(type, CIW),
VMSTATE_UINT8(command, CIW),
VMSTATE_UINT16(count, CIW),
@@ -152,7 +152,7 @@ static const VMStateDescription vmstate_sense_id = {
.name = "s390_sense_id",
.version_id = 1,
.minimum_version_id = 1,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_UINT8(reserved, SenseId),
VMSTATE_UINT16(cu_type, SenseId),
VMSTATE_UINT8(cu_model, SenseId),
@@ -168,7 +168,7 @@ static const VMStateDescription vmstate_orb = {
.name = "s390_orb",
.version_id = 1,
.minimum_version_id = 1,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_UINT32(intparm, ORB),
VMSTATE_UINT16(ctrl0, ORB),
VMSTATE_UINT8(lpm, ORB),
@@ -188,7 +188,7 @@ static const VMStateDescription vmstate_schdev_orb = {
.version_id = 1,
.minimum_version_id = 1,
.needed = vmstate_schdev_orb_needed,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_STRUCT(orb, SubchDev, 1, vmstate_orb, ORB),
VMSTATE_END_OF_LIST()
}
@@ -207,7 +207,7 @@ const VMStateDescription vmstate_subch_dev = {
.minimum_version_id = 1,
.post_load = subch_dev_post_load,
.pre_save = subch_dev_pre_save,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_UINT8_EQUAL(cssid, SubchDev, "Bug!"),
VMSTATE_UINT8_EQUAL(ssid, SubchDev, "Bug!"),
VMSTATE_UINT16(migrated_schid, SubchDev),
@@ -223,7 +223,7 @@ const VMStateDescription vmstate_subch_dev = {
VMSTATE_UINT8(ccw_no_data_cnt, SubchDev),
VMSTATE_END_OF_LIST()
},
- .subsections = (const VMStateDescription * []) {
+ .subsections = (const VMStateDescription * const []) {
&vmstate_schdev_orb,
NULL
}
@@ -264,12 +264,12 @@ static int pre_save_ind_addr(void *opaque)
return 0;
}
-const VMStateDescription vmstate_ind_addr_tmp = {
+static const VMStateDescription vmstate_ind_addr_tmp = {
.name = "s390_ind_addr_tmp",
.pre_save = pre_save_ind_addr,
.post_load = post_load_ind_addr,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_INT32(len, IndAddrPtrTmp),
VMSTATE_UINT64(addr, IndAddrPtrTmp),
VMSTATE_END_OF_LIST()
@@ -278,7 +278,7 @@ const VMStateDescription vmstate_ind_addr_tmp = {
const VMStateDescription vmstate_ind_addr = {
.name = "s390_ind_addr_tmp",
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_WITH_TMP(IndAddr*, IndAddrPtrTmp, vmstate_ind_addr_tmp),
VMSTATE_END_OF_LIST()
}
@@ -293,7 +293,7 @@ static const VMStateDescription vmstate_css_img = {
.name = "s390_css_img",
.version_id = 1,
.minimum_version_id = 1,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
/* Subchannel sets have no relevant state. */
VMSTATE_STRUCT_ARRAY(chpids, CssImage, MAX_CHPID + 1, 0,
vmstate_chp_info, ChpInfo),
@@ -330,7 +330,7 @@ static const VMStateDescription vmstate_css = {
.name = "s390_css",
.version_id = 1,
.minimum_version_id = 1,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_QTAILQ_V(pending_crws, ChannelSubSys, 1, vmstate_crw_container,
CrwContainer, sibling),
VMSTATE_BOOL(sei_pending, ChannelSubSys),
diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c
index 6891e3cd73..f9829de953 100644
--- a/hw/s390x/event-facility.c
+++ b/hw/s390x/event-facility.c
@@ -367,7 +367,7 @@ static const VMStateDescription vmstate_event_facility_mask64 = {
.version_id = 0,
.minimum_version_id = 0,
.needed = vmstate_event_facility_mask64_needed,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_UINT32(receive_mask_pieces[RECV_MASK_LOWER], SCLPEventFacility),
VMSTATE_END_OF_LIST()
}
@@ -378,7 +378,7 @@ static const VMStateDescription vmstate_event_facility_mask_length = {
.version_id = 0,
.minimum_version_id = 0,
.needed = vmstate_event_facility_mask_length_needed,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_UINT16(mask_length, SCLPEventFacility),
VMSTATE_END_OF_LIST()
}
@@ -388,11 +388,11 @@ static const VMStateDescription vmstate_event_facility = {
.name = "vmstate-event-facility",
.version_id = 0,
.minimum_version_id = 0,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_UINT32(receive_mask_pieces[RECV_MASK_UPPER], SCLPEventFacility),
VMSTATE_END_OF_LIST()
},
- .subsections = (const VMStateDescription * []) {
+ .subsections = (const VMStateDescription * const []) {
&vmstate_event_facility_mask64,
&vmstate_event_facility_mask_length,
NULL
diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
index 62182d81a0..76110e8f58 100644
--- a/hw/s390x/ipl.c
+++ b/hw/s390x/ipl.c
@@ -59,7 +59,7 @@ static const VMStateDescription vmstate_iplb_extended = {
.version_id = 0,
.minimum_version_id = 0,
.needed = iplb_extended_needed,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_UINT8_ARRAY(reserved_ext, IplParameterBlock, 4096 - 200),
VMSTATE_END_OF_LIST()
}
@@ -69,13 +69,13 @@ static const VMStateDescription vmstate_iplb = {
.name = "ipl/iplb",
.version_id = 0,
.minimum_version_id = 0,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_UINT8_ARRAY(reserved1, IplParameterBlock, 110),
VMSTATE_UINT16(devno, IplParameterBlock),
VMSTATE_UINT8_ARRAY(reserved2, IplParameterBlock, 88),
VMSTATE_END_OF_LIST()
},
- .subsections = (const VMStateDescription*[]) {
+ .subsections = (const VMStateDescription * const []) {
&vmstate_iplb_extended,
NULL
}
@@ -85,7 +85,7 @@ static const VMStateDescription vmstate_ipl = {
.name = "ipl",
.version_id = 0,
.minimum_version_id = 0,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_UINT64(compat_start_addr, S390IPLState),
VMSTATE_UINT64(compat_bios_start_addr, S390IPLState),
VMSTATE_STRUCT(iplb, S390IPLState, 0, vmstate_iplb, IplParameterBlock),
diff --git a/hw/s390x/sclpquiesce.c b/hw/s390x/sclpquiesce.c
index a641089929..14936aa94b 100644
--- a/hw/s390x/sclpquiesce.c
+++ b/hw/s390x/sclpquiesce.c
@@ -72,7 +72,7 @@ static const VMStateDescription vmstate_sclpquiesce = {
.name = TYPE_SCLP_QUIESCE,
.version_id = 0,
.minimum_version_id = 0,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_BOOL(event_pending, SCLPEvent),
VMSTATE_END_OF_LIST()
}
diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
index 80453718a3..b4676909dd 100644
--- a/hw/s390x/virtio-ccw.c
+++ b/hw/s390x/virtio-ccw.c
@@ -87,7 +87,7 @@ const VMStateDescription vmstate_virtio_ccw_dev_tmp = {
.name = "s390_virtio_ccw_dev_tmp",
.pre_save = virtio_ccw_dev_tmp_pre_save,
.post_load = virtio_ccw_dev_tmp_post_load,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_UINT16(config_vector, VirtioCcwDeviceTmp),
VMSTATE_END_OF_LIST()
}
@@ -98,7 +98,7 @@ const VMStateDescription vmstate_virtio_ccw_dev = {
.version_id = 1,
.minimum_version_id = 1,
.post_load = virtio_ccw_dev_post_load,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_CCW_DEVICE(parent_obj, VirtioCcwDevice),
VMSTATE_PTR_TO_IND_ADDR(indicators, VirtioCcwDevice),
VMSTATE_PTR_TO_IND_ADDR(indicators2, VirtioCcwDevice),
--
2.34.1
next prev parent reply other threads:[~2023-12-21 3:25 UTC|newest]
Thread overview: 78+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-21 3:15 [PATCH v2 00/71] *: Constify VMState Richard Henderson
2023-12-21 3:15 ` [PATCH v2 01/71] migration: Make VMStateDescription.subsections const Richard Henderson
2023-12-21 3:15 ` [PATCH v2 02/71] target/arm: Constify VMState in machine.c Richard Henderson
2023-12-21 3:15 ` [PATCH v2 03/71] target/arm: Constify hvf/hvf.c Richard Henderson
2023-12-21 3:15 ` [PATCH v2 04/71] target/alpha: Constify VMState in machine.c Richard Henderson
2023-12-21 3:15 ` [PATCH v2 05/71] target/avr: " Richard Henderson
2023-12-21 3:15 ` [PATCH v2 06/71] target/cris: " Richard Henderson
2023-12-21 3:15 ` [PATCH v2 07/71] target/hppa: " Richard Henderson
2023-12-21 3:15 ` [PATCH v2 08/71] target/i386: " Richard Henderson
2023-12-22 2:51 ` Zhao Liu
2023-12-21 3:15 ` [PATCH v2 09/71] target/loongarch: " Richard Henderson
2023-12-21 6:43 ` gaosong
2023-12-21 3:15 ` [PATCH v2 10/71] target/m68k: " Richard Henderson
2023-12-21 3:15 ` [PATCH v2 11/71] target/microblaze: " Richard Henderson
2023-12-21 3:15 ` [PATCH v2 12/71] target/mips: " Richard Henderson
2023-12-21 3:15 ` [PATCH v2 13/71] target/openrisc: " Richard Henderson
2023-12-21 3:15 ` [PATCH v2 14/71] target/ppc: " Richard Henderson
2023-12-21 3:15 ` [PATCH v2 15/71] target/riscv: " Richard Henderson
2023-12-21 3:15 ` [PATCH v2 16/71] target/s390x: " Richard Henderson
2023-12-21 3:15 ` [PATCH v2 17/71] target/sparc: " Richard Henderson
2023-12-21 3:15 ` [PATCH v2 18/71] hw/arm: Constify VMState Richard Henderson
2023-12-21 3:16 ` [PATCH v2 19/71] hw/core: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 20/71] hw/9pfs: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 21/71] hw/acpi: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 22/71] hw/adc: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 23/71] hw/audio: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 24/71] hw/block: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 25/71] hw/char: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 26/71] hw/display: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 27/71] hw/dma: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 28/71] hw/gpio: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 29/71] hw/hyperv: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 30/71] hw/i2c: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 31/71] hw/i386: " Richard Henderson
2023-12-22 2:54 ` Zhao Liu
2023-12-21 3:16 ` [PATCH v2 32/71] hw/ide: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 33/71] hw/input: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 34/71] hw/intc: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 35/71] hw/ipack: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 36/71] hw/ipmi: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 37/71] hw/isa: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 38/71] hw/loongarch: " Richard Henderson
2023-12-21 6:44 ` gaosong
2023-12-21 3:16 ` [PATCH v2 39/71] hw/m68k: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 40/71] hw/misc: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 41/71] hw/net: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 42/71] hw/nvram: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 43/71] hw/openrisc: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 44/71] hw/pci: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 45/71] hw/pci-bridge: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 46/71] hw/pci-host: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 47/71] hw/ppc: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 48/71] hw/riscv: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 49/71] hw/rtc: " Richard Henderson
2023-12-21 3:16 ` Richard Henderson [this message]
2023-12-21 3:16 ` [PATCH v2 51/71] hw/scsi: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 52/71] hw/sd: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 53/71] hw/sensor: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 54/71] hw/sparc: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 55/71] hw/ssi: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 56/71] hw/timer: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 57/71] hw/tpm: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 58/71] hw/usb: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 59/71] hw/vfio: " Richard Henderson
2023-12-21 8:14 ` Cédric Le Goater
2023-12-21 3:16 ` [PATCH v2 60/71] hw/virtio: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 61/71] hw/watchdog: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 62/71] hw/misc/macio: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 63/71] audio: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 64/71] backends: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 65/71] cpu-target: " Richard Henderson
2023-12-22 2:55 ` Zhao Liu
2023-12-21 3:16 ` [PATCH v2 66/71] migration: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 67/71] system: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 68/71] replay: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 69/71] util/fifo8: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 70/71] tests/unit/test-vmstate: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 71/71] docs: Constify VMstate in examples Richard Henderson
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=20231221031652.119827-51-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=qemu-devel@nongnu.org \
/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).