diff options
-rw-r--r-- | tools/firmware/hvmloader/config.h | 6 | ||||
-rw-r--r-- | tools/firmware/hvmloader/hvmloader.c | 25 | ||||
-rw-r--r-- | tools/firmware/hvmloader/rombios.c | 29 |
3 files changed, 36 insertions, 24 deletions
diff --git a/tools/firmware/hvmloader/config.h b/tools/firmware/hvmloader/config.h index 3d0683414d..4aa59a1509 100644 --- a/tools/firmware/hvmloader/config.h +++ b/tools/firmware/hvmloader/config.h @@ -31,6 +31,9 @@ struct bios_config { uint32_t (*bios_high_setup)(void); void (*bios_info_setup)(uint32_t); + + void (*vm86_setup)(void); + void (*e820_setup)(void); }; extern struct bios_config rombios_config; @@ -62,9 +65,6 @@ extern unsigned long pci_mem_start, pci_mem_end; #define ROMBIOS_MAXOFFSET 0x0000FFFF #define ROMBIOS_END (ROMBIOS_BEGIN + ROMBIOS_SIZE) -#include "e820.h" -#include "../rombios/config.h" - #define SCRATCH_PHYSICAL_ADDRESS 0x00010000 #define HYPERCALL_PHYSICAL_ADDRESS 0x00080000 diff --git a/tools/firmware/hvmloader/hvmloader.c b/tools/firmware/hvmloader/hvmloader.c index 0426a42054..232941fd36 100644 --- a/tools/firmware/hvmloader/hvmloader.c +++ b/tools/firmware/hvmloader/hvmloader.c @@ -338,24 +338,6 @@ static void cmos_write_memory_size(void) cmos_outb(0x35, (uint8_t)( alt_mem >> 8)); } -/* - * Set up an empty TSS area for virtual 8086 mode to use. - * The only important thing is that it musn't have any bits set - * in the interrupt redirection bitmap, so all zeros will do. - */ -static void init_vm86_tss(void) -{ - void *tss; - struct xen_hvm_param p; - - tss = mem_alloc(128, 128); - memset(tss, 0, 128); - p.domid = DOMID_SELF; - p.index = HVM_PARAM_VM86_TSS; - p.value = virt_to_phys(tss); - hypercall_hvm_op(HVMOP_set_param, &p); - printf("vm86 TSS at %08lx\n", virt_to_phys(tss)); -} static const struct bios_config *detect_bios(void) { @@ -454,7 +436,8 @@ int main(void) hypercall_hvm_op(HVMOP_set_param, &p); } - init_vm86_tss(); + if (bios->vm86_setup) + bios->vm86_setup(); cmos_write_memory_size(); @@ -479,8 +462,8 @@ int main(void) bios->bios_address, bios->bios_address + bios->image_size - 1); - *E820_NR = build_e820_table(E820); - dump_e820_table(E820, *E820_NR); + if (bios->e820_setup) + bios->e820_setup(); if (bios->bios_info_setup) bios->bios_info_setup(highbios); diff --git a/tools/firmware/hvmloader/rombios.c b/tools/firmware/hvmloader/rombios.c index 7d88425730..688a2bfa49 100644 --- a/tools/firmware/hvmloader/rombios.c +++ b/tools/firmware/hvmloader/rombios.c @@ -30,12 +30,38 @@ #include "util.h" #include "hypercall.h" +#include <xen/hvm/params.h> #include <xen/hvm/ioreq.h> #include <xen/memory.h> #define ROM_INCLUDE_ROMBIOS #include "roms.inc" +/* + * Set up an empty TSS area for virtual 8086 mode to use. + * The only important thing is that it musn't have any bits set + * in the interrupt redirection bitmap, so all zeros will do. + */ +static void rombios_init_vm86_tss(void) +{ + void *tss; + struct xen_hvm_param p; + + tss = mem_alloc(128, 128); + memset(tss, 0, 128); + p.domid = DOMID_SELF; + p.index = HVM_PARAM_VM86_TSS; + p.value = virt_to_phys(tss); + hypercall_hvm_op(HVMOP_set_param, &p); + printf("vm86 TSS at %08lx\n", virt_to_phys(tss)); +} + +static void rombios_setup_e820(void) +{ + *E820_NR = build_e820_table(E820); + dump_e820_table(E820, *E820_NR); +} + static void rombios_setup_bios_info(uint32_t bioshigh) { struct bios_info *bios_info; @@ -301,6 +327,9 @@ struct bios_config rombios_config = { .bios_high_setup = rombios_highbios_setup, .bios_info_setup = rombios_setup_bios_info, + + .vm86_setup = rombios_init_vm86_tss, + .e820_setup = rombios_setup_e820, }; /* |