56 lines
2.1 KiB
Diff
56 lines
2.1 KiB
Diff
|
From e3d13cec19a919b06dea49edd64a50c68e1094a7 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Anthony PERARD <anthony.perard@citrix.com>
|
||
|
|
Date: Mon, 14 Mar 2016 17:55:42 +0000
|
||
|
|
Subject: [PATCH 07/15] hvmloader: Grab the hvm_start_info pointer
|
||
|
|
|
||
|
|
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
|
||
|
|
---
|
||
|
|
tools/firmware/hvmloader/hvmloader.c | 5 +++++
|
||
|
|
tools/firmware/hvmloader/util.h | 3 +++
|
||
|
|
2 files changed, 8 insertions(+)
|
||
|
|
|
||
|
|
Index: xen-4.7.0-testing/tools/firmware/hvmloader/hvmloader.c
|
||
|
|
===================================================================
|
||
|
|
--- xen-4.7.0-testing.orig/tools/firmware/hvmloader/hvmloader.c
|
||
|
|
+++ xen-4.7.0-testing/tools/firmware/hvmloader/hvmloader.c
|
||
|
|
@@ -29,6 +29,8 @@
|
||
|
|
#include <xen/version.h>
|
||
|
|
#include <xen/hvm/params.h>
|
||
|
|
|
||
|
|
+const struct hvm_start_info *hvm_start_info;
|
||
|
|
+
|
||
|
|
asm (
|
||
|
|
" .text \n"
|
||
|
|
" .globl _start \n"
|
||
|
|
@@ -46,6 +48,8 @@ asm (
|
||
|
|
" ljmp $"STR(SEL_CODE32)",$1f \n"
|
||
|
|
"1: movl $stack_top,%esp \n"
|
||
|
|
" movl %esp,%ebp \n"
|
||
|
|
+ /* store HVM start info ptr */
|
||
|
|
+ " mov %ebx, hvm_start_info \n"
|
||
|
|
" call main \n"
|
||
|
|
/* Relocate real-mode trampoline to 0x0. */
|
||
|
|
" mov $trampoline_start,%esi \n"
|
||
|
|
@@ -258,6 +262,7 @@ int main(void)
|
||
|
|
memset((void *)HYPERCALL_PHYSICAL_ADDRESS, 0xc3 /* RET */, PAGE_SIZE);
|
||
|
|
|
||
|
|
printf("HVM Loader\n");
|
||
|
|
+ BUG_ON(hvm_start_info->magic != XEN_HVM_START_MAGIC_VALUE);
|
||
|
|
|
||
|
|
init_hypercalls();
|
||
|
|
|
||
|
|
Index: xen-4.7.0-testing/tools/firmware/hvmloader/util.h
|
||
|
|
===================================================================
|
||
|
|
--- xen-4.7.0-testing.orig/tools/firmware/hvmloader/util.h
|
||
|
|
+++ xen-4.7.0-testing/tools/firmware/hvmloader/util.h
|
||
|
|
@@ -158,6 +158,9 @@ static inline void cpu_relax(void)
|
||
|
|
struct hvm_info_table *get_hvm_info_table(void) __attribute__ ((const));
|
||
|
|
#define hvm_info (get_hvm_info_table())
|
||
|
|
|
||
|
|
+/* HVM start info */
|
||
|
|
+extern const struct hvm_start_info *hvm_start_info;
|
||
|
|
+
|
||
|
|
/* String and memory functions */
|
||
|
|
int strcmp(const char *cs, const char *ct);
|
||
|
|
int strncmp(const char *s1, const char *s2, uint32_t n);
|