From: Lei Li <lilei@linux.vnet.ibm.com>
To: qemu-devel@nongnu.org
Cc: aarcange@redhat.com, Lei Li <lilei@linux.vnet.ibm.com>,
quintela@redhat.com, mrhines@linux.vnet.ibm.com,
aliguori@amazon.com, lagarcia@br.ibm.com, pbonzini@redhat.com,
rcj@linux.vnet.ibm.com
Subject: [Qemu-devel] [PATCH 14/17] add new RanState RAN_STATE_MEMORY_STALE
Date: Fri, 29 Nov 2013 18:06:21 +0800 [thread overview]
Message-ID: <1385719584-21114-15-git-send-email-lilei@linux.vnet.ibm.com> (raw)
In-Reply-To: <1385719584-21114-1-git-send-email-lilei@linux.vnet.ibm.com>
Introduce new RanState RAN_STATE_MEMORY_STALE and
add it to runstate_needs_reset().
Signed-off-by: Lei Li <lilei@linux.vnet.ibm.com>
---
qapi-schema.json | 7 +++++--
vl.c | 13 ++++++++++++-
2 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/qapi-schema.json b/qapi-schema.json
index b290a0f..4d9e712 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -176,12 +176,15 @@
# @watchdog: the watchdog action is configured to pause and has been triggered
#
# @guest-panicked: guest has been panicked as a result of guest OS panic
+#
+# @memory-stale: guest is paused to start unix_page_flipping migration
+# process, the destination QEMU will has the newer contents of the memory
##
{ 'enum': 'RunState',
'data': [ 'debug', 'inmigrate', 'internal-error', 'io-error', 'paused',
'postmigrate', 'prelaunch', 'finish-migrate', 'restore-vm',
- 'running', 'save-vm', 'shutdown', 'suspended', 'watchdog',
- 'guest-panicked' ] }
+ 'running', 'save-vm', 'shutdown', 'suspended', 'memory-stale',
+ 'watchdog', 'guest-panicked' ] }
##
# @SnapshotInfo
diff --git a/vl.c b/vl.c
index 8d5d874..3ea96b2 100644
--- a/vl.c
+++ b/vl.c
@@ -601,6 +601,7 @@ static const RunStateTransition runstate_transitions_def[] = {
{ RUN_STATE_PAUSED, RUN_STATE_RUNNING },
{ RUN_STATE_PAUSED, RUN_STATE_FINISH_MIGRATE },
+ { RUN_STATE_PAUSED, RUN_STATE_MEMORY_STALE },
{ RUN_STATE_POSTMIGRATE, RUN_STATE_RUNNING },
{ RUN_STATE_POSTMIGRATE, RUN_STATE_FINISH_MIGRATE },
@@ -608,6 +609,7 @@ static const RunStateTransition runstate_transitions_def[] = {
{ RUN_STATE_PRELAUNCH, RUN_STATE_RUNNING },
{ RUN_STATE_PRELAUNCH, RUN_STATE_FINISH_MIGRATE },
{ RUN_STATE_PRELAUNCH, RUN_STATE_INMIGRATE },
+ { RUN_STATE_PRELAUNCH, RUN_STATE_MEMORY_STALE },
{ RUN_STATE_FINISH_MIGRATE, RUN_STATE_RUNNING },
{ RUN_STATE_FINISH_MIGRATE, RUN_STATE_POSTMIGRATE },
@@ -624,23 +626,31 @@ static const RunStateTransition runstate_transitions_def[] = {
{ RUN_STATE_RUNNING, RUN_STATE_SHUTDOWN },
{ RUN_STATE_RUNNING, RUN_STATE_WATCHDOG },
{ RUN_STATE_RUNNING, RUN_STATE_GUEST_PANICKED },
+ { RUN_STATE_RUNNING, RUN_STATE_MEMORY_STALE },
{ RUN_STATE_SAVE_VM, RUN_STATE_RUNNING },
{ RUN_STATE_SHUTDOWN, RUN_STATE_PAUSED },
{ RUN_STATE_SHUTDOWN, RUN_STATE_FINISH_MIGRATE },
+ { RUN_STATE_SHUTDOWN, RUN_STATE_MEMORY_STALE },
{ RUN_STATE_DEBUG, RUN_STATE_SUSPENDED },
+ { RUN_STATE_DEBUG, RUN_STATE_MEMORY_STALE },
{ RUN_STATE_RUNNING, RUN_STATE_SUSPENDED },
{ RUN_STATE_SUSPENDED, RUN_STATE_RUNNING },
{ RUN_STATE_SUSPENDED, RUN_STATE_FINISH_MIGRATE },
+ { RUN_STATE_SUSPENDED, RUN_STATE_MEMORY_STALE },
{ RUN_STATE_WATCHDOG, RUN_STATE_RUNNING },
{ RUN_STATE_WATCHDOG, RUN_STATE_FINISH_MIGRATE },
+ { RUN_STATE_WATCHDOG, RUN_STATE_MEMORY_STALE },
{ RUN_STATE_GUEST_PANICKED, RUN_STATE_RUNNING },
{ RUN_STATE_GUEST_PANICKED, RUN_STATE_FINISH_MIGRATE },
+ { RUN_STATE_GUEST_PANICKED, RUN_STATE_MEMORY_STALE },
+ { RUN_STATE_MEMORY_STALE, RUN_STATE_RUNNING },
+ { RUN_STATE_MEMORY_STALE, RUN_STATE_POSTMIGRATE },
{ RUN_STATE_MAX, RUN_STATE_MAX },
};
@@ -685,7 +695,8 @@ int runstate_is_running(void)
bool runstate_needs_reset(void)
{
return runstate_check(RUN_STATE_INTERNAL_ERROR) ||
- runstate_check(RUN_STATE_SHUTDOWN);
+ runstate_check(RUN_STATE_SHUTDOWN) ||
+ runstate_check(RUN_STATE_MEMORY_STALE);
}
StatusInfo *qmp_query_status(Error **errp)
--
1.7.7.6
next prev parent reply other threads:[~2013-11-29 10:07 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-29 10:06 [Qemu-devel] [PATCH 0/17 v4] Localhost migration with side channel for ram Lei Li
2013-11-29 10:06 ` [Qemu-devel] [PATCH 01/17] QAPI: introduce migration capability unix_page_flipping Lei Li
2013-11-29 10:06 ` [Qemu-devel] [PATCH 02/17] migration: add migrate_unix_page_flipping() Lei Li
2013-11-29 10:06 ` [Qemu-devel] [PATCH 03/17] qmp-command.hx: add missing docs for migration capabilites Lei Li
2013-11-29 10:06 ` [Qemu-devel] [PATCH 04/17] migration-local: add QEMUFileLocal with socket based QEMUFile Lei Li
2013-11-29 10:06 ` [Qemu-devel] [PATCH 05/17] migration-local: introduce qemu_fopen_socket_local() Lei Li
2013-11-29 10:06 ` [Qemu-devel] [PATCH 06/17] migration-local: add send_pipefd() Lei Li
2013-11-29 11:14 ` Daniel P. Berrange
2013-12-02 9:13 ` Lei Li
2013-11-29 10:06 ` [Qemu-devel] [PATCH 07/17] save_page: replace block_offset with a MemoryRegion Lei Li
2013-11-29 10:06 ` [Qemu-devel] [PATCH 08/17] migration-local: override save_page for page transmit Lei Li
2013-11-29 10:06 ` [Qemu-devel] [PATCH 09/17] savevm: adjust ram_control_save_page for page flipping Lei Li
2013-11-29 10:06 ` [Qemu-devel] [PATCH 10/17] add unix_msgfd_lookup() to callback get_buffer Lei Li
2013-11-29 10:06 ` [Qemu-devel] [PATCH 11/17] add argument ram_addr_t to hook_ram_load Lei Li
2013-11-29 10:06 ` [Qemu-devel] [PATCH 12/17] migration-local: override hook_ram_load Lei Li
2013-11-29 10:06 ` [Qemu-devel] [PATCH 13/17] migration-unix: replace qemu_fopen_socket with qemu_fopen_socket_local Lei Li
2013-11-29 10:06 ` Lei Li [this message]
2013-11-29 10:06 ` [Qemu-devel] [PATCH 15/17] migration-unix: page flipping support on unix outgoing Lei Li
2013-11-29 10:06 ` [Qemu-devel] [PATCH 16/17] migration: adjust migration_thread() process for page flipping Lei Li
2013-11-29 10:06 ` [Qemu-devel] [PATCH 17/17] hmp: better format for info migrate_capabilities Lei Li
2013-11-29 10:26 ` [Qemu-devel] [PATCH 0/17 v4] Localhost migration with side channel for ram Paolo Bonzini
2013-12-02 9:16 ` Lei Li
-- strict thread matches above, loose matches on Subject: below --
2013-11-21 9:11 [Qemu-devel] [PATCH 0/17 v3] " Lei Li
2013-11-21 9:11 ` [Qemu-devel] [PATCH 14/17] add new RanState RAN_STATE_MEMORY_STALE Lei Li
2013-11-26 12:28 ` Paolo Bonzini
2013-11-26 14:02 ` Lei Li
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=1385719584-21114-15-git-send-email-lilei@linux.vnet.ibm.com \
--to=lilei@linux.vnet.ibm.com \
--cc=aarcange@redhat.com \
--cc=aliguori@amazon.com \
--cc=lagarcia@br.ibm.com \
--cc=mrhines@linux.vnet.ibm.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=rcj@linux.vnet.ibm.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).