hw/isa: Constify VMState

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20231221031652.119827-38-richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2023-12-21 14:16:18 +11:00
parent 09c6ac6d8f
commit cbf195061c
6 changed files with 13 additions and 13 deletions

View File

@ -68,7 +68,7 @@ const VMStateDescription vmstate_apm = {
.name = "APM State", .name = "APM State",
.version_id = 1, .version_id = 1,
.minimum_version_id = 1, .minimum_version_id = 1,
.fields = (VMStateField[]) { .fields = (const VMStateField[]) {
VMSTATE_UINT8(apmc, APMState), VMSTATE_UINT8(apmc, APMState),
VMSTATE_UINT8(apms, APMState), VMSTATE_UINT8(apms, APMState),
VMSTATE_END_OF_LIST() VMSTATE_END_OF_LIST()

View File

@ -40,7 +40,7 @@ static const VMStateDescription vmstate_i82378 = {
.name = "pci-i82378", .name = "pci-i82378",
.version_id = 0, .version_id = 0,
.minimum_version_id = 0, .minimum_version_id = 0,
.fields = (VMStateField[]) { .fields = (const VMStateField[]) {
VMSTATE_PCI_DEVICE(parent_obj, I82378State), VMSTATE_PCI_DEVICE(parent_obj, I82378State),
VMSTATE_END_OF_LIST() VMSTATE_END_OF_LIST()
}, },

View File

@ -768,7 +768,7 @@ static const VMStateDescription vmstate_ich9_rst_cnt = {
.version_id = 1, .version_id = 1,
.minimum_version_id = 1, .minimum_version_id = 1,
.needed = ich9_rst_cnt_needed, .needed = ich9_rst_cnt_needed,
.fields = (VMStateField[]) { .fields = (const VMStateField[]) {
VMSTATE_UINT8(rst_cnt, ICH9LPCState), VMSTATE_UINT8(rst_cnt, ICH9LPCState),
VMSTATE_END_OF_LIST() VMSTATE_END_OF_LIST()
} }
@ -788,7 +788,7 @@ static const VMStateDescription vmstate_ich9_smi_feat = {
.version_id = 1, .version_id = 1,
.minimum_version_id = 1, .minimum_version_id = 1,
.needed = ich9_smi_feat_needed, .needed = ich9_smi_feat_needed,
.fields = (VMStateField[]) { .fields = (const VMStateField[]) {
VMSTATE_UINT8_ARRAY(smi_guest_features_le, ICH9LPCState, VMSTATE_UINT8_ARRAY(smi_guest_features_le, ICH9LPCState,
sizeof(uint64_t)), sizeof(uint64_t)),
VMSTATE_UINT8(smi_features_ok, ICH9LPCState), VMSTATE_UINT8(smi_features_ok, ICH9LPCState),
@ -802,7 +802,7 @@ static const VMStateDescription vmstate_ich9_lpc = {
.version_id = 1, .version_id = 1,
.minimum_version_id = 1, .minimum_version_id = 1,
.post_load = ich9_lpc_post_load, .post_load = ich9_lpc_post_load,
.fields = (VMStateField[]) { .fields = (const VMStateField[]) {
VMSTATE_PCI_DEVICE(d, ICH9LPCState), VMSTATE_PCI_DEVICE(d, ICH9LPCState),
VMSTATE_STRUCT(apm, ICH9LPCState, 0, vmstate_apm, APMState), VMSTATE_STRUCT(apm, ICH9LPCState, 0, vmstate_apm, APMState),
VMSTATE_STRUCT(pm, ICH9LPCState, 0, vmstate_ich9_pm, ICH9LPCPMRegs), VMSTATE_STRUCT(pm, ICH9LPCState, 0, vmstate_ich9_pm, ICH9LPCPMRegs),
@ -810,7 +810,7 @@ static const VMStateDescription vmstate_ich9_lpc = {
VMSTATE_UINT32(sci_level, ICH9LPCState), VMSTATE_UINT32(sci_level, ICH9LPCState),
VMSTATE_END_OF_LIST() VMSTATE_END_OF_LIST()
}, },
.subsections = (const VMStateDescription*[]) { .subsections = (const VMStateDescription * const []) {
&vmstate_ich9_rst_cnt, &vmstate_ich9_rst_cnt,
&vmstate_ich9_smi_feat, &vmstate_ich9_smi_feat,
NULL NULL

View File

@ -319,7 +319,7 @@ static const VMStateDescription vmstate_pc87312 = {
.version_id = 1, .version_id = 1,
.minimum_version_id = 1, .minimum_version_id = 1,
.post_load = pc87312_post_load, .post_load = pc87312_post_load,
.fields = (VMStateField[]) { .fields = (const VMStateField[]) {
VMSTATE_UINT8(read_id_step, PC87312State), VMSTATE_UINT8(read_id_step, PC87312State),
VMSTATE_UINT8(selected_index, PC87312State), VMSTATE_UINT8(selected_index, PC87312State),
VMSTATE_UINT8_ARRAY(regs, PC87312State, 3), VMSTATE_UINT8_ARRAY(regs, PC87312State, 3),

View File

@ -230,7 +230,7 @@ static const VMStateDescription vmstate_piix3_rcr = {
.version_id = 1, .version_id = 1,
.minimum_version_id = 1, .minimum_version_id = 1,
.needed = piix3_rcr_needed, .needed = piix3_rcr_needed,
.fields = (VMStateField[]) { .fields = (const VMStateField[]) {
VMSTATE_UINT8(rcr, PIIXState), VMSTATE_UINT8(rcr, PIIXState),
VMSTATE_END_OF_LIST() VMSTATE_END_OF_LIST()
} }
@ -242,13 +242,13 @@ static const VMStateDescription vmstate_piix3 = {
.minimum_version_id = 2, .minimum_version_id = 2,
.post_load = piix_post_load, .post_load = piix_post_load,
.pre_save = piix3_pre_save, .pre_save = piix3_pre_save,
.fields = (VMStateField[]) { .fields = (const VMStateField[]) {
VMSTATE_PCI_DEVICE(dev, PIIXState), VMSTATE_PCI_DEVICE(dev, PIIXState),
VMSTATE_INT32_ARRAY_V(pci_irq_levels_vmstate, PIIXState, VMSTATE_INT32_ARRAY_V(pci_irq_levels_vmstate, PIIXState,
PIIX_NUM_PIRQS, 3), PIIX_NUM_PIRQS, 3),
VMSTATE_END_OF_LIST() VMSTATE_END_OF_LIST()
}, },
.subsections = (const VMStateDescription*[]) { .subsections = (const VMStateDescription * const []) {
&vmstate_piix3_rcr, &vmstate_piix3_rcr,
NULL NULL
} }
@ -259,7 +259,7 @@ static const VMStateDescription vmstate_piix4 = {
.version_id = 3, .version_id = 3,
.minimum_version_id = 2, .minimum_version_id = 2,
.post_load = piix4_post_load, .post_load = piix4_post_load,
.fields = (VMStateField[]) { .fields = (const VMStateField[]) {
VMSTATE_PCI_DEVICE(dev, PIIXState), VMSTATE_PCI_DEVICE(dev, PIIXState),
VMSTATE_UINT8_V(rcr, PIIXState, 3), VMSTATE_UINT8_V(rcr, PIIXState, 3),
VMSTATE_END_OF_LIST() VMSTATE_END_OF_LIST()

View File

@ -82,7 +82,7 @@ static const VMStateDescription vmstate_acpi = {
.version_id = 1, .version_id = 1,
.minimum_version_id = 1, .minimum_version_id = 1,
.post_load = vmstate_acpi_post_load, .post_load = vmstate_acpi_post_load,
.fields = (VMStateField[]) { .fields = (const VMStateField[]) {
VMSTATE_PCI_DEVICE(dev, ViaPMState), VMSTATE_PCI_DEVICE(dev, ViaPMState),
VMSTATE_UINT16(ar.pm1.evt.sts, ViaPMState), VMSTATE_UINT16(ar.pm1.evt.sts, ViaPMState),
VMSTATE_UINT16(ar.pm1.evt.en, ViaPMState), VMSTATE_UINT16(ar.pm1.evt.en, ViaPMState),
@ -563,7 +563,7 @@ static const VMStateDescription vmstate_via = {
.name = "via-isa", .name = "via-isa",
.version_id = 1, .version_id = 1,
.minimum_version_id = 1, .minimum_version_id = 1,
.fields = (VMStateField[]) { .fields = (const VMStateField[]) {
VMSTATE_PCI_DEVICE(dev, ViaISAState), VMSTATE_PCI_DEVICE(dev, ViaISAState),
VMSTATE_END_OF_LIST() VMSTATE_END_OF_LIST()
} }