From patchwork Mon Mar 30 09:23:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 456027 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 68F60140140 for ; Mon, 30 Mar 2015 20:24:10 +1100 (AEDT) Received: from localhost ([::1]:60782 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcVvU-0000wQ-Ae for incoming@patchwork.ozlabs.org; Mon, 30 Mar 2015 05:24:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49446) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcVuz-0008Tz-Oo for qemu-devel@nongnu.org; Mon, 30 Mar 2015 05:23:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YcVuy-0004Ei-Vo for qemu-devel@nongnu.org; Mon, 30 Mar 2015 05:23:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53555) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcVuy-0004EW-OS; Mon, 30 Mar 2015 05:23:36 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t2U9NZqm016624 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 30 Mar 2015 05:23:35 -0400 Received: from ad.nay.redhat.com (dhcp-14-137.nay.redhat.com [10.66.14.137]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t2U9NOjb024754; Mon, 30 Mar 2015 05:23:32 -0400 From: Fam Zheng To: qemu-devel@nongnu.org Date: Mon, 30 Mar 2015 17:23:19 +0800 Message-Id: <1427707400-4323-3-git-send-email-famz@redhat.com> In-Reply-To: <1427707400-4323-1-git-send-email-famz@redhat.com> References: <1427707400-4323-1-git-send-email-famz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Kevin Wolf , qemu-block@nongnu.org, Stefan Hajnoczi Subject: [Qemu-devel] [PATCH 2/3] block/null: Support reopen 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 Reopen is used in block-commit. With this always-succeed operation, it is now possible to test committing to a null drive, by specifying "null-aio://" or "null-co://" as the backing image when creating the qcow2 image. Signed-off-by: Fam Zheng Reviewed-by: Eric Blake --- block/null.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/block/null.c b/block/null.c index fa56eac..e0cb612 100644 --- a/block/null.c +++ b/block/null.c @@ -178,6 +178,12 @@ static BlockAIOCB *null_aio_flush(BlockDriverState *bs, return null_aio_common(bs, cb, opaque); } +static int null_reopen_prepare(BDRVReopenState *reopen_state, + BlockReopenQueue *queue, Error **errp) +{ + return 0; +} + static BlockDriver bdrv_null_co = { .format_name = "null-co", .protocol_name = "null-co", @@ -190,6 +196,7 @@ static BlockDriver bdrv_null_co = { .bdrv_co_readv = null_co_readv, .bdrv_co_writev = null_co_writev, .bdrv_co_flush_to_disk = null_co_flush, + .bdrv_reopen_prepare = null_reopen_prepare, }; static BlockDriver bdrv_null_aio = { @@ -204,6 +211,7 @@ static BlockDriver bdrv_null_aio = { .bdrv_aio_readv = null_aio_readv, .bdrv_aio_writev = null_aio_writev, .bdrv_aio_flush = null_aio_flush, + .bdrv_reopen_prepare = null_reopen_prepare, }; static void bdrv_null_init(void)