From: zhanghailiang <zhang.zhanghailiang@huawei.com>
To: qemu-devel@nongnu.org
Cc: xiecl.fnst@cn.fujitsu.com, lizhijian@cn.fujitsu.com,
quintela@redhat.com, armbru@redhat.com, yunhong.jiang@intel.com,
eddie.dong@intel.com, peter.huangpeng@huawei.com,
dgilbert@redhat.com,
zhanghailiang <zhang.zhanghailiang@huawei.com>,
arei.gonglei@huawei.com, stefanha@redhat.com,
amit.shah@redhat.com, zhangchen.fnst@cn.fujitsu.com,
hongyang.yang@easystack.cn
Subject: [Qemu-devel] [PATCH COLO-Frame v14 06/40] COLO/migration: Create a new communication path from destination to source
Date: Sat, 6 Feb 2016 17:28:18 +0800 [thread overview]
Message-ID: <1454750932-7556-7-git-send-email-zhang.zhanghailiang@huawei.com> (raw)
In-Reply-To: <1454750932-7556-1-git-send-email-zhang.zhanghailiang@huawei.com>
This new communication path will be used for returning messages
from destination to source.
Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
v13:
- Remove useless error report
v12:
- Add Reviewed-by tag
v11:
- Rebase master to use qemu_file_get_return_path() for opening return path
v10:
- fix the the error log (Dave's suggestion).
---
migration/colo.c | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/migration/colo.c b/migration/colo.c
index 20052d9..43e9890 100644
--- a/migration/colo.c
+++ b/migration/colo.c
@@ -36,6 +36,12 @@ bool migration_incoming_in_colo_state(void)
static void colo_process_checkpoint(MigrationState *s)
{
+ s->rp_state.from_dst_file = qemu_file_get_return_path(s->to_dst_file);
+ if (!s->rp_state.from_dst_file) {
+ error_report("Open QEMUFile from_dst_file failed");
+ goto out;
+ }
+
qemu_mutex_lock_iothread();
vm_start();
qemu_mutex_unlock_iothread();
@@ -43,8 +49,13 @@ static void colo_process_checkpoint(MigrationState *s)
/*TODO: COLO checkpoint savevm loop*/
+out:
migrate_set_state(&s->state, MIGRATION_STATUS_COLO,
MIGRATION_STATUS_COMPLETED);
+
+ if (s->rp_state.from_dst_file) {
+ qemu_fclose(s->rp_state.from_dst_file);
+ }
}
void migrate_start_colo_process(MigrationState *s)
@@ -63,8 +74,23 @@ void *colo_process_incoming_thread(void *opaque)
migrate_set_state(&mis->state, MIGRATION_STATUS_ACTIVE,
MIGRATION_STATUS_COLO);
+ mis->to_src_file = qemu_file_get_return_path(mis->from_src_file);
+ if (!mis->to_src_file) {
+ error_report("colo incoming thread: Open QEMUFile to_src_file failed");
+ goto out;
+ }
+ /* Note: We set the fd to unblocked in migration incoming coroutine,
+ * But here we are in the colo incoming thread, so it is ok to set the
+ * fd back to blocked.
+ */
+ qemu_file_set_blocking(mis->from_src_file, true);
+
/* TODO: COLO checkpoint restore loop */
+out:
+ if (mis->to_src_file) {
+ qemu_fclose(mis->to_src_file);
+ }
migration_incoming_exit_colo();
return NULL;
--
1.8.3.1
next prev parent reply other threads:[~2016-02-06 9:29 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-06 9:28 [Qemu-devel] [PATCH COLO-Frame v14 00/40] COarse-grain LOck-stepping(COLO) Virtual Machines for Non-stop Service (FT) zhanghailiang
2016-02-06 9:28 ` [Qemu-devel] [PATCH COLO-Frame v14 01/40] configure: Add parameter for configure to enable/disable COLO support zhanghailiang
2016-02-06 9:28 ` [Qemu-devel] [PATCH COLO-Frame v14 02/40] migration: Introduce capability 'x-colo' to migration zhanghailiang
2016-02-06 9:28 ` [Qemu-devel] [PATCH COLO-Frame v14 03/40] COLO: migrate colo related info to secondary node zhanghailiang
2016-02-06 9:28 ` [Qemu-devel] [PATCH COLO-Frame v14 04/40] migration: Integrate COLO checkpoint process into migration zhanghailiang
2016-02-06 9:28 ` [Qemu-devel] [PATCH COLO-Frame v14 05/40] migration: Integrate COLO checkpoint process into loadvm zhanghailiang
2016-02-06 9:28 ` zhanghailiang [this message]
2016-02-06 9:28 ` [Qemu-devel] [PATCH COLO-Frame v14 07/40] COLO: Implement colo checkpoint protocol zhanghailiang
2016-02-06 9:28 ` [Qemu-devel] [PATCH COLO-Frame v14 08/40] COLO: Add a new RunState RUN_STATE_COLO zhanghailiang
2016-02-06 9:28 ` [Qemu-devel] [PATCH COLO-Frame v14 09/40] QEMUSizedBuffer: Introduce two help functions for qsb zhanghailiang
2016-02-06 9:28 ` [Qemu-devel] [PATCH COLO-Frame v14 10/40] COLO: Save PVM state to secondary side when do checkpoint zhanghailiang
2016-02-06 9:28 ` [Qemu-devel] [PATCH COLO-Frame v14 11/40] COLO: Load PVM's dirty pages into SVM's RAM cache temporarily zhanghailiang
2016-02-06 9:28 ` [Qemu-devel] [PATCH COLO-Frame v14 12/40] ram/COLO: Record the dirty pages that SVM received zhanghailiang
2016-02-06 9:28 ` [Qemu-devel] [PATCH COLO-Frame v14 13/40] COLO: Load VMState into qsb before restore it zhanghailiang
2016-02-06 9:28 ` [Qemu-devel] [PATCH COLO-Frame v14 14/40] COLO: Flush PVM's cached RAM into SVM's memory zhanghailiang
2016-02-06 9:28 ` [Qemu-devel] [PATCH COLO-Frame v14 15/40] COLO: Add checkpoint-delay parameter for migrate-set-parameters zhanghailiang
2016-02-06 9:28 ` [Qemu-devel] [PATCH COLO-Frame v14 16/40] COLO: synchronize PVM's state to SVM periodically zhanghailiang
2016-02-06 9:28 ` [Qemu-devel] [PATCH COLO-Frame v14 17/40] COLO failover: Introduce a new command to trigger a failover zhanghailiang
2016-02-06 9:28 ` [Qemu-devel] [PATCH COLO-Frame v14 18/40] COLO failover: Introduce state to record failover process zhanghailiang
2016-02-06 9:28 ` [Qemu-devel] [PATCH COLO-Frame v14 19/40] COLO: Implement failover work for Primary VM zhanghailiang
2016-02-06 9:28 ` [Qemu-devel] [PATCH COLO-Frame v14 20/40] COLO: Implement failover work for Secondary VM zhanghailiang
2016-02-06 9:28 ` [Qemu-devel] [PATCH COLO-Frame v14 21/40] qmp event: Add COLO_EXIT event to notify users while exited from COLO zhanghailiang
2016-02-06 9:28 ` [Qemu-devel] [PATCH COLO-Frame v14 22/40] COLO failover: Shutdown related socket fd when do failover zhanghailiang
2016-02-06 9:28 ` [Qemu-devel] [PATCH COLO-Frame v14 23/40] COLO failover: Don't do failover during loading VM's state zhanghailiang
2016-02-06 9:28 ` [Qemu-devel] [PATCH COLO-Frame v14 24/40] COLO: Process shutdown command for VM in COLO state zhanghailiang
2016-02-12 15:09 ` Dr. David Alan Gilbert
2016-02-16 6:17 ` Hailiang Zhang
2016-02-06 9:28 ` [Qemu-devel] [PATCH COLO-Frame v14 25/40] COLO: Update the global runstate after going into colo state zhanghailiang
2016-02-06 9:28 ` [Qemu-devel] [PATCH COLO-Frame v14 26/40] savevm: Introduce two helper functions for save/find loadvm_handlers entry zhanghailiang
2016-02-06 9:28 ` [Qemu-devel] [PATCH COLO-Frame v14 27/40] migration/savevm: Add new helpers to process the different stages of loadvm zhanghailiang
2016-02-06 9:28 ` [Qemu-devel] [PATCH COLO-Frame v14 28/40] migration/savevm: Export two helper functions for savevm process zhanghailiang
2016-02-06 9:28 ` [Qemu-devel] [PATCH COLO-Frame v14 29/40] COLO: Separate the process of saving/loading ram and device state zhanghailiang
2016-02-06 9:28 ` [Qemu-devel] [PATCH COLO-Frame v14 30/40] COLO: Split qemu_savevm_state_begin out of checkpoint process zhanghailiang
2016-02-06 9:28 ` [Qemu-devel] [PATCH COLO-Frame v14 31/40] net/filter: Add a 'status' property for filter object zhanghailiang
2016-02-18 3:00 ` Jason Wang
2016-02-18 3:27 ` Hailiang Zhang
2016-02-23 8:34 ` Jason Wang
2016-02-23 9:37 ` Hailiang Zhang
2016-02-06 9:28 ` [Qemu-devel] [PATCH COLO-Frame v14 32/40] net/filter: Introduce a helper to add a filter to the netdev zhanghailiang
2016-02-18 3:19 ` Jason Wang
2016-02-18 3:30 ` Hailiang Zhang
2016-02-23 8:36 ` Jason Wang
2016-02-23 11:39 ` Hailiang Zhang
2016-02-23 11:50 ` Hailiang Zhang
2016-02-06 9:28 ` [Qemu-devel] [PATCH COLO-Frame v14 33/40] filter-buffer: Accept zero interval zhanghailiang
2016-02-06 9:28 ` [Qemu-devel] [PATCH COLO-Frame v14 34/40] net: Add notifier/callback for netdev init zhanghailiang
2016-02-06 9:28 ` [Qemu-devel] [PATCH COLO-Frame v14 35/40] COLO/filter: add each netdev a buffer filter zhanghailiang
2016-02-18 3:23 ` Jason Wang
2016-02-18 4:07 ` Hailiang Zhang
2016-02-06 9:28 ` [Qemu-devel] [PATCH COLO-Frame v14 36/40] net/filter: Add a helper to traverse all the filters zhanghailiang
2016-02-06 9:28 ` [Qemu-devel] [PATCH COLO-Frame v14 37/40] COLO: enable buffer filters for PVM zhanghailiang
2016-02-18 3:31 ` Jason Wang
2016-02-18 3:46 ` Hailiang Zhang
2016-02-18 7:30 ` Hailiang Zhang
2016-02-23 8:38 ` Jason Wang
2016-02-23 9:10 ` Hailiang Zhang
2016-02-23 8:37 ` Jason Wang
2016-02-06 9:28 ` [Qemu-devel] [PATCH COLO-Frame v14 38/40] filter-buffer: make filter_buffer_flush() public zhanghailiang
2016-02-06 9:28 ` [Qemu-devel] [PATCH COLO-Frame v14 39/40] COLO: flush buffered packets in checkpoint process or exit COLO zhanghailiang
2016-02-06 9:28 ` [Qemu-devel] [PATCH COLO-Frame v14 40/40] COLO: Add block replication into colo process zhanghailiang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1454750932-7556-7-git-send-email-zhang.zhanghailiang@huawei.com \
--to=zhang.zhanghailiang@huawei.com \
--cc=amit.shah@redhat.com \
--cc=arei.gonglei@huawei.com \
--cc=armbru@redhat.com \
--cc=dgilbert@redhat.com \
--cc=eddie.dong@intel.com \
--cc=hongyang.yang@easystack.cn \
--cc=lizhijian@cn.fujitsu.com \
--cc=peter.huangpeng@huawei.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=stefanha@redhat.com \
--cc=xiecl.fnst@cn.fujitsu.com \
--cc=yunhong.jiang@intel.com \
--cc=zhangchen.fnst@cn.fujitsu.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).