Mailing List Archive

# HG changeset patch
# User Ian Campbell <ian.campbell@citrix.com>
# Date 1302612380 -3600
# Node ID 845d654b6117e23062b586f19ce7a1837c619184
# Parent 8fc9d810fd1651e3582b8cd3eb70fc563c29d36f
tools: hvmloader: Refactor VM86 and E820 setup into struct bios_config

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---


diff -r 8fc9d810fd16 -r 845d654b6117 tools/firmware/hvmloader/config.h
--- a/tools/firmware/hvmloader/config.h Tue Apr 12 13:45:59 2011 +0100
+++ b/tools/firmware/hvmloader/config.h Tue Apr 12 13:46:20 2011 +0100
@@ -31,6 +31,9 @@

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 @@
#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 -r 8fc9d810fd16 -r 845d654b6117 tools/firmware/hvmloader/hvmloader.c
--- a/tools/firmware/hvmloader/hvmloader.c Tue Apr 12 13:45:59 2011 +0100
+++ b/tools/firmware/hvmloader/hvmloader.c Tue Apr 12 13:46:20 2011 +0100
@@ -338,24 +338,6 @@
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 @@
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 @@
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 -r 8fc9d810fd16 -r 845d654b6117 tools/firmware/hvmloader/rombios.c
--- a/tools/firmware/hvmloader/rombios.c Tue Apr 12 13:45:59 2011 +0100
+++ b/tools/firmware/hvmloader/rombios.c Tue Apr 12 13:46:20 2011 +0100
@@ -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 @@

.bios_high_setup = rombios_highbios_setup,
.bios_info_setup = rombios_setup_bios_info,
+
+ .vm86_setup = rombios_init_vm86_tss,
+ .e820_setup = rombios_setup_e820,
};

/*

_______________________________________________
Xen-changelog mailing list
Xen-changelog@lists.xensource.com
http://lists.xensource.com/xen-changelog