diff options
| author | Peter Xu <peterx@redhat.com> | 2017-06-27 12:10:16 +0800 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2017-06-28 11:18:38 +0200 |
| commit | 71dd4c1a5672cafe9fb89abc83fe2a962f39ec42 (patch) | |
| tree | 0111227c041d0addee3baae9092c69af4d34a7ab /hw | |
| parent | 3df663e575f1876d7f3bc684f80e72fca0703d39 (diff) | |
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: Juan Quintela <quintela@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
Message-Id: <1498536619-14548-8-git-send-email-peterx@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/i386/pc_piix.c | 1 | ||||
| -rw-r--r-- | hw/ppc/spapr.c | 1 | ||||
| -rw-r--r-- | hw/xen/xen-common.c | 6 |
3 files changed, 5 insertions, 3 deletions
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 3b512974fd..488fc0a7c0 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -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) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index f07d40a1f8..84291877ef 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -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) diff --git a/hw/xen/xen-common.c b/hw/xen/xen-common.c index 459e6ab765..1f3688d2ff 100644 --- a/hw/xen/xen-common.c +++ b/hw/xen/xen-common.c @@ -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 */ }, }; |