From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35863) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZPrQA-0001QQ-Nw for qemu-devel@nongnu.org; Thu, 13 Aug 2015 08:15:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZPrQ6-0008MA-Dl for qemu-devel@nongnu.org; Thu, 13 Aug 2015 08:15:46 -0400 Received: from szxga01-in.huawei.com ([58.251.152.64]:44072) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZPrQ5-0008Ks-MN for qemu-devel@nongnu.org; Thu, 13 Aug 2015 08:15:42 -0400 References: <1439463094-5394-1-git-send-email-dgilbert@redhat.com> <1439463094-5394-6-git-send-email-dgilbert@redhat.com> From: zhanghailiang Message-ID: <55CC8A55.5010000@huawei.com> Date: Thu, 13 Aug 2015 20:15:17 +0800 MIME-Version: 1.0 In-Reply-To: <1439463094-5394-6-git-send-email-dgilbert@redhat.com> Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 5/5] migration: qemu-file more size_t'ifying List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Dr. David Alan Gilbert (git)" , qemu-devel@nongnu.org Cc: amit.shah@redhat.com, peter.huangpeng@huawei.com, quintela@redhat.com On 2015/8/13 18:51, Dr. David Alan Gilbert (git) wrote: > From: "Dr. David Alan Gilbert" > > This time convert the external functions: > qemu_get_buffer, qemu_peek_buffer > qemu_put_buffer and qemu_put_buffer_async > > Signed-off-by: Dr. David Alan Gilbert > --- Reviewed-by: zhanghailiang > include/migration/qemu-file.h | 10 +++++----- > migration/qemu-file.c | 22 +++++++++++----------- > 2 files changed, 16 insertions(+), 16 deletions(-) > > diff --git a/include/migration/qemu-file.h b/include/migration/qemu-file.h > index e1e2bab..29a338d 100644 > --- a/include/migration/qemu-file.h > +++ b/include/migration/qemu-file.h > @@ -126,13 +126,13 @@ int qemu_get_fd(QEMUFile *f); > int qemu_fclose(QEMUFile *f); > int64_t qemu_ftell(QEMUFile *f); > int64_t qemu_ftell_fast(QEMUFile *f); > -void qemu_put_buffer(QEMUFile *f, const uint8_t *buf, int size); > +void qemu_put_buffer(QEMUFile *f, const uint8_t *buf, size_t size); > void qemu_put_byte(QEMUFile *f, int v); > /* > * put_buffer without copying the buffer. > * The buffer should be available till it is sent asynchronously. > */ > -void qemu_put_buffer_async(QEMUFile *f, const uint8_t *buf, int size); > +void qemu_put_buffer_async(QEMUFile *f, const uint8_t *buf, size_t size); > bool qemu_file_mode_is_not_valid(const char *mode); > bool qemu_file_is_writable(QEMUFile *f); > > @@ -161,8 +161,8 @@ static inline void qemu_put_ubyte(QEMUFile *f, unsigned int v) > void qemu_put_be16(QEMUFile *f, unsigned int v); > void qemu_put_be32(QEMUFile *f, unsigned int v); > void qemu_put_be64(QEMUFile *f, uint64_t v); > -int qemu_peek_buffer(QEMUFile *f, uint8_t **buf, int size, size_t offset); > -int qemu_get_buffer(QEMUFile *f, uint8_t *buf, int size); > +size_t qemu_peek_buffer(QEMUFile *f, uint8_t **buf, size_t size, size_t offset); > +size_t qemu_get_buffer(QEMUFile *f, uint8_t *buf, size_t size); > ssize_t qemu_put_compression_data(QEMUFile *f, const uint8_t *p, size_t size, > int level); > int qemu_put_qemu_file(QEMUFile *f_des, QEMUFile *f_src); > @@ -237,7 +237,7 @@ static inline void qemu_get_8s(QEMUFile *f, uint8_t *pv) > } > > // Signed versions for type safety > -static inline void qemu_put_sbuffer(QEMUFile *f, const int8_t *buf, int size) > +static inline void qemu_put_sbuffer(QEMUFile *f, const int8_t *buf, size_t size) > { > qemu_put_buffer(f, (const uint8_t *)buf, size); > } > diff --git a/migration/qemu-file.c b/migration/qemu-file.c > index 6bb3dc1..b273b1a 100644 > --- a/migration/qemu-file.c > +++ b/migration/qemu-file.c > @@ -270,7 +270,7 @@ int qemu_fclose(QEMUFile *f) > return ret; > } > > -static void add_to_iovec(QEMUFile *f, const uint8_t *buf, int size) > +static void add_to_iovec(QEMUFile *f, const uint8_t *buf, size_t size) > { > /* check for adjacent buffer and coalesce them */ > if (f->iovcnt > 0 && buf == f->iov[f->iovcnt - 1].iov_base + > @@ -286,7 +286,7 @@ static void add_to_iovec(QEMUFile *f, const uint8_t *buf, int size) > } > } > > -void qemu_put_buffer_async(QEMUFile *f, const uint8_t *buf, int size) > +void qemu_put_buffer_async(QEMUFile *f, const uint8_t *buf, size_t size) > { > if (!f->ops->writev_buffer) { > qemu_put_buffer(f, buf, size); > @@ -301,9 +301,9 @@ void qemu_put_buffer_async(QEMUFile *f, const uint8_t *buf, int size) > add_to_iovec(f, buf, size); > } > > -void qemu_put_buffer(QEMUFile *f, const uint8_t *buf, int size) > +void qemu_put_buffer(QEMUFile *f, const uint8_t *buf, size_t size) > { > - int l; > + size_t l; > > if (f->last_error) { > return; > @@ -363,10 +363,10 @@ void qemu_file_skip(QEMUFile *f, int size) > * return as many as it managed to read (assuming blocking fd's which > * all current QEMUFile are) > */ > -int qemu_peek_buffer(QEMUFile *f, uint8_t **buf, int size, size_t offset) > +size_t qemu_peek_buffer(QEMUFile *f, uint8_t **buf, size_t size, size_t offset) > { > - int pending; > - int index; > + ssize_t pending; > + size_t index; > > assert(!qemu_file_is_writable(f)); > assert(offset < IO_BUF_SIZE); > @@ -411,13 +411,13 @@ int qemu_peek_buffer(QEMUFile *f, uint8_t **buf, int size, size_t offset) > * return as many as it managed to read (assuming blocking fd's which > * all current QEMUFile are) > */ > -int qemu_get_buffer(QEMUFile *f, uint8_t *buf, int size) > +size_t qemu_get_buffer(QEMUFile *f, uint8_t *buf, size_t size) > { > - int pending = size; > - int done = 0; > + size_t pending = size; > + size_t done = 0; > > while (pending > 0) { > - int res; > + size_t res; > uint8_t *src; > > res = qemu_peek_buffer(f, &src, MIN(pending, IO_BUF_SIZE), 0); >