From nobody Mon Apr 29 10:07:38 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 14943534950323.0728118165883416; Tue, 9 May 2017 11:11:35 -0700 (PDT) Received: from localhost ([::1]:38780 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d89bh-0005B5-G0 for importer@patchew.org; Tue, 09 May 2017 14:11:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54799) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d89aC-00040o-Q2 for qemu-devel@nongnu.org; Tue, 09 May 2017 14:10:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d89aA-0004qm-Tu for qemu-devel@nongnu.org; Tue, 09 May 2017 14:10:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53090) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d89a5-0004km-E3; Tue, 09 May 2017 14:09:53 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BC0E680460; Tue, 9 May 2017 18:09:51 +0000 (UTC) Received: from scv.usersys.redhat.com (dhcp-17-221.bos.redhat.com [10.18.17.221]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6632418A68; Tue, 9 May 2017 18:09:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com BC0E680460 Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=jsnow@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com BC0E680460 From: John Snow To: qemu-block@nongnu.org Date: Tue, 9 May 2017 14:09:46 -0400 Message-Id: <20170509180946.17046-1-jsnow@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Tue, 09 May 2017 18:09:51 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2] qemu-img: Check for backing image if specified during create X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, John Snow , qemu-devel@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Or, rather, force the open of a backing image if one was specified for creation. Using a similar -unsafe option as rebase, allow qemu-img to ignore the backing file validation if possible. It may not always be possible, as in the existing case when a filesize for the new image was not specified. This is accomplished by shifting around the conditionals in bdrv_img_create, such that a backing file is always opened unless we provide BDRV_O_NO_BACKING. qemu-img is adjusted to pass this new flag when -u is provided to create. Sorry for the heinous looking diffstat, but it's mostly whitespace. Inspired by: https://bugzilla.redhat.com/show_bug.cgi?id=3D1213786 Signed-off-by: John Snow Reviewed-by: Eric Blake --- v2: Rebased for 2.10 Corrected some of my less cromulent grammar block.c | 75 +++++++++++++++++++++++-------------------= ---- qemu-img-cmds.hx | 4 +-- qemu-img.c | 16 ++++++---- tests/qemu-iotests/082 | 4 +-- tests/qemu-iotests/082.out | 4 +-- 5 files changed, 55 insertions(+), 48 deletions(-) diff --git a/block.c b/block.c index 6c6bb3e..ca3e195 100644 --- a/block.c +++ b/block.c @@ -4284,38 +4284,38 @@ void bdrv_img_create(const char *filename, const ch= ar *fmt, // The size for the image must always be specified, with one exception: // If we are using a backing file, we can obtain the size from there size =3D qemu_opt_get_size(opts, BLOCK_OPT_SIZE, 0); - if (size =3D=3D -1) { - if (backing_file) { - BlockDriverState *bs; - char *full_backing =3D g_new0(char, PATH_MAX); - int64_t size; - int back_flags; - QDict *backing_options =3D NULL; - - bdrv_get_full_backing_filename_from_filename(filename, backing= _file, - full_backing, PAT= H_MAX, - &local_err); - if (local_err) { - g_free(full_backing); - goto out; - } - - /* backing files always opened read-only */ - back_flags =3D flags; - back_flags &=3D ~(BDRV_O_RDWR | BDRV_O_SNAPSHOT | BDRV_O_NO_BA= CKING); - - if (backing_fmt) { - backing_options =3D qdict_new(); - qdict_put(backing_options, "driver", - qstring_from_str(backing_fmt)); - } - - bs =3D bdrv_open(full_backing, NULL, backing_options, back_fla= gs, - &local_err); + if (backing_file && !(flags & BDRV_O_NO_BACKING)) { + BlockDriverState *bs; + char *full_backing =3D g_new0(char, PATH_MAX); + int back_flags; + QDict *backing_options =3D NULL; + + bdrv_get_full_backing_filename_from_filename(filename, backing_fil= e, + full_backing, PATH_MA= X, + &local_err); + if (local_err) { g_free(full_backing); - if (!bs) { - goto out; - } + goto out; + } + + /* backing files always opened read-only */ + back_flags =3D flags; + back_flags &=3D ~(BDRV_O_RDWR | BDRV_O_SNAPSHOT | BDRV_O_NO_BACKIN= G); + + if (backing_fmt) { + backing_options =3D qdict_new(); + qdict_put(backing_options, "driver", + qstring_from_str(backing_fmt)); + } + + bs =3D bdrv_open(full_backing, NULL, backing_options, back_flags, + &local_err); + g_free(full_backing); + if (!bs) { + goto out; + } + + if (size =3D=3D -1) { size =3D bdrv_getlength(bs); if (size < 0) { error_setg_errno(errp, -size, "Could not get size of '%s'", @@ -4323,14 +4323,15 @@ void bdrv_img_create(const char *filename, const ch= ar *fmt, bdrv_unref(bs); goto out; } - qemu_opt_set_number(opts, BLOCK_OPT_SIZE, size, &error_abort); - - bdrv_unref(bs); - } else { - error_setg(errp, "Image creation needs a size parameter"); - goto out; } + + bdrv_unref(bs); + } + + if (size =3D=3D -1) { + error_setg(errp, "Image creation needs a size parameter"); + goto out; } =20 if (!quiet) { diff --git a/qemu-img-cmds.hx b/qemu-img-cmds.hx index bf4ce59..1d230c6 100644 --- a/qemu-img-cmds.hx +++ b/qemu-img-cmds.hx @@ -22,9 +22,9 @@ STEXI ETEXI =20 DEF("create", img_create, - "create [-q] [--object objectdef] [-f fmt] [-b backing_file] [-F backi= ng_fmt] [-o options] filename [size]") + "create [-q] [--object objectdef] [-f fmt] [-b backing_file] [-F backi= ng_fmt] [-u] [-o options] filename [size]") STEXI -@item create [--object @var{objectdef}] [-q] [-f @var{fmt}] [-b @var{backi= ng_file}] [-F @var{backing_fmt}] [-o @var{options}] @var{filename} [@var{si= ze}] +@item create [--object @var{objectdef}] [-q] [-f @var{fmt}] [-b @var{backi= ng_file}] [-F @var{backing_fmt}] [-u] [-o @var{options}] @var{filename} [@v= ar{size}] ETEXI =20 DEF("commit", img_commit, diff --git a/qemu-img.c b/qemu-img.c index c719636..9686110 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -145,9 +145,11 @@ static void QEMU_NORETURN help(void) " 'snapshot_id_or_name' is deprecated, use 'snapshot_param'\n" " instead\n" " '-c' indicates that target image must be compressed (qcow fo= rmat only)\n" - " '-u' enables unsafe rebasing. It is assumed that old and new= backing file\n" - " match exactly. The image doesn't need a working backing= file before\n" - " rebasing in this case (useful for renaming the backing = file)\n" + " '-u' allows unsafe backing chains. For rebasing, it is assum= ed that old and new\n" + " backing file match exactly. The image doesn't need a wo= rking backing file\n" + " before rebasing in this case (useful for renaming the b= acking file)\n" + " For image creation, allow creating without attempting t= o" + " open the backing file.\n" " '-h' with or without a command shows this help and lists the= supported formats\n" " '-p' show progress of command (only certain commands)\n" " '-q' use Quiet mode - do not print any output (except errors= )\n" @@ -409,6 +411,7 @@ static int img_create(int argc, char **argv) char *options =3D NULL; Error *local_err =3D NULL; bool quiet =3D false; + int flags =3D 0; =20 for(;;) { static const struct option long_options[] =3D { @@ -416,7 +419,7 @@ static int img_create(int argc, char **argv) {"object", required_argument, 0, OPTION_OBJECT}, {0, 0, 0, 0} }; - c =3D getopt_long(argc, argv, ":F:b:f:he6o:q", + c =3D getopt_long(argc, argv, ":F:b:f:he6o:qu", long_options, NULL); if (c =3D=3D -1) { break; @@ -464,6 +467,9 @@ static int img_create(int argc, char **argv) case 'q': quiet =3D true; break; + case 'u': + flags |=3D BDRV_O_NO_BACKING; + break; case OPTION_OBJECT: { QemuOpts *opts; opts =3D qemu_opts_parse_noisily(&qemu_object_opts, @@ -516,7 +522,7 @@ static int img_create(int argc, char **argv) } =20 bdrv_img_create(filename, fmt, base_filename, base_fmt, - options, img_size, 0, quiet, &local_err); + options, img_size, flags, quiet, &local_err); if (local_err) { error_reportf_err(local_err, "%s: ", filename); goto fail; diff --git a/tests/qemu-iotests/082 b/tests/qemu-iotests/082 index ad1d9fa..d5c83d4 100755 --- a/tests/qemu-iotests/082 +++ b/tests/qemu-iotests/082 @@ -85,8 +85,8 @@ run_qemu_img create -f $IMGFMT -o cluster_size=3D4k -o he= lp "$TEST_IMG" $size run_qemu_img create -f $IMGFMT -o cluster_size=3D4k -o \? "$TEST_IMG" $size =20 # Looks like a help option, but is part of the backing file name -run_qemu_img create -f $IMGFMT -o backing_file=3D"$TEST_IMG",,help "$TEST_= IMG" $size -run_qemu_img create -f $IMGFMT -o backing_file=3D"$TEST_IMG",,\? "$TEST_IM= G" $size +run_qemu_img create -f $IMGFMT -u -o backing_file=3D"$TEST_IMG",,help "$TE= ST_IMG" $size +run_qemu_img create -f $IMGFMT -u -o backing_file=3D"$TEST_IMG",,\? "$TEST= _IMG" $size =20 # Try to trick qemu-img into creating escaped commas run_qemu_img create -f $IMGFMT -o backing_file=3D"$TEST_IMG", -o help "$TE= ST_IMG" $size diff --git a/tests/qemu-iotests/082.out b/tests/qemu-iotests/082.out index a952330..f2732e4 100644 --- a/tests/qemu-iotests/082.out +++ b/tests/qemu-iotests/082.out @@ -146,10 +146,10 @@ lazy_refcounts Postpone refcount updates refcount_bits Width of a reference count entry in bits nocow Turn off copy-on-write (valid only on btrfs) =20 -Testing: create -f qcow2 -o backing_file=3DTEST_DIR/t.qcow2,,help TEST_DIR= /t.qcow2 128M +Testing: create -f qcow2 -u -o backing_file=3DTEST_DIR/t.qcow2,,help TEST_= DIR/t.qcow2 128M Formatting 'TEST_DIR/t.qcow2', fmt=3Dqcow2 size=3D134217728 backing_file= =3DTEST_DIR/t.qcow2,,help encryption=3Doff cluster_size=3D65536 lazy_refcou= nts=3Doff refcount_bits=3D16 =20 -Testing: create -f qcow2 -o backing_file=3DTEST_DIR/t.qcow2,,? TEST_DIR/t.= qcow2 128M +Testing: create -f qcow2 -u -o backing_file=3DTEST_DIR/t.qcow2,,? TEST_DIR= /t.qcow2 128M Formatting 'TEST_DIR/t.qcow2', fmt=3Dqcow2 size=3D134217728 backing_file= =3DTEST_DIR/t.qcow2,,? encryption=3Doff cluster_size=3D65536 lazy_refcounts= =3Doff refcount_bits=3D16 =20 Testing: create -f qcow2 -o backing_file=3DTEST_DIR/t.qcow2, -o help TEST_= DIR/t.qcow2 128M --=20 2.9.3