diff options
| author | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-01-21 21:46:20 +0000 |
|---|---|---|
| committer | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-01-21 21:46:20 +0000 |
| commit | 9a717b55df29b2b0dd0553ccfa656671bad043d1 (patch) | |
| tree | 2539f6e29cd358372e0f5cd5729596fedbfc0fa4 /pc-bios/bios-pq/0003_kvm-bios-generate-mptable-unconditionally.patch | |
| parent | 9043b62d4c3a13e8a47ddfc027fa96c93e7176a5 (diff) | |
Add BIOS fixes from KVM tree
See each patch for individual Signed-off-by's/commit logs
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6392 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'pc-bios/bios-pq/0003_kvm-bios-generate-mptable-unconditionally.patch')
| -rw-r--r-- | pc-bios/bios-pq/0003_kvm-bios-generate-mptable-unconditionally.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/pc-bios/bios-pq/0003_kvm-bios-generate-mptable-unconditionally.patch b/pc-bios/bios-pq/0003_kvm-bios-generate-mptable-unconditionally.patch new file mode 100644 index 0000000000..7826a86d0e --- /dev/null +++ b/pc-bios/bios-pq/0003_kvm-bios-generate-mptable-unconditionally.patch @@ -0,0 +1,25 @@ +generate mptable unconditionally (Avi Kivity) + +VMware ESX requires an mptable even for uniprocessor guests. + +Signed-off-by: Avi Kivity <avi@qumranet.com> +Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> + +Index: bochs/bios/rombios32.c +=================================================================== +--- bochs.orig/bios/rombios32.c ++++ bochs/bios/rombios32.c +@@ -970,11 +970,6 @@ static void mptable_init(void) + int ioapic_id, i, len; + int mp_config_table_size; + +-#ifdef BX_QEMU +- if (smp_cpus <= 1) +- return; +-#endif +- + #ifdef BX_USE_EBDA_TABLES + mp_config_table = (uint8_t *)(ram_size - ACPI_DATA_SIZE - MPTABLE_MAX_SIZE); + #else + + |