From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:49548) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UFqrG-0001aW-CZ for qemu-devel@nongnu.org; Wed, 13 Mar 2013 14:57:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UFqr9-00039L-Ab for qemu-devel@nongnu.org; Wed, 13 Mar 2013 14:57:02 -0400 Received: from e34.co.us.ibm.com ([32.97.110.152]:51191) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UFqr9-00038x-33 for qemu-devel@nongnu.org; Wed, 13 Mar 2013 14:56:55 -0400 Received: from /spool/local by e34.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 13 Mar 2013 12:56:54 -0600 Received: from d03relay01.boulder.ibm.com (d03relay01.boulder.ibm.com [9.17.195.226]) by d03dlp02.boulder.ibm.com (Postfix) with ESMTP id CB3333E4003E for ; Wed, 13 Mar 2013 12:56:39 -0600 (MDT) Received: from d03av01.boulder.ibm.com (d03av01.boulder.ibm.com [9.17.195.167]) by d03relay01.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r2DIudus038380 for ; Wed, 13 Mar 2013 12:56:39 -0600 Received: from d03av01.boulder.ibm.com (loopback [127.0.0.1]) by d03av01.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r2DIuc72007193 for ; Wed, 13 Mar 2013 12:56:38 -0600 From: Joel Schopp Date: Wed, 13 Mar 2013 13:56:22 -0500 Message-Id: <1363200988-17865-4-git-send-email-jschopp@linux.vnet.ibm.com> In-Reply-To: <1363200988-17865-1-git-send-email-jschopp@linux.vnet.ibm.com> References: <1363200988-17865-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 +++ util/qemu-file.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/include/migration/qemu-file.h b/include/migration/qemu-file.h index b76a901..07d8362 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/util/qemu-file.c b/util/qemu-file.c index 44b52b4..e698713 100644 --- a/util/qemu-file.c +++ b/util/qemu-file.c @@ -680,3 +680,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