From patchwork Thu Mar 5 18:00:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 11422455 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 73681138D for ; Thu, 5 Mar 2020 18:01:52 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4D0E72072D for ; Thu, 5 Mar 2020 18:01:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="Dh+D8Xon" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4D0E72072D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=citrix.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1j9un8-0005u0-KD; Thu, 05 Mar 2020 18:00:14 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1j9un7-0005tv-B7 for xen-devel@lists.xenproject.org; Thu, 05 Mar 2020 18:00:13 +0000 X-Inumbo-ID: 28ce1cd2-5f0b-11ea-b52f-bc764e2007e4 Received: from esa5.hc3370-68.iphmx.com (unknown [216.71.155.168]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 28ce1cd2-5f0b-11ea-b52f-bc764e2007e4; Thu, 05 Mar 2020 18:00:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1583431212; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=at5R+bT2/hoFkIEcWYIA94JT/YJT3ubWaT6l3gJ/41s=; b=Dh+D8XonlJP1sDmYASw02ynjm6zGLaJIJks1ovDibPjd9sKyDzEONjd4 cRMi2ux9Q1EmBvmO6SKaiP08LEWdZnwAZreDxzo/qwuwvpoQwgE/vDSke 5xEGmkqLgLhIv3mvv9y5SPdeXIUb7kZ+1vc2mIscCfr3aqRYnVEM6YAc2 M=; Authentication-Results: esa5.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 (esa5.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=esa5.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="andrew.cooper3@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa5.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=esa5.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 ip4:168.245.78.127 ~all" Received-SPF: None (esa5.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=esa5.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: jAtseGSMT8ACRDUh8wP0wJWhSo5jiycZclk+EU46epWt4hhn88r+DZ5oP99zfEd79iHQmAkjtS wAQ0gKfk4Juh4OPBxnfSe8NzWPrEUyP2k77aTvhfkhIcCHMcM6CdOEj66cbEnJfobBHqZSIe/Q RRbw9XdjqNpxmJ6E4RoELXT8bmQw7g2UVi/8/7kQWfNqR3uHwgI94FnNdmglq2IUUbqr3p0p1S FwpmLLfFffEkX6jYuLxOVn6rk5it3Jpf9VbTOrcXbPqB/xeg9KRDgU73zhITX9lwh/3rAPFFiD 678= X-SBRS: 2.7 X-MesageID: 13825280 X-Ironport-Server: esa5.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.70,518,1574139600"; d="scan'208";a="13825280" From: Andrew Cooper To: Xen-devel Date: Thu, 5 Mar 2020 18:00:09 +0000 Message-ID: <20200305180009.11365-1-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Subject: [Xen-devel] [PATCH] x86/dom0: Fix build with clang 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 , Wei Liu , Jan Beulich , =?utf-8?q?Roger_Pau_Monn=C3=A9?= Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" find_memory() isn't marked as __init, so if it isn't fully inlined, it ends up tripping: Error: size of dom0_build.o:.text is 0x0c1 Fixes: 73b47eea21 "x86/dom0: improve PVH initrd and metadata placement" Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné --- CC: Jan Beulich CC: Wei Liu CC: Roger Pau Monné --- xen/arch/x86/hvm/dom0_build.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/dom0_build.c b/xen/arch/x86/hvm/dom0_build.c index c41504f22d..ee1d50acc6 100644 --- a/xen/arch/x86/hvm/dom0_build.c +++ b/xen/arch/x86/hvm/dom0_build.c @@ -490,8 +490,8 @@ static int __init pvh_populate_p2m(struct domain *d) #undef MB1_PAGES } -static paddr_t find_memory(const struct domain *d, const struct elf_binary *elf, - size_t size) +static paddr_t __init find_memory( + const struct domain *d, const struct elf_binary *elf, size_t size) { paddr_t kernel_start = (paddr_t)elf->dest_base & PAGE_MASK; paddr_t kernel_end = ROUNDUP((paddr_t)elf->dest_base + elf->dest_size,