| Message ID | 1457978150-27201-8-git-send-email-anthony.perard@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Mar 14, 2016 at 05:55:42PM +0000, Anthony PERARD wrote: > Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> > Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> > --- > Change in V4: > - remove struct hvm_info_start redefinition, as it's moved to > public/xen.h in a previous patch. > > Change in V3: > - remove cmdline parser > - load hvm_start_info pointer earlier, before calling main(). > - Add struct hvm_start_info definition to hvmloader. > --- > tools/firmware/hvmloader/hvmloader.c | 5 +++++ > tools/firmware/hvmloader/util.h | 3 +++ > 2 files changed, 8 insertions(+) > > diff --git a/tools/firmware/hvmloader/hvmloader.c b/tools/firmware/hvmloader/hvmloader.c > index 716d03c..c45f367 100644 > --- a/tools/firmware/hvmloader/hvmloader.c > +++ b/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(); > > diff --git a/tools/firmware/hvmloader/util.h b/tools/firmware/hvmloader/util.h > index 3126817..9808016 100644 > --- a/tools/firmware/hvmloader/util.h > +++ b/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); > -- > Anthony PERARD > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel
>>> On 14.03.16 at 18:55, <anthony.perard@citrix.com> wrote: > Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> Acked-by: Jan Beulich <jbeulich@suse.com>
diff --git a/tools/firmware/hvmloader/hvmloader.c b/tools/firmware/hvmloader/hvmloader.c index 716d03c..c45f367 100644 --- a/tools/firmware/hvmloader/hvmloader.c +++ b/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(); diff --git a/tools/firmware/hvmloader/util.h b/tools/firmware/hvmloader/util.h index 3126817..9808016 100644 --- a/tools/firmware/hvmloader/util.h +++ b/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);
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> --- Change in V4: - remove struct hvm_info_start redefinition, as it's moved to public/xen.h in a previous patch. Change in V3: - remove cmdline parser - load hvm_start_info pointer earlier, before calling main(). - Add struct hvm_start_info definition to hvmloader. --- tools/firmware/hvmloader/hvmloader.c | 5 +++++ tools/firmware/hvmloader/util.h | 3 +++ 2 files changed, 8 insertions(+)