From nobody Sat Nov 1 22:27:51 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1527697789581967.8285450263718; Wed, 30 May 2018 09:29:49 -0700 (PDT) Received: from localhost ([::1]:39625 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fO3yu-0006kD-Qy for importer@patchew.org; Wed, 30 May 2018 12:29:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34351) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fO3tA-0002O5-CJ for qemu-devel@nongnu.org; Wed, 30 May 2018 12:23:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fO3t9-0002V9-Hq for qemu-devel@nongnu.org; Wed, 30 May 2018 12:23:52 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:59864 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fO3t9-0002Uo-DG for qemu-devel@nongnu.org; Wed, 30 May 2018 12:23:51 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D8514818A6A5; Wed, 30 May 2018 16:23:50 +0000 (UTC) Received: from donizetti.redhat.com (unknown [10.36.118.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 22F8363A6B; Wed, 30 May 2018 16:23:49 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 30 May 2018 18:23:49 +0200 Message-Id: <20180530162349.31100-1-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Wed, 30 May 2018 16:23:50 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Wed, 30 May 2018 16:23:50 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'pbonzini@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH] qom: support orphan objects in object_get_canonical_path X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: aik@ozlabs.ru Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Mostly a rewrite, in order to keep the loop simple. Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- qom/object.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/qom/object.c b/qom/object.c index 0fc972030e..4f30431ae3 100644 --- a/qom/object.c +++ b/qom/object.c @@ -1669,25 +1669,28 @@ gchar *object_get_canonical_path(Object *obj) Object *root =3D object_get_root(); char *newpath, *path =3D NULL; =20 - while (obj !=3D root) { + if (obj =3D=3D root) { + return g_strdup("/"); + } + + do { char *component =3D object_get_canonical_path_component(obj); =20 - if (path) { - newpath =3D g_strdup_printf("%s/%s", component, path); - g_free(component); + if (!component) { + /* A canonical path must be complete, so discard what was + * collected so far. + */ g_free(path); - path =3D newpath; - } else { - path =3D component; + return NULL; } =20 - obj =3D obj->parent; - } - - newpath =3D g_strdup_printf("/%s", path ? path : ""); - g_free(path); + newpath =3D g_strdup_printf("/%s%s", component, path ? path : ""); + g_free(path); + g_free(component); + path =3D newpath; + } while ((obj =3D obj->parent) !=3D root); =20 - return newpath; + return path; } =20 Object *object_resolve_path_component(Object *parent, const gchar *part) --=20 2.17.0