From nobody Tue Nov 26 05:32:01 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=1709735382; cv=none; d=zohomail.com; s=zohoarc; b=YMsb82RORauK1fIS8RbD++fz/4HDD5ZdWrDhPgAsFPihRo1L9cX8bSJCwtAGZmdQpP6452pMs2wTxCSg4Q7nNR89cYqU9TmMEGJM4lvQS6JNkS2aCuRtGAfG18aKdcC8Ax2V4RRMMEbBtaFdTZ0fnhd8wHGcqqlBXdUxK3NRdEA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1709735382; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=oO47nNdCbFfOr1QhJsTJLn777GWhWY/TMXW8pMn2RiA=; b=i6guzjcFni5D91Di9Mkll+2o7VKEGg0ll9UtrJpp+otDpJ8hv+HsxsS2qk+tc0yPKcbWZa1DkZznjNXHBJ5zjTJL/QK3XQ0D9gZ6bR8yQOdwlzdQ5kfgc2dnGvFHHx2J8cbXpRUMVasyhC7ta/YyDKLi6POaTpUOTDgzZDC+EPA= 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 1709735382875830.2536009058335; Wed, 6 Mar 2024 06:29:42 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rhsG7-0000XM-QA; Wed, 06 Mar 2024 09:28:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rhsG5-0000Wo-KK for qemu-devel@nongnu.org; Wed, 06 Mar 2024 09:28:37 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rhsG4-00043v-36 for qemu-devel@nongnu.org; Wed, 06 Mar 2024 09:28:37 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-319-lKMjwvlEPweFXZbmOGkp_A-1; Wed, 06 Mar 2024 09:28:32 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 726DC852008; Wed, 6 Mar 2024 14:28:32 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.3]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4FDEA111DD03; Wed, 6 Mar 2024 14:28:32 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 5413F21E6A24; Wed, 6 Mar 2024 15:28:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709735314; 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=oO47nNdCbFfOr1QhJsTJLn777GWhWY/TMXW8pMn2RiA=; b=ad3srxEkGwpuPt2KnYKC1G+kdu6+BLtBHAHxoXZ/eRv5kWjLYzVQgvw39/ApitLy1UBJA6 NiweoJfCszImBaySM+0Lmywqh90V+nfUgTEuXa4sH0E5mIPawhhMpW3tJKPZFM6O1BCJw3 +QITkVbQIEAixlOeNyFS/JDO54Md4wU= X-MC-Unique: lKMjwvlEPweFXZbmOGkp_A-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, hreitz@redhat.com, qemu-block@nongnu.org, qemu-trivial@nongnu.org Subject: [PATCH] blockdev: Fix blockdev-snapshot-sync error reporting for no medium Date: Wed, 6 Mar 2024 15:28:31 +0100 Message-ID: <20240306142831.2514431-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.3 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.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.365, 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, T_SCC_BODY_TEXT_LINE=-0.01 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1709735384912100001 Content-Type: text/plain; charset="utf-8" When external_snapshot_abort() rejects a BlockDriverState without a medium, it creates an error like this: error_setg(errp, "Device '%s' has no medium", device); Trouble is @device can be null. My system formats null as "(null)", but other systems might crash. Reproducer: 1. Create a block device without a medium -> {"execute": "blockdev-add", "arguments": {"driver": "host_cdrom", "n= ode-name": "blk0", "filename": "/dev/sr0"}} <- {"return": {}} 3. Attempt to snapshot it -> {"execute":"blockdev-snapshot-sync", "arguments": { "node-name": "bl= k0", "snapshot-file":"/tmp/foo.qcow2","format":"qcow2"}} <- {"error": {"class": "GenericError", "desc": "Device '(null)' has no = medium"}} Broken when commit 0901f67ecdb made @device optional. Use bdrv_get_device_or_node_name() instead. Now it fails as it should: <- {"error": {"class": "GenericError", "desc": "Device 'blk0' has no me= dium"}} Fixes: 0901f67ecdb7 (qmp: Allow to take external snapshots on bs graphs nod= e.) Signed-off-by: Markus Armbruster --- blockdev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/blockdev.c b/blockdev.c index d8fb3399f5..057601dcf0 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1395,7 +1395,8 @@ static void external_snapshot_action(TransactionActio= n *action, bdrv_drained_begin(state->old_bs); =20 if (!bdrv_is_inserted(state->old_bs)) { - error_setg(errp, QERR_DEVICE_HAS_NO_MEDIUM, device); + error_setg(errp, QERR_DEVICE_HAS_NO_MEDIUM, + bdrv_get_device_or_node_name(state->old_bs)); return; } =20 --=20 2.44.0