From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: qemu-block@nongnu.org, qemu-arm@nongnu.org, qemu-ppc@nongnu.org,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Zhao Liu" <zhao1.liu@intel.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Eduardo Habkost" <eduardo@habkost.net>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>
Subject: [PULL 19/32] hw/i386/pc_sysfw: Use qdev_is_realized() instead of QOM API
Date: Thu, 22 Feb 2024 13:55:12 +0100 [thread overview]
Message-ID: <20240222125517.67131-5-philmd@linaro.org> (raw)
In-Reply-To: <20240222125517.67131-1-philmd@linaro.org>
Prefer QDev API for QDev objects, avoid the underlying QOM layer.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
Message-Id: <20240216110313.17039-3-philmd@linaro.org>
---
hw/i386/pc_sysfw.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c
index 2dcaa116ad..b02e285579 100644
--- a/hw/i386/pc_sysfw.c
+++ b/hw/i386/pc_sysfw.c
@@ -95,17 +95,15 @@ static void pc_system_flash_cleanup_unused(PCMachineState *pcms)
{
char *prop_name;
int i;
- Object *dev_obj;
assert(PC_MACHINE_GET_CLASS(pcms)->pci_enabled);
for (i = 0; i < ARRAY_SIZE(pcms->flash); i++) {
- dev_obj = OBJECT(pcms->flash[i]);
- if (!object_property_get_bool(dev_obj, "realized", &error_abort)) {
+ if (!qdev_is_realized(DEVICE(pcms->flash[i]))) {
prop_name = g_strdup_printf("pflash%d", i);
object_property_del(OBJECT(pcms), prop_name);
g_free(prop_name);
- object_unparent(dev_obj);
+ object_unparent(OBJECT(pcms->flash[i]));
pcms->flash[i] = NULL;
}
}
--
2.41.0
next prev parent reply other threads:[~2024-02-22 12:57 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-22 12:55 [PULL 02/32] hw/sysbus: Inline and remove sysbus_add_io() Philippe Mathieu-Daudé
2024-02-22 12:55 ` [PULL 07/32] hw/ppc/spapr_cpu: Use qdev_is_realized() instead of QOM API Philippe Mathieu-Daudé
2024-02-22 12:55 ` [PULL 08/32] hw/ppc/pnv_bmc: Use qdev_new() " Philippe Mathieu-Daudé
2024-02-22 12:55 ` [PULL 09/32] hw/tricore/testboard: Use qdev_new() instead of QOM basic API Philippe Mathieu-Daudé
2024-02-22 12:55 ` Philippe Mathieu-Daudé [this message]
2024-02-22 12:55 ` [PULL 22/32] hw/acpi: Include missing 'qapi/qapi-types-acpi.h' generated header Philippe Mathieu-Daudé
2024-02-22 12:55 ` [PULL 23/32] hw/acpi/cpu: Use CPUState typedef Philippe Mathieu-Daudé
2024-02-22 12:55 ` [PULL 24/32] hw/acpi/ich9_tco: Include missing 'migration/vmstate.h' header Philippe Mathieu-Daudé
2024-02-22 12:55 ` [PULL 32/32] hw/sparc/leon3: Fix wrong usage of DO_UPCAST macro Philippe Mathieu-Daudé
2024-02-22 12:58 ` [PULL v2 00/32] Misc HW patches for 2024-02-22 Philippe Mathieu-Daudé
2024-02-23 9:43 ` 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=20240222125517.67131-5-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=eduardo@habkost.net \
--cc=marcel.apfelbaum@gmail.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-arm@nongnu.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=zhao1.liu@intel.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).