diff options
author | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-02-11 14:55:47 +0000 |
---|---|---|
committer | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-02-11 14:55:47 +0000 |
commit | 7217e1240340ab49878c4e415df40aa0c6376eb9 (patch) | |
tree | 9726aea8c1b85636646275dc4b4598f9c66934f4 /pc-bios/bios-pq/0010_kvm-bios-fix-smbios-memory-device-length-boundary--condition.patch | |
parent | 2edd089f8a265c2fab92da118dd89c1f59f437a5 (diff) |
Update PC BIOS to latest bits from Bochs
A number of patches were merged since we last pulled.
Thanks to Marcelo Tosatti for rebasing the existing patches and testing.
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6589 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'pc-bios/bios-pq/0010_kvm-bios-fix-smbios-memory-device-length-boundary--condition.patch')
-rw-r--r-- | pc-bios/bios-pq/0010_kvm-bios-fix-smbios-memory-device-length-boundary--condition.patch | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/pc-bios/bios-pq/0010_kvm-bios-fix-smbios-memory-device-length-boundary--condition.patch b/pc-bios/bios-pq/0010_kvm-bios-fix-smbios-memory-device-length-boundary--condition.patch deleted file mode 100644 index e4ec229bae..0000000000 --- a/pc-bios/bios-pq/0010_kvm-bios-fix-smbios-memory-device-length-boundary--condition.patch +++ /dev/null @@ -1,23 +0,0 @@ -fix smbios memory device length boundary condition (Bill Rieske) - -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> -Signed-off-by: Anthony Liguori <aliguori@us.ibm.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)); - - |