From nobody Mon May 6 11:12:04 2024 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=1664558509; cv=none; d=zohomail.com; s=zohoarc; b=OOsaAmJ40Utn0zL33iQY5XCWMb+kETlSpGAJjs40c/kGSNMnFvvEvymKn/SOt5hVDnWllnWLkzpt/DhzSROuq2fZEWK4Kcp3guF5uhHwsU8ofA+T+imD9p0XUO1evteEf5H8Bei1dIJ2f1JAsYu1WjzK0fB6Tt/stFqifzuU4NE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664558509; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=yJ52BDAzQVR2LH49wQwnGdqoJG6yjR+AiVz5LrXsbg8=; b=GWLILrHQPHkdffEQ+caIZyu5xYHxs/gl/AT1N+rWHQdGaxXZNxwCTNSN6hJHL8DFn3BHVGEY8g9W5PJa3xRCfRazxzWYBRAny2DusIfy7H5P5hoKoJCclL8iaJD6n69KdfhtI86ZD2R2/SmwhgYdHiXOR5X9oZwlSmuMiFrORhE= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1664558509459123.55979053204112; Fri, 30 Sep 2022 10:21:49 -0700 (PDT) Received: from localhost ([::1]:41580 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oeJhr-0007rz-CP for importer@patchew.org; Fri, 30 Sep 2022 13:21:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59198) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oeJfR-0006oK-Km for qemu-devel@nongnu.org; Fri, 30 Sep 2022 13:19:22 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:41356) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oeJfO-0002EE-P2 for qemu-devel@nongnu.org; Fri, 30 Sep 2022 13:19:16 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-468-GLJuikC8PrasVLTgipgNWw-1; Fri, 30 Sep 2022 13:19:11 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 99050833948 for ; Fri, 30 Sep 2022 17:19:11 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.163]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6C41C207AD4C; Fri, 30 Sep 2022 17:19:11 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 92A9521E691D; Fri, 30 Sep 2022 19:19:08 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1664558352; 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; bh=yJ52BDAzQVR2LH49wQwnGdqoJG6yjR+AiVz5LrXsbg8=; b=b+w1IYa489+5nkW+7bJSQjUq7P2l9Q8dZ1rxY4rZSJ5x9T6vxDtzth6CX4olcC0mnLWxAb 2ISsm50KZnCKhb1tplFJHoSYgFKK9odNVaGv7Uw8MFPJvFk3JP2bv3skYv6gqlidEN/cv0 zvQT9xeNC3GluEjZpvq6QB5sjmeuUYQ= X-MC-Unique: GLJuikC8PrasVLTgipgNWw-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: victortoso@redhat.com, kwolf@redhat.com Subject: [PATCH] Revert "qapi: fix examples of blockdev-add with qcow2" Date: Fri, 30 Sep 2022 19:19:08 +0200 Message-Id: <20220930171908.846769-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 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=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1664558510036100001 Content-Type: text/plain; charset="utf-8" This reverts commit b6522938327141235b97ab38e40c6c4512587373. Kevin Wolf NAKed this patch, because: 'file' is a required member (defined in BlockdevOptionsGenericFormat), removing it makes the example invalid. 'data-file' is only an additional optional member to be used for external data files (i.e. when the guest data is kept separate from the metadata in the .qcow2 file). However, it had already been merged then. Revert. Signed-off-by: Markus Armbruster Acked-by: Victor Toso --- qapi/block-core.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/qapi/block-core.json b/qapi/block-core.json index f21fa235f2..882b266532 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1541,8 +1541,8 @@ # -> { "execute": "blockdev-add", # "arguments": { "driver": "qcow2", # "node-name": "node1534", -# "data-file": { "driver": "file", -# "filename": "hd1.qcow2" }, +# "file": { "driver": "file", +# "filename": "hd1.qcow2" }, # "backing": null } } # # <- { "return": {} } @@ -4378,7 +4378,7 @@ # "arguments": { # "driver": "qcow2", # "node-name": "test1", -# "data-file": { +# "file": { # "driver": "file", # "filename": "test.qcow2" # } @@ -4395,7 +4395,7 @@ # "cache": { # "direct": true # }, -# "data-file": { +# "file": { # "driver": "file", # "filename": "/tmp/test.qcow2" # }, @@ -4477,7 +4477,7 @@ # "arguments": { # "driver": "qcow2", # "node-name": "node0", -# "data-file": { +# "file": { # "driver": "file", # "filename": "test.qcow2" # } --=20 2.37.2