From: Daniel Henrique Barboza <danielhb413@gmail.com>
To: qemu-devel@nongnu.org
Cc: qemu-ppc@nongnu.org, danielhb413@gmail.com,
peter.maydell@linaro.org, Bernhard Beschow <shentey@gmail.com>
Subject: [PULL 06/16] hw/ppc/e500{, plat}: Drop redundant checks for presence of platform bus
Date: Sun, 5 Feb 2023 07:04:39 -0300 [thread overview]
Message-ID: <20230205100449.2352781-7-danielhb413@gmail.com> (raw)
In-Reply-To: <20230205100449.2352781-1-danielhb413@gmail.com>
From: Bernhard Beschow <shentey@gmail.com>
This is a follow-up on commit 47a0b1dff7e9 'hw/ppc/mpc8544ds: Add
platform bus': Both mpc85xx boards now have a platform bus
unconditionally.
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Message-Id: <20230125130024.158721-3-shentey@gmail.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
hw/ppc/e500.c | 5 ++---
hw/ppc/e500plat.c | 9 +++------
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index 7239993acc..48288c0b41 100644
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -643,9 +643,8 @@ static int ppce500_load_device_tree(PPCE500MachineState *pms,
}
g_free(soc);
- if (pms->pbus_dev) {
- platform_bus_create_devtree(pms, fdt, mpic);
- }
+ platform_bus_create_devtree(pms, fdt, mpic);
+
g_free(mpic);
pmc->fixup_devtree(fdt);
diff --git a/hw/ppc/e500plat.c b/hw/ppc/e500plat.c
index 44bf874b0f..3032bd3f6d 100644
--- a/hw/ppc/e500plat.c
+++ b/hw/ppc/e500plat.c
@@ -46,13 +46,10 @@ static void e500plat_machine_device_plug_cb(HotplugHandler *hotplug_dev,
DeviceState *dev, Error **errp)
{
PPCE500MachineState *pms = PPCE500_MACHINE(hotplug_dev);
+ MachineClass *mc = MACHINE_GET_CLASS(pms);
- if (pms->pbus_dev) {
- MachineClass *mc = MACHINE_GET_CLASS(pms);
-
- if (device_is_dynamic_sysbus(mc, dev)) {
- platform_bus_link_device(pms->pbus_dev, SYS_BUS_DEVICE(dev));
- }
+ if (device_is_dynamic_sysbus(mc, dev)) {
+ platform_bus_link_device(pms->pbus_dev, SYS_BUS_DEVICE(dev));
}
}
--
2.39.1
next prev parent reply other threads:[~2023-02-05 10:09 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-05 10:04 [PULL 00/16] ppc queue Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 01/16] tests/migration: add sysprof-capture-4 as dependency for stress binary Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 02/16] tests/migration: add support for ppc64le for guestperf.py Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 03/16] ppc/pegasos2: Improve readability of VIA south bridge creation Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 04/16] hw/pci-host/mv64361: Reuse pci_swizzle_map_irq_fn Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 05/16] hw/ppc: Set machine->fdt in e500 machines Daniel Henrique Barboza
2023-02-05 10:04 ` Daniel Henrique Barboza [this message]
2023-02-05 10:04 ` [PULL 07/16] hw/ppc/e500.c: Avoid hardcoding parent device in create_devtree_etsec() Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 08/16] hw/ppc/e500.c: Attach eSDHC unimplemented region to ccsr_addr_space Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 09/16] ppc/pnv/pci: Cleanup PnvPHBPecState structure Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 10/16] ppc/pnv/pci: Remove duplicate definition of PNV_PHB5_DEVICE_ID Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 11/16] ppc/pnv/pci: Update PHB5 version register Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 12/16] ppc/pnv/pci: Fix PHB xscom registers memory region name Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 13/16] hw/ppc/pegasos2: Fix a typo in a comment Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 14/16] hw/display/sm501: Remove parenthesis around constant macro definitions Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 15/16] hw/display/sm501: Remove unneeded casts from void pointer Daniel Henrique Barboza
2023-02-05 10:04 ` [PULL 16/16] hw/display/sm501: Code style fix Daniel Henrique Barboza
2023-02-06 11:37 ` [PULL 00/16] ppc queue Peter Maydell
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=20230205100449.2352781-7-danielhb413@gmail.com \
--to=danielhb413@gmail.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=shentey@gmail.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).