From patchwork Thu Feb 14 10:47:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 10812431 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 514A813B4 for ; Thu, 14 Feb 2019 10:48:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3EC242D6AD for ; Thu, 14 Feb 2019 10:48:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 329312D6B0; Thu, 14 Feb 2019 10:48:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 886672D6AD for ; Thu, 14 Feb 2019 10:48:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2395349AbfBNKsV (ORCPT ); Thu, 14 Feb 2019 05:48:21 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:45461 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2395378AbfBNKsC (ORCPT ); Thu, 14 Feb 2019 05:48:02 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MuUza-1hCRvj0XPm-00rU5U; Thu, 14 Feb 2019 11:47:49 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: Laurent Vivier , Paolo Bonzini , kvm@vger.kernel.org, libvir-list@redhat.com, "Michael S. Tsirkin" , Eric Blake , Markus Armbruster , Michael Tokarev , "Dr. David Alan Gilbert" , qemu-trivial@nongnu.org, Gerd Hoffmann , Artyom Tarasenko , Kamil Rytarowski , Mark Cave-Ayland , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 13/14] hw/sparc64: Explicitly set default_display = "std" Date: Thu, 14 Feb 2019 11:47:16 +0100 Message-Id: <20190214104717.3543-14-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190214104717.3543-1-laurent@vivier.eu> References: <20190214104717.3543-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:clkzpb0kf5OkOTkDePAWmbK+LGoWFoOkSqYIO+AEwTedXnBh+68 Sal3EDlWvFtfve9SmjgAGQvgMVwHw8fAb3FpYqzisB2GFZMPLfyy8RKV4bU5qietBq4rmvh tb3QMnL9T96G8nRZ26ZvRDpIjjIfx2feGKXUoB9sR5wz6jokCOiBm0vjF2gccWuPpOlnW7y mh/uwoGqWk9OausF/Mn9A== X-UI-Out-Filterresults: notjunk:1;V03:K0:tizVtLKisjk=:6MMMqO4MJ4LmETSx67nExd ITqZGG6+fshWRL8DbJ0QDBrL2Lo/2fT8qwV4+rek1wZthWXol9rxr/I7hwg8y8EkSZtq4HT17 8G//GkZkrOIwWR2s0aXQrrpeLpsfxSHBRtasVwhjQlVOOz6pXkVXhWJII+YSXiG6pxe1k5azy BG0DzLFbEamq+A6fTrTeVGH/phS3sicdN85O/SFqMb7UGmeoQxEZWd6SGzyJ/5Z0VVgcZYTpE owsE5VfdmMB2q+9qBNKed4kUQnegU+9uymaykBCreXi/000gSfFQw1hkcc/szwsh4IBIL/03A krfJRGoC3enDsrWlNefLZG27eucZn5znWWX/6Lplc+jK6RhLE20Bi1L5XyoQLjTQJQnhg95aj 0pEAqsfq2L3lYs9otP6LOe3bippeOKko/3nK8WFrRFghBoTHkNTuTSf+f8j1AtIxTCdirTDH2 1GaKRWh0CXpmUsc/Fmk+eZ2Uh+Jxm9tIaIo7IxAkB+wtnEbYVnuPd+lBEouhuHuLCvgPg+vAf bu1y8lL1hwtcT5iFXb9xZiML+nBz0tBimOvAVZRjrvzCDPorg9Ni38q1IwJ58kVAOM4805/UO SqnRMOoUIicGPe407cLEnokOeiMGHVHVwOHRRLXr6+w2Wwoj8A2uYFjGVsw4aDGqwehEV2aZy d0qxAGWtvzKGbKlAbZhA968b7pp69qr2irgI202Rn1b9JunRw3qojeMGrnrKRDUqJ8hWnVxSy hFe9WC1HFH+w8aRM1ACAiQ7dNT2ZEG/k7vTlOrBlj1dx2xsbPTMxs+aIwrY= Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Thomas Huth The sun4uv_init() function expects vga_interface_type to be either VGA_STD or VGA_NONE and sets up a stdvga device or no vga card accordingly. However, the code in vl.c prefers the Cirrus VGA card to stdvga if it is available and the user and the machine did not specify anything else. So far this has not been a problem, since the Cirrus VGA was not linked into the sparc64 target. But with the upcoming Kconfig build system, all theoretically possible PCI cards will be enabled by default, so the Cirrus VGA card might become available on the sparc64 target, too. vl.c then picks the wrong card, causing sun4uv_init() to abort. Thus let's make it explicit that we always want stdvga for sparc64 and so set default_display = "std" for these machines. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Mark Cave-Ayland Message-Id: <1550041639-10232-1-git-send-email-thuth@redhat.com> Signed-off-by: Laurent Vivier --- hw/sparc64/sun4u.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index ff24d9b35016..399f2d73c814 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -797,6 +797,7 @@ static void sun4u_class_init(ObjectClass *oc, void *data) mc->default_boot_order = "c"; mc->default_cpu_type = SPARC_CPU_TYPE_NAME("TI-UltraSparc-IIi"); mc->ignore_boot_device_suffixes = true; + mc->default_display = "std"; fwc->get_dev_path = sun4u_fw_dev_path; } @@ -820,6 +821,7 @@ static void sun4v_class_init(ObjectClass *oc, void *data) mc->max_cpus = 1; /* XXX for now */ mc->default_boot_order = "c"; mc->default_cpu_type = SPARC_CPU_TYPE_NAME("Sun-UltraSparc-T1"); + mc->default_display = "std"; } static const TypeInfo sun4v_type = {