From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48960) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ci7Ky-0008Cz-3Y for qemu-devel@nongnu.org; Sun, 26 Feb 2017 17:30:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ci7Ku-0000Ak-Ss for qemu-devel@nongnu.org; Sun, 26 Feb 2017 17:30:40 -0500 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:33663) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ci7Ku-0000Ae-Mr for qemu-devel@nongnu.org; Sun, 26 Feb 2017 17:30:36 -0500 Received: by mail-wm0-x244.google.com with SMTP id v77so10887301wmv.0 for ; Sun, 26 Feb 2017 14:30:36 -0800 (PST) From: Artyom Tarasenko Date: Sun, 26 Feb 2017 23:29:16 +0100 Message-Id: <1488148156-2036-3-git-send-email-atar4qemu@gmail.com> In-Reply-To: <1488148156-2036-1-git-send-email-atar4qemu@gmail.com> References: <1488148156-2036-1-git-send-email-atar4qemu@gmail.com> Subject: [Qemu-devel] [PULL 2/2] niagara: check if a serial port is available List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mark.cave-ayland@ilande.co.uk, peter.maydell@linaro.org, Artyom Tarasenko Reported-by: Markus Armbruster Reviewed-by: Markus Armbruster Signed-off-by: Artyom Tarasenko --- hw/sparc64/niagara.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/sparc64/niagara.c b/hw/sparc64/niagara.c index edde86e..9a8d610 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); } -- 2.7.2