From: Patrick Williams <patrick@stwcx.xyz>
Date: Tue, 8 Mar 2022 08:18:11 +0000 (+0100)
Subject: hw/arm/aspeed: allow missing spi_model
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=179b2058829f934c17622b3bbfb398fcf267b670;p=qemu.git

hw/arm/aspeed: allow missing spi_model

Generally all BMCs will use the fmc_model to hold their own flash
and most will have a spi_model to hold the managed system's flash,
but not all systems do.  Add a simple NULL check to allow a system
to set the spi_model as NULL to indicate it should not be instantiated.

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Message-Id: <20220305000656.1944589-1-patrick@stwcx.xyz>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
---

diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
index 90504ee444..088550ed33 100644
--- a/hw/arm/aspeed.c
+++ b/hw/arm/aspeed.c
@@ -274,7 +274,11 @@ static void write_boot_rom(DriveInfo *dinfo, hwaddr addr, size_t rom_size,
 static void aspeed_board_init_flashes(AspeedSMCState *s, const char *flashtype,
                                       unsigned int count, int unit0)
 {
-    int i ;
+    int i;
+
+    if (!flashtype) {
+        return;
+    }
 
     for (i = 0; i < count; ++i) {
         DriveInfo *dinfo = drive_get(IF_MTD, 0, unit0 + i);