From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0B179C04AB5 for ; Mon, 3 Jun 2019 16:36:22 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D82FF2730E for ; Mon, 3 Jun 2019 16:36:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D82FF2730E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([127.0.0.1]:37788 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hXpwb-0000On-0C for qemu-devel@archiver.kernel.org; Mon, 03 Jun 2019 12:36:21 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34018) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hXpus-0007UL-2k for qemu-devel@nongnu.org; Mon, 03 Jun 2019 12:34:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hXpmA-0002BW-HI for qemu-devel@nongnu.org; Mon, 03 Jun 2019 12:25:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53922) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hXpm9-0001f0-8i; Mon, 03 Jun 2019 12:25:33 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6FAB5308794D; Mon, 3 Jun 2019 16:25:19 +0000 (UTC) Received: from localhost (unknown [10.40.205.221]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 06E2B2E198; Mon, 3 Jun 2019 16:25:18 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Mon, 3 Jun 2019 18:25:12 +0200 Message-Id: <20190603162512.30422-3-mreitz@redhat.com> In-Reply-To: <20190603162512.30422-1-mreitz@redhat.com> References: <20190603162512.30422-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Mon, 03 Jun 2019 16:25:19 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/2] blockdev: Overlays are not snapshots 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: Kevin Wolf , Markus Armbruster , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" There are error messages which refer to an overlay node as the snapshot. That is wrong, those are two different things. Signed-off-by: Max Reitz --- blockdev.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/blockdev.c b/blockdev.c index 6963270108..7de0b04fe7 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1608,13 +1608,13 @@ static void external_snapshot_prepare(BlkActionSt= ate *common, s->has_snapshot_node_name ? s->snapshot_node_name : NULL; =20 if (node_name && !snapshot_node_name) { - error_setg(errp, "New snapshot node name missing"); + error_setg(errp, "New overlay node name missing"); goto out; } =20 if (snapshot_node_name && bdrv_lookup_bs(snapshot_node_name, snapshot_node_name, NULL)= ) { - error_setg(errp, "New snapshot node name already in use"); + error_setg(errp, "New overlay node name already in use"); goto out; } =20 @@ -1656,7 +1656,7 @@ static void external_snapshot_prepare(BlkActionStat= e *common, } =20 if (bdrv_has_blk(state->new_bs)) { - error_setg(errp, "The snapshot is already in use"); + error_setg(errp, "The overlay is already in use"); goto out; } =20 @@ -1666,12 +1666,12 @@ static void external_snapshot_prepare(BlkActionSt= ate *common, } =20 if (state->new_bs->backing !=3D NULL) { - error_setg(errp, "The snapshot already has a backing image"); + error_setg(errp, "The overlay already has a backing image"); goto out; } =20 if (!state->new_bs->drv->supports_backing) { - error_setg(errp, "The snapshot does not support backing images")= ; + error_setg(errp, "The overlay does not support backing images"); goto out; } =20 --=20 2.21.0