From nobody Sat May 18 22:31:18 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=2; a=rsa-sha256; t=1675939136; cv=pass; d=zohomail.com; s=zohoarc; b=NCnP7YGvc//ixeqtg86md2zeMhjI5CHFLiNPgc5h2H3V0gZZ9/stnmacw0n1vCMRb2Oekm3P7ulo0Ooxy1TSxd7XyVbopW82fM1cf9/7nLIWMT7WgLLeCroBmI9futidLeRYNZANtj0dujqAKN1495NYBNNC3mhgVe/jpnDNrEA= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675939136; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=TG2Rx4pKN111MpETmzA9hKXV1FMjq3bxnugIAbeKEN4=; b=PY7GGOdmeHiPhuVB2AIrqtTIiIT5TwbGRXU7GuJjROrYO1Duc0ONOimq3SqnfGx6fRoSuoSrGebE+mxTpKZ1M47YTcpuI+pNSILqGvC0K8P/CvGEQ+sERueLXj14hwuXjq5WilODu+V5cWZ+90YsOngjGb5Ua9DWHwQTm4RRKt8= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1675939136940739.0203222568643; Thu, 9 Feb 2023 02:38:56 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.492275.761737 (Exim 4.92) (envelope-from ) id 1pQ4Ji-00082Y-My; Thu, 09 Feb 2023 10:38:14 +0000 Received: by outflank-mailman (output) from mailman id 492275.761737; Thu, 09 Feb 2023 10:38:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pQ4Ji-00082R-K6; Thu, 09 Feb 2023 10:38:14 +0000 Received: by outflank-mailman (input) for mailman id 492275; Thu, 09 Feb 2023 10:38:13 +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 1pQ4Jh-00082J-CU for xen-devel@lists.xenproject.org; Thu, 09 Feb 2023 10:38:13 +0000 Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2060b.outbound.protection.outlook.com [2a01:111:f400:7eaf::60b]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id d798d6e0-a865-11ed-93b5-47a8fe42b414; Thu, 09 Feb 2023 11:38:08 +0100 (CET) Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by DU2PR04MB8630.eurprd04.prod.outlook.com (2603:10a6:10:2dd::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6086.19; Thu, 9 Feb 2023 10:38:07 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::e138:4fc3:705c:d178]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::e138:4fc3:705c:d178%7]) with mapi id 15.20.6064.036; Thu, 9 Feb 2023 10:38:07 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: d798d6e0-a865-11ed-93b5-47a8fe42b414 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=C6S1Djz67JKipNyZQ647Hz0v+jdoj88sPhBvohNy3tf1eCvyDwffycUvxz/B7Xxx+g6jPV7SYLFAVBZTE7WYHVMuCu9oeXS+WBvYXZzV4wJAfmP04EHm5Jby8Zv4VrtQvIMhH0h0k2vRfcUWWGSQuS7CgVBOThe7vgjq8v4sR0NybSbowcnQpUUrajE4GD1NePoDwN0tLArN0oW2KJGQjeRl8w7CXJZY1GqnBTbXLCiqTsUIZV9WrXjCGdVsE5q7V/dHApUabowL9b/aDXiZk7Is7aaxcHSIH4vICNTPUwIkPHyHMZjk0AQQqGgQHFgR1usmMDBgWbql5P5t/ipdTQ== 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=TG2Rx4pKN111MpETmzA9hKXV1FMjq3bxnugIAbeKEN4=; b=dNOITZcunT9z6jaWwa62dlIpr7owDZDbn0mGMGWbR+Do4NFtXPkOVsR2npkWiathcqi0wOtEwAjUcMuAzGU+VK7L5sXsG1LQUGVE0kiSQQRc75mQaxwUJOKraUKJ00EicfF8bEExl82hppt9HRLxHHFgoA+3sXe3hN2h1EXCnRxuMeK2ORNimndEWWHRQjBNWLVie1VwMNE/rbbfFQ6eslVDVO2U+tPwyXwAKQ5RTpcM87rGpeIH/3+GWXgIFUq5cM/JW3iuC2URTIEpJJH6rKhQbBM+ofVMdNA7vdZihxWYxjgYV/dLQQhy2swYJI2ixOvZlJgY5hPkPbb3ztNrDA== 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=TG2Rx4pKN111MpETmzA9hKXV1FMjq3bxnugIAbeKEN4=; b=YvCVOxoEzpfSivFWVCB9bb3g+kGgoIy4uj3Gpro25Aq3AlY6wUCM9le18oPM+u49meaJJyVPC2ZutaB7hIis3OBdNQiOFjPa/JFmXdt6FJWVCv1cXyT3LUT3If+0p4DmP1GXq+mPwjGlDKbO9RrmPr2SxSwRMOoH720lYnHT4NQMPSbGaGNdHurJ7U3mX8co2Pb8L2WeA/1gwnOYa2B6Ph8g1hkJzZraJeY6fQzDjTKw2UDXLEJfPrPMGcpQsyjW7uA4dHCafIc/BAksTOCL/IGjZNQPE/hH2um89wzLSrhvd1hV9EMZalvIFVpEPxuOA2ctD0z2Hby4gc7zsBEWhw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: Date: Thu, 9 Feb 2023 11:38:04 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.7.1 Subject: [PATCH 1/6] x86/Hyper-V: use standard C types in hyperv-tlfs.h Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: George Dunlap , Wei Liu , Paul Durrant References: <98c3141c-9d49-695e-a936-4e755a4fc527@suse.com> In-Reply-To: <98c3141c-9d49-695e-a936-4e755a4fc527@suse.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR2P281CA0067.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9a::7) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VE1PR04MB6560:EE_|DU2PR04MB8630:EE_ X-MS-Office365-Filtering-Correlation-Id: 2b6f00dc-9eda-437c-b596-08db0a89bb2a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: b58577ciHBqBlNs0MdWhltJcHodUsSwnvlGvnqUPqbVnYc5BRJtbHQE5rq2VscZ3i3ZNSZBttfWbWWGT6EtzAK9zdE/+y4o0bTc25kfvf0T3Sor03UsbsgMJXCrFs2zslfpNU1/KdsiKD+atI6q/n+0FHYz8DrtMzdkSudr6Y1PEtJq5/fe1D5jffyS/tBiF0a3pSiQMyxxx3mhjE9zXqewK4levC7zUsrRhyYyORCQssDguPGOn03BPm9FVji1cN1WeYKHbkxkNBZaDVc78z6FB/1qmGF3zs4NTGV6IJbThi0034favtqODtCUjw6cVWT1YJNJi5QklfraSogyLBBS/bLCnFPZHYklok1gdYZjn0SUXoi1P0OhF5YdIzUheViBKVIuSHB8dcNxV5HkNLVUmv9QPbwqaxxx3mwf+Ot2mszpfWdbWjHIMeIY0WOmtwaiKqBu6lbwjE3hPIgzFszponoG4A9+I9vnFEIlTOdF59b0NIo38oYheMybh0bD8udR9bV2iqVRo21fXR+PGwyBYhNmE7Qs5SsgQDRH5TGfTBBp+R84GS8trUceFERNwfoaUCKcCMJAiuyGf+zC9GXtod1DBi4d2idcijuZxCR2xuqfd1Q1y/007nS/MIkasnXaLSi+fh3Cz675HRmZkUbkNouNyVAlw8U/LxJtvqvlpkt7lWAVrKRpXqY3Yn7Q8kpXW+mqvRc4/n7R9XT5JU8mt8gBnqu7Sf52ZAVAPM1g= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VE1PR04MB6560.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230025)(136003)(39860400002)(346002)(366004)(376002)(396003)(451199018)(478600001)(6666004)(2616005)(5660300002)(6486002)(30864003)(8936002)(6512007)(186003)(26005)(31686004)(6506007)(54906003)(316002)(4326008)(8676002)(6916009)(66556008)(66946007)(41300700001)(83380400001)(66476007)(38100700002)(36756003)(31696002)(86362001)(2906002)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?VHBwazR6VVdnaXVEc3ZsSStFMHYzYkhrNUtBOFJiY3AzYmo0YU9uM29yd3pP?= =?utf-8?B?Q1lGVmYwZEYxcmRtcGZWRmJ3aTkvZUx0eVJzdFdXTG0rOWcrMmRPRER1VEpR?= =?utf-8?B?ZEdOWjdmS202YjV1U0VYbjJOenZhQWFacnk5eUZHbjdnYVhOclpualFROXAv?= =?utf-8?B?WmJkbmNuejdCeEtCeEFRVTNZU3ZTZ1JNV2JEamJ4UHlNUWg2V0IxazdGNy9Y?= =?utf-8?B?ZzlPbmJpNnlRWVRrOGJPQ3hVd2NnbTh4d1BodDdCZXRuNnh5NXAwaGVnUWhE?= =?utf-8?B?S3ZFekhkTnZYNG9ITXpTakY2UGVTQzExbk5KQnhSbVNjUnZPN2szMDdqRGp0?= =?utf-8?B?TjlmMEFLUlJ5NUdqdzR6K04wbkpFcHRueTByWURkNGVoSEIybFRLVmk4R3lV?= =?utf-8?B?SHhNVmFTeE5Relg3MVJUQ2RMOG5UekVreW9heEpuc0EzWEVsUkg5czk0QWIw?= =?utf-8?B?MTFBSHA5dkdsZG5qNnV3REZCUWdEYVlnS3J3S3Z2TnNBOEZoT21hZ0lZd0Zt?= =?utf-8?B?NmJhY3ZIaGF3cWxLSkQydkZJN2tLVmRsemdrOEhvZ0NRSURHdnIweGhwMmpq?= =?utf-8?B?aFBLbXZQYVFYNFVOR3MxOXBZMi9oRG43MnljWFVuSTA5RDJ0eTcyeWpyRXpG?= =?utf-8?B?TTZwZXBvOVcrYm9seGxSaENla0tuQUk1UVlPaGl4M0RhR1haUVBnR2RUb0Zv?= =?utf-8?B?YWVndEpVOWdCcGRUSDVpKzdTaWE3cGYvbVFnVGFlNTNyTVJIYjlTQWhORFRt?= =?utf-8?B?WVdUMEdXbU01YjRCUmJHTEh1UHEwN1NMcW5TS1pDdEZDeXJmTjFBMkxSdVBu?= =?utf-8?B?OThGMldRdEEwa1dFY1RRYWQ4dSt5MExsTW9BZDVFMkpQOEhxdFM1SnVTWTEz?= =?utf-8?B?WEd6cHYwdzB2UnZUWDdCZlQ5YVJKYmt0YUIvY0tUL2NTK05oVVRLb2dYaWpo?= =?utf-8?B?NkIrVkJidTZXUDBMNXhiWDJ1bVJIaVM3aVhEdTRuZ2VQRWRIUDZ5ZUdZUFR0?= =?utf-8?B?YkpONGFGbkwrT3VzUGJ2WjhaangycnM5bnAxV25nOVpIemFJTmtMMzYxcDJV?= =?utf-8?B?ZGk0aXFnSDZIWWJHYkllTE1HQ3FSc3NpTnMyL00zODl5Z09qQks4V28vTEJU?= =?utf-8?B?VVhaMGZjdWxGRGhoQjhteFVCNE5QMkRlRC9WblpObjUvMGJGenZTckViUG83?= =?utf-8?B?MU9QSFVLajFMSGc1TUlQcU81VEtzUFRrdlZjWHJOQmhxMm94WTBxQUdJYnVy?= =?utf-8?B?L3o1V0tpdjM1YlIwOFRtYksxT1huc2pFZjdiT0FkZ3B3SVNDeCtqZ1FmSXZ6?= =?utf-8?B?OGtkK1dxa1dNK1p3aDhlWkF2Mng4dnRDUTNVTTJwZ01oelhnNmN0Wkc3VTkz?= =?utf-8?B?clNVcW1ZbjJWNU95WmdvbXRBdUlaUERvN0J1eUdDeFcvRE1KZzVOYWpvbzFy?= =?utf-8?B?NGJDSEM4Mk5nWWdHNmpLaUVWRnJhU1lLV0E0M1NDdWY5TW5LU2JKazloK0ZF?= =?utf-8?B?aTVXZlVQU1JSWllTcDNsRVZmM00xZm95WDk0UlJlTFN5bEdTL1J0TVZFTEEy?= =?utf-8?B?dlNueHFINENWZFJhcWtTRzBqWFhHL0k5bnVoekVNaWk2dWVtTVMvb05RYVlj?= =?utf-8?B?S0M5cWZzUWhuUEplYjhmODgycUlXdXNBMHB3QTMyb0Y2S3puSEpFTThsYjRk?= =?utf-8?B?WXhBdkJVVXFNdzBCMkVoNWZpQ2ZFQWxLcXZEZ1RPaUhDWDlKeEIwL1BwUFRT?= =?utf-8?B?ZTl0eFlZZ2lzTWVVTk5mS2FEZ05yOVNscEFuN2ZQU1N0cnFLYVlOcWdlY045?= =?utf-8?B?OTMzeG9QZmRUTWJnRkVXTzVOUURhbUVkSEVseXExZkl5YlhMbHBNOWpSNXVa?= =?utf-8?B?Qy81VEpTYXlnVCtDc0lBdSs0SVVwNVBicmNUdU90d3FOMTQ4NHA1dXptQWhD?= =?utf-8?B?YkZIdnlUM2RzTytIdTBkMVZHRkl4V1A1cCsySDhjMUlUVGM5TE1NN3Z5RGNO?= =?utf-8?B?WFFFQjliWi9iUlViK1JTMkNMN3ROM1BscE9vRERrZXF4bFZZUmFLT0dYWUdH?= =?utf-8?B?UnM5Z3RQWnZYTXRUL1RrMndZRTE2UzN0NFRBTWtPRmJkLzRDK3YrZ2hPMHBx?= =?utf-8?Q?FXiAj3W3uGDN7ybubumRAvDme?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2b6f00dc-9eda-437c-b596-08db0a89bb2a X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Feb 2023 10:38:07.2180 (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: EoFb+FYw6TDBL4WQfEqLe76TGwaFMv1NI0ayepXTh3D9duQf7TixbDC/fdX5gMFdn4XJCktM2gXi7wM7Lpryww== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR04MB8630 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1675939138221100001 Content-Type: text/plain; charset="utf-8" This is the only file left with a use of an __s type coming from Linux. Since the file has been using an apparently random mix of all three classes of fixed-width types (__{s,u}, {s,u}, and {,u}int_t), consolidate this to use exclusively standard types. No functional change intended. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- a/xen/arch/x86/include/asm/guest/hyperv-tlfs.h +++ b/xen/arch/x86/include/asm/guest/hyperv-tlfs.h @@ -283,11 +283,11 @@ * Declare the MSR used to setup pages used to communicate with the hyperv= isor. */ union hv_x64_msr_hypercall_contents { - u64 as_uint64; + uint64_t as_uint64; struct { - u64 enable:1; - u64 reserved:11; - u64 guest_physical_address:52; + uint64_t enable:1; + uint64_t reserved:11; + uint64_t guest_physical_address:52; }; }; =20 @@ -295,11 +295,11 @@ union hv_x64_msr_hypercall_contents { * TSC page layout. */ struct ms_hyperv_tsc_page { - volatile u32 tsc_sequence; - u32 reserved1; - volatile u64 tsc_scale; - volatile s64 tsc_offset; - u64 reserved2[509]; + volatile uint32_t tsc_sequence; + uint32_t reserved1; + volatile uint64_t tsc_scale; + volatile int64_t tsc_offset; + uint64_t reserved2[509]; }; =20 /* @@ -343,21 +343,21 @@ union hv_guest_os_id }; =20 struct hv_reenlightenment_control { - __u64 vector:8; - __u64 reserved1:8; - __u64 enabled:1; - __u64 reserved2:15; - __u64 target_vp:32; + uint64_t vector:8; + uint64_t reserved1:8; + uint64_t enabled:1; + uint64_t reserved2:15; + uint64_t target_vp:32; }; =20 struct hv_tsc_emulation_control { - __u64 enabled:1; - __u64 reserved:63; + uint64_t enabled:1; + uint64_t reserved:63; }; =20 struct hv_tsc_emulation_status { - __u64 inprogress:1; - __u64 reserved:63; + uint64_t inprogress:1; + uint64_t reserved:63; }; =20 #define HV_X64_MSR_HYPERCALL_ENABLE 0x00000001 @@ -442,10 +442,10 @@ enum HV_GENERIC_SET_FORMAT { #define HV_CLOCK_HZ (NSEC_PER_SEC/100) =20 typedef struct _HV_REFERENCE_TSC_PAGE { - __u32 tsc_sequence; - __u32 res1; - __u64 tsc_scale; - __s64 tsc_offset; + uint32_t tsc_sequence; + uint32_t res1; + uint64_t tsc_scale; + int64_t tsc_offset; } HV_REFERENCE_TSC_PAGE, *PHV_REFERENCE_TSC_PAGE; =20 /* Define the number of synthetic interrupt sources. */ @@ -499,30 +499,30 @@ enum hv_message_type { =20 /* Define synthetic interrupt controller message flags. */ union hv_message_flags { - __u8 asu8; + uint8_t asu8; struct { - __u8 msg_pending:1; - __u8 reserved:7; + uint8_t msg_pending:1; + uint8_t reserved:7; }; }; =20 /* Define port identifier type. */ union hv_port_id { - __u32 asu32; + uint32_t asu32; struct { - __u32 id:24; - __u32 reserved:8; + uint32_t id:24; + uint32_t reserved:8; } u; }; =20 /* Define synthetic interrupt controller message header. */ struct hv_message_header { - __u32 message_type; - __u8 payload_size; + uint32_t message_type; + uint8_t payload_size; union hv_message_flags message_flags; - __u8 reserved[2]; + uint8_t reserved[2]; union { - __u64 sender; + uint64_t sender; union hv_port_id port; }; }; @@ -531,7 +531,7 @@ struct hv_message_header { struct hv_message { struct hv_message_header header; union { - __u64 payload[HV_MESSAGE_PAYLOAD_QWORD_COUNT]; + uint64_t payload[HV_MESSAGE_PAYLOAD_QWORD_COUNT]; } u; }; =20 @@ -542,19 +542,19 @@ struct hv_message_page { =20 /* Define timer message payload structure. */ struct hv_timer_message_payload { - __u32 timer_index; - __u32 reserved; - __u64 expiration_time; /* When the timer expired */ - __u64 delivery_time; /* When the message was delivered */ + uint32_t timer_index; + uint32_t reserved; + uint64_t expiration_time; /* When the timer expired */ + uint64_t delivery_time; /* When the message was delivered */ }; =20 struct hv_nested_enlightenments_control { struct { - __u32 directhypercall:1; - __u32 reserved:31; + uint32_t directhypercall:1; + uint32_t reserved:31; } features; struct { - __u32 reserved; + uint32_t reserved; } hypercallControls; }; =20 @@ -571,199 +571,199 @@ union hv_vp_assist_page_msr =20 /* Define virtual processor assist page structure. */ struct hv_vp_assist_page { - __u32 apic_assist; - __u32 reserved1; - __u64 vtl_control[3]; + uint32_t apic_assist; + uint32_t reserved1; + uint64_t vtl_control[3]; struct hv_nested_enlightenments_control nested_control; - __u8 enlighten_vmentry; - __u8 reserved2[7]; - __u64 current_nested_vmcs; + uint8_t enlighten_vmentry; + uint8_t reserved2[7]; + uint64_t current_nested_vmcs; }; =20 struct hv_enlightened_vmcs { - u32 revision_id; - u32 abort; + uint32_t revision_id; + uint32_t abort; =20 - u16 host_es_selector; - u16 host_cs_selector; - u16 host_ss_selector; - u16 host_ds_selector; - u16 host_fs_selector; - u16 host_gs_selector; - u16 host_tr_selector; - - u16 padding16_1; - - u64 host_ia32_pat; - u64 host_ia32_efer; - - u64 host_cr0; - u64 host_cr3; - u64 host_cr4; - - u64 host_ia32_sysenter_esp; - u64 host_ia32_sysenter_eip; - u64 host_rip; - u32 host_ia32_sysenter_cs; - - u32 pin_based_vm_exec_control; - u32 vm_exit_controls; - u32 secondary_vm_exec_control; - - u64 io_bitmap_a; - u64 io_bitmap_b; - u64 msr_bitmap; - - u16 guest_es_selector; - u16 guest_cs_selector; - u16 guest_ss_selector; - u16 guest_ds_selector; - u16 guest_fs_selector; - u16 guest_gs_selector; - u16 guest_ldtr_selector; - u16 guest_tr_selector; - - u32 guest_es_limit; - u32 guest_cs_limit; - u32 guest_ss_limit; - u32 guest_ds_limit; - u32 guest_fs_limit; - u32 guest_gs_limit; - u32 guest_ldtr_limit; - u32 guest_tr_limit; - u32 guest_gdtr_limit; - u32 guest_idtr_limit; - - u32 guest_es_ar_bytes; - u32 guest_cs_ar_bytes; - u32 guest_ss_ar_bytes; - u32 guest_ds_ar_bytes; - u32 guest_fs_ar_bytes; - u32 guest_gs_ar_bytes; - u32 guest_ldtr_ar_bytes; - u32 guest_tr_ar_bytes; - - u64 guest_es_base; - u64 guest_cs_base; - u64 guest_ss_base; - u64 guest_ds_base; - u64 guest_fs_base; - u64 guest_gs_base; - u64 guest_ldtr_base; - u64 guest_tr_base; - u64 guest_gdtr_base; - u64 guest_idtr_base; - - u64 padding64_1[3]; - - u64 vm_exit_msr_store_addr; - u64 vm_exit_msr_load_addr; - u64 vm_entry_msr_load_addr; - - u64 cr3_target_value0; - u64 cr3_target_value1; - u64 cr3_target_value2; - u64 cr3_target_value3; - - u32 page_fault_error_code_mask; - u32 page_fault_error_code_match; - - u32 cr3_target_count; - u32 vm_exit_msr_store_count; - u32 vm_exit_msr_load_count; - u32 vm_entry_msr_load_count; - - u64 tsc_offset; - u64 virtual_apic_page_addr; - u64 vmcs_link_pointer; - - u64 guest_ia32_debugctl; - u64 guest_ia32_pat; - u64 guest_ia32_efer; - - u64 guest_pdptr0; - u64 guest_pdptr1; - u64 guest_pdptr2; - u64 guest_pdptr3; - - u64 guest_pending_dbg_exceptions; - u64 guest_sysenter_esp; - u64 guest_sysenter_eip; - - u32 guest_activity_state; - u32 guest_sysenter_cs; - - u64 cr0_guest_host_mask; - u64 cr4_guest_host_mask; - u64 cr0_read_shadow; - u64 cr4_read_shadow; - u64 guest_cr0; - u64 guest_cr3; - u64 guest_cr4; - u64 guest_dr7; - - u64 host_fs_base; - u64 host_gs_base; - u64 host_tr_base; - u64 host_gdtr_base; - u64 host_idtr_base; - u64 host_rsp; - - u64 ept_pointer; - - u16 virtual_processor_id; - u16 padding16_2[3]; - - u64 padding64_2[5]; - u64 guest_physical_address; - - u32 vm_instruction_error; - u32 vm_exit_reason; - u32 vm_exit_intr_info; - u32 vm_exit_intr_error_code; - u32 idt_vectoring_info_field; - u32 idt_vectoring_error_code; - u32 vm_exit_instruction_len; - u32 vmx_instruction_info; - - u64 exit_qualification; - u64 exit_io_instruction_ecx; - u64 exit_io_instruction_esi; - u64 exit_io_instruction_edi; - u64 exit_io_instruction_eip; - - u64 guest_linear_address; - u64 guest_rsp; - u64 guest_rflags; - - u32 guest_interruptibility_info; - u32 cpu_based_vm_exec_control; - u32 exception_bitmap; - u32 vm_entry_controls; - u32 vm_entry_intr_info_field; - u32 vm_entry_exception_error_code; - u32 vm_entry_instruction_len; - u32 tpr_threshold; - - u64 guest_rip; - - u32 hv_clean_fields; - u32 hv_padding_32; - u32 hv_synthetic_controls; - struct { - u32 nested_flush_hypercall:1; - u32 msr_bitmap:1; - u32 reserved:30; + uint16_t host_es_selector; + uint16_t host_cs_selector; + uint16_t host_ss_selector; + uint16_t host_ds_selector; + uint16_t host_fs_selector; + uint16_t host_gs_selector; + uint16_t host_tr_selector; + + uint16_t padding16_1; + + uint64_t host_ia32_pat; + uint64_t host_ia32_efer; + + uint64_t host_cr0; + uint64_t host_cr3; + uint64_t host_cr4; + + uint64_t host_ia32_sysenter_esp; + uint64_t host_ia32_sysenter_eip; + uint64_t host_rip; + uint32_t host_ia32_sysenter_cs; + + uint32_t pin_based_vm_exec_control; + uint32_t vm_exit_controls; + uint32_t secondary_vm_exec_control; + + uint64_t io_bitmap_a; + uint64_t io_bitmap_b; + uint64_t msr_bitmap; + + uint16_t guest_es_selector; + uint16_t guest_cs_selector; + uint16_t guest_ss_selector; + uint16_t guest_ds_selector; + uint16_t guest_fs_selector; + uint16_t guest_gs_selector; + uint16_t guest_ldtr_selector; + uint16_t guest_tr_selector; + + uint32_t guest_es_limit; + uint32_t guest_cs_limit; + uint32_t guest_ss_limit; + uint32_t guest_ds_limit; + uint32_t guest_fs_limit; + uint32_t guest_gs_limit; + uint32_t guest_ldtr_limit; + uint32_t guest_tr_limit; + uint32_t guest_gdtr_limit; + uint32_t guest_idtr_limit; + + uint32_t guest_es_ar_bytes; + uint32_t guest_cs_ar_bytes; + uint32_t guest_ss_ar_bytes; + uint32_t guest_ds_ar_bytes; + uint32_t guest_fs_ar_bytes; + uint32_t guest_gs_ar_bytes; + uint32_t guest_ldtr_ar_bytes; + uint32_t guest_tr_ar_bytes; + + uint64_t guest_es_base; + uint64_t guest_cs_base; + uint64_t guest_ss_base; + uint64_t guest_ds_base; + uint64_t guest_fs_base; + uint64_t guest_gs_base; + uint64_t guest_ldtr_base; + uint64_t guest_tr_base; + uint64_t guest_gdtr_base; + uint64_t guest_idtr_base; + + uint64_t padding64_1[3]; + + uint64_t vm_exit_msr_store_addr; + uint64_t vm_exit_msr_load_addr; + uint64_t vm_entry_msr_load_addr; + + uint64_t cr3_target_value0; + uint64_t cr3_target_value1; + uint64_t cr3_target_value2; + uint64_t cr3_target_value3; + + uint32_t page_fault_error_code_mask; + uint32_t page_fault_error_code_match; + + uint32_t cr3_target_count; + uint32_t vm_exit_msr_store_count; + uint32_t vm_exit_msr_load_count; + uint32_t vm_entry_msr_load_count; + + uint64_t tsc_offset; + uint64_t virtual_apic_page_addr; + uint64_t vmcs_link_pointer; + + uint64_t guest_ia32_debugctl; + uint64_t guest_ia32_pat; + uint64_t guest_ia32_efer; + + uint64_t guest_pdptr0; + uint64_t guest_pdptr1; + uint64_t guest_pdptr2; + uint64_t guest_pdptr3; + + uint64_t guest_pending_dbg_exceptions; + uint64_t guest_sysenter_esp; + uint64_t guest_sysenter_eip; + + uint32_t guest_activity_state; + uint32_t guest_sysenter_cs; + + uint64_t cr0_guest_host_mask; + uint64_t cr4_guest_host_mask; + uint64_t cr0_read_shadow; + uint64_t cr4_read_shadow; + uint64_t guest_cr0; + uint64_t guest_cr3; + uint64_t guest_cr4; + uint64_t guest_dr7; + + uint64_t host_fs_base; + uint64_t host_gs_base; + uint64_t host_tr_base; + uint64_t host_gdtr_base; + uint64_t host_idtr_base; + uint64_t host_rsp; + + uint64_t ept_pointer; + + uint16_t virtual_processor_id; + uint16_t padding16_2[3]; + + uint64_t padding64_2[5]; + uint64_t guest_physical_address; + + uint32_t vm_instruction_error; + uint32_t vm_exit_reason; + uint32_t vm_exit_intr_info; + uint32_t vm_exit_intr_error_code; + uint32_t idt_vectoring_info_field; + uint32_t idt_vectoring_error_code; + uint32_t vm_exit_instruction_len; + uint32_t vmx_instruction_info; + + uint64_t exit_qualification; + uint64_t exit_io_instruction_ecx; + uint64_t exit_io_instruction_esi; + uint64_t exit_io_instruction_edi; + uint64_t exit_io_instruction_eip; + + uint64_t guest_linear_address; + uint64_t guest_rsp; + uint64_t guest_rflags; + + uint32_t guest_interruptibility_info; + uint32_t cpu_based_vm_exec_control; + uint32_t exception_bitmap; + uint32_t vm_entry_controls; + uint32_t vm_entry_intr_info_field; + uint32_t vm_entry_exception_error_code; + uint32_t vm_entry_instruction_len; + uint32_t tpr_threshold; + + uint64_t guest_rip; + + uint32_t hv_clean_fields; + uint32_t hv_padding_32; + uint32_t hv_synthetic_controls; + struct { + uint32_t nested_flush_hypercall:1; + uint32_t msr_bitmap:1; + uint32_t reserved:30; } hv_enlightenments_control; - u32 hv_vp_id; + uint32_t hv_vp_id; =20 - u64 hv_vm_id; - u64 partition_assist_page; - u64 padding64_4[4]; - u64 guest_bndcfgs; - u64 padding64_5[7]; - u64 xss_exit_bitmap; - u64 padding64_6[7]; + uint64_t hv_vm_id; + uint64_t partition_assist_page; + uint64_t padding64_4[4]; + uint64_t guest_bndcfgs; + uint64_t padding64_5[7]; + uint64_t xss_exit_bitmap; + uint64_t padding64_6[7]; }; =20 #define HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE 0 @@ -794,17 +794,17 @@ struct hv_enlightened_vmcs { * Synthetic timer configuration. */ union hv_stimer_config { - u64 as_uint64; + uint64_t as_uint64; struct { - u64 enable:1; - u64 periodic:1; - u64 lazy:1; - u64 auto_enable:1; - u64 apic_vector:8; - u64 direct_mode:1; - u64 reserved_z0:3; - u64 sintx:4; - u64 reserved_z1:44; + uint64_t enable:1; + uint64_t periodic:1; + uint64_t lazy:1; + uint64_t auto_enable:1; + uint64_t apic_vector:8; + uint64_t direct_mode:1; + uint64_t reserved_z0:3; + uint64_t sintx:4; + uint64_t reserved_z1:44; }; }; =20 @@ -816,70 +816,70 @@ union hv_synic_event_flags { =20 /* Define SynIC control register. */ union hv_synic_scontrol { - u64 as_uint64; + uint64_t as_uint64; struct { - u64 enable:1; - u64 reserved:63; + uint64_t enable:1; + uint64_t reserved:63; }; }; =20 /* Define synthetic interrupt source. */ union hv_synic_sint { - u64 as_uint64; + uint64_t as_uint64; struct { - u64 vector:8; - u64 reserved1:8; - u64 masked:1; - u64 auto_eoi:1; - u64 polling:1; - u64 reserved2:45; + uint64_t vector:8; + uint64_t reserved1:8; + uint64_t masked:1; + uint64_t auto_eoi:1; + uint64_t polling:1; + uint64_t reserved2:45; }; }; =20 /* Define the format of the SIMP register */ union hv_synic_simp { - u64 as_uint64; + uint64_t as_uint64; struct { - u64 simp_enabled:1; - u64 preserved:11; - u64 base_simp_gpa:52; + uint64_t simp_enabled:1; + uint64_t preserved:11; + uint64_t base_simp_gpa:52; }; }; =20 /* Define the format of the SIEFP register */ union hv_synic_siefp { - u64 as_uint64; + uint64_t as_uint64; struct { - u64 siefp_enabled:1; - u64 preserved:11; - u64 base_siefp_gpa:52; + uint64_t siefp_enabled:1; + uint64_t preserved:11; + uint64_t base_siefp_gpa:52; }; }; =20 struct hv_vpset { - u64 format; - u64 valid_bank_mask; - u64 bank_contents[]; + uint64_t format; + uint64_t valid_bank_mask; + uint64_t bank_contents[]; }; =20 /* HvCallSendSyntheticClusterIpi hypercall */ struct hv_send_ipi { - u32 vector; - u32 reserved; - u64 cpu_mask; + uint32_t vector; + uint32_t reserved; + uint64_t cpu_mask; }; =20 /* HvCallSendSyntheticClusterIpiEx hypercall */ struct hv_send_ipi_ex { - u32 vector; - u32 reserved; + uint32_t vector; + uint32_t reserved; struct hv_vpset vp_set; }; =20 /* HvFlushGuestPhysicalAddressSpace hypercalls */ struct hv_guest_mapping_flush { - u64 address_space; - u64 flags; + uint64_t address_space; + uint64_t flags; }; =20 /* @@ -890,11 +890,11 @@ struct hv_guest_mapping_flush { =20 /* HvFlushGuestPhysicalAddressList hypercall */ union hv_gpa_page_range { - u64 address_space; + uint64_t address_space; struct { - u64 additional_pages:11; - u64 largepage:1; - u64 basepfn:52; + uint64_t additional_pages:11; + uint64_t largepage:1; + uint64_t basepfn:52; } page; }; =20 @@ -903,32 +903,32 @@ union hv_gpa_page_range { * count is equal with how many entries of union hv_gpa_page_range can * be populated into the input parameter page. */ -#define HV_MAX_FLUSH_REP_COUNT ((HV_HYP_PAGE_SIZE - 2 * sizeof(u64)) / \ +#define HV_MAX_FLUSH_REP_COUNT ((HV_HYP_PAGE_SIZE - 2 * sizeof(uint64_t)) = / \ sizeof(union hv_gpa_page_range)) =20 struct hv_guest_mapping_flush_list { - u64 address_space; - u64 flags; + uint64_t address_space; + uint64_t flags; union hv_gpa_page_range gpa_list[HV_MAX_FLUSH_REP_COUNT]; }; =20 /* HvFlushVirtualAddressSpace, HvFlushVirtualAddressList hypercalls */ struct hv_tlb_flush { - u64 address_space; - u64 flags; - u64 processor_mask; - u64 gva_list[]; + uint64_t address_space; + uint64_t flags; + uint64_t processor_mask; + uint64_t gva_list[]; }; =20 /* HvFlushVirtualAddressSpaceEx hypercall */ struct hv_tlb_flush_ex { - u64 address_space; - u64 flags; + uint64_t address_space; + uint64_t flags; struct hv_vpset hv_vp_set; - /* u64 gva_list[]; */ + /* uint64_t gva_list[]; */ }; =20 struct hv_partition_assist_pg { - u32 tlb_lock_count; + uint32_t tlb_lock_count; }; #endif From nobody Sat May 18 22:31:18 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=2; a=rsa-sha256; t=1675939174; cv=pass; d=zohomail.com; s=zohoarc; b=fbtghh3AlFWBeHtp2GpATNrDrQibizvJidT57/eASGa29rnlJ5YLOI4bexdUSWbLVDK3LVyumyA3eJA9SfhjdQ43GjQm6zrTHc93TTI8KvgdhKa8PoJ2TTn+VUNyVISmuxDrlDqWvXs/WhMi9/dWEm6BFMDBA1Z6uu9DkX19O78= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675939174; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=rILu2n+55PxWhIc3uZf00lTC9CxB/k+P+ibUVXcR5pE=; b=EhHn+JzamHvPvzJpIe3+FeGMsguh9zBDRHd6YU7xolx8FTu0wA9Zvw1coewB4BTKO7cANjWmTYqyRLSRFHxt5gPa+Xjdrh8UiSOG+0KAfCqU2BBIIt9pWQ/2cRi65LR7aItBP0ZG2eCDml1Kle4Oejk6Oh11BKKPZKhxaYWX2yY= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1675939174239273.87823394287204; Thu, 9 Feb 2023 02:39:34 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.492282.761749 (Exim 4.92) (envelope-from ) id 1pQ4Kc-0000Ej-5K; Thu, 09 Feb 2023 10:39:10 +0000 Received: by outflank-mailman (output) from mailman id 492282.761749; Thu, 09 Feb 2023 10:39:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pQ4Kc-0000Ec-2A; Thu, 09 Feb 2023 10:39:10 +0000 Received: by outflank-mailman (input) for mailman id 492282; Thu, 09 Feb 2023 10:39:08 +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 1pQ4Ka-0000EU-Kd for xen-devel@lists.xenproject.org; Thu, 09 Feb 2023 10:39:08 +0000 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2071.outbound.protection.outlook.com [40.107.7.71]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id faca7aaf-a865-11ed-933c-83870f6b2ba8; Thu, 09 Feb 2023 11:39:07 +0100 (CET) Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by AM9PR04MB8812.eurprd04.prod.outlook.com (2603:10a6:20b:40b::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6086.18; Thu, 9 Feb 2023 10:38:36 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::e138:4fc3:705c:d178]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::e138:4fc3:705c:d178%7]) with mapi id 15.20.6064.036; Thu, 9 Feb 2023 10:38:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: faca7aaf-a865-11ed-933c-83870f6b2ba8 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iMCrkf98kIMouAlCo/62YTxWBCI8/x0p0vF/cgQNOiEgRLI/iJoCCDcOpyu5dO0t7ibIDqlpG49njqMdqvo0bn4U4Kl8vUUoK8Vw+G70gO3RVmP416crU+7Fyr61u02OhDRmLADdWc5zAzw4y2wqqlnCjp5whdOu+DOVqivBgkpnRgDC0jTOGUAVMSu6yIUKr1MoouNU/+CnM9x+KW1yaFuBCngcgcNIoWmtZiEwcBw2IED7erPfSkvuhzUOWdGgwqwJK1duZAFyXcmPQJ09QdGrLAqf04Ur5TTHxSAWHqTd4xW/dhs4/iidE8C9d2VQC8AUCSDgLDaP4CVzfFRsbw== 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=rILu2n+55PxWhIc3uZf00lTC9CxB/k+P+ibUVXcR5pE=; b=kRNb/Hr5WovfO5ROemcIzfmjPBIEL3viad6d2WP5sGxkNzTR7hzPOaCE5eqiFtfLC6yiypiuFZ4LLlZUPPUSLNJoCkZkgNI0mD5ir28Bb9agKEbK2j+nxm25Q3bMktmfIsKtiilTfqSLVYvCK9Y+yqj1Ln9skJAnkYnh6iuX5+DKmWoIVQB7ytdifM0hpP1hJHe3dVKqnu16kVG3aLfhASBMvEsr3WOOsmBJa5NhvdPHWf/8zmbaF4kSetqF0C494c2nGLY7+h88s1NKf6WikQL+2a3tq+lKHSGlyFDHMY+i1t+nyACqPnd5hcwrld5Qyg4HK37kZIggh8MLc6WqWg== 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=rILu2n+55PxWhIc3uZf00lTC9CxB/k+P+ibUVXcR5pE=; b=h+4Ct9hinHdoKZaCNytvCOQEa7ck9UMC4Nc6qV+jhtJ8KI+fcOtaqt7sdA7QqoQCmxbKsWHNYXDs0rxoxTA6MvMnnO3tDaOIQdnGtrVCzJH1XZ4EV+HroDe2RvpFqEAwIcTAHj75k7/pxEqDKj93Rt2SgPP56cLNC9s4kP9uNf+k8R9svqWqaLhoAnZtZoAvD0xWQyQKSe/xF3sSh1tPpF0pGaMLbpiuHN1YORS+PDiCsEcNHyY2n88g2H2D5hXvMIkFGN1Oj70Mia0V+yvuUAaU4Vq0ngu9XjmDKvHdVAf+R002rnMumHrjiG+LqAeaduoFSoz3sXmt6cY6KhWQmg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <862a1076-4be6-79ac-4243-7d690a2f88ca@suse.com> Date: Thu, 9 Feb 2023 11:38:33 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.7.1 Subject: [PATCH 2/6] common: move standard C fixed width type declarations to common header Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , George Dunlap , Julien Grall , Stefano Stabellini , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= , Bertrand Marquis , Bobby Eshleman , Alistair Francis , Connor Davis , Daniel Smith , Paul Durrant References: <98c3141c-9d49-695e-a936-4e755a4fc527@suse.com> In-Reply-To: <98c3141c-9d49-695e-a936-4e755a4fc527@suse.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR2P281CA0068.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9a::12) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VE1PR04MB6560:EE_|AM9PR04MB8812:EE_ X-MS-Office365-Filtering-Correlation-Id: f5787135-ddb2-4de9-b95e-08db0a89cc30 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xZDN7h274UmwGO384UrUp4P7Mlql0OI9lp2zKjToRlzW757DdLfRh1nJUD86GqPUMjwRw8btEr1eUTT6z4HRg1ji19AHyiHArzyWIogeWO4qX1S12o37DywPBN/LVhIX44TCWVpg/Q/0lwXG+tDWpVqm54gEqL5ZDkzl106LQxB6dEV10HpOY+MhxAsMGyGoMI4cGBPK+ILczJfFxElFtgX62QwHdEqAJrqQxk/5ylsKs/AsvnPNpC1uZtP1sbEdS4HEdWQX/QDaAuYvL5LOigDhK6zTMelKvJkKv79WbswYjK8aaawn0sTC56WLFeophoQRNEaGtoz2T99ckW1G1Dj8Jyx7dxAqkanqi2yNnp+0NU8IqBNPUz8gWsSce1Jl9sOO30l35ED0EIJUm0km1g8i3aa1tom9AJrPkiXDT+KuIPu/ywKOfmikpuFN3qEVVL0OwlWSlgYs3pKPhNCIOQwILxFhBZOZX/skIt15VR5oInyofoTVlVUS6XNNHD7EA2EomBMAcaRmDiK+kn/46NlmsdpAISZEZXbNTXe4h5kBVl1l0SFhHULBaEcvcwkjBfKXuAmcny6R0BzUqlJGosxlmIqanfI/VzbF5Pvt+69HVwPEstVETRzp5t2up9aGh1CXpjPiCsKni4f7sRSb9dtAunrlKQXlEtMEgyBQ04uz6bdueDUhaXS1bSXauaA42hVh+pmlUqt713qtA2lSSxyPdNLmJWGt+qCVSpXTW00= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VE1PR04MB6560.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230025)(366004)(136003)(396003)(376002)(346002)(39860400002)(451199018)(5660300002)(7416002)(86362001)(31696002)(186003)(8936002)(2616005)(26005)(38100700002)(6512007)(83380400001)(54906003)(66946007)(316002)(4326008)(41300700001)(8676002)(66556008)(66476007)(6916009)(478600001)(6506007)(36756003)(6486002)(31686004)(2906002)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?MlVPVlB4SnUzU09KYmFNbE5CRTN5RExFRElPS2t4Q1RRVzM4bENkZVIzYzZB?= =?utf-8?B?aUFUS3BsbzFEc2NweXA5eDZYY0Y1eEtiNGFkQ1ZvZVRHSEV4ZElsSk1CZ0dy?= =?utf-8?B?TG9pajRvQTY5elJ3RTc4Q0ZWVktZMmVpUmZmUFk3NkFrdThWZTNSSndqUTBL?= =?utf-8?B?WXVZMlZrbXg0VUJPWGhxN1p5VzhMNUJ6V1dtSmk5UWRQbFNWVk1RbDZjL0Vk?= =?utf-8?B?dXVJd1YyNmt5by9XTzlMVyt4SnFNSjdWTnp6cHR2Rytlempvck53WFNpN251?= =?utf-8?B?Y01YNTVuYmhsbzR0ZWtPZ3N4T2MvWE9kbTJUc0lCZVA5OGlySit3dUFOQ3Vt?= =?utf-8?B?M0UyR3Q4c2JUcjFuSldZYmtvcU9wQmVuRjlBdEcveVJ1WGtkK1cyd2dWM0Nu?= =?utf-8?B?V3pjaVVZMy93TUN1allJM1FHMzlBenJPNnVQTHVnME1LMnZraDgzdVZuTHJw?= =?utf-8?B?dzR2Z2l6RmRWMzRzMzBRWVJBMlZVcUtnZkI0Y1FPNU5EbVR1cWw1Z1A4ME43?= =?utf-8?B?cmNLdTRhbThTNEMvQW5kQUNIcjVRNE1xc00rd1ZScjhxRHNDcll6TVhKVHJw?= =?utf-8?B?dHRDUnV4U1RQSzRFa2dGY2lEd2NyYVI4dWNIRnZibHVnSlFONW8rTkgya3ZH?= =?utf-8?B?UEZHYXNhSVhQaWtiM3MrNHl2YlVNZE5wUEkyK090ZTdCdzZUZHVaQncvenFH?= =?utf-8?B?YmpGRitGRzk4V3hlcjlZSVBXakc5dlFQeVdQSHg0UmVHUVV1YzVmS1FBVzA1?= =?utf-8?B?SmRNckt3TUpQVzRWOGYyS2R2S0F5SzRxbE9BcXZvSGt3LzVkRDJMOC9IL3VV?= =?utf-8?B?Rno5bmROeWZTV3VCK09wNzBnbXY2dGluWW5tcDErSUcva00ybThTMkZKditl?= =?utf-8?B?WEU0cFN1N0t6SFZJUytCcittUXJORkZxSGJEMVpWSEZIZ2xzR0FySWNzL0dU?= =?utf-8?B?Z2JpQjV0RmxXY1ZyVkxocWs4eStXdm9XbDN6T2owa3VjVlJ6UTV6Z20ySkRS?= =?utf-8?B?MGd2Ulg5MUc2K0tYRUVuWVEvU2lxYmE0cnB0RTdlejhaQmc5Y3VQbFZSS1Ny?= =?utf-8?B?YndjNldHaXpNTGpxWWdsSzZoT25ja2VyM1NHbktvV1FtNkpCa21BUHVnRDJq?= =?utf-8?B?OXNvTUIzYk5GZERMSWg4YWxBU3BoYXNQa2EveXJWcjJGMDlpUDJVejYvaGtt?= =?utf-8?B?b0Y2Y1FJL1dRWGVWWDVDSmtMR2FIbDh6OStLUWhpZ2x3T3hhUEpTR2xkWXdj?= =?utf-8?B?MnBlNzNlbStxZVE3eDFKamdXdmZrYjM0TFkrMWYxeFo3WU5CaW1oaGhMS3c5?= =?utf-8?B?SEFweDRVcnU1dEl6UnFBRGl0dzZCaW9ibVJDaVZLdTVtWU4yam1kVGNVM2RS?= =?utf-8?B?UVl3MkNabVpiZ2YxeGFYSlVxUVN6THRYbTViRjdLQU55YlR5Z3pFSytISXZD?= =?utf-8?B?S3pWYzhCcHRlcUJmVm1Qd1VpRTlNc1BHQVZOcldhaWFrUnhNV3Q4czBuVEt5?= =?utf-8?B?WktqRlAwN3RzbUh6alF5eVNCQ0pOZWpEUi9STi80dStIcGJEUTk3SE9EL0pa?= =?utf-8?B?T1A4aE5jR3BBaFBNNWsxMml4Q3JtY1I4eUQxZEkyZFo5U2NNdlVNNG9KMmZ2?= =?utf-8?B?YTB0bmNtSGJxMDNMTHJSb2RHU1BoVkxaTDF3V1RLR2RqdnU4WFpRZ1JERmZO?= =?utf-8?B?NjdzUUVoamxucjlhRGtIRy9sV2tVT3AwZW9Nb1Q2b01kWERHSWlMNld5NDlG?= =?utf-8?B?aVBJTnUrZkxobG12YzMwVmlvcEs4dkg2OFowOHdTajQ2L2I1d2dFSjhGR2NV?= =?utf-8?B?dXpjdG5nQnNIUXZmY1ZLZjhVNDh1OUhtR1M3SjJoSlBPdHF0Y2E2LzdtMGh3?= =?utf-8?B?WjNaRGliTWcrVW54bWZJckZNMzQ0VWQ3MW91UEVwZ3J0NW1LZ0lodjFFK2xE?= =?utf-8?B?eWFueFcyYVV3YkRPUjFSVStJNmliNTByOFlsbEllTHQ4aWxGaGU2MTFaL1R5?= =?utf-8?B?YVU2cDlnQUhLZ0RLNTBEdWNBRGIrS21XZWl1bFhpYWoySVhKMGYvWjRtUHJx?= =?utf-8?B?bXhmekJXWjBseXpYa2VEQ2U0aGd4alhMb2VoeEZqMTlTS0xieERBamJwOTZM?= =?utf-8?Q?WanG7VLBzrbysN4JIhST8Vh+/?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: f5787135-ddb2-4de9-b95e-08db0a89cc30 X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Feb 2023 10:38:35.8412 (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: Ri+eI6HX8DtkrxNlqljsJdvmUy3/yfa7COjsdEh+Cy7giW+eEbWPZMBD/2MuhQjdMzgSWxU9ltDaIX7bIL633A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8812 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1675939176526100002 Content-Type: text/plain; charset="utf-8" Have these in one place, for all architectures to use. Also use the C99 types as the "original" ones, and derive the Linux compatible ones (which we're trying to phase out). For __s, seeing that no uses exist anymore, move them to a new Linux compatibility header (as an act of precaution - we don't have any uses of these types right now). Modern compilers supply __{,U}INT_TYPE__ - use those if available. Otherwise fall back to using "mode" attributes, but this can be relied upon only when bytes are 8 bits wide. Should there ever be a port to an architecture not matching this, it would need to define the fixed width types locally by some other means. In a few cases inclusion of asm/types.h needs replacing by xen/types.h. Further in common/trace.c take the opportunity and also drop the apparently unused inclusion of asm/io.h at the same time. Finally in some Flask sources inclusion of asm/byteorder.h needs moving later. No functional change intended. Signed-off-by: Jan Beulich --- RFC: I know Andrew would prefer these types to move to a new xen/stdint.h, but not being fully convinced of this myself, I was hoping for others to voice views. --- a/xen/arch/arm/include/asm/types.h +++ b/xen/arch/arm/include/asm/types.h @@ -1,37 +1,8 @@ #ifndef __ARM_TYPES_H__ #define __ARM_TYPES_H__ =20 -typedef __signed__ char __s8; -typedef unsigned char __u8; - -typedef __signed__ short __s16; -typedef unsigned short __u16; - -typedef __signed__ int __s32; -typedef unsigned int __u32; - -#if defined(__GNUC__) && !defined(__STRICT_ANSI__) #if defined(CONFIG_ARM_32) -typedef __signed__ long long __s64; -typedef unsigned long long __u64; -#elif defined (CONFIG_ARM_64) -typedef __signed__ long __s64; -typedef unsigned long __u64; -#endif -#endif - -typedef signed char s8; -typedef unsigned char u8; =20 -typedef signed short s16; -typedef unsigned short u16; - -typedef signed int s32; -typedef unsigned int u32; - -#if defined(CONFIG_ARM_32) -typedef signed long long s64; -typedef unsigned long long u64; typedef u32 vaddr_t; #define PRIvaddr PRIx32 typedef u64 paddr_t; @@ -39,9 +10,9 @@ typedef u64 paddr_t; #define PRIpaddr "016llx" typedef u32 register_t; #define PRIregister "08x" -#elif defined (CONFIG_ARM_64) -typedef signed long s64; -typedef unsigned long u64; + +#elif defined(CONFIG_ARM_64) + typedef u64 vaddr_t; #define PRIvaddr PRIx64 typedef u64 paddr_t; @@ -49,6 +20,7 @@ typedef u64 paddr_t; #define PRIpaddr "016lx" typedef u64 register_t; #define PRIregister "016lx" + #endif =20 #endif /* __ARM_TYPES_H__ */ --- a/xen/arch/riscv/include/asm/types.h +++ b/xen/arch/riscv/include/asm/types.h @@ -1,38 +1,8 @@ #ifndef __RISCV_TYPES_H__ #define __RISCV_TYPES_H__ =20 -typedef __signed__ char __s8; -typedef unsigned char __u8; - -typedef __signed__ short __s16; -typedef unsigned short __u16; - -typedef __signed__ int __s32; -typedef unsigned int __u32; - -#if defined(__GNUC__) && !defined(__STRICT_ANSI__) -#if defined(CONFIG_RISCV_32) -typedef __signed__ long long __s64; -typedef unsigned long long __u64; -#elif defined (CONFIG_RISCV_64) -typedef __signed__ long __s64; -typedef unsigned long __u64; -#endif -#endif - -typedef signed char s8; -typedef unsigned char u8; - -typedef signed short s16; -typedef unsigned short u16; - -typedef signed int s32; -typedef unsigned int u32; - #if defined(CONFIG_RISCV_32) =20 -typedef signed long long s64; -typedef unsigned long long u64; typedef u32 vaddr_t; #define PRIvaddr PRIx32 typedef u64 paddr_t; @@ -43,8 +13,6 @@ typedef u32 register_t; =20 #elif defined (CONFIG_RISCV_64) =20 -typedef signed long s64; -typedef unsigned long u64; typedef u64 vaddr_t; #define PRIvaddr PRIx64 typedef u64 paddr_t; --- a/xen/arch/x86/include/asm/types.h +++ b/xen/arch/x86/include/asm/types.h @@ -1,31 +1,6 @@ #ifndef __X86_TYPES_H__ #define __X86_TYPES_H__ =20 -typedef __signed__ char __s8; -typedef unsigned char __u8; - -typedef __signed__ short __s16; -typedef unsigned short __u16; - -typedef __signed__ int __s32; -typedef unsigned int __u32; - -#if defined(__GNUC__) && !defined(__STRICT_ANSI__) -typedef __signed__ long __s64; -typedef unsigned long __u64; -#endif - -typedef signed char s8; -typedef unsigned char u8; - -typedef signed short s16; -typedef unsigned short u16; - -typedef signed int s32; -typedef unsigned int u32; - -typedef signed long s64; -typedef unsigned long u64; typedef unsigned long paddr_t; #define INVALID_PADDR (~0UL) #define PRIpaddr "016lx" --- a/xen/common/trace.c +++ b/xen/common/trace.c @@ -16,8 +16,6 @@ * it's possible to reconstruct a chronological record of trace events. */ =20 -#include -#include #include #include #include --- a/xen/include/xen/bitops.h +++ b/xen/include/xen/bitops.h @@ -1,6 +1,7 @@ #ifndef _LINUX_BITOPS_H #define _LINUX_BITOPS_H -#include + +#include =20 /* * Create a contiguous bitmask starting at bit position @l and ending at --- /dev/null +++ b/xen/include/xen/linux-compat.h @@ -0,0 +1,19 @@ +/*************************************************************************= ***** + * linux-compat.h + * + * Container for types and other definitions use in Linux (and hence in fi= les + * we "steal" from there), but which shouldn't be used (anymore) in normal= Xen + * files. + */ + +#ifndef __XEN_LINUX_COMPAT_H__ +#define __XEN_LINUX_COMPAT_H__ + +#include + +typedef int8_t __s8; +typedef int16_t __s16; +typedef int32_t __s32; +typedef int64_t __s64; + +#endif /* __XEN_LINUX_COMPAT_H__ */ --- a/xen/include/xen/types.h +++ b/xen/include/xen/types.h @@ -3,6 +3,66 @@ =20 #include =20 +/* Fixed width types */ + +#if defined(__INT8_TYPE__) +typedef __INT8_TYPE__ int8_t; +#elif BITS_PER_BYTE =3D=3D 8 +typedef signed int __attribute__((__mode__(__QI__))) int8_t; +#endif + +#if defined(__UINT8_TYPE__) +typedef __UINT8_TYPE__ uint8_t; +#elif BITS_PER_BYTE =3D=3D 8 +typedef unsigned int __attribute__((__mode__(__QI__))) uint8_t; +#endif + +#if defined(__INT16_TYPE__) +typedef __INT16_TYPE__ int16_t; +#elif BITS_PER_BYTE =3D=3D 8 +typedef signed int __attribute__((__mode__(__HI__))) int16_t; +#endif + +#if defined(__UINT16_TYPE__) +typedef __UINT16_TYPE__ uint16_t; +#elif BITS_PER_BYTE =3D=3D 8 +typedef unsigned int __attribute__((__mode__(__HI__))) uint16_t; +#endif + +#if defined(__INT32_TYPE__) +typedef __INT32_TYPE__ int32_t; +#elif BITS_PER_BYTE =3D=3D 8 +typedef signed int __attribute__((__mode__(__SI__))) int32_t; +#endif + +#if defined(__UINT32_TYPE__) +typedef __UINT32_TYPE__ uint32_t; +#elif BITS_PER_BYTE =3D=3D 8 +typedef unsigned int __attribute__((__mode__(__SI__))) uint32_t; +#endif + +#if defined(__INT64_TYPE__) +typedef __INT64_TYPE__ int64_t; +#elif BITS_PER_BYTE =3D=3D 8 +typedef signed int __attribute__((__mode__(__DI__))) int64_t; +#endif + +#if defined(__UINT64_TYPE__) +typedef __UINT64_TYPE__ uint64_t; +#elif BITS_PER_BYTE =3D=3D 8 +typedef unsigned int __attribute__((__mode__(__DI__))) uint64_t; +#endif + +/* Linux inherited types which are being phased out */ +typedef int8_t s8; +typedef uint8_t u8, __u8; +typedef int16_t s16; +typedef uint16_t u16, __u16; +typedef int32_t s32; +typedef uint32_t u32, __u32; +typedef int64_t s64; +typedef uint64_t u64, __u64; + #include =20 #if defined(__SIZE_TYPE__) @@ -46,18 +106,6 @@ typedef signed long ptrdiff_t; #define LONG_MIN (-LONG_MAX - 1) #define ULONG_MAX (~0UL) =20 -typedef __u8 uint8_t; -typedef __s8 int8_t; - -typedef __u16 uint16_t; -typedef __s16 int16_t; - -typedef __u32 uint32_t; -typedef __s32 int32_t; - -typedef __u64 uint64_t; -typedef __s64 int64_t; - typedef __u16 __le16; typedef __u16 __be16; typedef __u32 __le32; --- a/xen/xsm/flask/ss/conditional.c +++ b/xen/xsm/flask/ss/conditional.c @@ -9,7 +9,6 @@ =20 /* Ported to Xen 3.0, George Coker, */ =20 -#include #include #include #include @@ -17,6 +16,8 @@ #include #include =20 +#include + #include "security.h" #include "conditional.h" =20 --- a/xen/xsm/flask/ss/ebitmap.c +++ b/xen/xsm/flask/ss/ebitmap.c @@ -10,12 +10,14 @@ =20 /* Ported to Xen 3.0, George Coker, */ =20 -#include #include #include #include #include #include + +#include + #include "ebitmap.h" #include "policydb.h" =20 --- a/xen/xsm/flask/ss/policydb.c +++ b/xen/xsm/flask/ss/policydb.c @@ -22,12 +22,14 @@ =20 /* Ported to Xen 3.0, George Coker, */ =20 -#include #include #include #include #include #include + +#include + #include #include "security.h" From nobody Sat May 18 22:31:18 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=2; a=rsa-sha256; t=1675939174; cv=pass; d=zohomail.com; s=zohoarc; b=G1+1DYN6CS0fnh/mgAOh3FoPU/tChEbbXcJTiVGJb/ScPFlAeji7IYFYDDq4O3TUUh2IYkiPodjB3LMUVTWCZtLIwwWQ6AugcWeNfxMoDj5d0DT38TbEhp6S3cQspvSbg4qrYZV4ktvTBo9dygzfDdmkWnd5bguvoOHsTBolv+A= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675939174; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=IZ6dMhewYflEJz8XfzAjeFgRRV7iuGsvgI4j+vcP/zo=; b=Aohio78fI4uXXgrJQ832Vq7OdJoVcmD/EqG9Kid9zJWGFKnjxQtQ+jUWKsOmSb1qRwa0TiDTSgQD+kkXea9U9IQIUxZU58T8tguVYFOyL7Ld8H9Tm55R1WNe/UL3xqazRRf2yMifYTV69gYrGX1xHGCK02BTzvG86DRY6SpTdfE= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1675939174478681.7001158448846; Thu, 9 Feb 2023 02:39:34 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.492283.761760 (Exim 4.92) (envelope-from ) id 1pQ4Kg-0000WR-DF; Thu, 09 Feb 2023 10:39:14 +0000 Received: by outflank-mailman (output) from mailman id 492283.761760; Thu, 09 Feb 2023 10:39:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pQ4Kg-0000WI-9v; Thu, 09 Feb 2023 10:39:14 +0000 Received: by outflank-mailman (input) for mailman id 492283; Thu, 09 Feb 2023 10:39:13 +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 1pQ4Kf-00082J-4W for xen-devel@lists.xenproject.org; Thu, 09 Feb 2023 10:39:13 +0000 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2060e.outbound.protection.outlook.com [2a01:111:f400:7e1b::60e]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id fbd729c4-a865-11ed-93b5-47a8fe42b414; Thu, 09 Feb 2023 11:39:09 +0100 (CET) Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by AM9PR04MB8812.eurprd04.prod.outlook.com (2603:10a6:20b:40b::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6086.18; Thu, 9 Feb 2023 10:39:10 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::e138:4fc3:705c:d178]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::e138:4fc3:705c:d178%7]) with mapi id 15.20.6064.036; Thu, 9 Feb 2023 10:39:10 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: fbd729c4-a865-11ed-93b5-47a8fe42b414 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Nb7TAX9XbHRjntH435Ii1Y/1h1GrE1jI3njwEnd6CLgWQInk4nUM0hx/8y9AgeWvSRmNjH1gBQxwRjc4/OZuASEA+0Zkz3XNQTcTnHivfZ5T426ofjydc0TU65NIqmDAwqV73n5QKDA5t455WYDdFlSKyqWgqicX4cZ7zf3XkJ1kW60vAmzsYJ6gYzjAIWm+4p0u+prf3do1aq5jKPC4hjJxQG6EjcCkmJ287Kwra6cz/SMukIt8f6J+5H2ZyF3zk2edWwEdPI6PK/yd2ss650y3QAX0DhIQtz0aG8OPZZ3k4TYoSEdMusvdKWxXmovpurMve5p34dyTu+a7jYZoxw== 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=IZ6dMhewYflEJz8XfzAjeFgRRV7iuGsvgI4j+vcP/zo=; b=PMkgax1bK6bUa2JrdkJZM7CekKC5LxnsOgisHk/OlPNU5pULQlAyoxIdTcizge77fvhpfdxrbEkVVfvjp7XYk1R0H3TfWiFwU7IPHtm9S0H/miKmc2sStDFJBqnEWTfE/SM8G+OYtRI/Ebhv+mQyH8IGOF21QhMYeDECxh/xXHLCpFPq+0nMsx44lQr0UuukS1MIbJedBUfvIotB5PFplambSIN63hwlRGDvef7lYucBn8Ohjc8BjmP08IPNWO22zoHjLtt32m9fAwPXHdzQ5fFbzoTIQDKrDFToN8occB1yxpdgDjBVy1TPLiETh9sqypHwEKlZR+YjROnUpWc8yg== 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=IZ6dMhewYflEJz8XfzAjeFgRRV7iuGsvgI4j+vcP/zo=; b=5q1MTHOd+W1I/BYvBPolA2lWuSa+Cwso0BwX3Apma4GMnZQ50awMWmtVgXLa8e4nQXdmr45evOXQO+7jpupViPFDqE3e5V4VxfxTQozh5sUloGnrDCsF+NHAtDxmYhtTzGFLTmoKKpw+s5ZVnkllATiCUhQJMJbtungeX2F9qEaZP3S33+0PQAMGzjYbOM6m8SiG1HG1w4EuepzBJosPnMsOSdGlCpRTvZvmtWZbVF+BZrMG+8wupqIVARDskUyd7uyChC6xUb2hnioU78uU6DoUHC3uZEIv6bHMaXrXrFpSBSOQGxMpQ0yJV+cFi7X93Uaznf+OyOfY6Vni787klQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <68bb1c78-2b6c-4b8d-725d-f1d6a6c92dcb@suse.com> Date: Thu, 9 Feb 2023 11:39:08 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.7.1 Subject: [PATCH 3/6] ACPI/CPER: use standard C types Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , George Dunlap , Julien Grall , Stefano Stabellini , Wei Liu References: <98c3141c-9d49-695e-a936-4e755a4fc527@suse.com> In-Reply-To: <98c3141c-9d49-695e-a936-4e755a4fc527@suse.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FRYP281CA0016.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10::26) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VE1PR04MB6560:EE_|AM9PR04MB8812:EE_ X-MS-Office365-Filtering-Correlation-Id: d13952fa-7d8d-4bec-c235-08db0a89e095 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aVZu7CDR3mW+eRsPE8rdamQyutMkNkiE1cfBktYMi4JjoWZPoAka63yxGdeqOb0Eqhzfs+XqUC1bdeEQ1rBU17kSOBjjrMFxAqu4xEEvRS/+lFzqWt8se6zPRXJlVVhQbu6yDmIMgwCUa4cYelgoghrtc60WEe1uzgrvTmyLpOmvUotCWLdjZikkP7+LFQ8ah3MFmocL7LQd2dQyx/Yjzjcq+Sl2W/QvRoXQpum44d0TV0uyLucD6hhnfp2w/9w45SYOA+c5t0UiQZeyu+kN42OprIGpJfWkLB6GAfuARvgAig7F/gdY1MjZ6MC3KlsiPrMSCmk/BWY46NOBquUxCJLEJ1ZKD5vs2bGbw3rrZHUMeiGl4TGQqM4LU0OZ7oHsRCOvbOcXVA/eHDabdmn4ZCfAHm4JqlQRgn6Bqn2JAvGgIiGCKvLuSmoWSa43h9Nug2jMYDfJG+N6DAaN2usaOOozTnZtFlTB0OAYVayzH6QUPmYYCC+s5PC9KPOW3jsalZY8skoBNUeukMticrmq97zfderoO91rwMenRCJleMwc5XMPAGY9EMwAAHdNH+xSCHNDP1TG1lJyj++vi3PAi0v+yhbXVkERZOjgKxBlBLvkAifgsKg6g2k1KU26dIdTA80Or2H0T0NiMxLPljsJer6s1FsdLw+8yR7ffc5jI5gsTp0G+2Mii4p9pjPpgF8iK//h8fZ283nF1ghSaHVX9Etz+jRp68fP+axWe+HOXY4= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VE1PR04MB6560.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230025)(366004)(136003)(396003)(376002)(346002)(39860400002)(451199018)(5660300002)(86362001)(31696002)(186003)(8936002)(2616005)(26005)(38100700002)(6512007)(83380400001)(54906003)(66946007)(316002)(4326008)(41300700001)(8676002)(66556008)(66476007)(6916009)(478600001)(6506007)(36756003)(6486002)(31686004)(2906002)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?a0duTkhIMkQra3IwMEgwNGhQRHdraUJuRFNFdG5GcTU2YkU4aDJtdWFUa29i?= =?utf-8?B?R3JyWCtpalA2SlJQUmk0YkkxMkIzTW5hRW5seDViY00xZzlpY2thNk52QW9K?= =?utf-8?B?RDA3SE1aVnJzV2JjMVZDSXVTTzBsN2hja0YyUmllOG45K0pHcmIzUUI1T2ly?= =?utf-8?B?Y2psdzd4RXArc0xtUmsrVkZ3MldqSlp3TDJpMW1NbzduMWxBUExFS3d1Z2M5?= =?utf-8?B?bVlmMWFvRVFwSlNWUHYvblpUNWw0UzBITWVmQlgzY2hScU5YS0VJQXJ2Nndm?= =?utf-8?B?RC8yVlNYVWdpMmpneDBINndvKzMrZ0ZMOVhveUxSMXNTdVpCN0xYbG00QXVW?= =?utf-8?B?R0hKQzNXcDNUaStpYWM1ZkJ0K2ZvcmY1eXhiVnV0Z25GZkFwMG1IVmIvdWVH?= =?utf-8?B?Q1ZkTU41MndRUG1RcjI1SFJVWXFhK1VzWVFDczd6cHhlQ01WRkFHSm9zOVhY?= =?utf-8?B?MEV6eklsckR1akdNMWN3UFVTY2F2RDhvbXRzcFVVZEtmZm5yeHBadXN3Q1ho?= =?utf-8?B?cG1WRWdiZ2pzQ25VREhxQ2VWbi9GdGtZUG8reDhVc1N0aEl3NEZ2M3VSTXNk?= =?utf-8?B?dEZXUmM4cFIxVSt5TUp1SWFNSWNUb2dlQzcreFk4ODZhZGg1OE1ZQWdITGNM?= =?utf-8?B?bE1Ya0NET0VGUU1ZQlZSTkE3cnZOaDAzK1krbW5qS3lzeVJ5NlQyQ2lLNWoz?= =?utf-8?B?OTBpcnpnaWFheUVCR21qNlEzZmloSnB3Y3cxeFZBSU1RcVFnRTh6dTN6aFoz?= =?utf-8?B?V2U2ZVB2S0xldGp5UUVOVkZHT29QaXRMVlBwWDQ5cWIxVHRNNGxaOUlmRGM3?= =?utf-8?B?eEZKUk1YUHR3eUNIaTNqNVg1N3RKMEM1RXNlUnNQaDhvbFVSeW1LcG8zVHlv?= =?utf-8?B?WjVMS3lzbGNmckZSY3JNMlI1RDcvdUZOUUJxMlFPRExrY2tQMGFKUmErbUhj?= =?utf-8?B?elFpcW91a2krbVlHWEwrK2FtdktLVG9IKzdXeXMvOHpJdnI1c0F5b3Bmc3BG?= =?utf-8?B?c3dpcTNWdUNVWkN2MFk0dk9lS25OK0hRVjlINXVmOEl6eiswemVscUlGUEJm?= =?utf-8?B?V0xXT1FnZnlxbFJvUHVCVFNJcFBRV3VRNm5id05xdFM5R2VGNmQzdVpnVHEx?= =?utf-8?B?WlYyS2lEZTM5NjJzWDZnb1l4WTN3TytGNmJrWVJoWEFNREJsTmJFVHIrbXlK?= =?utf-8?B?UFBWM3FFb2orTEFCYlVWV1Y1TUFBdmlHN0FWY0dMeXE4ZHFnVFc0YWxaWk1x?= =?utf-8?B?Rkdxcms4TWVpaVVVRVdkMnZjY2J2dy9rRHNOTUpiZzJUV3I4a3BpOG84Wkpx?= =?utf-8?B?MVZOU2JyUUlUVHFqTkhOdy94N2p0czVXZTNlWG1xQUZ4SjZNUkZBY1Bsa3A5?= =?utf-8?B?c1BrSVp1OGNrLzdCa0hnUVR0TE9WaUM3bEpoT1FORThBNmw3S3IyOUl6TlR2?= =?utf-8?B?VzFIc2h1TVZpRlE3Vm56L2pHeURVZk1XQjRKNHlqRFBPYXJCbGl3MXBha1Er?= =?utf-8?B?Wmd2dGFOaUZEa0t2ZjVtakFmUmxsRUV0VUhKV1UyeituR1UxeUc5WXFLSnc4?= =?utf-8?B?cDk0U01vMnpTTDcvcXpvUEQzdWF4TFczd25JTUxMc1VqQVlYR2VodlZzTm5Y?= =?utf-8?B?RDNXUHk1SFk3b0pNTXBabHc3NlNDMnJHTlArOGwveEk0VUwvbitaOCtmMWJa?= =?utf-8?B?KzZwYTR6bXBWZFlpWW1TbW00NUZ3b002Y09KMkZoTExhR0xZQTZSS3I1M3FU?= =?utf-8?B?Z0xVMW40ZUJYcmF1Wk1yWmV3YlJKWFFQb0s4THkvVnJPVFlCeFdJS0RROEE3?= =?utf-8?B?MkVRYk1HVXR5NDB2a2wrNHovUnNMdEFIY1h6WVVLTi9TSlFmS3hYRXZQaTVt?= =?utf-8?B?cFpHVG10VUwvMFVLc1pXcEJaVFArcldlLzY4NnZXcm8zSTE3VDR4Yjl1VVI5?= =?utf-8?B?VjZkS2tNWGRJNTJtNmNrWU93NDJuU0xaZUFVY3MyVkpMWlExL1FCcEJtSk91?= =?utf-8?B?eXYrb2dsT1ErT2JWWXg1R1pZMEY4MFFtb2JPeU42T3FVMS90WThoRlY2Qy9k?= =?utf-8?B?cjJiSjhEWHNuOFBvWFI3OHd5QkhZNzdKVGNiMmlMcWlUcnhtYmYvQ0dHNFEr?= =?utf-8?Q?mxfjbZURAoENBDKuqNzNXfrgQ?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: d13952fa-7d8d-4bec-c235-08db0a89e095 X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Feb 2023 10:39:09.9327 (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: Ij1zuDafS55VRwyH3CfYoxU8FvupoEEmXjhYnPpPix0DEfzIC5cjGFFkla0ndAjpxJQoY6hZuN/BI9/ueMBL/w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8812 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1675939176495100001 Content-Type: text/plain; charset="utf-8" Consolidate cper.h to use exclusively standard types. No functional change intended. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- a/xen/include/xen/cper.h +++ b/xen/include/xen/cper.h @@ -27,7 +27,7 @@ extern unsigned long get_sec(void); =20 typedef struct { - __u8 b[16]; + uint8_t b[16]; } uuid_le; =20 static inline int uuid_le_cmp(const uuid_le u1, const uuid_le u2) @@ -35,12 +35,12 @@ static inline int uuid_le_cmp(const uuid return memcmp(&u1, &u2, sizeof(uuid_le)); } =20 -static inline u64 cper_next_record_id(void) +static inline uint64_t cper_next_record_id(void) { - static u64 record_id; + static uint64_t record_id; =20 if (!record_id) - record_id =3D (u64)get_sec() << 32; + record_id =3D (uint64_t)get_sec() << 32; =20 return ++record_id; } @@ -154,36 +154,36 @@ static inline u64 cper_next_record_id(vo =20 struct cper_record_header { char signature[CPER_SIG_SIZE]; /* must be CPER_SIG_RECORD */ - __u16 revision; /* must be CPER_RECORD_REV */ - __u32 signature_end; /* must be CPER_SIG_END */ - __u16 section_count; - __u32 error_severity; - __u32 validation_bits; - __u32 record_length; - __u64 timestamp; + uint16_t revision; /* must be CPER_RECORD_REV */ + uint32_t signature_end; /* must be CPER_SIG_END */ + uint16_t section_count; + uint32_t error_severity; + uint32_t validation_bits; + uint32_t record_length; + uint64_t timestamp; uuid_le platform_id; uuid_le partition_id; uuid_le creator_id; uuid_le notification_type; - __u64 record_id; - __u32 flags; - __u64 persistence_information; - __u8 reserved[12]; /* must be zero */ + uint64_t record_id; + uint32_t flags; + uint64_t persistence_information; + uint8_t reserved[12]; /* must be zero */ }; =20 struct cper_section_descriptor { - __u32 section_offset; /* Offset in bytes of the + uint32_t section_offset; /* Offset in bytes of the * section body from the base * of the record header */ - __u32 section_length; - __u16 revision; /* must be CPER_RECORD_REV */ - __u8 validation_bits; - __u8 reserved; /* must be zero */ - __u32 flags; + uint32_t section_length; + uint16_t revision; /* must be CPER_RECORD_REV */ + uint8_t validation_bits; + uint8_t reserved; /* must be zero */ + uint32_t flags; uuid_le section_type; uuid_le fru_id; - __u32 section_severity; - __u8 fru_text[20]; + uint32_t section_severity; + uint8_t fru_text[20]; }; =20 /* Reset to default packing */ From nobody Sat May 18 22:31:18 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=2; a=rsa-sha256; t=1675939219; cv=pass; d=zohomail.com; s=zohoarc; b=XN5wFmfKhvdMz5zW/jqk45YbvODcE+vZmzpq0QZD1vC7WKNNuF2xy2XNEQ7RWYZPa8Cdf7+ASu91pGFaqWV78a320Cj+PoB+tlUvh6ksgeT1/GvlbFDncxpieNk4AR2qY5s5TsYzUQ5Rfx5KDLK7YdHTPqduhK/shTzC0agXrSI= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675939219; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=PsV8xTifBcj/y3tgKvVpVcGSALX044cesQDYK+Fr4Ek=; b=LU51ZiLrm5q4cM0D6kCciS2ln5QCXBpdvP6aEd2rLrphe+2K02+XwYwja2/ORGPrw49aKR429g+J4zIQIHOGxC9o5ECbGd6Xev6ycIqzeylmQV0x3lKLxD2XlTulTL9v9uIgc9M3sU/4np0sBEWF9wEWfX1spZi8QxjXtyFELsA= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1675939219294524.7197871806425; Thu, 9 Feb 2023 02:40:19 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.492294.761770 (Exim 4.92) (envelope-from ) id 1pQ4LL-0001N7-QH; Thu, 09 Feb 2023 10:39:55 +0000 Received: by outflank-mailman (output) from mailman id 492294.761770; Thu, 09 Feb 2023 10:39:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pQ4LL-0001N0-NU; Thu, 09 Feb 2023 10:39:55 +0000 Received: by outflank-mailman (input) for mailman id 492294; Thu, 09 Feb 2023 10:39:54 +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 1pQ4LJ-0000EU-Qd for xen-devel@lists.xenproject.org; Thu, 09 Feb 2023 10:39:54 +0000 Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02on20606.outbound.protection.outlook.com [2a01:111:f400:fe13::606]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 160a4f14-a866-11ed-933c-83870f6b2ba8; Thu, 09 Feb 2023 11:39:53 +0100 (CET) Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by AS4PR04MB9387.eurprd04.prod.outlook.com (2603:10a6:20b:4ea::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.32; Thu, 9 Feb 2023 10:39:50 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::e138:4fc3:705c:d178]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::e138:4fc3:705c:d178%7]) with mapi id 15.20.6064.036; Thu, 9 Feb 2023 10:39:50 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: 160a4f14-a866-11ed-933c-83870f6b2ba8 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FUF/5wg0yAoQ5BnNkl3+d8S1Z49SeY+Vq6ogeiMo6lweg7aUOHx8mgMNunFIvpRz4r2LugQ5LoK/79sRUBQc/y+muqZiCTJPNUI1wN/jEwsshJerPeitPgye+4QOtqBA9QlDXCl3Qed39dUlnvOPb1MLexkA9qnGfOBqpZUmVCIVZKeuIAaYvq1rmpDkfTI+c/SmafQexSXe4uwpSFWQEk8QwI+E0SVYNJFjo3qPmCv1HBQawDWIuC5mBqDGeUrnvIbT0x0ngHCObYwAZLroqLot7v7thfMXt9zc8PQYNJiyAqJI3M4/0rMlORAwHQZ4CCMEBSFMO5iO39aYn02TKg== 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=PsV8xTifBcj/y3tgKvVpVcGSALX044cesQDYK+Fr4Ek=; b=QR2u6+HCW2e/dhqtz+gEW629Zb3W0R9VPCj+j4tkqltGJ67bNnhHyPz5MEAFyZuHsytaN9+GpAHbcD0v2ALSHer8la79VoVR2LAa91j5qfM+EQxEzIgpsKk4H6IOETfiWq97O2sYMKY9CALqaK7toGp1NUJwmB2KPQ10u7SjDMhfNPyTf+//gxXK7FrpvDeiO0DJYBKvBCn/aCDSudVvQsx9ReY6cGdof5wfC+id4kgAbRAnjNUyPEIORnITGtHvhfYsUb6qsOCyJO291uj6X4qPd+wMqEWYj82OnCi7vyS9h1q9cRrCqYGyRC3dNjgxCzpYWu2584RJS+XXk264Rg== 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=PsV8xTifBcj/y3tgKvVpVcGSALX044cesQDYK+Fr4Ek=; b=AnqoOJYGekNWGqT455/63I735z95vafYL1j8sp8/dVnvMMMZFUkBBP+LiTK6Qyl+e2ByOhC14PbNoFVEPwIRnhgdFIBv1tGcEJsPh+6TJCWnNEIZiIFq/1D0md5lMWcVKrE4QAYiBa0rp+1LMz9R5FXM5jkGOadmZL5GRDo7pxHe+BoW5XQZSvVo4M5jgNFdG4OB83Ku71titSb9a2W7zzsas56b+jkeySZOtxsGiQyIYfMzjlIs6uuYTeOh1s4lyPLOm88UVLbX9EfBx3UKF8hyBQ5juiKB4+nCia4vPTSokmdPH2FUbN7CYC/PRo/2EDWyElQIVSXAmvnz9KEOJA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <9f375055-eff2-010b-c904-e4122b834777@suse.com> Date: Thu, 9 Feb 2023 11:39:48 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.7.1 Subject: [PATCH 4/6] x86/MSI: use standard C types in structures/unions Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , George Dunlap , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= References: <98c3141c-9d49-695e-a936-4e755a4fc527@suse.com> In-Reply-To: <98c3141c-9d49-695e-a936-4e755a4fc527@suse.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR3P281CA0101.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a1::10) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VE1PR04MB6560:EE_|AS4PR04MB9387:EE_ X-MS-Office365-Filtering-Correlation-Id: 52788b22-d743-4a63-6823-08db0a89f8b4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Mu35lepH7Ed1r5RZ0TjaXbzpzyhfsKABQiMpnZ4HUHxPBEhCEduQdsqI1PH8kl7iGtgXasskD+u0DeMh384cxB5BRjC0R6Fr+cAappZbptdg49Bgd4lO9OTW6tAoCQanNL7RqSEgDXKkfZZI3iDbwtJ2tntQlVsEV14fKprZHpK/OPL8ZxejIfNwZaU4wlMuxC7manYl/FEu1oE/UXXriMxUy9JlJlTPcdy1+pZ/oTXSgKxpZz3za6nG7VJ6uMSTvmG/8k+545I9Hu6L+cPPFUvJZClwPCSzZD+SoLVm1QcZxpoTXKvZlkn5i91stpJ/3TnH9yPxTPYmhGWC3qEupSqe1+h2MFO7yZmjDyBjGoBGCRRIM8Djeb8P6mbA0jdAdJE0SEBnQcoINCC1IDX8NkwgiRDfLIShDsJ2bLuBsEcFQijbZWgR2SqjWAtKqUYHPZlxJI7wFbKArsgQ8sObIw7+lzh8/QPVp8YuRhWYhxo9T1NOBtB5+gd9No/zQnpTZ9cGctdjOSrvJVt3/6x04kyokOQHSB2ln0DNehxGqTjutfrEXRmoJOLuyAS6+SOLClMa9mOlIGb0ZYNDV7urhbKRAIJHr+ZWqa8c38hEANANjod/q7z/hFTCW+/iDo1fxgonW0lUhZs94tsQOSOQusW7z7zjgWJu/1xkac1XftokDTURokRZRmKyLD90meDPWSFLDO2pn/noMkpnFZOpiMVJjE9WmFOJsPk3Td/8KDY= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VE1PR04MB6560.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230025)(396003)(366004)(136003)(39860400002)(346002)(376002)(451199018)(26005)(5660300002)(31696002)(86362001)(8936002)(186003)(41300700001)(83380400001)(4326008)(2616005)(6512007)(38100700002)(54906003)(8676002)(66946007)(316002)(6916009)(66556008)(66476007)(6506007)(478600001)(36756003)(6486002)(31686004)(2906002)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?MTlhVUJTbDU2Z3N5Si9FVnZtdTZ0WWkwbmJXazgzZlJiVDNCdHUyS2dSNVBs?= =?utf-8?B?TDRTbk9kRE1zRFRYdWtkWThlUlcxa3FwTUUzaXRyaWRoRVJyM3hsYTVzVEM2?= =?utf-8?B?dmplNjBjN24walBjckNYejV6Q0ZReG9sN1hyN0xrUTVJWFpaNlJlZlprb1FL?= =?utf-8?B?Q1BkZy9veDlHR0ExaWJtRklRRDJJcG16bFJDMHhsaTA2MUFiQk83U3lyU1Fx?= =?utf-8?B?S2pQZGQ1Z2pWWVR2VWJaUzVqaHR4ZVlvSWZ6U3lheGhDRktMcVJjdGJwcm9m?= =?utf-8?B?cEc0T0VoOG5HcTQ2eTUvaktxTUM3QXpoNG5ienU5aWt4Q2Z2cWtRT3BYSm5k?= =?utf-8?B?c0MyQU9BbTU3c2NmUExORDJtSzBFY3JiS1NLaDVmeFo2QmVvUkttdWc0S24y?= =?utf-8?B?aUp5T0ZGSWExajhQSkgweXFHRDlVblRMREpJRHE5SGYxT0lkSnN6aEhhM3Aw?= =?utf-8?B?RU5hRFJ0dVIwZitNeEYySDdsZkxHVWtRQ0xnMG1wRGZLd2JWYkhJMUtENEdJ?= =?utf-8?B?blBwVVAyQmw2U2dpZm1CUUNSODRhbEYwZ0dXQjh0SnVVS0p3akdZVXZoallN?= =?utf-8?B?c0FZZkxKQnIzcDZsSHlrRkROWUIwanJsVG4yczdjOFY0dHNzYW1xc3N3cHlu?= =?utf-8?B?bkhRdTN3V0VpaU1Gejh4eENBYUdYQzQ3aDhnL0wydU5ZRkJHT0NSWHUwK3Aw?= =?utf-8?B?NjF4c25JTks2eEFiYjFDTEFZUWdONERFTEg3dGJmRTZaemlMUnp5UWM0R0xm?= =?utf-8?B?T2ViV1VpdDFNNkZmRGZoMXRqZ0NCekp0eElnYTd5ajBmU20wVTNZTUZWdnhk?= =?utf-8?B?TXFtS09sWXhTNVI4UWZ6Q3dJVWd1VHIyMUlOTkdBakFkcXc0S2U4cDB3NGJH?= =?utf-8?B?L2RlQ05QKzVkNWNmZzlaMWxmV2lVL3lGYzRKaDNvMmJnV3hqNnRheEpJRnN1?= =?utf-8?B?WUo2L1FMRW9MZGZMNTJCUEJlcU4vOUJQVmtUSWVUY1k3ZU1hSWZBY215ZnhV?= =?utf-8?B?ekJLcWdHZXk4Q2lKRkwyd2VHRUxGMERGV1ZVVU1vMWEwMXB6R0g5R2tkaFkw?= =?utf-8?B?NU9HazhXcmZmeXllS2tjWWZyQzN2RnFBa2xxb1NWWTJTbjA4Y09jbXVSV0ZE?= =?utf-8?B?RWJ5QmZkWERzYXhHcWpua2NWamlNVWtIWWxJRitDRTc1bVEzSnAwNFAzaUtS?= =?utf-8?B?TzhqbjRMelBiQ3RvWFBTR20xMGVYWmNrWlozRGRUaDVrZTF5bVJjald6ejIy?= =?utf-8?B?VTExL1NVZlpROCs5eWI5TjJpUThvUWFFTm4xaFdaU2ZyL0k2TSs5U2tJbUR6?= =?utf-8?B?VnlXUGZLOW9pRTlHSjZDNHhDaUJiTGxkejRPZUczUDNXK0doS2dwanJiYVh6?= =?utf-8?B?OHpJQjlrSEJYNCtkS2UyZ0RBN2hhbVA4WHdVTWlaRWlFS0dzUlQ1U0t4amVQ?= =?utf-8?B?MTF2bWxXUFgwM0c0bHkxbTJTbHRWWlN5Ylg0RWZVTXpuTEpKYXY5RlhHL1M4?= =?utf-8?B?L0VYSVJDM1U4YW5sc2VaMkgzclJ1UnhrSmdLcTlJOEtKTDRJUmJkN3p2K010?= =?utf-8?B?VWhueGczazJKYndpSERTYXV6SVo2U0lUczVlSS9icjQvRXhNalRyRk5jdVNT?= =?utf-8?B?Z2lCb3UwOVRWSHdGVjloUEMrOHhzK3d1YnF5ZUdRUTVXalo4Q1kxTVQrblJ2?= =?utf-8?B?Si9qNWpIYkZFMEdMR1NraENYZXdRMExsK1ZaTEkwMG14VkwyMTdoYVNuOUYy?= =?utf-8?B?K2VKZ1hINGNESDR3UWdabTZoc2Fnc0hoZXlHL016Z2FzajUxMEw4T21CT2x6?= =?utf-8?B?aUtFbHFOakZxTVlNZ2dGeVZWdkpzTGxqZjZ6dC8xQlVGL2toNGNkd2s3L201?= =?utf-8?B?bkxTbXRJczhueFFZL1ZiTUZIRHRCb3c2R2ZKeEFBRm1ERTZ5aXoxcG5MN0NR?= =?utf-8?B?V2JTTzZZcDF4YUJ0cnlxYWxVUWIvRFc5L1RnclAwVmYveTd0ZytuSGxZSU53?= =?utf-8?B?MWl5b1pNQWxXMGYzbU5kOEZ1MXlJRHd5Sk11MkQvZER3NVNZb2Y5a05LbDc0?= =?utf-8?B?WU1qSGtMY1FTMUdrQmdsVDFmdkVQMVVzVC82cko5dmxIVWIxMVJ4Yzk3Z3By?= =?utf-8?Q?cMpLTQudyHTzDeYgL0CKPZhBP?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 52788b22-d743-4a63-6823-08db0a89f8b4 X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Feb 2023 10:39:50.4458 (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: gRReWV91OHYdd6o799k+9OBuIvuYe5ogMzmGUr7zsyGHNnEr+tJmR4KfrwrTbWQNsiQC+HlWFfUBRe1D7LKzjw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR04MB9387 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1675939220325100001 Content-Type: text/plain; charset="utf-8" Consolidate this to use exclusively standard types, and change indentation style to Xen's there at the same time (the file already had a mix of styles). No functional change intended. Signed-off-by: Jan Beulich --- For most (all?) of the single bit I was on the edge of switching them to bool - thoughts? --- a/xen/arch/x86/include/asm/msi.h +++ b/xen/arch/x86/include/asm/msi.h @@ -66,15 +66,15 @@ struct msi_info { }; =20 struct msi_msg { - union { - u64 address; /* message address */ - struct { - u32 address_lo; /* message address low 32 bits */ - u32 address_hi; /* message address high 32 bits */ - }; - }; - u32 data; /* 16 bits of msi message data */ - u32 dest32; /* used when Interrupt Remapping with EIM is enabled */ + union { + uint64_t address; /* message address */ + struct { + uint32_t address_lo; /* message address low 32 bits */ + uint32_t address_hi; /* message address high 32 bits */ + }; + }; + uint32_t data; /* 16 bits of msi message data */ + uint32_t dest32; /* used when Interrupt Remapping with EIM is ena= bled */ }; =20 struct irq_desc; @@ -94,35 +94,35 @@ extern int pci_restore_msi_state(struct extern int pci_reset_msix_state(struct pci_dev *pdev); =20 struct msi_desc { - struct msi_attrib { - __u8 type; /* {0: unused, 5h:MSI, 11h:MSI-X} */ - __u8 pos; /* Location of the MSI capability */ - __u8 maskbit : 1; /* mask/pending bit supported ? */ - __u8 is_64 : 1; /* Address size: 0=3D32bit 1=3D64bit */ - __u8 host_masked : 1; - __u8 guest_masked : 1; - __u16 entry_nr; /* specific enabled entry */ - } msi_attrib; - - bool irte_initialized; - uint8_t gvec; /* guest vector. valid when pi_desc isn't NULL */ - const struct pi_desc *pi_desc; /* pointer to posted descriptor */ - - struct list_head list; - - union { - void __iomem *mask_base;/* va for the entry in mask table */ - struct { - unsigned int nvec;/* number of vectors */ - unsigned int mpos;/* location of mask register */ - } msi; - unsigned int hpet_id; /* HPET (dev is NULL) */ - }; - struct pci_dev *dev; - int irq; - int remap_index; /* index in interrupt remapping table */ + struct msi_attrib { + uint8_t type; /* {0: unused, 5h:MSI, 11h:MSI-X} */ + uint8_t pos; /* Location of the MSI capability */ + uint8_t maskbit : 1; /* mask/pending bit supported ? */ + uint8_t is_64 : 1; /* Address size: 0=3D32bit 1=3D64bit */ + uint8_t host_masked : 1; + uint8_t guest_masked : 1; + uint16_t entry_nr; /* specific enabled entry */ + } msi_attrib; + + bool irte_initialized; + uint8_t gvec; /* guest vector. valid when pi_desc isn't NUL= L */ + const struct pi_desc *pi_desc; /* pointer to posted descriptor */ + + struct list_head list; + + union { + void __iomem *mask_base; /* va for the entry in mask table */ + struct { + unsigned int nvec; /* number of vectors */ + unsigned int mpos; /* location of mask register */ + } msi; + unsigned int hpet_id; /* HPET (dev is NULL) */ + }; + struct pci_dev *dev; + int irq; + int remap_index; /* index in interrupt remapping table */ =20 - struct msi_msg msg; /* Last set MSI message */ + struct msi_msg msg; /* Last set MSI message */ }; =20 /* @@ -180,48 +180,48 @@ int msi_free_irq(struct msi_desc *entry) =20 struct __packed msg_data { #if defined(__LITTLE_ENDIAN_BITFIELD) - __u32 vector : 8; - __u32 delivery_mode : 3; /* 000b: FIXED | 001b: lowest prior */ - __u32 reserved_1 : 3; - __u32 level : 1; /* 0: deassert | 1: assert */ - __u32 trigger : 1; /* 0: edge | 1: level */ - __u32 reserved_2 : 16; + uint32_t vector : 8; + uint32_t delivery_mode : 3; /* 000b: FIXED | 001b: lowest prior */ + uint32_t reserved_1 : 3; + uint32_t level : 1; /* 0: deassert | 1: assert */ + uint32_t trigger : 1; /* 0: edge | 1: level */ + uint32_t reserved_2 : 16; #elif defined(__BIG_ENDIAN_BITFIELD) - __u32 reserved_2 : 16; - __u32 trigger : 1; /* 0: edge | 1: level */ - __u32 level : 1; /* 0: deassert | 1: assert */ - __u32 reserved_1 : 3; - __u32 delivery_mode : 3; /* 000b: FIXED | 001b: lowest prior */ - __u32 vector : 8; + uint32_t reserved_2 : 16; + uint32_t trigger : 1; /* 0: edge | 1: level */ + uint32_t level : 1; /* 0: deassert | 1: assert */ + uint32_t reserved_1 : 3; + uint32_t delivery_mode : 3; /* 000b: FIXED | 001b: lowest prior */ + uint32_t vector : 8; #else #error "Bitfield endianness not defined! Check your byteorder.h" #endif }; =20 struct __packed msg_address { - union { - struct { + union { + struct { #if defined(__LITTLE_ENDIAN_BITFIELD) - __u32 reserved_1 : 2; - __u32 dest_mode : 1; /*0:physic | 1:logic */ - __u32 redirection_hint: 1; /*0: dedicated CPU - 1: lowest priority */ - __u32 reserved_2 : 4; - __u32 dest_id : 24; /* Destination ID */ + uint32_t reserved_1 : 2; + uint32_t dest_mode : 1; /* 0:phys | 1:logic */ + uint32_t redirection_hint : 1; /* 0: dedicated CPU + 1: lowest priority */ + uint32_t reserved_2 : 4; + uint32_t dest_id : 24; /* Destination ID */ #elif defined(__BIG_ENDIAN_BITFIELD) - __u32 dest_id : 24; /* Destination ID */ - __u32 reserved_2 : 4; - __u32 redirection_hint: 1; /*0: dedicated CPU - 1: lowest priority */ - __u32 dest_mode : 1; /*0:physic | 1:logic */ - __u32 reserved_1 : 2; + uint32_t dest_id : 24; /* Destination ID */ + uint32_t reserved_2 : 4; + uint32_t redirection_hint : 1; /* 0: dedicated CPU + 1: lowest priority */ + uint32_t dest_mode : 1; /* 0:phys | 1:logic */ + uint32_t reserved_1 : 2; #else #error "Bitfield endianness not defined! Check your byteorder.h" #endif - }u; - __u32 value; - }lo_address; - __u32 hi_address; + } u; + uint32_t value; + } lo_address; + uint32_t hi_address; }; =20 #define MAX_MSIX_TABLE_ENTRIES (PCI_MSIX_FLAGS_QSIZE + 1) From nobody Sat May 18 22:31:18 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=2; a=rsa-sha256; t=1675939418; cv=pass; d=zohomail.com; s=zohoarc; b=Tqjo2CaGeITl+mRtP5sFqe6CiUC/uyAwdbNVJx4koeB3h2Ue2MdSNVuyCHHO2MOsRsGAFxwiAJNilIbEOdmNAHMn1KRSxlbjiQ/+jwf4f8dkXv+VgJvzz3kYP0A1mXU9D7U7XpS63jEFrneR0px31zdRIS5kUXRp68r3GrYpCbM= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675939417; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=gJVJeI3VEzCV6YzhKqBfgIWU3kFqNTq9u2bZ49rhjQk=; b=SwFjwiYaTuQvycad/Ap4a6+v6eSJrRm0zcGBrKhhV0QuDcjtjsgugV4FCPO7G/35mOPcipuBxz4IeRqQY2nMnx2Q/QSczjuMSwHW86zCmZABosUIO8l6m845uD+NMdtaKd+wmzuTWpDNyyWawYgt0P3GZ4I5IlNDrzNcjZ9PUJ8= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1675939417968525.3563737403025; Thu, 9 Feb 2023 02:43:37 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.492300.761782 (Exim 4.92) (envelope-from ) id 1pQ4OT-0002r7-8F; Thu, 09 Feb 2023 10:43:09 +0000 Received: by outflank-mailman (output) from mailman id 492300.761782; Thu, 09 Feb 2023 10:43:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pQ4OT-0002r0-5V; Thu, 09 Feb 2023 10:43:09 +0000 Received: by outflank-mailman (input) for mailman id 492300; Thu, 09 Feb 2023 10:43:07 +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 1pQ4OR-0002qh-Df for xen-devel@lists.xenproject.org; Thu, 09 Feb 2023 10:43:07 +0000 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0628.outbound.protection.outlook.com [2a01:111:f400:fe0e::628]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 8726017f-a866-11ed-93b5-47a8fe42b414; Thu, 09 Feb 2023 11:43:03 +0100 (CET) Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by AS4PR04MB9649.eurprd04.prod.outlook.com (2603:10a6:20b:4cc::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.34; Thu, 9 Feb 2023 10:43:01 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::e138:4fc3:705c:d178]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::e138:4fc3:705c:d178%7]) with mapi id 15.20.6064.036; Thu, 9 Feb 2023 10:43:01 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: 8726017f-a866-11ed-93b5-47a8fe42b414 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oGVQX2k2/gZbC2/zFX7PsMzUPIQZHjCjEv0pkHxb5+suyv6EqKeT0picWHB9B2heVw4ijaecjG2VVuflcRDhaD2p1ZFz4SkGEe6e6NeDxprXoPnDx6IPVJjXTPg/O+dr7KHrPXCOkCVwTAl85zxY8dNqMj9457mOCsTjZJJLp1worygIz8ebrpeaSh86ilVjDBo3Ypbmq3RKoEtM6s1bVVZbuPGKW5HkeWa1N+TbLlWt/Zt1NrSRDLFTgCxrxUqQPYPVd8nCVLRet/2DOyP+IC+KxD6wOW8nPLd32YZRGm+PVxINrMWgs8aoj8HF4IyrD1EygOpT6zz4cnK+ZraFSQ== 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=gJVJeI3VEzCV6YzhKqBfgIWU3kFqNTq9u2bZ49rhjQk=; b=NtN72dCwfen2oRhnSjBrLirE4DEQduXdLtDAanyolrc/xudQ3nnuJcLxw6ag40mcAbcr+foW4xvdbGqOPygeoexQLgB7GGMB+KYemQcs9HjGO1WG9W4OinmqahX1qEXcEQo2oxr5qaR0cY6Qnwx5SvFkj1C76XcTSif2lHfHiJZguGXzImXCwR4bsbHVGzzpncXxEGFSiIUZOu2d2IGWb1trA87YRkTLmli9qzmtgv/52Ty5thk30ImmocJeD1U493aWta/1cIEvSwiM//KsU1gdq9+SN2OG88CjOJQV/lwFOVogy6WFjRkBNqY+1GPpnaO15FK3By+sUlI7PC7IIg== 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=gJVJeI3VEzCV6YzhKqBfgIWU3kFqNTq9u2bZ49rhjQk=; b=w+W64sXlQehQ0GrzRlLJmLNgtwCFrNV1+Hc5mSl2rtluAevrC+pLsro6ShBB21iTdXx0w2t+ED0zeV5TN9WIOTr272QL+MsS2hdVn+tb3fVLNeWoSCKEl3XQ58BZ55gkfeKC3LWGJLZTJimZRxr7EiCMhGBvTHCmbkYnrADefCdnUAA7UQP5eAcpY/1qaswiYkpPDPo3sbC+FWBlai/D0+oOPFheBA04UrUJMRcz4yTL5NHtoIZBsEBX/B1wWHyemB3aIbnB8H7A9tIS5p6lhtIWH3R0vuyLxQshusX4KO2J6/F08Gr6lYx/gHlt/LdKdrHZpypt4GcSJYSxzBciPg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <969e851e-5674-9aa5-b00f-4fe4d4cf8e5e@suse.com> Date: Thu, 9 Feb 2023 11:42:59 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.7.1 Subject: [PATCH 5/6] x86: use standard C types in struct cpuinfo_x86 Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , George Dunlap , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= References: <98c3141c-9d49-695e-a936-4e755a4fc527@suse.com> In-Reply-To: <98c3141c-9d49-695e-a936-4e755a4fc527@suse.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR2P281CA0113.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9d::8) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VE1PR04MB6560:EE_|AS4PR04MB9649:EE_ X-MS-Office365-Filtering-Correlation-Id: 13d93d16-cae3-4276-3880-08db0a8a6aac X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QyOkqZrvgrRuO6IjBt3DPNA2UivYIMN+D5ynzjUX3Ygy1Ck0BPmMysFETOROs5c2kkhjML6J2kmHG1w9yN7OSrXrFPfX4jkIiO3HMEWR+SffWNbNd7kv7yTDc8Xkl7wOTGULROhADId4rI5ISPs6vozxHhOaSJNuzJnLX7Z2uUk6pWz+r7wYmTVjWLZN4u6ObpZCrJVngxS1W98sJS6J9lDinW5B8q6ZwaEe6Jjd1O9vgx6RWUQtsR18SWTKxnX8+MlOCilmpifqyMZhyHswNRo2N/Um5ODlrmTtHdoT4JgRtwdIaWPXnP9T1jF56xQ3DhkXpR23cT2hVAS/AR8tMs8WFuD+qpF/C1iov56Z7N3AcEpGI5I7ZelRl9kSGNdr+hR6EbqzGcl67InASe28Tf9Vo0AxZYKdqjdsdvfxxW80OKK0AxAH0FAdjtmnZ07IhkQGrrFMi8p4v2Q6vhF2HBw9NX2D97ls3hmN9rmgoFaUTH6G9R3fi/bOpy/YRgYpkZ0L0EnX35ueNnSoYhfDnB5LIA5fA+HrBlIfoB4pu8fAjppbIZ2GBYhZ18ZLsJZx0AZ2urIm8dTgqolKq/dJhlP6ybBSxPM1n5vk1fbhh9/+M5v6DpImf/4796UUZ+okc02HwTsdFkJ5L1ESj5e4/BzWso4lCUzmIqfdug3M0vi8DsTqEQzIUOgmzGmc4kXwIrpqTUvM383GrhErrsz8yLyO3goKvbBOPavXA98dxQg= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VE1PR04MB6560.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230025)(346002)(366004)(39860400002)(136003)(376002)(396003)(451199018)(4326008)(6916009)(8676002)(41300700001)(66476007)(66556008)(66946007)(2906002)(36756003)(86362001)(31696002)(8936002)(38100700002)(5660300002)(478600001)(6486002)(316002)(2616005)(54906003)(6512007)(186003)(26005)(6506007)(31686004)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?UUxmSnlRM0VOOUNWdlNqWDZFMzFTVEJRZmluaHhDTUZMZ2Y5ckNISGpFdStj?= =?utf-8?B?K0s2S3FnalQ4QXA2ZkRCOFBUSHpYbWowTzRnS0h4VHJsRnQzVmROK1M4TTM5?= =?utf-8?B?RnI5Vnd1RHFGQ1NTcTJTRFRoeGtGRzJhUEpROUs0b3J4UDRzdTJ1V0Nxajhv?= =?utf-8?B?VXdROGNSRFdvR1JtQ21zcjhvd2F0N3k4V00vK1VjeWY0ZEQ4K3M4VFNoVWtN?= =?utf-8?B?dWJ2WTBldUcxMSsvdDE5K2dtMDhxaGtTUklzekhzTko0d0NxdVJxcHcwMHBo?= =?utf-8?B?bEhyTzFvUEVJRFhHSG1DMEo3cHFJL1g3UExmeUc0YXBkN2RvZVdlMVY0OE5N?= =?utf-8?B?cCtUYnUrZXAxay92ZmY1NHE2RHVxTTJGRVpWSk1Xa1RtcHdCR1JXTS9CVFpT?= =?utf-8?B?cXFUMFNJZHhkYU9BdEhOL1o2eFpacFZsTHhmdXBGbHBrbjZRM1kwOWFPVEdO?= =?utf-8?B?TVpLZExSY3FUVS9xNTZ0NmpDVVZuTzJiMGtkMGZjWS95UGpBNTkzd3RIZjJu?= =?utf-8?B?U0VOVXpvdHJlUlR0bVBNYmlzNmhjdkdzbmRCQm5LSXgzNTZKZW42QnpQdlhs?= =?utf-8?B?VzU2Y0phZ01Oamhzc0JPMkpLTFhSZVl1WlV4VW9vSStEOXN0ZTNDbzZaZDRx?= =?utf-8?B?RXJlTloxaS9IaWhZQWw4aHVDNzFKNUVVYmVUVzdvNXA0TUp0eU1JSmlsTnQr?= =?utf-8?B?NkZlS1lJdDA2MlhzMFFHYWtQMHVsdzNSeGx4TUtDdm1hQXM2emEwSldKcGto?= =?utf-8?B?dEUvTUZQVEVLWkxCeXMwTTNuWENoci9WNEZDaVN6bS83Nnp6ZWRrSkdWdzl0?= =?utf-8?B?ejhZRkRocytKVTNRZFNxcmFtVnpGTVJGbXRiTmx6VEJtNUNlODdWcUdCU3ZR?= =?utf-8?B?b0hFMkNuNE94MDZWRUs2eFFUYVFPT1Y4WGhFbVBsYXZ6UFhuU0thRXBlL2lj?= =?utf-8?B?OUZRWGQ5QStRNlF1MER3UGZMdWFJQkpmWE5EdGorRlczQ0pkUFRSOXdOZkpo?= =?utf-8?B?dFJ4TTYweTlJNXRhYmJBNnB0R3Vnamk5ZzR3TDFlNElGMG5yaWxmTVVrOUty?= =?utf-8?B?bU54aVdSUTR6Vis0RlF5NjRqNzBXOUp4blFKQk5SemVpU0lnQ1NvUkRHUDNF?= =?utf-8?B?dHJjOERpeE9IOTBwejFETk8vU3J3S1BQdmdEWno4cTF6YlluMTIvZ2VxUFg0?= =?utf-8?B?UVplK3JSRGRRcmczMkl5QldleDltYTlWcEY2V1RERE1MUUdyV3pWUk02TDhE?= =?utf-8?B?SnVva1FIWU9UUUs2WkRFc0twY0NCbzAreVo5d3lYckUwNGhwRHZjS1BJVytq?= =?utf-8?B?T3cyNXJ0OTdwa21odjUvZzVHcnJYS1RPbmxPV1JmcWVVbmxON1ZiWVYzZzRE?= =?utf-8?B?eEx2OTArenNEMjFBbnVLQk1jWmpaamZKMWw2c1VUWGNrOTIzNFhHSU9VUTBO?= =?utf-8?B?WG9TSVlvUVdvRXhBd2NHdTlGbFRyQlRPOGlMOXY3MVNIMHc3N214dzAraW5L?= =?utf-8?B?UEVIbCtQQzl0M1VFWHB3QXJaZUh0UWE0eTF6aFNXam5Qbit4SjdBR1FETkNK?= =?utf-8?B?ejJtKzczbmFvRFVHbXpnRXduY1FIUjZQWWNOeTlqaHpoUGJVVWRPN0RzQWxB?= =?utf-8?B?UDZrc0p2WVZTSHlTc0xNY0hLaHc5K3crdzIxOVBKeEpoOENEK1ArS3pLaURx?= =?utf-8?B?cjRJVG9Pd0ZHRDFLaGxrM2JrdWR5MG9FeTdYSzBCeWZqcC9hQ1h2QjgxSjNh?= =?utf-8?B?M0NUbzQ0UlMvb1ZmTkUrejRibXdKRUt5S1dDZVF2RzczUDUrSEQyZTZ3V1Fq?= =?utf-8?B?SDBhZUhrWVFNaXpQaldEQjBWaTBmTk42eDdkZElqaGlJeDhGZEpUL2tpSjVQ?= =?utf-8?B?Y3ZML1VlR00rdkQ5VDROZlVWa0NMTDlDbzhXd1V5cm0zamlJMDZiOVBJSVhy?= =?utf-8?B?Vnd5QjVEOUduUVl6VEpmOG42MGJ5aWhyZUtxelJ1QWtqM01xUzFPZTZEeXJS?= =?utf-8?B?QkYvL204T2R2L1RaRjZEOUFwN0R3ZllIQkN3NVB3Rkk3b2ZMb0JWaXlNeWho?= =?utf-8?B?dUl0cDdKQ0JzdW4xS1BPcnIwbkgzLzN4VWRwVlVQV1V4djcxZEVSN2R5VWJW?= =?utf-8?Q?t4dwrMRDEO7MASw2/mqtjCHmc?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 13d93d16-cae3-4276-3880-08db0a8a6aac X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Feb 2023 10:43:01.6836 (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: xnabBtj8Heszq/9zguIyLxYQx8fDP631u41/UHx+clJdfiz3ND0cAQx7zGUj3ZmuW9w0BfMpEJAZmVbksxMTpg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR04MB9649 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1675939419360100001 Content-Type: text/plain; charset="utf-8" Consolidate this to use exclusively standard types, and change oprofile code (apparently trying to mirror those types) at the same time. Where sensible actually drop local variables. No functional change intended. Signed-off-by: Jan Beulich --- Much like x86_capability[] already doesn't use a fixed width type, most if not all of the other fields touched here probably also shouldn't. I wasn't sure though whether switching might be controversial for some of them ... --- a/xen/arch/x86/include/asm/processor.h +++ b/xen/arch/x86/include/asm/processor.h @@ -119,24 +119,24 @@ struct x86_cpu_id { }; =20 struct cpuinfo_x86 { - __u8 x86; /* CPU family */ - __u8 x86_vendor; /* CPU vendor */ - __u8 x86_model; - __u8 x86_mask; + uint8_t x86; /* CPU family */ + uint8_t x86_vendor; /* CPU vendor */ + uint8_t x86_model; + uint8_t x86_mask; int cpuid_level; /* Maximum supported CPUID level, -1=3Dno CPUID */ - __u32 extended_cpuid_level; /* Maximum supported CPUID extended level = */ + uint32_t extended_cpuid_level; /* Maximum supported CPUID extended lev= el */ unsigned int x86_capability[NCAPINTS]; char x86_vendor_id[16]; char x86_model_id[64]; int x86_cache_size; /* in KB - valid for CPUS which support this call= */ int x86_cache_alignment; /* In bytes */ - __u32 x86_max_cores; /* cpuid returned max cores value */ - __u32 booted_cores; /* number of cores as seen by OS */ - __u32 x86_num_siblings; /* cpuid logical cpus per chip value */ - __u32 apicid; - __u32 phys_proc_id; /* package ID of each logical CPU */ - __u32 cpu_core_id; /* core ID of each logical CPU*/ - __u32 compute_unit_id; /* AMD compute unit ID of each logical CPU */ + uint32_t x86_max_cores; /* cpuid returned max cores value */ + uint32_t booted_cores; /* number of cores as seen by OS */ + uint32_t x86_num_siblings; /* cpuid logical cpus per chip value */ + uint32_t apicid; + uint32_t phys_proc_id; /* package ID of each logical CPU */ + uint32_t cpu_core_id; /* core ID of each logical CPU */ + uint32_t compute_unit_id; /* AMD compute unit ID of each logical CPU */ unsigned short x86_clflush_size; } __cacheline_aligned; =20 --- a/xen/arch/x86/oprofile/nmi_int.c +++ b/xen/arch/x86/oprofile/nmi_int.c @@ -311,11 +311,11 @@ void nmi_stop(void) =20 static int __init p4_init(char ** cpu_type) { - __u8 cpu_model =3D current_cpu_data.x86_model; + unsigned int cpu_model =3D current_cpu_data.x86_model; =20 if ((cpu_model > 6) || (cpu_model =3D=3D 5)) { printk("xenoprof: Initialization failed. " - "Intel processor model %d for pentium 4 family is not " + "Intel processor model %u for pentium 4 family is not " "supported\n", cpu_model); return 0; } @@ -355,12 +355,10 @@ custom_param("cpu_type", force_cpu_type) =20 static int __init ppro_init(char ** cpu_type) { - __u8 cpu_model =3D current_cpu_data.x86_model; - if (force_arch_perfmon && cpu_has_arch_perfmon) return 0; =20 - switch (cpu_model) { + switch (current_cpu_data.x86_model) { case 14: *cpu_type =3D "i386/core"; break; @@ -390,9 +388,8 @@ static int __init arch_perfmon_init(char =20 static int __init cf_check nmi_init(void) { - __u8 vendor =3D current_cpu_data.x86_vendor; - __u8 family =3D current_cpu_data.x86; - __u8 _model =3D current_cpu_data.x86_model; + unsigned int vendor =3D current_cpu_data.x86_vendor; + unsigned int family =3D current_cpu_data.x86; =20 if (!cpu_has_apic) { printk("xenoprof: Initialization failed. No APIC\n"); @@ -406,7 +403,7 @@ static int __init cf_check nmi_init(void switch (family) { default: printk("xenoprof: Initialization failed. " - "AMD processor family %d is not " + "AMD processor family %u is not " "supported\n", family); return -ENODEV; case 0xf: @@ -458,15 +455,15 @@ static int __init cf_check nmi_init(void } if (!cpu_type && !arch_perfmon_init(&cpu_type)) { printk("xenoprof: Initialization failed. " - "Intel processor family %d model %d " - "is not supported\n", family, _model); + "Intel processor family %u model %d is not supported\n", + family, current_cpu_data.x86_model); return -ENODEV; } break; =20 default: printk("xenoprof: Initialization failed. " - "Unsupported processor. Unknown vendor %d\n", + "Unsupported processor. Unknown vendor %u\n", vendor); return -ENODEV; } From nobody Sat May 18 22:31:18 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=2; a=rsa-sha256; t=1675939455; cv=pass; d=zohomail.com; s=zohoarc; b=SdKf1nrUbf4em9qbDkqSoO2AsZEbkAN7/qmadeQIIxNXkfrPoe30trvL/UVIfzTH/0Vx1NtbvgzCl/38Q4AjmLfEgTJz8loiV4ooEbWd0r31mhPxbpbrxn+TZXCbVwcCGTVpu6CsDaO96M8duZ4c7q9pqgKCl5rmVeSUj7rnui0= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675939455; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=xw8mCtU+Oy7VuL6oxtGntwYumtAFZyIQqnEOo+ExMsY=; b=AR+8Cef81iMhm1rBnspi4lSmAISFDT3vND+/8WHs302r1thHR7yoUer9Tl2PwC9HHEHGIPUsCps1yW5cSC4x3vxIqHpv4GSw1D3RCvQsslHi6I04Md9TMVYrqZyASj9hL5gZuHmIaUjQhvORcDIwQaR59G5/4h17waEu0BeJDhA= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 16759394559481009.3888004692506; Thu, 9 Feb 2023 02:44:15 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.492306.761793 (Exim 4.92) (envelope-from ) id 1pQ4PD-0003Pr-II; Thu, 09 Feb 2023 10:43:55 +0000 Received: by outflank-mailman (output) from mailman id 492306.761793; Thu, 09 Feb 2023 10:43:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pQ4PD-0003Pk-F4; Thu, 09 Feb 2023 10:43:55 +0000 Received: by outflank-mailman (input) for mailman id 492306; Thu, 09 Feb 2023 10:43:53 +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 1pQ4PB-0003Ar-EJ for xen-devel@lists.xenproject.org; Thu, 09 Feb 2023 10:43:53 +0000 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0618.outbound.protection.outlook.com [2a01:111:f400:fe0e::618]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id a4c7e637-a866-11ed-933c-83870f6b2ba8; Thu, 09 Feb 2023 11:43:52 +0100 (CET) Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by AS4PR04MB9649.eurprd04.prod.outlook.com (2603:10a6:20b:4cc::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.34; Thu, 9 Feb 2023 10:43:51 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::e138:4fc3:705c:d178]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::e138:4fc3:705c:d178%7]) with mapi id 15.20.6064.036; Thu, 9 Feb 2023 10:43:51 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version 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: a4c7e637-a866-11ed-933c-83870f6b2ba8 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jJR55GaZQIWOrmDagCBS9+tQbyv6h13ridGPWMoIz/nJseQFvbu+jV0Fj1QbMvowkLA8/gpJ3X6EwOHNy9YU8Z2VAwI8tI4w3wmjaZIzhahksjMObOpgoa45NZVQ55wuDggP6ePWZg1Bh/TgGGE4fkBOBIz8fXmaI7NbUPgwylyBVzjqAwbWpyD+bQTIFJdMDNi2VVgr0MmxyWPuejbtPIcEJVP6HW5DYRpPzebErbvSO1scFtS7Qu9qr8dgud0S0efU8Sz2LKnxIWtgk/6zzs/lbeU4w5wYYnvWYWb21kGITq/P8zl2aUTunIc/ryd0fOEVAiaIf40aCkJDZzJ5Tw== 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=xw8mCtU+Oy7VuL6oxtGntwYumtAFZyIQqnEOo+ExMsY=; b=cllWuWQ53azBWMfNfU+pK5BcWCSuora2G3PJKm/ejL0aJGD8T5xGhobBIq0o+y/4dg+hFC0G744HEHYDv9BcQCPybUHAlLbwp4nmv5hzRbxahXxZ87aXlrkrkQZMKV2uRYB3gKmBxCnEuCC8bxyI3Q9LlGTvp5yTrFPGUVGCWALdmPXVExdN67Bje8s9s5DxkOTH6dtokV8Lj+h/CrT6o5siK43/9l76oMlC+tvf2zs4UO4nkJx3NtwOwQ6Z+N1MgPwtak1ZfC/NkmzaOGnJjStnQ268+FWlt5A0jpmYdJEm19o6KRr2Q7cT4jiPn1X7ZoQibX/iF7i8oj+22qmFVw== 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=xw8mCtU+Oy7VuL6oxtGntwYumtAFZyIQqnEOo+ExMsY=; b=D8p01gsJ21aRF1psxOAreZBFo9vi1y4Ly98cSLrRSKUydJ0aDAEnDLSem8eWTq3xXj4WEOp6WGXamohAoc4TYxwtVf7ME8gUHkAU62I10xOqMLch1cRKkDTj/gPdP8K0Pzwt3KXrGPIkqhbk12Zc6XCMKRs5cdURpkugMI7TQFVZdSFVUFLzbYpO8JVKpV29Pi8Iq63ZIQYb+4UeOYKFedouVCgTmPFQgidJWbmOmfX5ghXzbxhChBb1kYGMS11Re48DwckQ0w91uVftK/nJgW9yjG6kiRNutcoX8+kgkqQcbGIEti7WvxniRHRalq+pZG9wwEfxDVx99lDDL15Ayg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <9e3c6641-1ab8-83ae-724d-a85af8e9ec17@suse.com> Date: Thu, 9 Feb 2023 11:43:49 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.7.1 Subject: [PATCH 6/6] common: __u8 is history Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , George Dunlap , Julien Grall , Stefano Stabellini , Wei Liu References: <98c3141c-9d49-695e-a936-4e755a4fc527@suse.com> In-Reply-To: <98c3141c-9d49-695e-a936-4e755a4fc527@suse.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: FR2P281CA0112.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9d::14) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VE1PR04MB6560:EE_|AS4PR04MB9649:EE_ X-MS-Office365-Filtering-Correlation-Id: c4758f9c-ffd8-4bf4-397d-08db0a8a882f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: am+Sj4y0Zy9eaE0UBXVyRPw2tEe9xi/L+ai5gl1BjOBeiNq8O4srcv2YBge1U9ETpwsVMkU+7rZ66oKPo0RLbsEC5lhbFIaaCv0UTWgK7sKZZNMXf29MwZBULZVIiUYZMeRnGsca+SPWIytt1156iw9Yk4VKoPUlo6hCipgiWXoDM0XHrFjjjxyPbegykIGK80MuNJNz+ZSV2SjtDw6GGtlXdJtOnUoCSdEcydQYEOZ3Sj3Qv7WI6ND8UMj11D0EUtsyVVSnRcN2Mb7i89xftrGJ2NAq+LIWHlGwXg1XEKxipDD2qNWaIeEfuAyU+iA9CypptHaQr7wzX1jeknPpbiJwYHR8IVWmHzwm1asNz6CTM9rHfpdcJb6l1xuC9anvNWewoChbeV0TmDbzXE3PteDLW5jYbJrQJAz9adDZ25uq9pMxSnbOk53D+E2L5bi4EK8BFVRCSYphmiwqk686YjvvLHn6X2ENtnvODWit9qlZ50B/+Y0tJfM4dkW1sguaQ9mJXNvcFmZBmhpL2IdBhvWVV1jNeJJTUhqqcRKKPsAYg5pCfJE7FAHYWsvhLGeHfAJsREMP35nSk7AmUYLv88C0ffDcEqk8KzjnJZo9lhCnlKEQeJeMhMxxlJlHDkwQJ3XxI0qULd733sljSN6zsPgkD56TpJ1/2ry8clTruK4jxpjgbgrQ29SANR+Eumyhw00nwRU0E2vCusR4O1dwEXN0TyLN3S5AEq0tqdvF8ew= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VE1PR04MB6560.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230025)(346002)(366004)(39860400002)(136003)(376002)(396003)(451199018)(4326008)(6916009)(8676002)(41300700001)(66476007)(66556008)(66946007)(2906002)(36756003)(86362001)(31696002)(8936002)(38100700002)(4744005)(5660300002)(478600001)(6486002)(316002)(2616005)(54906003)(6512007)(186003)(26005)(83380400001)(6506007)(31686004)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Y2F4dnlPc2FxdCttZDFnRFFWbGxIaEVDUVhhVVR4bHF6VEI5VmdiWjl1Qkoy?= =?utf-8?B?M3FPWHRVb2J0c1dnaDNGQXgwUE9iL3U3eXF3NHhyczFWZUFCakRZTk5FdXZn?= =?utf-8?B?R3l5eHlrVklUOGNIZWZEeDZzOTViUUx1WEt0ZHpONlpka2M4bnR6Qkc1TENX?= =?utf-8?B?bzVjb0gxOXlWdm9yVDErYWpDdEplSStRT2ZDNE42RVVDbVpEcnF2ekk1TDB2?= =?utf-8?B?aCtsdDl2MFpTcFNqa01uT2J3cVR1cllmdi9HWlM3TzI1WVlidDMrK3hKbFA2?= =?utf-8?B?NmdjOUhhS2swVi9iVHpEQkU2c1FnUlZtWmdiSUJjVU9QMUZyNkNuc0N5UEpl?= =?utf-8?B?MUFxbnVuUFY5QmhudTd1K3JkemxWNkl5OUdHN0NTaGJzdm95NEdKWTNiU0lh?= =?utf-8?B?anJhdFpycGdPZHpoZU0yQkRXMHB0ZTkzNkdjRC9DTndtL3E1RkZSelRYSUJX?= =?utf-8?B?eklUNVhrTHoxcGVVRW1nN3gyVVdiV0xWTHVHRm5JN2VMM0ZkWHg4WDFSVndS?= =?utf-8?B?WHJaU2FtWUFvUVpBVm52aFFvRGgrMlN5TmZvQlhudVZSMURUUG16Kzc2NHVJ?= =?utf-8?B?T2FUZVQzdXNBdHJSc253UWdDalFnbGpRMXFVSlQwb09lVTdUbjlaZFRUQWkr?= =?utf-8?B?MmpPU05BbnVkbyt0TDFteDlxdXVMMi9aTzlnQ1NCcFFHZFJJRzFsL2RmOHpl?= =?utf-8?B?aDdSK1VpVVB5SFYxQXNOanJNUUZLTlYra00wZ1RhajJXVmkyYlNBUnR2TXhB?= =?utf-8?B?aVFTeWhmSEE3amtyN2FTWFFWMEhXb0Y0d29KeU1jdDd5OStLZ1pZa2xWdlFN?= =?utf-8?B?QnMvYmt3WjJLdWRtMmRBTEFLdWhGQWNHaGdCS0VwSmR0c0hJWHVMM2ZiNDVD?= =?utf-8?B?eVdKMEJ5WCtpa21NYW11bkw5blpidXRkTUYrZGFtN2p2aW5YRTZyWThKci9T?= =?utf-8?B?KzBHZVdoRkpIUlFQaHpSeStkMVhGMUhSTUtodk1BSUhQakU3Wnc2MnZvNS8r?= =?utf-8?B?RkRXR1QrQ2xJd3NIU2lnMHBGSzFBYVdIYno2SGZCbG5Td2lGc09Nd3ZrMU05?= =?utf-8?B?OFZlUVRiOWRTbmVHYysvRGtxZGl3YlpjM3I3YWExb3Jsa1JwSG1ZVGtxSzcx?= =?utf-8?B?RnY4aldMVlljU0Z3c3dlVmJkdGJCNDVCR09vR0JFSk9FWStnZk5DREdFdyt5?= =?utf-8?B?cFF4a00yWHlmUm9KUkhNMGR6YldJMkU5bGJMSUR6bmg2eVc4SDBjSFBwRXBu?= =?utf-8?B?azRxbThKOUwxUHE5YVZzTDVJOGxiRk02cjZIcUQxRC9BSWZsRWllTUZwdkFn?= =?utf-8?B?K1pKUmp3ZUlpcGRQTkczdzE4b3h1c1MrYkNiVmNIejF6b0lUQmFUUWxXbkFj?= =?utf-8?B?a3hGMVA4SmFqRFpjOFovS1Uvb05jbEdyL0ZpZ0oxYlM4b2s2dUpXdVJzY25R?= =?utf-8?B?dnNGdlprb3lPM2lsMTJrK25vRk13SjFFK05OQlVBcGdVT2x4bDNuZHBPcGp4?= =?utf-8?B?YkdEMDVrNHc3c2czYjhzTFpHQncxMlh2a0xCZEpFd1NGZEp1UmFDeHZScmFE?= =?utf-8?B?WlU4RVh5Qitxc1FFUkVrQldpRjlOYXNzRW9LS043dVo0RmVFY05XNkh4aGpT?= =?utf-8?B?Rnc2M2FGNmU4U25PS1VBK2hpY1ZoVnBGdU4wZHo0T2MwbTFEWUhMTzNwWUM4?= =?utf-8?B?N1I3RlQyczZ6Ky9Ic2hkWmtHQWlRZWZlOEYwUW5ZNTZPMDN5dlRYbGUxU3V0?= =?utf-8?B?amdGNFVuVGNuVnpxUXo0cEIvSGlWbnZKMFRPVWlGcUVMS1IwZVpGajZic204?= =?utf-8?B?eDFyVVpibVBUazVWN1ZTZGl4Z3ZvelhpbU5Pa2lZblF5cUZ3WGtVQWF3dk5Y?= =?utf-8?B?dTNzUGxjVHJqV1BLTjV5dE9jVFNtaGlFWjRRME9acTQxMlcrSG1MNUMrVWM1?= =?utf-8?B?enB6MWFhanI3L3J2NU51Q1JFZWlUWHBDaTVMYnByNUNHMWxPVWlObmtFY0JY?= =?utf-8?B?TnBkR2U0dEJES0w3K1FwNVVoakpCd0VuejZCVEQyb2R1WmRVTEtKVjZsNU1T?= =?utf-8?B?MjlyVXFJZG9Pc1VnWE5UMzBBSDR4Um1vL2sxcEZlQWhmWHh0alpKczZWdFRY?= =?utf-8?Q?ziHtuEQttq6P/NWAGhiqwT+L9?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: c4758f9c-ffd8-4bf4-397d-08db0a8a882f X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Feb 2023 10:43:51.1336 (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: Xym67MkgslfHVU/qGwa0AF04Kfyaxd1T1VEluGAIPF6cAzQYEnNnvtkcyZTS0rQ+VehlpNOATpILrDhzfXtfPA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR04MB9649 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1675939457295100001 Content-Type: text/plain; charset="utf-8" With the last uses gone, move the type to linux-compat.h. No functional change intended. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- The primary use of __u{16,32,64} is in the byte-order headers. Iirc there is a series re-working part of that, so I guess before touching the logic there that other series would better land first. --- a/xen/include/xen/linux-compat.h +++ b/xen/include/xen/linux-compat.h @@ -12,6 +12,7 @@ #include =20 typedef int8_t __s8; +typedef uint8_t __u8; typedef int16_t __s16; typedef int32_t __s32; typedef int64_t __s64; --- a/xen/include/xen/types.h +++ b/xen/include/xen/types.h @@ -55,7 +55,7 @@ typedef unsigned int __attribute__((__mo =20 /* Linux inherited types which are being phased out */ typedef int8_t s8; -typedef uint8_t u8, __u8; +typedef uint8_t u8; typedef int16_t s16; typedef uint16_t u16, __u16; typedef int32_t s32;