Message ID | 20231221031652.119827-66-richard.henderson@linaro.org |
---|---|
State | Superseded |
Headers | show |
Series | *: Constify VMState | expand |
On Thu, Dec 21, 2023 at 02:16:46PM +1100, Richard Henderson wrote: > Date: Thu, 21 Dec 2023 14:16:46 +1100 > From: Richard Henderson <richard.henderson@linaro.org> > Subject: [PATCH v2 65/71] cpu-target: Constify VMState > X-Mailer: git-send-email 2.34.1 > > Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- Reviewed-by: Zhao Liu <zhao1.liu@intel.com> > cpu-target.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/cpu-target.c b/cpu-target.c > index 508013e23d..430dc53566 100644 > --- a/cpu-target.c > +++ b/cpu-target.c > @@ -87,7 +87,7 @@ static const VMStateDescription vmstate_cpu_common_exception_index = { > .version_id = 1, > .minimum_version_id = 1, > .needed = cpu_common_exception_index_needed, > - .fields = (VMStateField[]) { > + .fields = (const VMStateField[]) { > VMSTATE_INT32(exception_index, CPUState), > VMSTATE_END_OF_LIST() > } > @@ -105,7 +105,7 @@ static const VMStateDescription vmstate_cpu_common_crash_occurred = { > .version_id = 1, > .minimum_version_id = 1, > .needed = cpu_common_crash_occurred_needed, > - .fields = (VMStateField[]) { > + .fields = (const VMStateField[]) { > VMSTATE_BOOL(crash_occurred, CPUState), > VMSTATE_END_OF_LIST() > } > @@ -117,12 +117,12 @@ const VMStateDescription vmstate_cpu_common = { > .minimum_version_id = 1, > .pre_load = cpu_common_pre_load, > .post_load = cpu_common_post_load, > - .fields = (VMStateField[]) { > + .fields = (const VMStateField[]) { > VMSTATE_UINT32(halted, CPUState), > VMSTATE_UINT32(interrupt_request, CPUState), > VMSTATE_END_OF_LIST() > }, > - .subsections = (const VMStateDescription*[]) { > + .subsections = (const VMStateDescription * const []) { > &vmstate_cpu_common_exception_index, > &vmstate_cpu_common_crash_occurred, > NULL > -- > 2.34.1 > >
diff --git a/cpu-target.c b/cpu-target.c index 508013e23d..430dc53566 100644 --- a/cpu-target.c +++ b/cpu-target.c @@ -87,7 +87,7 @@ static const VMStateDescription vmstate_cpu_common_exception_index = { .version_id = 1, .minimum_version_id = 1, .needed = cpu_common_exception_index_needed, - .fields = (VMStateField[]) { + .fields = (const VMStateField[]) { VMSTATE_INT32(exception_index, CPUState), VMSTATE_END_OF_LIST() } @@ -105,7 +105,7 @@ static const VMStateDescription vmstate_cpu_common_crash_occurred = { .version_id = 1, .minimum_version_id = 1, .needed = cpu_common_crash_occurred_needed, - .fields = (VMStateField[]) { + .fields = (const VMStateField[]) { VMSTATE_BOOL(crash_occurred, CPUState), VMSTATE_END_OF_LIST() } @@ -117,12 +117,12 @@ const VMStateDescription vmstate_cpu_common = { .minimum_version_id = 1, .pre_load = cpu_common_pre_load, .post_load = cpu_common_post_load, - .fields = (VMStateField[]) { + .fields = (const VMStateField[]) { VMSTATE_UINT32(halted, CPUState), VMSTATE_UINT32(interrupt_request, CPUState), VMSTATE_END_OF_LIST() }, - .subsections = (const VMStateDescription*[]) { + .subsections = (const VMStateDescription * const []) { &vmstate_cpu_common_exception_index, &vmstate_cpu_common_crash_occurred, NULL