From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60881) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y9H0R-0004yg-R5 for qemu-devel@nongnu.org; Thu, 08 Jan 2015 12:36:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y9H02-0006v0-AU for qemu-devel@nongnu.org; Thu, 08 Jan 2015 12:36:23 -0500 Received: from e33.co.us.ibm.com ([32.97.110.151]:38304) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y9H02-0006ul-2A for qemu-devel@nongnu.org; Thu, 08 Jan 2015 12:35:58 -0500 Received: from /spool/local by e33.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 8 Jan 2015 10:35:57 -0700 From: Michael Roth Date: Thu, 8 Jan 2015 11:34:15 -0600 Message-Id: <1420738472-23267-72-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1420738472-23267-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1420738472-23267-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 71/88] qemu-img: Check create_opts before image creation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org From: Max Reitz If a driver supports image creation, it needs to set the .create_opts field. We can use that to make sure .create_opts for both drivers involved is not NULL for the target image in qemu-img convert, which is important so that the create_opts pointer in img_convert() is not NULL after the qemu_opts_append() calls and when going into qemu_opts_create(). Cc: qemu-stable@nongnu.org Signed-off-by: Max Reitz Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf (cherry picked from commit f75613cf2488a37fb8019bc32a06ddbcd477d0ce) Signed-off-by: Michael Roth --- qemu-img.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/qemu-img.c b/qemu-img.c index d4518e7..309c14b 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -1378,6 +1378,20 @@ static int img_convert(int argc, char **argv) goto out; } + if (!drv->create_opts) { + error_report("Format driver '%s' does not support image creation", + drv->format_name); + ret = -1; + goto out; + } + + if (!proto_drv->create_opts) { + error_report("Protocol driver '%s' does not support image creation", + proto_drv->format_name); + ret = -1; + goto out; + } + create_opts = qemu_opts_append(create_opts, drv->create_opts); create_opts = qemu_opts_append(create_opts, proto_drv->create_opts); -- 1.9.1