From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:38349) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qsfde-0000EV-F6 for qemu-devel@nongnu.org; Sun, 14 Aug 2011 14:42:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qsfdd-00020L-HH for qemu-devel@nongnu.org; Sun, 14 Aug 2011 14:42:22 -0400 Received: from mail-pz0-f42.google.com ([209.85.210.42]:54037) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qsfdd-00020D-Ao for qemu-devel@nongnu.org; Sun, 14 Aug 2011 14:42:21 -0400 Received: by pzk37 with SMTP id 37so7525190pzk.29 for ; Sun, 14 Aug 2011 11:42:19 -0700 (PDT) Message-ID: <4E47FAE5.5080802@codemonkey.ws> Date: Sun, 14 Aug 2011 11:42:13 -0500 From: Anthony Liguori MIME-Version: 1.0 References: <1313008408-23161-1-git-send-email-lcapitulino@redhat.com> <1313008408-23161-5-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1313008408-23161-5-git-send-email-lcapitulino@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 4/8] Drop the incoming_expected global variable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Luiz Capitulino Cc: kwolf@redhat.com, jan.kiszka@siemens.com, qemu-devel@nongnu.org, armbru@redhat.com, avi@redhat.com, amit.shah@redhat.com On 08/10/2011 03:33 PM, Luiz Capitulino wrote: > Test against RSTATE_IN_MIGRATE instead. > > Please, note that the RSTATE_IN_MIGRATE 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 f482f8c..a1a955d 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 cffef22..72f26ab 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 (runstate_get() == RSTATE_IN_MIGRATE) { This reads a little odd to me. I think having a: if (runstate_check(RSTATE_IN_MIGRATE)) { Would read a bit more clearly. Regards, Anthony Liguori