Received: from eggs.gnu.org ([208.118.235.92]:36484) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UFc4z-0007MP-JA for qemu-devel@nongnu.org; Tue, 12 Mar 2013 23:10:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UFc4s-0002UG-2u for qemu-devel@nongnu.org; Tue, 12 Mar 2013 23:10:13 -0400 Received: from e8.ny.us.ibm.com ([32.97.182.138]:35288) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UFc4r-0002TD-Vf for qemu-devel@nongnu.org; Tue, 12 Mar 2013 23:10:06 -0400 Received: from /spool/local by e8.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 12 Mar 2013 23:10:05 -0400 Received: from d01relay03.pok.ibm.com (d01relay03.pok.ibm.com [9.56.227.235]) by d01dlp01.pok.ibm.com (Postfix) with ESMTP id 270C238C801C for ; Tue, 12 Mar 2013 23:10:02 -0400 (EDT) Received: from d01av02.pok.ibm.com (d01av02.pok.ibm.com [9.56.224.216]) by d01relay03.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r2D3A2qx313518 for ; Tue, 12 Mar 2013 23:10:02 -0400 Received: from d01av02.pok.ibm.com (loopback [127.0.0.1]) by d01av02.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r2D3A04L029424 for ; Wed, 13 Mar 2013 00:10:01 -0300 From: Joel Schopp Date: Tue, 12 Mar 2013 22:09:36 -0500 Message-Id: <1363144182-1016-4-git-send-email-jschopp@linux.vnet.ibm.com> In-Reply-To: <1363144182-1016-1-git-send-email-jschopp@linux.vnet.ibm.com> References: <1363144182-1016-1-git-send-email-jschopp@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 3/9] two new file wrappers List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Joel Schopp , Stefan Berger , Michael Tsirkin Add a 3 very short file wrapper functions to make code that follows more readable. Also export an existing function that is currently static. Cc: Michael Tsirkin Signed-off-by: Stefan Berger Signed-off-by: Joel Schopp --- include/migration/qemu-file.h | 3 +++ qemu-file.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/include/migration/qemu-file.h b/include/migration/qemu-file.h index 7194b84..728b6e2 100644 --- a/include/migration/qemu-file.h +++ b/include/migration/qemu-file.h @@ -68,6 +68,9 @@ int qemu_fclose(QEMUFile *f); int64_t qemu_ftell(QEMUFile *f); void qemu_put_buffer(QEMUFile *f, const uint8_t *buf, int size); void qemu_put_byte(QEMUFile *f, int v); +int qemu_read_bytes(QEMUFile *f, uint8_t *buf, int size); +int qemu_peek_bytes(QEMUFile *f, uint8_t *buf, int size, size_t offset); +int qemu_write_bytes(QEMUFile *f, const uint8_t *buf, int size); static inline void qemu_put_ubyte(QEMUFile *f, unsigned int v) { diff --git a/qemu-file.c b/qemu-file.c index 4fed6d5..f8a54e7 100644 --- a/qemu-file.c +++ b/qemu-file.c @@ -713,3 +713,33 @@ uint64_t qemu_get_be64(QEMUFile *f) return v; } +int qemu_read_bytes(QEMUFile *f, uint8_t *buf, int size) +{ + if (qemu_file_get_error(f)) { + return -1; + } + return qemu_get_buffer(f, buf, size); +} + +int qemu_peek_bytes(QEMUFile *f, uint8_t *buf, int size, size_t offset) +{ + if (qemu_file_get_error(f)) { + return -1; + } + return qemu_peek_buffer(f, buf, size, offset); +} + +int qemu_write_bytes(QEMUFile *f, const uint8_t *buf, int size) +{ + if (qemu_file_get_error(f)) { + return -1; + } + + qemu_put_buffer(f, buf, size); + + if (qemu_file_get_error(f)) { + return -1; + } + + return size; +} -- 1.7.10.4