# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1306916902 -3600
# Node ID ecc58aeac569ad6defd47cc068eb93df143a0b5c
# Parent b76a45b26b062be8f376271b039698ef566ffab2
hvmloader: call SMP setup from common code again.
Previous refactoring was premature.
Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
diff -r b76a45b26b06 -r ecc58aeac569 tools/firmware/hvmloader/config.h
--- a/tools/firmware/hvmloader/config.h Wed Jun 01 09:28:09 2011 +0100
+++ b/tools/firmware/hvmloader/config.h Wed Jun 01 09:28:22 2011 +0100
@@ -26,8 +26,6 @@ struct bios_config {
/* ACPI tables */
unsigned int acpi_start;
- void (*smp_setup)(void);
-
uint32_t (*bios_high_setup)(void);
void (*bios_info_setup)(uint32_t);
diff -r b76a45b26b06 -r ecc58aeac569 tools/firmware/hvmloader/hvmloader.c
--- a/tools/firmware/hvmloader/hvmloader.c Wed Jun 01 09:28:09 2011 +0100
+++ b/tools/firmware/hvmloader/hvmloader.c Wed Jun 01 09:28:22 2011 +0100
@@ -403,8 +403,7 @@ int main(void)
apic_setup();
pci_setup();
- if (bios->smp_setup)
- bios->smp_setup();
+ smp_initialise();
perform_tests();
diff -r b76a45b26b06 -r ecc58aeac569 tools/firmware/hvmloader/rombios.c
--- a/tools/firmware/hvmloader/rombios.c Wed Jun 01 09:28:09 2011 +0100
+++ b/tools/firmware/hvmloader/rombios.c Wed Jun 01 09:28:22 2011 +0100
@@ -151,8 +151,6 @@ struct bios_config rombios_config = {
.acpi_start = ACPI_PHYSICAL_ADDRESS,
- .smp_setup = smp_initialise,
-
.bios_high_setup = rombios_highbios_setup,
.bios_info_setup = rombios_setup_bios_info,
diff -r b76a45b26b06 -r ecc58aeac569 tools/firmware/hvmloader/seabios.c
--- a/tools/firmware/hvmloader/seabios.c Wed Jun 01 09:28:09 2011 +0100
+++ b/tools/firmware/hvmloader/seabios.c Wed Jun 01 09:28:22 2011 +0100
@@ -50,8 +50,6 @@ struct bios_config seabios_config = {
.bios_info_setup = NULL,
- .smp_setup = NULL,
-
.vm86_setup = NULL,
.e820_setup = NULL,
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
Home