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: 67853 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 277951007D3 for ; Fri, 15 Oct 2010 05:40:01 +1100 (EST) Received: from localhost ([127.0.0.1]:33934 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P6SiZ-0007dN-2H for incoming@patchwork.ozlabs.org; Thu, 14 Oct 2010 14:39:55 -0400 Received: from [140.186.70.92] (port=38492 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P6SfE-0005Z8-Hr for qemu-devel@nongnu.org; Thu, 14 Oct 2010 14:36:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P6SfD-00074C-NK for qemu-devel@nongnu.org; Thu, 14 Oct 2010 14:36:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53672) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1P6SfD-000744-GR for qemu-devel@nongnu.org; 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 To: qemu-devel@nongnu.org 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 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: jes.sorensen@redhat.com, alex.williamson@redhat.com, kvm@vger.kernel.org Subject: [Qemu-devel] [PATCH] vga: Mark VBE area as reserved in e820 tables X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Otherwise the guest might try to use the range for device hotplug. Signed-off-by: Alex Williamson --- hw/vga.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) 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);