From nobody Mon Feb 9 09:53:00 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=1608376745; cv=none; d=zohomail.com; s=zohoarc; b=bGOfHxw67MZHslxwm/7DLvYIUMvmdW0Rgs3OtxxTHPjupbYRntCRYFSQvA/xMRdzHGC5qzbWAn0xcH0+TUamFWZ1HXQntfhAWz2NAuhMRH1t3H5dTFUoPufm+cKDSyGe8WPb/PintyeiLibGKqDng+f3I3jaEYnbCs1QDaiTOkc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608376745; 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=TKn58zkxqk1EeoQRUU0MaGsaJJ+I/4c1ZDLkT/Mn5uA=; b=ZXbion+9ns95DdVQy7DNGg0WsxJWxR9xQM7G/QKMR+mmIs/nk1XK3hLRy/pghDRnrTzU0EqwXMhs9D4tnptWOJlgWkvxhexckjFz35t0B5Xt6YZ51Y0f4oLrxLzmUOO0is6ylvTPjUdoTE9X5BOOrryJHpFDYpFHNM+mKCVGkF0= 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 1608376745379621.2660388899054; Sat, 19 Dec 2020 03:19:05 -0800 (PST) Received: from localhost ([::1]:56168 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kqaGO-00026W-Bg for importer@patchew.org; Sat, 19 Dec 2020 06:19:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50918) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kqZu3-0005Q4-IS for qemu-devel@nongnu.org; Sat, 19 Dec 2020 05:55:59 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:49858) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kqZtk-0007GN-RA for qemu-devel@nongnu.org; Sat, 19 Dec 2020 05:55:59 -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-68-4kM3Vc3QNgaTtjWs__VdYA-1; Sat, 19 Dec 2020 05:55:38 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 12275107ACF5; 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 D3BD12CC9C; Sat, 19 Dec 2020 10:55:36 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id B8EAB1126833; 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=TKn58zkxqk1EeoQRUU0MaGsaJJ+I/4c1ZDLkT/Mn5uA=; b=afvQY8tdrUtTVTjXgLD/yqAiBa3j+eeFK9HAPZCBHseETPDB0OUuqGpFUgtj8oVogxh0be 2iOFhasct7EJnXzNYWkTQE/kZSp4V+ihg5Mjy1TRNwMnURzuGDoovjVB944O0PVC7PUF9/ r5fNpB0NDFdJ03UyPtrGa2TdqGcAL+I= X-MC-Unique: 4kM3Vc3QNgaTtjWs__VdYA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 24/33] Revert "qobject: let object_property_get_str() use new API" Date: Sat, 19 Dec 2020 11:55:23 +0100 Message-Id: <20201219105532.1734134-25-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.15 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-Type: text/plain; charset="utf-8" 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: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: peter.maydell@linaro.org, =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Eduardo Habkost , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Commit aafb21a0b9 "qobject: let object_property_get_str() use new API" isn't much of a simplification. Not worth having object_property_get_str() differ from the other object_property_get_FOO(). Revert. This reverts commit aafb21a0b9cea5fa0fe52e68111bb6bd13837a02. Cc: Paolo Bonzini Cc: Daniel P. Berrang=C3=A9 Cc: Eduardo Habkost Signed-off-by: Markus Armbruster Message-Id: <20201211171152.146877-12-armbru@redhat.com> Reviewed-by: Eduardo Habkost --- qom/object.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/qom/object.c b/qom/object.c index f2ae6e6b2a..5cd43fe366 100644 --- a/qom/object.c +++ b/qom/object.c @@ -1415,15 +1415,18 @@ char *object_property_get_str(Object *obj, const ch= ar *name, Error **errp) { QObject *ret =3D object_property_get_qobject(obj, name, errp); + QString *qstring; char *retval; =20 if (!ret) { return NULL; } - - retval =3D g_strdup(qobject_get_try_str(ret)); - if (!retval) { + qstring =3D qobject_to(QString, ret); + if (!qstring) { error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name, "string"); + retval =3D NULL; + } else { + retval =3D g_strdup(qstring_get_str(qstring)); } =20 qobject_unref(ret); --=20 2.26.2