From patchwork Thu Oct 18 09:51:32 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Wang X-Patchwork-Id: 192252 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 09B142C0080 for ; Thu, 18 Oct 2012 20:52:11 +1100 (EST) Received: from localhost ([::1]:54408 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOmlt-0007Xs-6Y for incoming@patchwork.ozlabs.org; Thu, 18 Oct 2012 05:52:09 -0400 Received: from eggs.gnu.org ([208.118.235.92]:47386) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOmla-0007GB-S7 for qemu-devel@nongnu.org; Thu, 18 Oct 2012 05:51:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TOmlW-0001Fo-H0 for qemu-devel@nongnu.org; Thu, 18 Oct 2012 05:51:50 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:55219) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOmlW-0001Fg-A2 for qemu-devel@nongnu.org; Thu, 18 Oct 2012 05:51:46 -0400 Received: by mail-pb0-f45.google.com with SMTP id rp2so8272621pbb.4 for ; Thu, 18 Oct 2012 02:51:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=jqGTbNEWsgP1zFzSQPWxBG5frAagkNrWTjRZMltAazk=; b=vAwDaRFF5DbIcrND8Rkeqim5/TtR6O+grsx9441P/tOtxJn14a60/WVBeih0KZxcXJ a7PUBB3G+as6eM5/Y0bI+u8kNl2RhRc/G9XgQeO7p3+Pwdf8LM2/KC84MgFl/OtVmsLM ZIlBnIkfzFtK00eNTOWXtbRtaAYf4QC7Z4GNdQTB9Hsxf/FXFt0KK6w73CBQoRzqWcAs wPvvDzGD/MIGVl/5IPTnXfk11amx/h5w5g7OoOG5OGE8Bdra1yjc5jmixtzw646qXUSk o4E1JjpX0ic/FoOrUKCWQ5ZiuJxK2+j01QtbL6N6j8SoP3GHRR66YqUVoNnEJxEtO/7Z xojg== Received: by 10.68.189.132 with SMTP id gi4mr64100503pbc.111.1350553905323; Thu, 18 Oct 2012 02:51:45 -0700 (PDT) Received: from localhost.localdomain ([202.108.130.138]) by mx.google.com with ESMTPS id hu5sm3543570pbc.72.2012.10.18.02.51.43 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 18 Oct 2012 02:51:44 -0700 (PDT) From: Dong Xu Wang To: qemu-devel@nongnu.org Date: Thu, 18 Oct 2012 17:51:32 +0800 Message-Id: <1350553895-3388-4-git-send-email-wdongxu@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1350553895-3388-1-git-send-email-wdongxu@linux.vnet.ibm.com> References: <1350553895-3388-1-git-send-email-wdongxu@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 Cc: kwolf@redhat.com, Dong Xu Wang Subject: [Qemu-devel] [PATCH V13 3/6] qed_read_string to bdrv_read_string 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 Make qed_read_string function to a common interface, so move it to block.c. Signed-off-by: Dong Xu Wang --- block.c | 27 +++++++++++++++++++++++++++ block.h | 2 ++ block/qed.c | 34 ++++------------------------------ 3 files changed, 33 insertions(+), 30 deletions(-) diff --git a/block.c b/block.c index 03ba485..9afb7b5 100644 --- a/block.c +++ b/block.c @@ -215,6 +215,33 @@ int path_has_protocol(const char *path) return *p == ':'; } +/** + * Read a string of known length from the image file + * + * @bs: Image file + * @offset: File offset to start of string, in bytes + * @n: String length in bytes + * @buf: Destination buffer + * @buflen: Destination buffer length in bytes + * @ret: 0 on success, -errno on failure + * + * The string is NUL-terminated. + */ +int bdrv_read_string(BlockDriverState *bs, uint64_t offset, size_t n, + char *buf, size_t buflen) +{ + int ret; + if (n >= buflen) { + return -EINVAL; + } + ret = bdrv_pread(bs, offset, buf, n); + if (ret < 0) { + return ret; + } + buf[n] = '\0'; + return 0; +} + int path_is_absolute(const char *path) { #ifdef _WIN32 diff --git a/block.h b/block.h index 364ba04..166e00c 100644 --- a/block.h +++ b/block.h @@ -168,6 +168,8 @@ int bdrv_pwrite_sync(BlockDriverState *bs, int64_t offset, const void *buf, int count); int coroutine_fn bdrv_co_readv(BlockDriverState *bs, int64_t sector_num, int nb_sectors, QEMUIOVector *qiov); +int bdrv_read_string(BlockDriverState *bs, uint64_t offset, size_t n, + char *buf, size_t buflen); int coroutine_fn bdrv_co_copy_on_readv(BlockDriverState *bs, int64_t sector_num, int nb_sectors, QEMUIOVector *qiov); int coroutine_fn bdrv_co_writev(BlockDriverState *bs, int64_t sector_num, diff --git a/block/qed.c b/block/qed.c index 0a9dbe8..096de21 100644 --- a/block/qed.c +++ b/block/qed.c @@ -217,33 +217,6 @@ static bool qed_is_image_size_valid(uint64_t image_size, uint32_t cluster_size, } /** - * Read a string of known length from the image file - * - * @file: Image file - * @offset: File offset to start of string, in bytes - * @n: String length in bytes - * @buf: Destination buffer - * @buflen: Destination buffer length in bytes - * @ret: 0 on success, -errno on failure - * - * The string is NUL-terminated. - */ -static int qed_read_string(BlockDriverState *file, uint64_t offset, size_t n, - char *buf, size_t buflen) -{ - int ret; - if (n >= buflen) { - return -EINVAL; - } - ret = bdrv_pread(file, offset, buf, n); - if (ret < 0) { - return ret; - } - buf[n] = '\0'; - return 0; -} - -/** * Allocate new clusters * * @s: QED state @@ -437,9 +410,10 @@ static int bdrv_qed_open(BlockDriverState *bs, int flags) return -EINVAL; } - ret = qed_read_string(bs->file, s->header.backing_filename_offset, - s->header.backing_filename_size, bs->backing_file, - sizeof(bs->backing_file)); + ret = bdrv_read_string(bs->file, s->header.backing_filename_offset, + s->header.backing_filename_size, + bs->backing_file, + sizeof(bs->backing_file)); if (ret < 0) { return ret; }