Drop the incoming_expected global variable

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 <lcapitulino@redhat.com>
This commit is contained in:
Luiz Capitulino 2011-07-29 15:15:00 -03:00
parent 5db9d4d186
commit 1bcef683bf
3 changed files with 1 additions and 5 deletions

View File

@ -70,8 +70,6 @@ void process_incoming_migration(QEMUFile *f)
qemu_announce_self(); qemu_announce_self();
DPRINTF("successfully loaded vm state\n"); DPRINTF("successfully loaded vm state\n");
incoming_expected = false;
if (autostart) { if (autostart) {
vm_start(); vm_start();
} else { } else {

View File

@ -1311,7 +1311,7 @@ static int do_cont(Monitor *mon, const QDict *qdict, QObject **ret_data)
{ {
struct bdrv_iterate_context context = { mon, 0 }; struct bdrv_iterate_context context = { mon, 0 };
if (incoming_expected) { if (runstate_check(RSTATE_IN_MIGRATE)) {
qerror_report(QERR_MIGRATION_EXPECTED); qerror_report(QERR_MIGRATION_EXPECTED);
return -1; return -1;
} }

2
vl.c
View File

@ -187,7 +187,6 @@ int nb_nics;
NICInfo nd_table[MAX_NICS]; NICInfo nd_table[MAX_NICS];
int vm_running; int vm_running;
int autostart; int autostart;
int incoming_expected; /* Started with -incoming and waiting for incoming */
static int rtc_utc = 1; static int rtc_utc = 1;
static int rtc_date_offset = -1; /* -1 means no change */ static int rtc_date_offset = -1; /* -1 means no change */
QEMUClock *rtc_clock; QEMUClock *rtc_clock;
@ -3041,7 +3040,6 @@ int main(int argc, char **argv, char **envp)
break; break;
case QEMU_OPTION_incoming: case QEMU_OPTION_incoming:
incoming = optarg; incoming = optarg;
incoming_expected = true;
break; break;
case QEMU_OPTION_nodefaults: case QEMU_OPTION_nodefaults:
default_serial = 0; default_serial = 0;