]> xenbits.xensource.com Git - people/sstabellini/xen-unstable.git/.git/commitdiff
x86/boot: Fix build dependenices for reloc.c
authorAndrew Cooper <andrew.cooper3@citrix.com>
Tue, 30 Jul 2019 16:40:33 +0000 (17:40 +0100)
committerAndrew Cooper <andrew.cooper3@citrix.com>
Wed, 31 Jul 2019 10:19:45 +0000 (11:19 +0100)
c/s 201f852eaf added start_info.h and kconfig.h to reloc.c, but only updated
start_info.h in RELOC_DEPS.

This causes reloc.c to not be regenerated when Kconfig changes.  It is most
noticeable when enabling CONFIG_PVH and finding the resulting binary crash
early with:

  (d9) (XEN)
  (d9) (XEN) ****************************************
  (d9) (XEN) Panic on CPU 0:
  (d9) (XEN) Magic value is wrong: c2c2c2c2
  (d9) (XEN) ****************************************
  (d9) (XEN)
  (d9) (XEN) Reboot in five seconds...
  (XEN) d9v0 Triple fault - invoking HVM shutdown action 1

Reported-by: Paul Durrant <paul.durrant@citrix.com>
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Roger Pau Monné <roger.pau@citrix.com>
xen/arch/x86/boot/Makefile

index e10388282f728bd5e45f3b73b07f5b52e91c2f5b..9b31bfcbfb8a5fa2242264b74fb2c8abf15ef61d 100644 (file)
@@ -4,7 +4,10 @@ DEFS_H_DEPS = defs.h $(BASEDIR)/include/xen/stdbool.h
 
 CMDLINE_DEPS = $(DEFS_H_DEPS) video.h
 
-RELOC_DEPS = $(DEFS_H_DEPS) $(BASEDIR)/include/xen/multiboot.h \
+RELOC_DEPS = $(DEFS_H_DEPS) \
+            $(BASEDIR)/include/generated/autoconf.h \
+            $(BASEDIR)/include/xen/kconfig.h \
+            $(BASEDIR)/include/xen/multiboot.h \
             $(BASEDIR)/include/xen/multiboot2.h \
             $(BASEDIR)/include/public/arch-x86/hvm/start_info.h