Commit 5cd8cada authored by Juan Quintela's avatar Juan Quintela
Browse files

migration: Use normal VMStateDescriptions for Subsections 



We create optional sections with this patch.  But we already have
optional subsections.  Instead of having two mechanism that do the
same, we can just generalize it.

For subsections we just change:

- Add a needed function to VMStateDescription
- Remove VMStateSubsection (after removal of the needed function
  it is just a VMStateDescription)
- Adjust the whole tree, moving the needed function to the corresponding
  VMStateDescription

Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
parent 0163a2e0

cpus.c

+4 −7
Original line number Diff line number Diff line
@@ -480,6 +480,7 @@ static const VMStateDescription icount_vmstate_timers = { 
    .name = "timer/icount",

    .version_id = 1,

    .minimum_version_id = 1,

    .needed = icount_state_needed,

    .fields = (VMStateField[]) {

        VMSTATE_INT64(qemu_icount_bias, TimersState),

        VMSTATE_INT64(qemu_icount, TimersState),
@@ -497,13 +498,9 @@ static const VMStateDescription vmstate_timers = { 
        VMSTATE_INT64_V(cpu_clock_offset, TimersState, 2),

        VMSTATE_END_OF_LIST()

    },

    .subsections = (VMStateSubsection[]) {

        {

            .vmsd = &icount_vmstate_timers,

            .needed = icount_state_needed,

        }, {

            /* empty */

        }

    .subsections = (const VMStateDescription*[]) {

        &icount_vmstate_timers,

        NULL

    }

};

docs/migration.txt

+4 −7
Original line number Diff line number Diff line
@@ -257,6 +257,7 @@ const VMStateDescription vmstate_ide_drive_pio_state = { 
    .minimum_version_id = 1,

    .pre_save = ide_drive_pio_pre_save,

    .post_load = ide_drive_pio_post_load,

    .needed = ide_drive_pio_state_needed,

    .fields = (VMStateField[]) {

        VMSTATE_INT32(req_nb_sectors, IDEState),

        VMSTATE_VARRAY_INT32(io_buffer, IDEState, io_buffer_total_len, 1,
@@ -279,13 +280,9 @@ const VMStateDescription vmstate_ide_drive = { 
        .... several fields ....

        VMSTATE_END_OF_LIST()

    },

    .subsections = (VMStateSubsection []) {

        {

            .vmsd = &vmstate_ide_drive_pio_state,

            .needed = ide_drive_pio_state_needed,

        }, {

            /* empty */

        }

    .subsections = (const VMStateDescription*[]) {

        &vmstate_ide_drive_pio_state,

        NULL

    }

};

exec.c

+4 −7
Original line number Diff line number Diff line
@@ -454,6 +454,7 @@ static const VMStateDescription vmstate_cpu_common_exception_index = { 
    .name = "cpu_common/exception_index",

    .version_id = 1,

    .minimum_version_id = 1,

    .needed = cpu_common_exception_index_needed,

    .fields = (VMStateField[]) {

        VMSTATE_INT32(exception_index, CPUState),

        VMSTATE_END_OF_LIST()
@@ -471,13 +472,9 @@ const VMStateDescription vmstate_cpu_common = { 
        VMSTATE_UINT32(interrupt_request, CPUState),

        VMSTATE_END_OF_LIST()

    },

    .subsections = (VMStateSubsection[]) {

        {

            .vmsd = &vmstate_cpu_common_exception_index,

            .needed = cpu_common_exception_index_needed,

        } , {

            /* empty */

        }

    .subsections = (const VMStateDescription*[]) {

        &vmstate_cpu_common_exception_index,

        NULL

    }

};

hw/acpi/ich9.c

+4 −6
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ static const VMStateDescription vmstate_memhp_state = { 
    .version_id = 1,

    .minimum_version_id = 1,

    .minimum_version_id_old = 1,

    .needed = vmstate_test_use_memhp,

    .fields      = (VMStateField[]) {

        VMSTATE_MEMORY_HOTPLUG(acpi_memory_hotplug, ICH9LPCPMRegs),

        VMSTATE_END_OF_LIST()
@@ -175,12 +176,9 @@ const VMStateDescription vmstate_ich9_pm = { 
        VMSTATE_UINT32(smi_sts, ICH9LPCPMRegs),

        VMSTATE_END_OF_LIST()

    },

    .subsections = (VMStateSubsection[]) {

        {

            .vmsd = &vmstate_memhp_state,

            .needed = vmstate_test_use_memhp,

        },

        VMSTATE_END_OF_LIST()

    .subsections = (const VMStateDescription*[]) {

        &vmstate_memhp_state,

        NULL

    }

};

hw/acpi/piix4.c

+4 −6
Original line number Diff line number Diff line
@@ -260,6 +260,7 @@ static const VMStateDescription vmstate_memhp_state = { 
    .version_id = 1,

    .minimum_version_id = 1,

    .minimum_version_id_old = 1,

    .needed = vmstate_test_use_memhp,

    .fields      = (VMStateField[]) {

        VMSTATE_MEMORY_HOTPLUG(acpi_memory_hotplug, PIIX4PMState),

        VMSTATE_END_OF_LIST()
@@ -298,12 +299,9 @@ static const VMStateDescription vmstate_acpi = { 
                            vmstate_test_use_acpi_pci_hotplug),

        VMSTATE_END_OF_LIST()

    },

    .subsections = (VMStateSubsection[]) {

        {

            .vmsd = &vmstate_memhp_state,

            .needed = vmstate_test_use_memhp,

        },

        VMSTATE_END_OF_LIST()

    .subsections = (const VMStateDescription*[]) {

         &vmstate_memhp_state,

         NULL

    }

};