From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NuU04-0002NN-Qs for qemu-devel@nongnu.org; Wed, 24 Mar 2010 13:04:12 -0400 Received: from [140.186.70.92] (port=51565 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NuU03-0002Mp-Br for qemu-devel@nongnu.org; Wed, 24 Mar 2010 13:04:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1NuTzx-00077b-JN for qemu-devel@nongnu.org; Wed, 24 Mar 2010 13:04:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49084) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NuTzx-00077Q-CJ for qemu-devel@nongnu.org; Wed, 24 Mar 2010 13:04:05 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o2OH43h8007382 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 24 Mar 2010 13:04:04 -0400 From: Juan Quintela In-Reply-To: <1269440070-26788-1-git-send-email-kraxel@redhat.com> (Gerd Hoffmann's message of "Wed, 24 Mar 2010 15:14:30 +0100") References: <1269440070-26788-1-git-send-email-kraxel@redhat.com> Date: Wed, 24 Mar 2010 18:04:01 +0100 Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Subject: [Qemu-devel] Re: [PATCH] update bochs vbe interface List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Gerd Hoffmann Cc: qemu-devel@nongnu.org Gerd Hoffmann wrote: > 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. > > Signed-off-by: Gerd Hoffmann It breaks migration. vga.c:525: if (s->vbe_index <= VBE_DISPI_INDEX_NB) { vga.c:564: if (s->vbe_index <= VBE_DISPI_INDEX_NB) { vga.c:2218: VMSTATE_UINT16_ARRAY(vbe_regs, VGACommonState, VBE_DISPI_INDEX_NB), vga_int.h:50:#define VBE_DISPI_INDEX_NB 0xa vga_int.h:71: uint16_t vbe_regs[VBE_DISPI_INDEX_NB]; \ 2218 is the interesting line. Can we freeze this patch until the subsections stuff is done? I hope to sent a proposal Friday? And can use this as guinea pig? Later, Juan. > --- > hw/vga.c | 3 ++- > hw/vga_int.h | 4 +++- > 2 files changed, 5 insertions(+), 2 deletions(-) > > diff --git a/hw/vga.c b/hw/vga.c > index 6a1a059..a5c6997 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; > diff --git a/hw/vga_int.h b/hw/vga_int.h > index 23a42ef..4b8fc74 100644 > --- a/hw/vga_int.h > +++ b/hw/vga_int.h > @@ -47,13 +47,15 @@ > #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 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