From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42984) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XW8tT-0003zE-Cl for qemu-devel@nongnu.org; Mon, 22 Sep 2014 15:03:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XW8tN-0001K1-8y for qemu-devel@nongnu.org; Mon, 22 Sep 2014 15:03:27 -0400 Received: from lputeaux-656-01-25-125.w80-12.abo.wanadoo.fr ([80.12.84.125]:39424 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XW8tN-0001FG-2U for qemu-devel@nongnu.org; Mon, 22 Sep 2014 15:03:21 -0400 From: =?UTF-8?q?Beno=C3=AEt=20Canet?= Date: Mon, 22 Sep 2014 21:00:51 +0200 Message-Id: <1411412452-8655-2-git-send-email-benoit.canet@nodalink.com> In-Reply-To: <1411412452-8655-1-git-send-email-benoit.canet@nodalink.com> References: <1411412452-8655-1-git-send-email-benoit.canet@nodalink.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v2 1/2] block: Rename BLOCK_OP_TYPE_REPLACE to BLOCK_OP_TYPE_MIRROR_REPLACE List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, jcody@redhat.com, famz@redhat.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , stefanha@redhat.com This operation blocker is really specific to the mirroring code so its na= me should reflect this. Signed-off-by: Beno=C3=AEt Canet --- block.c | 2 +- include/block/block.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/block.c b/block.c index bcd952a..9a9f8a0 100644 --- a/block.c +++ b/block.c @@ -5912,7 +5912,7 @@ BlockDriverState *check_to_replace_node(const char = *node_name, Error **errp) return NULL; } =20 - if (bdrv_op_is_blocked(to_replace_bs, BLOCK_OP_TYPE_REPLACE, errp)) = { + if (bdrv_op_is_blocked(to_replace_bs, BLOCK_OP_TYPE_MIRROR_REPLACE, = errp)) { return NULL; } =20 diff --git a/include/block/block.h b/include/block/block.h index 07d6d8e..10952ed 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -176,7 +176,7 @@ typedef enum BlockOpType { BLOCK_OP_TYPE_MIRROR, BLOCK_OP_TYPE_RESIZE, BLOCK_OP_TYPE_STREAM, - BLOCK_OP_TYPE_REPLACE, + BLOCK_OP_TYPE_MIRROR_REPLACE, BLOCK_OP_TYPE_MAX, } BlockOpType; =20 --=20 2.1.0