Patchwork [4/7] Drop the incoming_expected global variable

login
register
mail settings
Submitter Luiz Capitulino
Date Aug. 3, 2011, 3:17 p.m.
Message ID <1312384643-581-5-git-send-email-lcapitulino@redhat.com>
Download mbox | patch
Permalink /patch/108299/
State New
Headers show

Comments

Luiz Capitulino - Aug. 3, 2011, 3:17 p.m.
Test against QSTATE_INMIGRATE instead.

Please, note that the QSTATE_INMIGRATE state is only set when all the
initial VM setup is done, while 'incoming_expected' was set right in
the beginning when parsing command-line options. Shouldn't be a problem
as far as I could check.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 migration.c |    2 --
 monitor.c   |    2 +-
 vl.c        |    2 --
 3 files changed, 1 insertions(+), 5 deletions(-)

Patch

diff --git a/migration.c b/migration.c
index 8aacf64..73e9bd6 100644
--- a/migration.c
+++ b/migration.c
@@ -70,8 +70,6 @@  void process_incoming_migration(QEMUFile *f)
     qemu_announce_self();
     DPRINTF("successfully loaded vm state\n");
 
-    incoming_expected = false;
-
     if (autostart) {
         vm_start();
     } else {
diff --git a/monitor.c b/monitor.c
index 6ce0391..05c5936 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1309,7 +1309,7 @@  static int do_cont(Monitor *mon, const QDict *qdict, QObject **ret_data)
 {
     struct bdrv_iterate_context context = { mon, 0 };
 
-    if (incoming_expected) {
+    if (qemu_state_get() == QSTATE_INMIGRATE) {
         qerror_report(QERR_MIGRATION_EXPECTED);
         return -1;
     }
diff --git a/vl.c b/vl.c
index 2619c8e..c2ab7ce 100644
--- a/vl.c
+++ b/vl.c
@@ -185,7 +185,6 @@  int nb_nics;
 NICInfo nd_table[MAX_NICS];
 int vm_running;
 int autostart;
-int incoming_expected; /* Started with -incoming and waiting for incoming */
 static int rtc_utc = 1;
 static int rtc_date_offset = -1; /* -1 means no change */
 QEMUClock *rtc_clock;
@@ -2873,7 +2872,6 @@  int main(int argc, char **argv, char **envp)
                 break;
             case QEMU_OPTION_incoming:
                 incoming = optarg;
-                incoming_expected = true;
                 break;
             case QEMU_OPTION_nodefaults:
                 default_serial = 0;