From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59487) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7Sdl-00024X-2v for qemu-devel@nongnu.org; Tue, 13 Mar 2012 10:23:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S7Sdi-00061n-LK for qemu-devel@nongnu.org; Tue, 13 Mar 2012 10:23:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:17183) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7Sdi-0005zV-Cf for qemu-devel@nongnu.org; Tue, 13 Mar 2012 10:23:50 -0400 Date: Tue, 13 Mar 2012 16:23:27 +0200 From: "Michael S. Tsirkin" Message-ID: <20120313142326.GD14931@redhat.com> References: <20120313085500.10958.92659.stgit@amd-6168-8-1.englab.nay.redhat.com> <20120313085622.10958.46277.stgit@amd-6168-8-1.englab.nay.redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20120313085622.10958.46277.stgit@amd-6168-8-1.englab.nay.redhat.com> Subject: Re: [Qemu-devel] [V4 PATCH 2/5] net: announce self after vm start List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Jason Wang Cc: quintela@redhat.com, aliguori@us.ibm.com, rusty@rustcorp.com.au, stefanha@linux.vnet.ibm.com, qemu-devel@nongnu.org On Tue, Mar 13, 2012 at 04:56:22PM +0800, Jason Wang wrote: > This patch moves qemu_announce_self() to vm_start() and add a new parameters to > control whether sending gratuitous packet is needed. There are several reasons > to do this: > > - Gratuitous packet is also needed when we resume a stopped vm or successfully > load a state. Why is it needed when we continue a stopped vm? > - Sending gratuitous packets may be done through co-operation with guest, so > this work should be done after vm is started. > > Signed-off-by: Jason Wang > --- > gdbstub.c | 2 +- > migration.c | 5 ++--- > monitor.c | 2 +- > qmp.c | 2 +- > savevm.c | 2 +- > sysemu.h | 2 +- > vl.c | 7 +++++-- > 7 files changed, 12 insertions(+), 10 deletions(-) > > diff --git a/gdbstub.c b/gdbstub.c > index ef95ac2..f4d22e5 100644 > --- a/gdbstub.c > +++ b/gdbstub.c > @@ -371,7 +371,7 @@ static inline void gdb_continue(GDBState *s) > #ifdef CONFIG_USER_ONLY > s->running_state = 1; > #else > - vm_start(); > + vm_start(false); > #endif > } > > diff --git a/migration.c b/migration.c > index 00fa1e3..40332d2 100644 > --- a/migration.c > +++ b/migration.c > @@ -88,14 +88,13 @@ void process_incoming_migration(QEMUFile *f) > fprintf(stderr, "load of migration failed\n"); > exit(0); > } > - qemu_announce_self(); > DPRINTF("successfully loaded vm state\n"); > > /* Make sure all file formats flush their mutable metadata */ > bdrv_invalidate_cache_all(); > > if (autostart) { > - vm_start(); > + vm_start(true); > } else { > runstate_set(RUN_STATE_PRELAUNCH); > } > @@ -274,7 +273,7 @@ static void migrate_fd_put_ready(void *opaque) > } > if (s->state != MIG_STATE_COMPLETED) { > if (old_vm_running) { > - vm_start(); > + vm_start(false); > } > } > } > diff --git a/monitor.c b/monitor.c > index cbdfbad..0b63c11 100644 > --- a/monitor.c > +++ b/monitor.c > @@ -2260,7 +2260,7 @@ static void do_loadvm(Monitor *mon, const QDict *qdict) > vm_stop(RUN_STATE_RESTORE_VM); > > if (load_vmstate(name) == 0 && saved_vm_running) { > - vm_start(); > + vm_start(true); > } > } > > diff --git a/qmp.c b/qmp.c > index a182b51..252c842 100644 > --- a/qmp.c > +++ b/qmp.c > @@ -160,7 +160,7 @@ void qmp_cont(Error **errp) > return; > } > > - vm_start(); > + vm_start(true); > } > > void qmp_system_wakeup(Error **errp) > diff --git a/savevm.c b/savevm.c > index 5b59826..82b9d3a 100644 > --- a/savevm.c > +++ b/savevm.c > @@ -2107,7 +2107,7 @@ void do_savevm(Monitor *mon, const QDict *qdict) > > the_end: > if (saved_vm_running) > - vm_start(); > + vm_start(false); > } > > int load_vmstate(const char *name) > diff --git a/sysemu.h b/sysemu.h > index 98118cc..787edd4 100644 > --- a/sysemu.h > +++ b/sysemu.h > @@ -34,7 +34,7 @@ void vm_state_notify(int running, RunState state); > #define VMRESET_SILENT false > #define VMRESET_REPORT true > > -void vm_start(void); > +void vm_start(bool announce); > void vm_stop(RunState state); > void vm_stop_force_state(RunState state); > > diff --git a/vl.c b/vl.c > index 65f11f2..4e04f82 100644 > --- a/vl.c > +++ b/vl.c > @@ -1258,7 +1258,7 @@ void vm_state_notify(int running, RunState state) > } > } > > -void vm_start(void) > +void vm_start(bool announce) > { > if (!runstate_is_running()) { > cpu_enable_ticks(); > @@ -1266,6 +1266,9 @@ void vm_start(void) > vm_state_notify(1, RUN_STATE_RUNNING); > resume_all_vcpus(); > monitor_protocol_event(QEVENT_RESUME, NULL); > + if (announce) { > + qemu_announce_self(); > + } > } > } > > @@ -3619,7 +3622,7 @@ int main(int argc, char **argv, char **envp) > exit(ret); > } > } else if (autostart) { > - vm_start(); > + vm_start(false); > } > > os_setup_post();