From patchwork Wed Feb 24 14:58:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Roger_Pau_Monn=C3=A9?= X-Patchwork-Id: 12101999 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 44588C433E0 for ; Wed, 24 Feb 2021 14:59:27 +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 D7BFD64E4B for ; Wed, 24 Feb 2021 14:59:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D7BFD64E4B Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=citrix.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.89382.168302 (Exim 4.92) (envelope-from ) id 1lEvdF-0002yK-LZ; Wed, 24 Feb 2021 14:59:17 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 89382.168302; Wed, 24 Feb 2021 14:59:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lEvdF-0002yD-Ho; Wed, 24 Feb 2021 14:59:17 +0000 Received: by outflank-mailman (input) for mailman id 89382; Wed, 24 Feb 2021 14:59:16 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lEvdD-0002y6-Vh for xen-devel@lists.xenproject.org; Wed, 24 Feb 2021 14:59:16 +0000 Received: from esa4.hc3370-68.iphmx.com (unknown [216.71.155.144]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 7b2d3c2f-00d8-41b1-bd31-4e0502369d1f; Wed, 24 Feb 2021 14:59:14 +0000 (UTC) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 7b2d3c2f-00d8-41b1-bd31-4e0502369d1f DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1614178754; h=from:to:cc:subject:date:message-id: content-transfer-encoding:mime-version; bh=Rpf1znQVFPhTHcaRs7o+3m6cDCMZV93qNeHGwUR0YhE=; b=SrT/dV9edx9wjzv+h0aNX8QG6AN7TSVGr9uWiJ34AQeuu0wU0CAvdvkX 27d8Ui0QodsI/vMTM0xKVJ978zC7cRYZnYynjMe8ARcNgHLyBxHmyaoEl OLzdF46aI09JFpz7IlCH0zAmOfvXATWlcnzOIQLykaaYC9ag8e8k4rjfM A=; Authentication-Results: esa4.hc3370-68.iphmx.com; dkim=pass (signature verified) header.i=@citrix.onmicrosoft.com IronPort-SDR: s9UqbJCjIOkE1FarCBae5hZLghFEiMB/fN0KVFLT3B0TEzar2DsfULfCxgfM3Db5i90J1wyKzn n3+6P06iQ5wSifT9XJWRB6a8QCGhmFEAHHLOyATcJSrEoTKnMFtxQGvosGpEhmagPuXFMQoYz4 k8okRXAyT2PN+wghkEzwYZIxkrhhEbpIeIwcb/3e63fz/iteATY3nVQ7w6zMjFJXaPlyLzIkWo k1UL6HcNdpwqAuM21gVcDTGtZ7FxmeuYReimYRLjcQaeMq35wLhAxOyMTxfXOqppZYZn4ptXsS DIk= X-SBRS: 5.2 X-MesageID: 39319449 X-Ironport-Server: esa4.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.81,203,1610427600"; d="scan'208";a="39319449" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PhrWSopI9TxhxOdquol5Ln6Zs9ecjCSmlxmeeCzldOL0Qi/ImSOry/dCp7exD91C0WkQkz1w8c/oPsmEVSRAJKngEf8zHcj8bFqah753ozaKMjl3Ji4Tbn41qY5PAPQoTCWl52nNFgnowT4BYQJgAt2p9gk8kNmfJBKvrCz17eWv4jNHb+SanzVhN99y0knozp6mBxvvjCCpJ0WOymJbboChahwIykfTfSJK4waRl05ebJWGzZpq6sTFx0tg8em//cVRDEUNNNR41d4LAtY4Z3pjBp4yOrBOZOnqipSXFmvZY21Apknw7zK08hY7SBIhjPPItM84yASyITK7Q9S+pA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=HzE9BQN1GctUAEq5FuaqiEyjrg9KDf9htA4nHd5lHYs=; b=CkAo9os4Lr1Q0w/ZdHbWX02gk4W5st4Rv4Te1xg+TnPe51WFDve9V4flTx9tlCMUGuVLcF1VIP1A6xuKyLsSj0YexeL4hZ4TSFFLfZqTJEeXzLchBa2t6d+5c49wzhx9k9P+N3Qekhd8v/QTNm9wyY/ZFExFVAJt6Q5tnHtiwW3lKlxNBXS42YQJEauuwBBQ3ArTDCIHNz6Wb9FNmYs8yOGizIfs98oJzQgkWZG05LESbSwnHCa60SJoc9fmzk4rdOnG8vAuzaLrPAuNGxFotbqHcHPb5k+QFgWQ3UfFzQ31nYUzX1VDqIph38GVJ0ClHMqYHCd/c+yluMW3CZbDqQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.onmicrosoft.com; s=selector2-citrix-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=HzE9BQN1GctUAEq5FuaqiEyjrg9KDf9htA4nHd5lHYs=; b=Ptz2JIiM9fb6Yp6lL7a0UMsVaB4fwd3YaeZNVJ5A+0E+XlWH3cq1M7hP9mxPIWExZFN+A9B61dXtgyLl8pPctfClKbVeFileUQAFRAOzfXbI11jPglU1cZxikdv3RR9g1fsaomQMp62CTp2SuoxLZqKn28q19QdfUnajNJi1Kfk= From: Roger Pau Monne To: CC: Roger Pau Monne , Andrew Cooper , George Dunlap , Ian Jackson , Jan Beulich , Julien Grall , Stefano Stabellini , Wei Liu Subject: [PATCH for-4.15] elfstructs: add relocation defines for i386 Date: Wed, 24 Feb 2021 15:58:56 +0100 Message-ID: <20210224145856.94465-1-roger.pau@citrix.com> X-Mailer: git-send-email 2.30.1 X-ClientProxiedBy: MR2P264CA0145.FRAP264.PROD.OUTLOOK.COM (2603:10a6:501:1::8) To DS7PR03MB5608.namprd03.prod.outlook.com (2603:10b6:5:2c9::18) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 045db8d1-ec33-4d4c-27c4-08d8d8d4bec7 X-MS-TrafficTypeDiagnostic: DM6PR03MB5337: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2582; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4UtfiAF6jpTEEepSJwX4vwhXmWyNh6XfhBVAqIbqa2+OGIqh1Ayv3tpz+lXvLdBWNyjUAIgi2DsRzxehwpi9URxUncxe6edJ7t5FcF9JlDDY+Lt7dFmwzX/AxlTjOvE5wNX/TXm391bjwo0ETqYB+S5fUE4CcVTw01dNhT6n7APX2KzSdN40Igx063eNjx8tj7AtK+YmXdBRU+GTsZ+u3K+lsiQie1pHwKoyPXMMGy1voi44re6v+ZD68w+Cy29BhngMp5DAZh+Pmq+QCRK9bVdadGAZdwnDV1+OkBwblCpTuTYfQtgowTaePMvfCqjhK/T1tLgAS8pE0X2JvkcR9ZYQ9RvbBV7EtvCRlbuP+agoDI2r5EhvyTAoks13OJi3E2kPRNMeGAuwIWmZ7W+sgXrOsmOZaUCftg+ryAtBlac/phub8V5KnfXAR0+yZYQnJ+pGMAWX8UHUOoTvRjGJTXwtC06W/42Fl01PIv/RU5TbQ4OxtYL54qM5RjyT8iF5SpdngQElxFwBdTEvG3ctOA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS7PR03MB5608.namprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(376002)(136003)(346002)(39860400002)(396003)(366004)(66946007)(66556008)(36756003)(66476007)(26005)(186003)(16526019)(6916009)(2616005)(478600001)(956004)(6496006)(8936002)(8676002)(54906003)(5660300002)(86362001)(2906002)(6666004)(316002)(4326008)(6486002)(1076003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?utf-8?q?z2ON8WPaQa68uQSABBilQgIVDbQ20u?= =?utf-8?q?dtLPBrQT8ZHzPlH1DSxT/SoGhld4c0ELLhWhmXOkoUQEf7NzVXaAi4uUD/z8BI1MT?= =?utf-8?q?Tp3ifZh8wYb1UwzVtX8RasbNZ8il0EDMGAvv5E21C4nTklUVbeKd+DEQdF4O2/35f?= =?utf-8?q?kHr49JN8bxtxclly5F+fbaX7+R+2FCfCqcMKvbEpp92K947mjH9EZZxq7/dEldB5z?= =?utf-8?q?5uyaVQ2zeQKmy0kZGejCqFLsq4e7z6G47pD+ZUamiyDaujjvJlX8x/2wZqXzVVwOm?= =?utf-8?q?3eYDxNArBrnatoA1JXEgza4hncWbUMfqkSneW77ddVkm1aWFpJqmOs+o8BshqclAc?= =?utf-8?q?5aUN5xrizc19qLx8GOYKCOZSpPV4R32nyFRCRTFfcYZBY/YbTJ1xCYamvx+ifT1PS?= =?utf-8?q?C++zTb7z+lJ7ELsazZKqtAYvmbIFZAjEJk7e7vF5q/gRO6Na4dCamWGp8aIfidDNM?= =?utf-8?q?ImSXisfgMek+FF6MJV7SheR6v7RiAhCINkpMEr9oneIaWI4O1iSbulfYX88Oxq/A9?= =?utf-8?q?DySXWLnYhlBtcABbm3pNOc0X2mt1GUyZi5ud8XDSekFVBgOiDlq6Q43xgw65HTtUH?= =?utf-8?q?O551L2oTgk5noPtDr/PsEguqW2l//vPL6PPSrW4+1F3M49UnPNv2Wad7YokjmCAAK?= =?utf-8?q?Z2qs3x7vN7+HjRfXNEcYFPxAViOuylDSzrGDT6Bw94R+sfULGecYhDSWbY9l2MvDx?= =?utf-8?q?TVOWEwHG4xZYhYH1NhVMjFWeuY0AtpPt1GVxRiMcvymb4tR5/MqII8O05ZrQYUlt5?= =?utf-8?q?9BHG9bi0NccDqqGDIScGJ9skTqKgqPHUa9nLO/JTOarrDMyZGhPnjaVdvb/aWxKCj?= =?utf-8?q?Ch1DfoJ5ghmQ/OnzpI9lzFqbFlcu0/hWibWSpNDbINJIUK5lrH/ISqZG/54Ug5Uxm?= =?utf-8?q?+PrcOWg5SpAsnea67vaL+QPW3yG90CPdNtuZjx3eJ4ytzqzgcWwbv2NbOhYWpVSTU?= =?utf-8?q?WIkEVwuveDHryym4k85mMt1Cx3lioZ9FiRbqeABoS9vtPqcqgnO9L/G7BaMRGGkNu?= =?utf-8?q?4wmX1YagYywv7fmGG++E3q9ph5hzjJTXTjb5gCu1diao6MYmljRnbLZn4Eiv+AHu4?= =?utf-8?q?xNUC2xb/LUA9WiZo9z9HZSGyLvKgjOoKit2vl+7kEghNnaWgtrzaFvxC8OzB3ayFx?= =?utf-8?q?PnaY0wvqkX7Ce5vQyEyj7VdgXguQHzTREJJcv0sx3EJMehYZS9upJh2xio5YjcV6E?= =?utf-8?q?1HDy7Ero9vHYbvEpRb++gHh5afdYomliAN9cyEG6I6PRjkBZy4wUiyIUQdHU8Q2j9?= =?utf-8?q?uJaoYwg0vGxDIfLp7VRVF/znfrZxQG3NDf+A=3D=3D?= X-MS-Exchange-CrossTenant-Network-Message-Id: 045db8d1-ec33-4d4c-27c4-08d8d8d4bec7 X-MS-Exchange-CrossTenant-AuthSource: DS7PR03MB5608.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Feb 2021 14:59:12.0644 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 335836de-42ef-43a2-b145-348c2ee9ca5b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: GAk/dqxPTpIaPYWxIqBnhzNpVkOKQEab4USmAzqJ/o7uYZAD1xkMIYNyqNd25UCCkYEP+VMqPKQiZprPwvddpg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR03MB5337 X-OriginatorOrg: citrix.com Those are need by the rombios relocation code in hvmloader. Fixes the following build error: 32bitbios_support.c: In function 'relocate_32bitbios': 32bitbios_support.c:130:18: error: 'R_386_PC32' undeclared (first use in this function); did you mean 'R_X86_64_PC32'? case R_386_PC32: ^~~~~~~~~~ R_X86_64_PC32 32bitbios_support.c:130:18: note: each undeclared identifier is reported only once for each function it appears in 32bitbios_support.c:134:18: error: 'R_386_32' undeclared (first use in this function) case R_386_32: ^~~~~~~~ Only add the two defines that are actually used, which seems to match what we do for amd64. Fixes: 81b2b328a26c1b ('hvmloader: use Xen private header for elf structs') Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/include/xen/elfstructs.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xen/include/xen/elfstructs.h b/xen/include/xen/elfstructs.h index 726ca8f60d..d1054ae380 100644 --- a/xen/include/xen/elfstructs.h +++ b/xen/include/xen/elfstructs.h @@ -348,6 +348,9 @@ typedef struct { #define ELF32_R_TYPE(i) ((unsigned char) (i)) #define ELF32_R_INFO(s,t) (((s) << 8) + (unsigned char)(t)) +#define R_386_32 1 /* Direct 32 bit */ +#define R_386_PC32 2 /* PC relative 32 bit */ + typedef struct { Elf64_Addr r_offset; /* where to do it */ Elf64_Xword r_info; /* index & type of relocation */