From patchwork Mon Jan 22 07:21:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lin Ma X-Patchwork-Id: 864178 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) 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 3zQ2x14fxMz9s74 for ; Mon, 22 Jan 2018 18:24:04 +1100 (AEDT) Received: from localhost ([::1]:52272 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edWSX-00064t-Ss for incoming@patchwork.ozlabs.org; Mon, 22 Jan 2018 02:24:01 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36819) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edWS5-00064b-Ts for qemu-devel@nongnu.org; Mon, 22 Jan 2018 02:23:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1edWS5-00028K-4f for qemu-devel@nongnu.org; Mon, 22 Jan 2018 02:23:33 -0500 Received: from prv3-mh.provo.novell.com ([137.65.250.26]:48730) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1edWS0-0001yw-Sv; Mon, 22 Jan 2018 02:23:28 -0500 Received: from localhost.localdomain (prv-ext-foundry1int.gns.novell.com [137.65.251.240]) by prv3-mh.provo.novell.com with ESMTP (NOT encrypted); Mon, 22 Jan 2018 00:23:13 -0700 From: Lin Ma To: qemu-block@nongnu.org Date: Mon, 22 Jan 2018 15:21:02 +0800 Message-Id: <20180122072102.4141-1-lma@suse.com> X-Mailer: git-send-email 2.15.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 137.65.250.26 Subject: [Qemu-devel] [PATCH] raw: Disable probing if image format is given by driver-specific options 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: kwolf@redhat.com, qemu-devel@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" If the user specifies image format through driver-specific options, The format probing should be prohibited and the warning message should not be printed. e.g.: $ qemu-system-x86_64 ... -drive file.file.filename=disk0.raw,file.driver=raw ... WARNING: Image format was not specified for 'disk0.raw' and probing guessed raw. Automatically detecting the format is dangerous for raw images, ... Signed-off-by: Lin Ma --- blockdev.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/blockdev.c b/blockdev.c index 29d569a24e..ef4c167235 100644 --- a/blockdev.c +++ b/blockdev.c @@ -529,6 +529,8 @@ static BlockBackend *blockdev_init(const char *file, QDict *bs_opts, goto early_err; } qdict_put_str(bs_opts, "driver", buf); + } else if (qdict_haskey(bs_opts, "file.driver")) { + qdict_put_str(bs_opts, "driver", qdict_get_str(bs_opts, "file.driver")); } on_write_error = BLOCKDEV_ON_ERROR_ENOSPC;