From patchwork Mon May 7 10:10:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 10383823 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E07F46037F for ; Mon, 7 May 2018 10:11:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D2AC528A91 for ; Mon, 7 May 2018 10:11:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C734D28AC5; Mon, 7 May 2018 10:11:35 +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 lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7F92F28A91 for ; Mon, 7 May 2018 10:11:35 +0000 (UTC) Received: from localhost ([::1]:45028 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fFd7F-0007Ac-Tn for patchwork-qemu-devel@patchwork.kernel.org; Mon, 07 May 2018 06:11:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47873) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fFd6C-0006sF-2i for qemu-devel@nongnu.org; Mon, 07 May 2018 06:10:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fFd67-00056n-3u for qemu-devel@nongnu.org; Mon, 07 May 2018 06:10:28 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:34690 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fFd66-00056B-VJ for qemu-devel@nongnu.org; Mon, 07 May 2018 06:10:23 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3DDE8401DEBB for ; Mon, 7 May 2018 10:10:19 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-99.ams2.redhat.com [10.36.116.99]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1EF29111E3E8; Mon, 7 May 2018 10:10:14 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 212D53EC01; Mon, 7 May 2018 12:10:13 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Mon, 7 May 2018 12:10:13 +0200 Message-Id: <20180507101013.32736-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Mon, 07 May 2018 10:10:19 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Mon, 07 May 2018 10:10:19 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'kraxel@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH] vga: print friendly error message in case multiple vga devices are added 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: Gerd Hoffmann Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP ... to a virtual machine. Without that we fail a ramblock register sanity check, leading to a abort(), which isn't exactly user friendly. https://bugzilla.redhat.com/show_bug.cgi?id=1206037 Signed-off-by: Gerd Hoffmann --- hw/display/vga.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/hw/display/vga.c b/hw/display/vga.c index 72181330b8..328b6413ad 100644 --- a/hw/display/vga.c +++ b/hw/display/vga.c @@ -2184,6 +2184,14 @@ void vga_common_init(VGACommonState *s, Object *obj, bool global_vmstate) } s->vbe_size_mask = s->vbe_size - 1; + if (global_vmstate) { + static int have_vga; + if (have_vga) { + error_report("only one vga device is supported"); + exit(1); + } + have_vga = true; + } s->is_vbe_vmstate = 1; memory_region_init_ram_nomigrate(&s->vram, obj, "vga.vram", s->vram_size, &error_fatal);