From: Artyom Tarasenko <atar4qemu@gmail.com>
Date: Mon, 23 Jan 2017 21:08:59 +0000 (+0100)
Subject: niagara: check if a serial port is available
X-Git-Tag: v2.9.0-rc0~65^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a5a08302d44a8b1a8c5819b1411002f85bb5f847;p=thirdparty%2Fqemu.git

niagara: check if a serial port is available

Reported-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Artyom Tarasenko <atar4qemu@gmail.com>
---

diff --git a/hw/sparc64/niagara.c b/hw/sparc64/niagara.c
index edde86ea2f7..9a8d6109d49 100644
--- a/hw/sparc64/niagara.c
+++ b/hw/sparc64/niagara.c
@@ -158,9 +158,10 @@ static void niagara_init(MachineState *machine)
             exit(1);
         }
     }
-    serial_mm_init(sysmem, NIAGARA_UART_BASE, 0, NULL, 115200,
-                   serial_hds[0], DEVICE_BIG_ENDIAN);
-
+    if (serial_hds[0]) {
+        serial_mm_init(sysmem, NIAGARA_UART_BASE, 0, NULL, 115200,
+                       serial_hds[0], DEVICE_BIG_ENDIAN);
+    }
     empty_slot_init(NIAGARA_IOBBASE, NIAGARA_IOBSIZE);
     sun4v_rtc_init(NIAGARA_RTC_BASE);
 }