hw/nvram: Constify VMState

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20231221031652.119827-43-richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2023-12-21 14:16:23 +11:00
parent 1de81b426c
commit 18d10e6175
10 changed files with 13 additions and 13 deletions

View file

@ -102,7 +102,7 @@ static const VMStateDescription vmstate_nvram = {
.version_id = 0, .version_id = 0,
.minimum_version_id = 0, .minimum_version_id = 0,
.post_load = nvram_post_load, .post_load = nvram_post_load,
.fields = (VMStateField[]) { .fields = (const VMStateField[]) {
VMSTATE_VARRAY_UINT32(contents, NvRamState, chip_size, 0, VMSTATE_VARRAY_UINT32(contents, NvRamState, chip_size, 0,
vmstate_info_uint8, uint8_t), vmstate_info_uint8, uint8_t),
VMSTATE_END_OF_LIST() VMSTATE_END_OF_LIST()

View file

@ -131,7 +131,7 @@ static const VMStateDescription vmstate_eeprom = {
.name = "eeprom", .name = "eeprom",
.version_id = EEPROM_VERSION, .version_id = EEPROM_VERSION,
.minimum_version_id = OLD_EEPROM_VERSION, .minimum_version_id = OLD_EEPROM_VERSION,
.fields = (VMStateField[]) { .fields = (const VMStateField[]) {
VMSTATE_UINT8(tick, eeprom_t), VMSTATE_UINT8(tick, eeprom_t),
VMSTATE_UINT8(address, eeprom_t), VMSTATE_UINT8(address, eeprom_t),
VMSTATE_UINT8(command, eeprom_t), VMSTATE_UINT8(command, eeprom_t),

View file

@ -656,7 +656,7 @@ static int fw_cfg_acpi_mr_restore_post_load(void *opaque, int version_id)
static const VMStateDescription vmstate_fw_cfg_dma = { static const VMStateDescription vmstate_fw_cfg_dma = {
.name = "fw_cfg/dma", .name = "fw_cfg/dma",
.needed = fw_cfg_dma_enabled, .needed = fw_cfg_dma_enabled,
.fields = (VMStateField[]) { .fields = (const VMStateField[]) {
VMSTATE_UINT64(dma_addr, FWCfgState), VMSTATE_UINT64(dma_addr, FWCfgState),
VMSTATE_END_OF_LIST() VMSTATE_END_OF_LIST()
}, },
@ -668,7 +668,7 @@ static const VMStateDescription vmstate_fw_cfg_acpi_mr = {
.minimum_version_id = 1, .minimum_version_id = 1,
.needed = fw_cfg_acpi_mr_restore, .needed = fw_cfg_acpi_mr_restore,
.post_load = fw_cfg_acpi_mr_restore_post_load, .post_load = fw_cfg_acpi_mr_restore_post_load,
.fields = (VMStateField[]) { .fields = (const VMStateField[]) {
VMSTATE_UINT64(table_mr_size, FWCfgState), VMSTATE_UINT64(table_mr_size, FWCfgState),
VMSTATE_UINT64(linker_mr_size, FWCfgState), VMSTATE_UINT64(linker_mr_size, FWCfgState),
VMSTATE_UINT64(rsdp_mr_size, FWCfgState), VMSTATE_UINT64(rsdp_mr_size, FWCfgState),
@ -680,13 +680,13 @@ static const VMStateDescription vmstate_fw_cfg = {
.name = "fw_cfg", .name = "fw_cfg",
.version_id = 2, .version_id = 2,
.minimum_version_id = 1, .minimum_version_id = 1,
.fields = (VMStateField[]) { .fields = (const VMStateField[]) {
VMSTATE_UINT16(cur_entry, FWCfgState), VMSTATE_UINT16(cur_entry, FWCfgState),
VMSTATE_UINT16_HACK(cur_offset, FWCfgState, is_version_1), VMSTATE_UINT16_HACK(cur_offset, FWCfgState, is_version_1),
VMSTATE_UINT32_V(cur_offset, FWCfgState, 2), VMSTATE_UINT32_V(cur_offset, FWCfgState, 2),
VMSTATE_END_OF_LIST() VMSTATE_END_OF_LIST()
}, },
.subsections = (const VMStateDescription*[]) { .subsections = (const VMStateDescription * const []) {
&vmstate_fw_cfg_dma, &vmstate_fw_cfg_dma,
&vmstate_fw_cfg_acpi_mr, &vmstate_fw_cfg_acpi_mr,
NULL, NULL,

View file

@ -79,7 +79,7 @@ static const VMStateDescription vmstate_macio_nvram = {
.name = "macio_nvram", .name = "macio_nvram",
.version_id = 1, .version_id = 1,
.minimum_version_id = 1, .minimum_version_id = 1,
.fields = (VMStateField[]) { .fields = (const VMStateField[]) {
VMSTATE_VBUFFER_UINT32(data, MacIONVRAMState, 0, NULL, size), VMSTATE_VBUFFER_UINT32(data, MacIONVRAMState, 0, NULL, size),
VMSTATE_END_OF_LIST() VMSTATE_END_OF_LIST()
} }

View file

@ -384,7 +384,7 @@ static const VMStateDescription vmstate_npcm7xx_otp = {
.name = "npcm7xx-otp", .name = "npcm7xx-otp",
.version_id = 0, .version_id = 0,
.minimum_version_id = 0, .minimum_version_id = 0,
.fields = (VMStateField[]) { .fields = (const VMStateField[]) {
VMSTATE_UINT32_ARRAY(regs, NPCM7xxOTPState, NPCM7XX_OTP_NR_REGS), VMSTATE_UINT32_ARRAY(regs, NPCM7xxOTPState, NPCM7XX_OTP_NR_REGS),
VMSTATE_UINT8_ARRAY(array, NPCM7xxOTPState, NPCM7XX_OTP_ARRAY_BYTES), VMSTATE_UINT8_ARRAY(array, NPCM7xxOTPState, NPCM7XX_OTP_ARRAY_BYTES),
VMSTATE_END_OF_LIST(), VMSTATE_END_OF_LIST(),

View file

@ -366,7 +366,7 @@ static const VMStateDescription vmstate_nvm = {
.name = "nrf51_soc.nvm", .name = "nrf51_soc.nvm",
.version_id = 1, .version_id = 1,
.minimum_version_id = 1, .minimum_version_id = 1,
.fields = (VMStateField[]) { .fields = (const VMStateField[]) {
VMSTATE_UINT32_ARRAY(uicr_content, NRF51NVMState, VMSTATE_UINT32_ARRAY(uicr_content, NRF51NVMState,
NRF51_UICR_FIXTURE_SIZE), NRF51_UICR_FIXTURE_SIZE),
VMSTATE_UINT32(config, NRF51NVMState), VMSTATE_UINT32(config, NRF51NVMState),

View file

@ -245,7 +245,7 @@ static const VMStateDescription vmstate_spapr_nvram = {
.minimum_version_id = 1, .minimum_version_id = 1,
.pre_load = spapr_nvram_pre_load, .pre_load = spapr_nvram_pre_load,
.post_load = spapr_nvram_post_load, .post_load = spapr_nvram_post_load,
.fields = (VMStateField[]) { .fields = (const VMStateField[]) {
VMSTATE_UINT32(size, SpaprNvram), VMSTATE_UINT32(size, SpaprNvram),
VMSTATE_VBUFFER_ALLOC_UINT32(buf, SpaprNvram, 1, NULL, size), VMSTATE_VBUFFER_ALLOC_UINT32(buf, SpaprNvram, 1, NULL, size),
VMSTATE_END_OF_LIST() VMSTATE_END_OF_LIST()

View file

@ -508,7 +508,7 @@ static const VMStateDescription vmstate_bbram_ctrl = {
.name = TYPE_XLNX_BBRAM, .name = TYPE_XLNX_BBRAM,
.version_id = 1, .version_id = 1,
.minimum_version_id = 1, .minimum_version_id = 1,
.fields = (VMStateField[]) { .fields = (const VMStateField[]) {
VMSTATE_UINT32_ARRAY(regs, XlnxBBRam, R_MAX), VMSTATE_UINT32_ARRAY(regs, XlnxBBRam, R_MAX),
VMSTATE_END_OF_LIST(), VMSTATE_END_OF_LIST(),
} }

View file

@ -737,7 +737,7 @@ static const VMStateDescription vmstate_efuse_ctrl = {
.name = TYPE_XLNX_VERSAL_EFUSE_CTRL, .name = TYPE_XLNX_VERSAL_EFUSE_CTRL,
.version_id = 1, .version_id = 1,
.minimum_version_id = 1, .minimum_version_id = 1,
.fields = (VMStateField[]) { .fields = (const VMStateField[]) {
VMSTATE_UINT32_ARRAY(regs, XlnxVersalEFuseCtrl, R_MAX), VMSTATE_UINT32_ARRAY(regs, XlnxVersalEFuseCtrl, R_MAX),
VMSTATE_END_OF_LIST(), VMSTATE_END_OF_LIST(),
} }

View file

@ -821,7 +821,7 @@ static const VMStateDescription vmstate_efuse = {
.name = TYPE_XLNX_ZYNQMP_EFUSE, .name = TYPE_XLNX_ZYNQMP_EFUSE,
.version_id = 1, .version_id = 1,
.minimum_version_id = 1, .minimum_version_id = 1,
.fields = (VMStateField[]) { .fields = (const VMStateField[]) {
VMSTATE_UINT32_ARRAY(regs, XlnxZynqMPEFuse, R_MAX), VMSTATE_UINT32_ARRAY(regs, XlnxZynqMPEFuse, R_MAX),
VMSTATE_END_OF_LIST(), VMSTATE_END_OF_LIST(),
} }