Re: [Qemu-devel] [PATCH 4/8] Drop the incoming_expected global variable

[Anthony Liguori]

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<address@hidden>
> ---
>   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