From patchwork Thu Oct 14 18:36:23 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Williamson X-Patchwork-Id: 253921 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o9EIaUw6006966 for ; Thu, 14 Oct 2010 18:36:30 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755925Ab0JNSg2 (ORCPT ); Thu, 14 Oct 2010 14:36:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:23777 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755921Ab0JNSg1 (ORCPT ); Thu, 14 Oct 2010 14:36:27 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o9EIaPeZ030742 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 14 Oct 2010 14:36:25 -0400 Received: from s20.home (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o9EIaNo0008283; Thu, 14 Oct 2010 14:36:23 -0400 From: Alex Williamson Subject: [PATCH] vga: Mark VBE area as reserved in e820 tables To: qemu-devel@nongnu.org Cc: kvm@vger.kernel.org, jes.sorensen@redhat.com, anthony@codemonkey.ws, alex.williamson@redhat.com Date: Thu, 14 Oct 2010 12:36:23 -0600 Message-ID: <20101014183546.23575.34968.stgit@s20.home> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Thu, 14 Oct 2010 18:36:30 +0000 (UTC) diff --git a/hw/vga.c b/hw/vga.c index 966185e..90f9dc0 100644 --- a/hw/vga.c +++ b/hw/vga.c @@ -2331,6 +2331,14 @@ void vga_init(VGACommonState *s) void vga_init_vbe(VGACommonState *s) { #ifdef CONFIG_BOCHS_VBE +#if defined (TARGET_I386) + if (e820_add_entry(VBE_DISPI_LFB_PHYSICAL_ADDRESS, + VGA_RAM_SIZE, E820_RESERVED) < 0) { + fprintf(stderr, + "Warning: unable to register VBE range as e820 reserved\n"); + } +#endif + /* XXX: use optimized standard vga accesses */ cpu_register_physical_memory(VBE_DISPI_LFB_PHYSICAL_ADDRESS, VGA_RAM_SIZE, s->vram_offset);