From patchwork Mon Jun 4 09:57:30 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 162726 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D088CB72C0 for ; Mon, 4 Jun 2012 21:04:55 +1000 (EST) Received: from localhost ([::1]:41810 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SbU5c-0003Aq-4d for incoming@patchwork.ozlabs.org; Mon, 04 Jun 2012 06:00:44 -0400 Received: from eggs.gnu.org ([208.118.235.92]:51094) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SbU35-00005t-Pq for qemu-devel@nongnu.org; Mon, 04 Jun 2012 05:58:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SbU2r-0004en-PR for qemu-devel@nongnu.org; Mon, 04 Jun 2012 05:58:07 -0400 Received: from mail.valinux.co.jp ([210.128.90.3]:46521) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SbU2r-0004c6-8W for qemu-devel@nongnu.org; Mon, 04 Jun 2012 05:57:53 -0400 Received: from ps.local.valinux.co.jp (vagw.valinux.co.jp [210.128.90.14]) by mail.valinux.co.jp (Postfix) with SMTP id C81DA48995; Mon, 4 Jun 2012 18:57:46 +0900 (JST) Received: (nullmailer pid 5158 invoked by uid 1000); Mon, 04 Jun 2012 09:57:45 -0000 From: Isaku Yamahata To: qemu-devel@nongnu.org, kvm@vger.kernel.org Date: Mon, 4 Jun 2012 18:57:30 +0900 Message-Id: <4db94d12163b571b33cff80fe93b052a4cfc8422.1338802192.git.yamahata@valinux.co.jp> X-Mailer: git-send-email 1.7.1.1 In-Reply-To: References: In-Reply-To: References: X-Virus-Scanned: clamav-milter 0.95.2 at va-mail.local.valinux.co.jp X-Virus-Status: Clean X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 210.128.90.3 Cc: benoit.hudzia@gmail.com, aarcange@redhat.com, aliguori@us.ibm.com, quintela@redhat.com, stefanha@gmail.com, t.hirofuchi@aist.go.jp, dlaor@redhat.com, satoshi.itoh@aist.go.jp, mdroth@linux.vnet.ibm.com, yoshikawa.takuya@oss.ntt.co.jp, owasserm@redhat.com, avi@redhat.com, pbonzini@redhat.com Subject: [Qemu-devel] [PATCH v2 28/41] buffered_file: add qemu_file to read/write to buffer in memory X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This is used by postcopy live migration. Signed-off-by: Isaku Yamahata --- buffered_file.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ buffered_file.h | 10 ++++++++++ 2 files changed, 60 insertions(+), 0 deletions(-) diff --git a/buffered_file.c b/buffered_file.c index 5198923..4f0c98e 100644 --- a/buffered_file.c +++ b/buffered_file.c @@ -106,6 +106,56 @@ static void buffer_flush(QEMUBuffer *buf, QEMUFile *file, /*************************************************************************** + * read/write to buffer on memory + */ + +static int buf_close(void *opaque) +{ + QEMUFileBuf *s = opaque; + buffer_destroy(&s->buf); + g_free(s); + return 0; +} + +static int buf_put_buffer(void *opaque, + const uint8_t *buf, int64_t pos, int size) +{ + QEMUFileBuf *s = opaque; + buffer_append(&s->buf, buf, size); + return size; +} + +QEMUFileBuf *qemu_fopen_buf_write(void) +{ + QEMUFileBuf *s = g_malloc0(sizeof(*s)); + + s->file = qemu_fopen_ops(s, buf_put_buffer, NULL, buf_close, + NULL, NULL, NULL); + return s; +} + +static int buf_get_buffer(void *opaque, uint8_t *buf, int64_t pos, int size) +{ + QEMUFileBuf *s = opaque; + ssize_t len = MIN(size, s->buf.buffer_capacity - s->buf.buffer_size); + memcpy(buf, s->buf.buffer + s->buf.buffer_size, len); + s->buf.buffer_size += len; + return len; +} + +/* This get the ownership of buf. */ +QEMUFile *qemu_fopen_buf_read(uint8_t *buf, size_t size) +{ + QEMUFileBuf *s = g_malloc0(sizeof(*s)); + s->buf.buffer = buf; + s->buf.buffer_size = 0; /* this is used as index to read */ + s->buf.buffer_capacity = size; + s->file = qemu_fopen_ops(s, NULL, buf_get_buffer, buf_close, + NULL, NULL, NULL); + return s->file; +} + +/*************************************************************************** * Nonblocking write only file */ static ssize_t nonblock_flush_buffer_putbuf(void *opaque, diff --git a/buffered_file.h b/buffered_file.h index 2712e01..9e28bef 100644 --- a/buffered_file.h +++ b/buffered_file.h @@ -24,6 +24,16 @@ struct QEMUBuffer { }; typedef struct QEMUBuffer QEMUBuffer; +struct QEMUFileBuf { + QEMUFile *file; + QEMUBuffer buf; +}; +typedef struct QEMUFileBuf QEMUFileBuf; + +QEMUFileBuf *qemu_fopen_buf_write(void); +/* This get the ownership of buf. */ +QEMUFile *qemu_fopen_buf_read(uint8_t *buf, size_t size); + struct QEMUFileNonblock { int fd; QEMUFile *file;