From patchwork Thu Aug 3 14:14:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 13340173 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id CF488EB64DD for ; Thu, 3 Aug 2023 14:14:52 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.576412.902522 (Exim 4.92) (envelope-from ) id 1qRZ6D-0004Ps-4p; Thu, 03 Aug 2023 14:14:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 576412.902522; Thu, 03 Aug 2023 14:14:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qRZ6D-0004Pj-1U; Thu, 03 Aug 2023 14:14:45 +0000 Received: by outflank-mailman (input) for mailman id 576412; Thu, 03 Aug 2023 14:14:43 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qRZ6B-0004PR-TH for xen-devel@lists.xenproject.org; Thu, 03 Aug 2023 14:14:43 +0000 Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2062f.outbound.protection.outlook.com [2a01:111:f400:7eaf::62f]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 16b7cebc-3208-11ee-8613-37d641c3527e; Thu, 03 Aug 2023 16:14:42 +0200 (CEST) Received: from DU2PR04MB8790.eurprd04.prod.outlook.com (2603:10a6:10:2e1::23) by DBBPR04MB7977.eurprd04.prod.outlook.com (2603:10a6:10:1ed::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6609.32; Thu, 3 Aug 2023 14:14:39 +0000 Received: from DU2PR04MB8790.eurprd04.prod.outlook.com ([fe80::e5cf:5743:ab60:b14e]) by DU2PR04MB8790.eurprd04.prod.outlook.com ([fe80::e5cf:5743:ab60:b14e%5]) with mapi id 15.20.6631.046; Thu, 3 Aug 2023 14:14:39 +0000 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: 16b7cebc-3208-11ee-8613-37d641c3527e ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GwNT9JX8K3CRQToDzYxMD9EadIOu/g5BF6Bm0WuNBEdBOcNYyNt2ymIhdB5J37/pIuncLk9dfFTwNtRGakqARelboufr+l8oMtNssJSl8fjL8XJgUCX96A29WnsI+yYi5ngNlesk1MFkkVXVXa55MmbCNfDz9b5B6V7JyKlKGxnt8daWgN4vhj8Xxnvh/kYqzW2kIQdjO6hD3g/39YW0N9TN2XSSl+ELszDb69ruDzLBNDOr2h1OYOEf4nwhNBbG9I/8417vcdNoT1cPFPgouD56AQ4Iba3jZmxqwAJqZncNWr1FYSSu9JwFaJe4jsPbPQqvuw77LbmQdWIMRgXZLA== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=obCL3PCbJvdo09qNGQHUZs/QI2sBpH+PLePc5+Lcf4A=; b=F4pOvQwExrI7HTobvqoASa+gBHzt0fnxcFxySBveCjFr+JmndqGavYVJYr8f5jVja55kEXH8ylDBzJfCrqqfntUGt1A4cwJa8MHxW43b7QvGHn7TgVqTNbi9KS4DdlWvfLaueMY2HT5kz1IYgnAc3RSdac7hPKotaGYlRAPBDo/504XHiwTaG0Mon049KcC/gW5XxcNWU1RqypC0R5oTmcphre2JfqiC2/8OlEpLZ8qKOuR8b8slps6AKFd9DPIAz3/EXm3FXZkVBQyZm5eo0tcqayg7X0SCUpr6u7OWdBZJNyN+K2JQYsnMnq9s1qG7AtpWzH7j+lbLdmpB/YMIkA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=obCL3PCbJvdo09qNGQHUZs/QI2sBpH+PLePc5+Lcf4A=; b=R126oDAvSMVh8KZRjeu3GFu0f3GNEcUDviUZ3zodrMhdV1/pR80ksv2aKnJlKU7fp/S6sbcdm3DqRw78EoKjjNtn2mE+LjfLH6eYRLbEFhOCcxevlMWDuUShLc5nGAt3+9u5jd3N4olwOG70WDgw4Ki76TLDxI1n9HOsF4XfOx8qdO2TtXkQr8CFdiHmnYIqpa4T5tZEh0BnKNt110gR3u4zNZ4iQnuzFLpSlvAznWjevlcMuLfb+4MwcvIG4o9w7xxAj8xNj3b9DtSktl+1yq23Unqjkj3CzaHnTX0CwHmToN/apG/RMtvr9cSop1waqyMlnrNbWVMdc0NHMtm4pw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <71b20ec7-fcc9-9c24-2cad-fca64e949e44@suse.com> Date: Thu, 3 Aug 2023 16:14:37 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.13.1 Subject: [PATCH 1/2] libxl: avoid shadowing of index() Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Anthony Perard , Andrew Cooper , Wei Liu , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Juergen Gross References: <226f087d-34b1-1a27-4048-f9c6ce3d2d76@suse.com> In-Reply-To: <226f087d-34b1-1a27-4048-f9c6ce3d2d76@suse.com> X-ClientProxiedBy: FR3P281CA0145.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:95::8) To DU2PR04MB8790.eurprd04.prod.outlook.com (2603:10a6:10:2e1::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU2PR04MB8790:EE_|DBBPR04MB7977:EE_ X-MS-Office365-Filtering-Correlation-Id: e7015116-2dd2-4160-1756-08db942bf96d X-LD-Processed: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba,ExtFwd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wQx/X7ukQMD7pOoXikMc7NEHJk217CJ2FVTlKxd0dyzde3f0B5weKcD15kWJjMtnMQNYZSnJWU6R9BfKDXRdWmx9/oPFn7HfwsbzY5tR5wojU/85aKfIgjDwN013Q16mBeyTgBmg5uw/ta24eJwCMuwk0LAOVpOj4F5kSB5ZHhU7IbCXOg3xgjJ++rR6OJL+7h5CHMfs5gWG1bXXcxY1dXLFg5jBjRtK4njrZFXf5NaNEXXPSnJqtS1IMmIIifUVaXA6fwItAB+Wl2nSsW1qM2peIuvqrTdlezq6bMH+iVTdwrXf4LG47LkMsEoBYBtXCcJD9lREXjiTE39tyOD0zPVhPFhxy69LjjYKe+qnXveOhOctqo4YqeymgkRnaoYZXEsTelTrghM1Fmrt59gpQhSjzw5LRD0jxMxQigGrwhZxfmRkSpY+SvfVLkuQ2Z7u7BMSRiWcgmFaNfX6FjsjD4GeWWRhC/VX01QqAXnPznESeNW2Wi5An1Nsl7edyBuENHUjEZQqgWK4RBaFFgxcWGTtZkcA2mWajWu4ipy5YDr6alMujla6l1dtcAY951Xm0A7l0hmBDEowJtA5Gy1ownSNXoyzFYr1ubrEeYVjgGjL/ImCUI53m7ffV2RDgSK31P6hRjrdv7PuX9HHNaLPqg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU2PR04MB8790.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(376002)(396003)(136003)(39860400002)(346002)(366004)(451199021)(54906003)(6506007)(107886003)(26005)(478600001)(2616005)(83380400001)(6486002)(36756003)(4326008)(66946007)(186003)(38100700002)(316002)(6916009)(66556008)(41300700001)(66476007)(86362001)(31686004)(6512007)(31696002)(5660300002)(8676002)(8936002)(2906002)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?nO240ax5AaX24irUiX+5LM+6NpjH?= =?utf-8?q?cAkCmzKKjtxrpC+XkbbIfFfA1BuaYNFPw1eh+tmW7BgMs1U8v3FWgXPzefa8a0oKO?= =?utf-8?q?491g23VVrotbFfm4oVQpy/ctbirIo7lmUJV8g0SbaTtfR7tgn84MwdzzJUHcmFyD9?= =?utf-8?q?qTE1YJcemgLYiRTPIWJ1azFZ5+t9A3HQlcJlZZPjbUkpCzCgu6mtPs8+G5bwQDGrA?= =?utf-8?q?QiL+8sywAhhhfisqbC1rEXUSarPOx+HT9j5dDPGlVVNIl1tXasm24pPst+JOpUU9W?= =?utf-8?q?oonkAuZQfgvqrYZ6JyIcy8nhhWDMlDK+CGsSMWimavh9Re/NIy7rLkXolrwg1maCl?= =?utf-8?q?sFvR2MNNG0XSkTtgJGCbtvmj3b1TZORZDpSO/TOxtb+oApX7eSBrT/RaqAq8MksEL?= =?utf-8?q?eRHzUuhTUzJkjcXhRqTWbisC8taIMI9mb3KJHKA+JOQcnxYCaFcZSLwDYX9MYfXJs?= =?utf-8?q?J1Cw4VkpS9xHfCVGXnjNikaoq+jv9hpE1+GM0ZfBa7NbdDyRJxA48X4V85NlG/hf/?= =?utf-8?q?/aWrYjncJ/fYH+399v94sPTTj58PPVtO2GhDrAZY1YFH69TuDLRffB7GST/3MiUDf?= =?utf-8?q?fgdfegadQUUO7wwrfSpS5pe+IzrrjG7kQ60x/vmofB+etUH+mnYk7RzKtyDe41MrE?= =?utf-8?q?gWgmEX1XCzTIA4jTgpy4liymIVUKNtiNGQWiVfyTXc4Kzw78J//uh/YtTCFow318B?= =?utf-8?q?1jfFSNj/Lb9pqkvgTdmRpENdpXmA9blHCOZiTno+94C3xcoeiCw+YLrYYfdYvQ+Cy?= =?utf-8?q?Y4lELnwOm/dqdwbkmDH6IreAS3RJR3oGxaCdIByIdeP1+gn0yG43W9zozsulpQJZU?= =?utf-8?q?zcxojywGkFUzkcKN8ItDWpZM4IyXwkVCCSp2REW0HDxNWS2FkUBTz2PE/NqVfO6XA?= =?utf-8?q?W1GFptgscEdVxWC3lw9BJvX1RVIcDpu3UtY7ltVupUDrpy6o6syaEhwnxvcuDNA7e?= =?utf-8?q?3pOOcWR90EVq371UbRfDfER4pzPlthWZj6/l+ai266qKrr3gk7b6ef7yZgAQuavCi?= =?utf-8?q?lLaNdmep2vDincRNzzIMk78oRV657Z8fGsfzXLyOm1WZ/lMatwqi0t6Wg14QUoUB7?= =?utf-8?q?+2jxquoRllWKk8/Jlr+4fbD3sm/2VJg9DRb4a89eE2OhcqJElZXjYmFGBIjlubwxl?= =?utf-8?q?kWtFLE3ZNdp2sxnGLnhOUj2Ue3I7tKz978A8VyoRwCth0iaFhcyooMITJZfyxo3GD?= =?utf-8?q?SHY9sOEPmrOclEEvri335SBBaVI71CUx71ecE4ASn5tG4XqzR4obPV5/MJker3R7T?= =?utf-8?q?Llyua3w9IN6vT7oy0LIFVPgZGHILDA/C+Ce4IQmE6H/yC7g9xhUZ76WD0BKDvuVxD?= =?utf-8?q?7EMCJsqVVrOir/HZ5m55gvPvvv++ejscc7sLDVgiYIMysiYk14B4hr3aaxRCnLOam?= =?utf-8?q?nCpyixmyurUUL1fZth/+n00eslKplz0Xh+4Qj/9xsdQlG2YEXk18D/DZ7c7lga3s5?= =?utf-8?q?czN7gQfCFZHtrA4RCxgJhQRmc+db2oCilv1vYn3kldxR3F6RahSw5jFSnjgvE/iYi?= =?utf-8?q?ub4lE6Q4DRyr?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: e7015116-2dd2-4160-1756-08db942bf96d X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8790.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Aug 2023 14:14:39.3365 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: m7/3v/uTBdNZrag3J7Gs528LhElzmteJz76NyCFw6jpSfoTisOAso8cVYreeVzPOnOZTPDJmaV691H3QveI6dQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7977 Because of -Wshadow the build otherwise fails with old enough glibc. While there also obey line length limits for msr_add(). Fixes: 6d21cedbaa34 ("libxl: add support for parsing MSR features") Signed-off-by: Jan Beulich --- a/tools/libs/light/libxl_cpuid.c +++ b/tools/libs/light/libxl_cpuid.c @@ -157,7 +157,7 @@ static int cpuid_add(libxl_cpuid_policy_ return 0; } -static struct xc_msr *msr_find_match(libxl_cpuid_policy_list *pl, uint32_t index) +static struct xc_msr *msr_find_match(libxl_cpuid_policy_list *pl, uint32_t idx) { unsigned int i = 0; libxl_cpuid_policy_list policy = *pl; @@ -167,14 +167,14 @@ static struct xc_msr *msr_find_match(lib if (policy->msr != NULL) { for (i = 0; policy->msr[i].index != XC_MSR_INPUT_UNUSED; i++) { - if (policy->msr[i].index == index) { + if (policy->msr[i].index == idx) { return &policy->msr[i]; } } } policy->msr = realloc(policy->msr, sizeof(struct xc_msr) * (i + 2)); - policy->msr[i].index = index; + policy->msr[i].index = idx; memset(policy->msr[i].policy, 'x', ARRAY_SIZE(policy->msr[0].policy) - 1); policy->msr[i].policy[ARRAY_SIZE(policy->msr[0].policy) - 1] = '\0'; policy->msr[i + 1].index = XC_MSR_INPUT_UNUSED; @@ -182,10 +182,10 @@ static struct xc_msr *msr_find_match(lib return &policy->msr[i]; } -static int msr_add(libxl_cpuid_policy_list *policy, uint32_t index, unsigned int bit, - const char *val) +static int msr_add(libxl_cpuid_policy_list *policy, uint32_t idx, + unsigned int bit, const char *val) { - struct xc_msr *entry = msr_find_match(policy, index); + struct xc_msr *entry = msr_find_match(policy, idx); /* Only allow options taking a character for MSRs, no values allowed. */ if (strlen(val) != 1) From patchwork Thu Aug 3 14:15:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 13340174 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id B715EC04A94 for ; Thu, 3 Aug 2023 14:15:36 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.576416.902533 (Exim 4.92) (envelope-from ) id 1qRZ6r-00052x-ID; Thu, 03 Aug 2023 14:15:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 576416.902533; Thu, 03 Aug 2023 14:15:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qRZ6r-00052q-Dk; Thu, 03 Aug 2023 14:15:25 +0000 Received: by outflank-mailman (input) for mailman id 576416; Thu, 03 Aug 2023 14:15:24 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qRZ6q-00052g-J1 for xen-devel@lists.xenproject.org; Thu, 03 Aug 2023 14:15:24 +0000 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on20631.outbound.protection.outlook.com [2a01:111:f400:7e1a::631]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 2f317f22-3208-11ee-b268-6b7b168915f2; Thu, 03 Aug 2023 16:15:23 +0200 (CEST) Received: from DU2PR04MB8790.eurprd04.prod.outlook.com (2603:10a6:10:2e1::23) by DBBPR04MB7977.eurprd04.prod.outlook.com (2603:10a6:10:1ed::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6609.32; Thu, 3 Aug 2023 14:15:21 +0000 Received: from DU2PR04MB8790.eurprd04.prod.outlook.com ([fe80::e5cf:5743:ab60:b14e]) by DU2PR04MB8790.eurprd04.prod.outlook.com ([fe80::e5cf:5743:ab60:b14e%5]) with mapi id 15.20.6631.046; Thu, 3 Aug 2023 14:15:21 +0000 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: 2f317f22-3208-11ee-b268-6b7b168915f2 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aYlbFVuVqu4CUqRNH4M/OO/m8/CyOQ3+xBmCk5+DVAC8W3U1U/HVoXc6UuugRdZQfScu62pv0gy56vsOOiSrztUnBrO8jZRXkfpq+UEEJOsxABCLwcU0plM8H7k+pPvSB/5NRUjCtG4KyZGiuQr/WEK0gVMZQSYTAUpi765RfgdFIab7S6iXhNfux9lJGDHmmGU7JaDPbsjhe7EQVd4XxUOmgR5pMy9LomANFWcQQhz82sbt88ICA0SscvpNygkrGT3ymBMfERSu88KDHIxMX0oJYx5bkzf8q2NaQX5jt0NgOP9DSE2jeZMHSM5SMBJgLt8MJGu2VTRDzggV3sgKcA== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=pW0Q7b7mAbaCsN9ic44XlYuE60szaE3+3cpssf/B9Jw=; b=QTzN53d7Le6uhlStV/QGQCSzuAJU3cAjqTYctgC1IdCRJvoIKDQJDn0wC6VRY3tt4h7sVvhjaC7j+ht0KBCmbLG401/gbbkl1L3hUjnoZLcwfbs5wzGauVuWQLUi33YdixWkIhdnRjSNEUtEDoo9HzfwmZNZZe+wZcaMWNWrPiHUQrWY1PT/lY+ghPKwhrxqzTuSblz43nKskAl0n6zpsB9wab4yfcr1TZanbj1SKw1mm46KvnS8Y9Dd2j2vfykwo4t6vk3n3B/ONgsbt8NZ9ldMMF2Jj0In1VKfcaAYxLjg4gUlTOix0GgFFh02TYHoPh/ro/3KK0wBBKgaCXQ7kQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pW0Q7b7mAbaCsN9ic44XlYuE60szaE3+3cpssf/B9Jw=; b=aICgwONFGMdantSZIeV5fBJDuPRAEavYjrmCVm0Syc93dawV/nJhliYZol/tfV8FkhsI1w88OzaazycSt06UVHnDzUVorDT/f0mV0QCiAEdMNChCgbwFQTRAZbVK4ARwyHHb1U+W16zSKGDidEpqMtaVxZAelkuDH5YfcENCohqYtFOqRDFFNqAFUIyPOtLlwF2zgMlHIoLxlToxm8gh9scvjZx8foIsk1WJho0YGjuQK/StWGyNxdMLLrug/G9Kv+s4CDPtWVSrU6ggU8tFp1Pusb97cOC5/hTgf3du7XAhMIgxpnngiyzaN4rM5YETwvY7MU4N4W8YL1Y0ElH2hg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <550a2b3d-ed15-6035-623d-8725edb40b2d@suse.com> Date: Thu, 3 Aug 2023 16:15:19 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.13.1 Subject: [PATCH 2/2] libxl: allow building with old gcc again Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Anthony Perard , Andrew Cooper , Wei Liu , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Juergen Gross References: <226f087d-34b1-1a27-4048-f9c6ce3d2d76@suse.com> In-Reply-To: <226f087d-34b1-1a27-4048-f9c6ce3d2d76@suse.com> X-ClientProxiedBy: FR0P281CA0204.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:ad::13) To DU2PR04MB8790.eurprd04.prod.outlook.com (2603:10a6:10:2e1::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU2PR04MB8790:EE_|DBBPR04MB7977:EE_ X-MS-Office365-Filtering-Correlation-Id: dccf5f94-90d6-4614-da5d-08db942c126f X-LD-Processed: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba,ExtFwd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: b53N3KypiyzVIIKvaO3W/pOoLO1+hezA1tgpkg56YQZkgxEXJOfVCAq3tOEAHjiobOM2W2iN3bYj3dxtxe85+agKDbXiXjgaOynXzaDDrer/iv91F52DJjBVcgr7kc9D4pN3OxrYlZRZIrV5CrbVb8fqVKEnNkYpCdNo4yakZ8WM7Uiz6W4dirWaLFX0UPW1aOF8wSLZ0fls0tzT7EQ+BgD7Tc6B7MOscGJhy1OI/iPnf21IQqaSBkWc5LZTdnhQjc7ZCGpZXwmfhhFCNMnhY0mJEqBRgbZr/TngfX8JzfFHke+IxGgI/7gTjkfU0gF0Zoau0DvaGFrvdIskQFNhVD6+2m49dR/TXESC0+19DN6daWWkxrgtgmKw+gPz5JZ+D0iCgwqeyrkmTmyTSRqUyNEimPXQ92p4RwAlmvmZzDDX/NdQSVv/d+olWFUduRJRPFYjs44mZr+jZA7e6dkMTMi81MERX5NxOSNnKPA/nHtlQoaINOK2DO4zt9Rw63Y9opUV0LrfTJtVnllJb2qI9NAtfJmGbh65+N5ZzkwO+wI2CqDvsKvMvrq7v6k6+JTxBdCQ+0hNtkWJhA13e4s2BGpE1DJ8Rr2DdFpH3/GdDmh3LHiM6aVigEkYk9nmUwL4D82e8McdFy/NCcc9yqvCHw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU2PR04MB8790.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(376002)(396003)(136003)(39860400002)(346002)(366004)(451199021)(54906003)(6506007)(107886003)(26005)(478600001)(2616005)(6486002)(36756003)(4326008)(66946007)(186003)(38100700002)(316002)(6916009)(66556008)(41300700001)(66476007)(86362001)(31686004)(6512007)(31696002)(5660300002)(8676002)(8936002)(2906002)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?fVMLCh/E32gP2Xj8SFNIla4zOlKu?= =?utf-8?q?2MNVE8ZIKfAkxObBGBquXEHPdLUU6lE1SqAn60GhRKUe8z5724EyJr0mKGupA+9yy?= =?utf-8?q?zdNmlGYFCUjNgr0XNfD6CK8pJcANxT4SXbOg8p4grxCPEMbxNrzmTZc4tuA3zXg2v?= =?utf-8?q?36mxKySRD2mT4LzgmpnEdI84TsXEDCx89iwm34KpFilmggrHRb2srL3C0YA0k3hzl?= =?utf-8?q?sXWF0SkQMectoQBYGJc1p/hFOPH2f8iVPaN6m87/izpHy3Ffax+Ds6D1NHWJlVxaN?= =?utf-8?q?sq9Iyo79fA6aRANcoYet2okWBl/wA2bEwHyZPDq9uaRiSHdDALm/NuZUai2LS53/I?= =?utf-8?q?h8wg6ilQxSHqZXEa9fdg0pghi8hrC2g2FNLB96W2BsZMl6QuUkwWMKTiYvhldY6PG?= =?utf-8?q?JDAXKuxND1qHWOp4rXqUTh0dHBGfIYTY0xQfW/gvZqtIp2MN1srdFAetlb8Dx1xfX?= =?utf-8?q?dLz/gzDW1xTmsTRTMk5bPXM208ctsuxI3WFVfsbD4XTI2tJw/bw/NAyr77d+fWz3W?= =?utf-8?q?Obh+p+Jx1/shBOv9DSN6ogg0a3/CG8L7AcExFJBqt+QadMTNo6TNxstVPj0sgvnXV?= =?utf-8?q?bXZHLMJSvwHt80/jgVVxyCc9VrvU4LokMiUeYrtLgeKlwW9MnaXYZxRK4WU9o+zba?= =?utf-8?q?cz1rGmAZXlQbuleNngqMwLqw2H5kBnxhLmCQVlh8jxQ/zpBSr4/VvyL8gUnjvLA5O?= =?utf-8?q?kIoG33QlDO87QETBkup4cRUiC6kLkJIzx/PUFF8MlJaSROHnIf6D7xJKTtb+Y3VuK?= =?utf-8?q?VJEeLYcRG7zpFBzZv+cVkY5+Y4+bZcQe4m9P3a2AnyJkktV0g5TPsenawDxwOOnuY?= =?utf-8?q?caH3Tv2pG+bBIpo9IyY0C1fHPiqOpV/5lbF9HJugZUyeaFfqvYD0ShlPjgmxs5WFO?= =?utf-8?q?tkbXt+FW5kUqa84+oOiUUydtG9dQHA+2BBi82ICllNmYXi1u3xfIH/Eo1l3Xs3NMN?= =?utf-8?q?sXWWpuA2kXiyw0d0tjTS1uRhr4reVfNTLgQIZUjeH0vbO82QhvySG++GHL1IL1KL4?= =?utf-8?q?k86rp4OPQ/aPV1Mqkf3gO1903o+0yuxQUwP3JAgBtdJZlJtdb88Z09SI0Dmx8fvpl?= =?utf-8?q?1bYTtEwGEqtieq+LSFSjOCPhu45k4qdHryuAw3MBgD6XLAilai+EZEfw97rGzhQ7J?= =?utf-8?q?AWhkC/jvF1QYdLEuZgnIRHbUpvO7LpbajWVmQ8T0g1mfWSB+0NmaXEMikEZ653R4X?= =?utf-8?q?o3JTh1baKXF4xBHylP0dcXKUvk9fMv43KKnI52tMSzIZy7gxsalIm/98ZU2k4G63H?= =?utf-8?q?TuJAFg2Wqo7MvodhKV0QepcmrFSmK6GuXB5Fps8f2T8YzMhxTNM3l5jEiFyOKt6W1?= =?utf-8?q?BFAT85H9HiAbRos5Z5uR+t/5F9HrlrH9KlRTuCJKJMKypAsThwwtgdNhlX32TOlM5?= =?utf-8?q?Uq8e3ZCdDqdds2jbSm2czOv2cG9d6yQBX7i0LIe3O3xe5NU/U6o+O4IDGAmsXrrqe?= =?utf-8?q?epqnpZfMUDoL+HSWKR96oDdOi59xmJk1MNbLLzGCavCgUT46UFCH+oy5LzuqBG1jV?= =?utf-8?q?9xrOI86K29he?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: dccf5f94-90d6-4614-da5d-08db942c126f X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8790.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Aug 2023 14:15:21.3130 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: EV+FjhvzJJUKVVvV8Lpra1Qe0K03d7BqNc7GINrr2iwshgW7czoNxyDasuOo6w9gm+tBQMvcp3mvE3U4hPiw3w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7977 We can't use initializers of unnamed struct/union members just yet. Fixes: d638fe233cb3 ("libxl: use the cpuid feature names from cpufeatureset.h") Signed-off-by: Jan Beulich --- a/tools/libs/light/libxl_cpuid.c +++ b/tools/libs/light/libxl_cpuid.c @@ -316,12 +316,16 @@ int libxl_cpuid_parse_config(libxl_cpuid uint32_t index; unsigned int reg; } msr; - }; + } u; } feature_to_policy[] = { #define CPUID_ENTRY(l, s, r) \ - { .type = FEAT_CPUID, .cpuid.leaf = l, .cpuid.subleaf = s, .cpuid.reg = r } + { .type = FEAT_CPUID, \ + .u = { .cpuid.leaf = l, .cpuid.subleaf = s, .cpuid.reg = r } \ + } #define MSR_ENTRY(i, r) \ - { .type = FEAT_MSR, .msr.index = i, .msr.reg = r } + { .type = FEAT_MSR, \ + .u = { .msr.index = i, .msr.reg = r } \ + } CPUID_ENTRY(0x00000001, NA, CPUID_REG_EDX), CPUID_ENTRY(0x00000001, NA, CPUID_REG_ECX), CPUID_ENTRY(0x80000001, NA, CPUID_REG_EDX), @@ -380,9 +384,9 @@ int libxl_cpuid_parse_config(libxl_cpuid struct cpuid_flags f; f.name = feat->name; - f.leaf = feature_to_policy[feat->bit / 32].cpuid.leaf; - f.subleaf = feature_to_policy[feat->bit / 32].cpuid.subleaf; - f.reg = feature_to_policy[feat->bit / 32].cpuid.reg; + f.leaf = feature_to_policy[feat->bit / 32].u.cpuid.leaf; + f.subleaf = feature_to_policy[feat->bit / 32].u.cpuid.subleaf; + f.reg = feature_to_policy[feat->bit / 32].u.cpuid.reg; f.bit = feat->bit % 32; f.length = 1; @@ -393,10 +397,10 @@ int libxl_cpuid_parse_config(libxl_cpuid { unsigned int bit = feat->bit % 32; - if (feature_to_policy[feat->bit / 32].msr.reg == CPUID_REG_EDX) + if (feature_to_policy[feat->bit / 32].u.msr.reg == CPUID_REG_EDX) bit += 32; - return msr_add(policy, feature_to_policy[feat->bit / 32].msr.index, + return msr_add(policy, feature_to_policy[feat->bit / 32].u.msr.index, bit, val); } }