From patchwork Mon Sep 8 16:50:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 386995 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 211CF14018C for ; Tue, 9 Sep 2014 02:51:58 +1000 (EST) Received: from localhost ([::1]:44771 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XR2AP-0004Xm-Hw for incoming@patchwork.ozlabs.org; Mon, 08 Sep 2014 12:51:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53285) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XR29o-0003f1-UK for qemu-devel@nongnu.org; Mon, 08 Sep 2014 12:51:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XR29h-00039W-CM for qemu-devel@nongnu.org; Mon, 08 Sep 2014 12:51:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:28541) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XR29h-000397-3G for qemu-devel@nongnu.org; Mon, 08 Sep 2014 12:51:05 -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 s88Gp4BZ001405 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Mon, 8 Sep 2014 12:51:04 -0400 Received: from blackfin.pond.sub.org (ovpn-116-24.ams2.redhat.com [10.36.116.24]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s88Gp2xG009427 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Mon, 8 Sep 2014 12:51:04 -0400 Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id DFBA7305CA88; Mon, 8 Sep 2014 18:51:01 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Mon, 8 Sep 2014 18:50:58 +0200 Message-Id: <1410195061-8267-2-git-send-email-armbru@redhat.com> In-Reply-To: <1410195061-8267-1-git-send-email-armbru@redhat.com> References: <1410195061-8267-1-git-send-email-armbru@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: kwolf@redhat.com, stefanha@redhat.com Subject: [Qemu-devel] [PATCH 1/4] qemu-io: Clean up openfile() after commit 2e40134 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 Commit 6db9560 split off the growable case so it can use bdrv_file_open() instead of bdrv_open() then. Growable BDSes become anonymous. Weird. Commit 2e40134 folded bdrv_file_open() back into bdrv_open() with new flag BDRV_O_PROTOCOL. We still have two bdrv_open() calls, and growable BDSes remain anonymous. Circle back to before commit 6db9560: just one call, not anonymous. Signed-off-by: Markus Armbruster --- qemu-io.c | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/qemu-io.c b/qemu-io.c index 33c96c4..d2ab694 100644 --- a/qemu-io.c +++ b/qemu-io.c @@ -58,30 +58,20 @@ static int openfile(char *name, int flags, int growable, QDict *opts) return 1; } + qemuio_bs = bdrv_new("hda", &error_abort); + if (growable) { - if (bdrv_open(&qemuio_bs, name, NULL, opts, flags | BDRV_O_PROTOCOL, - NULL, &local_err)) - { - fprintf(stderr, "%s: can't open%s%s: %s\n", progname, - name ? " device " : "", name ?: "", - error_get_pretty(local_err)); - error_free(local_err); - return 1; - } - } else { - qemuio_bs = bdrv_new("hda", &error_abort); + flags |= BDRV_O_PROTOCOL; + } - if (bdrv_open(&qemuio_bs, name, NULL, opts, flags, NULL, &local_err) - < 0) - { - fprintf(stderr, "%s: can't open%s%s: %s\n", progname, - name ? " device " : "", name ?: "", - error_get_pretty(local_err)); - error_free(local_err); - bdrv_unref(qemuio_bs); - qemuio_bs = NULL; - return 1; - } + if (bdrv_open(&qemuio_bs, name, NULL, opts, flags, NULL, &local_err) < 0) { + fprintf(stderr, "%s: can't open%s%s: %s\n", progname, + name ? " device " : "", name ?: "", + error_get_pretty(local_err)); + error_free(local_err); + bdrv_unref(qemuio_bs); + qemuio_bs = NULL; + return 1; } return 0;