From patchwork Wed Apr 5 15:12:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Denis V. Lunev" X-Patchwork-Id: 9664413 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 592C7602B5 for ; Wed, 5 Apr 2017 15:13:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 497EE27FA3 for ; Wed, 5 Apr 2017 15:13:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3C7CD28113; Wed, 5 Apr 2017 15:13:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id CA3BE27FA3 for ; Wed, 5 Apr 2017 15:13:32 +0000 (UTC) Received: from localhost ([::1]:40957 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cvmcl-0006TA-JA for patchwork-qemu-devel@patchwork.kernel.org; Wed, 05 Apr 2017 11:13:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59517) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cvmbX-0006Rd-PZ for qemu-devel@nongnu.org; Wed, 05 Apr 2017 11:12:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cvmbU-0007Zx-Kc for qemu-devel@nongnu.org; Wed, 05 Apr 2017 11:12:15 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:2217 helo=relay.sw.ru) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cvmbU-0007V8-8s for qemu-devel@nongnu.org; Wed, 05 Apr 2017 11:12:12 -0400 Received: from iris.sw.ru (msk-vpn.virtuozzo.com [195.214.232.6]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id v35FC6n7022233; Wed, 5 Apr 2017 18:12:08 +0300 (MSK) From: "Denis V. Lunev" To: qemu-devel@nongnu.org Date: Wed, 5 Apr 2017 18:12:06 +0300 Message-Id: <1491405126-30591-3-git-send-email-den@openvz.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1491405126-30591-1-git-send-email-den@openvz.org> References: <1491405126-30591-1-git-send-email-den@openvz.org> X-detected-operating-system: by eggs.gnu.org: OpenBSD 3.x [fuzzy] X-Received-From: 195.214.232.25 Subject: [Qemu-devel] [PATCH 2/2] parallels: relax check for auto switch of prealloc_mode X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Denis V. Lunev" , Stefan Hajnoczi Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP PRL_PREALLOC_MODE_TRUNCATE can be set only through command line. Remove the check that bdrv_truncate() is working on, this is almost always the case, while the check could lead to serious consequences during migration etc when we should not even try to API which technically could change the image (asserts are possible). Let us keep this simple. Signed-off-by: Denis V. Lunev CC: Stefan Hajnoczi Reviewed-by: Stefan Hajnoczi --- block/parallels.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/block/parallels.c b/block/parallels.c index 9dea09e..e805034 100644 --- a/block/parallels.c +++ b/block/parallels.c @@ -695,8 +695,7 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags, goto fail_options; } - if (!(flags & BDRV_O_RESIZE) || !bdrv_has_zero_init(bs->file->bs) || - bdrv_truncate(bs->file, bdrv_getlength(bs->file->bs)) != 0) { + if (!bdrv_has_zero_init(bs->file->bs) != 0) { s->prealloc_mode = PRL_PREALLOC_MODE_FALLOCATE; }