From nobody Mon May 6 14:23:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1508831506312989.8834855478526; Tue, 24 Oct 2017 00:51:46 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6255610F29; Tue, 24 Oct 2017 07:51:44 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9920E60BCB; Tue, 24 Oct 2017 07:51:43 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 94EF41804482; Tue, 24 Oct 2017 07:51:41 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v9O7pev0026912 for ; Tue, 24 Oct 2017 03:51:40 -0400 Received: by smtp.corp.redhat.com (Postfix) id 07E4718E36; Tue, 24 Oct 2017 07:51:40 +0000 (UTC) Received: from andariel.redhat.com (ovpn-204-133.brq.redhat.com [10.40.204.133]) by smtp.corp.redhat.com (Postfix) with ESMTP id B3AD65DA6C; Tue, 24 Oct 2017 07:51:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 6255610F29 Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=libvir-list-bounces@redhat.com From: Peter Krempa To: libvir-list@redhat.com Date: Tue, 24 Oct 2017 09:51:31 +0200 Message-Id: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Cc: Peter Krempa Subject: [libvirt] [PATCH] virsh: domain: Fix option handling in domxml-to-native X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Tue, 24 Oct 2017 07:51:45 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Commit fdeac7a05fdf85458d72e89efcfa0f444525aaad tried to fix the output of 'virsh --help domxml-to-native' by switching types around. One of the changes broke the option parser. VSH_OT_ARGV should be used only for variable argument count, not to make the help generator look pretty. The correct option type in this case is VSH_OT_STRING as it's not mandatory now since it can be substituted by using --domain. This makes --help for this command look incorrect, but the parser works as it should. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=3D1494400 Reviewed-by: Pavel Hrdina --- tools/virsh-domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index e1a312a6a..1e33e8295 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -10152,7 +10152,7 @@ static const vshCmdOptDef opts_domxmltonative[] =3D= { .help =3D N_("domain name, id or uuid") }, {.name =3D "xml", - .type =3D VSH_OT_ARGV, + .type =3D VSH_OT_STRING, .help =3D N_("xml data file to export from") }, {.name =3D NULL} --=20 2.13.6 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list