diff mbox series

[PULL,05/22] spapr: DRC lookup cannot fail

Message ID 20210106033816.232598-6-david@gibson.dropbear.id.au (mailing list archive)
State New, archived
Headers show
Series [PULL,01/22] hw/ppc/ppc4xx_devs: Make code style fixes to UIC code | expand

Commit Message

David Gibson Jan. 6, 2021, 3:37 a.m. UTC
From: Greg Kurz <groug@kaod.org>

All memory DRC objects are created during machine init. It is thus safe
to assume spapr_drc_by_id() cannot return NULL when hot-plug/unplugging

Make this clear with an assertion, like the code already does a few lines
above when looping over memory DRCs. This fixes Coverity reports 1437757
and 1437758.

Signed-off-by: Greg Kurz <groug@kaod.org>
Message-Id: <160805381160.228955.5388294067094240175.stgit@bahia.lan>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
 hw/ppc/spapr.c | 2 ++
 1 file changed, 2 insertions(+)
diff mbox series


diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 489cefcb81..08f57f9164 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -3437,6 +3437,7 @@  static void spapr_add_lmbs(DeviceState *dev, uint64_t addr_start, uint64_t size,
         if (dedicated_hp_event_source) {
             drc = spapr_drc_by_id(TYPE_SPAPR_DRC_LMB,
                                   addr_start / SPAPR_MEMORY_BLOCK_SIZE);
+            g_assert(drc);
@@ -3677,6 +3678,7 @@  static void spapr_memory_unplug_request(HotplugHandler *hotplug_dev,
     drc = spapr_drc_by_id(TYPE_SPAPR_DRC_LMB,
                           addr_start / SPAPR_MEMORY_BLOCK_SIZE);
+    g_assert(drc);
                                               nr_lmbs, spapr_drc_index(drc));