[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 10/13] migration: move global_state.optional out
From: |
Peter Xu |
Subject: |
[Qemu-devel] [PATCH v3 10/13] migration: move global_state.optional out |
Date: |
Mon, 19 Jun 2017 20:49:45 +0800 |
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 accel_register_prop() for xen_init().
Signed-off-by: Peter Xu <address@hidden>
---
hw/i386/pc_piix.c | 1 -
hw/ppc/spapr.c | 1 -
hw/xen/xen-common.c | 5 ++++-
include/hw/compat.h | 4 ++++
include/migration/global_state.h | 1 -
migration/global_state.c | 9 ++-------
migration/migration.c | 7 +++++++
migration/migration.h | 6 ++++++
8 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index d1d8979..b662618 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -326,7 +326,6 @@ static void pc_compat_2_3(MachineState *machine)
if (kvm_enabled()) {
pcms->smm = ON_OFF_AUTO_OFF;
}
- global_state_set_optional();
savevm_skip_configuration();
}
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index e877d45..edbdbfd 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -3580,7 +3580,6 @@ static void
spapr_machine_2_3_instance_options(MachineState *machine)
{
spapr_machine_2_4_instance_options(machine);
savevm_skip_section_footers();
- global_state_set_optional();
savevm_skip_configuration();
}
diff --git a/hw/xen/xen-common.c b/hw/xen/xen-common.c
index d3fa705..186808b 100644
--- a/hw/xen/xen-common.c
+++ b/hw/xen/xen-common.c
@@ -10,6 +10,7 @@
#include "qemu/osdep.h"
#include "hw/xen/xen_backend.h"
+#include "hw/boards.h"
#include "qmp-commands.h"
#include "chardev/char.h"
#include "sysemu/accel.h"
@@ -119,6 +120,8 @@ static void xen_change_state_handler(void *opaque, int
running,
static int xen_init(MachineState *ms)
{
+ AccelState *accel = ms->accelerator;
+
xen_xc = xc_interface_open(0, 0, 0);
if (xen_xc == NULL) {
xen_pv_printf(NULL, 0, "can't open xen interface\n");
@@ -139,7 +142,7 @@ static int xen_init(MachineState *ms)
}
qemu_add_vm_change_state_handler(xen_change_state_handler, NULL);
- global_state_set_optional();
+ accel_register_prop(accel, "migration", "store-global-state", "off");
savevm_skip_configuration();
savevm_skip_section_footers();
diff --git a/include/hw/compat.h b/include/hw/compat.h
index 26cd585..a506a74 100644
--- a/include/hw/compat.h
+++ b/include/hw/compat.h
@@ -181,6 +181,10 @@
.driver = TYPE_PCI_DEVICE,\
.property = "x-pcie-lnksta-dllla",\
.value = "off",\
+ },{\
+ .driver = "migration",\
+ .property = "store-global-state",\
+ .value = "off",\
},
#define HW_COMPAT_2_2 \
diff --git a/include/migration/global_state.h b/include/migration/global_state.h
index 90faea7..d307de8 100644
--- a/include/migration/global_state.h
+++ b/include/migration/global_state.h
@@ -16,7 +16,6 @@
#include "sysemu/sysemu.h"
void register_global_state(void);
-void global_state_set_optional(void);
int global_state_store(void);
void global_state_store_running(void);
bool global_state_received(void);
diff --git a/migration/global_state.c b/migration/global_state.c
index f792cf5..dcbbcb2 100644
--- a/migration/global_state.c
+++ b/migration/global_state.c
@@ -15,12 +15,12 @@
#include "qemu/error-report.h"
#include "qapi/error.h"
#include "qapi/util.h"
+#include "migration.h"
#include "migration/global_state.h"
#include "migration/vmstate.h"
#include "trace.h"
typedef struct {
- bool optional;
uint32_t size;
uint8_t runstate[100];
RunState state;
@@ -57,11 +57,6 @@ RunState global_state_get_runstate(void)
return global_state.state;
}
-void global_state_set_optional(void)
-{
- global_state.optional = true;
-}
-
static bool global_state_needed(void *opaque)
{
GlobalState *s = opaque;
@@ -69,7 +64,7 @@ static bool global_state_needed(void *opaque)
/* If it is not optional, it is mandatory */
- if (s->optional == false) {
+ if (migrate_get_current()->store_global_state) {
return true;
}
diff --git a/migration/migration.c b/migration/migration.c
index 4ba1212..095abd8 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1976,11 +1976,18 @@ void migrate_fd_connect(MigrationState *s)
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)
{
DeviceClass *dc = DEVICE_CLASS(klass);
dc->user_creatable = false;
+ dc->props = migration_properties;
}
static void migration_instance_init(Object *obj)
diff --git a/migration/migration.h b/migration/migration.h
index 3fca364..4b898e9 100644
--- a/migration/migration.h
+++ b/migration/migration.h
@@ -133,6 +133,12 @@ struct MigrationState
/* Do we have to clean up -b/-i from old migrate parameters */
/* This feature is deprecated and will be removed */
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);
--
2.7.4
- Re: [Qemu-devel] [PATCH v3 04/13] accel: introduce AccelState.global_props, (continued)
[Qemu-devel] [PATCH v3 07/13] tcg: use AccelState.global_props, Peter Xu, 2017/06/19
[Qemu-devel] [PATCH v3 08/13] trace: add qdev_global_prop_apply, Peter Xu, 2017/06/19
[Qemu-devel] [PATCH v3 09/13] migration: let MigrationState be a qdev, Peter Xu, 2017/06/19
[Qemu-devel] [PATCH v3 10/13] migration: move global_state.optional out,
Peter Xu <=
[Qemu-devel] [PATCH v3 11/13] migration: move only_migratable to MigrationState, Peter Xu, 2017/06/19
[Qemu-devel] [PATCH v3 12/13] migration: move skip_configuration out, Peter Xu, 2017/06/19
[Qemu-devel] [PATCH v3 13/13] migration: move skip_section_footers, Peter Xu, 2017/06/19