From patchwork Sun Jan 26 19:02:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Reitz X-Patchwork-Id: 314240 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 E6B692C0092 for ; Mon, 27 Jan 2014 06:15:37 +1100 (EST) Received: from localhost ([::1]:55880 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W7V0E-0000gn-2m for incoming@patchwork.ozlabs.org; Sun, 26 Jan 2014 14:04:18 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44180) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W7UxG-0005jJ-08 for qemu-devel@nongnu.org; Sun, 26 Jan 2014 14:01:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W7UxA-0001TG-0i for qemu-devel@nongnu.org; Sun, 26 Jan 2014 14:01:13 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46942) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W7Ux9-0001T8-Lb for qemu-devel@nongnu.org; Sun, 26 Jan 2014 14:01:07 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s0QJ16KN000751 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sun, 26 Jan 2014 14:01:06 -0500 Received: from localhost (ovpn-116-36.ams2.redhat.com [10.36.116.36]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s0QJ14hG000475 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NO); Sun, 26 Jan 2014 14:01:05 -0500 From: Max Reitz To: qemu-devel@nongnu.org Date: Sun, 26 Jan 2014 20:02:41 +0100 Message-Id: <1390762963-25538-9-git-send-email-mreitz@redhat.com> In-Reply-To: <1390762963-25538-1-git-send-email-mreitz@redhat.com> References: <1390762963-25538-1-git-send-email-mreitz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Kevin Wolf , Stefan Hajnoczi , Max Reitz Subject: [Qemu-devel] [PATCH 08/10] block: Reuse bs->options setting from bdrv_open() 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 Setting bs->options in bdrv_file_open() is not necessary if it is already done in bdrv_open(). Signed-off-by: Max Reitz Reviewed-by: Benoit Canet --- block.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/block.c b/block.c index 0f2cd3f..f847c4b 100644 --- a/block.c +++ b/block.c @@ -956,9 +956,6 @@ static int bdrv_file_open(BlockDriverState *bs, const char *filename, Error *local_err = NULL; int ret; - bs->options = options; - options = qdict_clone_shallow(options); - /* Fetch the file name from the options QDict if necessary */ if (!filename) { filename = qdict_get_try_str(options, "filename"); @@ -1234,6 +1231,9 @@ int bdrv_open(BlockDriverState **pbs, const char *filename, bs = bdrv_new(""); } + bs->options = options; + options = qdict_clone_shallow(options); + if (flags & BDRV_O_PROTOCOL) { assert(!drv); ret = bdrv_file_open(bs, filename, options, flags & ~BDRV_O_PROTOCOL, @@ -1250,9 +1250,6 @@ int bdrv_open(BlockDriverState **pbs, const char *filename, return 0; } - bs->options = options; - options = qdict_clone_shallow(options); - /* For snapshot=on, create a temporary qcow2 overlay */ if (flags & BDRV_O_SNAPSHOT) { BlockDriverState *bs1 = NULL;