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