From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:39748) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QodD5-0006Vd-3u for qemu-devel@nongnu.org; Wed, 03 Aug 2011 11:18:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QodCk-0006dd-9O for qemu-devel@nongnu.org; Wed, 03 Aug 2011 11:17:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:65439) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QodCj-0006ak-W6 for qemu-devel@nongnu.org; Wed, 03 Aug 2011 11:17:54 -0400 From: Luiz Capitulino Date: Wed, 3 Aug 2011 12:17:20 -0300 Message-Id: <1312384643-581-5-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1312384643-581-1-git-send-email-lcapitulino@redhat.com> References: <1312384643-581-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 4/7] Drop the incoming_expected global variable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: blauwirbel@gmail.com, amit.shah@redhat.com, aliguori@us.ibm.com, jan.kiszka@web.de, avi@redhat.com 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 --- migration.c | 2 -- monitor.c | 2 +- vl.c | 2 -- 3 files changed, 1 insertions(+), 5 deletions(-) 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; -- 1.7.6.396.ge0613