From: kaf24@firebug.cl.cam.ac.uk Date: Wed, 7 Jun 2006 08:59:56 +0000 (+0100) Subject: [HVMLOADER] Revert to uniprocessor MPS table in rombios. X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15972^2~49^2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=fa50dd1a8e15ca1e7d8455afe02830598edcde69;p=xen.git [HVMLOADER] Revert to uniprocessor MPS table in rombios. Advertising more CPUs than the guest is allocated hangs boot of Windows XP (selects wrong HAL). The correct fix here is to dynamically generate the MPS table (at least the CPU entries) from hvmloader binary. Signed-off-by: Keir Fraser --- diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile index 86b67035b8..a91391c2bd 100644 --- a/tools/firmware/hvmloader/Makefile +++ b/tools/firmware/hvmloader/Makefile @@ -51,8 +51,8 @@ hvmloader: roms.h hvmloader.c acpi_madt.c $(OBJCOPY) hvmloader.tmp hvmloader rm -f hvmloader.tmp -roms.h: ../rombios/BIOS-bochs-8-processors ../vgabios/VGABIOS-lgpl-latest.bin ../vgabios/VGABIOS-lgpl-latest.cirrus.bin ../vmxassist/vmxassist.bin - sh ./mkhex rombios ../rombios/BIOS-bochs-8-processors > roms.h +roms.h: ../rombios/BIOS-bochs-latest ../vgabios/VGABIOS-lgpl-latest.bin ../vgabios/VGABIOS-lgpl-latest.cirrus.bin ../vmxassist/vmxassist.bin + sh ./mkhex rombios ../rombios/BIOS-bochs-latest > roms.h sh ./mkhex vgabios_stdvga ../vgabios/VGABIOS-lgpl-latest.bin >> roms.h sh ./mkhex vgabios_cirrusvga ../vgabios/VGABIOS-lgpl-latest.cirrus.bin >> roms.h sh ./mkhex vmxassist ../vmxassist/vmxassist.bin >> roms.h diff --git a/tools/firmware/rombios/Makefile b/tools/firmware/rombios/Makefile index 080e3de5fd..3f4200df25 100644 --- a/tools/firmware/rombios/Makefile +++ b/tools/firmware/rombios/Makefile @@ -1,7 +1,7 @@ -#BIOS_BUILDS = BIOS-bochs-latest +BIOS_BUILDS = BIOS-bochs-latest #BIOS_BUILDS += BIOS-bochs-2-processors #BIOS_BUILDS += BIOS-bochs-4-processors -BIOS_BUILDS += BIOS-bochs-8-processors +#BIOS_BUILDS += BIOS-bochs-8-processors .PHONY: all all: bios