Commit 15c38503 authored by Peter Xu's avatar Peter Xu Committed by Juan Quintela
Browse files

migration: move skip_section_footers



Move it into MigrationState, revert its meaning and renaming it to
send_section_footer, with a property bound to it. Same trick is played
like previous patches.

Removing savevm_skip_section_footers().

Reviewed-by: default avatarJuan Quintela <quintela@redhat.com>
Signed-off-by: default avatarPeter Xu <peterx@redhat.com>
Message-Id: <1498536619-14548-9-git-send-email-peterx@redhat.com>
Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
parent 71dd4c1a
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -314,7 +314,6 @@ static void pc_init1(MachineState *machine,
static void pc_compat_2_3(MachineState *machine)
{
    PCMachineState *pcms = PC_MACHINE(machine);
    savevm_skip_section_footers();
    if (kvm_enabled()) {
        pcms->smm = ON_OFF_AUTO_OFF;
    }
+0 −1
Original line number Diff line number Diff line
@@ -3580,7 +3580,6 @@ DEFINE_SPAPR_MACHINE(2_4, "2.4", false);
static void spapr_machine_2_3_instance_options(MachineState *machine)
{
    spapr_machine_2_4_instance_options(machine);
    savevm_skip_section_footers();
}

static void spapr_machine_2_3_class_options(MachineClass *mc)
+5 −3
Original line number Diff line number Diff line
@@ -138,9 +138,6 @@ static int xen_init(MachineState *ms)
        return -1;
    }
    qemu_add_vm_change_state_handler(xen_change_state_handler, NULL);

    savevm_skip_section_footers();

    return 0;
}

@@ -155,6 +152,11 @@ static GlobalProperty xen_compat_props[] = {
        .property = "send-configuration",
        .value = "off",
    },
    {
        .driver = "migration",
        .property = "send-section-footer",
        .value = "off",
    },
    { /* end of list */ },
};

+4 −0
Original line number Diff line number Diff line
@@ -185,6 +185,10 @@
        .driver   = "migration",\
        .property = "send-configuration",\
        .value    = "off",\
    },{\
        .driver   = "migration",\
        .property = "send-section-footer",\
        .value    = "off",\
    },{\
        .driver   = "migration",\
        .property = "store-global-state",\
+0 −1
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ int64_t self_announce_delay(int round)
/* migration/savevm.c */

void dump_vmstate_json_to_file(FILE *out_fp);
void savevm_skip_section_footers(void);

/* migration/migration.c */
void migration_object_init(void);
Loading