From nobody Mon Feb 9 23:39:03 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1608376071; cv=none; d=zohomail.com; s=zohoarc; b=G0XYrSadtPMbmxZ4hE81+/ifR9hGKiIOBAvP5K/fpMwXbIPzvHDqqy1mk+zt2qL2P+oigWQkENfzLrpb3wnvXBqq+cwkP68WqKiFTa5wkdKTPT22AXKgcT2W3YO73Sp3mm671pMZ4LlSfO7q+jx4pfRuoCHS1ovzrDNZ5ShTHWY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608376071; 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=ArWYvOkOsSQfEDSh3eobi/mm1FjGc5gzHUQcz8x7llc=; b=YJ/JS5UZJLJ9ZE+05OrTgwcQfjFIPoVSHgnoTApzyHmj5s0XkwiM05juOrovPnq505ypsqQ3U1Pklxvxst21+BI6+rG+NMEVZBAARvXxaEQ1H5IwSBWpKPIzHfJg8i8hMhgW3KemmceRpAT/sMeaXxTgaTBdd1wAw0tMkCsmV1M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1608376071887334.4955714691798; Sat, 19 Dec 2020 03:07:51 -0800 (PST) Received: from localhost ([::1]:48328 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kqa5W-0003ww-OT for importer@patchew.org; Sat, 19 Dec 2020 06:07:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50800) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kqZtv-00050j-Ls for qemu-devel@nongnu.org; Sat, 19 Dec 2020 05:55:51 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:29840) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kqZtl-0007HU-MU for qemu-devel@nongnu.org; Sat, 19 Dec 2020 05:55:51 -0500 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-50-tJc24Hh1Mtq61FvGISPTDQ-1; Sat, 19 Dec 2020 05:55:38 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 354348015CE; Sat, 19 Dec 2020 10:55:37 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-103.ams2.redhat.com [10.36.112.103]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D0D7877701; Sat, 19 Dec 2020 10:55:36 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id B418D11268B9; Sat, 19 Dec 2020 11:55:32 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608375340; 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=ArWYvOkOsSQfEDSh3eobi/mm1FjGc5gzHUQcz8x7llc=; b=ZhzjpuNv4DdjgqvXUbHLXwzI73RZ/Yih8IK2S9IhxjqDywkgVXd2ZknjDrq/Ea9DLiV/O+ DW8tIUp/Wy4l77z/H+grQFeGto66GZOb4EoACbjR0xDzYzCGmZMh7G/YxhpEy90FOd33Xl PjX90Moz2MrqAxEmH1zVXArxUTbXB6A= X-MC-Unique: tJc24Hh1Mtq61FvGISPTDQ-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 23/33] block: Avoid qobject_get_try_str() Date: Sat, 19 Dec 2020 11:55:22 +0100 Message-Id: <20201219105532.1734134-24-armbru@redhat.com> In-Reply-To: <20201219105532.1734134-1-armbru@redhat.com> References: <20201219105532.1734134-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@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=63.128.21.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_H4=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: Kevin Wolf , peter.maydell@linaro.org, Vladimir Sementsov-Ogievskiy , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" I'm about to remove qobject_get_try_str(). Use qstring_get_str() instead. Safe because the argument is known to be a QString here. Cc: Kevin Wolf Cc: Max Reitz Cc: qemu-block@nongnu.org Signed-off-by: Markus Armbruster Message-Id: <20201211171152.146877-11-armbru@redhat.com> Reviewed-by: Vladimir Sementsov-Ogievskiy --- block.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/block.c b/block.c index 09d4c6bd25..934d1bcc8f 100644 --- a/block.c +++ b/block.c @@ -4021,7 +4021,7 @@ static int bdrv_reopen_parse_backing(BDRVReopenState = *reopen_state, new_backing_bs =3D NULL; break; case QTYPE_QSTRING: - str =3D qobject_get_try_str(value); + str =3D qstring_get_str(qobject_to(QString, value)); new_backing_bs =3D bdrv_lookup_bs(NULL, str, errp); if (new_backing_bs =3D=3D NULL) { return -EINVAL; @@ -4284,8 +4284,8 @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state= , BlockReopenQueue *queue, } =20 if (child) { - const char *str =3D qobject_get_try_str(new); - if (!strcmp(child->bs->node_name, str)) { + if (!strcmp(child->bs->node_name, + qstring_get_str(qobject_to(QString, new)))= ) { continue; /* Found child with this name, skip opti= on */ } } --=20 2.26.2