Message ID | 20180723201748.25573-16-mdroth@linux.vnet.ibm.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org> Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DED8F17FD for <patchwork-qemu-devel@patchwork.kernel.org>; Mon, 23 Jul 2018 20:24:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CBDDC2848B for <patchwork-qemu-devel@patchwork.kernel.org>; Mon, 23 Jul 2018 20:24:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C03662848F; Mon, 23 Jul 2018 20:24:36 +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=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 697B12848B for <patchwork-qemu-devel@patchwork.kernel.org>; Mon, 23 Jul 2018 20:24:36 +0000 (UTC) Received: from localhost ([::1]:36354 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org>) id 1fhhNj-0006rO-Eb for patchwork-qemu-devel@patchwork.kernel.org; Mon, 23 Jul 2018 16:24:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40704) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <flukshun@gmail.com>) id 1fhhIF-0001QU-Ot for qemu-devel@nongnu.org; Mon, 23 Jul 2018 16:18:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <flukshun@gmail.com>) id 1fhhIE-0002Sp-R2 for qemu-devel@nongnu.org; Mon, 23 Jul 2018 16:18:55 -0400 Received: from mail-oi0-x229.google.com ([2607:f8b0:4003:c06::229]:33562) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <flukshun@gmail.com>) id 1fhhIE-0002R8-M4; Mon, 23 Jul 2018 16:18:54 -0400 Received: by mail-oi0-x229.google.com with SMTP id l10-v6so3493865oii.0; Mon, 23 Jul 2018 13:18:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=pgeIXs/uHoRVfNlBGmWIXBh9ayrWzXkSCAujd7RNfMM=; b=uVxWp5e5zW+RhGjzovSPNffqXWviFkPiQ8KjkrRUsKtCvFtxBr8uSmscj2Jus79Hpu 8wnDPkrAXdDknRsVerSLBZXZYOAqBnLobuymDlQc8KixCmtgnXN9qcmARlU85HVQ6zMG cr1ehZLoii7N7lixs7E3uaQktadTpyhu6x1uFgn66a0omdBdAqWoxRRnZd+9gUai+nfR qU6pi+Mzpb2xT2VyUrv1/HHZ4bNKWaeofcuzPVEBYMX8GykGvthS1+2XEcE9jCqJMEXE z6Drwk/KJMqlNJGWvl3YDtpgNJaeJ4WJznP+BzRD63A//eM34vKyHxNV0pS8dYi0h44y UBEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=pgeIXs/uHoRVfNlBGmWIXBh9ayrWzXkSCAujd7RNfMM=; b=hPY20bpqiAdmpZGusrXXAESpE6oqTVntDp0uY8eZ8CaskPv/L6G+ctdmguFeiiHZXV QUPuX0GvOtEgh5EU9HdPIIy7oEC8ObaX1YGuwvwazAGAauHOjB+JZAVzMll72IppvGj6 3QItolzTGLdOAL2Emtlb1j3AyIZScpfgJ28JPvbM0GkYbJt/jekWjjqPv1MFi+MXJ02R B7T1ZG3Snu80F9E8nhUrrFmsXVn78/dbWKpRehdNKPYnpXM3EGQ/PWgKK2hsrTZ/XfzV tK/0PvMn22xm0alBblyc4OLyCdewPwQFpkuAJbJNXeD8azP1ShMAbG3gvqRPmcAlWAGo rNqA== X-Gm-Message-State: AOUpUlFXoeE5npxu+dA5CqRLS+asBTtYO2WuS26tRMYLEkN81tOcP5BU pbyOMrRxnixCff0cxz+NCAASUsU1FvA= X-Google-Smtp-Source: AAOMgpfg8g9nlc4WGCjQSC1V5LjT9cwg5si7vOnDGhD44YDaWw024reLiOQA3X3LKltVB4NXMcAmMw== X-Received: by 2002:aca:4c7:: with SMTP id 190-v6mr292099oie.107.1532377133498; Mon, 23 Jul 2018 13:18:53 -0700 (PDT) Received: from localhost (76-251-165-188.lightspeed.austtx.sbcglobal.net. [76.251.165.188]) by smtp.gmail.com with ESMTPSA id e125-v6sm9832771oig.4.2018.07.23.13.18.52 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 23 Jul 2018 13:18:52 -0700 (PDT) From: Michael Roth <mdroth@linux.vnet.ibm.com> To: qemu-devel@nongnu.org Date: Mon, 23 Jul 2018 15:16:24 -0500 Message-Id: <20180723201748.25573-16-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180723201748.25573-1-mdroth@linux.vnet.ibm.com> References: <20180723201748.25573-1-mdroth@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4003:c06::229 Subject: [Qemu-devel] [PATCH 15/99] qemu-img: Use only string options in img_open_opts X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: qemu-stable@nongnu.org, Max Reitz <mreitz@redhat.com> Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org> X-Virus-Scanned: ClamAV using ClamSMTP |
Series |
Patch Round-up for stable 2.12.1, freeze on 2018-07-30
|
expand
|
diff --git a/qemu-img.c b/qemu-img.c index 15d457d6b8..b422fda6f3 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -277,12 +277,12 @@ static BlockBackend *img_open_opts(const char *optstr, options = qemu_opts_to_qdict(opts, NULL); if (force_share) { if (qdict_haskey(options, BDRV_OPT_FORCE_SHARE) - && !qdict_get_bool(options, BDRV_OPT_FORCE_SHARE)) { + && strcmp(qdict_get_str(options, BDRV_OPT_FORCE_SHARE), "on")) { error_report("--force-share/-U conflicts with image options"); QDECREF(options); return NULL; } - qdict_put_bool(options, BDRV_OPT_FORCE_SHARE, true); + qdict_put_str(options, BDRV_OPT_FORCE_SHARE, "on"); } blk = blk_new_open(NULL, NULL, options, flags, &local_err); if (!blk) {