qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
	"Zhao Liu" <zhao1.liu@intel.com>,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PULL 06/55] hw/intc: Check @errp to handle the error of IOAPICCommonClass.realize()
Date: Tue, 12 Mar 2024 13:42:50 +0100	[thread overview]
Message-ID: <20240312124339.761630-7-thuth@redhat.com> (raw)
In-Reply-To: <20240312124339.761630-1-thuth@redhat.com>

From: Zhao Liu <zhao1.liu@intel.com>

IOAPICCommonClass implements its own private realize(), and this private
realize() allows error.

Since IOAPICCommonClass.realize() returns void, to check the error,
dereference @errp with ERRP_GUARD().

Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20240223085653.1255438-8-zhao1.liu@linux.intel.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 hw/intc/ioapic_common.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/hw/intc/ioapic_common.c b/hw/intc/ioapic_common.c
index cb9bf62146..efbe6958c8 100644
--- a/hw/intc/ioapic_common.c
+++ b/hw/intc/ioapic_common.c
@@ -152,6 +152,7 @@ static int ioapic_dispatch_post_load(void *opaque, int version_id)
 
 static void ioapic_common_realize(DeviceState *dev, Error **errp)
 {
+    ERRP_GUARD();
     IOAPICCommonState *s = IOAPIC_COMMON(dev);
     IOAPICCommonClass *info;
 
@@ -162,6 +163,9 @@ static void ioapic_common_realize(DeviceState *dev, Error **errp)
 
     info = IOAPIC_COMMON_GET_CLASS(s);
     info->realize(dev, errp);
+    if (*errp) {
+        return;
+    }
 
     sysbus_init_mmio(SYS_BUS_DEVICE(s), &s->io_memory);
     ioapic_no++;
-- 
2.44.0



  parent reply	other threads:[~2024-03-12 12:44 UTC|newest]

Thread overview: 57+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-12 12:42 [PULL 00/55] Misc ERRP_GUARD() and cpu_env() patches Thomas Huth
2024-03-12 12:42 ` [PULL 01/55] hw/cxl/cxl-host: Fix missing ERRP_GUARD() in cxl_fixed_memory_window_config() Thomas Huth
2024-03-12 12:42 ` [PULL 02/55] hw/display/macfb: Fix missing ERRP_GUARD() in macfb_nubus_realize() Thomas Huth
2024-03-12 12:42 ` [PULL 03/55] hw/mem/cxl_type3: Fix missing ERRP_GUARD() in ct3_realize() Thomas Huth
2024-03-12 12:42 ` [PULL 04/55] hw/misc/xlnx-versal-trng: Check returned bool in trng_prop_fault_event_set() Thomas Huth
2024-03-12 12:42 ` [PULL 05/55] hw/pci-bridge/cxl_upstream: Fix missing ERRP_GUARD() in cxl_usp_realize() Thomas Huth
2024-03-12 12:42 ` Thomas Huth [this message]
2024-03-12 12:42 ` [PULL 07/55] error: Add error_vprepend() in comment of ERRP_GUARD() rules Thomas Huth
2024-03-12 12:42 ` [PULL 08/55] backends/iommufd: Fix missing ERRP_GUARD() for error_prepend() Thomas Huth
2024-03-12 12:42 ` [PULL 09/55] block: " Thomas Huth
2024-03-12 12:42 ` [PULL 10/55] block/copy-before-write: " Thomas Huth
2024-03-12 12:42 ` [PULL 11/55] block/nbd: " Thomas Huth
2024-03-12 12:42 ` [PULL 12/55] block/nvme: " Thomas Huth
2024-03-12 12:42 ` [PULL 13/55] block/qcow2-bitmap: " Thomas Huth
2024-03-12 12:42 ` [PULL 14/55] block/qcow2: " Thomas Huth
2024-03-12 12:42 ` [PULL 15/55] block/qed: " Thomas Huth
2024-03-12 12:43 ` [PULL 16/55] block/snapshot: " Thomas Huth
2024-03-12 12:43 ` [PULL 17/55] block/vdi: " Thomas Huth
2024-03-12 12:43 ` [PULL 18/55] block/vmdk: " Thomas Huth
2024-03-12 12:43 ` [PULL 19/55] block/virtio-blk: " Thomas Huth
2024-03-12 12:43 ` [PULL 20/55] hw/scsi/vhost-scsi: " Thomas Huth
2024-03-12 12:43 ` [PULL 21/55] hw/vfio/ap: " Thomas Huth
2024-03-12 12:43 ` [PULL 22/55] hw/vfio/container: " Thomas Huth
2024-03-12 12:43 ` [PULL 23/55] hw/vfio/helpers: " Thomas Huth
2024-03-12 12:43 ` [PULL 24/55] hw/vfio/iommufd: " Thomas Huth
2024-03-12 12:43 ` [PULL 25/55] hw/vfio/pci-quirks: " Thomas Huth
2024-03-12 12:43 ` [PULL 26/55] hw/vfio/pci: " Thomas Huth
2024-03-12 12:43 ` [PULL 27/55] hw/vfio/platform: " Thomas Huth
2024-03-12 12:43 ` [PULL 28/55] hw/virtio/vhost-vsock: " Thomas Huth
2024-03-12 12:43 ` [PULL 29/55] hw/virtio/vhost: " Thomas Huth
2024-03-12 12:43 ` [PULL 30/55] migration/option: " Thomas Huth
2024-03-12 12:43 ` [PULL 31/55] net/vhost-vdpa: " Thomas Huth
2024-03-12 12:43 ` [PULL 32/55] target/s390x/cpu_models: " Thomas Huth
2024-03-12 12:43 ` [PULL 33/55] error: Move ERRP_GUARD() to the beginning of the function Thomas Huth
2024-03-12 12:43 ` [PULL 34/55] bulk: Access existing variables initialized to &S->F when available Thomas Huth
2024-03-12 12:43 ` [PULL 35/55] hw/core: Declare CPUArchId::cpu as CPUState instead of Object Thomas Huth
2024-03-12 12:43 ` [PULL 36/55] bulk: Call in place single use cpu_env() Thomas Huth
2024-03-12 12:43 ` [PULL 37/55] target: Replace CPU_GET_CLASS(cpu -> obj) in cpu_reset_hold() handler Thomas Huth
2024-03-12 12:43 ` [PULL 38/55] target/alpha: Prefer fast cpu_env() over slower CPU QOM cast macro Thomas Huth
2024-03-12 12:43 ` [PULL 39/55] target/avr: " Thomas Huth
2024-03-12 12:43 ` [PULL 40/55] target/cris: " Thomas Huth
2024-03-12 12:43 ` [PULL 41/55] target/hexagon: " Thomas Huth
2024-03-12 12:43 ` [PULL 42/55] target/i386/hvf: Use CPUState typedef Thomas Huth
2024-03-12 12:43 ` [PULL 43/55] target/loongarch: Prefer fast cpu_env() over slower CPU QOM cast macro Thomas Huth
2024-03-12 12:43 ` [PULL 44/55] target/m68k: " Thomas Huth
2024-03-12 12:43 ` [PULL 45/55] target/microblaze: " Thomas Huth
2024-03-12 12:43 ` [PULL 46/55] target/mips: " Thomas Huth
2024-03-12 12:43 ` [PULL 47/55] target/nios2: " Thomas Huth
2024-03-12 12:43 ` [PULL 48/55] target/openrisc: " Thomas Huth
2024-03-12 12:43 ` [PULL 49/55] target/ppc: " Thomas Huth
2024-03-12 12:43 ` [PULL 50/55] target/rx: " Thomas Huth
2024-03-12 12:43 ` [PULL 51/55] target/sh4: " Thomas Huth
2024-03-12 12:43 ` [PULL 52/55] target/sparc: " Thomas Huth
2024-03-12 12:43 ` [PULL 53/55] target/tricore: " Thomas Huth
2024-03-12 12:43 ` [PULL 54/55] target/xtensa: " Thomas Huth
2024-03-12 12:43 ` [PULL 55/55] user: " Thomas Huth
2024-03-12 21:31 ` [PULL 00/55] Misc ERRP_GUARD() and cpu_env() patches 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=20240312124339.761630-7-thuth@redhat.com \
    --to=thuth@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=philmd@linaro.org \
    --cc=qemu-devel@nongnu.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).