From nobody Sun May 19 06:50:47 2024 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=1589779260; cv=none; d=zohomail.com; s=zohoarc; b=hhnCVx9UEfSIlU/Ezy2G3tO8WASPl2DPsu1XKcA9aCXWm9L1smxxcrf45eKMG+LRFwq8QgNmRtFPblhLyHGUI3HqLRU6bMVz2G7qyge8dlz2P8RP78f4pKD9wIMFBOXE4/JIbmEIG7iF+m6rf4xc+dYGXfzQ0R131hfa4uUU92Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589779260; 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=bXECg6VhPKKPr6IKwLJ3K+f3rEK+su26Y48KCxlnGw4=; b=VI4MZwyGuejSi8WbCnQOIJTY/0qsRdhtQjfWS7HH5dJqtKwpAR7yV+yJB0CK0tZfkM6SeN76AKInWUAPNI0ofbwrr6qRxJmHufrnWcAEuxBos+m560vkC2Bm9uIPv49lxsqq54y0U/4tF7ho4tQg9E+ynp3vsBR9zdkLmNm5b8c= 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 1589779260994149.79445032172248; Sun, 17 May 2020 22:21:00 -0700 (PDT) Received: from localhost ([::1]:36506 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jaYCx-00082s-Id for importer@patchew.org; Mon, 18 May 2020 01:20:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50498) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jaYBs-0006EW-4P for qemu-devel@nongnu.org; Mon, 18 May 2020 01:19:52 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:54522 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jaYBr-0007IT-2B for qemu-devel@nongnu.org; Mon, 18 May 2020 01:19:51 -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-478-8wf1kNiaMGmx01bF5u00ow-1; Mon, 18 May 2020 01:19:47 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1F24F1005512 for ; Mon, 18 May 2020 05:19:47 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-32.ams2.redhat.com [10.36.112.32]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E19363A0; Mon, 18 May 2020 05:19:46 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 5DFDA11358BD; Mon, 18 May 2020 07:19:45 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589779189; 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=bXECg6VhPKKPr6IKwLJ3K+f3rEK+su26Y48KCxlnGw4=; b=bNtxR77modDRhN7SY39N1UoJ18SVPi3/g99Q9bJGeBh9MUeQYhtAYNoGGuUE+MDh6XvPX5 DKeyfQP7zTudZ1AeeFwJoeK6cwmZI6vL/QgzyjaGk4UQg1hbAZ/quc9wjBHoIS1s3ltA5C jf2ZsyGS6Hnz1NZvnS03TyzhwY9R2vw= X-MC-Unique: 8wf1kNiaMGmx01bF5u00ow-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH not-for-merge 1/5] qom: Instrument to detect missed realize Date: Mon, 18 May 2020 07:19:41 +0200 Message-Id: <20200518051945.8621-2-armbru@redhat.com> In-Reply-To: <20200518051945.8621-1-armbru@redhat.com> References: <20200518051945.8621-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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=205.139.110.120; envelope-from=armbru@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/17 22:51:00 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] 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, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: pbonzini@redhat.com, berrange@redhat.com, ehabkost@redhat.com 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" Signed-off-by: Markus Armbruster --- qom/qom-hmp-cmds.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/qom/qom-hmp-cmds.c b/qom/qom-hmp-cmds.c index cd08233a4c..4a61ee1b8c 100644 --- a/qom/qom-hmp-cmds.c +++ b/qom/qom-hmp-cmds.c @@ -91,6 +91,17 @@ static void print_qom_composition(Monitor *mon, Object *= obj, int indent) } else { name =3D object_get_canonical_path_component(obj); } + + DeviceState *dev =3D (DeviceState *)object_dynamic_cast(obj, TYPE_DEVI= CE); + DeviceClass *dc =3D (DeviceClass *)object_class_dynamic_cast(obj->clas= s, TYPE_DEVICE); + if (dev && !dev->realized) { + monitor_printf(mon, "### unrealized: %s (%s)\n", + name, object_get_typename(obj)); + } + if (dev && dc->bus_type && !dev->parent_bus) { + monitor_printf(mon, "### no %s bus: %s (%s)\n", + dc->bus_type, name, object_get_typename(obj)); + } monitor_printf(mon, "%*s/%s (%s)\n", indent, "", name, object_get_typename(obj)); g_free(name); --=20 2.21.1 From nobody Sun May 19 06:50:47 2024 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=1589779361; cv=none; d=zohomail.com; s=zohoarc; b=c9fRXbCGR1tge6b2eJAminKIGAegk4LxBj9PY8/eavQ2c8ulx8JyJZ62+Kq7WJWw2bbXYmcwoESzuSaFtG89UUwTVwmHM/RSaWaHDi7Dz9AqplQKCBIROaceX4ajbCUDL//47Ps/yAXZHYmXajO5aWRWEYHh0lGA/HlyeC88xPs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589779361; 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=lrjdkoqq59m3gm70wai2XBaHaN/BcEgROdns7yTJmXE=; b=S6RHBpFhgitWlR1kOBZn/T1b7dw3/DpQh9O2p+OFXF7br3J6ygu/Ca+MGzv3wUt6T/lKo3bfOP/mZEaWZbJlaRgmA8fWHKLke8NChwAk+gMwgNHtUHSPttgXU30ULtsnXD1EUUWgpM3qMKfZFwsePur7P7FyL9qhUWVjHkTPnFc= 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 1589779361671451.004241433091; Sun, 17 May 2020 22:22:41 -0700 (PDT) Received: from localhost ([::1]:44114 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jaYEa-0002mQ-Bv for importer@patchew.org; Mon, 18 May 2020 01:22:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50502) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jaYBs-0006FP-T1 for qemu-devel@nongnu.org; Mon, 18 May 2020 01:19:52 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:43231 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jaYBr-0007IU-3N for qemu-devel@nongnu.org; Mon, 18 May 2020 01:19:52 -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-433-oDkRMBiwPva-GOxctlLE7w-1; Mon, 18 May 2020 01:19:48 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1EFD91800D42 for ; Mon, 18 May 2020 05:19:47 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-32.ams2.redhat.com [10.36.112.32]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E189F5C1B2; Mon, 18 May 2020 05:19:46 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 6097011358BE; Mon, 18 May 2020 07:19:45 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589779189; 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=lrjdkoqq59m3gm70wai2XBaHaN/BcEgROdns7yTJmXE=; b=X0B4cXbjZIDqi8R5s+1RJCBkqumwfeqP+oZRTheI7wZMurib5eLplxzkjmYlc+PxpIDSqJ 9Wxy0UXJyOK9/gMrWKACoIfRH0jnC3YerYIjpFAqXaH+BfOch8cGLBg2xHxDZYx5dHjUJ3 lwbQa35DenWpuGKkCc7J3nmavUHivcw= X-MC-Unique: oDkRMBiwPva-GOxctlLE7w-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH not-for-merge 2/5] qom: Make "info qom-tree" show children sorted Date: Mon, 18 May 2020 07:19:42 +0200 Message-Id: <20200518051945.8621-3-armbru@redhat.com> In-Reply-To: <20200518051945.8621-1-armbru@redhat.com> References: <20200518051945.8621-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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=207.211.31.81; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/17 22:52:27 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: pbonzini@redhat.com, berrange@redhat.com, ehabkost@redhat.com 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" "info qom-tree" prints children in unstable order. This is a pain when diffing output for different versions to find change. Print it sorted. Signed-off-by: Markus Armbruster --- qom/qom-hmp-cmds.c | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/qom/qom-hmp-cmds.c b/qom/qom-hmp-cmds.c index 4a61ee1b8c..cf0af8f6b5 100644 --- a/qom/qom-hmp-cmds.c +++ b/qom/qom-hmp-cmds.c @@ -78,6 +78,35 @@ static int print_qom_composition_child(Object *obj, void= *opaque) return 0; } =20 +static int qom_composition_compare(const void *a, const void *b, void *ign= ore) +{ + Object *obja =3D (void *)a, *objb =3D (void *)b; + const char *namea, *nameb; + + if (obja =3D=3D object_get_root()) { + namea =3D g_strdup(""); + } else { + namea =3D object_get_canonical_path_component(obja); + } + + if (objb =3D=3D object_get_root()) { + nameb =3D g_strdup(""); + } else { + nameb =3D object_get_canonical_path_component(objb); + } + + + return strcmp(namea, nameb); +} + +static int insert_qom_composition_child(Object *obj, void *opaque) +{ + GQueue *children =3D opaque; + + g_queue_insert_sorted(children, obj, qom_composition_compare, NULL); + return 0; +} + static void print_qom_composition(Monitor *mon, Object *obj, int indent) { QOMCompositionState s =3D { @@ -105,7 +134,16 @@ static void print_qom_composition(Monitor *mon, Object= *obj, int indent) monitor_printf(mon, "%*s/%s (%s)\n", indent, "", name, object_get_typename(obj)); g_free(name); - object_child_foreach(obj, print_qom_composition_child, &s); + + GQueue children; + Object *child; + g_queue_init(&children); + object_child_foreach(obj, insert_qom_composition_child, &children); + while ((child =3D g_queue_pop_head(&children))) { + print_qom_composition(mon, child, indent + 2); + } + (void)s; + (void)print_qom_composition_child; } =20 void hmp_info_qom_tree(Monitor *mon, const QDict *dict) --=20 2.21.1 From nobody Sun May 19 06:50:47 2024 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=1589779261; cv=none; d=zohomail.com; s=zohoarc; b=D0sI7LXKv8P9ui2qww8YvgCWCQ92rTpP/giVjCCXHN7RXo6rSuv61mFfqOJX5k0t6cWd6SVSOOYm3/fzlaQ7ruXWZ2EbcQS9995FerFCXmJ+gQcz5ZBHTBeJFXSu8ALgI/vuvOoqWBeGT3Meme41qYWsmUiIPiWVUEoWCBzaJQY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589779261; 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=y71cqKwuXBCCvV/05bpD+iMljK1QevfXj6/AipGXIOQ=; b=K8gG5reWbeYQ+ofbnN8In/sY4koIcMrGH23cgrFQeyKVCf+/ZNisiT9OTyxBDKnABIOSIgDuO903rRnwhJAtUfPpoegtW3g0hrn3whuQ5yF/mBBket9ls1s4LYdmn+jpssSASybtGZjnuXhag7d1I/ifISHRXCdtw3E9ROg1V/M= 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 1589779261353629.8253572455733; Sun, 17 May 2020 22:21:01 -0700 (PDT) Received: from localhost ([::1]:36638 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jaYCy-00086G-3H for importer@patchew.org; Mon, 18 May 2020 01:21:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50500) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jaYBs-0006Eo-D6 for qemu-devel@nongnu.org; Mon, 18 May 2020 01:19:52 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:26763 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jaYBr-0007IW-9H for qemu-devel@nongnu.org; Mon, 18 May 2020 01:19:52 -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-168-8j9O1khPNVe1o2EOEoc1rw-1; Mon, 18 May 2020 01:19:47 -0400 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 27233107ACCD for ; Mon, 18 May 2020 05:19:47 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-32.ams2.redhat.com [10.36.112.32]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EB7EF82A11; Mon, 18 May 2020 05:19:46 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 640F611358BF; Mon, 18 May 2020 07:19:45 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589779189; 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=y71cqKwuXBCCvV/05bpD+iMljK1QevfXj6/AipGXIOQ=; b=T2CGxvclecenNACqgijv73+VX2oWdyxAwq+pLFRk0z+y7RYF0A20KHSzGU0Ui7DazHJi3G AyJer6kVD10NEcKGUdm+x0YCn8LfUvfBkhyGHinrb9NFkcMOIUpLuFvJY39wY8BTtG6bn3 ijn2oHQn7vfrQeOhJQZ8tw54FSSn9Lg= X-MC-Unique: 8j9O1khPNVe1o2EOEoc1rw-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH not-for-merge 3/5] qdev: Make "info qtree" show child devices sorted by QOM path Date: Mon, 18 May 2020 07:19:43 +0200 Message-Id: <20200518051945.8621-4-armbru@redhat.com> In-Reply-To: <20200518051945.8621-1-armbru@redhat.com> References: <20200518051945.8621-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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=205.139.110.120; envelope-from=armbru@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/17 22:51:00 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] 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, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: pbonzini@redhat.com, berrange@redhat.com, ehabkost@redhat.com 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" "info qtree" shows children in reverse creation order. Show them sorted by QOM path. Signed-off-by: Markus Armbruster --- qdev-monitor.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/qdev-monitor.c b/qdev-monitor.c index a4735d3bb1..07f78e9f5d 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -771,17 +771,43 @@ static void qdev_print(Monitor *mon, DeviceState *dev= , int indent) } } =20 +struct qbus_child { + DeviceState *dev; + char *qom_path; +}; + +static int dev_cmp(const void *a, const void *b) +{ + return g_strcmp0(((struct qbus_child *)a)->qom_path, + ((struct qbus_child *)b)->qom_path); +} + static void qbus_print(Monitor *mon, BusState *bus, int indent) { BusChild *kid; + GSList *children =3D NULL; =20 qdev_printf("bus: %s\n", bus->name); indent +=3D 2; qdev_printf("type %s\n", object_get_typename(OBJECT(bus))); QTAILQ_FOREACH(kid, &bus->children, sibling) { DeviceState *dev =3D kid->child; - qdev_print(mon, dev, indent); + struct qbus_child *qc =3D g_malloc(sizeof(*qc)); + qc->dev =3D dev; + qc->qom_path =3D object_get_canonical_path(OBJECT(dev)); + children =3D g_slist_insert_sorted(children, qc, dev_cmp); } + while (children) { + struct qbus_child *qc =3D children->data; + DeviceState *dev =3D qc->dev; + GSList *next =3D children->next; + qdev_print(mon, dev, indent); + g_free(qc->qom_path); + g_free(qc); + g_slist_free_1(children); + children =3D next; + } + } #undef qdev_printf =20 --=20 2.21.1 From nobody Sun May 19 06:50:47 2024 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=1589779261; cv=none; d=zohomail.com; s=zohoarc; b=Nu+j/Hn4Dxzk5qRbT3Pr9fSWzSGJUizqS7zal7HnwItObkpLzWOWuq5mVv1xmsxidyxmhNLrVvTDjgSepn+42mhdOS9YM5hXAtUSXeGV+LCOYxmCuE+HXDGjWK0qm66yzttxjuo7Wxm05xfT+gut+NTVeYS2cmrL93PfXdZOjYA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589779261; 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=rW3lzp5teMyOOF8llXJU1AeolVT1AcaWTvY7gDedRfo=; b=MkZSRpmzZM0LNhpoiyxL1FO9zmQVgfr7lmwS8KguVdogbwd4Uat+7wRvwsLwlozKhti3aRve4+cK70TGg+57/1z2jnfMUHqcHu5ZCKc0+yZj68cStTbF+fSjuAdL7LWkyR/Kq3CKt9BEJuR5ZLFBNedS2oulRAqIqczi2bVqJ7Y= 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 1589779261364317.86330672094596; Sun, 17 May 2020 22:21:01 -0700 (PDT) Received: from localhost ([::1]:36548 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jaYCx-000841-VZ for importer@patchew.org; Mon, 18 May 2020 01:21:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50496) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jaYBs-0006E4-3a for qemu-devel@nongnu.org; Mon, 18 May 2020 01:19:52 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:24638 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jaYBr-0007IZ-1y for qemu-devel@nongnu.org; Mon, 18 May 2020 01:19:51 -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-499-GvDnmRLzO6qwtllefLXyxA-1; Mon, 18 May 2020 01:19:48 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2873880058A for ; Mon, 18 May 2020 05:19:47 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-32.ams2.redhat.com [10.36.112.32]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EB7C71A922; Mon, 18 May 2020 05:19:46 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 675C011358C0; Mon, 18 May 2020 07:19:45 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589779190; 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=rW3lzp5teMyOOF8llXJU1AeolVT1AcaWTvY7gDedRfo=; b=PsBMqItIfJtKnIRtBCgnyL1bz89G83Nn9Q/6gXUTZgrEgq4TXOgw0HTMUMHaMcxXVqZJyd 6NdSRydfMDdZ1qVUHsV2X7UkeIRg5G6eYHrE8Xf4X/hDEhB7VkJuZtIHn1HrN+JH1rFeHm lewvnEXYMc+ydnOSiRv97j5jJ2T6h1Y= X-MC-Unique: GvDnmRLzO6qwtllefLXyxA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH not-for-merge 4/5] qdev: Instrument to detect missed QOM parenting Date: Mon, 18 May 2020 07:19:44 +0200 Message-Id: <20200518051945.8621-5-armbru@redhat.com> In-Reply-To: <20200518051945.8621-1-armbru@redhat.com> References: <20200518051945.8621-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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=207.211.31.120; envelope-from=armbru@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/18 00:53:04 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: pbonzini@redhat.com, berrange@redhat.com, ehabkost@redhat.com 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" Signed-off-by: Markus Armbruster --- qdev-monitor.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/qdev-monitor.c b/qdev-monitor.c index 07f78e9f5d..ec4e134ff7 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -801,6 +801,10 @@ static void qbus_print(Monitor *mon, BusState *bus, in= t indent) struct qbus_child *qc =3D children->data; DeviceState *dev =3D qc->dev; GSList *next =3D children->next; + if (!qc->qom_path) { + printf("### no qom path: %s, id \"%s\"\n", + object_get_typename(OBJECT(dev)), dev->id ? dev->id : "= "); + } qdev_print(mon, dev, indent); g_free(qc->qom_path); g_free(qc); --=20 2.21.1 From nobody Sun May 19 06:50:47 2024 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=1589779361; cv=none; d=zohomail.com; s=zohoarc; b=H66Gt3bakKXCHwFS4oHRnRAHQa4TKvneKhHbu6FYAkP4/pvAEyjXF821uLeFkbiXR6w+7sZBjXKfrD1BTzfxCvB7EFkG4DPWG+NoCkfj2lg1PojnqPS9I26aoq0sZg1ZBKpnnXXBCPRHDIjggwLOjG+dTDYsqj5VtpUbM10qUYU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589779361; 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=pl+UCiGWsmgOqH6TPA15ReEJptIY3N02HvxxwvL94as=; b=mzqgT/G9Pyhz6yGksOQKTM3m35QzO5DPpFQPT4JQoKjNVKpsxyKmUPY1yxP0kjzVVL0RGKOhAyR+8eDuPZHCZSJeV+xJxCb5vh/oM1jOh2ShkgUDvbEJ7nTWEW1TJXPiL7GtVIVU+p5YsPBAWezVytjv2S5Sd7QXxbcBZarKVfw= 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 1589779361129395.00653885562906; Sun, 17 May 2020 22:22:41 -0700 (PDT) Received: from localhost ([::1]:44152 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jaYEZ-0002nI-Ry for importer@patchew.org; Mon, 18 May 2020 01:22:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50506) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jaYBt-0006Fv-8W for qemu-devel@nongnu.org; Mon, 18 May 2020 01:19:53 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:20144 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jaYBr-0007It-Gn for qemu-devel@nongnu.org; Mon, 18 May 2020 01:19:52 -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-149-9pAs8xkwN0iyIUc_w8-OHQ-1; Mon, 18 May 2020 01:19:49 -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 9040518FE860 for ; Mon, 18 May 2020 05:19:48 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-32.ams2.redhat.com [10.36.112.32]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5E2DE600E5; Mon, 18 May 2020 05:19:48 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 6A90811358C1; Mon, 18 May 2020 07:19:45 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589779190; 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=pl+UCiGWsmgOqH6TPA15ReEJptIY3N02HvxxwvL94as=; b=FQY3R+gn5/ozJABb85Hf7ltpF5HBT12Yn5oFkYVPeQ61ktQZJiWfd8HZbwvbD59AMen5yn GwXHuhbSTHm4ayB52YCMdmepXTgYm4pPURvlo2LREX2WeMGx+XNMbphmdIrdhs0tub/huD 2WfmiD4GDnK4POkbbIdo/B/eQVqs2oo= X-MC-Unique: 9pAs8xkwN0iyIUc_w8-OHQ-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH not-for-merge 5/5] qdev: Instrument to detect bus mismatch Date: Mon, 18 May 2020 07:19:45 +0200 Message-Id: <20200518051945.8621-6-armbru@redhat.com> In-Reply-To: <20200518051945.8621-1-armbru@redhat.com> References: <20200518051945.8621-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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=207.211.31.81; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/17 22:52:27 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: pbonzini@redhat.com, berrange@redhat.com, ehabkost@redhat.com 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" Signed-off-by: Markus Armbruster --- hw/core/qdev.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 9e5538aeae..936ef3988a 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -98,6 +98,23 @@ void qdev_set_parent_bus(DeviceState *dev, BusState *bus) { BusState *old_parent_bus =3D dev->parent_bus; =20 + DeviceClass *dc =3D DEVICE_GET_CLASS(dev); + if (bus) { + BusClass *bc; + for (bc =3D BUS_GET_CLASS(bus); + bc; + bc =3D (BusClass *)object_class_dynamic_cast(object_class_get= _parent(OBJECT_CLASS(bc)), TYPE_BUS)) { + if (!g_strcmp0(dc->bus_type, object_class_get_name(OBJECT_CLAS= S(bc)))) { + break; + } + } + if (!bc) { + printf("### bus mismatch %s is %s plugged into %s\n", + object_get_typename(OBJECT(dev)), dc->bus_type, + object_class_get_name(OBJECT_CLASS(BUS_GET_CLASS(bus)))= ); + } + } + if (old_parent_bus) { trace_qdev_update_parent_bus(dev, object_get_typename(OBJECT(dev)), old_parent_bus, object_get_typename(OBJECT(old_parent_bus)), --=20 2.21.1