From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Richard Henderson" <richard.henderson@linaro.org>,
"Eric Farman" <farman@linux.ibm.com>,
"Peter Xu" <peterx@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Halil Pasic" <pasic@linux.ibm.com>,
"Jiaxun Yang" <jiaxun.yang@flygoat.com>,
"Strahinja Jankovic" <strahinja.p.jankovic@gmail.com>,
"Eduardo Habkost" <eduardo@habkost.net>,
"Sergio Lopez" <slp@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
"Jason Wang" <jasowang@redhat.com>,
qemu-arm@nongnu.org, qemu-s390x@nongnu.org,
"Ilya Leoshkevich" <iii@linux.ibm.com>,
"Song Gao" <gaosong@loongson.cn>,
"Huacai Chen" <chenhuacai@kernel.org>,
"Beniamino Galvani" <b.galvani@gmail.com>,
"Christian Borntraeger" <borntraeger@linux.ibm.com>,
"Thomas Huth" <thuth@redhat.com>,
"David Hildenbrand" <david@redhat.com>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>
Subject: [PATCH 09/12] hw/s390x/css-bridge: Realize sysbus device before accessing it
Date: Wed, 18 Oct 2023 16:11:47 +0200 [thread overview]
Message-ID: <20231018141151.87466-10-philmd@linaro.org> (raw)
In-Reply-To: <20231018141151.87466-1-philmd@linaro.org>
sysbus_mmio_map() should not be called on unrealized device.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/s390x/css-bridge.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/hw/s390x/css-bridge.c b/hw/s390x/css-bridge.c
index 4017081d49..15d26efc95 100644
--- a/hw/s390x/css-bridge.c
+++ b/hw/s390x/css-bridge.c
@@ -95,7 +95,6 @@ static const TypeInfo virtual_css_bus_info = {
VirtualCssBus *virtual_css_bus_init(void)
{
- VirtualCssBus *cbus;
BusState *bus;
DeviceState *dev;
@@ -103,19 +102,19 @@ VirtualCssBus *virtual_css_bus_init(void)
dev = qdev_new(TYPE_VIRTUAL_CSS_BRIDGE);
object_property_add_child(qdev_get_machine(), TYPE_VIRTUAL_CSS_BRIDGE,
OBJECT(dev));
- sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
/* Create bus on bridge device */
bus = qbus_new(TYPE_VIRTUAL_CSS_BUS, dev, "virtual-css");
- cbus = VIRTUAL_CSS_BUS(bus);
/* Enable hotplugging */
qbus_set_hotplug_handler(bus, OBJECT(dev));
+ sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
+
css_register_io_adapters(CSS_IO_ADAPTER_VIRTIO, true, false,
0, &error_abort);
- return cbus;
+ return VIRTUAL_CSS_BUS(bus);
}
/***************** Virtual-css Bus Bridge Device ********************/
--
2.41.0
next prev parent reply other threads:[~2023-10-18 14:14 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-18 14:11 [PATCH 00/12] hw: Strengthen SysBus & QBus API Philippe Mathieu-Daudé
2023-10-18 14:11 ` [PATCH 01/12] hw/i386/amd_iommu: Do not use SysBus API to map local MMIO region Philippe Mathieu-Daudé
2023-10-18 14:11 ` [PATCH 02/12] hw/i386/intel_iommu: " Philippe Mathieu-Daudé
2023-10-18 14:11 ` [PATCH 03/12] hw/misc/allwinner-dramc: Move sysbus_mmio_map call from init -> realize Philippe Mathieu-Daudé
2023-10-18 14:11 ` [PATCH 04/12] hw/misc/allwinner-dramc: Do not use SysBus API to map local MMIO region Philippe Mathieu-Daudé
2023-10-18 14:11 ` [PATCH 05/12] hw/pci-host/bonito: " Philippe Mathieu-Daudé
2023-10-18 16:05 ` Thomas Huth
2023-10-18 18:23 ` Philippe Mathieu-Daudé
2023-10-18 14:11 ` [PATCH 06/12] hw/acpi: Realize ACPI_GED sysbus device before accessing it Philippe Mathieu-Daudé
2023-10-18 16:00 ` Thomas Huth
2023-10-18 14:11 ` [PATCH 07/12] hw/arm/virt: Realize ARM_GICV2M " Philippe Mathieu-Daudé
2023-10-18 15:58 ` Thomas Huth
2023-10-18 14:11 ` [PATCH 08/12] hw/isa: Realize ISA BUS " Philippe Mathieu-Daudé
2023-10-18 15:57 ` Thomas Huth
2023-10-18 18:26 ` Philippe Mathieu-Daudé
2023-10-18 14:11 ` Philippe Mathieu-Daudé [this message]
2023-10-18 15:06 ` [PATCH 09/12] hw/s390x/css-bridge: Realize " Thomas Huth
2023-10-18 18:27 ` Philippe Mathieu-Daudé
2023-10-18 14:11 ` [PATCH 10/12] hw/qdev: Ensure parent device is not realized before adding bus Philippe Mathieu-Daudé
2023-10-18 16:08 ` Thomas Huth
2023-10-18 14:11 ` [PATCH 11/12] hw/sysbus: Ensure device is not realized before adding MMIO region Philippe Mathieu-Daudé
2023-10-18 16:10 ` Thomas Huth
2023-10-18 14:11 ` [PATCH 12/12] hw/sysbus: Ensure device is realized before mapping it Philippe Mathieu-Daudé
2023-10-18 16:13 ` Thomas Huth
2023-10-18 18:24 ` Philippe Mathieu-Daudé
2023-10-18 16:11 ` [PATCH 00/12] hw: Strengthen SysBus & QBus API Michael S. Tsirkin
2023-10-18 16:24 ` Thomas Huth
2023-10-18 18:25 ` Philippe Mathieu-Daudé
2023-10-18 18:32 ` Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231018141151.87466-10-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=b.galvani@gmail.com \
--cc=berrange@redhat.com \
--cc=borntraeger@linux.ibm.com \
--cc=chenhuacai@kernel.org \
--cc=david@redhat.com \
--cc=eduardo@habkost.net \
--cc=farman@linux.ibm.com \
--cc=gaosong@loongson.cn \
--cc=iii@linux.ibm.com \
--cc=jasowang@redhat.com \
--cc=jiaxun.yang@flygoat.com \
--cc=marcel.apfelbaum@gmail.com \
--cc=mst@redhat.com \
--cc=pasic@linux.ibm.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=peterx@redhat.com \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=slp@redhat.com \
--cc=strahinja.p.jankovic@gmail.com \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).