From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:53119) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TF2Sl-0004cT-7d for qemu-devel@nongnu.org; Fri, 21 Sep 2012 08:36:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TF2Sd-0006UB-Hp for qemu-devel@nongnu.org; Fri, 21 Sep 2012 08:36:07 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:63963) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TF2Sd-0006U4-BS for qemu-devel@nongnu.org; Fri, 21 Sep 2012 08:35:59 -0400 Received: by pbbrp12 with SMTP id rp12so7589524pbb.4 for ; Fri, 21 Sep 2012 05:35:58 -0700 (PDT) Sender: Paolo Bonzini Message-ID: <505C5F29.4070801@redhat.com> Date: Fri, 21 Sep 2012 14:35:53 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <1348217255-22441-1-git-send-email-quintela@redhat.com> <1348217255-22441-24-git-send-email-quintela@redhat.com> In-Reply-To: <1348217255-22441-24-git-send-email-quintela@redhat.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 23/41] buffered_file: We can access directly to bandwidth_limit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Juan Quintela Cc: qemu-devel@nongnu.org Il 21/09/2012 10:47, Juan Quintela ha scritto: > Signed-off-by: Juan Quintela > --- > buffered_file.c | 5 ++--- > buffered_file.h | 3 +-- > migration.c | 2 +- > 3 files changed, 4 insertions(+), 6 deletions(-) > > diff --git a/buffered_file.c b/buffered_file.c > index 4fca774..43e68b6 100644 > --- a/buffered_file.c > +++ b/buffered_file.c > @@ -222,15 +222,14 @@ static void buffered_rate_tick(void *opaque) > buffered_put_buffer(s, NULL, 0, 0); > } > > -QEMUFile *qemu_fopen_ops_buffered(MigrationState *migration_state, > - size_t bytes_per_sec) > +QEMUFile *qemu_fopen_ops_buffered(MigrationState *migration_state) > { > QEMUFileBuffered *s; > > s = g_malloc0(sizeof(*s)); > > s->migration_state = migration_state; > - s->xfer_limit = bytes_per_sec / 10; > + s->xfer_limit = migration_state->bandwidth_limit / 10; > > s->file = qemu_fopen_ops(s, buffered_put_buffer, NULL, > buffered_close, buffered_rate_limit, > diff --git a/buffered_file.h b/buffered_file.h > index 8a38754..ef010fe 100644 > --- a/buffered_file.h > +++ b/buffered_file.h > @@ -17,7 +17,6 @@ > #include "hw/hw.h" > #include "migration.h" > > -QEMUFile *qemu_fopen_ops_buffered(MigrationState *migration_state, > - size_t xfer_limit); > +QEMUFile *qemu_fopen_ops_buffered(MigrationState *migration_state); > > #endif > diff --git a/migration.c b/migration.c > index 6f1e4d3..56014dd 100644 > --- a/migration.c > +++ b/migration.c > @@ -427,7 +427,7 @@ void migrate_fd_connect(MigrationState *s) > int ret; > > s->state = MIG_STATE_ACTIVE; > - s->file = qemu_fopen_ops_buffered(s, s->bandwidth_limit); > + s->file = qemu_fopen_ops_buffered(s); > > DPRINTF("beginning savevm\n"); > ret = qemu_savevm_state_begin(s->file, &s->params); > Reviewed-by: Paolo Bonzini Paolo