From nobody Mon Feb 9 16:34:21 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578482765; cv=none; d=zohomail.com; s=zohoarc; b=ZkWylvmkhsFaU46P+zA4KmTVYf7vaKZ0YGsPY7+lSc8XOUxbsLBJC9ir9RZbJ0B78fuNWoh87jcD1fhztq4pNRZU1OOEnuhcDYWH1yRz9+KiM2PTaGnqFcJmj11yZecOZFms6YKfRElLACy9+5KiJEVYj1DxSowgrzMhlXhLmjE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578482765; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=pP+UUPL3KtjmGguKCUXvjDL7hdspl0SO6dUXr7IRjH8=; b=T2VY+iKrtWiAWlv0SKFAtP/SFKCyhpsaLLwzCHrVsY4Xw/ij52AePydY18qvk953ollPiBY/NRg4vI/2UUq5rq+iTzOEvquB8r/w+OWhkR3+G+9FcJ28v2FSwcGOqJxdj9Nm8vAlTS+kOuxgZApNTkbMGxkoTLFTlpU6XeMtTWQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578482765070108.13021835083191; Wed, 8 Jan 2020 03:26:05 -0800 (PST) Received: from localhost ([::1]:42202 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip9TO-0007y0-TZ for importer@patchew.org; Wed, 08 Jan 2020 06:26:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49779) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip9QA-00043w-L4 for qemu-devel@nongnu.org; Wed, 08 Jan 2020 06:22:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ip9Q9-0004bv-IZ for qemu-devel@nongnu.org; Wed, 08 Jan 2020 06:22:42 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:58972 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ip9Q9-0004bc-ER for qemu-devel@nongnu.org; Wed, 08 Jan 2020 06:22:41 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-409-ON9N0zpAORGcXPepnQtHKg-1; Wed, 08 Jan 2020 06:22:39 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E5214184B1E1; Wed, 8 Jan 2020 11:22:38 +0000 (UTC) Received: from localhost (ovpn-116-249.ams2.redhat.com [10.36.116.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id 09E297BA22; Wed, 8 Jan 2020 11:22:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578482561; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pP+UUPL3KtjmGguKCUXvjDL7hdspl0SO6dUXr7IRjH8=; b=WgiayaqOlR2/mUHao/JKs6OULuXl7Me3VKJfHkqoxyxxrJ5w1aUfu98fy6btOn+e72xMW3 iRCTstZIXqbomiO1SJZNgNNEHk+Y7cCvO+XDPAO0EWSKKUhwT7RxG/LCnA/lSCXxmbjvtl J6caOOesR1zpNbpncTC0BSITR94fzrM= From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PATCH 3/4] qemu-img: allow qemu-img measure --object without a filename Date: Wed, 8 Jan 2020 11:22:19 +0000 Message-Id: <20200108112220.499180-4-stefanha@redhat.com> In-Reply-To: <20200108112220.499180-1-stefanha@redhat.com> References: <20200108112220.499180-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-MC-Unique: ON9N0zpAORGcXPepnQtHKg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Stefan Hajnoczi , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" In most qemu-img sub-commands the --object option only makes sense when there is a filename. qemu-img measure is an exception because objects may be referenced from the image creation options instead of an existing image file. Allow --object without a filename. Signed-off-by: Stefan Hajnoczi --- qemu-img.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index 6233b8ca56..4f3e58f13b 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -4903,10 +4903,8 @@ static int img_measure(int argc, char **argv) filename =3D argv[optind]; } =20 - if (!filename && - (object_opts || image_opts || fmt || snapshot_name || sn_opts)) { - error_report("--object, --image-opts, -f, and -l " - "require a filename argument."); + if (!filename && (image_opts || fmt || snapshot_name || sn_opts)) { + error_report("--image-opts, -f, and -l require a filename argument= ."); goto out; } if (filename && img_size !=3D UINT64_MAX) { --=20 2.24.1