From patchwork Tue Aug 7 13:44:30 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benoit Canet X-Patchwork-Id: 175634 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 266C92C008B for ; Tue, 7 Aug 2012 23:46:02 +1000 (EST) Received: from localhost ([::1]:43912 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Syk6i-0007uQ-9C for incoming@patchwork.ozlabs.org; Tue, 07 Aug 2012 09:46:00 -0400 Received: from eggs.gnu.org ([208.118.235.92]:58816) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Syk5g-0005pd-UH for qemu-devel@nongnu.org; Tue, 07 Aug 2012 09:45:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Syk5b-0007xs-3F for qemu-devel@nongnu.org; Tue, 07 Aug 2012 09:44:56 -0400 Received: from mail-wi0-f181.google.com ([209.85.212.181]:56866) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Syk5a-0007ur-TR for qemu-devel@nongnu.org; Tue, 07 Aug 2012 09:44:51 -0400 Received: by mail-wi0-f181.google.com with SMTP id hm2so2110594wib.10 for ; Tue, 07 Aug 2012 06:44:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=Z0LoHdQCFRsLFljoyA02EsuZ2Wf1txpJsvuzGVz5+lo=; b=pAAtQjMwCw3jsDqEX17HpERu0u/POJmtGGfA2PLCg8NBNAwjuwQp1D9taxsdnBR3gi C1ytdzsTy/sHYfFjnH2PY4xvoRDrfVv2p1TmmycDC6Za4dcblUXaMm03bQaWhMPZxJTu hmpO1JMffMm+uLzPuZqSOzfwx+xyaLvMrIad1eW4S62FtUlsq+ZDPqc5/CV/9pi/5caz JWVyqQTSnBADz1tUkLRtG0dFXI7lqoCYv9wbOIvL5PNfvJmdw9+HvOXcKHXKAjBCQDUd Q/Ade/cRPOwFSMSXUWixBkFGFymnVYaHyhbz99g0f6T/E97rWLC4QIlaebZIhq+rGtIg mzAA== Received: by 10.217.6.12 with SMTP id x12mr6892141wes.176.1344347090480; Tue, 07 Aug 2012 06:44:50 -0700 (PDT) Received: from Laure.box.in.irqsave.net (paradis.irqsave.net. [109.190.18.76]) by mx.google.com with ESMTPS id cu1sm21381569wib.6.2012.08.07.06.44.48 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 07 Aug 2012 06:44:49 -0700 (PDT) From: "=?UTF-8?q?Beno=C3=AEt=20Canet?=" To: qemu-devel@nongnu.org Date: Tue, 7 Aug 2012 15:44:30 +0200 Message-Id: <1344347073-7773-8-git-send-email-benoit@irqsave.net> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1344347073-7773-1-git-send-email-benoit@irqsave.net> References: <1344347073-7773-1-git-send-email-benoit@irqsave.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.212.181 Cc: kwolf@redhat.com, stefanha@linux.vnet.ibm.com, blauwirbel@gmail.com, anthony@codemonkey.ws, pbonzini@redhat.com, eblake@redhat.com, afaerber@suse.de, =?UTF-8?q?Beno=C3=AEt=20Canet?= Subject: [Qemu-devel] [RFC V2 07/10] blkverify: Make blkverify_iovec_clone() and blkverify_iovec_compare() public 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 Signed-off-by: Benoit Canet --- block/blkverify.c | 8 ++++++-- block/quorum.c | 4 ++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/block/blkverify.c b/block/blkverify.c index 9d5f1ec..9e15081 100644 --- a/block/blkverify.c +++ b/block/blkverify.c @@ -11,6 +11,10 @@ #include "qemu_socket.h" /* for EINPROGRESS on Windows */ #include "block_int.h" +ssize_t blkverify_iovec_compare(QEMUIOVector *a, QEMUIOVector *b); +void blkverify_iovec_clone(QEMUIOVector *dest, const QEMUIOVector *src, + void *buf); + typedef struct { BlockDriverState *test_file; } BDRVBlkverifyState; @@ -130,7 +134,7 @@ static int64_t blkverify_getlength(BlockDriverState *bs) * @b: I/O vector * @ret: Offset to first mismatching byte or -1 if match */ -static ssize_t blkverify_iovec_compare(QEMUIOVector *a, QEMUIOVector *b) +ssize_t blkverify_iovec_compare(QEMUIOVector *a, QEMUIOVector *b) { int i; ssize_t offset = 0; @@ -190,7 +194,7 @@ static int sortelem_cmp_src_index(const void *a, const void *b) * The relative relationships of overlapping iovecs are preserved. This is * necessary to ensure identical semantics in the cloned I/O vector. */ -static void blkverify_iovec_clone(QEMUIOVector *dest, const QEMUIOVector *src, +void blkverify_iovec_clone(QEMUIOVector *dest, const QEMUIOVector *src, void *buf) { IOVectorSortElem sortelems[src->niov]; diff --git a/block/quorum.c b/block/quorum.c index e6d2274..003fc3f 100644 --- a/block/quorum.c +++ b/block/quorum.c @@ -15,6 +15,10 @@ #include "block_int.h" +ssize_t blkverify_iovec_compare(QEMUIOVector *a, QEMUIOVector *b); +void blkverify_iovec_clone(QEMUIOVector *dest, const QEMUIOVector *src, + void *buf); + typedef struct { BlockDriverState * bs[3]; } BDRVQuorumState;