From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 870804246C for ; Mon, 23 Jan 2023 15:06:24 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7AD63400EF; Mon, 23 Jan 2023 15:06:24 +0100 (CET) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mails.dpdk.org (Postfix) with ESMTP id D9786400D4 for ; Mon, 23 Jan 2023 15:06:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1674482783; x=1706018783; h=message-id:date:subject:to:cc:references:from: in-reply-to:content-transfer-encoding:mime-version; bh=LquPdrTFy/7+sHYrzrNArvdgw3INFOdiuo49nprmXSw=; b=SY5KL5eT4OY/3g8fmaUyeAjH9lpaK9tBMr5eYaecyNLuetXH8kOevfSE WoEDuUarZPO73LnFXTCBYls9uliTKX/K/s3aubq3WmU5VcLrIxPBaszUO o9cfX4whf9HxZD+wUrhha9S4usvQujEzy7rjtmO1Y1Q834fvMNP6sz+Mm Sw+/QGoL49BEb/AnfUm2SYrDuveDnnWJQtIWc4SS40XIeVKBbS3kyUZj8 x5pfZUzeEHrgW/x96/yMNM4sz/cxV6Ls1nl6edS8pUP5VjkN2NqnvnAd+ DHqRjJVrTn1yBvZzXI2+CZg/q9ne987LbPeTDmzNlB8O28x/HN6BMf89Q Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10598"; a="412272454" X-IronPort-AV: E=Sophos;i="5.97,239,1669104000"; d="scan'208";a="412272454" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jan 2023 06:06:21 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10598"; a="804122275" X-IronPort-AV: E=Sophos;i="5.97,239,1669104000"; d="scan'208";a="804122275" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by fmsmga001.fm.intel.com with ESMTP; 23 Jan 2023 06:06:21 -0800 Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16; Mon, 23 Jan 2023 06:06:20 -0800 Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16 via Frontend Transport; Mon, 23 Jan 2023 06:06:20 -0800 Received: from NAM02-BN1-obe.outbound.protection.outlook.com (104.47.51.42) by edgegateway.intel.com (192.55.55.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.16; Mon, 23 Jan 2023 06:06:20 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dAQj0iaCzJ+Uw0YR31TUchc6w3xt1vv1JtZvGPnj3bSfTUGpA92gDoejG7efTwDtNoctZIHIXFKWMpXpY6Cwvzc7OmqVPtixqbiXpbBWaNWMNDBbdAC/QJgzTTiUUOfy2uN29NFy/0h2XlgzCoC4vgwnF8gUTMowrW5GThpJVtnVZiycRVAuqKqxYv9ffor74Tpo1pWXGxbS8karxiTyryyLSSTIs8Arcda6LDNbnE5e3dnJb2y8sbBUQ891U/ckPAQh6h3OeMOb4tBVIRyeYxTI73f6O2tcRrlkblZVoEJlO7n+Y4aWp3qr07XBhRqwVLaZ1SPgkUFHf6vOHrhncw== 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=a5GqrLeVMBDRKUXTNMrx9LBASON/ATvCK1lumFXn5/4=; b=hb2qrIMjKKcjiQ+qqY1xYJoawUTgsOOTNjXpFSON96Slh1JcOo8gtkPQ27zkpNn4usrKHtZDFC9WkyFFmFmWXroXiiFMAHlak2OY8xgjcKs939U4ehxqNYnEVRrUrWi7VyqtyQZKdo/dRPQFPa5wCsPevpGLNjGrvtZvk1e7EIkwn38NigKUpht3uMkNHmBkPSm6P8hQq2ePQyF3DB10LlVWhTpVbWN5Z6m2IusEA8oSMmszSgShCNS3LFE9Iid4RaXhhnGvzOm8FG9PEcnWySww7Ebt9/gwZxvo/02MUCYmll8h5ssVISFlkRDjeWMHSZA/sckZ1fH5uaBa0v3b4Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from BYAPR11MB3799.namprd11.prod.outlook.com (2603:10b6:a03:fb::19) by CO1PR11MB4914.namprd11.prod.outlook.com (2603:10b6:303:90::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.33; Mon, 23 Jan 2023 14:06:18 +0000 Received: from BYAPR11MB3799.namprd11.prod.outlook.com ([fe80::fa57:6a26:c7d7:841a]) by BYAPR11MB3799.namprd11.prod.outlook.com ([fe80::fa57:6a26:c7d7:841a%4]) with mapi id 15.20.6002.033; Mon, 23 Jan 2023 14:06:18 +0000 Message-ID: Date: Mon, 23 Jan 2023 14:06:12 +0000 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.6.1 Subject: Re: [PATCH 20.11.7-rc1] examples/vm_power_manager: revert backported commit Content-Language: en-US To: Tadhg Kearney , CC: , References: <20230116141028.497949-1-tadhg.kearney@intel.com> From: "Hunt, David" In-Reply-To: <20230116141028.497949-1-tadhg.kearney@intel.com> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit X-ClientProxiedBy: LO4P123CA0437.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:1a9::10) To BYAPR11MB3799.namprd11.prod.outlook.com (2603:10b6:a03:fb::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BYAPR11MB3799:EE_|CO1PR11MB4914:EE_ X-MS-Office365-Filtering-Correlation-Id: 131789f9-e4df-4f43-3fbe-08dafd4aff4c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WLNexprdtWTBPGA1xgJBR+M5amocWM09Vn6fx2xqDU+CDXuSBT3jnNFyMkZQVmpZgamKEId960jLNZRDO5EOZ2SEYetVUxCF8iJzeCkYe8z1It4dSk3QNiARDtm2wIiW2Km83D6vwggdu1n9O7ZnZSUxVA5LYcrzXK28zbO0eXOySlpsGC63dbsWFrj0x7BK2Ywx6et80PHSoNMDws4zN6Ilk0g8cOGbYtu77Ps3hxmceGEOoce2+GltKmcX7zamjHfrkqdhqA7GV/toTF+PZgtsJTiBJcnxv4cxpiPuyZiZ/hS23RIqUDQbWFCmOIBddBJu9+qKEQX1APrL5dmOjeco72StO7jCW0wR7akZIodRdAGAqbq+FrotyGPsfWUvs83YsIbGyGkZS5+iGBVLYRNuoUv1mKWF5JlaHZYTyQfZhl8vuLSwbYjg2ZsdmDqkEcg4mVra20kKLoPnGEYGzbl/thL4qBLPa8oybje38ku+YjCwnVbLiNxLysCNonRsUGYeqbh4MQE0Q+yJH4OTLqsKTP0Xb7POFGegbuwMGgUsoLVanTewWCxVzbXE6uCfElzSTf4auhM6R0dVBj7Wp8hO9+dbvARrg4kfXiKHRTJeAJvD0jw7mADWc5iuNNd+97eGnOnjtf3lJ9hc+yL/Zcq0/s1GC/O7sMbtVF3kzBXSQTLlJg4kDTYUu54w0zOu53WNk0aPx+OWY0l3oTl81TyTL3I49QYhl+Y1HdKxT04= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BYAPR11MB3799.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(396003)(136003)(366004)(346002)(376002)(39860400002)(451199015)(38100700002)(82960400001)(36756003)(31696002)(86362001)(478600001)(316002)(6486002)(66946007)(8676002)(66556008)(4326008)(66476007)(2616005)(53546011)(31686004)(2906002)(6506007)(107886003)(6512007)(83380400001)(186003)(41300700001)(26005)(5660300002)(6666004)(8936002)(43740500002)(45980500001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?QmtId09GRTh3bjNRWUF5RUdmaDl5WFgxOEE4QVhUbUlKTWh4UWpJRmxPUlNu?= =?utf-8?B?MW1sRHowbVFON1NxQ3B5dENqL01UQUN5ZlRpUW1pS0xWdlVWUTRKUFl6UHJ0?= =?utf-8?B?RGNYVlRrMlRpekpkOXBGY0s4S242YTNGZDIyUjZrYmZyeC9VMjBodWFHTGpr?= =?utf-8?B?TGM0b1ZpWEt0OW5uRWdpNHk0RkxHVkoyeWJudjV1NSsxTkt3VWt1aDcwZUlX?= =?utf-8?B?Vzg1Q2Y2d3NJWlQrWmFHT2wxZ3lSL09IVUhSbEl6K00xank5SkVjWm8zbDdR?= =?utf-8?B?QmpQbjZNampkYjY0bVpTdUQ3eURNZTJTVFhiNmM0N3I5b0h0VzhDd1l2SzEy?= =?utf-8?B?U2l3RTBGdUVJN0g2dUZ0ZkYxaDBxQzhKWmo0R2dVbjhGcXFtRG1PaFpKSkR1?= =?utf-8?B?aXJxVURSS3lOWDkzMmVMcjJ1Y2FiRmNyb3A0S0JsRDZ3aEFQeVNrUjFDd2Er?= =?utf-8?B?R01UMllNYTFXdFJsM1RZYnpYQS9lQW9VMHhDT1AvaldHc3AvNlB2RGRLdWs4?= =?utf-8?B?T1J3OWtzMGVScFNwZXUwRExnRUdld0JTUmlRaUJWZi9kQmpSeENsdVU0TnQv?= =?utf-8?B?NVg3dy90WlU1ZDNKd0pVVFpGWGQ5akhGZDFUeWVFYjljRHpEUjFwRk1lTTd6?= =?utf-8?B?VkhXbEZrSkhLTlR1NE82WVZQNWZKcWZwQ0pkOFVuMlBDeU5IZ0g3WWZNL2Y3?= =?utf-8?B?U09ySkx6SW1QaUtrVkJVays3ZGlpUGtuZEtPRFozU20yVThSdU80ZGlYNjlN?= =?utf-8?B?UDhCYW0rS09lQzlOZU1yQzlSL2k2Rkl6WFI4ZkhhSVZjU1RNaGhPMHUyekdw?= =?utf-8?B?MHFGU0s1MDU5S05ZWFZyR3Y1RFhtSDNkNnBGcGkyYlQvajd4alcyYnpwbWNv?= =?utf-8?B?MElSWmw5cnZsdjg0NTFOM09nTHpQMXJTdTRoSzhRSzJhc2wrdU4wcWZ5MUFM?= =?utf-8?B?YXJtamZJOUxkVzJkVVpMbHJETm1yTjdCUDJmRmZyeCt5SzlGa082R0Y0UThD?= =?utf-8?B?NUJtbkZRbzM3SjhNSTVTV2tvS2dVUCtOOFp5NGFBQ2p4bzVlWmEyRkE3N3dv?= =?utf-8?B?cWN0L0JmcnRPWjlvVE1yMGxId3JHa242U21WSC9kSHFDMmJLZ3k1cU1EMTdQ?= =?utf-8?B?SXVYdkI3anhUVE5yWnNlRGoyR0V6eHF3NnVOOGV5VzZLT0FkZTVXak9kSEk4?= =?utf-8?B?N250aitsTkhTQWU1TWZiaE1mUjhXVmhrTmVKR3l2RjBSZDVndVB5V1BJbHBa?= =?utf-8?B?VnJOdE9rOWQxNFhxQ0puS1ZwNllsaThidWJKNmVKSklnckltalpGUWlOK1Bo?= =?utf-8?B?TmVEYnQyVTlZbUsxeEdCSERpYnEzOC8vUlYvb0hUOWcvUlRmMXBMWm9Fb2pD?= =?utf-8?B?Vk5yZHJNQUJjUU1JbUVxb1hDc3IrZUZtc29tWUxHZ3BrS1htakE3ekFNWHB0?= =?utf-8?B?MXRWRTVYZGZ3NFppeFRoY25YMk9vSjcxOGhkbndzTTd6N0xLbHUvL2ZFV0dk?= =?utf-8?B?cGtjdzNmTHR1enBBOFJGMEN5cWdXL2NYQVR3N1JHRjZvQWNOOXMwTXJkbEFY?= =?utf-8?B?VFFVTUtGSERQajZDSlRNSkhyZWFMSVo3dCtMcjltL3VLSVBEZ2ZEOTY5RjlT?= =?utf-8?B?eDVUdlhVb0FFTUNCa2t3azd4dDdHS1QzM2hkMmJ2Mm5SYitYeThDYkVhcWVK?= =?utf-8?B?MnRGTE9CM21PQjZaNjFranBiMm4rN214S0J2OFBLYzhML3JtUU92aXlCeStO?= =?utf-8?B?VmhMQTg2TFVMRmZXYWZGUE9ncFUvbE0rT2FBdEJQRzJmckVDVWJaTkRQY0sx?= =?utf-8?B?ZFJZekRjaUs1K2lvWmVES0JPQWJmZ2JTakRmYmlUWGNYT1VZc1J4YXN2SEFL?= =?utf-8?B?OUo0dUYzZm92RzB3OVkrUEtaQmEyM25iMXB2RFNiL1FSY1RxcStMR2M1MTJL?= =?utf-8?B?NTNqbTdldkZBNTRZczBHaFo5TW85MWg0U0NYaDk1VllqMzkrbnAyQXIwK3pY?= =?utf-8?B?cEJyMDdGdk1qblR3c1h2ejlBekJNcDE0WlJrVnlSb2lWcHdSdFVkeEtFSDNF?= =?utf-8?B?NnFDSkxWbDBiYzA2OFpSWkppU0hMMFd5Y2UvdFlKS3hydE4rMnJwcmZndmtQ?= =?utf-8?B?R2luK25KVjh5a0c3Vk9oZ2NQbGg0WUpmUFYyUzhtNklLdG4wNEtvdDZnYW9n?= =?utf-8?B?bEE9PQ==?= X-MS-Exchange-CrossTenant-Network-Message-Id: 131789f9-e4df-4f43-3fbe-08dafd4aff4c X-MS-Exchange-CrossTenant-AuthSource: BYAPR11MB3799.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jan 2023 14:06:18.2065 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: FS8GdWmYhOYcwWYaD2uYOHBuIqSU8SJM43+oNxIpHMibWOVkl/GomySssG2jsc8BVqPtudN0eoHX+37Y93BDew== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR11MB4914 X-OriginatorOrg: intel.com X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi Tadhg, On 16/01/2023 14:10, Tadhg Kearney wrote: > Revert backported commit a244dfa7d784 ("examples/vm_power_manager: > use safe list iterator") that adds compilation errors while compiling > dpdk with vm_power_manager. Issue is caused by TAILQ_FOREACH being used > without dependencies also having being backported. > > Fixes: a244dfa7d784 ("examples/vm_power_manager: use safe list iterator") > Cc: hamza.khan@intel.com > > Signed-off-by: Tadhg Kearney > --- > examples/vm_power_manager/channel_manager.c | 19 +++++++++---------- > 1 file changed, 9 insertions(+), 10 deletions(-) > > diff --git a/examples/vm_power_manager/channel_manager.c b/examples/vm_power_manager/channel_manager.c > index 5e0bbbb4c9..0a28cb643b 100644 > --- a/examples/vm_power_manager/channel_manager.c > +++ b/examples/vm_power_manager/channel_manager.c > @@ -23,7 +23,6 @@ > #include > #include > #include > -#include > > #include > > @@ -60,16 +59,16 @@ struct virtual_machine_info { > virDomainInfo info; > rte_spinlock_t config_spinlock; > int allow_query; > - RTE_TAILQ_ENTRY(virtual_machine_info) vms_info; > + LIST_ENTRY(virtual_machine_info) vms_info; > }; > > -RTE_TAILQ_HEAD(, virtual_machine_info) vm_list_head; > +LIST_HEAD(, virtual_machine_info) vm_list_head; > > static struct virtual_machine_info * > find_domain_by_name(const char *name) > { > struct virtual_machine_info *info; > - RTE_TAILQ_FOREACH(info, &vm_list_head, vms_info) { > + LIST_FOREACH(info, &vm_list_head, vms_info) { > if (!strncmp(info->name, name, CHANNEL_MGR_MAX_NAME_LEN-1)) > return info; > } > @@ -878,7 +877,7 @@ add_vm(const char *vm_name) > > new_domain->allow_query = 0; > rte_spinlock_init(&(new_domain->config_spinlock)); > - TAILQ_INSERT_HEAD(&vm_list_head, new_domain, vms_info); > + LIST_INSERT_HEAD(&vm_list_head, new_domain, vms_info); > return 0; > } > > @@ -900,7 +899,7 @@ remove_vm(const char *vm_name) > rte_spinlock_unlock(&vm_info->config_spinlock); > return -1; > } > - TAILQ_REMOVE(&vm_list_head, vm_info, vms_info); > + LIST_REMOVE(vm_info, vms_info); > rte_spinlock_unlock(&vm_info->config_spinlock); > rte_free(vm_info); > return 0; > @@ -953,7 +952,7 @@ channel_manager_init(const char *path __rte_unused) > { > virNodeInfo info; > > - TAILQ_INIT(&vm_list_head); > + LIST_INIT(&vm_list_head); > if (connect_hypervisor(path) < 0) { > global_n_host_cpus = 64; > global_hypervisor_available = 0; > @@ -1005,9 +1004,9 @@ channel_manager_exit(void) > { > unsigned i; > char mask[RTE_MAX_LCORE]; > - struct virtual_machine_info *vm_info, *tmp; > + struct virtual_machine_info *vm_info; > > - RTE_TAILQ_FOREACH_SAFE(vm_info, &vm_list_head, vms_info, tmp) { > + LIST_FOREACH(vm_info, &vm_list_head, vms_info) { > > rte_spinlock_lock(&(vm_info->config_spinlock)); > > @@ -1022,7 +1021,7 @@ channel_manager_exit(void) > } > rte_spinlock_unlock(&(vm_info->config_spinlock)); > > - TAILQ_REMOVE(&vm_list_head, vm_info, vms_info); > + LIST_REMOVE(vm_info, vms_info); > rte_free(vm_info); > } > Tested this patch set and it fixes the compilation issue. Thanks. Tested-by: David Hunt