From nobody Tue Apr 15 03:10:46 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1594141252; cv=none; d=zohomail.com; s=zohoarc; b=bcSer+ceLZr/H7O9Fdlnt1JUaO//uXi7SIp4TcP1cZPJprCqogobdqiIBxt9wnWksKB6LfoONURzG1OvcHv4lxTrNaZ0K8dNs4j5Fhq2Wtn2ys1GHHaf4sLVb8CItkbFYRgRGF9RJq+ZYTa4VL0dmcM2XoSBjTX3oHk3bAl+6e0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594141252; 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=EDzQqZKkiCaqZyEKi9kCYJwzusC1SRYKCLMc42JAFhI=; b=GX5CpW5TDjEP9DkrOqMJw0UeWDcrJJacZoiDu0Pm93i3063IECRPWQM1XirD3SMNh3T/Mc8OLks8T80qFfnzUsxExby9P5o3NTUh5Y7dI8C761UQ0oOua2O1OQvAhJv4nbHmelEHcPx+5kG2g+1JxSiZzFdvUfhI0GJIiKrp9wU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1594141252744485.8157278910726; Tue, 7 Jul 2020 10:00:52 -0700 (PDT) Received: from localhost ([::1]:40248 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jsqxf-0004YW-IE for importer@patchew.org; Tue, 07 Jul 2020 13:00:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39824) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jsqZb-0007rd-V0 for qemu-devel@nongnu.org; Tue, 07 Jul 2020 12:35:59 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:52567 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jsqZY-0004Av-M9 for qemu-devel@nongnu.org; Tue, 07 Jul 2020 12:35:59 -0400 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-60-5dYDmLj0P8KgvhU-d0NIew-1; Tue, 07 Jul 2020 12:35:53 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 029B3890509; Tue, 7 Jul 2020 16:35:48 +0000 (UTC) Received: from linux.fritz.box.com (ovpn-114-113.ams2.redhat.com [10.36.114.113]) by smtp.corp.redhat.com (Postfix) with ESMTP id E7AEE79310; Tue, 7 Jul 2020 16:35:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594139756; 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=EDzQqZKkiCaqZyEKi9kCYJwzusC1SRYKCLMc42JAFhI=; b=AOSYUFKOLReNmmCwWIbGG3pQxvRmFFnNOenrj2nn9yYllz3iVHFd5Ex+Di8TiMTVM11DVz aOSZ4Xswjr8N1r0HEA1sZqDT2y0oJECV1zV0z6R6Rudid+yKpQluVTuPe9ZbbgX91yAxjd wR4hoDFMMi4wJYK12b2SziSdghovkZE= X-MC-Unique: 5dYDmLj0P8KgvhU-d0NIew-1 From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PULL 05/12] sheepdog: Add trivial backing_fmt support Date: Tue, 7 Jul 2020 18:34:57 +0200 Message-Id: <20200707163504.194740-6-kwolf@redhat.com> In-Reply-To: <20200707163504.194740-1-kwolf@redhat.com> References: <20200707163504.194740-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kwolf@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=205.139.110.61; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/07 00:31:00 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Eric Blake Sheepdog already requires that if backing_file is present, that it be another sheepdog image (see sd_co_create). Meanwhile, we want to move towards always being explicit about the backing format for other drivers where it matters. So for convenience, make qemu-img create -F sheepdog work, while rejecting all other explicit formats (note that this is only for QemuOpts usage; there is no change to the QAPI to allow a format through -blockdev). Signed-off-by: Eric Blake Message-Id: <20200706203954.341758-4-eblake@redhat.com> Signed-off-by: Kevin Wolf --- block/sheepdog.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/block/sheepdog.c b/block/sheepdog.c index 27a30d17f4..548ce54cbc 100644 --- a/block/sheepdog.c +++ b/block/sheepdog.c @@ -2157,13 +2157,21 @@ static int coroutine_fn sd_co_create_opts(BlockDriv= er *drv, Error **errp) { BlockdevCreateOptions *create_options =3D NULL; - QDict *qdict, *location_qdict; + QDict *qdict =3D NULL, *location_qdict; Visitor *v; - char *redundancy; + char *redundancy =3D NULL; Error *local_err =3D NULL; int ret; + char *backing_fmt =3D NULL; =20 redundancy =3D qemu_opt_get_del(opts, BLOCK_OPT_REDUNDANCY); + backing_fmt =3D qemu_opt_get_del(opts, BLOCK_OPT_BACKING_FMT); + + if (backing_fmt && strcmp(backing_fmt, "sheepdog") !=3D 0) { + error_setg(errp, "backing_file must be a sheepdog image"); + ret =3D -EINVAL; + goto fail; + } =20 qdict =3D qemu_opts_to_qdict(opts, NULL); qdict_put_str(qdict, "driver", "sheepdog"); @@ -2228,6 +2236,7 @@ fail: qapi_free_BlockdevCreateOptions(create_options); qobject_unref(qdict); g_free(redundancy); + g_free(backing_fmt); return ret; } =20 @@ -3185,6 +3194,11 @@ static QemuOptsList sd_create_opts =3D { .type =3D QEMU_OPT_STRING, .help =3D "File name of a base image" }, + { + .name =3D BLOCK_OPT_BACKING_FMT, + .type =3D QEMU_OPT_STRING, + .help =3D "Must be 'sheepdog' if present", + }, { .name =3D BLOCK_OPT_PREALLOC, .type =3D QEMU_OPT_STRING, --=20 2.25.4