From patchwork Wed Apr 21 05:57:12 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshiaki Tamura X-Patchwork-Id: 50633 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 0492DB6EEB for ; Wed, 21 Apr 2010 17:03:10 +1000 (EST) Received: from localhost ([127.0.0.1]:54102 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O4TwT-0007Dl-Oz for incoming@patchwork.ozlabs.org; Wed, 21 Apr 2010 03:01:49 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O4T10-0003PY-Pk for qemu-devel@nongnu.org; Wed, 21 Apr 2010 02:02:27 -0400 Received: from [140.186.70.92] (port=36907 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O4T0b-0003Bm-PM for qemu-devel@nongnu.org; Wed, 21 Apr 2010 02:02:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O4T0B-0006gy-DL for qemu-devel@nongnu.org; Wed, 21 Apr 2010 02:02:00 -0400 Received: from sh.osrg.net ([192.16.179.4]:35926) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O4T09-0006e0-9x for qemu-devel@nongnu.org; Wed, 21 Apr 2010 02:01:33 -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 o3L61Qv1004085; Wed, 21 Apr 2010 15:01:26 +0900 Received: from localhost (hype-wd0.osrg.net [10.72.1.16]) by fs.osrg.net (Postfix) with ESMTP id 297B53E02F4; Wed, 21 Apr 2010 15:01:25 +0900 (JST) From: Yoshiaki Tamura To: kvm@vger.kernel.org, qemu-devel@nongnu.org Date: Wed, 21 Apr 2010 14:57:12 +0900 Message-Id: <1271829445-5328-8-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> X-Mailer: git-send-email 1.7.0.31.g1df487 In-Reply-To: <1271829445-5328-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> References: <1271829445-5328-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> X-Dispatcher: imput version 20070423(IM149) Lines: 97 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-3.0 (sh.osrg.net [192.16.179.4]); Wed, 21 Apr 2010 15:01:26 +0900 (JST) X-Virus-Scanned: clamav-milter 0.95.3 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, ohmura.kei@lab.ntt.co.jp, mtosatti@redhat.com, Yoshiaki Tamura , yoshikawa.takuya@oss.ntt.co.jp, avi@redhat.com Subject: [Qemu-devel] [RFC PATCH 07/20] Introduce qemu_put_vector() and qemu_put_vector_prepare() to use put_vector() in QEMUFile. 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 For fool proof purpose, qemu_put_vector_parepare should be called before qemu_put_vector. Then, if qemu_put_* functions except this is called after qemu_put_vector_prepare, program will abort(). Signed-off-by: Yoshiaki Tamura --- hw/hw.h | 2 ++ savevm.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 0 deletions(-) diff --git a/hw/hw.h b/hw/hw.h index 921cf90..10e6dda 100644 --- a/hw/hw.h +++ b/hw/hw.h @@ -77,6 +77,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_put_vector(QEMUFile *f, QEMUIOVector *qiov); +void qemu_put_vector_prepare(QEMUFile *f); void *qemu_realloc_buffer(QEMUFile *f, int size); void qemu_clear_buffer(QEMUFile *f); diff --git a/savevm.c b/savevm.c index 944e788..22d928c 100644 --- a/savevm.c +++ b/savevm.c @@ -180,6 +180,7 @@ struct QEMUFile { uint8_t *buf; int has_error; + int prepares_vector; }; typedef struct QEMUFileStdio @@ -557,6 +558,58 @@ void qemu_put_byte(QEMUFile *f, int v) qemu_fflush(f); } +void qemu_put_vector(QEMUFile *f, QEMUIOVector *v) +{ + struct iovec *iov; + int cnt; + size_t bufsize; + uint8_t *buf; + + if (qemu_file_get_rate_limit(f) != 0) { + fprintf(stderr, + "Attempted to write vector while bandwidth limit is not zero.\n"); + abort(); + } + + /* checks prepares vector. + * For fool proof purpose, qemu_put_vector_parepare should be called + * before qemu_put_vector. Then, if qemu_put_* functions except this + * is called after qemu_put_vector_prepare, program will abort(). + */ + if (!f->prepares_vector) { + fprintf(stderr, + "You should prepare with qemu_put_vector_prepare.\n"); + abort(); + } else if (f->prepares_vector && f->buf_index != 0) { + fprintf(stderr, "Wrote data after qemu_put_vector_prepare.\n"); + abort(); + } + f->prepares_vector = 0; + + if (f->put_vector) { + qemu_iovec_to_vector(v, &iov, &cnt); + f->put_vector(f->opaque, iov, 0, cnt); + } else { + qemu_iovec_to_size(v, &bufsize); + buf = qemu_malloc(bufsize + 1 /* for '\0' */); + qemu_iovec_to_buffer(v, buf); + qemu_put_buffer(f, buf, bufsize); + qemu_free(buf); + } + +} + +void qemu_put_vector_prepare(QEMUFile *f) +{ + if (f->prepares_vector) { + /* prepare vector */ + fprintf(stderr, "Attempted to prepare vector twice\n"); + abort(); + } + f->prepares_vector = 1; + qemu_fflush(f); +} + int qemu_get_buffer(QEMUFile *f, uint8_t *buf, int size1) { int size, l;