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 2FC1EC43458 for ; Sat, 11 Jul 2026 22:58:49 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wigek-00060E-Di; Sat, 11 Jul 2026 18:58:46 -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 1wigej-0005wE-4k; Sat, 11 Jul 2026 18:58:45 -0400 Received: from pdx-out-006.esa.us-west-2.outbound.mail-perimeter.amazon.com ([52.26.1.71]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wigeg-0001XH-Nv; Sat, 11 Jul 2026 18:58:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazoncorp2; t=1783810723; x=1815346723; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=XOPf9T+GRqou3ohjMhRytKrWr3YRkmJayT9N6zuaqro=; b=ieK2yNgfTG35ExfqUSGqQ0Crqlik2QRbFGBKRaUpUj3dWDZO8jBXEzsi 0vuJdogQIiWJ99JHgnOf3sUv1+Iz/4bjnPO4RqhzeCa4aysMRTTUQPmXx X9cnCQFrh4zsqXtqZkoOdx0BmJLXm9I4KZSBhFalzihR926Ov6SYfu9R1 /GAlgaedQTSYujVW470IqJNJD+m0CrO43y//y0Tf8i3jpSVb3wuob+28M AhL/MXDBmSkmzuyxDC2WUOb/VuQg43lS9M+zq4VA7O4un23MHCKfP8yd3 rg52Xho3fCMITjs6+UIlGH1wzexHVXQPuXXtBth+DmhDpdgLHYoAPuG4J A==; X-CSE-ConnectionGUID: LQP+PG6jQe+f2jEHBQRrAg== X-CSE-MsgGUID: yGfKPggQS3yblmiFUODA9w== X-IronPort-AV: E=Sophos;i="6.25,154,1779148800"; d="scan'208";a="23522428" 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-006.esa.us-west-2.outbound.mail-perimeter.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Jul 2026 22:58:38 +0000 Received: from EX19MTAUWB002.ant.amazon.com [205.251.233.48:20654] by smtpin.naws.us-west-2.prod.farcaster.email.amazon.dev [10.0.11.115:2525] with esmtp (Farcaster) id 5e51aef8-8b4d-47bc-850d-82ff609a3365; Sat, 11 Jul 2026 22:58:38 +0000 (UTC) X-Farcaster-Flow-ID: 5e51aef8-8b4d-47bc-850d-82ff609a3365 Received: from EX19D001UWA001.ant.amazon.com (10.13.138.214) by EX19MTAUWB002.ant.amazon.com (10.250.64.231) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.43; Sat, 11 Jul 2026 22:58:38 +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, 11 Jul 2026 22:58:29 +0000 From: Alexander Graf To: CC: , , , , Song Gao <17746591750@163.com>, Aditya Gupta , Alexey Kardashevskiy , Farhan Ali , Alistair Francis , "Alistair Francis" , Antony Pavlov , Markus Armbruster , Artyom Tarasenko , BALATON Zoltan , Felipe Balbi , 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 , 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 , =?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 , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [RFC PATCH 081/134] hw/isa: Give the isabus-bridge a QOM parent Date: Sat, 11 Jul 2026 22:36:14 +0000 Message-ID: <20260711223707.42139-82-graf@amazon.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20260711223707.42139-1-graf@amazon.com> References: <20260711223707.42139-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: EX19D036UWC003.ant.amazon.com (10.13.139.214) To EX19D001UWA001.ant.amazon.com (10.13.138.214) Received-SPF: pass client-ip=52.26.1.71; envelope-from=prvs=645f258d4=graf@amazon.de; helo=pdx-out-006.esa.us-west-2.outbound.mail-perimeter.amazon.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_LOW=-0.7, 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-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org isa_bus_new(NULL, ...) implicitly created a sysbus "isabus-bridge" and put the ISA bus on it. That bridge ended up under /machine/unattached, which this series is deleting. Split out an explicit isa_bus_new_bridge(parent, ...) helper for the five boards that don't already have a south-bridge device to own the ISA bus, and make plain isa_bus_new() require a non-NULL device. Callers own the bridge in the composition tree: hw/i386/microvm.c OBJECT(mms) hw/i386/isapc.c OBJECT(machine) hw/mips/jazz.c OBJECT(machine) hw/hppa/machine.c parent (already threaded) hw/ppc/pnv_lpc.c OBJECT(lpc) -- the LPC controller Assisted-by: Kiro Signed-off-by: Alexander Graf --- hw/hppa/machine.c | 2 +- hw/i386/isapc.c | 2 +- hw/i386/microvm.c | 2 +- hw/isa/isa-bus.c | 21 +++++++++++---------- hw/mips/jazz.c | 2 +- hw/ppc/pnv_lpc.c | 4 ++-- include/hw/isa/isa.h | 2 ++ 7 files changed, 19 insertions(+), 16 deletions(-) diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index 002f4299cc..d52f27c51c 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -108,7 +108,7 @@ static ISABus *hppa_isa_bus(Object *parent, hwaddr addr) NULL, "isa-io", 0x800); memory_region_add_subregion(get_system_memory(), addr, isa_region); - isa_bus = isa_bus_new(NULL, get_system_memory(), isa_region, + isa_bus = isa_bus_new_bridge(parent, get_system_memory(), isa_region, &error_abort); isa_irqs = i8259_init(parent, isa_bus, NULL); isa_bus_register_input_irqs(isa_bus, isa_irqs); diff --git a/hw/i386/isapc.c b/hw/i386/isapc.c index 842ae94acb..e8d5767b80 100644 --- a/hw/i386/isapc.c +++ b/hw/i386/isapc.c @@ -108,7 +108,7 @@ static void pc_init_isa(MachineState *machine) gsi_state = pc_gsi_create(&x86ms->gsi, false); - isa_bus = isa_bus_new(NULL, system_memory, system_io, + isa_bus = isa_bus_new_bridge(OBJECT(machine), system_memory, system_io, &error_abort); isa_bus_register_input_irqs(isa_bus, x86ms->gsi); diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c index 8c61106516..aa0e1ef155 100644 --- a/hw/i386/microvm.c +++ b/hw/i386/microvm.c @@ -171,7 +171,7 @@ static void microvm_devices_init(MicrovmMachineState *mms) x86ms->gsi = qemu_allocate_irqs(gsi_handler, gsi_state, IOAPIC_NUM_PINS * ioapics); - isa_bus = isa_bus_new(NULL, get_system_memory(), get_system_io(), + isa_bus = isa_bus_new_bridge(OBJECT(mms), get_system_memory(), get_system_io(), &error_abort); isa_bus_register_input_irqs(isa_bus, x86ms->gsi); diff --git a/hw/isa/isa-bus.c b/hw/isa/isa-bus.c index fb20c43869..7a6a595ce7 100644 --- a/hw/isa/isa-bus.c +++ b/hw/isa/isa-bus.c @@ -52,28 +52,29 @@ static const TypeInfo isa_bus_info = { ISABus *isa_bus_new(DeviceState *dev, MemoryRegion* address_space, MemoryRegion *address_space_io, Error **errp) { - DeviceState *bridge = NULL; - if (isabus) { error_setg(errp, "Can't create a second ISA bus"); return NULL; } - if (!dev) { - bridge = qdev_new_orphan("isabus-bridge"); - dev = bridge; - } + g_assert(dev); isabus = ISA_BUS(qbus_new(TYPE_ISA_BUS, dev, NULL)); isabus->address_space = address_space; isabus->address_space_io = address_space_io; - if (bridge) { - sysbus_realize_and_unref(SYS_BUS_DEVICE(bridge), &error_fatal); - } - return isabus; } +ISABus *isa_bus_new_bridge(Object *parent, MemoryRegion *address_space, + MemoryRegion *address_space_io, Error **errp) +{ + DeviceState *bridge = qdev_new(parent, "isabus-bridge", "isabus-bridge"); + ISABus *bus = isa_bus_new(bridge, address_space, address_space_io, errp); + + sysbus_realize(SYS_BUS_DEVICE(bridge), &error_fatal); + return bus; +} + void isa_bus_register_input_irqs(ISABus *bus, qemu_irq *irqs_in) { bus->irqs_in = irqs_in; diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c index 23d717d96a..8c52608913 100644 --- a/hw/mips/jazz.c +++ b/hw/mips/jazz.c @@ -283,7 +283,7 @@ static void mips_jazz_init(MachineState *machine, memory_region_init(isa_mem, NULL, "isa-mem", 0x01000000); memory_region_add_subregion(address_space, 0x90000000, isa_io); memory_region_add_subregion(address_space, 0x91000000, isa_mem); - isa_bus = isa_bus_new(NULL, isa_mem, isa_io, &error_abort); + isa_bus = isa_bus_new_bridge(OBJECT(machine), isa_mem, isa_io, &error_abort); /* ISA devices */ i8259 = i8259_init(OBJECT(machine), isa_bus, env->irq[4]); diff --git a/hw/ppc/pnv_lpc.c b/hw/ppc/pnv_lpc.c index d1357dd359..6ae228088f 100644 --- a/hw/ppc/pnv_lpc.c +++ b/hw/ppc/pnv_lpc.c @@ -972,11 +972,11 @@ ISABus *pnv_lpc_isa_create(PnvLpcController *lpc, bool use_cpld, Error **errp) qemu_irq *irqs; qemu_irq_handler handler; - /* let isa_bus_new() create its own bridge on SysBus otherwise + /* let isa_bus_new_bridge() create the bridge as a child of the LPC; * devices specified on the command line won't find the bus and * will fail to create. */ - isa_bus = isa_bus_new(NULL, &lpc->isa_mem, &lpc->isa_io, &local_err); + isa_bus = isa_bus_new_bridge(OBJECT(lpc), &lpc->isa_mem, &lpc->isa_io, &local_err); if (local_err) { error_propagate(errp, local_err); return NULL; diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h index 9e35d88b1e..79bfe16361 100644 --- a/include/hw/isa/isa.h +++ b/include/hw/isa/isa.h @@ -69,6 +69,8 @@ struct ISADevice { ISABus *isa_bus_new(DeviceState *dev, MemoryRegion *address_space, MemoryRegion *address_space_io, Error **errp); +ISABus *isa_bus_new_bridge(Object *parent, MemoryRegion *address_space, + MemoryRegion *address_space_io, Error **errp); void isa_bus_register_input_irqs(ISABus *bus, qemu_irq *irqs_in); void isa_bus_dma(ISABus *bus, IsaDma *dma8, IsaDma *dma16); IsaDma *isa_bus_get_dma(ISABus *bus, int nchan); -- 2.47.1