From patchwork Tue Jul 30 17:07:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 11066237 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 227B2112C for ; Tue, 30 Jul 2019 17:09:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0D2BB204FF for ; Tue, 30 Jul 2019 17:09:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 00AA2219AC; Tue, 30 Jul 2019 17:09:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8DAF5204FF for ; Tue, 30 Jul 2019 17:09:53 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hsVbU-0005pM-8K; Tue, 30 Jul 2019 17:08:00 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hsVbT-0005pD-25 for xen-devel@lists.xenproject.org; Tue, 30 Jul 2019 17:07:59 +0000 X-Inumbo-ID: 93f61b1d-b2ec-11e9-8980-bc764e045a96 Received: from esa2.hc3370-68.iphmx.com (unknown [216.71.145.153]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id 93f61b1d-b2ec-11e9-8980-bc764e045a96; Tue, 30 Jul 2019 17:07:58 +0000 (UTC) Authentication-Results: esa2.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=andrew.cooper3@citrix.com; spf=Pass smtp.mailfrom=Andrew.Cooper3@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: None (esa2.hc3370-68.iphmx.com: no sender authenticity information available from domain of andrew.cooper3@citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa2.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="andrew.cooper3@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa2.hc3370-68.iphmx.com: domain of Andrew.Cooper3@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa2.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="Andrew.Cooper3@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ~all" Received-SPF: None (esa2.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa2.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: Eu9lTdh8oL8sgPwZ5t1tg0a3YEcqBKTlwcdtXUC2JcpdAztkumz55e74YFevu4Nhqhjz8WwJ0m YJinNJLi1u7rReSyuUmEgQIDQwl+XqxhZIFFmu65A1syXAYlT6MG7UN+iH9bHoNTieB7lh6hN6 6ACfuJ1Ed7R8seU/DOFqOeN2k5qsNMbI05AOnJPke0i8F1wS5ZzjMOFOMI8PFIzR19VU8xlwkh +1DklWRw1lBqjxH5IGx8aS/eJy1Oy7L2FoaRAPMT7xT1pOt0Jyh6T1TGMZbhofvfv3KOPQ6EUg 9Ys= X-SBRS: 2.7 X-MesageID: 3626812 X-Ironport-Server: esa2.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.64,327,1559534400"; d="scan'208";a="3626812" From: Andrew Cooper To: Xen-devel Date: Tue, 30 Jul 2019 18:07:54 +0100 Message-ID: <20190730170754.31389-1-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Subject: [Xen-devel] [PATCH] x86/boot: Fix build dependenices for reloc.c X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Andrew Cooper , Paul Durrant , Wei Liu , Jan Beulich , =?utf-8?q?Roger_Pau_Monn=C3=A9?= Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné Reviewed-by: Roger Pau Monné Acked-by: Jan Beulich --- CC: Jan Beulich CC: Wei Liu CC: Roger Pau Monné CC: Paul Durrant --- xen/arch/x86/boot/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/boot/Makefile b/xen/arch/x86/boot/Makefile index e10388282f..9b31bfcbfb 100644 --- a/xen/arch/x86/boot/Makefile +++ b/xen/arch/x86/boot/Makefile @@ -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