[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH v4 27/28] COLO: Implement shutdown checkpoint
From: |
zhanghailiang |
Subject: |
[Qemu-devel] [RFC PATCH v4 27/28] COLO: Implement shutdown checkpoint |
Date: |
Thu, 26 Mar 2015 13:29:33 +0800 |
For SVM, we forbid it shutdown directly when in COLO mode,
FOR PVM's shutdown, we should do some work to ensure the consistent action
between PVM and SVM.
Signed-off-by: zhanghailiang <address@hidden>
Signed-off-by: Lai Jiangshan <address@hidden>
Signed-off-by: Li Zhijian <address@hidden>
---
include/migration/migration-colo.h | 1 +
include/sysemu/sysemu.h | 3 +++
migration/colo-comm.c | 5 +++++
migration/colo.c | 19 +++++++++++++++++++
vl.c | 23 +++++++++++++++++++++--
5 files changed, 49 insertions(+), 2 deletions(-)
diff --git a/include/migration/migration-colo.h
b/include/migration/migration-colo.h
index 7e8fe46..e8628f7 100644
--- a/include/migration/migration-colo.h
+++ b/include/migration/migration-colo.h
@@ -44,6 +44,7 @@ void loadvm_exit_colo(void);
void *colo_process_incoming_checkpoints(void *opaque);
bool loadvm_in_colo_state(void);
+bool vm_in_colo_state(void);
int get_colo_mode(void);
/* ram cache */
diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
index 8a52934..8b37bd2 100644
--- a/include/sysemu/sysemu.h
+++ b/include/sysemu/sysemu.h
@@ -51,6 +51,8 @@ typedef enum WakeupReason {
QEMU_WAKEUP_REASON_OTHER,
} WakeupReason;
+extern int colo_shutdown_requested;
+
void qemu_system_reset_request(void);
void qemu_system_suspend_request(void);
void qemu_register_suspend_notifier(Notifier *notifier);
@@ -58,6 +60,7 @@ void qemu_system_wakeup_request(WakeupReason reason);
void qemu_system_wakeup_enable(WakeupReason reason, bool enabled);
void qemu_register_wakeup_notifier(Notifier *notifier);
void qemu_system_shutdown_request(void);
+void qemu_system_shutdown_request_core(void);
void qemu_system_powerdown_request(void);
void qemu_register_powerdown_notifier(Notifier *notifier);
void qemu_system_debug_request(void);
diff --git a/migration/colo-comm.c b/migration/colo-comm.c
index c3dd617..ee92bb2 100644
--- a/migration/colo-comm.c
+++ b/migration/colo-comm.c
@@ -31,6 +31,11 @@ static void colo_info_save(QEMUFile *f, void *opaque)
}
/* restore */
+bool vm_in_colo_state(void)
+{
+ return migrate_in_colo_state() || loadvm_in_colo_state();
+}
+
int get_colo_mode(void)
{
if (migrate_in_colo_state()) {
diff --git a/migration/colo.c b/migration/colo.c
index 7d57121..894bf5f 100644
--- a/migration/colo.c
+++ b/migration/colo.c
@@ -75,6 +75,8 @@ enum {
COLO_CHECKPOINT_SEND,
COLO_CHECKPOINT_RECEIVED,
COLO_CHECKPOINT_LOADED,
+
+ COLO_GUEST_SHUTDOWN
};
static QEMUBH *colo_bh;
@@ -308,6 +310,13 @@ static int colo_do_checkpoint_transaction(MigrationState
*s, QEMUFile *control)
}
DPRINTF("got COLO_CHECKPOINT_LOADED\n");
+ if (colo_shutdown_requested) {
+ colo_ctl_put(s->file, COLO_GUEST_SHUTDOWN);
+ qemu_fflush(s->file);
+ colo_shutdown_requested = 0;
+ qemu_system_shutdown_request_core();
+ }
+
ret = 0;
/* resume master */
qemu_mutex_lock_iothread();
@@ -483,6 +492,16 @@ static int colo_wait_handle_cmd(QEMUFile *f, int
*checkpoint_request)
case COLO_CHECKPOINT_NEW:
*checkpoint_request = 1;
return 0;
+ case COLO_GUEST_SHUTDOWN:
+ qemu_mutex_lock_iothread();
+ qemu_system_shutdown_request_core();
+ qemu_mutex_unlock_iothread();
+ /* the main thread will exit and termiante the whole
+ * process, do we need some cleanup?
+ */
+ for (;;) {
+ ;
+ }
default:
return -1;
}
diff --git a/vl.c b/vl.c
index 8c07244..b0f3237 100644
--- a/vl.c
+++ b/vl.c
@@ -1532,6 +1532,8 @@ static NotifierList wakeup_notifiers =
NOTIFIER_LIST_INITIALIZER(wakeup_notifiers);
static uint32_t wakeup_reason_mask = ~(1 << QEMU_WAKEUP_REASON_NONE);
+int colo_shutdown_requested;
+
int qemu_shutdown_requested_get(void)
{
return shutdown_requested;
@@ -1648,6 +1650,10 @@ void qemu_system_reset(bool report)
void qemu_system_reset_request(void)
{
if (no_reboot) {
+ if (vm_in_colo_state()) {
+ colo_shutdown_requested = 1;
+ return;
+ }
shutdown_requested = 1;
} else {
reset_requested = 1;
@@ -1716,13 +1722,26 @@ void qemu_system_killed(int signal, pid_t pid)
qemu_system_shutdown_request();
}
-void qemu_system_shutdown_request(void)
+void qemu_system_shutdown_request_core(void)
{
- trace_qemu_system_shutdown_request();
shutdown_requested = 1;
qemu_notify_event();
}
+void qemu_system_shutdown_request(void)
+{
+ trace_qemu_system_shutdown_request();
+ /*
+ * if in colo mode, we need do some significant work before respond to the
+ * shutdown request.
+ */
+ if (vm_in_colo_state()) {
+ colo_shutdown_requested = 1;
+ return;
+ }
+ qemu_system_shutdown_request_core();
+}
+
static void qemu_system_powerdown(void)
{
qapi_event_send_powerdown(&error_abort);
--
1.7.12.4
- [Qemu-devel] [RFC PATCH v4 08/28] QEMUSizedBuffer: Introduce two help functions for qsb, (continued)
- [Qemu-devel] [RFC PATCH v4 08/28] QEMUSizedBuffer: Introduce two help functions for qsb, zhanghailiang, 2015/03/26
- [Qemu-devel] [RFC PATCH v4 01/28] configure: Add parameter for configure to enable/disable COLO support, zhanghailiang, 2015/03/26
- [Qemu-devel] [RFC PATCH v4 02/28] migration: Introduce capability 'colo' to migration, zhanghailiang, 2015/03/26
- [Qemu-devel] [RFC PATCH v4 23/28] COLO: Improve checkpoint efficiency by do additional periodic checkpoint, zhanghailiang, 2015/03/26
- [Qemu-devel] [RFC PATCH v4 18/28] COLO NIC: Init/remove colo nic devices when add/cleanup tap devices, zhanghailiang, 2015/03/26
- [Qemu-devel] [RFC PATCH v4 19/28] COLO NIC: Implement colo nic device interface configure(), zhanghailiang, 2015/03/26
- [Qemu-devel] [RFC PATCH v4 05/28] migration: Integrate COLO checkpoint process into loadvm, zhanghailiang, 2015/03/26
- [Qemu-devel] [RFC PATCH v4 26/28] COLO: Disable qdev hotplug when VM is in COLO mode, zhanghailiang, 2015/03/26
- [Qemu-devel] [RFC PATCH v4 28/28] COLO: Add block replication into colo process, zhanghailiang, 2015/03/26
- [Qemu-devel] [RFC PATCH v4 22/28] COLO: Do checkpoint according to the result of net packets comparing, zhanghailiang, 2015/03/26
- [Qemu-devel] [RFC PATCH v4 27/28] COLO: Implement shutdown checkpoint,
zhanghailiang <=
- [Qemu-devel] [RFC PATCH v4 20/28] COLO NIC : Implement colo nic init/destroy function, zhanghailiang, 2015/03/26
- [Qemu-devel] [RFC PATCH v4 25/28] COLO NIC: Implement NIC checkpoint and failover, zhanghailiang, 2015/03/26
- [Qemu-devel] [RFC PATCH v4 24/28] COLO: Add colo-set-checkpoint-period command, zhanghailiang, 2015/03/26
- [Qemu-devel] [RFC PATCH v4 14/28] COLO failover: Introduce a new command to trigger a failover, zhanghailiang, 2015/03/26
- [Qemu-devel] [RFC PATCH v4 13/28] COLO RAM: Flush cached RAM into SVM's memory, zhanghailiang, 2015/03/26
- [Qemu-devel] [RFC PATCH v4 16/28] COLO failover: Don't do failover during loading VM's state, zhanghailiang, 2015/03/26
- [Qemu-devel] [RFC PATCH v4 15/28] COLO failover: Implement COLO master/slave failover work, zhanghailiang, 2015/03/26
- [Qemu-devel] [RFC PATCH v4 17/28] COLO: Add new command parameter 'colo_nicname' 'colo_script' for net, zhanghailiang, 2015/03/26
- [Qemu-devel] [RFC PATCH v4 21/28] COLO NIC: Some init work related with proxy module, zhanghailiang, 2015/03/26
- [Qemu-devel] [RFC PATCH v4 10/28] COLO RAM: Load PVM's dirty page into SVM's RAM cache temporarily, zhanghailiang, 2015/03/26