Commit 71dd4c1a authored by Peter Xu's avatar Peter Xu Committed by Juan Quintela
Browse files

migration: move skip_configuration out 



It was in SaveState but now moved to MigrationState altogether, reverted
its meaning, then renamed to "send_configuration". Again, using
HW_COMPAT_2_3 for old PC/SPAPR machines, and accel_register_prop() for
xen_init().

Removing savevm_skip_configuration().

Reviewed-by: default avatarJuan Quintela <quintela@redhat.com>
Signed-off-by: default avatarPeter Xu <peterx@redhat.com>
Message-Id: <1498536619-14548-8-git-send-email-peterx@redhat.com>
Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
parent 3df663e5

hw/i386/pc_piix.c

+0 −1
Original line number Diff line number Diff line
@@ -318,7 +318,6 @@ static void pc_compat_2_3(MachineState *machine) 
    if (kvm_enabled()) {

        pcms->smm = ON_OFF_AUTO_OFF;

    }

    savevm_skip_configuration();

}



static void pc_compat_2_2(MachineState *machine)

hw/ppc/spapr.c

+0 −1
Original line number Diff line number Diff line
@@ -3581,7 +3581,6 @@ static void spapr_machine_2_3_instance_options(MachineState *machine) 
{

    spapr_machine_2_4_instance_options(machine);

    savevm_skip_section_footers();

    savevm_skip_configuration();

}



static void spapr_machine_2_3_class_options(MachineClass *mc)

hw/xen/xen-common.c

+5 −1
Original line number Diff line number Diff line
@@ -139,7 +139,6 @@ static int xen_init(MachineState *ms) 
    }

    qemu_add_vm_change_state_handler(xen_change_state_handler, NULL);



    savevm_skip_configuration();

    savevm_skip_section_footers();



    return 0;
@@ -151,6 +150,11 @@ static GlobalProperty xen_compat_props[] = { 
        .property = "store-global-state",

        .value = "off",

    },

    {

        .driver = "migration",

        .property = "send-configuration",

        .value = "off",

    },

    { /* end of list */ },

};

include/hw/compat.h

+4 −0
Original line number Diff line number Diff line
@@ -181,6 +181,10 @@ 
        .driver   = TYPE_PCI_DEVICE,\

        .property = "x-pcie-lnksta-dllla",\

        .value    = "off",\

    },{\

        .driver   = "migration",\

        .property = "send-configuration",\

        .value    = "off",\

    },{\

        .driver   = "migration",\

        .property = "store-global-state",\

include/migration/misc.h

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ int64_t self_announce_delay(int round) 


void dump_vmstate_json_to_file(FILE *out_fp);

void savevm_skip_section_footers(void);

void savevm_skip_configuration(void);



/* migration/migration.c */

void migration_object_init(void);