From patchwork Wed Mar 12 14:37:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 14013616 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id DFA27C28B28 for ; Wed, 12 Mar 2025 14:38:37 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tsNDw-0001pO-Vq; Wed, 12 Mar 2025 10:38:21 -0400 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 1tsNDn-0001of-QH for qemu-devel@nongnu.org; Wed, 12 Mar 2025 10:38:12 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tsNDm-0004SQ-4v for qemu-devel@nongnu.org; Wed, 12 Mar 2025 10:38:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741790286; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=sJJVastwPy/J+GQoTTP0HwUhC6yw590YuN8XO7mJFmU=; b=RJcy76DMIk/FNTbKbRwSZk8z729LhkfIvnLtGXYBlhbjypyjqMiwwtGcYE/6/6g1AfGyAm LRnj/Mn5ZxEn8Nw7SyMvWVwgFSWRwkSgMwRST0mfCAsDCzl0h8tLFKRTE1H8UQDba1pBUD MB//tBmT2FfRl6rwLstlDF4QZzezbfw= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-546-bJIiSibfOeaSCf9PW2o8EQ-1; Wed, 12 Mar 2025 10:38:04 -0400 X-MC-Unique: bJIiSibfOeaSCf9PW2o8EQ-1 X-Mimecast-MFC-AGG-ID: bJIiSibfOeaSCf9PW2o8EQ_1741790284 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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 mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 58E5418001F7; Wed, 12 Mar 2025 14:38:03 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.22.74.4]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 801A21800945; Wed, 12 Mar 2025 14:38:02 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 8C9E921E675F; Wed, 12 Mar 2025 15:37:58 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, hreitz@redhat.com, kwolf@redhat.com, vsementsov@yandex-team.ru Subject: [PATCH] block: Fix bdrv_activate() not to fail without medium Date: Wed, 12 Mar 2025 15:37:58 +0100 Message-ID: <20250312143758.1660177-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org bdrv_activate() returns failure without setting an error when !bs->drv. This is suspicious. Turns out it used to succeed then, until commit 5416645fcf82 changed it to return -ENOMEDIUM. Return zero instead. Fixes: 5416645fcf82 (block: return error-code from bdrv_invalidate_cache) Signed-off-by: Markus Armbruster --- block.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block.c b/block.c index 0ece805e41..9855c102de 100644 --- a/block.c +++ b/block.c @@ -6860,7 +6860,7 @@ int bdrv_activate(BlockDriverState *bs, Error **errp) GRAPH_RDLOCK_GUARD_MAINLOOP(); if (!bs->drv) { - return -ENOMEDIUM; + return 0; } QLIST_FOREACH(child, &bs->children, next) {