[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-arm] [PATCH for-3.0 v2 3/5] target/arm: Add dummy needed funct
From: |
Juan Quintela |
Subject: |
Re: [Qemu-arm] [PATCH for-3.0 v2 3/5] target/arm: Add dummy needed functions to M profile vmstate subsections |
Date: |
Tue, 07 Aug 2018 16:40:17 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) |
Peter Maydell <address@hidden> wrote:
> Currently the migration code incorrectly treats a subsection with
> no .needed function pointer as if it was the subsection list
> terminator -- it is ignored and so is everything after it.
> Work around this by giving various M profile vmstate structs
> a 'needed' function that always returns true.
> We reuse m_needed() for this, since it's always true here.
>
> Signed-off-by: Peter Maydell <address@hidden>
> Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
> ---
> Not strictly a regression as it only affects M profile CPUs
> with the security extensions, and migration of those was
> broken anyway in 2.12 due to a different bug.
> ---
> target/arm/machine.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/target/arm/machine.c b/target/arm/machine.c
> index 2e28d086bdf..ff4ec22bf75 100644
> --- a/target/arm/machine.c
> +++ b/target/arm/machine.c
> @@ -184,6 +184,7 @@ static const VMStateDescription
> vmstate_m_faultmask_primask = {
> .name = "cpu/m/faultmask-primask",
> .version_id = 1,
> .minimum_version_id = 1,
> + .needed = m_needed,
> .fields = (VMStateField[]) {
> VMSTATE_UINT32(env.v7m.faultmask[M_REG_NS], ARMCPU),
> VMSTATE_UINT32(env.v7m.primask[M_REG_NS], ARMCPU),
> @@ -230,6 +231,7 @@ static const VMStateDescription vmstate_m_scr = {
> .name = "cpu/m/scr",
> .version_id = 1,
> .minimum_version_id = 1,
> + .needed = m_needed,
> .fields = (VMStateField[]) {
> VMSTATE_UINT32(env.v7m.scr[M_REG_NS], ARMCPU),
> VMSTATE_END_OF_LIST()
> @@ -240,6 +242,7 @@ static const VMStateDescription vmstate_m_other_sp = {
> .name = "cpu/m/other-sp",
> .version_id = 1,
> .minimum_version_id = 1,
> + .needed = m_needed,
> .fields = (VMStateField[]) {
> VMSTATE_UINT32(env.v7m.other_sp, ARMCPU),
> VMSTATE_END_OF_LIST()
But having 3 subsections with the same needed function ... we could have
a single subsection.
Later, Juan.
- [Qemu-arm] [PATCH for-3.0 v2 0/5] Arm migration fixes for 3.0, Peter Maydell, 2018/08/06
- [Qemu-arm] [PATCH for-3.0 v2 4/5] hw/intc/arm_gicv3_common: Move post_load hooks to top-level VMSD, Peter Maydell, 2018/08/06
- [Qemu-arm] [PATCH for-3.0 v2 2/5] hw/intc/arm_gicv3_common: Combine duplicate .subsections in vmstate_gicv3_cpu, Peter Maydell, 2018/08/06
- [Qemu-arm] [PATCH for-3.0 v2 1/5] hw/intc/arm_gicv3_common: Give no-migration-shift-bug subsection a needed function, Peter Maydell, 2018/08/06
- Re: [Qemu-arm] [Qemu-devel] [PATCH for-3.0 v2 0/5] Arm migration fixes for 3.0, Richard Henderson, 2018/08/06