From patchwork Tue May 25 08:36:46 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshiaki Tamura X-Patchwork-Id: 53523 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 30BFFB7D59 for ; Tue, 25 May 2010 19:19:24 +1000 (EST) Received: from localhost ([127.0.0.1]:51703 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OGqI3-0003wx-Uc for incoming@patchwork.ozlabs.org; Tue, 25 May 2010 05:19:12 -0400 Received: from [140.186.70.92] (port=48417 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OGpgl-0003DY-9X for qemu-devel@nongnu.org; Tue, 25 May 2010 04:40:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OGpga-0003fO-4B for qemu-devel@nongnu.org; Tue, 25 May 2010 04:40:37 -0400 Received: from sh.osrg.net ([192.16.179.4]:51648) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OGpgZ-0003aV-HK for qemu-devel@nongnu.org; Tue, 25 May 2010 04:40:28 -0400 Received: from fs.osrg.net (postfix@fs.osrg.net [10.0.0.12]) by sh.osrg.net (8.14.3/8.14.3/OSRG-NET) with ESMTP id o4P8eJ2Q010198; Tue, 25 May 2010 17:40:19 +0900 Received: from localhost (hype-wd0.osrg.net [10.72.1.16]) by fs.osrg.net (Postfix) with ESMTP id B694D3E02FC; Tue, 25 May 2010 17:40:17 +0900 (JST) From: Yoshiaki Tamura To: kvm@vger.kernel.org, qemu-devel@nongnu.org Date: Tue, 25 May 2010 17:36:46 +0900 Message-Id: <1274776624-16435-7-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> X-Mailer: git-send-email 1.7.0.31.g1df487 In-Reply-To: <1274776624-16435-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> References: <1274776624-16435-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> X-Dispatcher: imput version 20070423(IM149) Lines: 78 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-3.0 (sh.osrg.net [192.16.179.4]); Tue, 25 May 2010 17:40:19 +0900 (JST) X-Virus-Scanned: clamav-milter 0.96 at sh X-Virus-Status: Clean X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: aliguori@us.ibm.com, mtosatti@redhat.com, avi@redhat.com, Yoshiaki Tamura , ohmura.kei@lab.ntt.co.jp Subject: [Qemu-devel] [RFC PATCH 05/23] Make QEMUFile buf expandable, and introduce qemu_realloc_buffer() and qemu_clear_buffer(). X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Currently buf size is fixed at 32KB. It would be useful if it could be flexible. Signed-off-by: Yoshiaki Tamura --- hw/hw.h | 2 ++ savevm.c | 21 ++++++++++++++++++++- 2 files changed, 22 insertions(+), 1 deletions(-) diff --git a/hw/hw.h b/hw/hw.h index 05131a0..fc9ed29 100644 --- a/hw/hw.h +++ b/hw/hw.h @@ -61,6 +61,8 @@ void qemu_fflush(QEMUFile *f); int qemu_fclose(QEMUFile *f); void qemu_put_buffer(QEMUFile *f, const uint8_t *buf, int size); void qemu_put_byte(QEMUFile *f, int v); +void *qemu_realloc_buffer(QEMUFile *f, int size); +void qemu_clear_buffer(QEMUFile *f); static inline void qemu_put_ubyte(QEMUFile *f, unsigned int v) { diff --git a/savevm.c b/savevm.c index 2fd3de6..b9bb9f4 100644 --- a/savevm.c +++ b/savevm.c @@ -174,7 +174,8 @@ struct QEMUFile { when reading */ int buf_index; int buf_size; /* 0 when writing */ - uint8_t buf[IO_BUF_SIZE]; + int buf_max_size; + uint8_t *buf; int has_error; }; @@ -424,6 +425,9 @@ QEMUFile *qemu_fopen_ops(void *opaque, QEMUFilePutBufferFunc *put_buffer, f->get_rate_limit = get_rate_limit; f->is_write = 0; + f->buf_max_size = IO_BUF_SIZE; + f->buf = qemu_mallocz(sizeof(uint8_t) * f->buf_max_size); + return f; } @@ -454,6 +458,20 @@ void qemu_fflush(QEMUFile *f) } } +void *qemu_realloc_buffer(QEMUFile *f, int size) +{ + f->buf_max_size = size; + f->buf = qemu_realloc(f->buf, f->buf_max_size); + + return f->buf; +} + +void qemu_clear_buffer(QEMUFile *f) +{ + f->buf_size = f->buf_index = f->buf_offset = 0; + memset(f->buf, 0, f->buf_max_size); +} + static void qemu_fill_buffer(QEMUFile *f) { int len; @@ -479,6 +497,7 @@ int qemu_fclose(QEMUFile *f) qemu_fflush(f); if (f->close) ret = f->close(f->opaque); + qemu_free(f->buf); qemu_free(f); return ret; }