Skip to content

Commit

Permalink
hw/intc/apic: Use ERRP_GUARD() in apic_common_realize()
Browse files Browse the repository at this point in the history
APICCommonClass::realize() is a DeviceRealize() handler which
take an Error** parameter and can fail. Do not proceed further
on failure.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Peter Xu <peterx@redhat.com>
Message-Id: <20231003082728.83496-2-philmd@linaro.org>
  • Loading branch information
philmd committed Oct 19, 2023
1 parent b2b5b09 commit 0459c14
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions hw/intc/apic_common.c
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,7 @@ static const VMStateDescription vmstate_apic_common;

static void apic_common_realize(DeviceState *dev, Error **errp)
{
ERRP_GUARD();
APICCommonState *s = APIC_COMMON(dev);
APICCommonClass *info;
static DeviceState *vapic;
Expand All @@ -267,6 +268,9 @@ static void apic_common_realize(DeviceState *dev, Error **errp)

info = APIC_COMMON_GET_CLASS(s);
info->realize(dev, errp);
if (*errp) {
return;
}

/* Note: We need at least 1M to map the VAPIC option ROM */
if (!vapic && s->vapic_control & VAPIC_ENABLE_MASK &&
Expand Down

0 comments on commit 0459c14

Please sign in to comment.