From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=58883 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PsB1M-0006Wu-1z for qemu-devel@nongnu.org; Wed, 23 Feb 2011 04:28:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PsB1K-0004V7-Tf for qemu-devel@nongnu.org; Wed, 23 Feb 2011 04:28:31 -0500 Received: from mail-ww0-f53.google.com ([74.125.82.53]:49017) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PsB1K-0004Uu-IU for qemu-devel@nongnu.org; Wed, 23 Feb 2011 04:28:30 -0500 Received: by wwb17 with SMTP id 17so96864wwb.10 for ; Wed, 23 Feb 2011 01:28:29 -0800 (PST) MIME-Version: 1.0 Sender: tamura.yoshiaki@gmail.com In-Reply-To: <6948f404690b9042a41888129a57f78bd2416f1c.1298421307.git.quintela@redhat.com> References: <6948f404690b9042a41888129a57f78bd2416f1c.1298421307.git.quintela@redhat.com> Date: Wed, 23 Feb 2011 18:28:14 +0900 Message-ID: Subject: Re: [Qemu-devel] [PATCH 06/22] migration: Make all posible migration functions static From: Yoshiaki Tamura Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Juan Quintela Cc: qemu-devel@nongnu.org 2011/2/23 Juan Quintela : > I have to move two functions postions to avoid forward declarations > > Signed-off-by: Juan Quintela > --- > =A0migration.c | =A0 72 +++++++++++++++++++++++++++++--------------------= --------- > =A0migration.h | =A0 12 --------- > =A02 files changed, 36 insertions(+), 48 deletions(-) > > diff --git a/migration.c b/migration.c > index e773806..1853380 100644 > --- a/migration.c > +++ b/migration.c > @@ -273,15 +273,7 @@ static void migrate_fd_monitor_suspend(MigrationStat= e *s, Monitor *mon) > =A0 =A0 } > =A0} > > -void migrate_fd_error(MigrationState *s) > -{ > - =A0 =A0DPRINTF("setting error state\n"); > - =A0 =A0s->state =3D MIG_STATE_ERROR; > - =A0 =A0notifier_list_notify(&migration_state_notifiers); > - =A0 =A0migrate_fd_cleanup(s); > -} > - > -int migrate_fd_cleanup(MigrationState *s) > +static int migrate_fd_cleanup(MigrationState *s) > =A0{ > =A0 =A0 int ret =3D 0; > > @@ -308,7 +300,15 @@ int migrate_fd_cleanup(MigrationState *s) > =A0 =A0 return ret; > =A0} > > -void migrate_fd_put_notify(void *opaque) > +void migrate_fd_error(MigrationState *s) > +{ > + =A0 =A0DPRINTF("setting error state\n"); > + =A0 =A0s->state =3D MIG_STATE_ERROR; > + =A0 =A0notifier_list_notify(&migration_state_notifiers); > + =A0 =A0migrate_fd_cleanup(s); > +} > + > +static void migrate_fd_put_notify(void *opaque) > =A0{ > =A0 =A0 MigrationState *s =3D opaque; > > @@ -316,7 +316,7 @@ void migrate_fd_put_notify(void *opaque) > =A0 =A0 qemu_file_put_notify(s->file); > =A0} > > -ssize_t migrate_fd_put_buffer(void *opaque, const void *data, size_t siz= e) > +static ssize_t migrate_fd_put_buffer(void *opaque, const void *data, siz= e_t size) > =A0{ > =A0 =A0 MigrationState *s =3D opaque; > =A0 =A0 ssize_t ret; > @@ -341,29 +341,7 @@ ssize_t migrate_fd_put_buffer(void *opaque, const vo= id *data, size_t size) > =A0 =A0 return ret; > =A0} > > -void migrate_fd_connect(MigrationState *s) > -{ > - =A0 =A0int ret; > - > - =A0 =A0s->file =3D qemu_fopen_ops_buffered(s, > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0s->bandwidth_limit, > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0migrate_fd_put_buffer, > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0migrate_fd_put_ready, > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0migrate_fd_wait_for_unfreeze, > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0migrate_fd_close); > - > - =A0 =A0DPRINTF("beginning savevm\n"); > - =A0 =A0ret =3D qemu_savevm_state_begin(s->mon, s->file, s->blk, s->shar= ed); > - =A0 =A0if (ret < 0) { > - =A0 =A0 =A0 =A0DPRINTF("failed, %d\n", ret); > - =A0 =A0 =A0 =A0migrate_fd_error(s); > - =A0 =A0 =A0 =A0return; > - =A0 =A0} > - > - =A0 =A0migrate_fd_put_ready(s); > -} > - > -void migrate_fd_put_ready(void *opaque) > +static void migrate_fd_put_ready(void *opaque) > =A0{ > =A0 =A0 MigrationState *s =3D opaque; > > @@ -431,7 +409,7 @@ static void migrate_fd_release(MigrationState *s) > =A0 =A0 qemu_free(s); > =A0} > > -void migrate_fd_wait_for_unfreeze(void *opaque) > +static void migrate_fd_wait_for_unfreeze(void *opaque) > =A0{ > =A0 =A0 MigrationState *s =3D opaque; > =A0 =A0 int ret; > @@ -450,7 +428,7 @@ void migrate_fd_wait_for_unfreeze(void *opaque) > =A0 =A0 } while (ret =3D=3D -1 && (s->get_error(s)) =3D=3D EINTR); > =A0} > > -int migrate_fd_close(void *opaque) > +static int migrate_fd_close(void *opaque) > =A0{ > =A0 =A0 MigrationState *s =3D opaque; > > @@ -477,6 +455,28 @@ int get_migration_state(void) > =A0 =A0 } > =A0} > > +void migrate_fd_connect(MigrationState *s) > +{ > + =A0 =A0int ret; > + > + =A0 =A0s->file =3D qemu_fopen_ops_buffered(s, > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0s->bandwidth_limit, > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0migrate_fd_put_buffer, > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0migrate_fd_put_ready, > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0migrate_fd_wait_for_unfreeze, > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0migrate_fd_close); > + > + =A0 =A0DPRINTF("beginning savevm\n"); > + =A0 =A0ret =3D qemu_savevm_state_begin(s->mon, s->file, s->blk, s->shar= ed); > + =A0 =A0if (ret < 0) { > + =A0 =A0 =A0 =A0DPRINTF("failed, %d\n", ret); > + =A0 =A0 =A0 =A0migrate_fd_error(s); > + =A0 =A0 =A0 =A0return; > + =A0 =A0} > + > + =A0 =A0migrate_fd_put_ready(s); > +} > + > =A0MigrationState *migrate_create_state(Monitor *mon, int64_t bandwidth_l= imit, > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0int detach, int blk, int inc) > =A0{ > diff --git a/migration.h b/migration.h > index 0178414..048ee46 100644 > --- a/migration.h > +++ b/migration.h > @@ -100,20 +100,8 @@ MigrationState *fd_start_outgoing_migration(Monitor = *mon, > > =A0void migrate_fd_error(MigrationState *s); > > -int migrate_fd_cleanup(MigrationState *s); > - > -void migrate_fd_put_notify(void *opaque); > - > -ssize_t migrate_fd_put_buffer(void *opaque, const void *data, size_t siz= e); > - > =A0void migrate_fd_connect(MigrationState *s); > > -void migrate_fd_put_ready(void *opaque); > - > -void migrate_fd_wait_for_unfreeze(void *opaque); > - > -int migrate_fd_close(void *opaque); > - > =A0MigrationState *migrate_create_state(Monitor *mon, int64_t bandwidth_l= imit, > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0int detach, int blk, int inc); > Looks good to me. Yoshi > -- > 1.7.4 > > >