From patchwork Mon Mar 1 23:36:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Connor Kuehl X-Patchwork-Id: 1445803 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=drHuTK5A; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DqGs41lrLz9sS8 for ; Tue, 2 Mar 2021 10:37:43 +1100 (AEDT) Received: from localhost ([::1]:39904 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lGs6f-0002cl-C5 for incoming@patchwork.ozlabs.org; Mon, 01 Mar 2021 18:37:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44840) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lGs5H-0002Zs-Ur for qemu-devel@nongnu.org; Mon, 01 Mar 2021 18:36:15 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:36845) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lGs5F-0007k0-9R for qemu-devel@nongnu.org; Mon, 01 Mar 2021 18:36:15 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614641771; 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=yGu3+Z9S0/n+m3F3rnAp7SxPc33Mr47djnBjXUIToYY=; b=drHuTK5AYWvs5wRPHjJ47bvffivDBwbbhhfkDfJ3a2RhJt8kR6kqDzO75y80pkh4fc/VAy GfbmDBXqVs4rLMl1s0BrnKjxCu6QAlfopARthCi+7mkSDuOKE1pSiKyggMVvoO8k+BOrkl Eodqf5jALbGSAnlD5jMb8mEjN8dDLmI= Received: from mail-ot1-f72.google.com (mail-ot1-f72.google.com [209.85.210.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-172-f5ny3P3CM9inG8JXwYQ6pA-1; Mon, 01 Mar 2021 18:36:10 -0500 X-MC-Unique: f5ny3P3CM9inG8JXwYQ6pA-1 Received: by mail-ot1-f72.google.com with SMTP id y12so2181959otq.1 for ; Mon, 01 Mar 2021 15:36:10 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yGu3+Z9S0/n+m3F3rnAp7SxPc33Mr47djnBjXUIToYY=; b=ocPnrP8OLBMOljQyrWTAGOZom8TE+jduL5gWuoMOWgnMulUQ59h7fGZ4CMP4OmM3jw nQwlkPkTeoTW1JJkvfFYD1yf8Ps4QSW4EwXTlGCEW18ExcvO1u/7UX0bpyA4qMOqpeM3 apEImkEv7ZS0+FiraswHfa45OHyasLKpka2I94V8yqbxg2h0/FO4iKnvjpr3xTPZJdsF U3lbJ/x8inM5bhQjStqrgZ3tr9ve9ILniQhPCHBI/xus4eKxZG13He9HYU2hBV8MUCMY c6UGXHclJQ2O4g/5HMZ4yucqRt+inu7X28BPbcUaEihHUP3ZQDu+8FbopmCIZtbaQcig Fg5w== X-Gm-Message-State: AOAM532N/o98CFRgEMlRHZmaj8FlXs7Tv/eE+gWqjaDysW289xfpHE/d P7NXeRg6R0/j83pqL/7Xsk1mzuz7iuYD1d92yCOsXi4ESdumju6IbrGSlwmIo/yPcWOXVBKAIXK BMx3ps4jttVBIZes= X-Received: by 2002:a05:6808:d47:: with SMTP id w7mr1151605oik.150.1614641769753; Mon, 01 Mar 2021 15:36:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJzxYkvcV1TiITlURM9DbaHVYm2/YFucMjWpYz7LyqfwvqqwAzTJTzUGPYlR1tvAQY58a2aaBA== X-Received: by 2002:a05:6808:d47:: with SMTP id w7mr1151597oik.150.1614641769622; Mon, 01 Mar 2021 15:36:09 -0800 (PST) Received: from redhat.redhat.com (ip68-103-222-6.ks.ok.cox.net. [68.103.222.6]) by smtp.gmail.com with ESMTPSA id a12sm4087885otp.30.2021.03.01.15.36.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Mar 2021 15:36:09 -0800 (PST) From: Connor Kuehl To: qemu-block@nongnu.org Subject: [PATCH 1/2] block: Clarify error messages pertaining to 'node-name' Date: Mon, 1 Mar 2021 17:36:06 -0600 Message-Id: <20210301233607.748412-2-ckuehl@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210301233607.748412-1-ckuehl@redhat.com> References: <20210301233607.748412-1-ckuehl@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ckuehl@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=63.128.21.124; envelope-from=ckuehl@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, armbru@redhat.com, qemu-devel@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Reported-by: Tingting Mao Fixes: https://bugzilla.redhat.com/1651437 Signed-off-by: Connor Kuehl --- block.c | 8 ++++---- tests/qemu-iotests/040 | 4 ++-- tests/qemu-iotests/249.out | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/block.c b/block.c index a1f3cecd75..2daff6d29a 100644 --- a/block.c +++ b/block.c @@ -1440,7 +1440,7 @@ static void bdrv_assign_node_name(BlockDriverState *bs, * Check for empty string or invalid characters, but not if it is * generated (generated names use characters not available to the user) */ - error_setg(errp, "Invalid node name"); + error_setg(errp, "Invalid node-name: '%s'", node_name); return; } @@ -1453,7 +1453,7 @@ static void bdrv_assign_node_name(BlockDriverState *bs, /* takes care of avoiding duplicates node names */ if (bdrv_find_node(node_name)) { - error_setg(errp, "Duplicate node name"); + error_setg(errp, "Duplicate nodes with node-name='%s'", node_name); goto out; } @@ -5432,7 +5432,7 @@ BlockDriverState *bdrv_lookup_bs(const char *device, } } - error_setg(errp, "Cannot find device=%s nor node_name=%s", + error_setg(errp, "Cannot find device=\'%s\' nor node-name=\'%s\'", device ? device : "", node_name ? node_name : ""); return NULL; @@ -6752,7 +6752,7 @@ BlockDriverState *check_to_replace_node(BlockDriverState *parent_bs, AioContext *aio_context; if (!to_replace_bs) { - error_setg(errp, "Node name '%s' not found", node_name); + error_setg(errp, "Failed to find node with node-name='%s'", node_name); return NULL; } diff --git a/tests/qemu-iotests/040 b/tests/qemu-iotests/040 index 7ebc9ed825..336ff7c4f2 100755 --- a/tests/qemu-iotests/040 +++ b/tests/qemu-iotests/040 @@ -175,13 +175,13 @@ class TestSingleDrive(ImageCommitTestCase): self.assert_no_active_block_jobs() result = self.vm.qmp('block-commit', device='drive0', top_node='badfile', base_node='base') self.assert_qmp(result, 'error/class', 'GenericError') - self.assert_qmp(result, 'error/desc', "Cannot find device= nor node_name=badfile") + self.assert_qmp(result, 'error/desc', "Cannot find device='' nor node-name='badfile'") def test_base_node_invalid(self): self.assert_no_active_block_jobs() result = self.vm.qmp('block-commit', device='drive0', top_node='mid', base_node='badfile') self.assert_qmp(result, 'error/class', 'GenericError') - self.assert_qmp(result, 'error/desc', "Cannot find device= nor node_name=badfile") + self.assert_qmp(result, 'error/desc', "Cannot find device='' nor node-name='badfile'") def test_top_path_and_node(self): self.assert_no_active_block_jobs() diff --git a/tests/qemu-iotests/249.out b/tests/qemu-iotests/249.out index 92ec81db03..d2bf9be85e 100644 --- a/tests/qemu-iotests/249.out +++ b/tests/qemu-iotests/249.out @@ -18,7 +18,7 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 backing_file=TEST_DIR/t. 'filter-node-name': '1234'}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "job0"}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "job0"}} -{"error": {"class": "GenericError", "desc": "Invalid node name"}} +{"error": {"class": "GenericError", "desc": "Invalid node-name: '1234'"}} === Send a write command to a drive opened in read-only mode (2) From patchwork Mon Mar 1 23:36:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Connor Kuehl X-Patchwork-Id: 1445805 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=BsVTbLov; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DqGv743T9z9sS8 for ; Tue, 2 Mar 2021 10:39:31 +1100 (AEDT) Received: from localhost ([::1]:44530 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lGs8P-0004gL-J1 for incoming@patchwork.ozlabs.org; Mon, 01 Mar 2021 18:39:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44846) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lGs5I-0002a0-BZ for qemu-devel@nongnu.org; Mon, 01 Mar 2021 18:36:17 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:54014) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lGs5F-0007l8-UG for qemu-devel@nongnu.org; Mon, 01 Mar 2021 18:36:16 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614641772; 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=L4hun4GD9d5F9uXCAu/RGnX28m+V5NS7jUfFTmaMEpg=; b=BsVTbLovk0He0GRPa3ZUCkPpisNWnWxw4+8qc73U9aHnrJbJdZtRKhaCk8n/6l/7y3Xu/a HGFRRbfOvrkpLiwl2X7TmAxHrJcS5haoZAtEd8hJHNeR7Pmf8j3wU1op1BPIB+53/ZIObt 2/b9lBT5g7rJR25CBC62uJme9VW++es= Received: from mail-oi1-f198.google.com (mail-oi1-f198.google.com [209.85.167.198]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-257-oR0NtRtOPVaU9BFalF4oQg-1; Mon, 01 Mar 2021 18:36:11 -0500 X-MC-Unique: oR0NtRtOPVaU9BFalF4oQg-1 Received: by mail-oi1-f198.google.com with SMTP id n17so1980042oie.0 for ; Mon, 01 Mar 2021 15:36:11 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=L4hun4GD9d5F9uXCAu/RGnX28m+V5NS7jUfFTmaMEpg=; b=YY/z40jm89CpMhL8894bDXBq56pmF9JRC66pPb+3x5Kb5eebq0VII7Mab/9Mz1PiBn Km1KwFHRyn5UUpkm6hJnnWs8Us0WdCKdex2inr5QuNBAnVZUeENZpH9WgNhdpAQfnjmp BhEmeOuGjTeMOaxcqr7iHjMLW1ofI+o9DyjJDsI9Bz06ZLes5iiVdZ7vO751SDipSH7m 6iVL/z3nk0ZIAuGyXyu+tIBzphmQvhpdDutXbWgpGQqRB57MQ+ilOdHMoi1uxHo3FXp2 hYUL8u4TmMqQKG0MAuIupJ+gYoOraQXRUaAYf+4GJNM8v7aqivioNQsY/ads66FeT1IG cwSw== X-Gm-Message-State: AOAM530PsQQgJLuLTrq7PwXg+ica3MPfjlekEd+KNkwHfjV2AqvGFliA mSBUbqJDvSNQQgY/t11yhcZa/zp9ZqMelRQlXLxk623UtA/5hLQoNPgjfdQ0nKxT68A6y/MgJr/ phLn+fPM4fWeodaw= X-Received: by 2002:a05:6808:154:: with SMTP id h20mr1166251oie.45.1614641770751; Mon, 01 Mar 2021 15:36:10 -0800 (PST) X-Google-Smtp-Source: ABdhPJxpgGq8c9YHntvWnoWlQ2tCQ5GxHqE6inkPibnTTd8ODc+s6w0GoW6NlDZbYnjoZilgvE4ewA== X-Received: by 2002:a05:6808:154:: with SMTP id h20mr1166241oie.45.1614641770630; Mon, 01 Mar 2021 15:36:10 -0800 (PST) Received: from redhat.redhat.com (ip68-103-222-6.ks.ok.cox.net. [68.103.222.6]) by smtp.gmail.com with ESMTPSA id a12sm4087885otp.30.2021.03.01.15.36.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Mar 2021 15:36:10 -0800 (PST) From: Connor Kuehl To: qemu-block@nongnu.org Subject: [PATCH 2/2] blockdev: Clarify error messages pertaining to 'node-name' Date: Mon, 1 Mar 2021 17:36:07 -0600 Message-Id: <20210301233607.748412-3-ckuehl@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210301233607.748412-1-ckuehl@redhat.com> References: <20210301233607.748412-1-ckuehl@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ckuehl@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=ckuehl@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no 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, armbru@redhat.com, qemu-devel@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Connor Kuehl --- blockdev.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/blockdev.c b/blockdev.c index cd438e60e3..7c7ab2b386 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1515,13 +1515,13 @@ static void external_snapshot_prepare(BlkActionState *common, s->has_snapshot_node_name ? s->snapshot_node_name : NULL; if (node_name && !snapshot_node_name) { - error_setg(errp, "New overlay node name missing"); + error_setg(errp, "New overlay node-name missing"); goto out; } if (snapshot_node_name && bdrv_lookup_bs(snapshot_node_name, snapshot_node_name, NULL)) { - error_setg(errp, "New overlay node name already in use"); + error_setg(errp, "New overlay node-name already in use"); goto out; } @@ -3598,13 +3598,14 @@ void qmp_x_blockdev_reopen(BlockdevOptions *options, Error **errp) /* Check for the selected node name */ if (!options->has_node_name) { - error_setg(errp, "Node name not specified"); + error_setg(errp, "node-name not specified"); goto fail; } bs = bdrv_find_node(options->node_name); if (!bs) { - error_setg(errp, "Cannot find node named '%s'", options->node_name); + error_setg(errp, "Failed to find node with node-name='%s'", + options->node_name); goto fail; } @@ -3635,7 +3636,7 @@ void qmp_blockdev_del(const char *node_name, Error **errp) bs = bdrv_find_node(node_name); if (!bs) { - error_setg(errp, "Cannot find node %s", node_name); + error_setg(errp, "Failed to find node with node-name='%s'", node_name); return; } if (bdrv_has_blk(bs)) { @@ -3758,7 +3759,7 @@ void qmp_x_blockdev_set_iothread(const char *node_name, StrOrNull *iothread, bs = bdrv_find_node(node_name); if (!bs) { - error_setg(errp, "Cannot find node %s", node_name); + error_setg(errp, "Failed to find node with node-name='%s'", node_name); return; }