Commit 3aff6c2f authored by Juan Quintela's avatar Juan Quintela
Browse files

savevm: Remove all the unneeded version_minimum_id_old (ppc) 



After previous Peter patch, they are redundant.  This way we don't
assign them except when needed.  Once there, there were lots of case
where the ".fields" indentation was wrong:

     .fields = (VMStateField []) {
and
     .fields =      (VMStateField []) {

Change all the combinations to:

     .fields = (VMStateField[]){

The biggest problem (appart from aesthetics) was that checkpatch complained
when we copy&pasted the code from one place to another.

Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
Acked-by: default avatarAlexey Kardashevskiy <aik@ozlabs.ru>
parent 06a59afa

hw/char/escc.c

+2 −4
Original line number Diff line number Diff line
@@ -660,7 +660,6 @@ static const VMStateDescription vmstate_escc_chn = { 
    .name ="escc_chn",

    .version_id = 2,

    .minimum_version_id = 1,

    .minimum_version_id_old = 1,

    .fields = (VMStateField[]) {

        VMSTATE_UINT32(vmstate_dummy, ChannelState),

        VMSTATE_UINT32(reg, ChannelState),
@@ -680,7 +679,6 @@ static const VMStateDescription vmstate_escc = { 
    .name ="escc",

    .version_id = 2,

    .minimum_version_id = 1,

    .minimum_version_id_old = 1,

    .fields = (VMStateField[]) {

        VMSTATE_STRUCT_ARRAY(chn, ESCCState, 2, 2, vmstate_escc_chn,

                             ChannelState),

hw/char/spapr_vty.c

+1 −2
Original line number Diff line number Diff line
@@ -148,7 +148,6 @@ static const VMStateDescription vmstate_spapr_vty = { 
    .name = "spapr_vty",

    .version_id = 1,

    .minimum_version_id = 1,

    .minimum_version_id_old = 1,

    .fields = (VMStateField[]) {

        VMSTATE_SPAPR_VIO(sdev, VIOsPAPRVTYDevice),

hw/intc/heathrow_pic.c

+2 −4
Original line number Diff line number Diff line
@@ -159,7 +159,6 @@ static const VMStateDescription vmstate_heathrow_pic_one = { 
    .name = "heathrow_pic_one",

    .version_id = 0,

    .minimum_version_id = 0,

    .minimum_version_id_old = 0,

    .fields = (VMStateField[]) {

        VMSTATE_UINT32(events, HeathrowPIC),

        VMSTATE_UINT32(mask, HeathrowPIC),
@@ -173,7 +172,6 @@ static const VMStateDescription vmstate_heathrow_pic = { 
    .name = "heathrow_pic",

    .version_id = 1,

    .minimum_version_id = 1,

    .minimum_version_id_old = 1,

    .fields = (VMStateField[]) {

        VMSTATE_STRUCT_ARRAY(pics, HeathrowPICS, 2, 1,

                             vmstate_heathrow_pic_one, HeathrowPIC),

hw/intc/xics.c

+3 −6
Original line number Diff line number Diff line
@@ -330,7 +330,6 @@ static const VMStateDescription vmstate_icp_server = { 
    .name = "icp/server",

    .version_id = 1,

    .minimum_version_id = 1,

    .minimum_version_id_old = 1,

    .pre_save = icp_dispatch_pre_save,

    .post_load = icp_dispatch_post_load,

    .fields = (VMStateField[]) {
@@ -566,7 +565,6 @@ static const VMStateDescription vmstate_ics_irq = { 
    .name = "ics/irq",

    .version_id = 1,

    .minimum_version_id = 1,

    .minimum_version_id_old = 1,

    .fields = (VMStateField[]) {

        VMSTATE_UINT32(server, ICSIRQState),

        VMSTATE_UINT8(priority, ICSIRQState),
@@ -580,7 +578,6 @@ static const VMStateDescription vmstate_ics = { 
    .name = "ics",

    .version_id = 1,

    .minimum_version_id = 1,

    .minimum_version_id_old = 1,

    .pre_save = ics_dispatch_pre_save,

    .post_load = ics_dispatch_post_load,

    .fields = (VMStateField[]) {

hw/net/spapr_llan.c

+1 −2
Original line number Diff line number Diff line
@@ -509,7 +509,6 @@ static const VMStateDescription vmstate_spapr_llan = { 
    .name = "spapr_llan",

    .version_id = 1,

    .minimum_version_id = 1,

    .minimum_version_id_old = 1,

    .fields = (VMStateField[]) {

        VMSTATE_SPAPR_VIO(sdev, VIOsPAPRVLANDevice),

        /* LLAN state */