[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 4/7] Drop the incoming_expected global variable
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 4/7] Drop the incoming_expected global variable |
Date: |
Wed, 3 Aug 2011 12:17:20 -0300 |
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 <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 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
- Re: [Qemu-devel] [PATCH 2/7] Replace VMSTOP macros with a proper QemuState type, (continued)
- Re: [Qemu-devel] [PATCH 2/7] Replace VMSTOP macros with a proper QemuState type, Luiz Capitulino, 2011/08/08
- Re: [Qemu-devel] [PATCH 2/7] Replace VMSTOP macros with a proper QemuState type, Avi Kivity, 2011/08/08
- Re: [Qemu-devel] [PATCH 2/7] Replace VMSTOP macros with a proper QemuState type, Luiz Capitulino, 2011/08/08
- Re: [Qemu-devel] [PATCH 2/7] Replace VMSTOP macros with a proper QemuState type, Avi Kivity, 2011/08/08
- Re: [Qemu-devel] [PATCH 2/7] Replace VMSTOP macros with a proper QemuState type, Luiz Capitulino, 2011/08/08
[Qemu-devel] [PATCH 1/7] Move vm_state_notify() prototype from cpus.h to sysemu.h, Luiz Capitulino, 2011/08/03
[Qemu-devel] [PATCH 6/7] Monitor: Don't allow cont on bad VM state, Luiz Capitulino, 2011/08/03
[Qemu-devel] [PATCH 4/7] Drop the incoming_expected global variable,
Luiz Capitulino <=
[Qemu-devel] [PATCH 3/7] QemuState: Add additional states, Luiz Capitulino, 2011/08/03
[Qemu-devel] [PATCH 5/7] Drop the vm_running global variable, Luiz Capitulino, 2011/08/03
[Qemu-devel] [PATCH 7/7] QMP: query-status: Introduce 'status' key, Luiz Capitulino, 2011/08/03
Re: [Qemu-devel] [PATCH 0/7]: Introduce the QemuState type, Markus Armbruster, 2011/08/04