From nobody Tue Apr 15 08:22:27 2025 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=1622641861; cv=none; d=zohomail.com; s=zohoarc; b=jwWBql8xLrBXwD3zlmAp1O8xAo5YxHnXLvc2Jm4vfaYTLPQjdg85J2rT5QM+V9rV0nZLHafM2oxEVdjg8a31h3VhQwd0ta14U7+58UfiH/lKtmrfYgY/aYZAh6MHVd8YNjfb/XCAZUMC8LK7OOU6r1hUXoBkCCABoDcuLkVJYAg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622641861; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=eIHfk2PxzIMa8nVXOaUPqutAR2SxBNT6tQV5Eo9WgGo=; b=FT0987M7vX+62Asq36fjA8g1XDrt+cTjnhV7Cz0lIKbwEtM/gXQpdhZjEz7lvsuUKy7mS6WT5bFzIUXU25rLjc4goVn5S2s8dOgiCRbR1hv/8tqgOrpfUn1gtfMkEQfeRVHcKhi7UDoPeMZ01wM27WRFpgjADNqYV2KjqHf4zw8= 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 162264186113378.54975258736965; Wed, 2 Jun 2021 06:51:01 -0700 (PDT) Received: from localhost ([::1]:56676 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1loRGt-0003g0-VT for importer@patchew.org; Wed, 02 Jun 2021 09:50:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44108) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1loRCb-0002G5-JH for qemu-devel@nongnu.org; Wed, 02 Jun 2021 09:46:33 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:47070) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1loRCX-0007Qw-Fs for qemu-devel@nongnu.org; Wed, 02 Jun 2021 09:46:33 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-166-Mw62IVzrOiOZeC2ozl3-Xw-1; Wed, 02 Jun 2021 09:46:24 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 26E8719253F8; Wed, 2 Jun 2021 13:45:52 +0000 (UTC) Received: from merkur.redhat.com (ovpn-114-240.ams2.redhat.com [10.36.114.240]) by smtp.corp.redhat.com (Postfix) with ESMTP id 369B860BD9; Wed, 2 Jun 2021 13:45:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622641588; 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=eIHfk2PxzIMa8nVXOaUPqutAR2SxBNT6tQV5Eo9WgGo=; b=JmFzE5+MPpUW2vYeFrM5Xolc2xHVc77+yHsrhebtFnaBVfTMgKTxnVAYPSZMInTNuJ9FYL D0oQnXDSpTUyOgfDlumXowiTjDRKgJev23DGStHLB0AgmAmncj6fd2ITnAyPvzgal1cGUM D+3Fox4/1I9fLKekBaCXC5NUonL+1Cg= X-MC-Unique: Mw62IVzrOiOZeC2ozl3-Xw-1 From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PULL 14/20] block: simplify bdrv_child_user_desc() Date: Wed, 2 Jun 2021 15:45:23 +0200 Message-Id: <20210602134529.231756-15-kwolf@redhat.com> In-Reply-To: <20210602134529.231756-1-kwolf@redhat.com> References: <20210602134529.231756-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kwolf@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.371, 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, peter.maydell@linaro.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy All child classes have this callback. So, drop unreachable code. Still add an assertion to bdrv_attach_child_common(), to early detect bad classes. Signed-off-by: Vladimir Sementsov-Ogievskiy Message-Id: <20210601075218.79249-6-vsementsov@virtuozzo.com> Signed-off-by: Kevin Wolf --- block.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/block.c b/block.c index 94cb7b6637..3c0c3964ec 100644 --- a/block.c +++ b/block.c @@ -2026,11 +2026,7 @@ bool bdrv_is_writable(BlockDriverState *bs) =20 static char *bdrv_child_user_desc(BdrvChild *c) { - if (c->klass->get_parent_desc) { - return c->klass->get_parent_desc(c); - } - - return g_strdup("another user"); + return c->klass->get_parent_desc(c); } =20 static bool bdrv_a_allow_b(BdrvChild *a, BdrvChild *b, Error **errp) @@ -2772,6 +2768,7 @@ static int bdrv_attach_child_common(BlockDriverState = *child_bs, =20 assert(child); assert(*child =3D=3D NULL); + assert(child_class->get_parent_desc); =20 new_child =3D g_new(BdrvChild, 1); *new_child =3D (BdrvChild) { --=20 2.30.2