From patchwork Wed Mar 24 19:50:45 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 48467 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 B3A71B7C59 for ; Thu, 25 Mar 2010 07:05:34 +1100 (EST) Received: from localhost ([127.0.0.1]:55204 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NuWhV-0005Ax-O3 for incoming@patchwork.ozlabs.org; Wed, 24 Mar 2010 15:57:13 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NuWbc-0003Uj-LB for qemu-devel@nongnu.org; Wed, 24 Mar 2010 15:51:08 -0400 Received: from [140.186.70.92] (port=54485 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NuWba-0003SG-Bk for qemu-devel@nongnu.org; Wed, 24 Mar 2010 15:51:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1NuWbK-0002Dp-Ft for qemu-devel@nongnu.org; Wed, 24 Mar 2010 15:50:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:27809) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NuWbK-0002Dk-6s for qemu-devel@nongnu.org; Wed, 24 Mar 2010 15:50:50 -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 o2OJonEI029687 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 24 Mar 2010 15:50:49 -0400 Received: from zweiblum.home.kraxel.org (vpn2-10-171.ams2.redhat.com [10.36.10.171]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o2OJokE9025760; Wed, 24 Mar 2010 15:50:47 -0400 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id 986E07010F; Wed, 24 Mar 2010 20:50:45 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Wed, 24 Mar 2010 20:50:45 +0100 Message-Id: <1269460245-31941-1-git-send-email-kraxel@redhat.com> 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: Gerd Hoffmann Subject: [Qemu-devel] [PATCH v2] update bochs vbe interface 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 The bochs vbe interface got a new register a while back, which specifies the linear framebuffer size in 64k units. This patch adds support for the new register to qemu. With this patch applied vgabios 0.6c works with qemu. [ v2: Don't savevm the new register. Doing so breaks migration, and as it carries read-only information for the guest there is no need to save it. ] --- hw/vga.c | 5 +++-- hw/vga_int.h | 6 +++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/hw/vga.c b/hw/vga.c index 6a1a059..f9e07cf 100644 --- a/hw/vga.c +++ b/hw/vga.c @@ -1955,7 +1955,8 @@ void vga_common_reset(VGACommonState *s) #ifdef CONFIG_BOCHS_VBE s->vbe_index = 0; memset(s->vbe_regs, '\0', sizeof(s->vbe_regs)); - s->vbe_regs[VBE_DISPI_INDEX_ID] = VBE_DISPI_ID0; + s->vbe_regs[VBE_DISPI_INDEX_ID] = VBE_DISPI_ID5; + s->vbe_regs[VBE_DISPI_INDEX_VIDEO_MEMORY_64K] = s->vram_size / (64 * 1024); s->vbe_start_addr = 0; s->vbe_line_offset = 0; s->vbe_bank_mask = (s->vram_size >> 16) - 1; @@ -2215,7 +2216,7 @@ const VMStateDescription vmstate_vga_common = { VMSTATE_UINT8_EQUAL(is_vbe_vmstate, VGACommonState), #ifdef CONFIG_BOCHS_VBE VMSTATE_UINT16(vbe_index, VGACommonState), - VMSTATE_UINT16_ARRAY(vbe_regs, VGACommonState, VBE_DISPI_INDEX_NB), + VMSTATE_UINT16_ARRAY(vbe_regs, VGACommonState, VBE_DISPI_INDEX_NB_VMSTATE), VMSTATE_UINT32(vbe_start_addr, VGACommonState), VMSTATE_UINT32(vbe_line_offset, VGACommonState), VMSTATE_UINT32(vbe_bank_mask, VGACommonState), diff --git a/hw/vga_int.h b/hw/vga_int.h index 23a42ef..c3c5e21 100644 --- a/hw/vga_int.h +++ b/hw/vga_int.h @@ -47,13 +47,17 @@ #define VBE_DISPI_INDEX_VIRT_HEIGHT 0x7 #define VBE_DISPI_INDEX_X_OFFSET 0x8 #define VBE_DISPI_INDEX_Y_OFFSET 0x9 -#define VBE_DISPI_INDEX_NB 0xa +#define VBE_DISPI_INDEX_VIDEO_MEMORY_64K 0xa + +#define VBE_DISPI_INDEX_NB_VMSTATE 0xa +#define VBE_DISPI_INDEX_NB 0xb #define VBE_DISPI_ID0 0xB0C0 #define VBE_DISPI_ID1 0xB0C1 #define VBE_DISPI_ID2 0xB0C2 #define VBE_DISPI_ID3 0xB0C3 #define VBE_DISPI_ID4 0xB0C4 +#define VBE_DISPI_ID5 0xB0C5 #define VBE_DISPI_DISABLED 0x00 #define VBE_DISPI_ENABLED 0x01