From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39223) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fGWCT-0008Sh-Iz for qemu-devel@nongnu.org; Wed, 09 May 2018 17:00:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fGWCT-0002A9-1D for qemu-devel@nongnu.org; Wed, 09 May 2018 17:00:37 -0400 From: Max Reitz Date: Wed, 9 May 2018 23:00:17 +0200 Message-Id: <20180509210023.20283-2-mreitz@redhat.com> In-Reply-To: <20180509210023.20283-1-mreitz@redhat.com> References: <20180509210023.20283-1-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v2 1/7] qemu-img: Amendment support implies create_opts List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, Max Reitz , John Snow , Eric Blake , Kevin Wolf Instead of checking whether a driver has a non-NULL create_opts we should check whether it supports image amendment in the first place. If it does, it must have create_opts. On the other hand, if it does not have create_opts (so it does not support amendment either), the error message "does not support any options" is a bit useless. Stating clearly that the driver has no amendment support whatsoever is probably better. Signed-off-by: Max Reitz Reviewed-by: John Snow Reviewed-by: Eric Blake --- qemu-img.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index 62b29e7feb..f38aa51166 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -3740,13 +3740,16 @@ static int img_amend(int argc, char **argv) goto out; } - if (!bs->drv->create_opts) { - error_report("Format driver '%s' does not support any options to amend", + if (!bs->drv->bdrv_amend_options) { + error_report("Format driver '%s' does not support option amendment", fmt); ret = -1; goto out; } + /* Every driver supporting amendment must have create_opts */ + assert(bs->drv->create_opts); + create_opts = qemu_opts_append(create_opts, bs->drv->create_opts); opts = qemu_opts_create(create_opts, NULL, 0, &error_abort); qemu_opts_do_parse(opts, options, NULL, &err); -- 2.14.3