On 12/09/2011 03:54 PM, Anthony PERARD wrote:
This new state will be used by Xen functions to know QEMU will wait for a
migration. This is important to know for memory related function because the
memory is already allocated and reallocated them will not works.

Signed-off-by: Anthony PERARD<anthony.per...@citrix.com>

Luiz, please Ack. In the future, when you make QMP changes, please CC the appropriate maintainer.

Regards,

Anthony Liguori

---
  qapi-schema.json |    2 +-
  vl.c             |    4 ++++
  2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/qapi-schema.json b/qapi-schema.json
index cb1ba77..bd77444 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -121,7 +121,7 @@
  { 'enum': 'RunState',
    'data': [ 'debug', 'inmigrate', 'internal-error', 'io-error', 'paused',
              'postmigrate', 'prelaunch', 'finish-migrate', 'restore-vm',
-            'running', 'save-vm', 'shutdown', 'watchdog' ] }
+            'running', 'save-vm', 'shutdown', 'watchdog', 'premigrate' ] }

  ##
  # @StatusInfo:
diff --git a/vl.c b/vl.c
index e7dced2..a291416 100644
--- a/vl.c
+++ b/vl.c
@@ -351,8 +351,11 @@ static const RunStateTransition runstate_transitions_def[] 
= {

      { RUN_STATE_PRELAUNCH, RUN_STATE_RUNNING },
      { RUN_STATE_PRELAUNCH, RUN_STATE_FINISH_MIGRATE },
+    { RUN_STATE_PRELAUNCH, RUN_STATE_PREMIGRATE },
      { RUN_STATE_PRELAUNCH, RUN_STATE_INMIGRATE },

+    { RUN_STATE_PREMIGRATE, RUN_STATE_INMIGRATE },
+
      { RUN_STATE_FINISH_MIGRATE, RUN_STATE_RUNNING },
      { RUN_STATE_FINISH_MIGRATE, RUN_STATE_POSTMIGRATE },

@@ -2975,6 +2978,7 @@ int main(int argc, char **argv, char **envp)
                  break;
              case QEMU_OPTION_incoming:
                  incoming = optarg;
+                runstate_set(RUN_STATE_PREMIGRATE);
                  break;
              case QEMU_OPTION_nodefaults:
                  default_serial = 0;


Reply via email to