~jderose/ubuntu/raring/qemu/vde-again

« back to all changes in this revision

Viewing changes to pc-bios/bios-pq/0003_kvm-bios-generate-mptable-unconditionally.patch

  • Committer: Bazaar Package Importer
  • Author(s): Aurelien Jarno, Aurelien Jarno
  • Date: 2009-03-07 06:20:34 UTC
  • mfrom: (1.1.9 upstream)
  • mto: This revision was merged to the branch mainline in revision 7.
  • Revision ID: james.westby@ubuntu.com-20090307062034-i3pead4mw653v2el
Tags: 0.10.0-1
[ Aurelien Jarno ]
* New upstream release:
  - Fix fr-be keyboard mapping (closes: bug#514462).
  - Fix stat64 structure on ppc-linux-user (closes: bug#470231).
  - Add a chroot option (closes: bug#415996).
  - Add evdev support (closes: bug#513210).
  - Fix loop on symlinks in user mode (closes: bug#297572).
  - Bump depends on openbios-sparc.
  - Depends on openbios-ppc.
  - Update 12_signal_powerpc_support.patch.
  - Update 21_net_soopts.patch.
  - Drop 44_socklen_t_check.patch (merged upstream).
  - Drop 49_null_check.patch (merged upstream).
  - Update 64_ppc_asm_constraints.patch.
  - Drop security/CVE-2008-0928-fedora.patch (merged upstream).
  - Drop security/CVE-2007-5730.patch (merged upstream).
* patches/80_stable-branch.patch: add patches from stable branch:
  - Fix race condition between signal handler/execution loop (closes:
    bug#474386, bug#501731).
* debian/copyright: update.
* Compile and install .dtb files:
  - debian/control: build-depends on device-tree-compiler.
  - debian/patches/81_compile_dtb.patch: new patch from upstream.
  - debian/rules: compile and install bamboo.dtb and mpc8544.dtb.

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
generate mptable unconditionally (Avi Kivity)
 
2
 
 
3
VMware ESX requires an mptable even for uniprocessor guests.
 
4
 
 
5
Signed-off-by: Avi Kivity <avi@qumranet.com>
 
6
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
 
7
 
 
8
Index: bochs/bios/rombios32.c
 
9
===================================================================
 
10
--- bochs.orig/bios/rombios32.c
 
11
+++ bochs/bios/rombios32.c
 
12
@@ -970,11 +970,6 @@ static void mptable_init(void)
 
13
     int ioapic_id, i, len;
 
14
     int mp_config_table_size;
 
15
 
 
16
-#ifdef BX_QEMU
 
17
-    if (smp_cpus <= 1)
 
18
-        return;
 
19
-#endif
 
20
-
 
21
 #ifdef BX_USE_EBDA_TABLES
 
22
     mp_config_table = (uint8_t *)(ram_size - ACPI_DATA_SIZE - MPTABLE_MAX_SIZE);
 
23
 #else
 
24
 
 
25