From patchwork Wed Feb 24 10:26:40 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: 12101655 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 EAE24C433E0 for ; Wed, 24 Feb 2021 10:27:32 +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 951E360241 for ; Wed, 24 Feb 2021 10:27:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 951E360241 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.89241.167946 (Exim 4.92) (envelope-from ) id 1lErO8-0007y3-AL; Wed, 24 Feb 2021 10:27:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 89241.167946; Wed, 24 Feb 2021 10:27:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lErO8-0007xw-6D; Wed, 24 Feb 2021 10:27:24 +0000 Received: by outflank-mailman (input) for mailman id 89241; Wed, 24 Feb 2021 10:27:22 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lErO6-0007xN-Bb for xen-devel@lists.xenproject.org; Wed, 24 Feb 2021 10:27:22 +0000 Received: from esa5.hc3370-68.iphmx.com (unknown [216.71.155.168]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 1c976331-fc60-4e30-b204-3cd549bf1bf8; Wed, 24 Feb 2021 10:27:21 +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: 1c976331-fc60-4e30-b204-3cd549bf1bf8 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1614162441; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=ihxhCmXP17iiV9w9AMaj2ft3L4iKQTPi1IbcOE4CM58=; b=FDxqu+FLmFLHAlFukfaalbylwpCcKaKkW8R1sfN5xpCXMY1T1NKmLc8V 3WW4Zp4zHbT7g6no/YfprFKR/L5vxOaJsk2X+3IeJvvNV2UIWIb4X7fBR ZVefBX5tBVYp0p7o5LojfNkLXZP8ycXV2JE5S50rYsUFVpd/tJnizYgYJ A=; Authentication-Results: esa5.hc3370-68.iphmx.com; dkim=pass (signature verified) header.i=@citrix.onmicrosoft.com IronPort-SDR: oV4/Ida21fjXwEnr1BVP3xImANUPJaCuQLoPiNWByyYoeUrCBmSEBYTsuROGV/rhOdxUR9ph2t njHtaFKRTfkBs0VsYIPthlqcTGN2N5bAGhNo/8S/++xdhJ2eG3Orqqzqx350L1+SI7unM6enHS PHiCp3SdISlrqIIlg4RjEKYnCOCNwHL0GvbKW2CgPsZU+NLadz5m09PJuboXvNxWqijlN1CkQy C1QD7tbrj2B6FgXf10yHvBRLGAVsbBTL0AqG/A/E7Q9oIQwEDfGjJW/NrrTQddbzRigRpOKWwR 1BU= X-SBRS: 5.2 X-MesageID: 37836429 X-Ironport-Server: esa5.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.81,202,1610427600"; d="scan'208";a="37836429" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bBL8+N20iZupBSdToCgC3gquntq4zsP+OGK6+x/tEh59jzkiX0rxInNcMSKgIPOgPzkbI7v9OSVQ+fYiFhGoYz2wHWTS/Ogx+YdwOrDyCH/vYPH2+kazZ5ti7VwDdKGLtKS9Ma0gfdSQtIB8vOE8FH5Rw8L8C9cew0+5dAWvN4K0vX9X9VSmSUAUhwcY0XjpOLfwichTieYit2Cy/p1MSUveJoOHnlLf8HGSgUiM9CKcKX8aF8fXWbT2fuifhusGRDAF+Hv5D7HdXvwTTzinE3yoB8V74kw0K65TwnwAxJyFSRWsLYG/J2ECeEj9f5Vj5BgOZAKoZD8ewG7JXetIpw== 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=J9KAlhoh5CiX9e/mbxtnN8i1nfHbreHNEtSEGhRcJjw=; b=YEA7xs1+JrRvuyXIKyRgytQvoeg5V3lchfgJB9MuYqikwBN0gjnxLJPTdYEoMcCymSA7zP+YJXmcNuL3TYVcY7RhHvU6SO3HO2GrNNQMWQBVttCjpmbxnP6sJ2i14ghQ9YBlbGVjRNipmrsUe13fehbiOAWKwduWm/H0zxpwAp3Qu7v6k5WhLWVlsgKw0RqAKFaA8EJ2J1/DOH/99rY136RazVIUf0u4RGba3VQePIbAirWxhS6DNNy6L3IN+hqK5yJCgl21RcRG9pPQndS7Xhso77j5D5p3dmmPnYsk9Nypj++JuGBR5s05uy6Q8fNfXpxmlMo3kmsKlDCwI9b+JQ== 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=J9KAlhoh5CiX9e/mbxtnN8i1nfHbreHNEtSEGhRcJjw=; b=smsWpfhxuCUeI8O2Aouq0BSNEmeVBT9RB3RJAZqQ+ja+FqFprQRvRepR+yLTeYQcLMqCTCCNTh3kaFCj0TEBBUgKfd9v4tSxc41weo62QXMeH3dlIl0CaLOFNg5cpZn5i6f8XW7MCmGrt6ql+tTnTXYhRfKSMo6RlwV0Z0pOv7A= From: Roger Pau Monne To: CC: Roger Pau Monne , Jan Beulich , Andrew Cooper , Wei Liu , Ian Jackson Subject: [PATCH 1/2] hvmloader: use Xen private header for elf structs Date: Wed, 24 Feb 2021 11:26:40 +0100 Message-ID: <20210224102641.89455-2-roger.pau@citrix.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210224102641.89455-1-roger.pau@citrix.com> References: <20210224102641.89455-1-roger.pau@citrix.com> X-ClientProxiedBy: MR2P264CA0143.FRAP264.PROD.OUTLOOK.COM (2603:10a6:500:30::35) 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: 1a70d12e-6fba-4841-2b56-08d8d8aec2ec X-MS-TrafficTypeDiagnostic: DM6PR03MB3481: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:913; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: byCcV/W37FVBQLbYx+dvKXqSsQH2rbPFvhe3ZL7oujBua52m/MKIEAcBZaGvnLy6MGGZiv+ROb0zrm6PjZyFw8DUt5EENxWx8IZBn46LbeCE1/L7kp8yKTCBZEljbd07H9SqP4s2knrdB5m2L+kZpCFPKONN7XZIkzI2sSTul/L2YpWuzv9dv4xZpD43BkY8ts3IC5Zp+ildn7ttSITHJ3CbwkQUhmYT0reshbDColyk2gihw8bsWyuPLsE4kA1sZbsTxpziNLClmWQy5OCEpdGaWDwbtzMDi1jEuYrAdhTDQiwsC5QUaz3l3UoicrHZ49/6FoDY6oV1LeahSNNA8Ko8iDALEQKj8To4NdI/Sgv4jbvdQ0y9Gg/4DddQrWtfYQAU7yHZS+qX/3FTIWTy7fy7iGP9y9olWTQzLCbM6IZh6uDwrsJd0Dl1bWKQK9aQTwK6zyTuPzUQSBxdzqoqkDm+CURQTGY30C3/ofHBDLc63Jny6rnxqY6rnC6sKOp7bbYPNI3hXnzsG+sJxWRKWQ== 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)(396003)(39860400002)(346002)(376002)(366004)(136003)(83380400001)(316002)(6496006)(1076003)(4744005)(86362001)(6666004)(26005)(8936002)(8676002)(5660300002)(6486002)(54906003)(478600001)(2616005)(956004)(2906002)(66946007)(6916009)(16526019)(66476007)(36756003)(4326008)(66556008)(186003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?utf-8?q?9hC+3PVQY+C2fUQlFWZvU20vHFOY3x?= =?utf-8?q?vvUEdGYj8veP0foxp/0JRQG243WYsgshprOsDA+DsioBZ0+p7pQsed/DdCvEX4rkW?= =?utf-8?q?ySrpGIAvOZIcQhqprrn3fnEECs/LmIgVSwIP4kirBRktlrpAkVJhPKAzGE4SBONgL?= =?utf-8?q?ah6TkAYEzJX84gdg7pjNNwoWalIoTGgiY4Tx9/c/kc+J6BFLG8K1h/JU7rUAjfIfx?= =?utf-8?q?iXVXiqJFMpC7J+JU9ELoxzz2pSeaKwzo2FF9TPzWW/ENK5+0RNJrp7XtzADDvST0Z?= =?utf-8?q?OjTX5B8JYOV20hE1IHzmUNCSwtxBN9ZheN/WAvxHi70aRxEGTl0iu+I+xi9MqHsYP?= =?utf-8?q?g8WLmP6N74PKaq2FGemvUqjAQGR3X/1LizI7dngZZbsgVqI4xapHu5iBaUFHLVM5q?= =?utf-8?q?SWxyPBn8kg82oA/s93LUmRD0y50gjEHqsvjRSzWymLKDv3aELzVaCfGpwGWbFjOIe?= =?utf-8?q?A5zQg0+XOgUHUfGqLkm3Ammq/NH4YTs5leafdzaA8jJFxgfr8Hv90ji7MxPjJx+7t?= =?utf-8?q?p6GqmocWrL2Bz3fZY1HdSCrZ1XO28ZFPVeMatDC66pW2ooR3Ixc/zF7IZeuUbpe1M?= =?utf-8?q?3yW6pAyWHdzMrzv+qLSx9NveMfh67ONXrjjoI1TKnF2p48b/ebRwIeCWhXkfJlw5k?= =?utf-8?q?QfxFm4o6KHwmv8TOGfSUct20y8rcmKC/7gCqdrW7p7j5zFxlVHvcAhsx2Of3ASj0k?= =?utf-8?q?yTlM9JnDZtAzhwX9MDY1e36BlrDLJeLTq2DJHM6nD94qT3ri93E8lywkNJnvt3H7K?= =?utf-8?q?zO0hXYN/D4RE3PqWRGVyDPg+gs4E6Qg4JIfOBhWGeMBO6vHFYyr+S00Lhz0zcAOF6?= =?utf-8?q?7Cn2K7sO2w5LZKuliaUTUeM3UPOF27igu7wye/38nlNJKz2aeOjgMDPrNR7kgk1XC?= =?utf-8?q?a87vlL0QWWWUbIsu3rFEr7XKWpq0nsGtGQqLB3MAKjz9qVX+2qp0am7Hhc3B5BFwN?= =?utf-8?q?iXknjOY38OSjamNaUP7bdSrhLLUvd7EXra5DDvAwyeijPQYZDdMqnX3KRNmp/7l7d?= =?utf-8?q?sAOb0qBB1pnCclpZC8RwULe6dEetRPXqE9iy60K2PGcc0gGbSLLlLouf4QTvgWGUh?= =?utf-8?q?QNGlbdmFEAmA3dGWaQ9jd31kp1doz+OhzUpR9tR0jU5jgWJiTcECrnLmLoOO8buYt?= =?utf-8?q?ZltMysUPc8rNEl400ouf8vN5mhOFQc5aeKgaSdb/CAp1faOx4aPuu7tkANeVRvRMP?= =?utf-8?q?TzxoR6XCGQxpCWvWqWZozZcwUcS26WyZ50FnIO00r8WuP1NMAU8PjECP8Sc7T2ykM?= =?utf-8?q?XLfp5OS76Jed7qa9zNQWkJ0Jle9fKEobJCsQ=3D=3D?= X-MS-Exchange-CrossTenant-Network-Message-Id: 1a70d12e-6fba-4841-2b56-08d8d8aec2ec X-MS-Exchange-CrossTenant-AuthSource: DS7PR03MB5608.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Feb 2021 10:27:18.0236 (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: oMLkbyDIu417uHg6z13uLiHKdXagB+B/tbuQPvGy8XIkpckMmyT06ZBm1wHVeH5zpib32rKOj+2CrnVO6ZxVZw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR03MB3481 X-OriginatorOrg: citrix.com Do not use the system provided elf.h, and instead use elfstructs.h from libelf. Signed-off-by: Roger Pau Monné Acked-by: Jan Beulich --- tools/firmware/hvmloader/32bitbios_support.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/firmware/hvmloader/32bitbios_support.c b/tools/firmware/hvmloader/32bitbios_support.c index 114135022e..e726946a7b 100644 --- a/tools/firmware/hvmloader/32bitbios_support.c +++ b/tools/firmware/hvmloader/32bitbios_support.c @@ -21,7 +21,7 @@ */ #include -#include +#include #ifdef __sun__ #include #endif From patchwork Wed Feb 24 10:26:41 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: 12101657 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 21CAFC433E0 for ; Wed, 24 Feb 2021 10:27:41 +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 A373F60241 for ; Wed, 24 Feb 2021 10:27:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A373F60241 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.89242.167958 (Exim 4.92) (envelope-from ) id 1lErOE-00081u-JU; Wed, 24 Feb 2021 10:27:30 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 89242.167958; Wed, 24 Feb 2021 10:27:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lErOE-00081l-Fd; Wed, 24 Feb 2021 10:27:30 +0000 Received: by outflank-mailman (input) for mailman id 89242; Wed, 24 Feb 2021 10:27:29 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lErOD-000815-Bg for xen-devel@lists.xenproject.org; Wed, 24 Feb 2021 10:27:29 +0000 Received: from esa5.hc3370-68.iphmx.com (unknown [216.71.155.168]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id a452f7d3-735c-48d1-8ee4-73ff64d6ad5e; Wed, 24 Feb 2021 10:27:28 +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: a452f7d3-735c-48d1-8ee4-73ff64d6ad5e DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1614162448; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=gt/9qJPpfd+Nj2qzhIwzlRauIGrZSQbZDuCtyyUly+w=; b=Wg5ATzqEkQcprUt4sgm4O7mmCSjoAoTXa3RNHtWFON57uciq1N4IiwPv 6vUdWcPvM6wusyXbIbvCipgQfY517OfyGpTUAmaV8kc2a0bjkQaChKQe0 BMzITPmIu+dlDOFw6Blqzj8CE+4H6O7p3OV7/zYHnnFwjMBor41CKQuzu 0=; Authentication-Results: esa5.hc3370-68.iphmx.com; dkim=pass (signature verified) header.i=@citrix.onmicrosoft.com IronPort-SDR: /vncOgBxjZJ3mxkJF5wDc4oCoDxhBISWg1v6BFsZQmxhpFEJH1t2iXWr47uWrI7k/n37riAj9y 62MzIG4mK5jEddphgpUEw7ddwH2Zu0oUSgoBLibYv+ygrCLNtX0jR45K7wdr9SI5rwoBCRD8TD W6JBwLZM+wed8RvOxcMHcVaT7A7VrsESgG4bZfnz2G2Hf5BLfuQbXS8coSzFMkTrCJvOeIH51N iIQjwk9CVLdHnADv48Mhg4+/LG7TcgybO43Mt0F2DhKAWVLqjY3f1hUiKdfnQo16+UcioxrhgQ e+s= X-SBRS: 5.2 X-MesageID: 37836438 X-Ironport-Server: esa5.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.81,202,1610427600"; d="scan'208";a="37836438" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=i9dPDgWZz3qu/FCOZZpRUK6DbY/kshW2QyJgJW6XfKHudiN70NKtydNAPfG/fzkH86v1tewj0SbW4UdNusVfjIY3LoCkYgBasR0aIzH9EGadcOMNAmURxr1vBDPRKcCI9llEqI+jpiJ8jEJVUyK38nNc8yCahyHhiYdZPkv0IsW7r1FZf7rBECE1r5RjQY9H+GqSCM0ybwtUjgnc7HnwlObN5OjYH8RG21l08XgLJykPEGn0xQjpLCG3L86DIgPxBmvUZit5/HHHuYoAVKWRLLw2vYD0bBhEx0ywawHxfJQ0JdGuZJe4v5k8v6hJwMk9BjcWbMETr5ssUxgoJ86WtQ== 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=VKK48ldDFyTZ4nizItvT0SdssDedMC6C9cFvsgN2uNY=; b=VqGpN+qr58ZV8+odDlR3/NjFuJuq7A80Rg/TVaGDcekBSQJnVykZQwogLoa3g0PR5zg8iPG7K1IfvMiOUPckdotZ6bOmoI5BjTWLzVLYlPjlAvxVonT98nzFHvJVZOuwpgdzkJ78x9FYjbb+MdSAwMSCYhaQ28VEymy+rUoFexTJJTPaOQLb3iheRwBqurebYLyeGldey/ZVu/blhlD35wQ8SAua1v1r3DeiUO3lBnw4uit7QfdDdZxLjFTlExnd3ow8QUytiiuw/v++Rvp4mdL/C0LpjWS0aeaSGRRIOS6KFoV9BD+DXfMTp9NuKXtt1l90xGVo6tTcXsvSmbD5iw== 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=VKK48ldDFyTZ4nizItvT0SdssDedMC6C9cFvsgN2uNY=; b=hs7lzedNjIJqX+DH8a5D1cEuu7lcH7Ziitip04d1ckMCE7vCjg3FJI+aGVZY36f+fsL9b8mU5dudYmpukGOUUZddZb/KFj3/cbnjiBE9enhQB23IgGiAp40aMYVX+EVatQEECceududNRZXgLMQETrDstVur5Y/t/Hbx7giNwso= From: Roger Pau Monne To: CC: Roger Pau Monne , Jan Beulich , Andrew Cooper , Wei Liu , Ian Jackson Subject: [PATCH 2/2] hvmloader: do not include system headers for type declarations Date: Wed, 24 Feb 2021 11:26:41 +0100 Message-ID: <20210224102641.89455-3-roger.pau@citrix.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210224102641.89455-1-roger.pau@citrix.com> References: <20210224102641.89455-1-roger.pau@citrix.com> X-ClientProxiedBy: MR2P264CA0086.FRAP264.PROD.OUTLOOK.COM (2603:10a6:500:32::26) 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: 70b3d478-8a79-4c21-2925-08d8d8aec64a X-MS-TrafficTypeDiagnostic: DM6PR03MB3481: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: F/dvgrk/5ZveMsj36jR6vJoWkHdA0PzLPMZ6Uyo7WXacCiOv3QsTalij0vZ3/+8zqM05zSpOPYW7e8wQoMGaD1B/GISoIe5zeQZKbeW5JQDrBQOIg7PgFguNLDpGSGfTFPLy9Li4yIKmyhUOIJLqRHUTyjJckITxknMQ5/wjfVRd9gmyBvkK0MV9BshL5gadeqXkjvAsnk3D46V9PhgA3JSaI3bPQ4WVIvBMTi2xypeB/9il1MIbLTiRpQ+ZPnurH1hYDmJmFE87qEUKnHdFKFs3L7aXrvg8K9N/kSWsy/wQ1cvBbFcjp7dYf5Gcv3Gg2bH5Y+GBuuU7lcWPgL+5IttAFfyJGktyRuE6aVdmsuW2HUbP/jIsASSXJqgNu32oBsy4ZWEYR8tKhtuR6uzr1haYjwFgMS7E8r1DKPmdQOIV/u9FpRJy08Y9824sLf05jQzksmxKxHTxBvELO1GX/giXkYsBEsN0C42aNoKYmgRWfV1gOcudw7Fz442BlQ3KrP1kO8BlBlzI+Swh24YV7Mxfte6JxCR54axYWPAALomc9PeoBKRjWMCOPUhXH98ZNVAdQwvoiWSxI6SQpuZyqUIjuN4ZAHkO91xSoInsMjQ= 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)(396003)(39860400002)(346002)(376002)(366004)(136003)(83380400001)(316002)(6496006)(1076003)(86362001)(6666004)(26005)(8936002)(8676002)(5660300002)(6486002)(54906003)(478600001)(2616005)(956004)(2906002)(66946007)(6916009)(16526019)(66476007)(36756003)(4326008)(66556008)(186003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?utf-8?q?wLvKkmvxIUjF5negfcdQMF+Eko9QAE?= =?utf-8?q?5naPerx5z+Y2z08xbyLb7qWv1xkWIpZOMUs/TJjQ3Dj4wfFS+CJIeorYXPOW6i9bu?= =?utf-8?q?r/p/cG//stLKJFc4w0cXw5QRulFhIaT72wca7lPI/FQfPJqMsnOHwdTrEA2o3YMn3?= =?utf-8?q?y08JY/+7q7teQq5WqRWuiKVU+fAMUFU5zpPwVzTHw4DO55mcJ+G0wMTdlenxH2U5z?= =?utf-8?q?/rpHPib3LyaJKtS/awg/MR9locu5Vc6hqsZCqFqksZt654gQa6Z21eFZyOCI7v9CF?= =?utf-8?q?I7widZG/8mVx2I81KvYf2UZaVXyx678AKnfw0mIGtcUdMAZVvrcJvBRofh9UkqLIK?= =?utf-8?q?C28HtpsJUI6JDV1vPU4RKqmNo9P6HEteJKDVbA8g43IEML0KAo0EFgUTyxKX1dF8V?= =?utf-8?q?rfT4cyUOus6Fl5O69X8tWYpQmO7YzuSGGyt+5jiLZlmeJLz/ezsNruFv9wm89JLIs?= =?utf-8?q?bWLgjyadK/OvqqbuZSDdPwWqaU+y76YhviMnSwB85vrMKHgWdH/SYqeUGcrG5ybZS?= =?utf-8?q?R1sohrARC2p/FK0oA11XoYOZk/0hDGJWBezEpZ/CxAZYhMWSVWHpC1/6uKWbNvl9C?= =?utf-8?q?rCUpiwK0xJX//d+fuZj58eDaDnxo/NtSmC6Bm0tkkNc2wrR5+ZE2WNZbKJUBnF8T5?= =?utf-8?q?e5QrMzOb3Re9NetNkM7fhvhcxOPFsggYjtqFwzEGF0N8qFHxP9gp/xt7u0qoMaX9X?= =?utf-8?q?iQttx+OA0S3Qaq2F95RxLFbbVPWbtgbQUBBLOuI7s4Ojam0lT+J9up5n5SZkzD/70?= =?utf-8?q?bjIvM1O/GBDvXSY8Ca+Tp9BlyQP0tIwYNao6nQkftkxWfuPAWupSYarjomMD+7JdS?= =?utf-8?q?z8OhnT2V4F0ayBdN2VM6HElWAEaJaBLbqw/+ToQtiav0Yg0S9uP3Iuwxk72kaLEsh?= =?utf-8?q?Z3O8Yblc4dWe9iuPmf8sXMBDiaOn8Obtcnb5T0wQTK736Wle5BWzCH/X7oqW57naR?= =?utf-8?q?86ZgutBPYj4R0igf3Xd9RnViwhnX0YmWZAd4ZnVcFUr9zPm3i3HYDS9TgMbbL017V?= =?utf-8?q?WOAMEEcVr5y3QM9ACZl92Bz+PcF1FDrKusqbcCI66366LUbQDkxUMav/PpgDVr+3H?= =?utf-8?q?ZFvs2C9z5CYGC/vSYvlWJXoq4t2RATg7O9gSGJx+nmiY62BDJrMji3OSruiACFlec?= =?utf-8?q?8GrZhnWzDiwQwEI5jDbeiG38uLQIRKM49FCWIsITYvsLWIlWppZracRWbvk9IoHoN?= =?utf-8?q?FXFOl+TjEFLymoCCSvpLVefm/qeZmMv1KtzD1XItVtoWnOhmrFEZXMwRIakAbDJvc?= =?utf-8?q?R9ENzNSWkYdExpgxYdeTQZbQgNLagw4M4Spg=3D=3D?= X-MS-Exchange-CrossTenant-Network-Message-Id: 70b3d478-8a79-4c21-2925-08d8d8aec64a X-MS-Exchange-CrossTenant-AuthSource: DS7PR03MB5608.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Feb 2021 10:27:23.7016 (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: A6qO8/NbA323Zzf+AjsVS9D/vu4YbO1Efv935iYtubOTDP+9ifuNaLEtsf1FWgVoUZHaEpM/NujVstd0wYemFw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR03MB3481 X-OriginatorOrg: citrix.com Instead create a private types.h header that contains the set of types that are required by hvmloader. Replace include occurrences of std* headers with type.h. Note that including types.h directly is not required in util.c because it already includes util.h which in turn includes the newly created types.h. Signed-off-by: Roger Pau Monné --- tools/firmware/hvmloader/32bitbios_support.c | 2 +- tools/firmware/hvmloader/config.h | 3 +- tools/firmware/hvmloader/hypercall.h | 2 +- tools/firmware/hvmloader/mp_tables.c | 2 +- tools/firmware/hvmloader/option_rom.h | 2 +- tools/firmware/hvmloader/pir_types.h | 2 +- tools/firmware/hvmloader/smbios.c | 2 +- tools/firmware/hvmloader/smbios_types.h | 2 +- tools/firmware/hvmloader/types.h | 47 ++++++++++++++++++++ tools/firmware/hvmloader/util.c | 1 - tools/firmware/hvmloader/util.h | 5 +-- 11 files changed, 56 insertions(+), 14 deletions(-) create mode 100644 tools/firmware/hvmloader/types.h diff --git a/tools/firmware/hvmloader/32bitbios_support.c b/tools/firmware/hvmloader/32bitbios_support.c index e726946a7b..32b5c4c4ad 100644 --- a/tools/firmware/hvmloader/32bitbios_support.c +++ b/tools/firmware/hvmloader/32bitbios_support.c @@ -20,7 +20,7 @@ * this program; If not, see . */ -#include +#include "types.h" #include #ifdef __sun__ #include diff --git a/tools/firmware/hvmloader/config.h b/tools/firmware/hvmloader/config.h index 844120bc87..510d5b5c79 100644 --- a/tools/firmware/hvmloader/config.h +++ b/tools/firmware/hvmloader/config.h @@ -1,8 +1,7 @@ #ifndef __HVMLOADER_CONFIG_H__ #define __HVMLOADER_CONFIG_H__ -#include -#include +#include "types.h" enum virtual_vga { VGA_none, VGA_std, VGA_cirrus, VGA_pt }; extern enum virtual_vga virtual_vga; diff --git a/tools/firmware/hvmloader/hypercall.h b/tools/firmware/hvmloader/hypercall.h index 5368c30720..788f699565 100644 --- a/tools/firmware/hvmloader/hypercall.h +++ b/tools/firmware/hvmloader/hypercall.h @@ -31,7 +31,7 @@ #ifndef __HVMLOADER_HYPERCALL_H__ #define __HVMLOADER_HYPERCALL_H__ -#include +#include "types.h" #include #include "config.h" diff --git a/tools/firmware/hvmloader/mp_tables.c b/tools/firmware/hvmloader/mp_tables.c index d207ecbf00..76790a9a1e 100644 --- a/tools/firmware/hvmloader/mp_tables.c +++ b/tools/firmware/hvmloader/mp_tables.c @@ -27,7 +27,7 @@ * this program; If not, see . */ -#include +#include "types.h" #include "config.h" /* number of non-processor MP table entries */ diff --git a/tools/firmware/hvmloader/option_rom.h b/tools/firmware/hvmloader/option_rom.h index 0fefe0812a..7988aa29ec 100644 --- a/tools/firmware/hvmloader/option_rom.h +++ b/tools/firmware/hvmloader/option_rom.h @@ -1,7 +1,7 @@ #ifndef __HVMLOADER_OPTION_ROM_H__ #define __HVMLOADER_OPTION_ROM_H__ -#include +#include "types.h" struct option_rom_header { uint8_t signature[2]; /* "\x55\xaa" */ diff --git a/tools/firmware/hvmloader/pir_types.h b/tools/firmware/hvmloader/pir_types.h index 9f9259c2e1..9efcdcf94b 100644 --- a/tools/firmware/hvmloader/pir_types.h +++ b/tools/firmware/hvmloader/pir_types.h @@ -23,7 +23,7 @@ #ifndef PIR_TYPES_H #define PIR_TYPES_H -#include +#include "types.h" #define NR_PIR_SLOTS 6 diff --git a/tools/firmware/hvmloader/smbios.c b/tools/firmware/hvmloader/smbios.c index 97a054e9e3..5821c85c30 100644 --- a/tools/firmware/hvmloader/smbios.c +++ b/tools/firmware/hvmloader/smbios.c @@ -19,7 +19,7 @@ * Authors: Andrew D. Ball */ -#include +#include "types.h" #include #include #include "smbios_types.h" diff --git a/tools/firmware/hvmloader/smbios_types.h b/tools/firmware/hvmloader/smbios_types.h index 7c648ece71..439c3fb247 100644 --- a/tools/firmware/hvmloader/smbios_types.h +++ b/tools/firmware/hvmloader/smbios_types.h @@ -25,7 +25,7 @@ #ifndef SMBIOS_TYPES_H #define SMBIOS_TYPES_H -#include +#include "types.h" /* SMBIOS entry point -- must be written to a 16-bit aligned address between 0xf0000 and 0xfffff. diff --git a/tools/firmware/hvmloader/types.h b/tools/firmware/hvmloader/types.h new file mode 100644 index 0000000000..3d765f2c60 --- /dev/null +++ b/tools/firmware/hvmloader/types.h @@ -0,0 +1,47 @@ +#ifndef _HVMLOADER_TYPES_H_ +#define _HVMLOADER_TYPES_H_ + +typedef unsigned char uint8_t; +typedef signed char int8_t; + +typedef unsigned short uint16_t; +typedef signed short int16_t; + +typedef unsigned int uint32_t; +typedef signed int int32_t; + +typedef unsigned long long uint64_t; +typedef signed long long int64_t; + +#define INT8_MIN (-0x7f-1) +#define INT16_MIN (-0x7fff-1) +#define INT32_MIN (-0x7fffffff-1) +#define INT64_MIN (-0x7fffffffffffffffll-1) + +#define INT8_MAX 0x7f +#define INT16_MAX 0x7fff +#define INT32_MAX 0x7fffffff +#define INT64_MAX 0x7fffffffffffffffll + +#define UINT8_MAX 0xff +#define UINT16_MAX 0xffff +#define UINT32_MAX 0xffffffffu +#define UINT64_MAX 0xffffffffffffffffull + +typedef uint32_t size_t; +typedef uint32_t uintptr_t; + +#define UINTPTR_MAX UINT32_MAX + +#define bool _Bool +#define true 1 +#define false 0 +#define __bool_true_false_are_defined 1 + +typedef __builtin_va_list va_list; +#define va_copy(dest, src) __builtin_va_copy((dest), (src)) +#define va_start(ap, last) __builtin_va_start((ap), (last)) +#define va_end(ap) __builtin_va_end(ap) +#define va_arg __builtin_va_arg + +#endif diff --git a/tools/firmware/hvmloader/util.c b/tools/firmware/hvmloader/util.c index 7da144b0bb..2df84482ab 100644 --- a/tools/firmware/hvmloader/util.c +++ b/tools/firmware/hvmloader/util.c @@ -24,7 +24,6 @@ #include "vnuma.h" #include #include -#include #include #include #include diff --git a/tools/firmware/hvmloader/util.h b/tools/firmware/hvmloader/util.h index 4f0baade0e..285a1d23c4 100644 --- a/tools/firmware/hvmloader/util.h +++ b/tools/firmware/hvmloader/util.h @@ -1,10 +1,7 @@ #ifndef __HVMLOADER_UTIL_H__ #define __HVMLOADER_UTIL_H__ -#include -#include -#include -#include +#include "types.h" #include #include #include "e820.h"