From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0953AC4450A for ; Sat, 18 Jul 2026 21:59:56 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wlD4c-0005WS-1f; Sat, 18 Jul 2026 17:59:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wlD4Z-0005UZ-HB; Sat, 18 Jul 2026 17:59:51 -0400 Received: from pdx-out-013.esa.us-west-2.outbound.mail-perimeter.amazon.com ([34.218.115.239]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wlD4X-0004s2-KI; Sat, 18 Jul 2026 17:59:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazoncorp2; t=1784411989; x=1815947989; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=06ETOBsEQzS5d9zH1jkTfyd2j8Kc5P+uPwzN0pdk1os=; b=TEGub6Q+rrofC61kco81vDsLV+wnRuoah1w9K1Qu5Anv3V8ADS88yNkf U2iXUzAxTeLs6+JAWe0nNSwv1P1XS2P1Tm9zoS6rRuIckatfviCDQ4IfD KIeZK5pWajxsrF5s3tq2nkL1upBZkHv6kLC1ZSybSLKKU6XD3zrSjUtEH 6rdp3crjtugcVC5GPA0mh8YlxNxBd22e2v+RlilFIVmVx56DxsnGckAez xC8DvjddODi5KqJU/Z1mqYk1OuZlAKoF7aSGWVuW0bOkf01WWXW8wgfqN 9DVbWlS/vFQZFJXP8PA++QaFXstljmSn3s0WNUOYv0VSR7voaHbEKQcCX w==; X-CSE-ConnectionGUID: y5lbufr0TM6scxDwcWCBNw== X-CSE-MsgGUID: ZYUO42N/TbCGmQXbaDDN2A== X-IronPort-AV: E=Sophos;i="6.25,171,1779148800"; d="scan'208";a="23719404" Received: from ip-10-5-6-203.us-west-2.compute.internal (HELO smtpout.naws.us-west-2.prod.farcaster.email.amazon.dev) ([10.5.6.203]) by internal-pdx-out-013.esa.us-west-2.outbound.mail-perimeter.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jul 2026 21:59:46 +0000 Received: from EX19MTAUWC001.ant.amazon.com [205.251.233.53:6565] by smtpin.naws.us-west-2.prod.farcaster.email.amazon.dev [10.0.30.230:2525] with esmtp (Farcaster) id 61be5819-85e4-4e9d-8aaa-113133826c15; Sat, 18 Jul 2026 21:59:45 +0000 (UTC) X-Farcaster-Flow-ID: 61be5819-85e4-4e9d-8aaa-113133826c15 Received: from EX19D001UWA001.ant.amazon.com (10.13.138.214) by EX19MTAUWC001.ant.amazon.com (10.250.64.174) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.43; Sat, 18 Jul 2026 21:59:45 +0000 Received: from ip-10-253-83-51.amazon.com (172.19.99.218) by EX19D001UWA001.ant.amazon.com (10.13.138.214) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.43; Sat, 18 Jul 2026 21:59:36 +0000 From: Alexander Graf To: CC: , , , , Song Gao <17746591750@163.com>, Aditya Gupta , Alexey Kardashevskiy , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Farhan Ali , Alistair Francis , "Alistair Francis" , Antony Pavlov , Markus Armbruster , Artyom Tarasenko , BALATON Zoltan , Felipe Balbi , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Christian Borntraeger , Brian Cain , Hendrik Brueckner , Chao Liu , "Huacai Chen" , =?UTF-8?q?Cl=C3=A9ment=20Chigot?= , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Helge Deller , Dorjoy Chowdhury , "Edgar E . Iglesias" , Alexandre Iooss , Eric Farman , Fabiano Rosas , Francisco Iglesias , "Gaurav Sharma" , Gautam Gala , "Harsh Prateek Bora" , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Jan Kiszka , Max Filippov , Joel Stanley , Jared Rossi , Tyrone Ting , Frederic Konrad , Laurent Vivier , "Manos Pitsidianakis" , Bibo Mao , Mark Cave-Ayland , Glenn Miles , Matthew Rosato , Michael Rolnik , "Michael S . Tsirkin" , Niek Linnenbank , Nicholas Piggin , Palmer Dabbelt , Halil Pasic , Paolo Bonzini , Peter Maydell , Peter Xu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Pierrick Bouvier" , Richard Henderson , Sai Pavan Boddu , Samuel Tardieu , Bernhard Beschow , Stafford Horne , Sergio Lopez , "Subbaraya Sundeep" , Thomas Huth , "Ran Wang" , Hao Wu Subject: [RFC PATCH v2 081/137] hw/nitro: Give the vsock bridge a QOM parent Date: Sat, 18 Jul 2026 21:35:56 +0000 Message-ID: <20260718213652.37673-82-graf@amazon.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20260718213652.37673-1-graf@amazon.com> References: <20260711223707.42139-1-graf@amazon.com> <20260718213652.37673-1-graf@amazon.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.19.99.218] X-ClientProxiedBy: EX19D043UWA002.ant.amazon.com (10.13.139.53) To EX19D001UWA001.ant.amazon.com (10.13.138.214) Received-SPF: pass client-ip=34.218.115.239; envelope-from=prvs=65292d44c=graf@amazon.de; helo=pdx-out-013.esa.us-west-2.outbound.mail-perimeter.amazon.com X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 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, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.01, SPF_HELO_NONE=0.001, T_SPF_PERMERROR=0.01, UNPARSEABLE_RELAY=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-arm-bounces+qemu-arm=archiver.kernel.org@nongnu.org Sender: qemu-arm-bounces+qemu-arm=archiver.kernel.org@nongnu.org nitro_vsock_bridge_create() was using qdev_set_id() to slot the bridge under /machine/peripheral. The bridge is a board-owned singleton created from nitro_machine_init(), so make it a plain child of the machine and drop the qdev_set_id() indirection. The heartbeat device that hangs off the bridge is already a child<> of it, so the composition tree becomes: /machine/nitro-vsock (nitro-vsock-bridge) /machine/nitro-vsock/heartbeat (nitro-heartbeat) AI-used-for: code (refactoring) Signed-off-by: Alexander Graf --- hw/nitro/machine.c | 2 +- hw/nitro/nitro-vsock-bus.c | 9 ++++----- include/hw/nitro/nitro-vsock-bus.h | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/hw/nitro/machine.c b/hw/nitro/machine.c index 6b61de911f..e522eae5ba 100644 --- a/hw/nitro/machine.c +++ b/hw/nitro/machine.c @@ -194,7 +194,7 @@ static void nitro_machine_init(MachineState *machine) MEMTXATTRS_UNSPECIFIED, eif_data, eif_size); if (defaults_enabled()) { - NitroVsockBridge *bridge = nitro_vsock_bridge_create(); + NitroVsockBridge *bridge = nitro_vsock_bridge_create(OBJECT(machine)); DeviceState *dev; /* Nitro Enclaves require a heartbeat device. Provide one. */ diff --git a/hw/nitro/nitro-vsock-bus.c b/hw/nitro/nitro-vsock-bus.c index f7540eaa54..2c4b66931f 100644 --- a/hw/nitro/nitro-vsock-bus.c +++ b/hw/nitro/nitro-vsock-bus.c @@ -20,7 +20,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "monitor/qdev.h" #include "hw/core/sysbus.h" #include "hw/nitro/nitro-vsock-bus.h" @@ -46,12 +45,12 @@ void nitro_vsock_bridge_start_enclave(NitroVsockBridge *bridge, } } -NitroVsockBridge *nitro_vsock_bridge_create(void) +NitroVsockBridge *nitro_vsock_bridge_create(Object *parent) { - DeviceState *dev = qdev_new_orphan(TYPE_NITRO_VSOCK_BRIDGE); + DeviceState *dev = qdev_new(parent, "nitro-vsock", + TYPE_NITRO_VSOCK_BRIDGE); - qdev_set_id(dev, g_strdup("nitro-vsock"), &error_fatal); - sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); + sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal); return NITRO_VSOCK_BRIDGE(dev); } diff --git a/include/hw/nitro/nitro-vsock-bus.h b/include/hw/nitro/nitro-vsock-bus.h index 064260aa41..36f4dde78f 100644 --- a/include/hw/nitro/nitro-vsock-bus.h +++ b/include/hw/nitro/nitro-vsock-bus.h @@ -50,7 +50,7 @@ struct NitroVsockDeviceClass { /* * Machine helper to create the Nitro vsock bridge sysbus device. */ -NitroVsockBridge *nitro_vsock_bridge_create(void); +NitroVsockBridge *nitro_vsock_bridge_create(Object *parent); /* * Find the Nitro vsock bridge on the sysbus. -- 2.47.1