From patchwork Sat Mar 16 20:08:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1057418 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44MDR453Xdz9s3q for ; Sun, 17 Mar 2019 07:23:12 +1100 (AEDT) Received: from localhost ([127.0.0.1]:45990 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h5Fpm-0002r5-NR for incoming@patchwork.ozlabs.org; Sat, 16 Mar 2019 16:23:10 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33482) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h5FdM-0001SN-7Y for qemu-devel@nongnu.org; Sat, 16 Mar 2019 16:10:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h5FdK-0000Co-OW for qemu-devel@nongnu.org; Sat, 16 Mar 2019 16:10:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41754) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h5FdK-0000Bm-Dn; Sat, 16 Mar 2019 16:10:18 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 42B0B3084212; Sat, 16 Mar 2019 20:10:16 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-28.brq.redhat.com [10.40.204.28]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1DAA260BA6; Sat, 16 Mar 2019 20:10:02 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Paolo Bonzini , qemu-devel@nongnu.org Date: Sat, 16 Mar 2019 21:08:15 +0100 Message-Id: <20190316200818.8265-12-philmd@redhat.com> In-Reply-To: <20190316200818.8265-1-philmd@redhat.com> References: <20190316200818.8265-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Sat, 16 Mar 2019 20:10:16 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 11/14] hw/sparc/Kconfig: SPARCstation machine requires the TCX display X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , Cornelia Huck , Eduardo Habkost , David Hildenbrand , Aleksandar Markovic , Helge Deller , "Michael S. Tsirkin" , Mark Cave-Ayland , Aleksandar Rikalo , Halil Pasic , Christian Borntraeger , qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, Artyom Tarasenko , Richard Henderson , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , Aurelien Jarno , David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This is the default display device used in sun4m_hw_init(): /* If no display specified, default to TCX */ This fixes when configuring with --without-default-devices: $ sparc-softmmu/qemu-system-sparc qemu-system-sparc: Unknown device 'SUNW,tcx' for default sysbus Aborted (core dumped) (gdb) bt #0 0x00007fc78d19353f in __GI_raise (sig=sig@entry=6) at ../sysdeps/unix/sysv/linux/raise.c:50 #1 0x00007fc78d17d895 in __GI_abort () at abort.c:79 #2 0x0000560beaf637f3 in qdev_create (bus=bus@entry=0x0, name=name@entry=0x560beb1be36b "SUNW,tcx") at hw/core/qdev.c:131 #3 0x0000560beaf1392d in tcx_init (vram_size=1048576, width=1024, height=768, depth=8, irq=0x560bed1a0230, addr=1342177280) at hw/sparc/sun4m.c:477 #4 0x0000560beaf1392d in sun4m_hw_init (hwdef=0x560beb1be780 , machine=0x560becf65f00) at hw/sparc/sun4m.c:943 #5 0x0000560beaf6b15b in machine_run_board_init (machine=0x560becf65f00) at hw/core/machine.c:1030 #6 0x0000560beae86692 in main (argc=, argv=, envp=) at vl.c:4463 Fixes: 8c75eec06d4 Signed-off-by: Philippe Mathieu-Daudé --- default-configs/sparc-softmmu.mak | 1 - hw/sparc/Kconfig | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-softmmu.mak index ee85218115..56509bf263 100644 --- a/default-configs/sparc-softmmu.mak +++ b/default-configs/sparc-softmmu.mak @@ -2,7 +2,6 @@ # Uncomment the following lines to disable these optional devices: # -#CONFIG_TCX=n #CONFIG_CG3=n # Boards: diff --git a/hw/sparc/Kconfig b/hw/sparc/Kconfig index 2a83a8010e..5383dbd910 100644 --- a/hw/sparc/Kconfig +++ b/hw/sparc/Kconfig @@ -1,6 +1,6 @@ config SUN4M bool - imply TCX + select TCX imply CG3 select CS4231 select ECCMEMCTL