From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:33906) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGTW4-0004Cp-UU for qemu-devel@nongnu.org; Tue, 25 Sep 2012 07:41:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TGTW3-0006B0-N4 for qemu-devel@nongnu.org; Tue, 25 Sep 2012 07:41:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:26454) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGTW3-0006AR-Eq for qemu-devel@nongnu.org; Tue, 25 Sep 2012 07:41:27 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q8PBfQkj017197 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 25 Sep 2012 07:41:26 -0400 Message-ID: <5061986B.3070503@redhat.com> Date: Tue, 25 Sep 2012 13:41:31 +0200 From: Orit Wasserman MIME-Version: 1.0 References: <1348217255-22441-1-git-send-email-quintela@redhat.com> <1348217255-22441-18-git-send-email-quintela@redhat.com> In-Reply-To: <1348217255-22441-18-git-send-email-quintela@redhat.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 17/41] buffered_file: rename opaque to migration_state 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: > Signed-off-by: Juan Quintela > --- > buffered_file.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/buffered_file.c b/buffered_file.c > index 7155800..33b700b 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 *opaque; > + void *migration_state; Why ? This doesn't have to be for migration use only. Orit > QEMUFile *file; > int freeze_output; > size_t bytes_xfer; > @@ -78,7 +78,7 @@ static void buffered_flush(QEMUFileBuffered *s) > while (s->bytes_xfer < s->xfer_limit && offset < s->buffer_size) { > ssize_t ret; > > - ret = s->put_buffer(s->opaque, s->buffer + offset, > + ret = s->put_buffer(s->migration_state, s->buffer + offset, > s->buffer_size - offset); > if (ret == -EAGAIN) { > DPRINTF("backend not ready, freezing\n"); > @@ -129,7 +129,7 @@ static int buffered_put_buffer(void *opaque, const uint8_t *buf, int64_t pos, in > DPRINTF("file is ready\n"); > if (!s->freeze_output && s->bytes_xfer < s->xfer_limit) { > DPRINTF("notifying client\n"); > - s->put_ready(s->opaque); > + s->put_ready(s->migration_state); > } > } > > @@ -147,10 +147,10 @@ static int buffered_close(void *opaque) > while (!qemu_file_get_error(s->file) && s->buffer_size) { > buffered_flush(s); > if (s->freeze_output) > - s->wait_for_unfreeze(s->opaque); > + s->wait_for_unfreeze(s->migration_state); > } > > - ret = s->close(s->opaque); > + ret = s->close(s->migration_state); > > qemu_del_timer(s->timer); > qemu_free_timer(s->timer); > @@ -237,7 +237,7 @@ QEMUFile *qemu_fopen_ops_buffered(void *opaque, > > s = g_malloc0(sizeof(*s)); > > - s->opaque = opaque; > + s->migration_state = opaque; > s->xfer_limit = bytes_per_sec / 10; > s->put_buffer = put_buffer; > s->put_ready = put_ready; >