Make qemu_ram_alloc() be able to allocate more than 4GB of memory
[qemu-kvm/fedora.git] / pc-bios / bios.diff
blob2bdfd5ca4917564327b4179bd25c18d16ec4228d
1 ? _rombios_.c
2 ? _rombiosl_.c
3 ? a.out
4 ? biossums
5 ? rombios.s
6 ? rombios.sym
7 ? rombios.txt
8 ? rombios16.bin
9 ? rombios32.bin
10 ? rombios32.out
11 ? rombiosl.s
12 ? rombiosl.sym
13 ? rombiosl.txt
14 Index: BIOS-bochs-latest
15 ===================================================================
16 RCS file: /cvsroot/bochs/bochs/bios/BIOS-bochs-latest,v
17 retrieving revision 1.145
18 diff -u -r1.145 BIOS-bochs-latest
19 Binary files /tmp/cvsHcT9RD and BIOS-bochs-latest differ
20 Index: BIOS-bochs-legacy
21 ===================================================================
22 RCS file: /cvsroot/bochs/bochs/bios/BIOS-bochs-legacy,v
23 retrieving revision 1.9
24 diff -u -r1.9 BIOS-bochs-legacy
25 Binary files /tmp/cvszbAyyn and BIOS-bochs-legacy differ
26 Index: rombios.c
27 ===================================================================
28 RCS file: /cvsroot/bochs/bochs/bios/rombios.c,v
29 retrieving revision 1.178
30 diff -u -r1.178 rombios.c
31 --- rombios.c 2 Apr 2007 20:35:08 -0000 1.178
32 +++ rombios.c 17 May 2007 13:32:36 -0000
33 @@ -9521,6 +9521,14 @@
34 rep
35 stosd
37 + ;; reset the memory (some boot loaders such as syslinux suppose
38 + ;; that the memory is set to zero)
39 + mov edi, #0x00040000
40 + mov ecx, #0x40000 / 4
41 + xor eax, eax
42 + rep
43 + stosd
45 ;; return to 16 bit protected mode first
46 db 0xea
47 dd rombios32_10
48 Index: rombios.h
49 ===================================================================
50 RCS file: /cvsroot/bochs/bochs/bios/rombios.h,v
51 retrieving revision 1.4
52 diff -u -r1.4 rombios.h
53 --- rombios.h 20 Feb 2007 09:36:55 -0000 1.4
54 +++ rombios.h 17 May 2007 13:32:36 -0000
55 @@ -19,7 +19,7 @@
56 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
58 /* define it to include QEMU specific code */
59 -//#define BX_QEMU
60 +#define BX_QEMU
62 #ifndef LEGACY
63 # define BX_ROMBIOS32 1
64 Index: rombios32.c
65 ===================================================================
66 RCS file: /cvsroot/bochs/bochs/bios/rombios32.c,v
67 retrieving revision 1.9
68 diff -u -r1.9 rombios32.c
69 --- rombios32.c 20 Feb 2007 09:36:55 -0000 1.9
70 +++ rombios32.c 17 May 2007 13:32:40 -0000
71 @@ -855,6 +855,11 @@
72 int ioapic_id, i, len;
73 int mp_config_table_size;
75 +#ifdef BX_QEMU
76 + if (smp_cpus <= 1)
77 + return;
78 +#endif
80 #ifdef BX_USE_EBDA_TABLES
81 mp_config_table = (uint8_t *)(ram_size - ACPI_DATA_SIZE - MPTABLE_MAX_SIZE);
82 #else