From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:48828) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGTaU-0005tA-Fm for qemu-devel@nongnu.org; Tue, 25 Sep 2012 07:46:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TGTaP-0007ms-OH for qemu-devel@nongnu.org; Tue, 25 Sep 2012 07:46:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:6153) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGTaP-0007mn-Eb for qemu-devel@nongnu.org; Tue, 25 Sep 2012 07:45:57 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q8PBjuj5016096 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 25 Sep 2012 07:45:56 -0400 Message-ID: <50619979.4080206@redhat.com> Date: Tue, 25 Sep 2012 13:46:01 +0200 From: Orit Wasserman MIME-Version: 1.0 References: <1348217255-22441-1-git-send-email-quintela@redhat.com> <1348217255-22441-19-git-send-email-quintela@redhat.com> In-Reply-To: <1348217255-22441-19-git-send-email-quintela@redhat.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 18/41] buffered_file: opaque is MigrationState List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Juan Quintela Cc: qemu-devel@nongnu.org On 09/21/2012 11:47 AM, Juan Quintela wrote: > It always have that type, just change it. > > Signed-off-by: Juan Quintela > --- > buffered_file.c | 6 +++--- > buffered_file.h | 4 +++- > 2 files changed, 6 insertions(+), 4 deletions(-) > > diff --git a/buffered_file.c b/buffered_file.c > index 33b700b..59d952d 100644 > --- a/buffered_file.c > +++ b/buffered_file.c > @@ -27,7 +27,7 @@ typedef struct QEMUFileBuffered > BufferedPutReadyFunc *put_ready; > BufferedWaitForUnfreezeFunc *wait_for_unfreeze; > BufferedCloseFunc *close; > - void *migration_state; > + MigrationState *migration_state; > QEMUFile *file; > int freeze_output; > size_t bytes_xfer; > @@ -226,7 +226,7 @@ static void buffered_rate_tick(void *opaque) > buffered_put_buffer(s, NULL, 0, 0); > } > > -QEMUFile *qemu_fopen_ops_buffered(void *opaque, > +QEMUFile *qemu_fopen_ops_buffered(MigrationState *migration_state, > size_t bytes_per_sec, > BufferedPutFunc *put_buffer, > BufferedPutReadyFunc *put_ready, > @@ -237,7 +237,7 @@ QEMUFile *qemu_fopen_ops_buffered(void *opaque, > > s = g_malloc0(sizeof(*s)); > > - s->migration_state = opaque; > + s->migration_state = migration_state; > s->xfer_limit = bytes_per_sec / 10; > s->put_buffer = put_buffer; > s->put_ready = put_ready; > diff --git a/buffered_file.h b/buffered_file.h > index 98d358b..39f7fa0 100644 > --- a/buffered_file.h > +++ b/buffered_file.h > @@ -15,13 +15,15 @@ > #define QEMU_BUFFERED_FILE_H > > #include "hw/hw.h" > +#include "migration.h" > > typedef ssize_t (BufferedPutFunc)(void *opaque, const void *data, size_t size); > typedef void (BufferedPutReadyFunc)(void *opaque); > typedef void (BufferedWaitForUnfreezeFunc)(void *opaque); > typedef int (BufferedCloseFunc)(void *opaque); > > -QEMUFile *qemu_fopen_ops_buffered(void *opaque, size_t xfer_limit, > +QEMUFile *qemu_fopen_ops_buffered(MigrationState *migration_state, > + size_t xfer_limit, > BufferedPutFunc *put_buffer, > BufferedPutReadyFunc *put_ready, > BufferedWaitForUnfreezeFunc *wait_for_unfreeze, > Again why ? this is a general buffered file not just for migration use. Orit