mirror of https://github.com/xemu-project/xemu.git
migration: move global_state.optional out
Put it into MigrationState then we can use the properties to specify whether to enable storing global state. Removing global_state_set_optional() since now we can use HW_COMPAT_2_3 for x86/power, and AccelClass.global_props for Xen. Reviewed-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Peter Xu <peterx@redhat.com> Message-Id: <1498536619-14548-6-git-send-email-peterx@redhat.com> Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
parent
e5cb7e7677
commit
5272298c48
|
@ -318,7 +318,6 @@ static void pc_compat_2_3(MachineState *machine)
|
||||||
if (kvm_enabled()) {
|
if (kvm_enabled()) {
|
||||||
pcms->smm = ON_OFF_AUTO_OFF;
|
pcms->smm = ON_OFF_AUTO_OFF;
|
||||||
}
|
}
|
||||||
global_state_set_optional();
|
|
||||||
savevm_skip_configuration();
|
savevm_skip_configuration();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -3581,7 +3581,6 @@ static void spapr_machine_2_3_instance_options(MachineState *machine)
|
||||||
{
|
{
|
||||||
spapr_machine_2_4_instance_options(machine);
|
spapr_machine_2_4_instance_options(machine);
|
||||||
savevm_skip_section_footers();
|
savevm_skip_section_footers();
|
||||||
global_state_set_optional();
|
|
||||||
savevm_skip_configuration();
|
savevm_skip_configuration();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -139,19 +139,28 @@ static int xen_init(MachineState *ms)
|
||||||
}
|
}
|
||||||
qemu_add_vm_change_state_handler(xen_change_state_handler, NULL);
|
qemu_add_vm_change_state_handler(xen_change_state_handler, NULL);
|
||||||
|
|
||||||
global_state_set_optional();
|
|
||||||
savevm_skip_configuration();
|
savevm_skip_configuration();
|
||||||
savevm_skip_section_footers();
|
savevm_skip_section_footers();
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static GlobalProperty xen_compat_props[] = {
|
||||||
|
{
|
||||||
|
.driver = "migration",
|
||||||
|
.property = "store-global-state",
|
||||||
|
.value = "off",
|
||||||
|
},
|
||||||
|
{ /* end of list */ },
|
||||||
|
};
|
||||||
|
|
||||||
static void xen_accel_class_init(ObjectClass *oc, void *data)
|
static void xen_accel_class_init(ObjectClass *oc, void *data)
|
||||||
{
|
{
|
||||||
AccelClass *ac = ACCEL_CLASS(oc);
|
AccelClass *ac = ACCEL_CLASS(oc);
|
||||||
ac->name = "Xen";
|
ac->name = "Xen";
|
||||||
ac->init_machine = xen_init;
|
ac->init_machine = xen_init;
|
||||||
ac->allowed = &xen_allowed;
|
ac->allowed = &xen_allowed;
|
||||||
|
ac->global_props = xen_compat_props;
|
||||||
}
|
}
|
||||||
|
|
||||||
#define TYPE_XEN_ACCEL ACCEL_CLASS_NAME("xen")
|
#define TYPE_XEN_ACCEL ACCEL_CLASS_NAME("xen")
|
||||||
|
|
|
@ -181,6 +181,10 @@
|
||||||
.driver = TYPE_PCI_DEVICE,\
|
.driver = TYPE_PCI_DEVICE,\
|
||||||
.property = "x-pcie-lnksta-dllla",\
|
.property = "x-pcie-lnksta-dllla",\
|
||||||
.value = "off",\
|
.value = "off",\
|
||||||
|
},{\
|
||||||
|
.driver = "migration",\
|
||||||
|
.property = "store-global-state",\
|
||||||
|
.value = "off",\
|
||||||
},
|
},
|
||||||
|
|
||||||
#define HW_COMPAT_2_2 \
|
#define HW_COMPAT_2_2 \
|
||||||
|
|
|
@ -16,7 +16,6 @@
|
||||||
#include "sysemu/sysemu.h"
|
#include "sysemu/sysemu.h"
|
||||||
|
|
||||||
void register_global_state(void);
|
void register_global_state(void);
|
||||||
void global_state_set_optional(void);
|
|
||||||
int global_state_store(void);
|
int global_state_store(void);
|
||||||
void global_state_store_running(void);
|
void global_state_store_running(void);
|
||||||
bool global_state_received(void);
|
bool global_state_received(void);
|
||||||
|
|
|
@ -15,12 +15,12 @@
|
||||||
#include "qemu/error-report.h"
|
#include "qemu/error-report.h"
|
||||||
#include "qapi/error.h"
|
#include "qapi/error.h"
|
||||||
#include "qapi/util.h"
|
#include "qapi/util.h"
|
||||||
|
#include "migration.h"
|
||||||
#include "migration/global_state.h"
|
#include "migration/global_state.h"
|
||||||
#include "migration/vmstate.h"
|
#include "migration/vmstate.h"
|
||||||
#include "trace.h"
|
#include "trace.h"
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
bool optional;
|
|
||||||
uint32_t size;
|
uint32_t size;
|
||||||
uint8_t runstate[100];
|
uint8_t runstate[100];
|
||||||
RunState state;
|
RunState state;
|
||||||
|
@ -57,11 +57,6 @@ RunState global_state_get_runstate(void)
|
||||||
return global_state.state;
|
return global_state.state;
|
||||||
}
|
}
|
||||||
|
|
||||||
void global_state_set_optional(void)
|
|
||||||
{
|
|
||||||
global_state.optional = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
static bool global_state_needed(void *opaque)
|
static bool global_state_needed(void *opaque)
|
||||||
{
|
{
|
||||||
GlobalState *s = opaque;
|
GlobalState *s = opaque;
|
||||||
|
@ -69,7 +64,7 @@ static bool global_state_needed(void *opaque)
|
||||||
|
|
||||||
/* If it is not optional, it is mandatory */
|
/* If it is not optional, it is mandatory */
|
||||||
|
|
||||||
if (s->optional == false) {
|
if (migrate_get_current()->store_global_state) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1976,11 +1976,18 @@ void migrate_fd_connect(MigrationState *s)
|
||||||
s->migration_thread_running = true;
|
s->migration_thread_running = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static Property migration_properties[] = {
|
||||||
|
DEFINE_PROP_BOOL("store-global-state", MigrationState,
|
||||||
|
store_global_state, true),
|
||||||
|
DEFINE_PROP_END_OF_LIST(),
|
||||||
|
};
|
||||||
|
|
||||||
static void migration_class_init(ObjectClass *klass, void *data)
|
static void migration_class_init(ObjectClass *klass, void *data)
|
||||||
{
|
{
|
||||||
DeviceClass *dc = DEVICE_CLASS(klass);
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
||||||
|
|
||||||
dc->user_creatable = false;
|
dc->user_creatable = false;
|
||||||
|
dc->props = migration_properties;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void migration_instance_init(Object *obj)
|
static void migration_instance_init(Object *obj)
|
||||||
|
|
|
@ -133,6 +133,12 @@ struct MigrationState
|
||||||
/* Do we have to clean up -b/-i from old migrate parameters */
|
/* Do we have to clean up -b/-i from old migrate parameters */
|
||||||
/* This feature is deprecated and will be removed */
|
/* This feature is deprecated and will be removed */
|
||||||
bool must_remove_block_options;
|
bool must_remove_block_options;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Global switch on whether we need to store the global state
|
||||||
|
* during migration.
|
||||||
|
*/
|
||||||
|
bool store_global_state;
|
||||||
};
|
};
|
||||||
|
|
||||||
void migrate_set_state(int *state, int old_state, int new_state);
|
void migrate_set_state(int *state, int old_state, int new_state);
|
||||||
|
|
Loading…
Reference in New Issue