From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LP6QY-0008Vd-2M
	for qemu-devel@nongnu.org; Mon, 19 Jan 2009 21:33:18 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LP6QX-0008Uj-9D
	for qemu-devel@nongnu.org; Mon, 19 Jan 2009 21:33:17 -0500
Received: from [199.232.76.173] (port=36806 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LP6QX-0008UY-1e
	for qemu-devel@nongnu.org; Mon, 19 Jan 2009 21:33:17 -0500
Received: from mx2.redhat.com ([66.187.237.31]:39323)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <mtosatti@redhat.com>) id 1LP6QW-0001Rh-MB
	for qemu-devel@nongnu.org; Mon, 19 Jan 2009 21:33:16 -0500
Message-Id: <20090120023058.105258000@amt.cnet>
Date: Tue, 20 Jan 2009 00:30:49 -0200
From: Marcelo Tosatti <mtosatti@redhat.com>
References: <20090120023040.623163208@amt.cnet>
Content-Disposition: inline; filename=0010_smbios_16g_boundary.patch
Subject: [Qemu-devel] [patch 9/9] kvm: bios: fix smbios memory device length
	boundary condition
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org, bochs-developers@lists.sourceforge.net
Cc: Anthony Liguori <aliguori@us.ibm.com>, Bill Rieske <brieske@novell.com>, Avi Kivity <avi@redhat.com>

dev_memsize ends up 0 when it shouldn't be on 16G boundary conditions.
    
Signed-off-by: Bill Rieske <brieske@novell.com>
Signed-off-by: Avi Kivity <avi@redhat.com>

From: Bill Rieske <brieske@novell.com>

Index: bochs/bios/rombios32.c
===================================================================
--- bochs.orig/bios/rombios32.c
+++ bochs/bios/rombios32.c
@@ -2218,7 +2218,7 @@ void smbios_init(void)
     for ( i = 0; i < nr_mem_devs; i++ )
     {
         uint32_t dev_memsize = ((i == (nr_mem_devs - 1))
-                                ? (memsize & 0x3fff) : 0x4000);
+                                ? (((memsize-1) & 0x3fff)+1) : 0x4000);
         add_struct(smbios_type_17_init(p, dev_memsize, i));
         add_struct(smbios_type_19_init(p, dev_memsize, i));
         add_struct(smbios_type_20_init(p, dev_memsize, i));