From nobody Thu Dec 18 13:31:21 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=nutanix.com); dmarc=pass(p=none dis=none) header.from=nutanix.com ARC-Seal: i=2; a=rsa-sha256; t=1751638514; cv=pass; d=zohomail.com; s=zohoarc; b=Buv9fw9BjcEJ/lc7HGQ7Wb2JKYDNnU5wp/plEaYqkbHYbZA9/4NbtiK8/RFmGYNqRWeqTvTnRrw3zkT89nfY6L8MGBKf1Y1g2MSNf5TGEDqljSOVf4ctRw+5HJ8LBXl10bE/7FDRNjRD76fv+GS72M6VXPXZTpKAuhXs6BEV5qY= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1751638514; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=pPuDxY4QWTE7Efc+/14RO1CaZk+qNTAYIF/jv+iHMrI=; b=QCW1Eq0JhvSiQPKWOBkW0UkgTG6OVbngFDypE71n+EOa12j/XZAI1MhL05dRPW1cH+DgcNVz7osHEbg0pwNbUR1O683sURZHHJtrCau3cumBOrkAZ28SCUIUZcgXuEHGqMhee/uQQ8Mxq0UaJvv7nup7fdwIP1sZOYsHZ9WoABE= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=nutanix.com); dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1751638514014865.090343393968; Fri, 4 Jul 2025 07:15:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uXh7c-0000h0-5S; Fri, 04 Jul 2025 10:10:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uXh7Z-0000ga-8l for qemu-devel@nongnu.org; Fri, 04 Jul 2025 10:10:33 -0400 Received: from mx0b-002c1b01.pphosted.com ([148.163.155.12]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uXh7X-0004cY-D1 for qemu-devel@nongnu.org; Fri, 04 Jul 2025 10:10:32 -0400 Received: from pps.filterd (m0127844.ppops.net [127.0.0.1]) by mx0b-002c1b01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 564C0wd8009938; Fri, 4 Jul 2025 07:10:27 -0700 Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12on2091.outbound.protection.outlook.com [40.107.244.91]) by mx0b-002c1b01.pphosted.com (PPS) with ESMTPS id 47jfx10gd3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 04 Jul 2025 07:10:27 -0700 (PDT) Received: from PH0PR02MB7159.namprd02.prod.outlook.com (2603:10b6:510:16::8) by BN0PR02MB8045.namprd02.prod.outlook.com (2603:10b6:408:16d::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.21; Fri, 4 Jul 2025 14:10:25 +0000 Received: from PH0PR02MB7159.namprd02.prod.outlook.com ([fe80::6cf9:b35c:b143:bb88]) by PH0PR02MB7159.namprd02.prod.outlook.com ([fe80::6cf9:b35c:b143:bb88%3]) with mapi id 15.20.8901.018; Fri, 4 Jul 2025 14:10:25 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nutanix.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= proofpoint20171006; bh=pPuDxY4QWTE7Efc+/14RO1CaZk+qNTAYIF/jv+iHM rI=; b=P2Sza43QI1G1Gg3bVakTKQLoVQt950xFXdofRCBjwgED8qcfKj8OPjpjh jweP9TToZL1udIy4+dM3/ToUrdUr6WI/M5S4gUie9miupwnjlBQR1xhJKBnnZfLY YdoUUsllZz+YHFplFViPBSHW7771uAVIGZG9174SOO4wcHJqWQrPwMZJwcxcHMpE BYQSPJx+85IeaWRKXALE2ckc7YHxJF7v+psTHlAONUpndAMedfzidH4tSZDEcV5K JZl5dkFnPEFIaPH0XuNfI4tpaIko4EZcC4i+4zLemAWBM7WRYRWKA7TtcooZeiPA DBjW9jPDGXO857PNM5fMEybwfgxhg== ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=AAaOzOaJzkoVj8MC2ZzQKmryIlUMJjjLlFa6Ajh647nu+1dUIYajmPuvi4EHHSrnkGMMJd0gsIWhIRfa1Ew6FunBZyp6MQFoOXwXp0si4E4eisCjOW5SaESufuAdodjYF3uWwTvc9xo8yU6ISmpPkulYHUKRFmLWEx17zeXDy51ThspoqvJgMUQztpeqwilQl10jpAoJ4+dr90MUL74nCb7stydAU/WSONcDwlvTixNGTjJUYru5N01KwHTFTBAlG8GltthxC4/UmkQVPt8Y1LeTvPc6dL3kfB0jaPO/s9l/LV2zwJgcjkx9iVPFOuvne6WkbHnU5pXGYZgST6Nl0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=pPuDxY4QWTE7Efc+/14RO1CaZk+qNTAYIF/jv+iHMrI=; b=fhDY+Y0hySyFWYJpGtGwrICr5jJJSP+SDD87mn0xQQzqcDSRrAdgw/Sc8279w7nGahiki/gr1Oe5HufdvmZRZIFtqioy4yeiZNyP56LTs8B3nlJf0T/+1JY7jeED9ApfUA4lGx0/9QTNBQtX642a2PfRZ0BHyp+3Y3oH9a1A5PK/cLtMp7suZFZt0hC35ffqj5cPZafb+32p8eSz9fcTrlo324Nvbt0nAS5zHM/HsYkX4O5WT0UxG06X6Rkq14Ajl1sOLyc8X04Ypz57K9RvCth037eUZz3gi/KRfQc7QMJhuZzszUd/IBUob96MWftI5PYgjniekPxkK6Q6xPPxCg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nutanix.com; dmarc=pass action=none header.from=nutanix.com; dkim=pass header.d=nutanix.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nutanix.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pPuDxY4QWTE7Efc+/14RO1CaZk+qNTAYIF/jv+iHMrI=; b=U7OyjHLeBHvJueHagoK40WPBTSj6aicLbm28IL5dQJ8rIQEnHmULdzN7yqzhxn/OeBGqpeBLFYSyXBBiJFCQ1CSBDG7QJSL+WTbUyeJ1Z1FWZwIuqG4Z4/iF/bx7MCzMbGoV7MndZkFOUDYxiz+urn4L482yVwqA/TJQpaT1otDqCaHz+sarZpR9lJKOX6RG4gIlEE0/+Yguk0tYTsdyOxT4n396phkhInEIFkntbh/26Ktnn8Ph2ghdQwMG+QQhvLTB1t58ZLyavijnad6c88VV3Pam/yl6rb0b+v0TsCTp3wBA1sl+DTnaTZQO7SciPZAwgIygONgwmxGolOGzRQ== From: Mark Cave-Ayland To: pbonzini@redhat.com, mst@redhat.com, marcel.apfelbaum@gmail.com, eduardo@habkost.net, imammedo@redhat.com, qemu-devel@nongnu.org Subject: [PATCH v3 01/14] hw/i386/pc_piix.c: restrict isapc machine to 32-bit CPUs Date: Fri, 4 Jul 2025 15:09:28 +0100 Message-ID: <20250704141018.674268-2-mark.caveayland@nutanix.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250704141018.674268-1-mark.caveayland@nutanix.com> References: <20250704141018.674268-1-mark.caveayland@nutanix.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM0PR01CA0151.eurprd01.prod.exchangelabs.com (2603:10a6:208:aa::20) To PH0PR02MB7159.namprd02.prod.outlook.com (2603:10b6:510:16::8) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR02MB7159:EE_|BN0PR02MB8045:EE_ X-MS-Office365-Filtering-Correlation-Id: 442873ce-00da-45ef-733c-08ddbb0485bb x-proofpoint-crosstenant: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|1800799024|376014|10070799003; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?RT+aBgKs+T4iqL44Kp6BlfX/LFO54SRliD8A7MIZ/YbskToUQid64fXE/96s?= =?us-ascii?Q?6eQ3YYvKOQL42cMZcukLQIS+fZYLdwnOPBBcFvaohGNP7Fg/1rJFGX8o/ojz?= =?us-ascii?Q?kFkNMNs89PbM//Y9q+LVLG9agI2RPQDeT8DCP4+joOHMIgBPxjqTHHh1pSXL?= =?us-ascii?Q?RKPF+VIoZ8wsCmiVn+YrDeybObOCcCmT0R+7ABC57JfsdX82C3k6zPIVUogN?= =?us-ascii?Q?4DGJilSc8Crz0cO1PoBP2BcAyQHzMqmuCww4J2GoVpAg9vbY5ffiiB3/P3hG?= =?us-ascii?Q?RxJUTR5Edm+ErUbdbLJCN8AB5aT1Afl0HK/mxOk4RfY2Duq96Hud6V+Fi+/0?= =?us-ascii?Q?t/FaTUobz0WRVvbIK7Z2DqNfUgtrTFxkxL6jQabALXwLTcZaSiAzBm6iW8Ni?= =?us-ascii?Q?nCadJ9WweVfD5kglqU7woLjefmK8AqnQI7NoYJaqkzhgPo3Zox/gLABv0AGw?= =?us-ascii?Q?N78kVyD/HNf0r7tS6cfLY6cetKnKpST3oUlQQyn8gsE4SnPgePqrU30a6Ce/?= =?us-ascii?Q?Lvj34fqhgr00yiXL9rLmBPaPbIhzyQ4oV4zRKVdPr/NiX/8BzkN11Af/+jin?= =?us-ascii?Q?ubzl51P2QqEY4iidgJ2wNRPYnY+iJzSMtdTZmWu02+MO6U86Blorx23QorYQ?= =?us-ascii?Q?iF55bMbcQHppBsfIEsVeR2mcHIyxZRshxcI2bb3NpyQs49VcEe9eQE1YlrPr?= =?us-ascii?Q?hC/RBB+XCNwOJmnHchm8RJ124/7aLisiA9xnqj7WIo/U0/XopN4diJR0SAB7?= =?us-ascii?Q?YOxoLK43C1JAn1iYySPcvQB9bA5TjpXKb3wbKrkHxus+InCjF//A68T1kLM6?= =?us-ascii?Q?Gzv084j5i1LLRMcOf1cgo4DUZCg8abLI65igFu+6Ht8yLO60JWk3v6pneTBL?= =?us-ascii?Q?yOgOGPJk4fqQTv4KO5vYX+ueUesRSwkQDlUBZplyQHxbGx0ZvUBF7MUmF4YD?= =?us-ascii?Q?JXMQiPQhZbMr19Od+U+90TN9h0LvuaA5PDiHVtBzWgKzZeHAPjkappZN7gP3?= =?us-ascii?Q?xVjQ2F4CUZYL/C33Ov99XEz8y93XabYwU4Hb0Xc5rP38Ase/O65sRnxpMTQ9?= =?us-ascii?Q?o51jH4kz8b1BgaTAV+5eA9889lKQrq4gFgnaMJ5e3Cf0hxOTd/NjPiMHxcpD?= =?us-ascii?Q?ctlTL5sEzDlDdQo+ETLYN0shi8c0XEVEQhJ8+3k1+ORxMLQ2Jo+xroIHTbDa?= =?us-ascii?Q?USXaBMS4gMnsp9TQ7wqbjrzxzn/wMudfOkZGECd2jJvIWVuFXFu8Dztls4e4?= =?us-ascii?Q?/799j8CO4uM9iOdNEe9GkUO8/tbaoiorlBKmkdPx24SzoAzc4RogmJxo5z5p?= =?us-ascii?Q?VlFhBiu9tLLvqL44CQuSBZGUzjLkBqr0DJHUVBjdc6cz360TwNfg2bs59fBX?= =?us-ascii?Q?afaeDOZ/RfPWk/dxrKTdbGTIOCJsxLXYq+jNZnaUgCMUG76XoMTY55bbAIT2?= =?us-ascii?Q?9X2PiYpoX6E=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR02MB7159.namprd02.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(1800799024)(376014)(10070799003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?rbiI9NxUf/I5pNjFECDoLUseV9yS9ocDO5rLFGVmCJdei+d3t7/k7q/o3mgw?= =?us-ascii?Q?ZNL4r+1Auf209FdMzlhPpa5kUyRJipXrdr3kr2QIs0GzgE4eRyKZg0lv46TB?= =?us-ascii?Q?Oq6KfqDH3wun+HhvA7Nt2OAtH7f82FAhWQzsURbsjC7kwbu30ZCn4R07Z1Qt?= =?us-ascii?Q?D38zw5BXx32W4R+zQAzYrIQ5bYfCr903OkaoJH9LW66wvw/Dac2dwSPAQAjV?= =?us-ascii?Q?Xofq1IGNiyXwZph7bsrwQsBWpTvrea1AE45mb9xUnE5XDVg6cyUMPBEl2QmK?= =?us-ascii?Q?DnO8/ruUnIlQGgoGo+dDbo+ST2FB+ma9KWRK9lW9l/XujZfmpA6wUmXD3CxT?= =?us-ascii?Q?4ZZO/kCmXOVRhbNLYREz6vAknl2Ar4sm8i1xDq9us08ONtOIN4zQyRwaJZRR?= =?us-ascii?Q?6V+KoKmbH6woBMHB5Aw5K6XWJTIaTQ8F2u2/ZQpoqM6rR8lEB+zxR9P8bEx6?= =?us-ascii?Q?nj3MuerJ7Xhj5JtsTHsYqDdxJbfrtyc3Ha7I/wsaVX6V+CEEsB2C0uFY4+xF?= =?us-ascii?Q?QrQjgpXkASkc5d/J3vi3ck4oqWIqjol1gjeBeKSAdm0GLOYf4RRKkmCfnBYm?= =?us-ascii?Q?wJ+Mxr+fiTcn/HaoJPQI3oJh8QunDLA4Er/YHTIQ1A4dIYVGHtmaQ5PIa0Qd?= =?us-ascii?Q?zOOz+VI5Wld2RnSvBTI91Q0tOvHVzMtthB4we2gqd2RvfElH5cjT9/FLLYvz?= =?us-ascii?Q?dOi+bzQAuhCZ4cL7ttJtoSlpzrk/XQDjjIrt8anDxf0I5WjPHWCfpcTwR4bU?= =?us-ascii?Q?2QcPbj0fwQ6f1ZYToT/V/ArrQ1IG9Ydlhx9350bjbr8NXvjBlkwL7P+08T7G?= =?us-ascii?Q?07PbZHlvpssV9NWUDHb3D7IF1gqP2DY8WgHD9Ja74VyM2kYCwL2VXV3ZIhT+?= =?us-ascii?Q?RQS9bulsdW+rwkllT6tk8njLNi5jRMAVksFnoom1YQOyT6GCU+iI0aRa0NkH?= =?us-ascii?Q?BAijkQUDhzcCt0CATDdyW0G40nh8FHdRVCuHy0s86pfmPhlgq7OEpqlluy/6?= =?us-ascii?Q?AvMi9mCzSHxMxmy9bqmxhXSKCXPX8i8UdPzgGvn4BZzZRbpbj4c1oe7bNoYk?= =?us-ascii?Q?DWwjdHDRAM6r3JwAd8YdzK3LMcMv0fpYDpDga7nKKizYnsNtcR6Tv8ksr3Ac?= =?us-ascii?Q?lGOWp+qT3Oi3JooJa7hIWpvxUbGYFGbdi7RGkFX6KPitMahOcOQyUCdsP40u?= =?us-ascii?Q?oku6Bak5OZA32m/NQf/IYSmweK8sBHBB94nBWUX7JJE+6Hu2PWRnw/eFMlHe?= =?us-ascii?Q?JJJlzAv7yzQk1VVUHuc/iS/tZSIexUyXspz505XWpYhfTxt0l1rh6cN9MCM3?= =?us-ascii?Q?csXBVKMByRomk4f+wTPXp7wiQJpPYB5OPqkIbvpboDXF9d6Ipo34cSBdYC3s?= =?us-ascii?Q?EBrK75LCaURDy2WLKh5rF4knTMC35aNFW25INsRLKyzikakrHqV9gNjbss4H?= =?us-ascii?Q?DvDttnmMIOgGC7VBby27IkCTsXPq1Mfi3Zrz7vXT3TQjiwvFyPthR+C4DS94?= =?us-ascii?Q?uspeMJ8B4bKNFekq/HxIQX8bBVlWoMtDX86N4byaNlj5dJ1nydqwPp94LIvC?= =?us-ascii?Q?IDi3saubVVKw9rR8qSMOtuL4/YGxeplccTIPKt5Mf5PR49cR9UiEQ5xOz5zI?= =?us-ascii?Q?PH6YYCbu3L2p8SpVKDiEf7kyNvTbFoxeiTryDP5KTroEETom/OD0oY3OnAj5?= =?us-ascii?Q?lTXWgA=3D=3D?= X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 442873ce-00da-45ef-733c-08ddbb0485bb X-MS-Exchange-CrossTenant-AuthSource: PH0PR02MB7159.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2025 14:10:25.4986 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bb047546-786f-4de1-bd75-24e5b6f79043 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: SDg2MEdVgEE1FjnLIj+I4UzWTfB1k4DsNPU88GRDc2u93RLKrB0E+5Y0uQ+REIbycHWK5o3ercvURgJtaEFyt8zphKFWrUfT7xv3ESdsgFk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN0PR02MB8045 X-Proofpoint-ORIG-GUID: JMZLHlhyImqV4BkE0Sd092khOQV9DA3x X-Proofpoint-GUID: JMZLHlhyImqV4BkE0Sd092khOQV9DA3x X-Authority-Analysis: v=2.4 cv=c4qrQQ9l c=1 sm=1 tr=0 ts=6867e0d3 cx=c_pps a=1grIbyKvDpWKlhKqFVAn8Q==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=Wb1JkmetP80A:10 a=0kUYKlekyDsA:10 a=64Cc0HZtAAAA:8 a=nuetpX4ixqIVgyrW5aIA:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzA0MDEwNyBTYWx0ZWRfX/pEhs+tPSbDy Y3gXBgnkK/fUC17dn+cy81+S3vkS4X5EQV7htXvsTeStVN5aSXAOvdNgbGHce8XLxiT41ZmEH2e 9wMSz+xjAyaYZnD8aq48nOFX3PNVRQleghVBR+s+Vxtfv/6RSrjcRWOgc0wwObUgpSLWK9Q/bsP rrzOFooSBcdY3jwJSR1GJklV/ZbW0vdKItQTcX9dxOwe0Rw6Rplr1ybtbUKW+fopla52Y37iUQV PXXV5HoO+Mkt8OHmwnI9OwcphaaNQbER5vRH41r+2j7fcbSSopT9c+k3Qe3rcMFCnVgSGFWE3l3 ISbGOEY8aq0bEmfXp57Y3SUQgYjD9a0MlHxbA5Tna4bby7PuVu6avK+FjclahOjjUZDEez0fuyY 0N9n8mjb3ePr2hkMYAAg9xIgkrRR9ADrrSRnXocYALcEGKaxqunw4Z0CtcJR7cLw1fAnLe+6 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.7,FMLib:17.12.80.40 definitions=2025-07-04_05,2025-07-04_01,2025-03-28_01 X-Proofpoint-Spam-Reason: safe Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=148.163.155.12; envelope-from=mark.caveayland@nutanix.com; helo=mx0b-002c1b01.pphosted.com X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.218, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @nutanix.com) X-ZM-MESSAGEID: 1751638517206116600 Content-Type: text/plain; charset="utf-8" The isapc machine represents a legacy ISA PC with a 486 CPU. Whilst it is possible to specify any CPU via -cpu on the command line, it makes no sense to allow modern 64-bit CPUs to be used. Restrict the isapc machine to the available 32-bit CPUs, taking care to handle the case where if a user inadvertently uses -cpu max then the "best" 32-bit CPU is used (in this case the pentium3). Signed-off-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/i386/pc_piix.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index ea7572e783..67c52d79b2 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -418,6 +418,18 @@ static void pc_set_south_bridge(Object *obj, int value= , Error **errp) #ifdef CONFIG_ISAPC static void pc_init_isa(MachineState *machine) { + /* + * There is a small chance that someone unintentionally passes "-cpu m= ax" + * for the isapc machine, which will provide a much more modern 32-bit + * CPU than would be expected for an ISA-era PC. If the "max" cpu type= has + * been specified, choose the "best" 32-bit cpu possible which we cons= ider + * be the pentium3 (deliberately choosing an Intel CPU given that the + * default 486 CPU for the isapc machine is also an Intel CPU). + */ + if (!strcmp(machine->cpu_type, X86_CPU_TYPE_NAME("max"))) { + machine->cpu_type =3D X86_CPU_TYPE_NAME("pentium3"); + } + pc_init1(machine, NULL); } #endif @@ -786,7 +798,19 @@ DEFINE_I440FX_MACHINE(2, 6); #ifdef CONFIG_ISAPC static void isapc_machine_options(MachineClass *m) { + static const char * const valid_cpu_types[] =3D { + X86_CPU_TYPE_NAME("486"), + X86_CPU_TYPE_NAME("athlon"), + X86_CPU_TYPE_NAME("kvm32"), + X86_CPU_TYPE_NAME("pentium"), + X86_CPU_TYPE_NAME("pentium2"), + X86_CPU_TYPE_NAME("pentium3"), + X86_CPU_TYPE_NAME("qemu32"), + X86_CPU_TYPE_NAME("max"), + NULL + }; PCMachineClass *pcmc =3D PC_MACHINE_CLASS(m); + m->desc =3D "ISA-only PC"; m->max_cpus =3D 1; m->option_rom_has_mr =3D true; @@ -799,6 +823,7 @@ static void isapc_machine_options(MachineClass *m) pcmc->has_reserved_memory =3D false; m->default_nic =3D "ne2k_isa"; m->default_cpu_type =3D X86_CPU_TYPE_NAME("486"); + m->valid_cpu_types =3D valid_cpu_types; m->no_floppy =3D !module_object_class_by_name(TYPE_ISA_FDC); m->no_parallel =3D !module_object_class_by_name(TYPE_ISA_PARALLEL); } --=20 2.43.0 From nobody Thu Dec 18 13:31:21 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=nutanix.com); dmarc=pass(p=none dis=none) header.from=nutanix.com ARC-Seal: i=2; a=rsa-sha256; t=1751638284; cv=pass; d=zohomail.com; s=zohoarc; b=CJe+IqO2VpYcamJ89sZLEKvmdofGsBY7T+Of/TcVYjfFbvIqi4AvVsAO3fmYWXlAVr8sRbJ4p2FL8k7S2gxLPi2kYcWgiWn+G69EnJNWMaaT6SYyg1hJMAAJ535clahKtC6eEBIL1FXZXbJDsq9glkXWyXBfSiKV5CtYlDKIkxs= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1751638284; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=zyeKhr35EZKtAE0UmUCPg6WHOT+4bU8uc9Ff3/dHAlE=; b=GgpQCUCGl+m8J2eMGfa0oF8TyNexuYi+Qr2av//TzSXb2csctmWLoWLG5g+8GipTghyPjBV5NpMJw74xEAOuNGb8VvrbJshFjcZcFUnKlDT2n4BloBfvpguoZ2+WmLS6XnLY2vZApVuegSSUYa4n/WGZPev31VpEbvfPxUSFM4c= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=nutanix.com); dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1751638284391469.3571590978038; Fri, 4 Jul 2025 07:11:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uXh7p-0000jw-8Z; Fri, 04 Jul 2025 10:10:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uXh7f-0000ik-Fz for qemu-devel@nongnu.org; Fri, 04 Jul 2025 10:10:40 -0400 Received: from mx0a-002c1b01.pphosted.com ([148.163.151.68]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uXh7c-0004du-Qm for qemu-devel@nongnu.org; Fri, 04 Jul 2025 10:10:39 -0400 Received: from pps.filterd (m0127838.ppops.net [127.0.0.1]) by mx0a-002c1b01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 564BSSeg022206; Fri, 4 Jul 2025 07:10:32 -0700 Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12on2125.outbound.protection.outlook.com [40.107.237.125]) by mx0a-002c1b01.pphosted.com (PPS) with ESMTPS id 47n1x96a45-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 04 Jul 2025 07:10:32 -0700 (PDT) Received: from PH0PR02MB7159.namprd02.prod.outlook.com (2603:10b6:510:16::8) by BN0PR02MB8045.namprd02.prod.outlook.com (2603:10b6:408:16d::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.21; Fri, 4 Jul 2025 14:10:29 +0000 Received: from PH0PR02MB7159.namprd02.prod.outlook.com ([fe80::6cf9:b35c:b143:bb88]) by PH0PR02MB7159.namprd02.prod.outlook.com ([fe80::6cf9:b35c:b143:bb88%3]) with mapi id 15.20.8901.018; Fri, 4 Jul 2025 14:10:28 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nutanix.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= proofpoint20171006; bh=zyeKhr35EZKtAE0UmUCPg6WHOT+4bU8uc9Ff3/dHA lE=; b=Okj15zBMLoxwbdL2E7qPeQy1doQmrw61YzXNsKb1Uq4P8GpW/FrdBfsv4 /hQryP9pJYSlOnr7+uUlhn09qx6KO/b+RVkHb+Q3r5qYsmptlJTbX/mMksBhpcXV V30+zU7MRqkQHIknKBpMmvYTT+BSD9iunhGu4iMwM6b2oT8hGdbWGnhTHAwmbiSC IBru82K37rquWPzTUH3Z7irrp1Pb6BeAYvA6pGcwcNlLmBZqnWlZtMSU6SE+cB/p KFO1SfHWR7VXKhTYW0occjpaIDDQg352T2+1GDUvzfosyBvT63XEkgDkoD7XS3AY XM/ejpuzzFcbxVi5lYJRE5Wk6SW/A== ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=aDIRIkQlOYrm6iOglcqLOU7z7n5bdmvjwmeiU1UNxJuhWWOilrORVI7HLbzxDTREzjeFdh1qOEY76beAVcIhaYTkxVdckPrVi4IP+cqLk2tLhkg0JQipxmASDcdGsNdvROfO3hLiIp21Vi4RivbINj4y9d/hofM4HvB8xb57btU1KKteo41qE61CSO8y4t+RlKkHxj/FZfJAfJh+fy5u2Gn0yOn6HvAogJ+AWoVIAndD997vhGpcOKt9UHgjKFPa5Zom1hpuVOLaSUTzBRnCKbV4DuGsdIc3sz4qlluEi60zLCX9tgELZtHRCIX4s6LGN8dagm5435J9Cym7JUY0Mg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=zyeKhr35EZKtAE0UmUCPg6WHOT+4bU8uc9Ff3/dHAlE=; b=VtLdw9h33mq4VJ9sKxRV/ubacwf/bhdgVqt2JXj3nz+rEQhdnr3/Pw7cavWO7izRGdm2IKDFOdU21s6+/pmXp5StASG8QS2hqQKUgBUorwtJRH3ge5LWL+0GN5aGzfXFzDLHU6I3sEgrfCDtyRmBsmRZTfTGEUU5llj1qZqLUg8YrX7aHcxwH5JStnT8RT1ziBb/Q8FcTpKt/Wsx3NwEzine97lXhqeBs7h4v5+VSMIj/tYCj2Y/myomQ37YntHdaZ8Da7J+k2DEgqXhYU7dXKgbPaI9uVx0XoSfw9ETlyHvqHTjCk0ak+EXdeg6vmTNb0AG5Ajpa8KEydmoae08Wg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nutanix.com; dmarc=pass action=none header.from=nutanix.com; dkim=pass header.d=nutanix.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nutanix.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zyeKhr35EZKtAE0UmUCPg6WHOT+4bU8uc9Ff3/dHAlE=; b=FTr4pDWFhrjpAN+E6NeH23m6Em6JYGDtNfRjUuRtyWSjnRDfPSBph9eLGDhotc7TxJTCv+X7Y2QAx7kuWHXBkCGzB4P7ebACRicTiShf8FabUWTuLLphdWRPL7Kgdeu6+7X6OF+svHV2tXPFmAFQowIOtf8SpAdiMV6RF2ufSROUloHGBzKqHt+9QCdc34q+//QxaXhPN0irTIJ/wJV0V1NxgF0eSsOF449C8/PyL3r/yN2eIFKf0dcmxM72VhYu45aRuhkD3B/l7ke/XvvisZngthJfYD+3e4CpmFYB2bZWr9/sGiniTAmJwp0LmiUnmohfzkRUyAkq6o17OUx8iw== From: Mark Cave-Ayland To: pbonzini@redhat.com, mst@redhat.com, marcel.apfelbaum@gmail.com, eduardo@habkost.net, imammedo@redhat.com, qemu-devel@nongnu.org Subject: [PATCH v3 02/14] hw/i386/pc_piix.c: duplicate pc_init1() into pc_isa_init() Date: Fri, 4 Jul 2025 15:09:29 +0100 Message-ID: <20250704141018.674268-3-mark.caveayland@nutanix.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250704141018.674268-1-mark.caveayland@nutanix.com> References: <20250704141018.674268-1-mark.caveayland@nutanix.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM9P193CA0018.EURP193.PROD.OUTLOOK.COM (2603:10a6:20b:21e::23) To PH0PR02MB7159.namprd02.prod.outlook.com (2603:10b6:510:16::8) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR02MB7159:EE_|BN0PR02MB8045:EE_ X-MS-Office365-Filtering-Correlation-Id: b6e93f97-a4f7-4a2f-cfbf-08ddbb0487b9 x-proofpoint-crosstenant: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|1800799024|376014|10070799003; X-Microsoft-Antispam-Message-Info: =?utf-8?B?cjIwWVdWcXlMbjFxZ1Y3REV5Ri85WjNYT1pMY3hrRWcxaVFHNDE2M3BNa1hY?= =?utf-8?B?SXBMS0xFUTFrV1Z5bXkzeGRrZUdxTlprcDA5cUJpWUVuejhJYnJZZlg3Mk1X?= =?utf-8?B?NklQYktVY2Qrb3NMYThKOURlbStJVjY2ZzhSK0FnelZ3d2Rwc2huT2pTTTRz?= =?utf-8?B?RUk1cXdGZkg2c1JrZnlYaUJ5UFFWU3MwMW96THZaK21rc1RJRUhYdGcydW1a?= =?utf-8?B?V1R1M0YzNFQ5MUIvdVFiY2lXQk1IaFZmVzZDWDJMT2hpcjkyV2FtRlBtc2NI?= =?utf-8?B?emZrTDF3Rk43SUpldnk2Rk1Oc1dtTXcyejZXSzE3b0Ztd1c3ZVdVL2RMbUdn?= =?utf-8?B?QUFxd3M4Nnd0UTJRUFlwUzNneHQvczdrZFB4NGEyd1lqQzVid0tTbllua0Vj?= =?utf-8?B?YTRTaTB5ejRFYUlkSkxDT3NEeFYxVWVHaHJJWDJncGZ4cFhNY29ScExQZTFp?= =?utf-8?B?ZHJMNHFaaVB6QXpvTHZMa3BPY0JvNjdTTXlBdUlUdEo3Y2lORmJ5NFp2ak15?= =?utf-8?B?bkZuNHlCYnRUKzZEUjN5TzB3VTNWb1pGdGs0ZXNWYUl1My93eTl4SDRlSWFF?= =?utf-8?B?NCs4L2NpYW9jSkVhYXlicS9NWkV3V3kxdm9wcHN0OVdvYVFud1VxRlRGV2RK?= =?utf-8?B?MmZFY203YnJqMG5BV2IwS2daTjZ0Yk1kcHZSUWRSc2t1ZHVkM2dFYWhYU0d4?= =?utf-8?B?ckRMcmU5QTYyVnpkcFBwUTNid0FRNVJVcHJsb2ZveFZVMVZ1aEYrdG9xMEJC?= =?utf-8?B?NTZoYkFIQUhIODU5SkZXNk1XckdUdVB0UGpSRzVGUTF0UmtSekNNbmFCWTJl?= =?utf-8?B?ZDdwVVZZck5rQ1p5dVdRU1RsMGJnMTZkUG9Sc0ErRGtFR0ZKTUJIejJ2dmFR?= =?utf-8?B?NllDaXdMUndxU2IvMnBPaDRDUmduZm5tdjF3SHFRcDRuanlOcDlXRUFXWHdP?= =?utf-8?B?VWNDNmRxQ281UFBrc1pWODlTTkZwd1VSbWxUSEJySW5DQkdacHBaMFc0cjJI?= =?utf-8?B?QmRNaklZMDZyZ2pXLytiOEd2azh3NG9UWlFOcGNFTC9md1hkUlNnM2Erd0JF?= =?utf-8?B?b3U1dFVhZnpRTzF2dmQxTEFzZjdlb2EvT3BWd0F5TEJVMSt3Y2xCWE5wbWMz?= =?utf-8?B?dm9MaUIvRDFVb1FJWWYrZUZDR1ZIV09leHNaNjlCdjJEWlBZMmF1OFVyT3JY?= =?utf-8?B?Q3JHM1BGRk1tU0NLQVl0bVcraWFzRU1xZzBtWm15VGNpOVZGK1pxWS9ZTVNE?= =?utf-8?B?R3hvY1NxT2ZLYTJQeVVOZENMdm1LOVI4U2lJZmJkV1NmZUFjRE16VFNMUVV5?= =?utf-8?B?dXhkRGZRSXBQZ3ljalp6bDBZV1FiT0lPaU5LRjgzN3pjUHJQQ0RCNU5nQ0hi?= =?utf-8?B?NUY4MDl3N25uVXBmVitCZWQ1bGJOdFdncXlSWVB2enI3ZnhldFdOVGd2OSti?= =?utf-8?B?WEZGV0NlL0p6Wmw1a1ZBUWowWWRseEd3UkxXb0w3TUg5QVI2Ui80WE5SM3pj?= =?utf-8?B?WGhRU0Z3c05LLzNDUlcxU2lOLzlWRll2SmdQT3hOUFdwNDJBcitZejhaazVl?= =?utf-8?B?YVo5d1VjWE0vNHh5THhFNlNBdHYxVktNWFZjVWhIWWo2QmUvY3pKelNZUk1m?= =?utf-8?B?WFdENzRSWEw5MDNsSjVUcmppUCszaCtFRjlKOEV5SU1wVnh1MXZBT1BPTVBj?= =?utf-8?B?QTdrVTg1U2RXVGgxTWNXT1c4VERzZjg3b29mUnN1RlZxbTArRG5wdXFUMHMr?= =?utf-8?B?NExMVGU2L243NHVIWE9nMVF4V2NUMGtxNlB0dzZqa2JFSDErdVM5aHgyVExT?= =?utf-8?B?MWt0eFNENElhYlJnU2d4Q0FRWlNFQ1JlWXVnS0J3YVhQWmppa21Vc3J3eEt1?= =?utf-8?B?dVBCdG9NbkVnRUJnUVRweCtXVFhCTVMxMnRsYStwdFBLOTY1RWpmdzNJN0h2?= =?utf-8?Q?JejcGBLIG+c=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR02MB7159.namprd02.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(1800799024)(376014)(10070799003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?MkV2RmE0QlNlUVhTeVY2ZWpFSTBoZXNOQkxkWXJ1OWtBWFZ4SjRSSE8wRnhu?= =?utf-8?B?VmRjU1FnZjEyaG9wajV3ck1QdEs2RmdDSkl0MDN4UEJFb3BUdStkS0tuUVNj?= =?utf-8?B?UjFkMUxFTXYveXlxTTRJT2tONmpTbTBMS2E3QXlUOTU4U1g2N1lKRzlYUUtU?= =?utf-8?B?SUdoVFdWWGt5NGxuMWhFa2pWOUZUVWcyb0tSV2hBUzdHVmh2cC9zR0JCZmxh?= =?utf-8?B?aXJvWTJ0cXE2czV4aUM2RmlrU05ocTNUMHpiTTd6V2Q4amRQNlZDTno1aGVB?= =?utf-8?B?dWZBTDh3emRFdmI4YXdyNXdCTEYrcDlmcWwyMzVWejRybFpzcmYvYU9CM2pL?= =?utf-8?B?U0lhWWVrT0Y5MjVkdU9COThKaUppaGdyem1oaUJUMWF1MjVXSkxqN3JNdjB6?= =?utf-8?B?aC9nVmxrY3lJdDBJcmQwaml1WWIrWjQ5dFVETkhLVTJCVGxYVmZyd1lzL3dx?= =?utf-8?B?UW5SRkNiQkF5QndEL1B4TTc1YlY5eGY2d2duVkY3Q0xFdGFySFpIdklFUjl0?= =?utf-8?B?aDhQcXpzY3FGZndVUFYwNUMyakN0MnJQWVhweW1sUnZqNk1iNVhTZGdKRGNJ?= =?utf-8?B?SU5tdEs1OVVNay9NZzlvZE14bnkzN1dOUFZQdEJqU1NRSUkxRkUwRmtuQlhM?= =?utf-8?B?SWlEUlJPdHE5US9DcmNGQkJWVTM3WFNnb2FYT3c4bUhZa2JDcnVtTi95MHlM?= =?utf-8?B?aVI5R0ZzK2RlMENXL3RCdWFFayt0K0tsdndXOUdGSjNHTGVvSTVVZzBock11?= =?utf-8?B?WkszUGRGbDVSditoNHExREpzakRGb2lYOXE0OHhCSmpxTVBzeGo5TS8xbjhF?= =?utf-8?B?VFBaa3BJZEtwTisxOUtua3RiNlhSZUhKUUQzREN2SDh3cE9KUWZBMk9sbDN6?= =?utf-8?B?U0tIY2dQQzNvdFFpNjhtVmVQbjlqQzNKdjFuMzVoL3d6RFNKU3JaTk1wZzJh?= =?utf-8?B?T3hYNTJHa3JxbjFjUDRuQW9TWDJ3RjJIRjk3dFNWTWlkNHNnTUdvN2RpSDZQ?= =?utf-8?B?VldrZUFlVFJ4dGJRWURGRW1EVTgrNGFvanlMUWRSZ0F2SmNGMnFGQUViRTgr?= =?utf-8?B?STIzb1hPSDBrYWpoOFFlQmdKd1JzOTJaUTBSeHV2cWdmR3k5K0NadGkrNktR?= =?utf-8?B?OHpJMDRvci9peXgvcTVXWVJmYUFoWkFKeDFMSW1GUEFGZmFCMncwV292eisv?= =?utf-8?B?R0h4QlVFQmJrYk5GODZNbUY0MlhLZHdrV2tHa2NmTFJnWjB6MTYzaWdBazlJ?= =?utf-8?B?OGdUUmdOZXJVVVVjNVJPQXpjUDNsR0ErQzI1L2lMRFZqK2JMaE83SU1tbDEw?= =?utf-8?B?OGxqbjdzMzdGWTBSb3VWTUE2ellkdjVuUTB5WGlhck9JRHd5SWZobnU3OGdk?= =?utf-8?B?WHdWTEJyKzhvYzM1YjFDTlRNN1JXTFVJbmxXTWhjYzB4ZHVJa0VoNzhCV1E5?= =?utf-8?B?cGNlNm1wdWdCMXdyamNybGxaWHdWNkhUTnBuSFVLNGNyNzZsbXM5NzRZMEp5?= =?utf-8?B?Qm82OHdHdlR3aDRObnlwSmdDZUFSMXl4K2JYd0U4d1hKemlJZVdQYjIyWWdH?= =?utf-8?B?QjA2ZXRSMjFwamIvblM4RkljRXY4ZmhyYUF2MGM1MG50VHJwT2l4TDBLUmZ1?= =?utf-8?B?WUdjRlYyZHJSeWVNZ1pXZWNmaVhNVkU1Yk1uME1BZ2ZKd0tsVHFqZ0Qwa0lo?= =?utf-8?B?N2ZDWFhHNE1Dc3U5aFJTblgvNGJvNG85SEwwSTZPTjFpRUt2dGZKSU0zTlFw?= =?utf-8?B?K3ZGNW1BVzJLMU5oVUdJbnU1YVlqUUdQaUpKT2k5UkxEWE1wS3JMcERlTzFT?= =?utf-8?B?UnNiK2V2d3FIanhYS2xkSWw0UCtSMW43a04vMHcvRTg4L216VWhGb0pmTkdr?= =?utf-8?B?d0l1OXBiMzlhR0R6dDYxV3cxQUEzcmo2WFdKSGUwcUVCdzRld1lmdXB3b3J4?= =?utf-8?B?eU9lemRIL21OUUF0K0pvdjU2ZU5JbU1wWWRKNWNGdHNZbFFpYmtLdG1ndDIw?= =?utf-8?B?cm50cUcvQnlSQWR0WEUyK0xyQ1RBcWRnNEV2blpwRHVOQ0NMeFNxT0JFVy9P?= =?utf-8?B?MHBUd1hSbE9XR1FNMHliTzZqOUtsZzk3NVNyK3JFV1drdndHaDRRVUpQQ1ZQ?= =?utf-8?B?UnZUbUhJY3hwSnR6ZSttZGtxaUp0d2hKY3lHMDN3NlR6eHByVW90OC9DbTRI?= =?utf-8?B?NVh0K2g3bDlHMTh0THZtYkliTXBocE1DK3BzeE83N2IzUmRPLzNJbFp2cGJW?= =?utf-8?B?UVVRRGlqcldla3lRalM5bFlMUlpRPT0=?= X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: b6e93f97-a4f7-4a2f-cfbf-08ddbb0487b9 X-MS-Exchange-CrossTenant-AuthSource: PH0PR02MB7159.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2025 14:10:28.8902 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bb047546-786f-4de1-bd75-24e5b6f79043 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: PMOaQKt5Xj2WgCQXeXeV35XV+ihNRgulFGAdw7yCSk4VHNjOSivTsqxrCr+Kup1c1FnuDqIg+/eImC7m3Hbvoyxn6bK6p3dvLu1I5R2O1vQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN0PR02MB8045 X-Proofpoint-GUID: bFaCqECmJghyy1Il24pEjk4RXXR_cyV8 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzA0MDEwNyBTYWx0ZWRfX4ZfA8V2ZnwmN cTZYstUJvIME2sAa/ZzJEQCpopIy4uGe/Ig15glYsgm/RPJU84engMmwio0vkcxjja2IsxFuwgz vGE8WlSgk1X28aYl5Oz6sRKeIwi6c1F/e2cPknQVpBmX8UHmPGWuL1c/wh2nmmx1a5zeNh6j7Iz 2Xq6sw7iTRrBwh2BfdLdVD98lPYjBbbZlvpLoH+BFzwjzFZBtwxQpu3mgZhvDltPjmZYN94NzLw MlZfhOA70tsWXFZt4RxtJU9lYvgPhpbMzvtf5DxQmuxfg7AZT//B/0OlWyyv5bt3/c1JIftZsiS KQd6aCpi0zU7ZF1f3sNjhtCf4B1/mMvDz9OV/PAeG8zIWRMjaS3qSiR42RW29M6XT7Zs16LG8l0 BLTOAHolX/dEIuO5w+kHClpqz+8deigl+uOQ68P4ZdPBz9Qpc4Dp3HMYe/G33jx9Y8wnXkGO X-Proofpoint-ORIG-GUID: bFaCqECmJghyy1Il24pEjk4RXXR_cyV8 X-Authority-Analysis: v=2.4 cv=V7190fni c=1 sm=1 tr=0 ts=6867e0d8 cx=c_pps a=azKGx87FDiaoMypZd7Lp/w==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Wb1JkmetP80A:10 a=0kUYKlekyDsA:10 a=64Cc0HZtAAAA:8 a=KKAkSRfTAAAA:8 a=EScErfUSVzH1iicdKiYA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.7,FMLib:17.12.80.40 definitions=2025-07-04_05,2025-07-04_01,2025-03-28_01 X-Proofpoint-Spam-Reason: safe Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=148.163.151.68; envelope-from=mark.caveayland@nutanix.com; helo=mx0a-002c1b01.pphosted.com X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.218, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @nutanix.com) X-ZM-MESSAGEID: 1751638285478116600 This is to prepare for splitting the isapc machine into its own separate fi= le. Signed-off-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/i386/pc_piix.c | 261 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 260 insertions(+), 1 deletion(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 67c52d79b2..fe53beb39b 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -418,6 +418,87 @@ static void pc_set_south_bridge(Object *obj, int value= , Error **errp) #ifdef CONFIG_ISAPC static void pc_init_isa(MachineState *machine) { + const char *pci_type =3D NULL; + PCMachineState *pcms =3D PC_MACHINE(machine); + PCMachineClass *pcmc =3D PC_MACHINE_GET_CLASS(pcms); + X86MachineState *x86ms =3D X86_MACHINE(machine); + MemoryRegion *system_memory =3D get_system_memory(); + MemoryRegion *system_io =3D get_system_io(); + Object *phb =3D NULL; + ISABus *isa_bus; + Object *piix4_pm =3D NULL; + qemu_irq smi_irq; + GSIState *gsi_state; + MemoryRegion *ram_memory; + MemoryRegion *pci_memory =3D NULL; + MemoryRegion *rom_memory =3D system_memory; + ram_addr_t lowmem; + uint64_t hole64_size =3D 0; + + /* + * Calculate ram split, for memory below and above 4G. It's a bit + * complicated for backward compatibility reasons ... + * + * - Traditional split is 3.5G (lowmem =3D 0xe0000000). This is the + * default value for max_ram_below_4g now. + * + * - Then, to gigabyte align the memory, we move the split to 3G + * (lowmem =3D 0xc0000000). But only in case we have to split in + * the first place, i.e. ram_size is larger than (traditional) + * lowmem. And for new machine types (gigabyte_align =3D true) + * only, for live migration compatibility reasons. + * + * - Next the max-ram-below-4g option was added, which allowed to + * reduce lowmem to a smaller value, to allow a larger PCI I/O + * window below 4G. qemu doesn't enforce gigabyte alignment here, + * but prints a warning. + * + * - Finally max-ram-below-4g got updated to also allow raising lowme= m, + * so legacy non-PAE guests can get as much memory as possible in + * the 32bit address space below 4G. + * + * - Note that Xen has its own ram setup code in xen_ram_init(), + * called via xen_hvm_init_pc(). + * + * Examples: + * qemu -M pc-1.7 -m 4G (old default) -> 3584M low, 512M high + * qemu -M pc -m 4G (new default) -> 3072M low, 1024M high + * qemu -M pc,max-ram-below-4g=3D2G -m 4G -> 2048M low, 2048M h= igh + * qemu -M pc,max-ram-below-4g=3D4G -m 3968M -> 3968M low (=3D4G-1= 28M) + */ + if (xen_enabled()) { + xen_hvm_init_pc(pcms, &ram_memory); + } else { + ram_memory =3D machine->ram; + if (!pcms->max_ram_below_4g) { + pcms->max_ram_below_4g =3D 0xe0000000; /* default: 3.5G */ + } + lowmem =3D pcms->max_ram_below_4g; + if (machine->ram_size >=3D pcms->max_ram_below_4g) { + if (pcmc->gigabyte_align) { + if (lowmem > 0xc0000000) { + lowmem =3D 0xc0000000; + } + if (lowmem & (1 * GiB - 1)) { + warn_report("Large machine and max_ram_below_4g " + "(%" PRIu64 ") not a multiple of 1G; " + "possible bad performance.", + pcms->max_ram_below_4g); + } + } + } + + if (machine->ram_size >=3D lowmem) { + x86ms->above_4g_mem_size =3D machine->ram_size - lowmem; + x86ms->below_4g_mem_size =3D lowmem; + } else { + x86ms->above_4g_mem_size =3D 0; + x86ms->below_4g_mem_size =3D machine->ram_size; + } + } + + pc_machine_init_sgx_epc(pcms); + /* * There is a small chance that someone unintentionally passes "-cpu m= ax" * for the isapc machine, which will provide a much more modern 32-bit @@ -430,7 +511,185 @@ static void pc_init_isa(MachineState *machine) machine->cpu_type =3D X86_CPU_TYPE_NAME("pentium3"); } =20 - pc_init1(machine, NULL); + x86_cpus_init(x86ms, pcmc->default_cpu_version); + + if (kvm_enabled()) { + kvmclock_create(pcmc->kvmclock_create_always); + } + + if (pcmc->pci_enabled) { + pci_memory =3D g_new(MemoryRegion, 1); + memory_region_init(pci_memory, NULL, "pci", UINT64_MAX); + rom_memory =3D pci_memory; + + phb =3D OBJECT(qdev_new(TYPE_I440FX_PCI_HOST_BRIDGE)); + object_property_add_child(OBJECT(machine), "i440fx", phb); + object_property_set_link(phb, PCI_HOST_PROP_RAM_MEM, + OBJECT(ram_memory), &error_fatal); + object_property_set_link(phb, PCI_HOST_PROP_PCI_MEM, + OBJECT(pci_memory), &error_fatal); + object_property_set_link(phb, PCI_HOST_PROP_SYSTEM_MEM, + OBJECT(system_memory), &error_fatal); + object_property_set_link(phb, PCI_HOST_PROP_IO_MEM, + OBJECT(system_io), &error_fatal); + object_property_set_uint(phb, PCI_HOST_BELOW_4G_MEM_SIZE, + x86ms->below_4g_mem_size, &error_fatal); + object_property_set_uint(phb, PCI_HOST_ABOVE_4G_MEM_SIZE, + x86ms->above_4g_mem_size, &error_fatal); + object_property_set_str(phb, I440FX_HOST_PROP_PCI_TYPE, pci_type, + &error_fatal); + sysbus_realize_and_unref(SYS_BUS_DEVICE(phb), &error_fatal); + + pcms->pcibus =3D PCI_BUS(qdev_get_child_bus(DEVICE(phb), "pci.0")); + pci_bus_map_irqs(pcms->pcibus, + xen_enabled() ? xen_pci_slot_get_pirq + : pc_pci_slot_get_pirq); + + hole64_size =3D object_property_get_uint(phb, + PCI_HOST_PROP_PCI_HOLE64_SI= ZE, + &error_abort); + } + + /* allocate ram and load rom/bios */ + if (!xen_enabled()) { + pc_memory_init(pcms, system_memory, rom_memory, hole64_size); + } else { + assert(machine->ram_size =3D=3D x86ms->below_4g_mem_size + + x86ms->above_4g_mem_size); + + pc_system_flash_cleanup_unused(pcms); + if (machine->kernel_filename !=3D NULL) { + /* For xen HVM direct kernel boot, load linux here */ + xen_load_linux(pcms); + } + } + + gsi_state =3D pc_gsi_create(&x86ms->gsi, pcmc->pci_enabled); + + if (pcmc->pci_enabled) { + PCIDevice *pci_dev; + DeviceState *dev; + size_t i; + + pci_dev =3D pci_new_multifunction(-1, pcms->south_bridge); + object_property_set_bool(OBJECT(pci_dev), "has-usb", + machine_usb(machine), &error_abort); + object_property_set_bool(OBJECT(pci_dev), "has-acpi", + x86_machine_is_acpi_enabled(x86ms), + &error_abort); + object_property_set_bool(OBJECT(pci_dev), "has-pic", false, + &error_abort); + object_property_set_bool(OBJECT(pci_dev), "has-pit", false, + &error_abort); + qdev_prop_set_uint32(DEVICE(pci_dev), "smb_io_base", 0xb100); + object_property_set_bool(OBJECT(pci_dev), "smm-enabled", + x86_machine_is_smm_enabled(x86ms), + &error_abort); + dev =3D DEVICE(pci_dev); + for (i =3D 0; i < ISA_NUM_IRQS; i++) { + qdev_connect_gpio_out_named(dev, "isa-irqs", i, x86ms->gsi[i]); + } + pci_realize_and_unref(pci_dev, pcms->pcibus, &error_fatal); + + if (xen_enabled()) { + pci_device_set_intx_routing_notifier( + pci_dev, piix_intx_routing_notifier_xen); + + /* + * Xen supports additional interrupt routes from the PCI devic= es to + * the IOAPIC: the four pins of each PCI device on the bus are= also + * connected to the IOAPIC directly. + * These additional routes can be discovered through ACPI. + */ + pci_bus_irqs(pcms->pcibus, xen_intx_set_irq, pci_dev, + XEN_IOAPIC_NUM_PIRQS); + } + + isa_bus =3D ISA_BUS(qdev_get_child_bus(DEVICE(pci_dev), "isa.0")); + x86ms->rtc =3D ISA_DEVICE(object_resolve_path_component(OBJECT(pci= _dev), + "rtc")); + piix4_pm =3D object_resolve_path_component(OBJECT(pci_dev), "pm"); + dev =3D DEVICE(object_resolve_path_component(OBJECT(pci_dev), "ide= ")); + pci_ide_create_devs(PCI_DEVICE(dev)); + pcms->idebus[0] =3D qdev_get_child_bus(dev, "ide.0"); + pcms->idebus[1] =3D qdev_get_child_bus(dev, "ide.1"); + } else { + isa_bus =3D isa_bus_new(NULL, system_memory, system_io, + &error_abort); + isa_bus_register_input_irqs(isa_bus, x86ms->gsi); + + x86ms->rtc =3D isa_new(TYPE_MC146818_RTC); + qdev_prop_set_int32(DEVICE(x86ms->rtc), "base_year", 2000); + isa_realize_and_unref(x86ms->rtc, isa_bus, &error_fatal); + + i8257_dma_init(OBJECT(machine), isa_bus, 0); + pcms->hpet_enabled =3D false; + } + + if (x86ms->pic =3D=3D ON_OFF_AUTO_ON || x86ms->pic =3D=3D ON_OFF_AUTO_= AUTO) { + pc_i8259_create(isa_bus, gsi_state->i8259_irq); + } + + if (phb) { + ioapic_init_gsi(gsi_state, phb); + } + + if (tcg_enabled()) { + x86_register_ferr_irq(x86ms->gsi[13]); + } + + pc_vga_init(isa_bus, pcmc->pci_enabled ? pcms->pcibus : NULL); + + /* init basic PC hardware */ + pc_basic_device_init(pcms, isa_bus, x86ms->gsi, x86ms->rtc, + !MACHINE_CLASS(pcmc)->no_floppy, 0x4); + + pc_nic_init(pcmc, isa_bus, pcms->pcibus); + +#ifdef CONFIG_IDE_ISA + if (!pcmc->pci_enabled) { + DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; + int i; + + ide_drive_get(hd, ARRAY_SIZE(hd)); + for (i =3D 0; i < MAX_IDE_BUS; i++) { + ISADevice *dev; + char busname[] =3D "ide.0"; + dev =3D isa_ide_init(isa_bus, ide_iobase[i], ide_iobase2[i], + ide_irq[i], + hd[MAX_IDE_DEVS * i], hd[MAX_IDE_DEVS * i += 1]); + /* + * The ide bus name is ide.0 for the first bus and ide.1 for t= he + * second one. + */ + busname[4] =3D '0' + i; + pcms->idebus[i] =3D qdev_get_child_bus(DEVICE(dev), busname); + } + } +#endif + + if (piix4_pm) { + smi_irq =3D qemu_allocate_irq(pc_acpi_smi_interrupt, first_cpu, 0); + + qdev_connect_gpio_out_named(DEVICE(piix4_pm), "smi-irq", 0, smi_ir= q); + pcms->smbus =3D I2C_BUS(qdev_get_child_bus(DEVICE(piix4_pm), "i2c"= )); + /* TODO: Populate SPD eeprom data. */ + smbus_eeprom_init(pcms->smbus, 8, NULL, 0); + + object_property_add_link(OBJECT(machine), PC_MACHINE_ACPI_DEVICE_P= ROP, + TYPE_HOTPLUG_HANDLER, + (Object **)&x86ms->acpi_dev, + object_property_allow_set_link, + OBJ_PROP_LINK_STRONG); + object_property_set_link(OBJECT(machine), PC_MACHINE_ACPI_DEVICE_P= ROP, + piix4_pm, &error_abort); + } + + if (machine->nvdimms_state->is_enabled) { + nvdimm_init_acpi_state(machine->nvdimms_state, system_io, + x86_nvdimm_acpi_dsmio, + x86ms->fw_cfg, OBJECT(pcms)); + } } #endif =20 --=20 2.43.0 From nobody Thu Dec 18 13:31:21 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=nutanix.com); dmarc=pass(p=none dis=none) header.from=nutanix.com ARC-Seal: i=2; a=rsa-sha256; t=1751638285; cv=pass; d=zohomail.com; s=zohoarc; b=X5lYRmt0MJdMdHrrFzNSmsr8K73d/ovg9djqUVNsUZ4urGHlL2x4yBAuRLUBG0ksHNhHHAm7tZmAfT2oNW47MX/KSlYpFn9Ep1i0OJopbSBswTs7rJvZRtPmJ8UL1+uPXmn/emCGyH8G83VfmFGfDeksdqJfVxvnVWhRG26kcP0= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1751638285; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=PKJZ3Npw86uIMi7wY52rzbu7QHtwkd178YWL/FcVouI=; b=Y5s333b3D+52aMrkaWI4FF8g50KcjrB5zap/R+XT6vRY3dgM2xKProepMvUjBEAbwrrLGiTwGMWkSGeTp+h2to5v4ExdybFDBm5ANc1sLBUz2+AhxYxQONFi/maK9JX++7SpegwW3UqK39IOGWOpYDUD1VuHOR7Vh8+y/hia57E= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=nutanix.com); dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1751638285820756.5205774980793; Fri, 4 Jul 2025 07:11:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uXh7r-0000nf-On; Fri, 04 Jul 2025 10:10:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uXh7f-0000hs-Da for qemu-devel@nongnu.org; Fri, 04 Jul 2025 10:10:41 -0400 Received: from mx0b-002c1b01.pphosted.com ([148.163.155.12]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uXh7d-0004e2-3E for qemu-devel@nongnu.org; Fri, 04 Jul 2025 10:10:39 -0400 Received: from pps.filterd (m0127841.ppops.net [127.0.0.1]) by mx0b-002c1b01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 564BAZ9i006360; Fri, 4 Jul 2025 07:10:35 -0700 Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12on2117.outbound.protection.outlook.com [40.107.244.117]) by mx0b-002c1b01.pphosted.com (PPS) with ESMTPS id 47jdxb8t2t-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 04 Jul 2025 07:10:34 -0700 (PDT) Received: from PH0PR02MB7159.namprd02.prod.outlook.com (2603:10b6:510:16::8) by BN0PR02MB8045.namprd02.prod.outlook.com (2603:10b6:408:16d::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.21; Fri, 4 Jul 2025 14:10:32 +0000 Received: from PH0PR02MB7159.namprd02.prod.outlook.com ([fe80::6cf9:b35c:b143:bb88]) by PH0PR02MB7159.namprd02.prod.outlook.com ([fe80::6cf9:b35c:b143:bb88%3]) with mapi id 15.20.8901.018; Fri, 4 Jul 2025 14:10:32 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nutanix.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= proofpoint20171006; bh=PKJZ3Npw86uIMi7wY52rzbu7QHtwkd178YWL/FcVo uI=; b=MxUxIc3+1QLKauPcmBpxMnGFlwsav8WwM9Yl1N8ffdAfAe+ZrcJ10iZC0 9NNbOnU1lXY3PRDCMz59GyWgb+jBjErJSBsp1ajP6l3y76LWE9efvFdkbql/IfT1 xcjFYni3DtNlixlWsjAz1STql5C7rjbx9naTY6Tm3632XXfWZecEPT+OnBRGHetr Fs/nh989Yb2oBhtjdAol/o4NcaSjmrgo3w+5sXerd3lpw9ZC7prKpq2aX9TWO5Fi 1QQIzwgkVLRxSye5s27yMfqO0qdD9g7BLd/Mta4fzqsdugAWFMoSzV8xYlTPZiPH Eikj3mDE8ycBn2LSUaXLt3VIppkSg== ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=hjCXGqPCI777sFeZEcKl0pZv3RA1ysn9udvF5cph2hbz1JvbImGvA1HzdsHBfotaZ6l7U/5nQjy7LRLzQZ60/m9Hjc4MEq0Fvdp2D6zgJkqGMiH1EaqSzgiAzlwkGOxFX6A52i5GKJtxpQO+GmyBWk8OA/i/6C72bAUlJ1jkX03DvartfI6ms+q+0WN663ulkET5PEVxLcCw0tIxppBI8ZLx5jxaJRMpww2xHTgS7/ZI8voAT71/NolYjMR0Bkfnttzz4yw2YMjeDBrceMjIRS+p9GKNkQ7NzSH5k60RJHneiUxOPYbSd76lcpZvXUMBBeezhhpc6489GTa+1SEs7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=PKJZ3Npw86uIMi7wY52rzbu7QHtwkd178YWL/FcVouI=; b=sdni+bxSgwQ37vNY0ZUKt9hL9CDRcgccbiCcJUJDb8BbwbdtUPHN3UH9vS+136astdXOho25E8iaezdRuYdYwQxlp/A5Qfp0NwFxiY4vAxOJlcGX+k3qDAr6OLL8w7fmrke9yVwLABcFYnKpPy9UrUddOg/WWb8iNNCn5fjb3QsjBWMATLBAn20vpznqgQtBX+hOuD+FI6XdYAmu/nwPyJmdeexKQWp2yieTyb2RBvxECXwhcR9mv2fVSx1+Y2nkUL3F3mIbDyEahiyiD7kt9q2JtLj8RbiiGWWSPo42Xg1UgG5tAeQUF52KAp0tcvWdYpaOy/vtLo59lanXC1qA5A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nutanix.com; dmarc=pass action=none header.from=nutanix.com; dkim=pass header.d=nutanix.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nutanix.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PKJZ3Npw86uIMi7wY52rzbu7QHtwkd178YWL/FcVouI=; b=Ihj6101H0SmoKqvbuMFoMZVmOZg/bis5kNyeBUhd7vGaoQ2vm5Y+FeSZ4Goshx0qCEL0btW09zXPor4iEezPW42umSL2QGR7KryAba2fIvVSItpJRHK3fxbQVYmfbfhs73JEw7o7AaYLp6LavqMwFrSEppWedPCs0mtD8amC/R1xRGsu45hVs3VyG+Ez8DP5gIQlRLYEfxZ/bAY08A3X9X7BViD+1Z0ZxUuyJk98xbtDY0tREMJv4JL0Y52LUfNiQgNmUv7ussJ4HH/Uebw1petvl0IZ4hhOz5snIAywB7/pd5d3JjBYpHl6x5inydOskrs+62TCdCdJlrqOrWT05Q== From: Mark Cave-Ayland To: pbonzini@redhat.com, mst@redhat.com, marcel.apfelbaum@gmail.com, eduardo@habkost.net, imammedo@redhat.com, qemu-devel@nongnu.org Subject: [PATCH v3 03/14] hw/i386/pc_piix.c: remove pcmc->pci_enabled dependent initialisation from pc_init_isa() Date: Fri, 4 Jul 2025 15:09:30 +0100 Message-ID: <20250704141018.674268-4-mark.caveayland@nutanix.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250704141018.674268-1-mark.caveayland@nutanix.com> References: <20250704141018.674268-1-mark.caveayland@nutanix.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM0PR10CA0001.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:17c::11) To PH0PR02MB7159.namprd02.prod.outlook.com (2603:10b6:510:16::8) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR02MB7159:EE_|BN0PR02MB8045:EE_ X-MS-Office365-Filtering-Correlation-Id: 572f3e07-8777-4e51-1038-08ddbb0489d0 x-proofpoint-crosstenant: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|1800799024|376014|10070799003; X-Microsoft-Antispam-Message-Info: =?utf-8?B?c20xRUZQd1k2ZnNZa2cwZFNYWXZ3aUhZc1FXUDhGSm0vY0piRmU3U29rOWwv?= =?utf-8?B?ejZTM0NueXZ4OEtNWjBnNHo1NDZmelBvYkhjdnI0NnBQTDJ1SFNoem13MDVi?= =?utf-8?B?akpReG5IN2xtaFBrcHFieHNPMHBUTkhlVmhnSllzRzl3elJ3N2xZRTdGTy9Z?= =?utf-8?B?aHdtRlhRbE5QMmdVeHRLdERGWXlSSFZtYkpQTDN2WGd1RUVYaUdEZnZCenNr?= =?utf-8?B?SWl4cjhwMS9DVkhqR2V5SFdxcW1USmMydDlkemU3blExTGxJOXV3TTYxanc5?= =?utf-8?B?ZWdDeFAwWWsxa0VXMm53ZEhQaFdFK2s0TFNqY1FpR0hzOURVY2FMMWtiNHcx?= =?utf-8?B?c09OZkNQOER5QXBqYURVVjFBckd6RmY4cVBOUVVNOWc4VXhweUs4NHlKSUJE?= =?utf-8?B?dTdmODliNEpiWTZBUmhpUkFZcVVmbDlnNFhONG5BUUlWTUxrdVZib040d09X?= =?utf-8?B?S3hHY1Z4MFZEMndnZ04xNk55Vm1VV2pJQkFFZU9DWG1xbjJ3bnJkNzZtcmsr?= =?utf-8?B?M1R2MTN2OE16Uk93VCt5bng0bU93dm1jMjZ4L2FNb1hCcEkzTzJMK215S01S?= =?utf-8?B?S3o5UjVkdWxnUm01OWFqTzNCdVNaelp0RHVFWnlIdmRLcDVVZ2NKWWxrM1lZ?= =?utf-8?B?QXhEMUlLbzJJWFUzeGNtK3k0ZkluSHZSd3QwdTZ4T2k0V3hFZXJuTU40dnB2?= =?utf-8?B?RU1mR1RMb2E3TUhHUHgvaEVvZDNrWkRUOTBoMjY1Q0kvTWNlQjRPazlFOCtZ?= =?utf-8?B?OVV0bFNidEdnbzNybmh0a0dhYnNFM1ZCWDZpa05GZFowZ1BQeU9uaGcvV1dP?= =?utf-8?B?VTdDSEJuRmhMUlR0U1VlR1ZobVFBZFEyVUJlQ0RJbnl6WGN2bi9yUmRDT05q?= =?utf-8?B?aUhCcGI0eE92S1kzaUtyaDh6blc5TjNNa2UzZzdVTllxOS9ZaGYxZVl0S3Av?= =?utf-8?B?SkhxRjhiQTBXc0RxKzhPRFBuSnJSVUZWTHBvK0lMd3NlODlDZnJDYjJGNnVa?= =?utf-8?B?eGpPSE82V3RIYkt0L1dKYmdjNFVqVHJwd1czMlczUHh2eVRHcXZkeCtIWmtH?= =?utf-8?B?MkRadGlBUG9jQWxTejFUc21Fc0tYVitmaTdtci9peXp2M3gyU2U4WmNWVFVr?= =?utf-8?B?NHcvQmpTZGI0NnA4WjVHSDRVdlFmYks1NmdjODl3NlVaRzJKcTNmeXMxajZl?= =?utf-8?B?Ry8yV1Radlp4enQ0bkhGVXZjaXlCVlIrUHcwVEZqakNtWnFWRjFXdm1IUStX?= =?utf-8?B?SDA0dlM2czlKcFVhL3JaYkd3b2tUNXNEQXJYQkpIVXJVckljY29yWjdtcXdQ?= =?utf-8?B?OE1iZk13TWdaZGFORDNTRG1xYy9ycDQ2RFVLcDVrRlhMMDBhdlhZZmh3M3Zu?= =?utf-8?B?VWZ1Y1FId0gvdWphR3hzbW9nQVdQTFEyRSsyVldYTWptOGQ1dTB0aGRlZFNH?= =?utf-8?B?aDIyRy9EWTc2SThCa0hOWThIY1g2V2lnYXZkSXlhNVcwTmw2MjNTTEtsQWxx?= =?utf-8?B?aFBXRUZJMHdjT0o5MUx3WGIvcnVWNko3MVpnMlBWdDJnMzVBclZGWko2M2xK?= =?utf-8?B?eGpNWndIZjRjZGZWZFFJdXgwcTM4dXRqczQ5Y3pKQkVUakZZbG56K29VclpO?= =?utf-8?B?bHBFVmlyeXB5U3VuUW80WkZkeC9Gam5FZy9EK25SL2ZIS2huY0x1aVozOUpk?= =?utf-8?B?T0dadGJ4Y0hzQVZBUlJGSTJIV01uZzFrVDJVZE9nYTZnS01WNHVNT1RLdHA1?= =?utf-8?B?MkQ1NTUrYkswdy94anV1UzFMNXJKVHBuWVVyMkVKN1pPOE1GUXJGTVlEN0RF?= =?utf-8?B?amRoZDNVSDJHUDZobUpxdmJLbWVtUkQxM0ZtMmRMeERUMWNraTU3SklGc3ha?= =?utf-8?B?RUlCdDI1MFgvV2ZVN1R2Ny9KbTRIbHJNS0psdVZDaVlZSjM4aEFqVE91d3pS?= =?utf-8?Q?lQKsvcXrsPQ=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR02MB7159.namprd02.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(1800799024)(376014)(10070799003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?d3JxaEJnVFIyNzQvRU5IelhEdkdwTk5nUllMdjBpWXJKU0M5bXdlc1Jqd3I0?= =?utf-8?B?OUVDTjNRaWFLWHYrazdhVUhsVXIrYlRSbHB6Q2FZQk13aHlQWWJTUnlidEpZ?= =?utf-8?B?M21kWC9VNC8vbXY4RDVJa042QnUvemZ4OWswMU9QL2pxM2dIRXdPNkJvcldB?= =?utf-8?B?eVorZHVKd3kwM1BRcExwZmUza2t5eFhwb0g4S0g1K2hCTmY0SWFac2xHazho?= =?utf-8?B?MU5hNXJqVUJnV1l2SGMyNnpVNTZYQWNESzh4R3IvYmptcVU1bTZrRzJ2K0ht?= =?utf-8?B?RjdVOUluTFRYdkZqZm91dkg5bHNaQ3BOSVc3VEJjVjNqUlo3L3VuWXlFU0Rl?= =?utf-8?B?NndteHFBK0NhUGhWVnNoc3FoRXBSUnFWcGRwdTgvL3l0cEZGVC9HQWVscmdB?= =?utf-8?B?d2ZuVWRLQU1WbUg2OEQvQ0VUYzVoMVVIY3J3ZEpqbnVXYlpOL1h2ZEsxcVUx?= =?utf-8?B?MTBYM1ZMeWFxMDRDeDFoK2NMbFE2SUVubkhPcEdZNHF0TEhYOGVVVGM2MG1D?= =?utf-8?B?aUZXNTZGY3AvTDFib21tZDN4NmlJTjB1UkpvaWQ3RlBobXhINHU0em1PR056?= =?utf-8?B?YVFkR00zSURSNS9xSkFSTlpWQ3Rpd1daaC9QUVc5QmxLeEdMVWR3WXdid3Iv?= =?utf-8?B?OHZUd2xNZ0J2Nmx3SkZNVnVBV21IVGhpMnZ6QUtGeFVHWER0UzFPWm9sNjlI?= =?utf-8?B?bzU4K01CUzlIbU1qVWhjRjBNbEhGN3U5MnpvMlBIc1RNLy91UmNtS3FOVW1X?= =?utf-8?B?bjRMQUJ6WkExZGZPd0pnZWp3TmYrMjhEVkljUkNGZU96N2IzKzdpQUhpbXJ2?= =?utf-8?B?dm9nYUQ0NjVDd3FJUzk5Vm1xZkd2amV4VEh6UDU0K0FIZVVDcnZldk5zNVFQ?= =?utf-8?B?ZW5tQkdoZkdUSzZ6ZDU2THVmRG1iRzhST2owaUR3Y3NuZ0c4RDZhZnhIOXZX?= =?utf-8?B?K1ZSNXBjMnh4L2YxS1ZwNmYrSVlCNjNGOTFOT2lCVDdOd3VzY0l2WFlDNFk5?= =?utf-8?B?MHErSjQxaDlWWDNoOGIySzR3S0RJRjlKVTJGZllYeG41Rm5PdGFDd09Dc2pL?= =?utf-8?B?V3B4K1pZZ2lNb0lMbVQ1bE1RNEhiMUwwMmdNUVJRaGlqeTFWVjh6OXdHUHZn?= =?utf-8?B?RFBnSlUyY21CMUYvY1llaXJKVHBKY1NPQmExWW91UEl0RGRTYXlSbkhSRzVX?= =?utf-8?B?cUtxRSthSzBUOG1RMEJFWlozUTlOeWF6MU04ampGWjhhNWZhQzE0SHI5WUl1?= =?utf-8?B?UU0zbEJLRzV0NzRvR0Z3dnV6VUpBNjZiMU8wc1N0QkttUkVQa3hBQ3MvMDdx?= =?utf-8?B?WXg5R3B6T0xXWkFVSFdiUjh1Ti9iSG5raC9pODZxUXJFQkhyVm5FNWpybU5L?= =?utf-8?B?TWovNEJGcWhGREY5RzlXb0FMakpNb29OYlNXamVVTGgyQlBBVkZKMGtCc3Zs?= =?utf-8?B?WHN3NUVQZXhkRFNVdkJGcEoxN0Z4N1U4V2lCa2lDS2RWYnl1bkZIeGczZTlJ?= =?utf-8?B?QUF6ZUREUkh3WStOMVhHdWs4VHVPb1U4QUxneUJJMndxMkx5QlAxN1VFZ1NL?= =?utf-8?B?eFNkUEV4bjhPb2Jad09ZOGQ4ZVZWN3BRbllzV2VqOHlxRzh5dW13MTZxVE0r?= =?utf-8?B?ZzVEYU9yVjdKUUc0MGJsVE1nRVNwTHJoT2ZMbk9yR1pXejhQSkU1OFc2cUtu?= =?utf-8?B?eG5aNU45czh6THNHMGJUZ0RmbTVJaDczWGtwTm0wRmJOc1ZocG1udWIzcDRR?= =?utf-8?B?R3QrNG00aXVTR3RSbHZYSkVlOWpDVi9BSnd3RTYvUWpIb2owMHhrOFpSOFkv?= =?utf-8?B?QVoyenFtT0xHSW04a25zanZPcGxOTW5SdjI1UEM2TGRnaEdaUHZENzgxREZD?= =?utf-8?B?R0N0YmNsTFNlbTJOcGhOcVJTai9vNTkvT1AwVXhOOVB0TUJ1aUxzLzlCVWpJ?= =?utf-8?B?MTVob3JNYkhieExYOElNMGFEaTE0ZTJ2TmlUUTEramtIN3hvdXZHMjc3USs5?= =?utf-8?B?R09GQktRaWd0UUlqaWtPQ2h3cys5ZHdnM21FSnJQbVNwQkZSZlZsZy9yTm9m?= =?utf-8?B?V2w3azZjc0RnNktJTy9Eb2tkekllblpPZDVocjRDQXdTMy92OXFRdWJpR3p0?= =?utf-8?B?M1d3eUFjQitqdnBoVjdDdHllSXFndXA1Q012TXV2RHk3UHlnc0tuR1g5Q2lv?= =?utf-8?B?WGJTaTJKUHViMkYyekhvZDZNenpDbDRTZ1ZxaHY2NnN4WlZycHAzZUVzelZY?= =?utf-8?B?QXNnZEY5a0NEV21uQkk5YzhMREFRPT0=?= X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 572f3e07-8777-4e51-1038-08ddbb0489d0 X-MS-Exchange-CrossTenant-AuthSource: PH0PR02MB7159.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2025 14:10:32.4927 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bb047546-786f-4de1-bd75-24e5b6f79043 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: E5TAtFHQo78XKg+uIHB2pmix+lLe6pL1bESHjBtbJD8AqBsnJehZwf1hvbaU+uEypRaJKgXvu1erV5dLTnnv12SIwBctLHBC6tLaZ5vzi1M= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN0PR02MB8045 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzA0MDEwNyBTYWx0ZWRfX2miH8GciFF5n Wlv8k+2s8JRQPlXxlPv1L/rcmWnWHLIUXnpzw1OxedIBg3rkWuP7Bj6hH2Zvh7aYikfWkfAx/n2 3VPUPlC/yWRd8UVUcmiuGJxc3rlzlPQKLpRtWOcLzZkYNGlwnr4MA2J5uAmIFuLZyBZohuR32ih 39qfYB0YiyIKi//ymr3O88qNcqOCBvi37UrqT/A+mvcptnvdSFvZPx+bdlenCv8nYd7dg2+tCxb z5BmApP7LaWppM4CT12L6LpGxFcLUxgmm/twh5llrh7f8bEmNJAeeEw1JPemJwwn1ZwnvZWvBTh XUHRkO9knRrxzhWXPycJFl0eN1xKC+QWkwwjj3Jvz0iKh8y18dInX+OGW5jqA/qggvLhaSEEPpW /ty5Grh9RRJIsOd9n5/qTX2lDkfNOTfV2iN/fCs7CZJaC1aV4hd+6Yq2V4rg7eq2m5vHowX7 X-Proofpoint-GUID: c4cO0IJln0iSfEt-9PIS1XbTdf7q0wKL X-Proofpoint-ORIG-GUID: c4cO0IJln0iSfEt-9PIS1XbTdf7q0wKL X-Authority-Analysis: v=2.4 cv=c+2rQQ9l c=1 sm=1 tr=0 ts=6867e0da cx=c_pps a=4yuKefASJ8Wsn776+NlVBg==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Wb1JkmetP80A:10 a=0kUYKlekyDsA:10 a=64Cc0HZtAAAA:8 a=KKAkSRfTAAAA:8 a=pDVciPHeplB8fhom_mUA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.7,FMLib:17.12.80.40 definitions=2025-07-04_05,2025-07-04_01,2025-03-28_01 X-Proofpoint-Spam-Reason: safe Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=148.163.155.12; envelope-from=mark.caveayland@nutanix.com; helo=mx0b-002c1b01.pphosted.com X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.218, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @nutanix.com) X-ZM-MESSAGEID: 1751638287425116600 PCI code will never be used for an isapc machine. Signed-off-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/i386/pc_piix.c | 105 ++++------------------------------------------ 1 file changed, 8 insertions(+), 97 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index fe53beb39b..5d59cbde09 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -418,19 +418,16 @@ static void pc_set_south_bridge(Object *obj, int valu= e, Error **errp) #ifdef CONFIG_ISAPC static void pc_init_isa(MachineState *machine) { - const char *pci_type =3D NULL; PCMachineState *pcms =3D PC_MACHINE(machine); PCMachineClass *pcmc =3D PC_MACHINE_GET_CLASS(pcms); X86MachineState *x86ms =3D X86_MACHINE(machine); MemoryRegion *system_memory =3D get_system_memory(); MemoryRegion *system_io =3D get_system_io(); - Object *phb =3D NULL; ISABus *isa_bus; Object *piix4_pm =3D NULL; qemu_irq smi_irq; GSIState *gsi_state; MemoryRegion *ram_memory; - MemoryRegion *pci_memory =3D NULL; MemoryRegion *rom_memory =3D system_memory; ram_addr_t lowmem; uint64_t hole64_size =3D 0; @@ -517,39 +514,6 @@ static void pc_init_isa(MachineState *machine) kvmclock_create(pcmc->kvmclock_create_always); } =20 - if (pcmc->pci_enabled) { - pci_memory =3D g_new(MemoryRegion, 1); - memory_region_init(pci_memory, NULL, "pci", UINT64_MAX); - rom_memory =3D pci_memory; - - phb =3D OBJECT(qdev_new(TYPE_I440FX_PCI_HOST_BRIDGE)); - object_property_add_child(OBJECT(machine), "i440fx", phb); - object_property_set_link(phb, PCI_HOST_PROP_RAM_MEM, - OBJECT(ram_memory), &error_fatal); - object_property_set_link(phb, PCI_HOST_PROP_PCI_MEM, - OBJECT(pci_memory), &error_fatal); - object_property_set_link(phb, PCI_HOST_PROP_SYSTEM_MEM, - OBJECT(system_memory), &error_fatal); - object_property_set_link(phb, PCI_HOST_PROP_IO_MEM, - OBJECT(system_io), &error_fatal); - object_property_set_uint(phb, PCI_HOST_BELOW_4G_MEM_SIZE, - x86ms->below_4g_mem_size, &error_fatal); - object_property_set_uint(phb, PCI_HOST_ABOVE_4G_MEM_SIZE, - x86ms->above_4g_mem_size, &error_fatal); - object_property_set_str(phb, I440FX_HOST_PROP_PCI_TYPE, pci_type, - &error_fatal); - sysbus_realize_and_unref(SYS_BUS_DEVICE(phb), &error_fatal); - - pcms->pcibus =3D PCI_BUS(qdev_get_child_bus(DEVICE(phb), "pci.0")); - pci_bus_map_irqs(pcms->pcibus, - xen_enabled() ? xen_pci_slot_get_pirq - : pc_pci_slot_get_pirq); - - hole64_size =3D object_property_get_uint(phb, - PCI_HOST_PROP_PCI_HOLE64_SI= ZE, - &error_abort); - } - /* allocate ram and load rom/bios */ if (!xen_enabled()) { pc_memory_init(pcms, system_memory, rom_memory, hole64_size); @@ -566,74 +530,21 @@ static void pc_init_isa(MachineState *machine) =20 gsi_state =3D pc_gsi_create(&x86ms->gsi, pcmc->pci_enabled); =20 - if (pcmc->pci_enabled) { - PCIDevice *pci_dev; - DeviceState *dev; - size_t i; - - pci_dev =3D pci_new_multifunction(-1, pcms->south_bridge); - object_property_set_bool(OBJECT(pci_dev), "has-usb", - machine_usb(machine), &error_abort); - object_property_set_bool(OBJECT(pci_dev), "has-acpi", - x86_machine_is_acpi_enabled(x86ms), - &error_abort); - object_property_set_bool(OBJECT(pci_dev), "has-pic", false, - &error_abort); - object_property_set_bool(OBJECT(pci_dev), "has-pit", false, - &error_abort); - qdev_prop_set_uint32(DEVICE(pci_dev), "smb_io_base", 0xb100); - object_property_set_bool(OBJECT(pci_dev), "smm-enabled", - x86_machine_is_smm_enabled(x86ms), - &error_abort); - dev =3D DEVICE(pci_dev); - for (i =3D 0; i < ISA_NUM_IRQS; i++) { - qdev_connect_gpio_out_named(dev, "isa-irqs", i, x86ms->gsi[i]); - } - pci_realize_and_unref(pci_dev, pcms->pcibus, &error_fatal); - - if (xen_enabled()) { - pci_device_set_intx_routing_notifier( - pci_dev, piix_intx_routing_notifier_xen); - - /* - * Xen supports additional interrupt routes from the PCI devic= es to - * the IOAPIC: the four pins of each PCI device on the bus are= also - * connected to the IOAPIC directly. - * These additional routes can be discovered through ACPI. - */ - pci_bus_irqs(pcms->pcibus, xen_intx_set_irq, pci_dev, - XEN_IOAPIC_NUM_PIRQS); - } - - isa_bus =3D ISA_BUS(qdev_get_child_bus(DEVICE(pci_dev), "isa.0")); - x86ms->rtc =3D ISA_DEVICE(object_resolve_path_component(OBJECT(pci= _dev), - "rtc")); - piix4_pm =3D object_resolve_path_component(OBJECT(pci_dev), "pm"); - dev =3D DEVICE(object_resolve_path_component(OBJECT(pci_dev), "ide= ")); - pci_ide_create_devs(PCI_DEVICE(dev)); - pcms->idebus[0] =3D qdev_get_child_bus(dev, "ide.0"); - pcms->idebus[1] =3D qdev_get_child_bus(dev, "ide.1"); - } else { - isa_bus =3D isa_bus_new(NULL, system_memory, system_io, - &error_abort); - isa_bus_register_input_irqs(isa_bus, x86ms->gsi); + isa_bus =3D isa_bus_new(NULL, system_memory, system_io, + &error_abort); + isa_bus_register_input_irqs(isa_bus, x86ms->gsi); =20 - x86ms->rtc =3D isa_new(TYPE_MC146818_RTC); - qdev_prop_set_int32(DEVICE(x86ms->rtc), "base_year", 2000); - isa_realize_and_unref(x86ms->rtc, isa_bus, &error_fatal); + x86ms->rtc =3D isa_new(TYPE_MC146818_RTC); + qdev_prop_set_int32(DEVICE(x86ms->rtc), "base_year", 2000); + isa_realize_and_unref(x86ms->rtc, isa_bus, &error_fatal); =20 - i8257_dma_init(OBJECT(machine), isa_bus, 0); - pcms->hpet_enabled =3D false; - } + i8257_dma_init(OBJECT(machine), isa_bus, 0); + pcms->hpet_enabled =3D false; =20 if (x86ms->pic =3D=3D ON_OFF_AUTO_ON || x86ms->pic =3D=3D ON_OFF_AUTO_= AUTO) { pc_i8259_create(isa_bus, gsi_state->i8259_irq); } =20 - if (phb) { - ioapic_init_gsi(gsi_state, phb); - } - if (tcg_enabled()) { x86_register_ferr_irq(x86ms->gsi[13]); } --=20 2.43.0 From nobody Thu Dec 18 13:31:21 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=nutanix.com); dmarc=pass(p=none dis=none) header.from=nutanix.com ARC-Seal: i=2; a=rsa-sha256; t=1751638345; cv=pass; d=zohomail.com; s=zohoarc; b=BzsOdbRrFxhWJLMabouymcODatV2EQJZzm6foxzTTQnzuHmVaexXNv2+wk8YrM9gUh11ckz8uTzU6PGYpu90a5uY4yPiwQG5CV6gqE+Rn7xtMpRJZ2tG4cNzN8D+ro3hZkKfR7pCF0CxWK5KJd9EZctRi59rZD2cx1mHaIVdH+k= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1751638345; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=jwOGQ7HAm25/lGhZ1Ub4PgLdheLV833Lf7acnvPZ5qU=; b=cGr/HDZGXvKKtGd4sPifS3cZ5uYj66JPwYuTXPTezg8jyltfPMrIn3c1q3JW+5PJ+x9ihNwFcmimVASAs9A+/WshEsQ7P7a9aKR1hKo/aanNbL3bJ9o+qsUVRFf7jckMORxwNeQcICKm/Cr07YqR4DV5CDtcGARVlOcu1e7zO40= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=nutanix.com); dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1751638345513383.338067779035; Fri, 4 Jul 2025 07:12:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uXh80-0000rW-Nu; Fri, 04 Jul 2025 10:11:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uXh7i-0000jY-Ec for qemu-devel@nongnu.org; Fri, 04 Jul 2025 10:10:43 -0400 Received: from mx0b-002c1b01.pphosted.com ([148.163.155.12]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uXh7g-0004fS-CS for qemu-devel@nongnu.org; Fri, 04 Jul 2025 10:10:42 -0400 Received: from pps.filterd (m0127843.ppops.net [127.0.0.1]) by mx0b-002c1b01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 564CWIIp020776; Fri, 4 Jul 2025 07:10:38 -0700 Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12on2095.outbound.protection.outlook.com [40.107.244.95]) by mx0b-002c1b01.pphosted.com (PPS) with ESMTPS id 47p2epsrqy-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 04 Jul 2025 07:10:37 -0700 (PDT) Received: from PH0PR02MB7159.namprd02.prod.outlook.com (2603:10b6:510:16::8) by BN0PR02MB8045.namprd02.prod.outlook.com (2603:10b6:408:16d::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.21; Fri, 4 Jul 2025 14:10:35 +0000 Received: from PH0PR02MB7159.namprd02.prod.outlook.com ([fe80::6cf9:b35c:b143:bb88]) by PH0PR02MB7159.namprd02.prod.outlook.com ([fe80::6cf9:b35c:b143:bb88%3]) with mapi id 15.20.8901.018; Fri, 4 Jul 2025 14:10:35 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nutanix.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= proofpoint20171006; bh=jwOGQ7HAm25/lGhZ1Ub4PgLdheLV833Lf7acnvPZ5 qU=; b=byIji8aZav9eirgG2u1OMrX9bqIetF5pGoZ7Mf9/cz+l5uiD1cY5GFoQq SJykZ5jUmyfnoGr/y98yJFO41WQHs9Mo96Pk63qO8mSTVMgmyiUlzR6xKFcemcnL Vx03LOwS+qOViriLM2dBSnqOCCwuSOb9OFKbCcz2XCf0NtnfKorU6H407UYwwNcI pWCiPebsrxJtDD7pIGppjJuif0dL3lcDJNioXUHQgno5YoCy05FkpyNfQqyLvneh CZIDASV983E/nsMDYmF1brcL3wCvz2GOSvAecjY2qQu+A02H2W+RYsU4Wtm9iERx 7f2blSjvgDafiU0ZiR87niYMLkEvA== ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=APufDK3aDojOW9fHmvo6wZJLh6WYmohhsnf0sNupBhIfjhVllATJTTZ7JAjbIbUBioeBJjWrffahzdOOCj5tgAA/8I1O8TOSmt1BboVqBhu3/xA3HcrSR3hzRVPjm0PzBVl0k7imfaGcXZfQAgHcb0uNljrpAJsWheaMEGzjB1VBVSjAebzLZ9Tb4dfsydVoyMzI9Nq5EvoMBXRXCKFX3JbPCy9JOJhE1Cy2K/rucaYY7Ry+5OfZ+wuwrxk49RsVpII2hh8MyTKEihoelW0bxd0nRrzbw2RMXoFfCyZdl8Z1TtWiaB9bIzhDcpFvITxDDrMIMfMlK5yyKkH4oogE0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=jwOGQ7HAm25/lGhZ1Ub4PgLdheLV833Lf7acnvPZ5qU=; b=AzXrSKwaH5xZEuvwBhpCHynyeX3hn/+ivqffLt2hTL8BtG+TIuF36YkyTWDcKHELikMoC8KavXohI3ogizhhRGOE3/uDa9Y2aQVP698a4OoNqasaHJGm7Cp/rdd4qZOhjmrK7MXMaEPWYnBF1KyQv7CD//9gVYS3k0lwI2lZD1LvKDoCIgRMnaHabBypiCZU1+0OHvgqtZ8NmtTKPfWue2PcK8qixMmU6LOLknLgS6VCLrI0TSr9+fYDHOajhHcPwABi2R2zwGNok30YV8EXpAtg3UObiA5CKvROnu+s2drGF89JhuEIHKl8oKjLFkOG3j3FVs+rnWQEH9XYJYuZiA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nutanix.com; dmarc=pass action=none header.from=nutanix.com; dkim=pass header.d=nutanix.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nutanix.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jwOGQ7HAm25/lGhZ1Ub4PgLdheLV833Lf7acnvPZ5qU=; b=QnO/WvH7g3MZdIuPqS3NdRwL5+tLPgS8AYd5gybsr7iXXtH+6mRd91DG4/zujvHMQk/z3RlozH8PPp/f4npI/Ya7iMzB8Cioj01Tp3xJ1GJDF1aNYPhRAuH4+m4ali4rWl8mVQd71MU0yi1Te3sz/zMw3aUERIR2u2h2y+RYyubdWqZQWZ2FBIgj7qmeAHgB9tOVJZVzVylsdnN0UyK7rLtOIXFiVYRS622o/49E67/WYY6fPDWUaOANMT+fX22eKlE5BFxyKBPrWzpeMiNYNE3ko4gxUgRrJFW5TiKxv1PqFwDNz0X4hHo1F/4uQ0by1H650KCxmHjLp7u7lwXzrw== From: Mark Cave-Ayland To: pbonzini@redhat.com, mst@redhat.com, marcel.apfelbaum@gmail.com, eduardo@habkost.net, imammedo@redhat.com, qemu-devel@nongnu.org Subject: [PATCH v3 04/14] hw/i386/pc_piix.c: remove SMI and piix4_pm initialisation from pc_init_isa() Date: Fri, 4 Jul 2025 15:09:31 +0100 Message-ID: <20250704141018.674268-5-mark.caveayland@nutanix.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250704141018.674268-1-mark.caveayland@nutanix.com> References: <20250704141018.674268-1-mark.caveayland@nutanix.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM0PR10CA0005.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:17c::15) To PH0PR02MB7159.namprd02.prod.outlook.com (2603:10b6:510:16::8) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR02MB7159:EE_|BN0PR02MB8045:EE_ X-MS-Office365-Filtering-Correlation-Id: aec9dc5a-cbe2-4725-0051-08ddbb048bd5 x-proofpoint-crosstenant: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|1800799024|376014|10070799003; X-Microsoft-Antispam-Message-Info: =?utf-8?B?cE41WFZ6eklZMEhVU0owYmt5eEVYQ3VVRjFrWVBsTzg1YTVYcHFCZWlMWmZM?= =?utf-8?B?L1RwaUNhbjhQUDM5ME5FcGhUc2pURGVXRUJlSUVxK2ZBN2pBdVB2R0tiei9Z?= =?utf-8?B?ZGVvVjFrU2RzVVB3bEJkR2xjLzRmbHV4YkQ3RURKakp5dTA1c2huZ0cvdC9h?= =?utf-8?B?bXFPZk1tVmVHM3pvMHo0ZWtCOEQzQkJFRS9RSExZVy9BVmkyS1dpdDVjU2Vl?= =?utf-8?B?ZGZSN3hQUEwyREFveGpWTkdpQmFJSHNuNTA5bHdMbzZ5WkNoWmFSdUhJT0Ft?= =?utf-8?B?TEVHZVlVM2NnSTYzbm9qVFdYV0ljR21SOEtXTjhkYno0b2ZxNE9yTjBGWGRB?= =?utf-8?B?TTN2Q0lqTEpPUGdJN2Mrcmxuek1neFpKOGwwbE9Qc2p4VzJXK3kwOHZuWlRj?= =?utf-8?B?Y05mT2d1Mi9pUHp6YVpIQVBtMEpUWENFMVJwTUNFa1BWelVYeEt5dVdHSVo5?= =?utf-8?B?bVVlaGFEcjU3S1VaRWYzS3UzSDFabWNBRWg2bTQrelh4R3AzVVFFUE90TFZJ?= =?utf-8?B?NWgxUWo5YUNqSC80dmF1MU9SOU1Bd0NvaEpyZjFESDhGQlRRZW41akttWEZz?= =?utf-8?B?NldITy9Kc3hnbUJXcVc1NktxZzRGaWR2K2x6KzE3WFdmeEUwZWN6eXlUMWhz?= =?utf-8?B?Ni9uYlkwT1VrUFErNWRkeUNySUhWayt2ZGNuL1lTRkVoV1lJWCtOUk03NGQ1?= =?utf-8?B?c1ZCMStnMW9vT2VHRzVmWm03SElPaVQ4bWI1a0ZHcFRKVDZvb29hSjV0cS9N?= =?utf-8?B?NkdURTAyV1MwS3k3QWtkd2xRakpuZ0lrODl3dUxTeU1UYWFHUWJjdG10YW83?= =?utf-8?B?WUZyUFlLZUhsQUlWblJXS0Z1dnZHY1UyZXo3N3ErRUc3eTM3T1JJbGZKdkly?= =?utf-8?B?YVlwbncvMzREQkducFcxN2I5bnlrS2dwWTdlTWtDNUhRZTFydlVveStxV0dn?= =?utf-8?B?dG1tczRrU2tmSVhNNDBWNVFwaHdIbU9hSmFCUXV0U3hwRVVnMUhFVVhMUVBD?= =?utf-8?B?ay9IeFVZRVFXS1IrZU94VktNVXA3bnFhcWxVSlFOenZ0MTI4R3NySzBSUHdp?= =?utf-8?B?QlNLWm1kVjJncU10YjBnakR4T2FZL0loM2J4S2dnOEhRUGlKZEM0VERkQzJN?= =?utf-8?B?SGVGbTJZZWRiSnJnZDZVUFNKQnplSlZFQm0ySHF5ZEZHU0FmcjFkeXBVV2tK?= =?utf-8?B?THZpNHhtNWNRUnBuRUVCb0JCK1BXclVWbDArbGMwZlFpcXhpakdjTkVYaDlC?= =?utf-8?B?RUE4WmZyVGttc0NaZ2hLa1NHL1FMR0FjS3VUZjU1WUZiTFdLSW9kMjhpQXk5?= =?utf-8?B?Q3RJQnJtczZDWkhQRE8zSjdhT0VmNHhTYXpiK21Ba3RUSmZUUlJEdlQwL1FI?= =?utf-8?B?S3ZCNHNROERHME55MzdkWmJhVE9CM2xkTmdaMjA5bzA5UWhQL0FrSzJ2a21J?= =?utf-8?B?a0c4dkNHaHpKbU8ya2VKRm1RcjdkZ3E0V2pkNGQzRkZRaFhDVFFDVHo3WEx0?= =?utf-8?B?Y1hsakQxbUZOdkE5T29SQUhJb3hyQmlMZUtYbEIvMWlObExRTU1GendETjBG?= =?utf-8?B?QzFDM1RDTlpvUHBONVVLZlZYbmJzUDgyWCswSjNBRmMyZWJSbk54NkZhS3Fv?= =?utf-8?B?K3A5dzB6aVo3b3Erak9MSzJkeGVwZU8vZ1Ixc0hvSmNKeWpKYmQwaVExaUMz?= =?utf-8?B?L3hjMjl3YTFFUFVONVJUQlJJc0VaUGRnQ0lXTmJ3UTJvakFTMGpxcVNvbzY4?= =?utf-8?B?cEpJRDBKcTJSdThycHBKWllDMUNWc21vUzJsNll5WUkxTU1uZEhDSDBkWXdT?= =?utf-8?B?YzZNeVQxclJYWnZlY0VKL2JFbG44ZXMzT04valRwSzBBWTZFcGFCYzNqbGJ0?= =?utf-8?B?enRUOTRybVo2VllyWFQ5bWpCWW5ONkt3K2dBbkpHeW1vd1FkbkhhdEFMcDky?= =?utf-8?Q?P0ZgdjbmCps=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR02MB7159.namprd02.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(1800799024)(376014)(10070799003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?b3dLeExoUlFnNnMvZ1A1Z2Z2Y0RTZzNzbVZRdTYrSDJyTFZTdWhLTS93Q2pq?= =?utf-8?B?NEF3YktEL0x3ZnFUSFRBdTc3L1JrS3IrS0owcTdVWmdKY3NSaXIvbDRRdzNa?= =?utf-8?B?VzdSVWQ1L0kxL2xVRGpyYUdublhqSnA5UkdIZlJTM1VwemVIanU0RmdVb1Jl?= =?utf-8?B?V2tEa00vN1BYcDZqWmZyUGQyNDNpUGNNZ2xLOEZLcFgwZnBMQzI4aG9iUCtN?= =?utf-8?B?NFpscGJHZjJjaFB3WS9OeEF2NXdJRjRQZTdBWFJrYWFtTE55QktLazE3bmJo?= =?utf-8?B?bGdYUitKWEJOYmUxN1JIUDI3eHBzbkszRzlBM01VVUlCdlBPeEVtMTFNRmMz?= =?utf-8?B?Z0xaSS9NbWtKa1pxL2Z4d0xMd3pjRVVqRVRQdk8yQ2ZpenlkbGQyUDdIV3Rt?= =?utf-8?B?SDIzVzB4NEo3Z2s4OC9Rb2IwaW1SVjhjVnVEUzFzYUZEaWtDVmt3cllJbHFi?= =?utf-8?B?TDlHb1BVZjF4bnp2YzlLVThINlZUNWpQRXRNcm55eDNiNEJPRUJVTzFTcldJ?= =?utf-8?B?Y1hrTk1UcE5aMkxYNEhRK1BwazNUQWdkODk2NlJpNFFWbTJGUTBBdVplQlcv?= =?utf-8?B?elpGZ1E3d2ZIbHgyN1lkQnhyT1ZlbWhhaktCU1NpMC9KcjBIS3NaYVIxWGt5?= =?utf-8?B?d0FBbVJCOVZxQktlcm9DYmtCSE0xbzI4U002UE44a1NoS284TkhaM0RZTk1q?= =?utf-8?B?RGl0anFqSFlBRGliR1lWMys1TkZaeW9LeXlRazM3UEdhOVhxeEZGYjJwM0w3?= =?utf-8?B?MXl3alJXYjJOOHQ3QXU5NDFSY3NMN2JtUERHZDlYVnVRZk1OMk9ldmdueDJr?= =?utf-8?B?TlRCNUttaHZic2MrMTdTME56djE2bUY3Z0xiOTNyMnFwTkx4U2hGbTlYZ0g2?= =?utf-8?B?NTQ4d0YybTcrOFlxVlhScHY1Mm10bkpWdzRudkZUYlFJckcwdjFRQzhpNUt4?= =?utf-8?B?aG4zMU1UZDlUNzdpdmJhSzlrUmcwWEs3QTRYS2UvZHcvMlBNSHA0cEJjUzYx?= =?utf-8?B?cWFUMmF4R040ZExLbDZUWVFqU2tjUlZtSUtnZjR3OXlTOUd1NG9VbW9XSXVs?= =?utf-8?B?T1dGNXFwZTN0amZ0TjZ4WmpEcm5wZDRDVXUyU0FsTHdXZU1iczdYdW5nNWdH?= =?utf-8?B?bXdQV2Q0WFR5cTFMc3Y4c09nRzZyU1dCcnlHU3NYUTlWOEtYaGJwbWJDZU96?= =?utf-8?B?VElyem92ZTE1N3FHUWYrbTZYQVRYWjVuS2hiTWdsay9vSWJRdVF3V1NLdCtr?= =?utf-8?B?NG05RE9pb1l0OXBWQkY0endWa0RubVA4ZXBHS3NLNUhYNURFZytOTk9nMndB?= =?utf-8?B?MHlnUFR3SnJ4L1hCNGxKRUlnb0dRazdoZGFqekJHYkczYkxpNFYvUHN6RU96?= =?utf-8?B?ZTF4WGFDOEZDZGZWbytPK1hqSmQzMzk0MUNwSHB5S3lNbHBrckxNTWpKcUV3?= =?utf-8?B?bm1lWWJkWmZVd1VjY0FOcXFXbTlJc0VRbzAyY2F3bDlVZURaaFNWQUJsQ1JN?= =?utf-8?B?RDM1c3h6NG1YWDUzTFhlcEo3eS9CUFAxTlJYTGg4MVEydnh5V0NKWDJUbmpU?= =?utf-8?B?UE51WXRKd054WWlRNEhlL3R5c2Y3R2UyQldpWURtdGRTOFo1WE1hdUgxbzhy?= =?utf-8?B?QkNjaisvY3RQaFdYVDNZYlZwU0tZdTgvdkF5ZTJnckxHN1pvYjRXeWVHTStH?= =?utf-8?B?UDBlTDVkWCtYU0luV0llR05DYzN5cmJrdnNMSkhSZndkcVRtUzJCbzZoNW9Y?= =?utf-8?B?ckpza2xROHI5a28rQzNxMitBc0kzQWxJQU16K2VIVWNYQU9IRFZMd0hwNWQv?= =?utf-8?B?am1iV2JycGI4cnJYaHc1OU9yc0ZjQ3ZzTHRnUFp1K1lIc3BXRURYeTZmdDUx?= =?utf-8?B?MjVaTW9qbDVDSEZmdmhZTzdTTWRhZ1gyd1o2WFBLekRwQ2V1Nm9wYnFxYlBF?= =?utf-8?B?K2FoVTZHc2Q3ZGVkcndlUmlla1BsRXZHUmdwUjBYUlNQb0NKUkRyTFBaRmlP?= =?utf-8?B?aFE5SmxZWWNUSG91Ykh0cEs4YTJKa3U3MkwzdW1Lc1l2Y0hCMm5NbzJRMWRV?= =?utf-8?B?R2tvcEJ2OEVOQ1JTME1PSXY0amNubUVKWlR6M3hPeHNrcktEcE05bEI4bVZk?= =?utf-8?B?K1FkU3l4aEQvQ0ZGeGV0R0plR1RyUmk0ZXRySjlKdGd0eW1QU09naEkzTTRZ?= =?utf-8?B?RkJLNmppMDdtalExSXRzVnMvVVhZRVJUWWVGYlJ4dldSSDRPMkhuK1JmSkpi?= =?utf-8?B?NXdqV0xITERKSXNneFdRaXB1SkV3PT0=?= X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: aec9dc5a-cbe2-4725-0051-08ddbb048bd5 X-MS-Exchange-CrossTenant-AuthSource: PH0PR02MB7159.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2025 14:10:35.7549 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bb047546-786f-4de1-bd75-24e5b6f79043 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: GR/Pc21jeUCHKjc8ULhxcHaFY8jiE/WWT9ouDA1iHWwpRpAq8CsRt1g3yEa1CZKsEZqxybQcBWHMqcuYqEdQOc5ee8DfSSzbJSzPMWKgDA8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN0PR02MB8045 X-Authority-Analysis: v=2.4 cv=NozRc9dJ c=1 sm=1 tr=0 ts=6867e0dd cx=c_pps a=PPhwdAdCFl3D9wfqO/a9tA==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Wb1JkmetP80A:10 a=0kUYKlekyDsA:10 a=64Cc0HZtAAAA:8 a=KKAkSRfTAAAA:8 a=F9lpminiuFHZMRiaUDYA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-ORIG-GUID: O-eTorcFoDKhycviHA1JmF9S_xVdWmrT X-Proofpoint-GUID: O-eTorcFoDKhycviHA1JmF9S_xVdWmrT X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzA0MDEwNyBTYWx0ZWRfX8DFEnJqxDubu UkEVWtV/66sofq6jcFGAsztwk2pr5OOVaiS/4aSClTyb8kG8aby9/0dm/saExc/PVtvjWvLrZRC n6ZYux9XIt9/25h6T+KHqiDx6xTX9pn7rmMzhbp10J9//LBPftdiC131EwFt6uuAZ9BCPRTlDEO bg7G29LLXbBcUauZlcdA2g+ubTkCQYkyLAm7+GX/fv2hdpB5nVRkGo+P6JJTcgrRClKdS0YlCc4 hnUzG4ThZqY1X9MtMVrf2kZUglnsUrUz3YsyrHMXWa+JrTtynx1DN6yWv+hjiRLv/M86SOEcOiL 3PdPFm7tfYGv/F8R25KgvAOei/DDNSLIGdw17OE9RAk9cO6LjJJIq95Q0UlGG/+loNktC1S9mWJ OK4McsMGmRcyjHGwY5r1oQWbdPEH3uHCtsIouvWXja44hh8/QIaLOuaWyDFNyiTBpUTdpeNk X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.7,FMLib:17.12.80.40 definitions=2025-07-04_05,2025-07-04_01,2025-03-28_01 X-Proofpoint-Spam-Reason: safe Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=148.163.155.12; envelope-from=mark.caveayland@nutanix.com; helo=mx0b-002c1b01.pphosted.com X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.218, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @nutanix.com) X-ZM-MESSAGEID: 1751638346338116600 These are based upon the PIIX4 PCI chipset and so can never be used on an i= sapc machine. Signed-off-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/i386/pc_piix.c | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 5d59cbde09..baaf744edb 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -424,8 +424,6 @@ static void pc_init_isa(MachineState *machine) MemoryRegion *system_memory =3D get_system_memory(); MemoryRegion *system_io =3D get_system_io(); ISABus *isa_bus; - Object *piix4_pm =3D NULL; - qemu_irq smi_irq; GSIState *gsi_state; MemoryRegion *ram_memory; MemoryRegion *rom_memory =3D system_memory; @@ -579,23 +577,6 @@ static void pc_init_isa(MachineState *machine) } #endif =20 - if (piix4_pm) { - smi_irq =3D qemu_allocate_irq(pc_acpi_smi_interrupt, first_cpu, 0); - - qdev_connect_gpio_out_named(DEVICE(piix4_pm), "smi-irq", 0, smi_ir= q); - pcms->smbus =3D I2C_BUS(qdev_get_child_bus(DEVICE(piix4_pm), "i2c"= )); - /* TODO: Populate SPD eeprom data. */ - smbus_eeprom_init(pcms->smbus, 8, NULL, 0); - - object_property_add_link(OBJECT(machine), PC_MACHINE_ACPI_DEVICE_P= ROP, - TYPE_HOTPLUG_HANDLER, - (Object **)&x86ms->acpi_dev, - object_property_allow_set_link, - OBJ_PROP_LINK_STRONG); - object_property_set_link(OBJECT(machine), PC_MACHINE_ACPI_DEVICE_P= ROP, - piix4_pm, &error_abort); - } - if (machine->nvdimms_state->is_enabled) { nvdimm_init_acpi_state(machine->nvdimms_state, system_io, x86_nvdimm_acpi_dsmio, --=20 2.43.0 From nobody Thu Dec 18 13:31:21 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=nutanix.com); dmarc=pass(p=none dis=none) header.from=nutanix.com ARC-Seal: i=2; a=rsa-sha256; t=1751638331; cv=pass; d=zohomail.com; s=zohoarc; b=EhB2PEeOwczrS24wTorp6ChH6LdFrCdAEdOiLvGU0NpuRg9S2/CWRLGvP9CBuLYVQW5g2rsBlYk7Ql5T0KAEXqef5YVlbLrlQcw8QLFZSSQfLu9LW73VUS6z9N24+Ukqn/5Cu6E0ZfKq6/xvV+0LyHY45Iryxg324QO7NfUSwU0= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1751638331; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=HIDDp/ImnI5o3fK+jKitf52nowJEBqWm+3iG3Lt6gxk=; b=ksss5mqIhV6PUjCUpJf0xM0YzzikThP7FZpP8EIWu4TeeVKZ8t6gUatytbF0htpvPQkW6XPbyllx3Fp2YUwU3I0MO3DV1ZY67/3yMseKQWDpeoLJP0pheCm1w0YDfTpEJ41+2HIpQAqqs8mISKfe0MY+B9sHcAJ0W4Mz1xCygIE= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=nutanix.com); dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1751638331677316.4988701327968; Fri, 4 Jul 2025 07:12:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uXh8R-00010w-Tm; Fri, 04 Jul 2025 10:11:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uXh7o-0000kT-40 for qemu-devel@nongnu.org; Fri, 04 Jul 2025 10:10:49 -0400 Received: from mx0a-002c1b01.pphosted.com ([148.163.151.68]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uXh7m-0004hE-CQ for qemu-devel@nongnu.org; Fri, 04 Jul 2025 10:10:47 -0400 Received: from pps.filterd (m0127839.ppops.net [127.0.0.1]) by mx0a-002c1b01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 564CLwts008830; Fri, 4 Jul 2025 07:10:42 -0700 Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12on2139.outbound.protection.outlook.com [40.107.237.139]) by mx0a-002c1b01.pphosted.com (PPS) with ESMTPS id 47mhw30fu3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 04 Jul 2025 07:10:41 -0700 (PDT) Received: from PH0PR02MB7159.namprd02.prod.outlook.com (2603:10b6:510:16::8) by BN0PR02MB8045.namprd02.prod.outlook.com (2603:10b6:408:16d::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.21; Fri, 4 Jul 2025 14:10:39 +0000 Received: from PH0PR02MB7159.namprd02.prod.outlook.com ([fe80::6cf9:b35c:b143:bb88]) by PH0PR02MB7159.namprd02.prod.outlook.com ([fe80::6cf9:b35c:b143:bb88%3]) with mapi id 15.20.8901.018; Fri, 4 Jul 2025 14:10:39 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nutanix.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= proofpoint20171006; bh=HIDDp/ImnI5o3fK+jKitf52nowJEBqWm+3iG3Lt6g xk=; b=XXIRWsaBz9k01jyVwUrsI1hQCPxuKbOOavWoWJ05Ac8eVTvRojkchWB7P js87vAGCE51fsAwh1ENcpDqcoIJTWlETrq9LTCmLXISiJO8F0D8Sg3JUlcqqS53B U6az+HClR12XbuktRTqlnji5t5Vu/g/1TBqQgQOHIHOM3KORLrIORU94uVdOUWq8 vWnX4a2wZWAIeLiLox9tXPIP0Vfr1o5lCkb/lHTSy26CylWelNs0TqFdaiRXqpwl lbVU0lYxrGS5f6jLbUi52h1kJrPs6+txXb4GmgbyqGiGKcZ4pjPhQhxpqpqNv07t l0M+I++lzrUsTsicp1b6hs9Rg5xsA== ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=CMkBuBPzeBtW20Jvt9vQy1bMBgzM2S2ydJLT24AFtm4uIVYwlAWa893WHgF+w8LYT5nMw5XalFVoyQSrl5GfF44D0GBQNVcX9fkkP/I2PtqVy5kVBWfel8UwZJoWumIMEIJl5ch5Xv56sUolwjfBCIfe0pF46DnhxwguhcGInL+5qRs0iKKDHN2XXlW9xwDyMDQokJe92qN4POQf9AmzBvOuUSlZFZ0pBM4S11KfuGdKH4a5LX2AW5FEKulBiol2KNSMpHTTxMMjmotyjB5crPcRGzzmKQLJl5KJSmTQ4SMGfAzSgfjZGrdyXgfocVvWWkwSlXYQGE48KjWSv/ACqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=HIDDp/ImnI5o3fK+jKitf52nowJEBqWm+3iG3Lt6gxk=; b=ejKTQ+jgpGrv/t4pTR0KJMumDLxJ115qLOQ+VpxtXJ2CcXsNSHhWTared9EJDrOmTksQejgptjoopNLt5KQ0Fff1LlfPU5ZbsfzB8Sqwdz/s4umdJIgG7ooaNGYI/ivJFKIb/uc86wRg/iKRxUPvXnB2e2k3JbCWNLwKE92g/E53DNeIlK8260rrxdr7xj4GQ8FbtuN72Dz+bQnZ8cVEGUeUFFfSNY5KaH/0Hn1nlhbi5LK0IVoGk2zGPoStNEis3esaKd4ca7/D0IEw54IvwgJR2AQ6zWeaH7g9dpiIkWTOANECHpP3yzH56mLB+cK+89seY++ZTF5AZdQECIES/A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nutanix.com; dmarc=pass action=none header.from=nutanix.com; dkim=pass header.d=nutanix.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nutanix.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=HIDDp/ImnI5o3fK+jKitf52nowJEBqWm+3iG3Lt6gxk=; b=YcwGV3MpHOGtQlrNfJlWe1718bR0sDUrqmE2FOpzCbUvbulREYKovXLWNGLJlOsx7XrEFTqzOcFyONYPmRQCfOV1wGgNukyKELkH/ixl3BXPxhadhbUCFRy0kXCvzEJipQB1We5GjaYkTO2IId//4TZyLWU2EB5HMoGY5vISUBkCrth6Q0ZsUxbj8PyLVH4bRA6vkEP2lul/iR0GT1EUY0+W8LT180QoAHO43vyBQxMcQDdf9Q7w1+3VsjTD5RU5RWCiY6OUNMgYdaP/V3vJ+c04j9DLy74dnbAQcVImQCE2hcRsWLMpqZj9/k7TX82Rk9PEIPafxP1mN2A3o5BagA== From: Mark Cave-Ayland To: pbonzini@redhat.com, mst@redhat.com, marcel.apfelbaum@gmail.com, eduardo@habkost.net, imammedo@redhat.com, qemu-devel@nongnu.org Subject: [PATCH v3 05/14] hw/i386/pc_piix.c: remove SGX initialisation from pc_init_isa() Date: Fri, 4 Jul 2025 15:09:32 +0100 Message-ID: <20250704141018.674268-6-mark.caveayland@nutanix.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250704141018.674268-1-mark.caveayland@nutanix.com> References: <20250704141018.674268-1-mark.caveayland@nutanix.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS4PR09CA0007.eurprd09.prod.outlook.com (2603:10a6:20b:5e0::8) To PH0PR02MB7159.namprd02.prod.outlook.com (2603:10b6:510:16::8) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR02MB7159:EE_|BN0PR02MB8045:EE_ X-MS-Office365-Filtering-Correlation-Id: 34bda3e7-2d2c-4421-0e84-08ddbb048e32 x-proofpoint-crosstenant: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|1800799024|376014|10070799003; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?8uem179ZjS/mltGWSDDUqQUQBE1bdRS1LpOo9J1MZoTHcSk/aduciD5xndft?= =?us-ascii?Q?nObPpT2+Y+LDq9u1FalluYOX8JyEpOEMEmt5Gsi2yvItE/Xp0ClHchoXcjZi?= =?us-ascii?Q?7/PvgTzFPb4igD7eA8rJ7MTx/vytZ/ixMKzkxhpSn8/Ouc7YZqtX8MMrRScN?= =?us-ascii?Q?A/b4pVLkDMKxw+jaCy4s2Lj7wFbWGug0IdDYN5hB4LetA6d3UKvWXxb8M2sJ?= =?us-ascii?Q?5y1eQjwNobCwaxcASqWioEMjnNoYEWPrLADBcJdqFautX9NzaPq31EPM1+QM?= =?us-ascii?Q?QtRBPr4tiMcIHGTNKVg/g6Rfp9RnxJABBANdy2Li0roKBnpM2JzaaBoeKXKV?= =?us-ascii?Q?Y8Xj37bsXuItLOI8FKz5IrchLXyh5eM7qbz8HmHyFn89nMhYgso9IfBqoi/O?= =?us-ascii?Q?gexTRHDBCzz6Zw6Zsb7vA+rv1KAkPPQXXuoITPSPXuRpRyEXV0QRaUfz3FUd?= =?us-ascii?Q?0atTkUigachZPf9mmlaxqzjUgHXnGgaoPuisg/Bel8fUcf1EBkzk0tBElERO?= =?us-ascii?Q?fX7UpSK4IWl99v6n0RVIDUnJ2PEK1gIv1pyl2o8UXkaGWr4sxQSATuEGrETM?= =?us-ascii?Q?apygCG/hS6Yzs0c5Z//AJtiGIn5cI+5jSyq0ShKi2qwi2BW7fEVAto65FgMv?= =?us-ascii?Q?0zZi/y224sZlZyTx408fNw00eRpt6OezbTOKn4z4aLkLjwkyPyrBjMUIacui?= =?us-ascii?Q?exaibmlm9fd23rYlbOG7BxLzFTa2qS/OmJJHzbNd4h721LNqFnLaifX7FVp0?= =?us-ascii?Q?euqV8OufAx79J/QPYFc5xFL8qSTa7k1+VU1/cnEHRTt3DetJ6DoHRuJSWTL7?= =?us-ascii?Q?1oJxbieXGv2BXv8Y5caJUxtEAaRuBwFYtPyY0Cy/WfbYMHgc+iAEFzBlVXn1?= =?us-ascii?Q?Qd9Z9yxoUm08oth5cvvzscLBuSUpL7etqMLS+IXhQKc7RKP0z/tRPhkFekr2?= =?us-ascii?Q?7pPQUrdIzrUO3RBt1YSi3nrrqRTkJWhg3HK7yioxdnpge2BPTT5p80bZlg0z?= =?us-ascii?Q?kc5O0ZfLLa8MwE0+OxhXBHH2170lu62FDFgBGPFNkxbIo6eZo6ELBo4giF6j?= =?us-ascii?Q?oJHf1XmzaquRNJy71o8n8seLqog3fXNVXfUxg+qVMEV4GirsLRjgtkolBRLh?= =?us-ascii?Q?BIzAWbGqoabgLVmUXC+tVSGIv8DGDdqM4onRXUP80rdLZj+2VATapsGI3ryV?= =?us-ascii?Q?2mKQV3GqjJc6NomfE0Pn5bf869fHtfNSQAsnyfk50yX47Bd28TCXVPr71twq?= =?us-ascii?Q?zrZOV5qTdXhDrJIlFc2kWawY/DW32sUj4kgLXWpXLfFOgQTZmlHkay/asiFw?= =?us-ascii?Q?+lfaKohWLF5Is0x4Nz3hUpR5sC3czB5tUKMQGSfQKbBvlbMrkiRaRG6a+7M9?= =?us-ascii?Q?ApxvCXqYav0TtUKpB6GenrUdWcMKd8WgMW+QWh083W3JtgfXQg=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR02MB7159.namprd02.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(1800799024)(376014)(10070799003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?r++qBkCnuuU8YY3nPZ9Psh8H3nLts/z0yPe5Jn7xsRhZFv2eb5bN5iqc65lk?= =?us-ascii?Q?bDCOIn+IJZ9UFCTXhx1t41R31u4daVyF+h1HPIHN2ljbgYp0mNm2TVJ//mBj?= =?us-ascii?Q?gZCRDEjFPsY2Ao3dyo+d/tn8UScRJzNni3y1GbuaUe1ThagnFWKu2v3alIaX?= =?us-ascii?Q?BT0Ek47vH1S7o7cDnvynHCyVH5Su+bHLZDQBSTZPG3uD2ZUHFRqeCv7+cRVA?= =?us-ascii?Q?qy+jcgxr7wWqUEm/pGltaSz2mwTXVi72dphcesJH7ftf+oXrnUKufdw0Los/?= =?us-ascii?Q?0LA3b6Y03hsQJYR+k7+35i3PUWa1Af1AaVPlAPPaFSwhj1oruFopg144itlx?= =?us-ascii?Q?U1HDB0mgXYqN+5yTqbfZQo9cwhlRMmN3YpwAlXq3E9DEu/Jd+ICJRITEmJzk?= =?us-ascii?Q?jmVu9dPrYDPRown6pQftBcvnuKW5gYUfzNs9khUTdYAOOSmvC1a3LmFNdio1?= =?us-ascii?Q?w/ataUAI/EO6dt8vlrOKgLGcXwTLMbj8/2sxV+omN3c5C27JwO1aOkmYY4rN?= =?us-ascii?Q?tQcQGpLlOHsE8i7PeJ8HXZB2SdGTmFZc6eNgGHLEA9uOzLn7/W/fgg6ujv27?= =?us-ascii?Q?yoHw3Y8HRq4xKJC36NXeII7jJVuF+CVLAk6RVB/oZf/CMVZ9nC8p7jDkaSyB?= =?us-ascii?Q?YaLOFmGg7KBqXJ+lCD81Fg+2Wx+afiMCBaOOWIt5yeIIpnfU9oKHsP9xuut5?= =?us-ascii?Q?zMMvePguW7y8rxNJV5eFLiHnPKPtnA2g7bfUOUUdhs+/OuI1fLAaCCjyRsMb?= =?us-ascii?Q?oTh/pnWn04ZhsPaumaOSDY6krIu2+y60C22bxkozV3Znf1N4VVcZG416f07l?= =?us-ascii?Q?XJeb/R6Mg+p5CPTHYCZvuonBcedmlHb8ZGMXUfox7N3xR666B3qW4aJSwfWp?= =?us-ascii?Q?dVgjXcpJWdPjITyQ/0ObCyIjWCG0atnfu310uaQWcRVxjWxQ96+rG9qnV2of?= =?us-ascii?Q?VghcehnF8+7TftcbwK6zN76Jiig+7WnLaejrUC6ZcrdLp5biD5BdXMwRY2Ng?= =?us-ascii?Q?9FJLXEIcU95112JKyD25MGqzTKShkExXPcq9QityrJF0xyNw8AVsF+Phg6n7?= =?us-ascii?Q?SwAoBQB2iCcrENPVIsCbd+nEgmpEDVw6iSfFLz5BsRZwhAu18V11JsgQIUWj?= =?us-ascii?Q?F5gI3axEXKqQEqtwaHj0zIZBZn9I2BJLhG/GR8VvGuXUn5kDVyBPk8zDwfNB?= =?us-ascii?Q?Tq4cYCWS+fiXcKuEdwDiS9IiRZi6w0hWrmmNyfZsfpMCvww8fEa6KjrEGWkl?= =?us-ascii?Q?K4HdJ3XAlMSuT8fpspf7L1PsjIMfN+eSvZYrlKrDWbvN6DOGYbAvwosQBWe+?= =?us-ascii?Q?InbxhGc+0E2eTyp5AJkqnhkEayuBy23SGNnivqroCq1N2djKSCkvWVMQXGOP?= =?us-ascii?Q?lDSMslqN5Y/MCtMKnOtzKim7s+JpkarRcd+FPLOFWC92mDG8zXCTVrY+7VJp?= =?us-ascii?Q?TCt5hKy6cQ+seZf10vYFSBA09F/WHZ16jgSgJFmOUX19qR/uQtNCp00tEq38?= =?us-ascii?Q?564F3h8F9tYTBPXCTCqB8pU3CJBqvvIDE7O3X39BvKcewiumEacRE9ikbFnH?= =?us-ascii?Q?J7AukCy9RADsJ3rxATBNhnhVPzLmFeK4NcP1A9s2Z3zjymbVVUjh5vOueqvC?= =?us-ascii?Q?gwTuDqgTUaJtxMHN+u5WV/YJv3Blf670URB86vdnPtWgudVhVywdhunK/zcf?= =?us-ascii?Q?O8yQJQ=3D=3D?= X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 34bda3e7-2d2c-4421-0e84-08ddbb048e32 X-MS-Exchange-CrossTenant-AuthSource: PH0PR02MB7159.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2025 14:10:39.7104 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bb047546-786f-4de1-bd75-24e5b6f79043 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Wp+7usAHDGiBbbLq2gWvFvCTo5TYImjdOAX0k7t5HQjsSndkREkPN3wjokfk4HxX/QSsNvNpc37HOJdNn5aZP7v+ltHSFJZC3VYSk3J9Ec0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN0PR02MB8045 X-Authority-Analysis: v=2.4 cv=ctGbk04i c=1 sm=1 tr=0 ts=6867e0e1 cx=c_pps a=96FhCRI2SFwVpwxLm/ws/Q==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=Wb1JkmetP80A:10 a=0kUYKlekyDsA:10 a=64Cc0HZtAAAA:8 a=yiTRickECGlooSfTVXsA:9 X-Proofpoint-ORIG-GUID: vY8-aGP3Kmu1jnebJls-O6j0egm5W7x_ X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzA0MDEwNyBTYWx0ZWRfXxVfDpMmEhF/f 2yOJtAwp+Pq/0+QPo/dy6OWPeg1P21fMMZ04bI8Ei/95HfpQ5pBZroEGZdjETG/Jtjfpgqjb83X caBlztxV6YpQ9nx2GE0Xn74NyclbmdyriA6WzD1dUZmmnnMmGMD4n4CP4OHA1aiK6nK/wWmHDCL PuyRr7Q7zw/RmrOrXXqt9lP+YTsnFctSJztcQZJmsYw39VBYJLtm96Yfxv8L7crkvE9nJGMGT7G l9faLmz8V8ipwdKSZw6/243JCpFd205s8M4iaFYCgQqzsk/rlfWNeGkK7Jj9gW3tex7uOcwcXCn BL0s91Z3XHTuGGFgoaGYerSCBdAKufs+q2Z4Pe7uvNsbgQ4sKXrRwXp6x6sobiIGEUDKkAM3KnR cm1PApFSVuWaOHImSVnoutuGMlPZ7qoM1M4+0h8/9uupN1FZNIgEbKixup+G1ergK2zk0YVW X-Proofpoint-GUID: vY8-aGP3Kmu1jnebJls-O6j0egm5W7x_ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.7,FMLib:17.12.80.40 definitions=2025-07-04_05,2025-07-04_01,2025-03-28_01 X-Proofpoint-Spam-Reason: safe Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=148.163.151.68; envelope-from=mark.caveayland@nutanix.com; helo=mx0a-002c1b01.pphosted.com X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.218, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @nutanix.com) X-ZM-MESSAGEID: 1751638333804116600 Content-Type: text/plain; charset="utf-8" The Intel SGX instructions only exist on recent CPUs and so would never be = available on a CPU from the pre-PCI era. Signed-off-by: Mark Cave-Ayland --- hw/i386/pc_piix.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index baaf744edb..75226aa775 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -492,8 +492,6 @@ static void pc_init_isa(MachineState *machine) } } =20 - pc_machine_init_sgx_epc(pcms); - /* * There is a small chance that someone unintentionally passes "-cpu m= ax" * for the isapc machine, which will provide a much more modern 32-bit --=20 2.43.0 From nobody Thu Dec 18 13:31:21 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=nutanix.com); dmarc=pass(p=none dis=none) header.from=nutanix.com ARC-Seal: i=2; a=rsa-sha256; t=1751638352; cv=pass; d=zohomail.com; s=zohoarc; b=iymsm06Ok3ZBEQd0pU1AjvmcoJNepSkp3uFiRbc5HsbBNdMJDGHp5ddRkB6aNTFXE+Lzzz8vwgR0sDNavms8p8Xn4oAQkOHQhOygS/FuOiD/NYaKRrGBqg20fUQdwDkqvVbFilOB1ezB68/h3E0NeaSdI9bO79gxTTC/cPatguI= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1751638352; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=M1kPtUv4WI3ycXgG18t+cGHK8rha3hi9nNVxUIOxMEs=; b=CmGANwXZuDw3vxV2JPxEzm8YWrH/5BZGwEVGyTjR0EYJEl8sCzUEEJPvsdU34OYeL0Bt9ZCNf0QcI07gwfUz/bIoxw74pSimotamAul83HeaFsdxmYRaLDQCT1HMCTUQvoQ3vpVORs3bWEBa8nTRyzvFr7lCi1EumwskY0jWSY4= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=nutanix.com); dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1751638352879455.7729278785373; Fri, 4 Jul 2025 07:12:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uXh80-0000rX-N7; Fri, 04 Jul 2025 10:11:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uXh7r-0000oY-SI for qemu-devel@nongnu.org; Fri, 04 Jul 2025 10:10:54 -0400 Received: from mx0a-002c1b01.pphosted.com ([148.163.151.68]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uXh7q-0004iu-04 for qemu-devel@nongnu.org; Fri, 04 Jul 2025 10:10:51 -0400 Received: from pps.filterd (m0127838.ppops.net [127.0.0.1]) by mx0a-002c1b01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 564CJlkk023056; Fri, 4 Jul 2025 07:10:46 -0700 Received: from cy7pr03cu001.outbound.protection.outlook.com (mail-westcentralusazon11022119.outbound.protection.outlook.com [40.93.200.119]) by mx0a-002c1b01.pphosted.com (PPS) with ESMTPS id 47n1x96a4h-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 04 Jul 2025 07:10:46 -0700 (PDT) Received: from PH0PR02MB7159.namprd02.prod.outlook.com (2603:10b6:510:16::8) by IA1PR02MB9087.namprd02.prod.outlook.com (2603:10b6:208:419::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.20; Fri, 4 Jul 2025 14:10:43 +0000 Received: from PH0PR02MB7159.namprd02.prod.outlook.com ([fe80::6cf9:b35c:b143:bb88]) by PH0PR02MB7159.namprd02.prod.outlook.com ([fe80::6cf9:b35c:b143:bb88%3]) with mapi id 15.20.8901.018; Fri, 4 Jul 2025 14:10:43 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nutanix.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= proofpoint20171006; bh=M1kPtUv4WI3ycXgG18t+cGHK8rha3hi9nNVxUIOxM Es=; b=vwdOOzUqAKwvcjN/2rRxSfPU/MNiFsrUnyt28eOXzipVnBAlT520WNmXS AOnfpZQ1n6hJupKo7fvYSprhMJfoDwzHD/nMSo90Lbp9aSJ+1Rh/FZC8wf9aWhNA dxOI9hPi936rn4EXzyk93wUXpnKvlAM1wee+vqCmdm18Gw0nCEdsIo66GXwVIToK +nmkLzEdD9x3fJpG6Rj2VzYSV4W+h4+9eseyhnFilHQdIl9k9nuTouWxPgvOdJaj PLJjbLJwYxLRU/f747IKslk6aSp4RNE39yvf6iF2uLj3kw7K8GVbqQcJSRlYRhE8 UAJdq81bBfii4dGkIiDHxddXm1vQQ== ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=MdCLW/NU9cPqRReDvplErTSTC295mBSuMfJGhyAqmddNbLdESOvsWxlw5tvd8YBkrPopqN/MG5UP5MUq5r+iUdJHjTDhnd81BkKNHy2zredFeGOZai9aHRiG5R+PY0zxd1FjZisAnO3e1h6agB2WbzYFBT/u9Xz1+TxaI4y9v82jqe3EFcaAb4+1dAsFHiaYsK/Jf3Xf8PsyzKIe92libtVu5azA8pTzpH0mkkw12mDe1wy2DQeUuvKfBrJJag8sHwzqetPJ/6KY1DAepVOpDyRlozTFlwh8lnWiXkcb3IefaQLqpM6N68DKaNq7Y0w8t2y5o9d+t5iVHNg3Q/tC+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=M1kPtUv4WI3ycXgG18t+cGHK8rha3hi9nNVxUIOxMEs=; b=j6KWdqk9ZADMod9Z89wlFcKOw88g6CdzuY9TJyEwaLCrim01V1jBvaI2K7hkrHFaYN5tAbyHNDgQihNIxDe+E3fsoXpvumvLVIolU7jYY0krs9AVxbDj/aBFrmSUscUpKxMML75fVtK+Qe6aYGDTfv42G1IDXdB9E+9S+EAa+8KunT7O6osoeW1+0MszX0kEZaquBuxgep5jUz/XJaBv2Ts1sl2EPiTeHoHg9FUsZk0eSg1MUbnPrWQFUq8yQA3ayy/v7vouW0Ytvg26ni4XBV5CqpN22iy5pKOWhxw5VYh8Wv2VzSHjpqUvT8lUn82cjahqZfLzM43OfUd1KCuqiw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nutanix.com; dmarc=pass action=none header.from=nutanix.com; dkim=pass header.d=nutanix.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nutanix.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=M1kPtUv4WI3ycXgG18t+cGHK8rha3hi9nNVxUIOxMEs=; b=b5Tje0sGJWH9p1m4yRSvnM5B+mx7aQFwVbWkJwvsCBgy15BF1GDYIzp3sJbz0pgaL03ouXEtZQoW7vUJ12nCNI5l52bz5W87FN54q60M11aqvIRclepEQkY70450SVx3rH0gZYBm5GYWjFYQ5zfm/720b/qaNTqH2oRuXKahKZpLhPwfbnS48NXtK0Dicctp+7EY1ffCKZAGBDoz2hYk1KvcWG+Yi8GSETmbIYoLo/R+f2aVbi4AKV0PRvx7ZeYQeKlaUyk3bCih1dKwGrq4KkMk5pRSBNK36VwaZcB+HpbbZZ1omRbpOOP9sepaXy4xlxWO+3g+I2Y2NfGyeq5YEg== From: Mark Cave-Ayland To: pbonzini@redhat.com, mst@redhat.com, marcel.apfelbaum@gmail.com, eduardo@habkost.net, imammedo@redhat.com, qemu-devel@nongnu.org Subject: [PATCH v3 06/14] hw/i386/pc_piix.c: remove nvdimm initialisation from pc_init_isa() Date: Fri, 4 Jul 2025 15:09:33 +0100 Message-ID: <20250704141018.674268-7-mark.caveayland@nutanix.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250704141018.674268-1-mark.caveayland@nutanix.com> References: <20250704141018.674268-1-mark.caveayland@nutanix.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM0PR02CA0015.eurprd02.prod.outlook.com (2603:10a6:208:3e::28) To PH0PR02MB7159.namprd02.prod.outlook.com (2603:10b6:510:16::8) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR02MB7159:EE_|IA1PR02MB9087:EE_ X-MS-Office365-Filtering-Correlation-Id: ea9ed5f6-8902-48dc-d012-08ddbb049064 x-proofpoint-crosstenant: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|10070799003|376014|366016|1800799024; X-Microsoft-Antispam-Message-Info: =?utf-8?B?ZUtSbzFqUDhSSUlpZlVCMkg0SzNnUHZSL2dNUEtNekZFeDhnbUJ6dkZsVTEv?= =?utf-8?B?UThhNWVFeVdQUGRuMExQRGpweEJranA0NFdNdUJ1SllPY2E5Q3NaMFdMaU1o?= =?utf-8?B?Y1EwRUlpYnlob1VaZ0lYazlnRWNnY3RoKzB4b0R5b0NVZWFYaXRzR25pd1FP?= =?utf-8?B?cFJSYTRUNFY4RFIvWnQ4OUtSNUxrU0g1eStRMEVEdDBtQmNkWGpuOUs3ajJB?= =?utf-8?B?WU10MTN3RlNGVFMvREtlTXhqdG01dmVscTdjZ1pCMjlSNExFQ1BITm4rdnVZ?= =?utf-8?B?QWNUaE1LU2hJYW9KRHBlY0ltTFJJVmJXQ3o2ZWVhVklzWTZyTFkyV0ZSQmZQ?= =?utf-8?B?TTdacjkzelZUMGJSSWhXSE9aUmw1N25RQnNtSWtLN2lzYzUxc1BFci95YVlx?= =?utf-8?B?WGZCajZNazlZNVZyZS9zb204dnhNYkQwU1hQdUxSSTdBcWwyaFpNZG45b0NS?= =?utf-8?B?Q3owc1p4VUgxeldKdHp3cFlWUTJFUHRPRTdMZTlETTdZbUR3MkwvQnBhRmpB?= =?utf-8?B?dEZCbFBvb0l5enZTQkZrYmU2YXR6OVBSTHdhNERpSnJ1aTNMMEFkdC91TGNk?= =?utf-8?B?UnNkeDdUODB4dC9vdi96VWNKSEVkWWFJdXQvbXlicHRjUEQvVWY2UEh2UlJB?= =?utf-8?B?cDB5TkdhdTAwUnJkQndIcTVtTU1GYjAxRGRaZjZWak82VlMyMDlWWnF2Q3lR?= =?utf-8?B?NENEcWFVVE9nQ2ROZDdqemdON0NiL2JKN1dKSUJyMFpWTlQzcllVTUZFaWtX?= =?utf-8?B?dm1GVG51aDR3eXpHT20yL3hNV0QrOU11VGVMU2d3YUZiUTFBcXpBeHgyNmoz?= =?utf-8?B?UWhQOVFDREdXb2JYR3FNRjhHRHJ5V3RzOTd4SGM3RTdXNW03bVgyMllFdFRX?= =?utf-8?B?RkdMVmZjYitvMXJYc1ZRU2Z2Z3h1SzJwRXJCR0Y2WDExOTlEamtJdThHczRU?= =?utf-8?B?anVmSWIzcy9VQ3p1RkZhVXdISEkzaEpBNnNlc0FaS0pMMTZXbysyMzFYNGNX?= =?utf-8?B?U3pGVjNtQlVBeFR1RklyU1F0a0dFQ0dsU0RxeUlSTTY2bStQTU54Q0dUQUhI?= =?utf-8?B?bXpIcXNQMit1dVdxMXNWVEwyUTR6YU5rYjB6Nll6c1N5Q3JRb0NVNGp3eGgr?= =?utf-8?B?aVNIeGswUzB4Rld5eGEzZzNVL2V3a1kvZU9NSjVYcVBqUzhPOXNLRmFBbVo3?= =?utf-8?B?T0REUmkxaGloMTJRRzViKzIrK2lKZVFyUkduS2grSE9ETHNxWTdjYVU0Syt0?= =?utf-8?B?MGxKVnVidENwbnZOa0NqeU82dnB2U2czSVhHTy9EQjhLSWpHQVJONFJHSzZK?= =?utf-8?B?aElQSE8wenE4dCtuUHpyZkdoUnBzT2liVjJFNmlVOG9jSXZ0VW1oMlY5Nm5a?= =?utf-8?B?TG56elk5SGdtb3ZycHN2QitKcjFOYmhMcUNPZUJ0RFJEQThEemJKRWFKZXN6?= =?utf-8?B?K0Q4ZGdJblFid1dhNHY4SmJOS21wL1VtRk9taXEydkNlNXlYVjVJYkRlTzFr?= =?utf-8?B?VHNvQ3J5ZHhSR2dTNHlCQ2hUaDNJY0R0RU5FbEdpWWJRWkF6cnBScndYLzRW?= =?utf-8?B?M3ZMU2dCSXhEaUN5a0c2V0RmS3ZYK1Erbm8rS3RZSktiT3V1S3crQ3R5aDln?= =?utf-8?B?SE9LSDYzb2NNZkI1VUJuRG9ERkFZZmw1U1FNcE9DcDNBWDVUaVgzZnBGendZ?= =?utf-8?B?L0pLbTBmbmVMTWNNL3IvaUFYWEE0OXUvOVNpSk0vWHdpRzNzUXRmamZSQ00w?= =?utf-8?B?bU5xdkY4QmRKSU51UEFZT2RjNlpXdUNnWFBZQ0oxdWJnbFhKWHdEZE5DQjQr?= =?utf-8?B?Z25YTmtqU2hSM0ZWQ2JkcFFscW93Tm83ckJ2VHpZU1IrS3BYTnZQZ2xUNEds?= =?utf-8?B?cHNTQTZTRVJrRmg5bGdzQW9rbXJCSHMzY1YwVklMV3dBRUhWRUxaMmlNdTRS?= =?utf-8?Q?8nSgiDFsSxA=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR02MB7159.namprd02.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(10070799003)(376014)(366016)(1800799024); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?dTIxQTlBWlpMMVFRazFodzludkVCWHRmdW1PZ0VlSW9BdVVTR3lVcnU5M1Rn?= =?utf-8?B?bjBMNDZLVzVHVzJXaE03dGo0eWdSMVdQRU1ITVZ6em5oZEpudUVCVmZBQ05X?= =?utf-8?B?ams5VEFOMXFPRHBQZjZNdmdmL1pLVGU2OW9qaXpVQnozalBLb0VEK2QybzJG?= =?utf-8?B?S2x0ZGg0d0RuM2MvaDBjOGt1Qy9DNWdDR2d6TUFtWTQ4RTZldjd4V3duOVdE?= =?utf-8?B?L1Azc2R6aktmQXlpZUhodWZXR2RKNXJCa1lzVkp0b0YyOEo2WXRzanh5M3Rj?= =?utf-8?B?WXpLa3BkTVRXM1dtd0NzQTQ1SDN2a0FjUzNLdjdhQUdhOTd2UGlYWFN2b3Y1?= =?utf-8?B?Nk4ybXY1ODNlZkpVVHQwUytTTjNsZGVSU2pCTlFpZ1Y0aGEvTldjUGZicFVY?= =?utf-8?B?SnJ6bXNFbWUySkRwTnE4K29zZHhzUDFQWSt4N0NuK1M5b1Q1Z2s1d2xXWmR0?= =?utf-8?B?OFA4QTQ4TTRuVmc4MFBMM2J1UVBBaTh2NHo3ZVNJaTJMZ2ovTkVWK1I4cHBO?= =?utf-8?B?Tk01V2tQdjJhenlkSERmaGdBbzA3bXBKY3laK2p1NmMvZkRaUXFNaGd1UUVw?= =?utf-8?B?dnQ4N1Z4WkNlMXVCVHVFaTZ4S2ZFNDh1S21HM0Z6ZDV1ZElqS2x3WWtCZWRs?= =?utf-8?B?ZC8wZTVDRWEvVGxrT295dWIxNVlJUnBJeElkMkxjVHZ6Q21jQmtRZkZHanp1?= =?utf-8?B?UHZkUjExQll2RlBoZndGL3YrUDNwck9yQjZRYzkyYWJPdENJUUhHTW9lUnc0?= =?utf-8?B?cm54dXlmU1AwdkFjWVVFd2oxZ3Ntb2Q3YVJCbGNvT2p1Wk50Vlg0YW1ROHhT?= =?utf-8?B?dGlzSnB0aVN3TWFseGF2dWVTZTR6L1IvRk5uYzg0Y0l2a0ppMEJMRUs1T0dJ?= =?utf-8?B?YWR5bjlRTTNuREQ0VTZ4MTBTNjdpSW5LajNRTFNxUkdaNXpHbGxrd0VKcFRD?= =?utf-8?B?dC9SU2R5TXB3UVNJR1JlSUZFV2NzaU9YcTkvOXRrYmUvMGJZekVRMU5zemJ2?= =?utf-8?B?TzNvYStlZi94NTBnalBlVC96VEU1SFdsZGNCdW00NjJLcFgzcEgvWU0wY0Zr?= =?utf-8?B?UHlWUzhUdmVrZHd3dERYSmZ6UjMxU2ZPU2hpTHl1NzFQdm9xYzRHRTBsc2la?= =?utf-8?B?YkFxUzFmN3RTbGVUcE5RbzM4OGk4ZHFCSXFKbkptdjIreDBtbXN1YkVWNEYv?= =?utf-8?B?Mzg1d3c4UzBlSjNESlpEa1J1d1BzcGcvRXpmcmlSaVF4dVdiYzBFWmNSY1J2?= =?utf-8?B?dHhtdUFraUd6SFphWGxLc2RORnNuMTBGY0htZktpQnNIb25pQ2JxSmhaazMz?= =?utf-8?B?VU9zQnJ0QlRyUUlJdlQzQTJWNUp6SW1OZ3llRUNRUDlxcnI2MmE1UTNRMEp4?= =?utf-8?B?UDNrc2YrVXV3cHZWSHhLeW5Kc2pRQ2dRSG41RU9sclQ3VU9Rb2RzUTNiY3N1?= =?utf-8?B?a1BVSzFHbkNjbTFIcDFPcEdEZFJ6TUdKT1VwUjQ5K29pbUNROGpwNWFrUDRw?= =?utf-8?B?LzJFa1k5MGRSVlVLT2FCTGQ2RjdVTUNoSDhwRmQ4OUt5blBzcytRZzVXeVNx?= =?utf-8?B?U2o4bVIwK2pBWnRSbys5T0R1NlhxNnJUVUlWRFI2YjhheFl2N3RqZEM0eXV6?= =?utf-8?B?U0JDd2dSQ1MrN09PUXJvSVNqYmdmVEh0ZnJmclU5SFNmdDFhbkg4Y1pCLzVo?= =?utf-8?B?TWtpajNFTkpSTkozYnIzS20rQ3J2SWpmNnhsTm9GVXY5MkMzRjlFY0ZOYjhv?= =?utf-8?B?NmtOakFEL0QxWkl4Z0VXcU1KZERFZSsybW80WWF3SFVKRVJNbU8rV1BGN0FW?= =?utf-8?B?S0xQK2dHemtUM1VtaFRMaFlhT3F6T2dibEtTTTNWT1RHVEhPdG5qUHJEZFdS?= =?utf-8?B?MTRGL0sxMExKN2lpRUJUaXJ0dFU5aDdSVXNDYUpHQnBQSStXU0FwNENkNzZo?= =?utf-8?B?MEttenJCRWZnNWZlb05mSlN6Y1VIL2U3dHpKZURQZldjcHRDU2JsNHQ2Nmcr?= =?utf-8?B?Vm56OEdxczBuWlZMd1o4ZHlraEl3TEc3dCs2UWxIWnRRZitjMHhKa2NkaDFo?= =?utf-8?B?d2tGZWpLYzM2NnZMN1hzWHNiRlk4VWF3R2RNMnlzV1FuOTNjUnlndGczL3JQ?= =?utf-8?B?TUxFV0RzTHp0c3RueXc4Qi9xbUFFN0dkemw4c3UvSTU3ajdjSHp3WjJ1eURv?= =?utf-8?B?aXJBdFRyYUlTeGo1YXlmRVAxZHNCTmtFZ0pramgzVXlueGlSRk9Da2FXOGxG?= =?utf-8?B?a1AwZmFBUTM4QUJMcUtmS0ZNRG13PT0=?= X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: ea9ed5f6-8902-48dc-d012-08ddbb049064 X-MS-Exchange-CrossTenant-AuthSource: PH0PR02MB7159.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2025 14:10:43.4093 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bb047546-786f-4de1-bd75-24e5b6f79043 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: XvcTYHxgBiokWchkUaZWTCQuOOnW8qG6F+B7qe3ZEyqiCpYrg67EnQHJqbbMEAOJqX4haMCMnRqGpyr3hfP3YjEAbz30EBdZkYLrC/Mg8uE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR02MB9087 X-Proofpoint-GUID: E50_GS9_IBDhagqGkUFeH-900eYJrOmG X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzA0MDEwNyBTYWx0ZWRfXxYnKFPHvRsfi RqZxqMKkyh16WKKRwyxWVRynbP8xghrjMijwxo4NJAlskkYLc3Q6b0YdDmEOF36yKfy1h07KQyk nOEGnZ2G2wYMw2WI5jR2mDuPxvMsEdQCNTkj5NIbfFIKDoJ+1LRXnJvXGOxyOwQvvMH6kojOrtQ n4ObAS7uRIxi2wsnB7LAWlXw0LL1IQUq00gwf7xGqK91F7zlLcYhi1RTwgOD/d5Fr4D8tLQj7fK eH2TOylyWaGC+hHOfNCHD1nRkyQz0DtTeEO9MY+6UF1wlVm8hTwBE/PA6RM0Pp1CueHs61yQZ03 Xl242bQfbk7DZRIQzDj95qec5G5Su2AgCPrXEpymBINO12LW488yxj2eiSNig/C0I9dN33blvvz HwjUfFzAKU1mYSiQNoVZn3dXlk0kG623UByF3PXIus+3ru/LVW0pb1Gj716dSepvxRGRbYqo X-Proofpoint-ORIG-GUID: E50_GS9_IBDhagqGkUFeH-900eYJrOmG X-Authority-Analysis: v=2.4 cv=V7190fni c=1 sm=1 tr=0 ts=6867e0e6 cx=c_pps a=GA26isaq87aKbCxmYTjF1A==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Wb1JkmetP80A:10 a=0kUYKlekyDsA:10 a=64Cc0HZtAAAA:8 a=KKAkSRfTAAAA:8 a=XL6wrB0Zc_gxRR1ig4QA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.7,FMLib:17.12.80.40 definitions=2025-07-04_05,2025-07-04_01,2025-03-28_01 X-Proofpoint-Spam-Reason: safe Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=148.163.151.68; envelope-from=mark.caveayland@nutanix.com; helo=mx0a-002c1b01.pphosted.com X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.218, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @nutanix.com) X-ZM-MESSAGEID: 1751638353968116600 NVDIMMs cannot be used by PCs from a pre-PCI era. Signed-off-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/i386/pc_piix.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 75226aa775..a6a35405ba 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -574,12 +574,6 @@ static void pc_init_isa(MachineState *machine) } } #endif - - if (machine->nvdimms_state->is_enabled) { - nvdimm_init_acpi_state(machine->nvdimms_state, system_io, - x86_nvdimm_acpi_dsmio, - x86ms->fw_cfg, OBJECT(pcms)); - } } #endif =20 --=20 2.43.0 From nobody Thu Dec 18 13:31:21 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=nutanix.com); dmarc=pass(p=none dis=none) header.from=nutanix.com ARC-Seal: i=2; a=rsa-sha256; t=1751638314; cv=pass; d=zohomail.com; s=zohoarc; b=kx6PPUMTQQuKmPVSYIXp0zilBMG1CnSXGBxYIufh51diqMmzZsiNX0KaqByAFUCa5khhbMwKCyiyqKhat86HAZmfvv6bAWbsxTqMWVsolML/aNGvfyN0eFPOhMDk8gyyS1iJdXYkirafvyUrz/S4owR50DsQY1SIgkAYoFXszI4= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1751638314; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=83pCADihsfBGAEwCDs6Ti1u2XveTZAv6qJcjLTQdTb8=; b=i23H817DXlpGsbGsXKPXW9NFEfocvIhRdBRSZoi5k9Gkg1hBFSBnuDbx3crUNLF2liVU9vnUMjXTQHbWTJOSGALfI8kXiK75AxcLaiXkVhR7peq3JX5qmhx52EC6Mzsl4NNdvVcXwvQd4AOWRbX28CUGMR3p7p/zH95IeyiHwig= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=nutanix.com); dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1751638314891942.8734046385013; Fri, 4 Jul 2025 07:11:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uXh8S-00011C-Ut; Fri, 04 Jul 2025 10:11:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uXh7y-0000qL-EZ for qemu-devel@nongnu.org; Fri, 04 Jul 2025 10:10:59 -0400 Received: from mx0a-002c1b01.pphosted.com ([148.163.151.68]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uXh7u-0004jm-SS for qemu-devel@nongnu.org; Fri, 04 Jul 2025 10:10:56 -0400 Received: from pps.filterd (m0127838.ppops.net [127.0.0.1]) by mx0a-002c1b01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 564BNITq023062; Fri, 4 Jul 2025 07:10:49 -0700 Received: from byapr05cu005.outbound.protection.outlook.com (mail-westusazon11020134.outbound.protection.outlook.com [52.101.85.134]) by mx0a-002c1b01.pphosted.com (PPS) with ESMTPS id 47n1x96a4j-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 04 Jul 2025 07:10:49 -0700 (PDT) Received: from PH0PR02MB7159.namprd02.prod.outlook.com (2603:10b6:510:16::8) by IA1PR02MB9087.namprd02.prod.outlook.com (2603:10b6:208:419::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.20; Fri, 4 Jul 2025 14:10:47 +0000 Received: from PH0PR02MB7159.namprd02.prod.outlook.com ([fe80::6cf9:b35c:b143:bb88]) by PH0PR02MB7159.namprd02.prod.outlook.com ([fe80::6cf9:b35c:b143:bb88%3]) with mapi id 15.20.8901.018; Fri, 4 Jul 2025 14:10:47 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nutanix.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= proofpoint20171006; bh=83pCADihsfBGAEwCDs6Ti1u2XveTZAv6qJcjLTQdT b8=; b=KXqUG1b2pTXKucyqEq6ra0TUIR/hkpoQLSm9VpMZHVLyfP7hl0x6G+tvO qs9MZnSMt3IPhQQeVZThu3WzkgtQcJgIKcykOIiyqvp9cxeND2+JQkR4iMqMw1/3 eWIKkpOT6E4lsIYe0TfPVFmUc4xRzTxWjmXmWfYUuHkAoPcrxef8XNyXU4O2pBL1 4IXz/+Blv4g0HNTPqqa6qWWT1jXi0Gl2PgWNlZtHB+bNQd+PlfLqJ6+7ihApuRIK 4NE+F5L/YmQfW/bcYLxssSK1BZzN4lX87OT7kh90aHI5Goik9dg+ePugo2+CMFtX 24oCS/2YTGJ+pgazIOOgwV8W1d/uA== ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=MvatoCKKxcbmZon58uZ8sRT0JjGw3SidTWHFmDZAhA4SGn7lQWgHlWAEz4i0XQ1oRBtPirnCeS6mqo7YgWDwFsS/qIwNigNcHZe0zEsIeyZ+Ryp/l1y0K5GMcquNFXoFzC2pv2z3VhFj1mfjzFi02My7YGz/irmkH0q3qwXaE+cbn/VUpVnNeeGTjq4D9N0cn/bznJW3Bnhmys/mJA9OAE/wEI5oqVKLj9CSPs4sZUuKLcLgpCCuH2e5/0KJ+xl6/scb7OADNtNIMVV1AwhHg4FHnyhPqWx1rI1yqENIJVwpOpFCv83KuMN6O1kmjpMD3wszn5VC/axaE+IcZwuDDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=83pCADihsfBGAEwCDs6Ti1u2XveTZAv6qJcjLTQdTb8=; b=e0OIXvvaZ64ndJ/2K7pEE5WyiEswpzxPspsVvfds3pk0w+zyqdpJV4bW91ahvUZ6Wp06JtUKysOeTsrBoT22sQftoFdTAK+EH9HyjVTYki9Y46VlendxQiOoOeBE6a5Il8OFAUCxS97q3ebPJ36Dk+Pmz4gt5wkbcWhcB79HHioHCBxsz/NUEgaYylk9b1aZOS82mDjih89s+8a6TLOjSqcq/sNhKum1SpCb4xbEfPBGQQ2kU/uTtpT6Q9FIqWad8sQ0CvudFt9rDv7YMd+T1AN/HO79CQD/1G5ZcxO35AZZy8jGaI1FV1V42XZ0qEcaau3m654hq6EKmSpyKb2bQA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nutanix.com; dmarc=pass action=none header.from=nutanix.com; dkim=pass header.d=nutanix.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nutanix.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=83pCADihsfBGAEwCDs6Ti1u2XveTZAv6qJcjLTQdTb8=; b=IxrxqzL1vnN9YLrC4/KZPxlCHXCwQUuspEmm/4xlW5eDOpMzAk2U7RNkWqcPe5FQp6gnqYl6pnIveWmQgQ5B1e7cJfhGx2py3SMQ5TqDeeOzZ6mpvId3Qm+hvvFsobXWvKxAdaVnLGbiZRr7+NOM3EYclSa3Tow6s/LvyWdU8/rfeG48Fxj3MbN8zhkR9Qf9HB4VUmAKyyfmb60/9n/j1ArOYPYJnqVB8+WdedIWFxsY1rkAr2aL9zXxYp1wGBNJ5HBo9a2qc2e9Kw9NGQvmg4S+TDY9eggdXlyrSaM2TxdSMgNgfbHaDAGeMZGHWRXM4Hyp9+GEGoDcxDBkd+6NRQ== From: Mark Cave-Ayland To: pbonzini@redhat.com, mst@redhat.com, marcel.apfelbaum@gmail.com, eduardo@habkost.net, imammedo@redhat.com, qemu-devel@nongnu.org Subject: [PATCH v3 07/14] hw/i386/pc_piix.c: simplify RAM size logic in pc_init_isa() Date: Fri, 4 Jul 2025 15:09:34 +0100 Message-ID: <20250704141018.674268-8-mark.caveayland@nutanix.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250704141018.674268-1-mark.caveayland@nutanix.com> References: <20250704141018.674268-1-mark.caveayland@nutanix.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM4PR0302CA0025.eurprd03.prod.outlook.com (2603:10a6:205:2::38) To PH0PR02MB7159.namprd02.prod.outlook.com (2603:10b6:510:16::8) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR02MB7159:EE_|IA1PR02MB9087:EE_ X-MS-Office365-Filtering-Correlation-Id: 01de785d-9d44-46a8-a611-08ddbb04927a x-proofpoint-crosstenant: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|10070799003|376014|366016|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?hK2W0sz2s8pbtKSeywCOMbQZ09wQjxuHUPop4uZ0ZQwt8kunJ6C/DfbI15GE?= =?us-ascii?Q?pbiqR8RB/X0wkMxyLjkLtpsCejTpX1Sj9H/hVy+jaSoDzyNtfgAu48CrUCTo?= =?us-ascii?Q?yTJEXn+/B60CgcFfSOklh5ugetsgphDCDEAzInwsLp48jpMQX2Gne3PXPRNl?= =?us-ascii?Q?oFVrfj4X0ImICIua+bn66y2sUtiGlWHGLTuZ7aMsEBbLMGbxpbzwYmAWVWAy?= =?us-ascii?Q?4q/xuEbff6Hp/Zvfre8YXthw0vCOKEKJ3NJEmPDembdNxbftlqiMBaQahzSR?= =?us-ascii?Q?t2vU5FaSzrHCRhMHSLdDmV4g3mrg2Dbd5wWVv9Lq30GvDDJHUtdwEQHBAcBO?= =?us-ascii?Q?5736rdx0haeH2SHxoppVEPuUxkMpbvsyUp3RwnAvGL0FgGEHbdYdvXev+oOv?= =?us-ascii?Q?9mShyDX92fYip3xDoPZzNbw3y2Scm81vDAT9xJPhdFI0ccNU0o+xqQ0Qa0m8?= =?us-ascii?Q?wvNMgdWZokThD3PhTsi85PnbvOlNUG2xcBCa0cn7torTdOY6gVrPk+clMsVq?= =?us-ascii?Q?v9A2+TTMbIyFT/QQP503UqKUlSlL23aoTIJ0TzCbMjmDxwzHBHr6I1ik6rkn?= =?us-ascii?Q?Qf2ygw/rTfyWFoTvG+3gZEilrXU83C1SrVSyIhZiGf+MpgKM2dz8Kqag3l/z?= =?us-ascii?Q?vECOHfPoS4GbpF+uFDIhjuUgEoBSPhcof7u7qI6nKlpWmjgxpl3fRtnPKwDc?= =?us-ascii?Q?+0L31eGHUMQqw1IzrtlhVE3pO2n+NiG1xoUnbP0AVpQssXS3+U6GHrTkAEXA?= =?us-ascii?Q?GocaNn+PZJ3rf2kQJupLSvfhc/sDtFGDGclHE2xA8pn2juzw/FbMhYZI3uWc?= =?us-ascii?Q?2wCLngWJg+Jlng+GOOwt9cYCWRBcCM2zKSeMAT9SpMmm1ZduQ8IhZnjP37S5?= =?us-ascii?Q?xJkmSY4R4C5bJTIR2kRgGLczDzQ746OuYokc8jZsi7AlaBysf6i2ja6/uCCa?= =?us-ascii?Q?/8fGFYe+PI+99cofaArvuW8P4+3BqSi+sMHo1uasQT+vebNpPnsjuCQmi5T0?= =?us-ascii?Q?KfDf5mPqWmxo1TrnaTG7PbqZQm4A47UeA2kPkBlNnZqujOThOAXOUbF/KYmJ?= =?us-ascii?Q?5Bzyp3WbEsH7TJlWQZ2jUF6KIEm0A4tPx8cDH39ZBqfa5ZWxbwViCbSWcJB8?= =?us-ascii?Q?AAOlchyw0zCDHlUbv40r3qPFPG2GPiVrtwxr51KNaaxzta5qSQv73PbsJiqz?= =?us-ascii?Q?o690YToDvAVAdLL2M4IPaIvAtsWFLaHFjPnAtWD4DbRCPV3rXYb6/FxlIn/4?= =?us-ascii?Q?D5Bf+qoVoqlTgF4nLNId/k7J318OJ33FHErPfYuHsXCHPIfaJRD5Vj4U3nP3?= =?us-ascii?Q?xW5rv5uenUFQT/l2PlihDOkhNPRyjC+nDaIMerWYrLCf0NAviNYzewqyiAYC?= =?us-ascii?Q?NJviSgmSOrdOKvKitWS/zZjNHOewqlqEobu1qNC6/1o1MmXUfLOJ0NgSOyVF?= =?us-ascii?Q?p+n7t3N+ygI=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR02MB7159.namprd02.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(10070799003)(376014)(366016)(1800799024); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Wsi7bD9PzY/yFtgXXn5t2Wwxd94/oUVmy0wmfwrK9T2Rv6HgnMWP19WCiXOz?= =?us-ascii?Q?+iGGYYIBrfwNhbaItIJs3FEhlfJCtxECbLlBpB0p8Af485wXmeFHteqkkcEA?= =?us-ascii?Q?GinJ7uo0UfoVFdZBFnKPmR52kNpAPEeaGPKbWcvtdwNl/pVx4KHZ6Ud1b49b?= =?us-ascii?Q?uyG3PMnCuo4LKSxaw6cMfBzuXJtdx/gM4+j5Y9UtkjX5DHV34+HUnIUAJz9l?= =?us-ascii?Q?pCsuPQa2ov63n1yZzRUq7w9paLi+JY0mtt/qNl03NDkyqPVq6FXn/30fGC+q?= =?us-ascii?Q?nC4zvw1Kq67WgLTXsshSCWlXulHkF5b1PhoefXwGXAP3GUfvxBfRRSVntJly?= =?us-ascii?Q?gxIM1C4tVg9No0c2ORj4uUOkybGki4HWk62wDucWYmy6Fx6dQUoUKrU/Z00V?= =?us-ascii?Q?TBPzjgLsHoRdbtiPCfucd8/vvSLWXAYRQ/6BfUif6XkirsyVjE8Zgo0ebBkb?= =?us-ascii?Q?G8nFpIotuHTZATxxnzSXwQSNF7sfQzY2wGtNtafFEJWLJfXvBNBjHtEuH0um?= =?us-ascii?Q?qxumf834y8j/JR2ecDKUKj2L5zCf7E4ww0cfeBU6N3Wlqc5zC8YXtD8u4C7l?= =?us-ascii?Q?1CcYB0KccnP/ZqunkoiMwUwC7+AHgQHJstnTeOVzoekdbCUCR91UuETEueSX?= =?us-ascii?Q?n4Q8XSGz+OdPMkAiqxnKfvEyscumYEuO6OEdogHeUcx7oYyvvvoLkU3DRW4u?= =?us-ascii?Q?nEtWV0b7TTlKKft8CNV8A1sq7SrfhqStPkHleIyFYqq0G7Swvs3NmRr+8vBk?= =?us-ascii?Q?vnIJPiQ/cyyyvWovH49km9qUp2CLdeIrjmJlYJ0wj2Y3bGH9jSjk3evSmLxO?= =?us-ascii?Q?QH0W6EDbV+A0ioSdw7PLvkCOcu6H9uA0a9OKrWWgF4r1++6XpgYtydQl5sKF?= =?us-ascii?Q?zj4/ijwU6RrY9DTSj+Z3kdkEM8sp/sdzlJMqLESljyEOkagC2gnhDvdJa2sO?= =?us-ascii?Q?2FRPLEXT6Xl0NoiUvLk3y6CzLL49XhRi4d1JyalHR3lvm3d+AWhT8XA+AvO9?= =?us-ascii?Q?x1MepLpA5ltDNLiFCGQAVG5opNzQtOCfdbO8hdxAJWPfQ+uztY2MYkSrjfOq?= =?us-ascii?Q?CCa2gP3wVylrFYrQM8zO4BOeLsjdtj7c6m9lHFT+kQBOOQOz6HSjvyeXxh5s?= =?us-ascii?Q?LdmEOMK+6YaII4l3tgU31iEEnQo8FKwLNeGkO3PwK2DZyhAWmbhYzGZOGRkS?= =?us-ascii?Q?3AOQOKKUX9mbFlu8+OoCbprjhsggoXEeuKvjofB1xd7t8rEsPF2mBTc+BBj4?= =?us-ascii?Q?+iEUigz6khYQFuNYPNO2bzFlhCHP7afMeeS+OgorN/B4TJ17EYuWtuxMLn4V?= =?us-ascii?Q?mmt5U+rmN/RNsp+s/qNJGe1opkn+HVxO8dPW39ITh9l19Xh+XXUf4cbSx5WE?= =?us-ascii?Q?rrn5Jn6tn+LrDPxdCo7KJ4MlrQ8RAzVqlQsf8twhAAz6SBls5XBXszJxpgG+?= =?us-ascii?Q?cViWQhFPHEFjs5LyuOho1tOR1Auy/bKQomuBM2v8hkrM8woWYSh/KtPef3nc?= =?us-ascii?Q?72k34KQmDC9R1ddLafwnm+ouqvKuw7RRJyRIq5SmTyPQYP4eguxwfI5wYNPX?= =?us-ascii?Q?pKcMSSn7nRG7jYZQueoU+YmVV5UBYfMWQeQggO3xx6S075mikITH8TJOT7xW?= =?us-ascii?Q?PDCAHN8FYweOPPJ4T+CcVur+4sp5NADQzHOEgiYfTdyG3hZPWYoM84ViNO18?= =?us-ascii?Q?Dq0xFw=3D=3D?= X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 01de785d-9d44-46a8-a611-08ddbb04927a X-MS-Exchange-CrossTenant-AuthSource: PH0PR02MB7159.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2025 14:10:47.1798 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bb047546-786f-4de1-bd75-24e5b6f79043 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: FTyeX8SCC3tpBc90JOL7J8vvHOQJJdTwn5fUa7UHWTJu3BZxcOb6oUtwBJAU9RPdMMxLxRC07Tnflzn6F/4mcmQKDOrvekQBfieF0+pKJPU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR02MB9087 X-Proofpoint-GUID: wGia42RkypkFc3zipYlKbZrfqxcJblrG X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzA0MDEwNyBTYWx0ZWRfX6fljznWgPMEQ 0jxszWqos7Fnf0hmkmKPOQEW9g49hOBtCSO5gTYw+PFIMml8VinrdhWSmpiL1Tf1D8r1LmYLhxh hRGe9nuL1yFhyYYla4NuX70JmUafvnR40cx03QbThMTmR+gzWqiH7CrtIXky1jzTClW727B/zg+ bJk63yftwfA2zTvWNnV9ejWJxg9Sxdb2HoUbdMYe4VUV/O2X27YXpau+IoMr5sgyJfUad5WJbXM L4h72o1vPuIDa5JYG0XTkQkf59Pz2y80qw8FKgWYwsN7KlyPVC4nf4zfZNZ5LwmKTq5bkZlWIGB I8+HKL6OC9Rv9G+cHKdg/p7CVEWUCO4rFMXUa5MvLGN2W6GDiTxG/eTaVqP1bMxg8/ekUYhfrXb ToUUnOaId/78gRiBzmsA+yiavDSuCYceqXVOlvIgJ6PuK2D2XdB5bbPd01gIA4MrPLAfEkPw X-Proofpoint-ORIG-GUID: wGia42RkypkFc3zipYlKbZrfqxcJblrG X-Authority-Analysis: v=2.4 cv=V7190fni c=1 sm=1 tr=0 ts=6867e0e9 cx=c_pps a=yr4orNQqY5sPVMLupZgypQ==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=Wb1JkmetP80A:10 a=0kUYKlekyDsA:10 a=64Cc0HZtAAAA:8 a=puX-rZ3iWx3qy-NnaecA:9 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.7,FMLib:17.12.80.40 definitions=2025-07-04_05,2025-07-04_01,2025-03-28_01 X-Proofpoint-Spam-Reason: safe Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=148.163.151.68; envelope-from=mark.caveayland@nutanix.com; helo=mx0a-002c1b01.pphosted.com X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.218, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @nutanix.com) X-ZM-MESSAGEID: 1751638315731116600 Content-Type: text/plain; charset="utf-8" All isapc machines must have 32-bit CPUs and so the RAM split logic can be = hardcoded accordingly. Signed-off-by: Mark Cave-Ayland --- hw/i386/pc_piix.c | 58 ++++------------------------------------------- 1 file changed, 4 insertions(+), 54 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index a6a35405ba..838ab9e15e 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -427,69 +427,19 @@ static void pc_init_isa(MachineState *machine) GSIState *gsi_state; MemoryRegion *ram_memory; MemoryRegion *rom_memory =3D system_memory; - ram_addr_t lowmem; uint64_t hole64_size =3D 0; =20 /* - * Calculate ram split, for memory below and above 4G. It's a bit - * complicated for backward compatibility reasons ... - * - * - Traditional split is 3.5G (lowmem =3D 0xe0000000). This is the - * default value for max_ram_below_4g now. - * - * - Then, to gigabyte align the memory, we move the split to 3G - * (lowmem =3D 0xc0000000). But only in case we have to split in - * the first place, i.e. ram_size is larger than (traditional) - * lowmem. And for new machine types (gigabyte_align =3D true) - * only, for live migration compatibility reasons. - * - * - Next the max-ram-below-4g option was added, which allowed to - * reduce lowmem to a smaller value, to allow a larger PCI I/O - * window below 4G. qemu doesn't enforce gigabyte alignment here, - * but prints a warning. - * - * - Finally max-ram-below-4g got updated to also allow raising lowme= m, - * so legacy non-PAE guests can get as much memory as possible in - * the 32bit address space below 4G. - * - * - Note that Xen has its own ram setup code in xen_ram_init(), - * called via xen_hvm_init_pc(). - * - * Examples: - * qemu -M pc-1.7 -m 4G (old default) -> 3584M low, 512M high - * qemu -M pc -m 4G (new default) -> 3072M low, 1024M high - * qemu -M pc,max-ram-below-4g=3D2G -m 4G -> 2048M low, 2048M h= igh - * qemu -M pc,max-ram-below-4g=3D4G -m 3968M -> 3968M low (=3D4G-1= 28M) + * There is no RAM split for the isapc machine */ if (xen_enabled()) { xen_hvm_init_pc(pcms, &ram_memory); } else { ram_memory =3D machine->ram; - if (!pcms->max_ram_below_4g) { - pcms->max_ram_below_4g =3D 0xe0000000; /* default: 3.5G */ - } - lowmem =3D pcms->max_ram_below_4g; - if (machine->ram_size >=3D pcms->max_ram_below_4g) { - if (pcmc->gigabyte_align) { - if (lowmem > 0xc0000000) { - lowmem =3D 0xc0000000; - } - if (lowmem & (1 * GiB - 1)) { - warn_report("Large machine and max_ram_below_4g " - "(%" PRIu64 ") not a multiple of 1G; " - "possible bad performance.", - pcms->max_ram_below_4g); - } - } - } =20 - if (machine->ram_size >=3D lowmem) { - x86ms->above_4g_mem_size =3D machine->ram_size - lowmem; - x86ms->below_4g_mem_size =3D lowmem; - } else { - x86ms->above_4g_mem_size =3D 0; - x86ms->below_4g_mem_size =3D machine->ram_size; - } + pcms->max_ram_below_4g =3D 0xe0000000; /* default: 3.5G */ + x86ms->above_4g_mem_size =3D 0; + x86ms->below_4g_mem_size =3D machine->ram_size; } =20 /* --=20 2.43.0 From nobody Thu Dec 18 13:31:22 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=nutanix.com); dmarc=pass(p=none dis=none) header.from=nutanix.com ARC-Seal: i=2; a=rsa-sha256; t=1751638319; cv=pass; d=zohomail.com; s=zohoarc; b=gAWswoArwMgANM7qZIqde/YvQH/90LH/rmiv04xOpdq47B9XNu73CpDGuRuLLlfIiySEaQKkF1Kvf7Aj1N0qWZBhCgKiLnk3aJpIphfyUwQ/ym1190g1kalZZf41yjD9h1LHMizNf2BjQ07obq96Md0IvKDSuhvTKLuvgAunUgk= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1751638319; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=4G9wT8zaI41zA7GIDM+pTIJYQLQ8dhW88Poi9NawK0Y=; b=gsNqUHBbtp5bPpy4s2trQK/bpk9XPBVzExGpwh+rW7hgLersF65ursQiVL2kykP8iVIjeirC7wk/XVovOdAlh6OKigdTP6Jn/a4Fpqp7jVvR960GZonI+figYy2vqxmGF/unOKiMsJsu/3erGSVko+kv1gJVOUo5XKKD3KKGZWo= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=nutanix.com); dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 175163831978112.213629610084581; Fri, 4 Jul 2025 07:11:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uXh8a-00014y-LY; Fri, 04 Jul 2025 10:11:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uXh80-0000rM-1y for qemu-devel@nongnu.org; Fri, 04 Jul 2025 10:11:00 -0400 Received: from mx0a-002c1b01.pphosted.com ([148.163.151.68]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uXh7w-0004kp-OW for qemu-devel@nongnu.org; Fri, 04 Jul 2025 10:10:59 -0400 Received: from pps.filterd (m0127839.ppops.net [127.0.0.1]) by mx0a-002c1b01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 564BwILL008977; Fri, 4 Jul 2025 07:10:53 -0700 Received: from ch4pr04cu002.outbound.protection.outlook.com (mail-northcentralusazon11023121.outbound.protection.outlook.com [40.107.201.121]) by mx0a-002c1b01.pphosted.com (PPS) with ESMTPS id 47mhw30fu6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 04 Jul 2025 07:10:53 -0700 (PDT) Received: from PH0PR02MB7159.namprd02.prod.outlook.com (2603:10b6:510:16::8) by IA1PR02MB9087.namprd02.prod.outlook.com (2603:10b6:208:419::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.20; Fri, 4 Jul 2025 14:10:51 +0000 Received: from PH0PR02MB7159.namprd02.prod.outlook.com ([fe80::6cf9:b35c:b143:bb88]) by PH0PR02MB7159.namprd02.prod.outlook.com ([fe80::6cf9:b35c:b143:bb88%3]) with mapi id 15.20.8901.018; Fri, 4 Jul 2025 14:10:51 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nutanix.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= proofpoint20171006; bh=4G9wT8zaI41zA7GIDM+pTIJYQLQ8dhW88Poi9NawK 0Y=; b=pzg3/7c1gQN8xfy038fL3LqwpMemsWg/4tAgbfxRB1eeX2iShrIqbn38c 0aVv6zLiaYpvZwvDQ8rf37k8H4zIzR34bb5TVix+kVfuQNPMPMWUWq/dZsVqIuY7 RGofWWx2A6lAxmKYK0z8v5ZvZ0TI1B2ZxCJW4qQSCSeLSIpa6IOezzinud/vrAiV AN/gv1kCJjrrUfcKT4hbUCEJRAdYVW7bUwcbfW99Oi/Rq8h4JKfXmcW/ROsr4z5S Gams48EJGq0vgxv7fo3j1CWHGwS1FOwxxTv8Get+h+mPXeFJ68HAdVTbP+U576I3 U49VpMVnCCdkdBRZlYHwNdZ2wh/XA== ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=i7bhN/Y6b7Bcyjloarg2Z5iTanySwPcJVD9969GjZfAO9ylo4c6o8uvbsHMvTcn+6fYFSLEtrFOHzexfFowZCJCa09FXN8LzqbMiFBglp1c+kpS2stE4MD65cJQf6RWRH9a7hFogKAdNCTMB7nZLy14orY0qiEQbfKnA0MtTSa381M8cRHUZpLQcLuJLebWOdsEB3x4a3rYL/T6fCuOP35gz4EbUwYStBrJiS3yHVIubZpiYTmuIKmZFKyentG0Dv+NdyCwI4VO2LtaMaWPgx/Lc7h+d7lzzK1Rplv4ZspgGRyJNvGq53J3CY86iJAux4oRMQ27TNavLDWEUW5tFSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=4G9wT8zaI41zA7GIDM+pTIJYQLQ8dhW88Poi9NawK0Y=; b=MaYNULHFdlQa32gqH1Bb14u3nf76lxv3DE8KYJ8D4XtZPK4J0+0eKX29N/RudrH2ia3AwBuMT+Eqm9GKm5+OBp/P/F9xJx2OIPKFC+OjCG60jiUM0WSgJMEbWl52I7KZq4slRuEzmqQHwwz6ihCNmGF+ed/kgH8hsXFRBhTXs8nFN/HP4Ch/UIJXt8qEN5wzRMaq5CtB6cUWx3PfV6uOEXiHLsKx4InC2OMj2TCaZrYzQf/6TsRwF6bEBobMfnxGj7JEt/N5dBWL3yaACmFkPUlXHU0Qj/0zPu7Th/KWeXM1iQkt/N9l1hxfPzybuyONG2SpdzNMqth/yfSXLfr0kg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nutanix.com; dmarc=pass action=none header.from=nutanix.com; dkim=pass header.d=nutanix.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nutanix.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4G9wT8zaI41zA7GIDM+pTIJYQLQ8dhW88Poi9NawK0Y=; b=kLL+dBBG9VCyKSnSI9sVjar/L4/lvtNeOp+NPYxdMp1UU4IXHYxgLxlfga8xq/4HMhwolSKttcuhKYCPHZ1szOPSebv59wJO/pfZdsV1FZL5yOI/gEuFDG8mKykmOoE0wHmPBDSv6pLl1H08DTU6Wuf7YqL6Q6eU/vj/4tvbzvtvDdsnidA0ZHUYmMTaEqcS9oW3ZbSKF9dfww9ar10ZcGV//rF7uMKYPNauuKG1WW1bds1yGrBJdqCmoQ1cDmdmKj+Z3pD17ihvsi0zTyC0JTMNptc+ipTSW0aWyj3+DxnlnWRFXOsVQDk7F7e5q6EwXQ2igkoJfYPmu8gW9YA68g== From: Mark Cave-Ayland To: pbonzini@redhat.com, mst@redhat.com, marcel.apfelbaum@gmail.com, eduardo@habkost.net, imammedo@redhat.com, qemu-devel@nongnu.org Subject: [PATCH v3 08/14] hw/i386/pc_piix.c: hardcode hole64_size to 0 in pc_init_isa() Date: Fri, 4 Jul 2025 15:09:35 +0100 Message-ID: <20250704141018.674268-9-mark.caveayland@nutanix.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250704141018.674268-1-mark.caveayland@nutanix.com> References: <20250704141018.674268-1-mark.caveayland@nutanix.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS4P250CA0029.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:5e3::19) To PH0PR02MB7159.namprd02.prod.outlook.com (2603:10b6:510:16::8) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR02MB7159:EE_|IA1PR02MB9087:EE_ X-MS-Office365-Filtering-Correlation-Id: 7fa8e809-fbf3-4291-0c5b-08ddbb04950c x-proofpoint-crosstenant: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|10070799003|376014|366016|1800799024; X-Microsoft-Antispam-Message-Info: =?utf-8?B?WGk1MzZXVkhHUTlzaXN3U1lKcnAxQ0w2SFdlN1crUWtGMmZvZ1Z6Y09rdGxP?= =?utf-8?B?ZGk0RDltNmJWOGZEOW1CcEFUR0FoRVVER2JOdHRFaUVzWVY5ZXdXTnU4S0Fa?= =?utf-8?B?ZHFpczg3TlE1TmsrUVowNlM5SFhPV1llRm9HYzR0UXlxSnFMdVVRWlcxRzNj?= =?utf-8?B?SkN4TTBkbzBnZ2FYRjRSZ1JScmhteXN2d0UxQWp1cFBaRVRra25nZWovTFR0?= =?utf-8?B?ZE5SNUlKUitrL1I1L1VhUzZieEZOaWk5R0VVQUszLzIvbTJnUVRMU2JrWHNn?= =?utf-8?B?cExXQWhIT1J6ZE9FNDM1ZHVJd1JtNlJyM1QyaFNod2s2KzY5YmlWeUJMYVQz?= =?utf-8?B?S3ZmTkFyYklYemhWbGN4UHVNNkZBVUpQY2c5S3YvYmRsbCtXT25lZlIvdU8z?= =?utf-8?B?RFdFM1FNeEZyRFE2aGIvenFwTGZtbmZDbVYrVjZNenJWUzR5dzhla0Y2WlRl?= =?utf-8?B?Vm85V2U0bmYwOUVTdWt2VVUrVWRwVWV2VXhtOU1HMm8wdXhjQzRuMnU0TDdr?= =?utf-8?B?bERLT3ZMVk9Db2ZXRVJNMmlHaHVheWQvbmVJWUc4UGJ4T1NrV1hsczk0NHFO?= =?utf-8?B?cy9IUmpQMHdCNEw0UDFEeldNQm0zUHpqVXFzRE9BMHFhOVdmaCtCQ21oL0lH?= =?utf-8?B?WGxVNjB3NjlLLzBTZVNkbWJTZmRBMThnT0lWVm5oYjhjSzBtWWFJQitETDd3?= =?utf-8?B?UTVOWUNlY1FOcmNSZkdQSzN2VUl0V0Z3YnFxMm9CMG1RbmYxZmVwbnM0M3Rr?= =?utf-8?B?bG84NFRVc1hXT1orc1ZHejk4ekRDZW04MmZDSEdTYUFyUUVsOXBrdU1PUGdk?= =?utf-8?B?bDN0R1I2VW8zTC9MaTF3N3lseGw5V0RZS3VqWDdCdSt0Rm9ZT3BOUzliZmQ5?= =?utf-8?B?UUowSDllM2lOYzlWbm1ZY0lrVGpVVFlJcllHNWVtUnZtazUyRStFaUVTQTNx?= =?utf-8?B?Vmw3SEJTUmMvN09EcFhoVTM2MlQzNzB6ZnA1OUVid2RnYmFDb2NwYkV4am9M?= =?utf-8?B?Y3hKaGtxUHZRYWZ0MlMvTmx2RE5tRFMva3dIMnY4Y0ZlZWNZbTFRZkZISk1M?= =?utf-8?B?OG9KNFlUdHFha3QzQ0JoMUU1TXRHNzF2dGVMY0ZNcVdUdUlWL2orQ3NJa3N2?= =?utf-8?B?REhjQjdhaGgybUZYTGVRK1czQUNBUFFCUkg5WGxhOGhBc1U4NkRHWlFLVzJk?= =?utf-8?B?Q0VDM2lUUXJTaUVNSU1TcWtkbFBiYmxQelhxVEk2MkxPbC9KbTluYk16d0NT?= =?utf-8?B?WjlPeTJ0YVo3TVA0dTBRUVFPdEZKdFZIODMrbkxSSGo5SEhmcUNQRENJaUND?= =?utf-8?B?eUtxclA3anhjQXdCMjJNVzFhdmdXcGs4cUhESG82aUN6UVhyd3V2MHZUd28z?= =?utf-8?B?OFM5WVZXWWRrNXE2bjFRLzJEZkNCQmxFN05OS2pGZmxjODZRK2ZGMTllVVNx?= =?utf-8?B?V28reEJxRTdoVC96clhYaVkrVkFTdXhDSEo1RzNLNkg3OTVncklGZS9MRzJm?= =?utf-8?B?aTRzWFgzTm4vWlJSMnNsWjV3enErbGdIN1gwd09ad2hvemJnbzFJUWluOVNp?= =?utf-8?B?ZWdBaXJ3K0hKVGRiREMvOXVXTTN0SWJuUTloWXk4cTRGY3BBMWVhbDljSURB?= =?utf-8?B?V3BVcEwyblQ4dHlZRzkvcTE4R2hwbU9nRUc2dDhUZExFSndCZ2pBNGdRM25Q?= =?utf-8?B?ZnhDaGlwS0FJSUpPcEVQT2ZySzJ5NVVPc09mRmVsRkhsL1RSZEhpd0pXdmxB?= =?utf-8?B?WUg0SzZnU2tHNVl1bi9vMHMzb002Mk5ka2s4aUMvZm9RUnZtL3oxL0dNK3Mv?= =?utf-8?B?bXZ3Q25BaEtycmt6WmxQUkY2Smoyd2JESjlBOUtUdXYxWDBUcHNValZWU1lZ?= =?utf-8?B?NnVpM0pvUDdEZnNJNWRaVWtoU1dXMGtSVFUxNXptb21Hamc9PQ==?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR02MB7159.namprd02.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(10070799003)(376014)(366016)(1800799024); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?aStxT0RrNzZRd3hKTlBSbHhKemQweHVYVnR6cUh1bW5xbHcyOWs0UXQxMkNJ?= =?utf-8?B?ekEyMTRNODFmOVN1WDk5RldlN1lzMzYxVW5FWVRSUG84VkYwc0hYUHpkVUNJ?= =?utf-8?B?M0lITDhLZUlPVHJyb0cvMHhjZm5iZWNyNWtsb1hGaS9YSXpFVWZoVkxwMGts?= =?utf-8?B?eHZZdk9GdzM4Y05YbWxlOFNyUWlCYXZINlY2U2F0cklGa3RZYjVXTytlUHla?= =?utf-8?B?T2RJQ0taUmpDa2srV0c5NEkwZ0VvTHplcnlhLzNvRjVDMFcwMlFLWUpPK3c3?= =?utf-8?B?SkMvS2J0Sk9ncE1LWE5nOGZiQXgxT2V0aFRwTWxuN0ZPZ1hCRkV2V1RpVldv?= =?utf-8?B?KytFMEY4bHZnMVpHVzdZRldCRkxKMjF4emhJN3FNc0pjV1RkRjVxMStiWkZO?= =?utf-8?B?bUF6NVg2b0NoRlNYeTFmUGhtOTRrQkx4TFdEY3FlejIvTW0yenVWb1AvOG1i?= =?utf-8?B?cDlsRWl6dXE5d3dqU1ZoRWpRSFF6N0FDSW9VNDRHL0JLYUljdUViZHI0NDA2?= =?utf-8?B?eFg3czlTd0tDSHdlWllMTlpublZjdHluNWNTVkozc0FYNjg4T0orZkdBS3Vu?= =?utf-8?B?eEFackM5WHFwaDU3THIxKzZIbFhBMmdVODczTTJMQnBnMW1Yc2FQbVh0cGU4?= =?utf-8?B?ME9YOXNycUFVRW5rOC9YN3RyOUJyTDVsY1dGN0RBN21YazYxRWN5TTFQZkxx?= =?utf-8?B?U1hyRTlmUndldHlBejY2b0FiYWxkb3VwR1ZBcjQyU0J6Zk5HbUphaEF6TDE5?= =?utf-8?B?enpYcGx2Vm1SbWptOEpyTnpodCtQNTEvaDZ5T2ZhbFRpRDlrSEZIOEhjSmVP?= =?utf-8?B?TUZCcEYzVGhWK2VmM3dFSVAyamF0b1cwSUQ5dzhUK1hTQ1NQMWpPY0k1R0dh?= =?utf-8?B?V3UzdUxrZnppQUZZT1EzeDZOc0ZhTE9tVGJRRFQrdUI3c2hwTjlRYnJHSXJT?= =?utf-8?B?NTZucitnVC9ZKzR6RlVscGNwM1FKRWxydlhkVUxlaHl1UC9BVVN3NXBoRDZh?= =?utf-8?B?QnVCNnJnUjQ3cXJPRGhkVUJXYS9BK2VnRkJObWlvRFc5c2VYbDdWOGw0cDlZ?= =?utf-8?B?aDVnUDA3aFZOc0R4bnJ5OGJXdVNIcU10dnBZeGx1YnU2TWREWFl3SkRxSzIw?= =?utf-8?B?TUJad25kYVRocTVjS0JObWZpZUtrRXNSS3RBOFZzQW5rb25NbTRPblBRblNW?= =?utf-8?B?TDBrbmZaK29GNUszcU5KUzBsRGpTRTJGekpXUGdUS1NReE5oQ2hiTFdTL2VC?= =?utf-8?B?RCtNekF4anllckZWUFQxbmdqKzVreis5Y1JHT1hJSisrMXdaVWdyRlBTc05z?= =?utf-8?B?RldFZWxQQm5JSU9ISExrZ3NpOTlyblV5OFBQckxrNGlpZTk2Z2RaK0tCUHo4?= =?utf-8?B?OHZFc3ZWN2lzSk9kSHh1dTljMEZjeHQ5YXRZYUhiSEMrdUtlMlFYSEdOZmpK?= =?utf-8?B?d3hTeC8xZTBLOFBmeDdZWmphV2V5NGwvS3o2OFphWVRneWJEOWRZT0l3MlRU?= =?utf-8?B?MVBpUmc4U2ZOME5DcHgwazJjYUtHNVhnV3RhQWc2SllkQkIxUUU4QUdNYmtN?= =?utf-8?B?S1pVajRWeTE3TXpjd25yUWZLVkc2ZVFDQldFMDJXUmI2Q05yZCtnOHROdVVa?= =?utf-8?B?a2QrUlYwTk9BQ2FoK1RjSk5GY0p6VGFjRGR2ZlRMTkd3d3EzVnkrVG1lY0U4?= =?utf-8?B?bUNLanhGMWMycHdZWE0xdnRmWFdFMjNuTmZzOENhbmRsaDZueGtZNnd1TnZ0?= =?utf-8?B?NlJPZ0hUeUY5V2h5cG1JMGZWVldHcHhQU1l1azNmNHNIblZ5VEYrMTlVUFYr?= =?utf-8?B?RExyNHVOaFVKaGlDV1hMdTNycmloYUJPY3BFd3crdmRZMEdIZ1I2SzNDOGR1?= =?utf-8?B?N2F2L2cwU01KdnZaQ0pLcjFUMXNCQlVrNTk0clR5L01id2FiUnVuVXJpaERB?= =?utf-8?B?bUZNSlVXdURPQ3JVcjB2c1pLK2pPTUFHWnVkdnliblpnTUdUMHY5QlNFbjlI?= =?utf-8?B?aWV1Z09QQkU4RGRxMlZJRVJhSDdlSE9YYnd4M3RzTytHSnpnN2JpSUxTdzd2?= =?utf-8?B?YW1TRHhFM1VnODZVSWJGMTRsSjdBVHJLY0h3dUFTZjlCZVB6aHNpVjBtM3Fz?= =?utf-8?B?SHN2ZmdqcmxwZ0hucTdwQThhTlEwSk95N0laaVhBOGQwVGVCNVZuQldMakxW?= =?utf-8?B?TUhoeW1Udmg5OXdmY2ZGeEZoWGRkc0JsZ1o4bHlxZGtVTE0yT3FBdFdKbUZp?= =?utf-8?B?aWkwUTMxc0RreGZ5R2h4dGFVdElBPT0=?= X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7fa8e809-fbf3-4291-0c5b-08ddbb04950c X-MS-Exchange-CrossTenant-AuthSource: PH0PR02MB7159.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2025 14:10:51.2070 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bb047546-786f-4de1-bd75-24e5b6f79043 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: hpagbbYSH6tUbEXDff2W2PndcTNzYo8OZp8Ac9XdeAUNszabYBgQnmm7XcaWAEIkAU/bdZYL0dV8Y8S+rCCUpBHv7PSmOtI5AqCsW/kKgbM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR02MB9087 X-Authority-Analysis: v=2.4 cv=ctGbk04i c=1 sm=1 tr=0 ts=6867e0ed cx=c_pps a=PUAjdIoGeqohqgimoigyeg==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Wb1JkmetP80A:10 a=0kUYKlekyDsA:10 a=64Cc0HZtAAAA:8 a=KKAkSRfTAAAA:8 a=aqeCdxMHYQgX1PSeTiMA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-ORIG-GUID: z5X-VdKwf9xUDYra3c-kNGwfX-6r2NZ5 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzA0MDEwNyBTYWx0ZWRfXwHz0iGGtM3ca kktOSn7yT1FunpmxjXrpDsx+Jd3HSPzmK6fzPPq/ueHKQl3+cDWGqXLUumZxwexCB9WpWkqn53F DSnCWDP14RB/7oWNoJL0bSNKaCmXaQIvlGzUHApuXKkoWAtSZ58ZDEJ9zZfAQ8HUn87DpJjP6Ps NhtpBodrq0XKHA4MEB0Rlxrxv4ohUnoP4neAuO8VhSIJXTDtfrZqZYWkGjUaA8aL1ciOxIkSuCP kuKyaQPnbJAmBLX6gjWuno2Ra7y24bb8Q3S066TBCLs+bKv8rGQNPuW5ACHdx4JUcETiGrhe0/O KimVF7U6a7+1z5CxoGgB5i47X8D2M4amzWGiOUwKMOMDsH43bda8ArH/UsDh7S0meJhJEiyGgN6 HnSOYIqzea6JZjX4msb5Xx6ZqfCur7M7KiPQLodnm167b9aK2g9LL0jsDdsxtQ4YY0iD27HE X-Proofpoint-GUID: z5X-VdKwf9xUDYra3c-kNGwfX-6r2NZ5 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.7,FMLib:17.12.80.40 definitions=2025-07-04_05,2025-07-04_01,2025-03-28_01 X-Proofpoint-Spam-Reason: safe Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=148.163.151.68; envelope-from=mark.caveayland@nutanix.com; helo=mx0a-002c1b01.pphosted.com X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.218, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @nutanix.com) X-ZM-MESSAGEID: 1751638321771116600 All isapc machines must have 32-bit CPUs and have no PCI 64-bit hole so it = can be hardcoded to 0. Signed-off-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/i386/pc_piix.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 838ab9e15e..f07ae6da26 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -427,7 +427,6 @@ static void pc_init_isa(MachineState *machine) GSIState *gsi_state; MemoryRegion *ram_memory; MemoryRegion *rom_memory =3D system_memory; - uint64_t hole64_size =3D 0; =20 /* * There is no RAM split for the isapc machine @@ -462,7 +461,7 @@ static void pc_init_isa(MachineState *machine) =20 /* allocate ram and load rom/bios */ if (!xen_enabled()) { - pc_memory_init(pcms, system_memory, rom_memory, hole64_size); + pc_memory_init(pcms, system_memory, rom_memory, 0); } else { assert(machine->ram_size =3D=3D x86ms->below_4g_mem_size + x86ms->above_4g_mem_size); --=20 2.43.0 From nobody Thu Dec 18 13:31:22 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=nutanix.com); dmarc=pass(p=none dis=none) header.from=nutanix.com ARC-Seal: i=2; a=rsa-sha256; t=1751638319; cv=pass; d=zohomail.com; s=zohoarc; b=Yoyo4WbEHQa6u/khJalDVEHQbKggmprthm8pcHbm7zjbzgqChBQDJGu1twhDDbr7ri483dEjsRdAURh6HpqpihDHs6tHISFAaJzikIV8luP69ZRUE6dgWC80PPgeFpPylKKnEDvwf8o+UrNOV8mXuyQa9tW4AAQYyvCeUUJI01k= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1751638319; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=JGpRDP3xb+T8f7LvARPgvVyW+AE4ornzzKbtZ9xNiVs=; b=XHLSwkeEDNuF5EPtIGEIALl81omJ9I31pG+5k5aAXV4fGCCSDgS1WHJ4WypbGDRAXP06xG/YXtZ3dsZ2Wpb3OmBfW6yS3FPZXScqqoCTgaweou6QXH1dzqVFaVop8D7sHsCbA988uKbATQDRuw/BHF7XoXuYxwLQoaGJZfsNxWs= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=nutanix.com); dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1751638319492154.13839372546056; Fri, 4 Jul 2025 07:11:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uXh8U-00013a-H0; Fri, 04 Jul 2025 10:11:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uXh82-0000sq-UZ for qemu-devel@nongnu.org; Fri, 04 Jul 2025 10:11:06 -0400 Received: from mx0a-002c1b01.pphosted.com ([148.163.151.68]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uXh80-0004ll-Rl for qemu-devel@nongnu.org; Fri, 04 Jul 2025 10:11:02 -0400 Received: from pps.filterd (m0127838.ppops.net [127.0.0.1]) by mx0a-002c1b01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 564BdGvH022207; Fri, 4 Jul 2025 07:10:57 -0700 Received: from ch4pr04cu002.outbound.protection.outlook.com (mail-northcentralusazon11023141.outbound.protection.outlook.com [40.107.201.141]) by mx0a-002c1b01.pphosted.com (PPS) with ESMTPS id 47n1x96a4m-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 04 Jul 2025 07:10:56 -0700 (PDT) Received: from PH0PR02MB7159.namprd02.prod.outlook.com (2603:10b6:510:16::8) by IA1PR02MB9087.namprd02.prod.outlook.com (2603:10b6:208:419::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.20; Fri, 4 Jul 2025 14:10:54 +0000 Received: from PH0PR02MB7159.namprd02.prod.outlook.com ([fe80::6cf9:b35c:b143:bb88]) by PH0PR02MB7159.namprd02.prod.outlook.com ([fe80::6cf9:b35c:b143:bb88%3]) with mapi id 15.20.8901.018; Fri, 4 Jul 2025 14:10:54 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nutanix.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= proofpoint20171006; bh=JGpRDP3xb+T8f7LvARPgvVyW+AE4ornzzKbtZ9xNi Vs=; b=Kb0hKWbBMVb9heq/E8D9/9Mvs+hgam+WbGGhEld0NK80G7aO8Wpt3Mvsr eMFQWvn7qYdYUjwQXe1xAndNkPc0cB0suUZ4MRtxI4QIlKBnMUtda0b/VGnFNeEw tpfsQlcVjZI38wFwVxaK0b2jTEa+XWOfDM5eSYcJPoMnwQPhSBfJ9SLgWdOqwOkd AMZ3ZrSKRkVeC/6tU5R7tEvYtZVwxCE9cRnc9GWgKQFZWzpzMMnyyK0MUBX7BM+O KZDlj1U4KHUTxxfYgRNi8Iq6CcASFigH+8GZMiEUkmQGSzstz1yzb3VbfjhMQZSA GGf3oIRrwuClaVwggcf9tePLoasAQ== ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=f/sbSZpTEhG7Cj2MBMLEgEp+ShewvURwe/W2BbD+lrCw3zlzTZAeFExQQEp4WFvvPvbXCKe+71zTHLHUQJecspHXgVl6tT2roXtry3ZLXayVZHYiK80gs4elA7GEtQRFi483BXZ2A1BNwJl1mBVTHCTqwb2cpbQ7cLN3qbRmVmpb8kN05nDTAVcG34fy/OoKSUALP5t3W2hVc3DEZm5Z3IPKBdO5iR5DroqZGE6Q3P6sUQbJOOJzLbXRVuOTMQItFlIFjsY1P+u9KrZ0xamGLriNZBjJQNB3zTnUOAvxScEAb7I37YiFHJRLTQqzdd2Fbyv2UcCbnFtdv5xo1XZPeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=JGpRDP3xb+T8f7LvARPgvVyW+AE4ornzzKbtZ9xNiVs=; b=UzdrZBIqvc0/kOo/yJSF+C4OnM24p9RLK495zkGQx/UMwX55ELWEhLuDhogNs0q8X9Cab/NdnjXDFxfGJNrXncLuy8t7DfFTbSXEANCTTSiotwZKTQjmxtDT4m1m7uiUeYNWW/qM49mVSePC7TU65MSB97PwaJ5tRB1zFGYmpIvIlXzn4S/nmfkwV31BJguRtmZfT1wXwq+7Pk5UIKcHijAdQ4cKvgoKU+MfebeJF94mu+e5FuC5JndL+OhslE2XdiOxoPsqN+/fayd4QDOPPgA3s3onf2bt76pito1NBSN5y9lg/PSzhajnGgayqQpOtyJnhnSFvLWTk2dYXeouug== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nutanix.com; dmarc=pass action=none header.from=nutanix.com; dkim=pass header.d=nutanix.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nutanix.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JGpRDP3xb+T8f7LvARPgvVyW+AE4ornzzKbtZ9xNiVs=; b=jipPoNAOEnt3dqqNtZfGXZEdD9eQ5ms7iVQoqo1Fry/XwCNyGO8HYdkNnwwEfu2wBxwDQV4rZLkgYSBOmLNIa5Tt1dRro/b7MQIxiIGmvb23/4yy8AfxL/tkK7hk3FzcvOq8zKUZDOb/epQfbVjr5Goszw6NT16Q88kg5kn7NyJ0rhQEQivMPfOSPru6vn4reF941Di7ZUG+M2Me/DSEUnm53gEdXwvRlwoYUaN/NTI+cCZJdNIO7jYhap6HCK4WvN5mGanhc76wpKJlF6HBWqI4d52664DeLbnyU1bqn8EOPExdFFDDtGDpy+YfUnDneu+Q/38VdbP9gaRfYxK07Q== From: Mark Cave-Ayland To: pbonzini@redhat.com, mst@redhat.com, marcel.apfelbaum@gmail.com, eduardo@habkost.net, imammedo@redhat.com, qemu-devel@nongnu.org Subject: [PATCH v3 09/14] hw/i386/pc_piix.c: remove pc_system_flash_cleanup_unused() from pc_init_isa() Date: Fri, 4 Jul 2025 15:09:36 +0100 Message-ID: <20250704141018.674268-10-mark.caveayland@nutanix.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250704141018.674268-1-mark.caveayland@nutanix.com> References: <20250704141018.674268-1-mark.caveayland@nutanix.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM0PR06CA0091.eurprd06.prod.outlook.com (2603:10a6:208:fa::32) To PH0PR02MB7159.namprd02.prod.outlook.com (2603:10b6:510:16::8) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR02MB7159:EE_|IA1PR02MB9087:EE_ X-MS-Office365-Filtering-Correlation-Id: 281f15ca-d653-4598-9800-08ddbb04972f x-proofpoint-crosstenant: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|10070799003|376014|366016|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?LaXEVcv95SZKRHc2Oqjqc8Dyp7P6NXN5bq3G4YE9gLFMgSf6+nQ6j4F6s3Ln?= =?us-ascii?Q?VNSYCDTArA3b8QYtBRcaoVZKuzOuteAUXgu5r/w8r2kWm+mTX8Z/ELT16U64?= =?us-ascii?Q?YJyTh4F6GtpnlY2+lJmkVELgwhy4+aDts/A5v4fn82lDKokXwI8mV/03nFk8?= =?us-ascii?Q?T0QYWRaOyvF/Dr/06hQQH4mCBzYSQJvkjLUFZ8d/59vEcl1M2EMlRTfcyNHs?= =?us-ascii?Q?cD2ltp/JnEuPWYdjihvmMNDCYmyYemRINWOnxJF+vRRKISz3U5Ko8k7mUvoY?= =?us-ascii?Q?WeDeOHbhjx9w9+aDVonTukusxOkyRBVfhHvKM0sLNIwJFa7GX3khZnD2iK7l?= =?us-ascii?Q?wTjTYkBnx5NgGR0H3EdmpTxjQwGj6MiS4GiGAnlXqOuYsn4YqNeSo7uWqCve?= =?us-ascii?Q?1/HvBrVqbdYvK57SU5VfhakKxZRpMhOhFs14mCrydquRSPdaiZocT7dHI0PM?= =?us-ascii?Q?uAT1mGIYNYsXLTlWWAlrEaYElWrMYWccPCa6FJ5ri42Mdi0SUlFY7dSYEPBH?= =?us-ascii?Q?3e+uVlGxxMYM1LQjwGytdUGMXjgVnSy7Et7Z5Myac5XkS5DT73gEmsCZoLgO?= =?us-ascii?Q?9I7nyLqf6yOWD9erfCKEJS+smMMYPHaEGl/i1OAmpbWevZdO8JmMHKnviD3P?= =?us-ascii?Q?U54AvqBk92qvedu1ERPLHRuDB+6PSxfLnUw+VpJ/KoKxFAaZM9RfcIxvmU+G?= =?us-ascii?Q?6uaqHS1VglYZCmz2xkrO98uMSZA0ziC+eFYWAK9ugULhsSJwHfES33n1BTYm?= =?us-ascii?Q?eKtFE4N9c+6Yog65hFkd7WKeXxa23Pr6qtr8jG648QjqvGmtP83dDlul4Moh?= =?us-ascii?Q?CTnM6mEZLRLGDZIoM+PA0oBlK+DBRqlDnxCK7s1ETqufcoCiE3FoZMebT/Cp?= =?us-ascii?Q?MWPJTtwBZRxnzU08ilyvUygc3VNCede5wxlVk3dVEaYVIH4iKSAX+OV+WohU?= =?us-ascii?Q?rchelM6zTN4O8B+wYKSBZ88jYN+QqiulANTjwdvQi12KUKMvdcwnKieTIR54?= =?us-ascii?Q?3Nfny30taGyElNUlprMaMCDdLQsZzjfk4vVYN4d7sHZPzOs3gjUthnFF7zdx?= =?us-ascii?Q?vBujjQTelwWHIBS9G7am+HvwsAznSWhQ8RrvtfNhcjNF+p9lWkjo4fQ1C1zo?= =?us-ascii?Q?HMnGeIS/aKtyd8yh2F676qEGIWb3ETtgNyU1WfiPv4VIxI/bCpMHCwR/YGYi?= =?us-ascii?Q?DC4og7dKblPBV5rfxHp2hQJdBlnAwNVWMbkTbIIsa/EaeooXRWK89UGV7pld?= =?us-ascii?Q?zJwUANqAl6UGp0JawXTzcOokIVSQalgItVFrsJjniOD9qJ28JCCxJdTqdZIj?= =?us-ascii?Q?4JtVU8b5DAZc2vzD02tm5/ljewwnrmAx40MLgg5JIiUUolny0gt3GwMxnQRY?= =?us-ascii?Q?aSv7aWvXtQCJPccKdjXdWwhotwAhdQEn61YwKet8fi7v0V52WnlJS3FgpShp?= =?us-ascii?Q?nSkdu3LmSKU=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR02MB7159.namprd02.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(10070799003)(376014)(366016)(1800799024); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?VXRToXCza6IJsxXHU3snWhfb4z5+KqGPVw+krC/hqn/2WS7EE00h/BvUEXLV?= =?us-ascii?Q?hW0Wj04rdjee5EdQWE/HN9lDZYDn6Aqo8cKxveMI84FaHo68fikvm5jKzUcG?= =?us-ascii?Q?sPzVBa9LNON5TJWteBag+IzQSCMoCccTaylmxSZEcHsDGgV3Kx+rYrNZd744?= =?us-ascii?Q?QPGLdheosysu2MBh4Sk3kHMlAfbK4AsXtDOfOSzTESEk2c85uZKLeDIzSAAf?= =?us-ascii?Q?F4EX7asMnRLXYLn9pbvTqfqjnNg/Lph1pXm34+Zi+rwBKOCR0797T9DzXFFz?= =?us-ascii?Q?ycTr55Jh074aonDfaIY7iN1CmoMJ/8OTvHOlyqLE6k0mmNt9SD8nUTgZ37Yd?= =?us-ascii?Q?8RGgaWje1yfPpM3lrVd1fa9uJRS3v8xTJwQRbRggGtb0J8xAqkt83BTWDNZE?= =?us-ascii?Q?/d9dIamihvPgwplGFPS44kCfnbQLRjG6P8ozMvx6TBguyMkENroxIITCmoWG?= =?us-ascii?Q?ueMv2UYOlqLSGMJPQdxvlqHjvIX7ttjSLSvWTe1o+jb3jevGMeTzqvP7QDc2?= =?us-ascii?Q?oydO6YFHdnGMzQsUxVCJZZr/Xm8W74EckIB4rVU/XJb46rkVINZrNGIC1oYF?= =?us-ascii?Q?YCUWlvh8igW0gn50t+vTycmBNUeK2/yVTXOUAxxs7It7wfnwJhRJlhk13S98?= =?us-ascii?Q?nDc6d/IyjR4msoQ80zvDmXApzpZo1tg39+kFZYVJJbmiVCy27E2tYU1PQr8R?= =?us-ascii?Q?Q1HeQh/UbHbVU3+RNAoVWcWVTAaraIEwisVJJi859Xgvqgi7jc545ydbr1iT?= =?us-ascii?Q?kRO0Ik6dASs+Z3Z1ZKLOS+LuKIOTkXzCYrYH3dQy86ST/HtbkU0Mg1flBMPR?= =?us-ascii?Q?OgnsqjVREngx3MKTjNd+dqr+LK0VuZMDZNNmi9ZsDcmRm29MyckUjRNGVxw5?= =?us-ascii?Q?/uLWRyGMdb5rnqNCqe0US/DPq1uFE+08z5IAZP4DoNKqLL17UPtsFu6Rcmxj?= =?us-ascii?Q?pr6Jz/TxFjTFddm/6MqI5ZecmrzrXcWJk5gUe5u3iB77maz903/uqOdUMuXn?= =?us-ascii?Q?lPArUg/WUyQWlfrraZpiDQjVU1N5XPzl0Ds81RfzXXKTVEhLhzjUrs69ELk4?= =?us-ascii?Q?cRMtUg07T8rhM0nPYgQlStHra8VcXDHpxT3YtXxJdBS+KhCL+IECgBnu7ULW?= =?us-ascii?Q?m9K1XV+VV/m+j//OVj2szeCNNRgYGN6EEdcIPR44PrHFKgbBUsgQ86Tmt+60?= =?us-ascii?Q?gF3sdfxAWR5rA++qu3nXVwFGmDEoe9BDod41+FeAcu4X6Y6Lr1tHuhiZ8+tg?= =?us-ascii?Q?UX7en3+ut/+inPsF/cXYewHvxWO5eMsM50Nk6ShjW5HAfnIrXoC0wVHw3nZT?= =?us-ascii?Q?O3OCEl5J0p/KyY5gxEhjBNyqwsjrK+XUtXwb+qsn20zxw0txn4YJjtbkFw+/?= =?us-ascii?Q?nY095MnD/RmYGpPnzKHVakTZrhwUDQBnFTAdfBA3xWrQgmzV5JOv+hl71rZ7?= =?us-ascii?Q?zeqCRLCQKFGa9CJCGnkCryC8avLXhpfKMAjKiZy6A1tF9KpMJtjbEiLXquEm?= =?us-ascii?Q?Og2iAukYP06lw/bZJfPp3uEYiA/nUyLdWjExZPNLk5PS49uuGNXiwBwyrdgn?= =?us-ascii?Q?Z6nHO8fpqan7CQhRUb0YRIiv/bdg3ObSfQUHa/51sZYrVOjmIP8n3KTVT+Zi?= =?us-ascii?Q?kDmAN0g6v/CDAv7v7drLpgO6t+lQcun+V45jVeT6SFc9RQNSm1AG+CgTeVBs?= =?us-ascii?Q?yNf4DQ=3D=3D?= X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 281f15ca-d653-4598-9800-08ddbb04972f X-MS-Exchange-CrossTenant-AuthSource: PH0PR02MB7159.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2025 14:10:54.8190 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bb047546-786f-4de1-bd75-24e5b6f79043 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 47Ar22lq8C/NlhmeQIAc0WMX5p7Db0CL+Ym+zxf6ObyB/ZUQMXTEUxg4KAugu6FUgGiV2cFWjTOFgLIexjjcF7JuurGaNWkS5LYVxoRO8Qk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR02MB9087 X-Proofpoint-GUID: xdq8vtHyFSvXg2DbEbw79CGaUO63atKW X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzA0MDEwNyBTYWx0ZWRfX9b9/rTVBLhYV bjwEXDfHqh/tz9Mu+TY2NBSFYFlQWbRVeG+su3nsDdO5blgk29ClLyLbzwQw2rXDsjgi4tIyd0t DbzVswuVf7QIgonR9/lMR1dwVU7O2RWsg8KylSMreOtVix0oAaD7mCJHtLIc/bz4EzMY5R1td1x iXHuLaehK63hOE7rkGRBY3MkbomE4MMQe0KgNMYAOhmdAcXlLAkxzwOgqnXD9zrzmxGdcz/M11/ i9g2dHIlc7SAtPteZMIQa9XBxKNsusuBPS267RRBfZ86UhvPD2jWKzwTvIdgryx9a96jwcDb7D3 D3mAvUDfVHNFamlT1/5I5PLHAHWQP5zfcb15jihzqNquBuHWt8TC1Mf+kaPXvO3U/cOinYaBObG 76RB9Z1T6hspXELF4vSckPCk0eAgLJjOTx3Oicr51A/KWOimtQl0eyqYbfmwzSJ0khL8K0Ue X-Proofpoint-ORIG-GUID: xdq8vtHyFSvXg2DbEbw79CGaUO63atKW X-Authority-Analysis: v=2.4 cv=V7190fni c=1 sm=1 tr=0 ts=6867e0f1 cx=c_pps a=Fw0ky2jKRwgN+c0iFCliFA==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=Wb1JkmetP80A:10 a=0kUYKlekyDsA:10 a=64Cc0HZtAAAA:8 a=mnHwG4yJ6Weg6gPWIr4A:9 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.7,FMLib:17.12.80.40 definitions=2025-07-04_05,2025-07-04_01,2025-03-28_01 X-Proofpoint-Spam-Reason: safe Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=148.163.151.68; envelope-from=mark.caveayland@nutanix.com; helo=mx0a-002c1b01.pphosted.com X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.218, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @nutanix.com) X-ZM-MESSAGEID: 1751638321776116600 Content-Type: text/plain; charset="utf-8" This function contains 'assert(PC_MACHINE_GET_CLASS(pcms)->pci_enabled)' an= d so we can safely assume that it should never be used for the isapc machine. Signed-off-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/i386/pc_piix.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index f07ae6da26..c3de1d830c 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -466,7 +466,6 @@ static void pc_init_isa(MachineState *machine) assert(machine->ram_size =3D=3D x86ms->below_4g_mem_size + x86ms->above_4g_mem_size); =20 - pc_system_flash_cleanup_unused(pcms); if (machine->kernel_filename !=3D NULL) { /* For xen HVM direct kernel boot, load linux here */ xen_load_linux(pcms); --=20 2.43.0 From nobody Thu Dec 18 13:31:22 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=nutanix.com); dmarc=pass(p=none dis=none) header.from=nutanix.com ARC-Seal: i=2; a=rsa-sha256; t=1751638576; cv=pass; d=zohomail.com; s=zohoarc; b=bnDbuLC0KWV3kx+lhK4w3rkvRITErv+gZq3lF/u93XsfRkyD6c85FXk55LAxVBixBiy8zdWWx9oi8y1E3HfYNKH5Jqbs3IeqFSBVlJRlG0gaXcAH3GkRgXO9nQXEuH1ELozhr7W0pufnWGlO73kkkL9uI/jzdUdUJe7OiACAHxw= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1751638576; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=YYbtmE1+GHQjnULpG/tr/Rcm50r9ACOgbDgPXFNfLW0=; b=PuPv/xURfYlE5bXVLzG65LOXS4KlfUjd5sf3BX2trfwagvInA4Guk+3zE1xBIQt1g/cZAWKns27pokJ/Fdp8rgZ0ETO++Wsq4JxG+7KkDqfp4axHjebNc470s9Tfd6K3LYkwavg1oNkhe58zySgexby/mhH4GiSRiu49Q44v0Z8= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=nutanix.com); dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1751638576519496.81589815967584; Fri, 4 Jul 2025 07:16:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uXh8u-0001Rh-A4; Fri, 04 Jul 2025 10:11:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uXh8A-0000ts-Rm for qemu-devel@nongnu.org; Fri, 04 Jul 2025 10:11:15 -0400 Received: from mx0a-002c1b01.pphosted.com ([148.163.151.68]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uXh85-0004mj-6A for qemu-devel@nongnu.org; Fri, 04 Jul 2025 10:11:09 -0400 Received: from pps.filterd (m0127839.ppops.net [127.0.0.1]) by mx0a-002c1b01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 564BwILM008977; Fri, 4 Jul 2025 07:11:01 -0700 Received: from bn1pr04cu002.outbound.protection.outlook.com (mail-eastus2azon11020081.outbound.protection.outlook.com [52.101.56.81]) by mx0a-002c1b01.pphosted.com (PPS) with ESMTPS id 47mhw30fua-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 04 Jul 2025 07:11:00 -0700 (PDT) Received: from PH0PR02MB7159.namprd02.prod.outlook.com (2603:10b6:510:16::8) by IA1PR02MB9087.namprd02.prod.outlook.com (2603:10b6:208:419::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.20; Fri, 4 Jul 2025 14:10:58 +0000 Received: from PH0PR02MB7159.namprd02.prod.outlook.com ([fe80::6cf9:b35c:b143:bb88]) by PH0PR02MB7159.namprd02.prod.outlook.com ([fe80::6cf9:b35c:b143:bb88%3]) with mapi id 15.20.8901.018; Fri, 4 Jul 2025 14:10:58 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nutanix.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= proofpoint20171006; bh=YYbtmE1+GHQjnULpG/tr/Rcm50r9ACOgbDgPXFNfL W0=; b=gUP1TWDBu//y1XyZCkUlgSkiid3XPB1aP/++Jr0kBnbhQBprJOKI5mne0 lVePKLfYwOvjsm0/AbJakWa/fSKpEIvXVvt5h24Q3CZpdZyDQ6+upnGRLXrtely1 yeFuOtzmewl6OclDcfB/vdqVfoKLPgveVFaxwTHIzKHhgfFqyQu4XN618qNAnAqH KPouDhb9fj0hW1L8gijocdLYZd/xNFZzwL4UFzr0YtM/ODqHswviU3LXT8hyyuLP NdFpZN9yNH4VmUZuN6/URFd0LBqUT+7GdmTygoDN2OuVF4MjzGs4Rpx4BoqD4sky kl2ugAwQaaAJjHWQPMXsVxrN2a3bg== ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ym0HgYMyPZIGDMpTiOb1DR5d7VD55p7ARL9GfAaDkmhStQ9WI46gpRnMBoPcc7e4zFTX3fyzt6LdEHTioMr55nusOT4Z/HV82rY+a+TSAsdFQ0+4CW098qK2lqh0Q603HSBKG61j1YGGc99jDveY7Dl+jZsl4/ZT47vjpghhMmbLgG0OAH4IcyqLL5Ma8DkU223t0k/DPjXGj3nt3FdVutCB5Akti2dXujrfsLfsyf5FUi8T+r/Ed62m1sFTqImUr2BQmdBve3B32VyMnx/2LZwOAVgFEH6km4G3syQfE/TKvk7JjwTY9kk0H+Z3MNQ3eDuZzUVXRTYW26+rVxnMug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=YYbtmE1+GHQjnULpG/tr/Rcm50r9ACOgbDgPXFNfLW0=; b=IufH5XD9THFzGt58odGCoOrtOfg/Zjqt3wjdpX08iF8RjSfdSgG3mmUReo3Hi/NPomcz01/6KhSF28Odh6Px002Tl1C7xUfML/TS4JQsWxYUNU9mB/CYDRT9PJSplfxsnJilbNzt/spwdGbQ1VFwlv4Vucu1VAzU71ytYKNBjEI2C9v06HZwumKMmVJtT4sdYhlN8H+RSlY/GkUQ8+zOGiIoaC4ulOAEIOZQjOAjVCQJqwHd5l+kw5xVSgMbeSPgtPwo7Ik//udeHPPs6s0560d0hg+ATAEJXRUYw1O8/srvYEbnft0GGo90h6EYoef8SPJtHdFlkjvWJ6qlFNkQ6w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nutanix.com; dmarc=pass action=none header.from=nutanix.com; dkim=pass header.d=nutanix.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nutanix.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YYbtmE1+GHQjnULpG/tr/Rcm50r9ACOgbDgPXFNfLW0=; b=dtYewxDxFuOTI1apzUNliOXZG1M3PUEefUUCeZs5RD7Jo1Tu0ToUwChp1OfhhH9NSwtKaGuWTtF/cwP8VYslYBpPIZc7ulNr2hoaiChpFizaJ/nVOUkZZrkzJ1lPl437Mvo+NyU97iv4Al27pKdLROC7EFlA8yRG6IdiSXk2nGQigEc6WieHMxlVKHC6De3x2Cho2i5v6p/30yhlGWF7odlpHMnie6KqcDKx4X+g1gqJ3wkT6VICctoNh1PKsl4lwTgTGcyoqPQ62iidvAYDSBKWj/tHfZ7OlFJqlbsDxbH4U3IjQSVxoYtutshFncc48w8y9aSlZkiYKaOuBsg/vg== From: Mark Cave-Ayland To: pbonzini@redhat.com, mst@redhat.com, marcel.apfelbaum@gmail.com, eduardo@habkost.net, imammedo@redhat.com, qemu-devel@nongnu.org Subject: [PATCH v3 10/14] hw/i386/pc_piix.c: always initialise ISA IDE drives in pc_init_isa() Date: Fri, 4 Jul 2025 15:09:37 +0100 Message-ID: <20250704141018.674268-11-mark.caveayland@nutanix.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250704141018.674268-1-mark.caveayland@nutanix.com> References: <20250704141018.674268-1-mark.caveayland@nutanix.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM0PR02CA0217.eurprd02.prod.outlook.com (2603:10a6:20b:28f::24) To PH0PR02MB7159.namprd02.prod.outlook.com (2603:10b6:510:16::8) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR02MB7159:EE_|IA1PR02MB9087:EE_ X-MS-Office365-Filtering-Correlation-Id: d6004e13-69b9-4ee9-2fa8-08ddbb049943 x-proofpoint-crosstenant: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|10070799003|376014|366016|1800799024; X-Microsoft-Antispam-Message-Info: =?utf-8?B?RWRBeWR6dWF3RVN3VkJwZkZXbkwzY3dJbUtHTUtaNHE0VkkrNkdZOU84THFw?= =?utf-8?B?eWtUMDhVVys5bzdRcUlQS3prZ1IvZXFzVU9IeThISnJJZmRBWkt3WU9kVFhQ?= =?utf-8?B?RkhJbkkwVWRGUHU5UkNhcUk0WjVMWHkwNmhlN0k1OGFOYXVTNG9NWitoRmRu?= =?utf-8?B?R2ltTFJ3MGF0Vmg3VjZTSzh4aWJENm5tQjBVbzZOS0NCYm51OFJaaGRnK1R4?= =?utf-8?B?Q09qdFRyMHNrcnJQa0M4aEVkemdoOVpyVEJZcXIvUzlqRnBlWnVOeHltclFn?= =?utf-8?B?SWtTSU9JMGhaMS9TNkRORGhmYzZjS0NFeC9YY1ZneWJWVUJSNFdtUWY1T1Fh?= =?utf-8?B?MGJpbGhvNWJnSEp2ZXUvdkNJanhacllScllhc0twYnJ4SWpJQVk2YVdGc04x?= =?utf-8?B?U1Q5N0hIVFFzUFQ1VTJaUDVUdTcyVmlGemZ4YUJvVnF6WWtxd2hxcXNtZUdM?= =?utf-8?B?dzFXUldRaW5IQjdmT2diSXBaQzk2MDdhajl0UVo2V1NyTjBWelNwWXo0elNl?= =?utf-8?B?bEJuczl5b0l4dDhPWU54QzBxUU5QemtzSVBWb092UCthRk9UNXJyRFFuY24v?= =?utf-8?B?QkFycGpybUl1WFdVQXZ6cVNBQ1Y4R2lURGhlY0M1MGgyWnRkeXI2YmwvVVpk?= =?utf-8?B?T05ubGRwVnU2RXhlRmlXbFd3cFNES1dGeVJrSWxzcFZYR3pHWlNpcmRxdXox?= =?utf-8?B?anYxbFFNdVZjUmE3dEw1OXJqYUNFWU1oTGh4Wjd1blF1K0xXYjErTVNXU0d5?= =?utf-8?B?VjgzUHBuaC9Rbm5mdEJka0tyUG1jV1RwQzhwY0t0VDVWWTQ1cnNKUGVLUm1j?= =?utf-8?B?S3Y4T1FrOVdnemhiZUNyd0xkRTdqM2h1cHlQc1Noemo2SkN4eHRuY21BMWNh?= =?utf-8?B?bHdsUWh1TlltT0FoQlNBNjBjd3dPRG1IeDcvNVZhdWdIUkhyT0pmN1NHSEx1?= =?utf-8?B?S3hVeFAzRzVaQ0FwQWJpSXduaWJNa1ZHNVlxNnhtY2lxUUpMeXR4bmw0MXZL?= =?utf-8?B?bnFWaEhEazAyNnY0KzhQbnBHSzJoeStFS3ZQSjU5R1VQN2g0OE4yQU82Y3NR?= =?utf-8?B?NHhHRjdNVHY0WDNHdEwrYi9CYzc0ckdMU2NzVnRZWXpWQVVxOEkvbVRqZ3ZO?= =?utf-8?B?VFJWRUJuS0taSXY0NWo0L3VHRUViNkxjMDc5YWsyR3JyVWUyNEtiamlOdVF3?= =?utf-8?B?Qk1UY1NxV0VpRVVsMHNhV0MxUDYraEZmdFM5Sm9jL2tzYmk4VjVNdGM3NDNW?= =?utf-8?B?ZVg5c1FuaVI5b3V4aDNLNTRPSGJvNWh1Q1htMmdyQmFXVDNoNjhDZE5LVVZL?= =?utf-8?B?OXVjYzZIOEJubDJpcG1Hdno4RlVabCtOWkxPSStpVlVWVkh4NkcwNUhnbTJn?= =?utf-8?B?a2dhdTJIYXE0VnhGZVdtNzFGM01YRDBIbXNlU3I3d3M5V3FNcFNBU1FmMFBM?= =?utf-8?B?V1pGbkNJbUoybUVqdTNBS09WUzRtZnJiQUx5SHM3aHNTdldlYlpwM0p0QldR?= =?utf-8?B?WmJOSmJJQitCZGFFZkpSbGFVUm44SlFJK01mYktZdHU3R0tCem54ZVQ3aWRi?= =?utf-8?B?UHppZXU0WkVnZ1lRMVpSZjIwdFNCYzBwZkhzeXkvR3ZWQXFzTWVOZXY4OWxh?= =?utf-8?B?NEhjbEFBdWpXcU81cVZOamJPQm8vT2R6aWYyRjdMR3hqdjRPdGxad1BjNk9T?= =?utf-8?B?blZldUZEMlZBcFVwQ2c3YmU4TlUyK1J2elAxRmJNbWxJL1JJMG90RGJHUzEx?= =?utf-8?B?UlAwNVpPaUkvVEIvL3lvQzYzWm90dHlEaHI0MENyM3NKWm1waE5DQXRwSVFi?= =?utf-8?B?bjVhTXZhbjZ2UzFOdmlhTGVhRWx5VVo5VXBZYlNsRTB2M2I1cFBka0FHdzRY?= =?utf-8?B?MmZXdStFbHJ5bm94dmRvWWJzaE5kcFR2WFR5UDQ1czlycnpjMzhLUERFVFo4?= =?utf-8?Q?yVoRT+dfZOM=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR02MB7159.namprd02.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(10070799003)(376014)(366016)(1800799024); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?c29SaXJxYTE2OXpKakM1TWNvQTBETFNLdmpvUzl6M2htZEsrR0trWndWQ2JG?= =?utf-8?B?STg2WkNQZDlLMlp6a1k0a0VFQ25zUHY1NysxVjVJL3d6cFNsVm9CZ2VlLzBL?= =?utf-8?B?Nk1CV0wrSG9EdzBHVDN6bmRveHpEcGlRWkhsdzBvaXBlNk5GYW94L3cxUUtx?= =?utf-8?B?WXVCNGZWRGV2UnJTUFBVaFhhTHJjckJJcnZmM3lOdXlXNGdyL0JqSjUvdkVD?= =?utf-8?B?VFFXK1U0TGxPd1VPQzArUGZ5TmErSmF0Z1BsTVZ4aW96cTQ4cWFVU3RKM28r?= =?utf-8?B?d2VLaTVtQnFJR1Vkd0p0N2pQV0FVMzJKYWZoRkY1QzFhWk4wQ25SUWhGVGIy?= =?utf-8?B?Smhhd3h5N3JtRnhLRTJlWDV0RmtudEJKZlRlS1Y3UVllZnlIYllXNndxZ3Er?= =?utf-8?B?R0EwRUEwS0lnaGR0bE1yQW12VjlFTExrcG9YbDFHWUJ6MndzNkM1QnhaTGRN?= =?utf-8?B?WUliMHplWXNneHFYTVBjTTNUMFRBRCtUalFlL0VmTnB1Y2VNMmpGdXl0YXZO?= =?utf-8?B?YUM2ZTc1L2VKVFJRaTl0RjluVXFFaERuN3BuZ3VrSWVtUFQrR09Ucmd2YThU?= =?utf-8?B?c0xnYUZ6MVpqaEpyVlBCYzdjN1F2bzExUW14RWptUE92dDRWMStjMUlxT09T?= =?utf-8?B?MkJzSGkxOHhpN0VuV2JxSVlOeU1kc0hHUEMyd216NGgvU0hoVXkzaWtSc3Ey?= =?utf-8?B?ZTh4WFhZWWR1R3YzWWlnVy9MZWYxNWJUbWJhRk9YY2dia1g0TE41UTdpUVNn?= =?utf-8?B?ditNeUk3dTVXdmJoN3hnOEFtL0Zqa28vMmh6Vlc0N3pVS3JKOEpiMGlsT20y?= =?utf-8?B?bDh1OHc1cUxKZXROcGhSOG9LeGVnR2pTUnRldndCRnZSaTkxRnZ2c1hpUVN4?= =?utf-8?B?OTFyakVwcyt1c3JyQldaa1hZQk5sMWEzOHZmZFB4ZlpmT0ZqOXdMQTI0ZUpX?= =?utf-8?B?ZnFpcEZFVmdOSklteU9zbXdCK1F1Y1I0eVdnQWZqalVsNDAzR3M3WE1RZkp5?= =?utf-8?B?MDBnNkpSdllUMTEreTFKVGZERUtISW9BZkhLUzRVWkFKNjZiU2JUN0hEczZL?= =?utf-8?B?K3ZGaklXdlB6bzVoVVVMUU5vNTZTaEdFYzhKNlJMajd3V3h0UDJoVFNqNGFt?= =?utf-8?B?S25nYUVEM3RxUjQyNk1XZ1duczA4VWdEcjB3ZXhRVFBiVG5MMHg5bzd3WDBk?= =?utf-8?B?aTY2ZzZiUnFnbTU4RktMNys4YXdjc2Q1ekRZbWJEajM4N09FMkFoRS8zQUc2?= =?utf-8?B?LzVlTE5oRHgvTVNXZFlGTGN5MHk3K0MwUWVLem1KdG9Ebnp0SlgzNXpRM0l3?= =?utf-8?B?dXp1QnpuTWRXdXZvTWw0dDE2RnpVMnNRVEg2MzM5dkVEa0hoakdtT0Y1UjZ1?= =?utf-8?B?cmlpMXR3dkVidnNCWU9DS3lKZ2JQdlZVSHMrNk01WHRzbEhYTnAyeCtIVy9R?= =?utf-8?B?dkNRQ2doRDk2TTk2UGdJbGMvUmNiQkpjWDlKYjlBbGdnd25yOVNHTFcwR1J6?= =?utf-8?B?ejVwM25yNHRLMVBvbERmR1JYYTl3b2Y1RTA1aUNLRmdpeVFRT3J1eVpYRnFL?= =?utf-8?B?TFNlWWd4Y3FuNlBPeHRUVEhOK1pnZGg5dW5GNTdJRzNPdng1YVErQUx5Y3BF?= =?utf-8?B?UU8vTnczMG5jWHpCbWJ1QWhRdzY2UUdIOEZmQlllemp5c0xReHVzQXBHNXpU?= =?utf-8?B?OHBlb2dieWRuRVdNcjRjaU56djh3QVNyTHpkcmtYZ0ErTGV1Ti9Sb0lIS3l4?= =?utf-8?B?VkdVQkRpSlZhWm1lNVBVaklVbkxkT0lDWXdxbWk5VFJ0Q1dtUDVaRmxjRzM1?= =?utf-8?B?S2k2WGNncjlkRDdKcC9CNHRYcktIakpobzdUU3YwL0p1Z0JCYS9EemFha0Fm?= =?utf-8?B?ZENYMnBORXZpY0xjWm5hY09OS094VHVJTzBXbitiWHAxNGQvV3ZDQU9hQTlG?= =?utf-8?B?SnZkd2ZpV1BaaC96M1dGbDVValFGaU95N0M0cjhxVUh2R3lmbGk2b3g2L1Bm?= =?utf-8?B?amQxQzRQeldOeHd6Ym14V3FCallLelkzeTkxOVp0VGwzWnk1L3RCZExDRzdJ?= =?utf-8?B?d3oxUDdrTXFpRnlEVU1lVUViN1FWMjczMEU0SmZ2MXJpYVBZSFBqdS9GRWo3?= =?utf-8?B?NGZWWGFvNVRNWFYrM1JQY1JGdHNmWlZac3UrVkxYSFM1MU83dTRVcGtnYzht?= =?utf-8?B?UERJNWpCeGFqRWpxcHVWaEl5YnpkTFh2Vld4VW9aNExHc0VnWUt2bDlLY0Jh?= =?utf-8?B?ODV5anYvMmJzdXN3Zk9DSVVrWktnPT0=?= X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: d6004e13-69b9-4ee9-2fa8-08ddbb049943 X-MS-Exchange-CrossTenant-AuthSource: PH0PR02MB7159.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2025 14:10:58.3191 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bb047546-786f-4de1-bd75-24e5b6f79043 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: bIn6/KhpGi3F8ymM61HySrfIelB/QJUJfGPHqiU8bZ8xOl/NAcCh+tZ9AnlpL3f004GN6D4t9u/J09B6T55vbjOe1iEZxsm92pCO91uH+Bc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR02MB9087 X-Authority-Analysis: v=2.4 cv=ctGbk04i c=1 sm=1 tr=0 ts=6867e0f4 cx=c_pps a=H8KQetTyUVx2NtQIo3bL5Q==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Wb1JkmetP80A:10 a=0kUYKlekyDsA:10 a=64Cc0HZtAAAA:8 a=KKAkSRfTAAAA:8 a=qN5ve3sCTOSH2ZO3jx4A:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-ORIG-GUID: gvwMRx5JKswEcl1QvvHj1hBoVB14ydao X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzA0MDEwNyBTYWx0ZWRfX4MHx59CSg3jV TbNEqzRYV/iAdcpIGXq+PiWT7qb/BHs7/+DXRD09mM53GCfYcAIbZI/32WmRI65W/FNktDqWicH xkgQh6LIk4Pgsg1j/YFa5AvIdYAA9lYMHKTU3llNXUJ1TjT9qt97CIlRpJfT6QgQ9BEl1pKi2AK MwR7QukSR6zqXtARSn8gPtKqddQaD1DIo06xLKTFS9khSJgukybBi+iXqQb+BITdhsy8Jig5Q02 rqFc850tljAMDwO/tBHFYIRl8LaUUJ02BIe0pEhruUfduC+edvSBXAXfLIHCLVk+S/HIw9YHy2X x+TNGdeqI7ltHmoT58MBeeWLFDZjQePp2wmfhm4yEA7jwnszAjYgzVh1FcWp1UsPloAOI6OqHAp X4dYMYO7r9/gA73b9dJNYg1N8EFIjQwWCq4tDKCTXRJTRsgIDFrhkjBZ1oyUr0rkF9WqDIyT X-Proofpoint-GUID: gvwMRx5JKswEcl1QvvHj1hBoVB14ydao X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.7,FMLib:17.12.80.40 definitions=2025-07-04_05,2025-07-04_01,2025-03-28_01 X-Proofpoint-Spam-Reason: safe Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=148.163.151.68; envelope-from=mark.caveayland@nutanix.com; helo=mx0a-002c1b01.pphosted.com X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.218, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, T_SPF_TEMPERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @nutanix.com) X-ZM-MESSAGEID: 1751638578916116600 By definition an isapc machine must always use ISA IDE drives so ensure tha= t they are always enabled. At the same time also remove the surrounding CONFIG_IDE= _ISA define since it will be enabled via the ISAPC Kconfig. Signed-off-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/i386/pc_piix.c | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index c3de1d830c..571a8d1ca6 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -427,6 +427,8 @@ static void pc_init_isa(MachineState *machine) GSIState *gsi_state; MemoryRegion *ram_memory; MemoryRegion *rom_memory =3D system_memory; + DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; + int i; =20 /* * There is no RAM split for the isapc machine @@ -501,27 +503,20 @@ static void pc_init_isa(MachineState *machine) =20 pc_nic_init(pcmc, isa_bus, pcms->pcibus); =20 -#ifdef CONFIG_IDE_ISA - if (!pcmc->pci_enabled) { - DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; - int i; - - ide_drive_get(hd, ARRAY_SIZE(hd)); - for (i =3D 0; i < MAX_IDE_BUS; i++) { - ISADevice *dev; - char busname[] =3D "ide.0"; - dev =3D isa_ide_init(isa_bus, ide_iobase[i], ide_iobase2[i], - ide_irq[i], - hd[MAX_IDE_DEVS * i], hd[MAX_IDE_DEVS * i += 1]); - /* - * The ide bus name is ide.0 for the first bus and ide.1 for t= he - * second one. - */ - busname[4] =3D '0' + i; - pcms->idebus[i] =3D qdev_get_child_bus(DEVICE(dev), busname); - } + ide_drive_get(hd, ARRAY_SIZE(hd)); + for (i =3D 0; i < MAX_IDE_BUS; i++) { + ISADevice *dev; + char busname[] =3D "ide.0"; + dev =3D isa_ide_init(isa_bus, ide_iobase[i], ide_iobase2[i], + ide_irq[i], + hd[MAX_IDE_DEVS * i], hd[MAX_IDE_DEVS * i + 1]= ); + /* + * The ide bus name is ide.0 for the first bus and ide.1 for the + * second one. + */ + busname[4] =3D '0' + i; + pcms->idebus[i] =3D qdev_get_child_bus(DEVICE(dev), busname); } -#endif } #endif =20 --=20 2.43.0 From nobody Thu Dec 18 13:31:22 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=nutanix.com); dmarc=pass(p=none dis=none) header.from=nutanix.com ARC-Seal: i=2; a=rsa-sha256; t=1751638371; cv=pass; d=zohomail.com; s=zohoarc; b=BuRR/5GxjqpT3UDpLqQHnbljHEOHZUqFVTxcqekTyCgwuErJZSyH5Wz4Dmlyk8cXBL5oDON93Qlbb/tBMqAJb+9zUHmsXYnMtLUORa1GLTtwbqTgyOY8xFJ3sCuu3TsbYbbdZvx41l/0eELX9wRwLm8BOmgWHcFYFtHMjtcmJMA= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1751638371; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=A0b/3vt0mwI+1nONBoXxMotx62P0BHSk+Vg8qHQR7LQ=; b=Ubqe6sWC7XETWlln6l7HaCSpMBiYcYbTXeBic1VkBysH3sCPTv0AfgYoZggdu0GR2PjPyXCxw/351mRNEkBcxevDANl6F9EJK3S0or2QqFx0eikdUtR6mN//lS1LbRk15Zq6ib+p4PKoogYScLu9wg49sK1+b+rcHLwt5W51s9Y= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=nutanix.com); dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1751638371755742.6013068983619; Fri, 4 Jul 2025 07:12:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uXh9C-00028k-Hp; Fri, 04 Jul 2025 10:12:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uXh8C-0000tw-Fr for qemu-devel@nongnu.org; Fri, 04 Jul 2025 10:11:18 -0400 Received: from mx0b-002c1b01.pphosted.com ([148.163.155.12]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uXh88-0004nO-Gs for qemu-devel@nongnu.org; Fri, 04 Jul 2025 10:11:11 -0400 Received: from pps.filterd (m0127842.ppops.net [127.0.0.1]) by mx0b-002c1b01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 564BVMZG009055; Fri, 4 Jul 2025 07:11:05 -0700 Received: from byapr05cu005.outbound.protection.outlook.com (mail-westusazon11020122.outbound.protection.outlook.com [52.101.85.122]) by mx0b-002c1b01.pphosted.com (PPS) with ESMTPS id 47nqmnuesj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 04 Jul 2025 07:11:04 -0700 (PDT) Received: from PH0PR02MB7159.namprd02.prod.outlook.com (2603:10b6:510:16::8) by IA1PR02MB9087.namprd02.prod.outlook.com (2603:10b6:208:419::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.20; Fri, 4 Jul 2025 14:11:02 +0000 Received: from PH0PR02MB7159.namprd02.prod.outlook.com ([fe80::6cf9:b35c:b143:bb88]) by PH0PR02MB7159.namprd02.prod.outlook.com ([fe80::6cf9:b35c:b143:bb88%3]) with mapi id 15.20.8901.018; Fri, 4 Jul 2025 14:11:02 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nutanix.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= proofpoint20171006; bh=A0b/3vt0mwI+1nONBoXxMotx62P0BHSk+Vg8qHQR7 LQ=; b=qIOrglv52HGxd56se/f1LunAxbIYijcS4Xz9MprYmKq23iv4mpPNhNcK7 Vo+3zB3tc5d91LGRnhczWA6sta7+UEGHieOxGcnGHzFI9k6IqRFmanEmZwKXpWaF rkUyTiWgv6CruEEF7zx/H0zUfe7BzYGISFu60EFM2dmXbOf127maHmFeQOx7jBdb ImZLhqefRUChZtcqBW3ltB2O+Hxw+IqV/k+HZ44rnPGYqT6t+Wxdp6pLuNVp23Zk MmDQVWjlIr6knEyhS3eDo4phmByYDquhII24k7PULgT8nMf7IAALb9VEZkmHIND+ 4wwHC+aAy9r19MlA6LgK6mWTwUmmA== ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=zDXHW93xeY8DXIf3WeNJhO7Z+IRGaObRGTKGAwD0nF3Ph6OtTft+i9rA8CqYm9jrpByi0lgc9wF/HUPnIMHehPtobDNdBRghEKrrPUmCFdYbjyOtR+AjwIU3YZ+kynsNXZ6a2vrLjl2FUmNqHLxF69CddADzHVTHyT+LxTANxuBBBRRoDkM6saldie1rfk2SaUbafYZK5/8TERX9DHoMaV/GDzJ8iTw05UDzaQOYkS1Hp2HE9CRaOhuMVDd0qH9pjK0xDTNHlDnRbvbWpi81WqQZlZy2tB4oMcC5KyLx2LurI4EeypEO5qm0esRAdAMa3nHv59rDVsS5K9WwIr0pnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=A0b/3vt0mwI+1nONBoXxMotx62P0BHSk+Vg8qHQR7LQ=; b=nc7ZfoUDxM2wxxTT6ThKiokk0Ozm+3FKFeY8zPuJJFcwNtH7sH2nVe6vePk0gUnl3NNR8RSfvKviQnUQmFEAXegAu87O+Yu12X+c/IYqQayHlLFosfJXDEbm+8l3MRldnOMRmpCbh564xgS/k4Q/gyTN+8vvl4AFbJs3E32z4qpsotfFqZUfXHlGdLMPjNuYzcV81LjrE2IBYqi83Z9a8jm2tzr1EK1vk2j6Psa3zGD+y8DBfjmc1BSFmkMLTUO83WpNtaZGT5+6vM0VAFvq6aazKb1Stbjui43ssRMnX0LsaW1ebGnnv2nUDFhwy/sKb+/3xQI817KUQcDia36rDQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nutanix.com; dmarc=pass action=none header.from=nutanix.com; dkim=pass header.d=nutanix.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nutanix.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=A0b/3vt0mwI+1nONBoXxMotx62P0BHSk+Vg8qHQR7LQ=; b=JUQhiI7PQCY5br8Ewao/xyKoEJiVooG80RiABAj3aThB9XGHMMX7QISSd6SmKDWb+NGBTSWeZuQKVp3yI0uLa8bnOiKDQqjdItbdltsfRC5Pr4g/11HU+B70HaoOqYzIhFUcXRkf3xWeNT1C1SYqakVKB0xtsk6M9cvHvq03UcHxjQ6xmdCkvYE6sE3s+JBhZrZJPQRdGrPR8pkUIUmbIu91LmQiI589cbdmSXSQhNrZeDzguCxaizxGWYev3l63++ESQyZ4DnKqfMLOp1FariMd1fVbl6bFpowkwwau/wWYv95BvSI21qlM6uaXZw7yGukdYNtRNF/vgvn2tOZC/w== From: Mark Cave-Ayland To: pbonzini@redhat.com, mst@redhat.com, marcel.apfelbaum@gmail.com, eduardo@habkost.net, imammedo@redhat.com, qemu-devel@nongnu.org Subject: [PATCH v3 11/14] hw/i386/pc_piix.c: assume pcmc->pci_enabled is always false in pc_init_isa() Date: Fri, 4 Jul 2025 15:09:38 +0100 Message-ID: <20250704141018.674268-12-mark.caveayland@nutanix.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250704141018.674268-1-mark.caveayland@nutanix.com> References: <20250704141018.674268-1-mark.caveayland@nutanix.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS4P189CA0009.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:5d7::13) To PH0PR02MB7159.namprd02.prod.outlook.com (2603:10b6:510:16::8) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR02MB7159:EE_|IA1PR02MB9087:EE_ X-MS-Office365-Filtering-Correlation-Id: 8bb0e8e1-734f-4369-f3f5-08ddbb049b82 x-proofpoint-crosstenant: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|10070799003|376014|366016|1800799024; X-Microsoft-Antispam-Message-Info: =?utf-8?B?R3ZJTTVVemJhc3cxOTZMUGQwSmthcUlkeVBPY0p3NE8zU29aNjhMbHptOHJi?= =?utf-8?B?Zm1hRnNLT3VTUTdOTHFDdUFqZUtwbzg3Y212cnMxZzBhT3pNeFAvUld0eHNU?= =?utf-8?B?TE1WRHJURDdjaHVoa2ptend1ek11Kzl6amVzUyttMU9ySWoxSjRteWRmNFBC?= =?utf-8?B?WENJL2JlM240S29oL0I4T2tlTmtERDAwTXowSksxSXNrSjA5KzYvNm5xdEJS?= =?utf-8?B?K3NEbmFSZE9lMS9IaDRCN2ZGSGpLWWE0Skh5WVBpTnlvSzc1L2Y5bTJSNDBQ?= =?utf-8?B?OVBoQUVHSTBITXE3NHAyOUlSdUxkVzJDUGU2WHMyQmthM2MxUmo0dUJSUlN6?= =?utf-8?B?ZndqSGlqYWtLK29mSUtTV3R3SmZyejdhZFZQUGhmYWRVS0E2bEo2dlErR2Vz?= =?utf-8?B?Vm5EY3g3bnRWalpXZVg4bnY1WDh0RGxvcUxuMmFtYTVvRkN3RWw4b3Y2MU1G?= =?utf-8?B?NTJ2aW5paUpCOTRjSXFkYUpyNkZHcDFSTVdCN1EwSEJMbmYvTHRSbzNIUDRJ?= =?utf-8?B?Y2xvQzhRZ3pTSklLRlBPSExhODF1ZlV2dXgwZFFPL2FwbGE3R0kyZUNWRHhH?= =?utf-8?B?V2VyQkJ6c3lkV05JTzhDaXpsTytjMTNLeE9aaE9meldUeHFNNHYzZVpaRUgy?= =?utf-8?B?UHh2MEgwVlliMG56cUtOazh0TThSVmo4RVVuODR6OUlWRVh2UE9hcytqRlhn?= =?utf-8?B?SlFlL0Q0YUhmdldyek5VSmx3cDRRN0txdGNEMWRMZzkzOWRQWEpGZjlGUGFp?= =?utf-8?B?SVVrdURDdG10YzRscmtoSnh4cWJEZEV4ZVY4eWJlM2Z2V3RYaHVJWk1QNDdr?= =?utf-8?B?RjlEMHZFNmVoK2dtUlZaSmtHRmg3V3d0M0VaamVNTHQyYUlhZEtIS21udUdy?= =?utf-8?B?NmszNk9FM0I5N1o2Ni85T2RXSlVxVEIxQ1EyNm9vM0NLUEZRczZCZmRKUGhj?= =?utf-8?B?OFZaeTNXRXNQU0JobUEyV1FuL2lETGxBazNCb21oMW50ZzlLUXZncEY1di85?= =?utf-8?B?S0dOaWFSb2o4eWlQM3o3OVhrcjRMVFFoZXVXV1JHRnBURHI4enJTbE9yZGYx?= =?utf-8?B?ZVhKYTY4YjcrRzhDRmVTTmo2UWdPMjlkRGRsWG1UcCtFUGpVdyt4by9vSnln?= =?utf-8?B?STFRNTVsaDR2clJGVHpJT1QwVzZ0U25UMXI2dHZxY3RQTUkrQkVmK215OU8y?= =?utf-8?B?OUs1VVhHZ1N3RExHT1N2RktqYUFCb0pDT3NEL1oyTVkvN0JUSzBzbWgrdkl5?= =?utf-8?B?YTUxZkdYUzM0MTZ2QnJjY1JUOTJoeXBaRVFmangydG9TSTFZSEFncEp4NFFU?= =?utf-8?B?SUpXczFXRUZDSUZ4YWNoTm9yK0tHdThtQUxRTm02S3BuMnY1SkM0S2xTRHhu?= =?utf-8?B?YUpmVXdQU3AzQVlKNjF3TVA0eW1JUTVDUldvMXhZcDdod1ZKK3hhZUhWaEJX?= =?utf-8?B?VXJpdzdIWkd4dnhiZE9WMWd1R0JRK2pBOWxsUUNhcnNDRE5vbUFyWW56V01J?= =?utf-8?B?U0NOQmVkdWE5bE9hdkF6U09VQmNUM3NCRUg1alZmTzVqSzBlVFI3UiswazNJ?= =?utf-8?B?MnFMWVFVc1AxdlBDRmJycERpZXZzU05ZSFRxYTI0WjVVbGFSenZsYlprTi92?= =?utf-8?B?Q2ZtcU9pd2pRK3I2U1Y5WERZQk5ncUkzQzJ3T2p6YlV5MG13RHg0TWNrQm80?= =?utf-8?B?L1N5WE80cDRicUpDZlc1WFhIWEZWNzc2UEtJamFIbFpvd3BDdTJvZEpUa1Qx?= =?utf-8?B?RFNhS3ZzSFg2dC9LUlA5WFhlQjVGdXBIT1YzSytWOHdXMEp1aUZsUGZoTW41?= =?utf-8?B?cVNicFplN1B6VlF6SHVEaFBWUzJZdloycXN5aWdSRm44V2tUdXBPVDVPLzZj?= =?utf-8?B?TWtHdVMwUDFYZlhReUcvalAyREo1VGN6aXViMU5MOU9oeXozRmhjeFZpSWgw?= =?utf-8?Q?mpS0+G82weg=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR02MB7159.namprd02.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(10070799003)(376014)(366016)(1800799024); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?dEp5VHNUOHV0VEdPbjY4Rm1hWHloNElTeXlIUWVSS0ZjRW9SM2N5Zm1oeWto?= =?utf-8?B?N2x0M1Yza0x3c3pSOVl2NFc2c2wyMng1dGhNa3dpaHBmcXg1bjVkZTVGNFFR?= =?utf-8?B?RGxrNG1wU01xbkFnOFhIbXhYcVVxZ3RWOWxjNWdFc0lFaXZvVjlvUFRFTnRE?= =?utf-8?B?SzFnOG9uQnM2a2pwZjg5K2FJSDJoOGpBRjh2bkI2cFFiZkNPQTZLaDdYYmVK?= =?utf-8?B?bWtFYk5Od1FuYUI4YUliK0U0ZTE4SjIzLzNCQkl4b2NTWWNmS09qZldTSVdk?= =?utf-8?B?VU5MUHd0R1ZXbktvVXVpbTNYYTBXeVJTSktMYWd1clo2VEhLYm5sWU96U0dq?= =?utf-8?B?QkVXYWxLd0x4aGp2UDBYTms3VXp5cm42NkJQQ09IaERxckN3RC9qc25ETjJB?= =?utf-8?B?OXk0ZUdSM0pTeUFCZkhTYnpIY2FETTZEWUJNZ1NwYURTUlMvRzN3QzYwSDFS?= =?utf-8?B?YStSWkVoankvUm5saXVsc1FWRk4vSitBWVR5cDdKTElwYVZLL3BrTGZJeTNU?= =?utf-8?B?R0dvRUlGaHl6UG96VmE5MmVjVGNnT2NQQVk2WVBYYXZLc2RnL2NKUUpEQ3Js?= =?utf-8?B?Qzlxa1pZMFZGcUo2dVNONWVaaTRsSnQ2OXNzZEdVMW1jNStlNTU1T0hpV2lk?= =?utf-8?B?QTlEcG9Nc1I3cVcxT2lwQmxBTlRCaWkwSWk4c3JYZy9EVkMvR0ZoRWxhenlr?= =?utf-8?B?YWZxNFhScFVSQzlkeW4rQTROVmNzVFpKd1BUZDRnUWVINjhuMVpOQzFoMW1r?= =?utf-8?B?b3l6WEZLWUIzakxZbU1aRU1CNG1tMzVUWVNKa2dVSVJuZm9oNkxwTURsZFly?= =?utf-8?B?aUVWL3NVWHBZcFo3Z2tZRnA1OUR0RWZsSmVSQndSSjNjSThhT1BMK1NnTFV3?= =?utf-8?B?ZnBoRHlQSWtMeDc1b3J5VGVUWUJINENWcE9wY0VGMWxyREtHWTNPTm92R0Yy?= =?utf-8?B?dHJTWWZyMFVOcEM4TklkcTd5RGxxRmVwOFgvQnorbWNRbkRnRHhjRWp2M2dn?= =?utf-8?B?bWRGUlVzZi9WUEw4Q0c4bjU2bGRZNm1OVDRTTlVwVE1kNUtjTmdwQTRBelgw?= =?utf-8?B?dXZiRWJPM0s0V1lUOVB2RzB5S0VkMkwydDlvbkk2U0NGam01ZzZRNU1NTVdJ?= =?utf-8?B?S0hXcTN6bVdTeFpMV1Y3MThFRnZ4TndIWnFEK1ArM01WVUx4amxyRWcrWTda?= =?utf-8?B?NE5HTFBPaHVkUDVnMXh1WHM3ODNkcEtqcHBXd0xWN2lIanlUMXJDRDhDSWZy?= =?utf-8?B?aVdpMi80MjdseFNzU1N5Smw4SUFwRndjcW5wYVlrT3pDckFpVmJxWnlvbWpU?= =?utf-8?B?WGYzZnBmaGhkMnNCS1MrSExVdWRsQUdRYUlXa0kxUE9JMjdxRjJNd3VoTGF1?= =?utf-8?B?NjNqNkJ3ejZ5OGtLMGd2MGo3U2FxWVFqT0ZWT2FYUG9mY1VtK2hVK2s3V0Vu?= =?utf-8?B?cFpseEVUU2RNd1dWY0NGSk1aRGVYbENDU2FncDNxSFBTdk1ZRVV4bmwyNFQ0?= =?utf-8?B?SXlpbEw0MCsvOTB6aHF1SFM5dENDKy84UnQ1VVU0MGtmRkppNG1Ecm14ZFBu?= =?utf-8?B?M0dURFB6NkJjanc4dkM4S0NuZjBMVmQ3Vm9sVXF5RHh6am1ZTVNDa2xJQVd5?= =?utf-8?B?bUp3RFB3OTU1TXdnZzFmK3pTTjZDZ0ZzazcyV0FSd3hsVWtVQjQzZ1RjSnd3?= =?utf-8?B?anRSdlRkRjl1WkY1T1hLSk5WSGtWV09qVEFxWHdnNWdoaE44WUQxWVpKU3BF?= =?utf-8?B?eS9neDVFTlA5YmdNWnpVSVVjYS9ScUNKdGJjbGZlY2FuM1J5OVdobjBuN2dq?= =?utf-8?B?YkRwSUh2NXFmazhPaVBPTGxSRDZDZ1dSZ2xUL2RPVlN5Um54ODBWS2ZrVjIw?= =?utf-8?B?VlFSZno0UGk4REgveWYyMStQQnQ1OTR3NlVlS0gyUmxSblVDYi96Nmc5WWhs?= =?utf-8?B?c1lzeFFHNGFBMUhOMXo2ODBHVjRDK0YyQ0crQjNzeTJYZ3ZRTHJlUWxqTjZI?= =?utf-8?B?S0tpV2F1STJqeGUvbnlMamg4WTRaNVRtTHhUOUM5MnNnZUcvZWpHYU1Odkdo?= =?utf-8?B?TTdFS3BiZHVsK0dwMFR2bjJGWDMyajRjVmxNelNuMjM0TFVzWHd6OUwyYWN4?= =?utf-8?B?QW5MenZLL05QWS9OWGVRWDdTSUZFLzV4UDIwRVBKOEprbXhUZmNCUUVvUFdP?= =?utf-8?B?MUJ2a2p5VFNWYWllc0tkMTU4MXBYdVpxWjM5Nm1hNzRBZElWb1pZQnlyNHlx?= =?utf-8?B?RWVha2g2M281WHY5WnkyRXpKVDlBPT0=?= X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8bb0e8e1-734f-4369-f3f5-08ddbb049b82 X-MS-Exchange-CrossTenant-AuthSource: PH0PR02MB7159.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2025 14:11:02.0595 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bb047546-786f-4de1-bd75-24e5b6f79043 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: +ardOPKdG8sLtcXP66zx+NpKXge/iA+fwQfPzXwl1aCK5iEb9E73Nht1ucP9qoVTWOJqJ8xpqLd2vWbqyGi4waywi59aDgg8Muv+fNQJNSk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR02MB9087 X-Proofpoint-ORIG-GUID: YG2piIxK5yZ9B6P229ivjogXK39eWxXn X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzA0MDEwNyBTYWx0ZWRfXy0M180n2WBWP nqi9wi9snjml7tMNsPDewl5kBcojTxOEWORdo4dmBgxr01WQW1oMnTGuKNXBbmRhl05uvFCrlj7 sGwabeSRS1D255TNqcyEWsHlbNJjqmo7UX2Z+OArcjLXJJMs/qcZy16+ZzvqoDG1zX0i2yL7cd0 6dzc1UoOip7+9Cj08Sslss1bOaumvFlvoNXqZ5OhYY2tvOx/W9hGurou4YPZatH6ushWzoXeCcW oKObWF+fe6GlYED7hW/HtxodaHtljt7ilrGMXVom9cbu9um2GkI0e/8Qo6dis+BMe05216Kmr5Z wiFI3/kEacBmr5ciYagQ/b6Y0Xihe3uSr3U9IEJEX2Fg91HmuoerIWd2mYJsDFUtCUvFpdhoIcr 6Wa+eq9EHOerOAu/vAqA65fNzFWq2wknrO3giZ+Db8ueSnCDQDNP3ns36vNTzbMbDhXhBA71 X-Proofpoint-GUID: YG2piIxK5yZ9B6P229ivjogXK39eWxXn X-Authority-Analysis: v=2.4 cv=aomyCTZV c=1 sm=1 tr=0 ts=6867e0f8 cx=c_pps a=Qdo7Ea4lwGWRD8/XiwST5A==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Wb1JkmetP80A:10 a=0kUYKlekyDsA:10 a=64Cc0HZtAAAA:8 a=KKAkSRfTAAAA:8 a=XqeNvJXGgvzUN9CD1PIA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.7,FMLib:17.12.80.40 definitions=2025-07-04_05,2025-07-04_01,2025-03-28_01 X-Proofpoint-Spam-Reason: safe Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=148.163.155.12; envelope-from=mark.caveayland@nutanix.com; helo=mx0b-002c1b01.pphosted.com X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.218, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @nutanix.com) X-ZM-MESSAGEID: 1751638372368116600 By definition PCI can never be enabled on an isapc machine so hardcode the = relevant values set via pcmc->pci_enabled. Signed-off-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/i386/pc_piix.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 571a8d1ca6..4e3fb17506 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -474,7 +474,7 @@ static void pc_init_isa(MachineState *machine) } } =20 - gsi_state =3D pc_gsi_create(&x86ms->gsi, pcmc->pci_enabled); + gsi_state =3D pc_gsi_create(&x86ms->gsi, false); =20 isa_bus =3D isa_bus_new(NULL, system_memory, system_io, &error_abort); @@ -495,7 +495,7 @@ static void pc_init_isa(MachineState *machine) x86_register_ferr_irq(x86ms->gsi[13]); } =20 - pc_vga_init(isa_bus, pcmc->pci_enabled ? pcms->pcibus : NULL); + pc_vga_init(isa_bus, NULL); =20 /* init basic PC hardware */ pc_basic_device_init(pcms, isa_bus, x86ms->gsi, x86ms->rtc, --=20 2.43.0 From nobody Thu Dec 18 13:31:22 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=nutanix.com); dmarc=pass(p=none dis=none) header.from=nutanix.com ARC-Seal: i=2; a=rsa-sha256; t=1751638416; cv=pass; d=zohomail.com; s=zohoarc; b=AncxxCIVLFGhZlo8d3Ti5siM40MumfhqcAKPe3FXR7q4TKTzK4r/4AtknKeqOfuuORfY1MmRc72KG4uhTBzxglMX1vu5ueWc2U5bLd68NMeF032rgrrPWSF9idyjHlfrKtyt7sjaqYSGeSPGMHu+6jbOcD2GkNOvUzAkyaKipO0= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1751638416; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=j1qyzBpzWeJn6R1Liy8XgtmanxrmjNffL/fGJYcsK3k=; b=mzhJkzO8OeKy0yTqFWTHUaYr6Mcyg7rOgYX2ZkYCvcw8zGxHkdO+/zhlaZaNFmj9Gp9DZv7XkDfmU3OWDeBc++HYkm/cCcoC5J0HXkSHXXNo0Sl7IlVJuOnrecPuFB5IFxJ6vBAMu0DkO+hMG02JSXLEstPnGOpSLS7RsX7T3xw= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=nutanix.com); dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1751638416790347.055680916352; Fri, 4 Jul 2025 07:13:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uXh8v-0001ZY-F9; Fri, 04 Jul 2025 10:11:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uXh8E-0000uA-Tl for qemu-devel@nongnu.org; Fri, 04 Jul 2025 10:11:18 -0400 Received: from mx0b-002c1b01.pphosted.com ([148.163.155.12]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uXh8A-0004ny-Jz for qemu-devel@nongnu.org; Fri, 04 Jul 2025 10:11:12 -0400 Received: from pps.filterd (m0127842.ppops.net [127.0.0.1]) by mx0b-002c1b01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 564AfNXN010658; Fri, 4 Jul 2025 07:11:07 -0700 Received: from byapr05cu005.outbound.protection.outlook.com (mail-westusazon11020080.outbound.protection.outlook.com [52.101.85.80]) by mx0b-002c1b01.pphosted.com (PPS) with ESMTPS id 47nqmnuesn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 04 Jul 2025 07:11:07 -0700 (PDT) Received: from PH0PR02MB7159.namprd02.prod.outlook.com (2603:10b6:510:16::8) by IA1PR02MB9087.namprd02.prod.outlook.com (2603:10b6:208:419::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.20; Fri, 4 Jul 2025 14:11:05 +0000 Received: from PH0PR02MB7159.namprd02.prod.outlook.com ([fe80::6cf9:b35c:b143:bb88]) by PH0PR02MB7159.namprd02.prod.outlook.com ([fe80::6cf9:b35c:b143:bb88%3]) with mapi id 15.20.8901.018; Fri, 4 Jul 2025 14:11:05 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nutanix.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= proofpoint20171006; bh=j1qyzBpzWeJn6R1Liy8XgtmanxrmjNffL/fGJYcsK 3k=; b=1MgK7k4dmU1S2ioFaVyfC7y7MwIJsr+WxGQf8DUIHWsUHVw6ixAfJYaP8 ncclxrww390pzlu/lIFlWT8Se6yOW7atKuR46Sih6aZdSt6d/y3SvIDayiJnZtH2 mFd90B12bNWlbtEyk6aX7Fg337lVuB3ZLzEVLh++L4fBaV06g/VbsSNr0S6VNZ9W shIudF2e7DRvjh2haEB5DZtRVK3Lsj1AsN69uG+UhPjgrIFnMLJbRIL7SVKVS3G3 TSbPu4kQAJnLWPTUdJELbwlJPoCnSvls8zw15PnZKFVeQ/5cMyBqrLVaXgBYGyuN pWhrYLUmGaDG4NsnkYxnoMYsfzYJg== ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=rtidyZ/xgRFed8rysZiGcnQGyYAVsvdXDQol86OvJTN0UN0CeEgdVzZ2sGLYD0IZnWsvA5jRuPX9vWvlb1eOuAh24Cc+mZPAIIthdHMrfxi/Ahdj+b+Q+PLbEJVfhOrTXKLve4giqTUpt+pp830xtRPkKr9/q8TLTnoo8S9I2greHv9ATWpbvNvvOi5mc6KFGMWl5VkMNVkccaGGNhPgTh79iQvovlnz8vhj2b/yNKbs508Qv97qFQMtbOtTefliJh5PJsiSx+dXBfJ6yCqiemK2jyBrFMo9cjzjkv0wm2KmbF7p1iYeJUaSrh5rWkpIgzenyo/tmvKK0tzl0nHjDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=j1qyzBpzWeJn6R1Liy8XgtmanxrmjNffL/fGJYcsK3k=; b=fC1Jl5tJqgF4zSiJ9fP/wv0azWfdfcrUU4yRnmCVuhVQ5qnVr55MJ/mJDpuOorBVWLpn4/1Loy7JawE2EWDCq4XAxKfnut/dqBtJUsAcJx2f0yaahzYa5IikPwlKnBkk5oaGtIbp90kXyNJ79kBGX9yEBvwU6xXLfKVyb6ERMAMHOF7tRO9mslpwzr0Ef5AUzufQkZ09DE5G6VmSbXrJ0l+qRkrVQAFexiUQrTYfzyKCRaNp99Unk0X+5cHsvpVsprCA/YxxQYaRasyU3uUOpxEwIqWs3vJsj6N6Coe8LmyelCutsqSIK1xGAyg1aYrsObdEEq500WP6wRCRmaFHaA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nutanix.com; dmarc=pass action=none header.from=nutanix.com; dkim=pass header.d=nutanix.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nutanix.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=j1qyzBpzWeJn6R1Liy8XgtmanxrmjNffL/fGJYcsK3k=; b=SJPp9HKEli5QxOQVbJMF4cBn/M8YJS5d+nHWmi5SGEz1ytAMvdf1OsGlsDstjPJqeCBK4ud7nwhy84eCOAtBV30k41qUqofeACEajkmPYFg9O8MBrPjz7MqkQGiTXCAA52P8a4lGhnslhcfqvVv4LAKKSEbCFdlcOpXox1YEaOyBbECtYAMNVWvF8zbtBm8+laPSEHRw1NZRslV3mgID4pvbxpyqFyU5ibd1acGYa+tT54t5n5Ku4X9wkHDBxbFa0dzOrZMUii7v0hMaMLAIjmOBd7wgWeDbjRrSSFR1l0JmgTQ2dyINEm3Oq/1qMLWRtubpHakKfRN5KcbHllSa3A== From: Mark Cave-Ayland To: pbonzini@redhat.com, mst@redhat.com, marcel.apfelbaum@gmail.com, eduardo@habkost.net, imammedo@redhat.com, qemu-devel@nongnu.org Subject: [PATCH v3 12/14] hw/i386/pc_piix.c: hardcode pcms->pci_bus to NULL in pc_init_isa() Date: Fri, 4 Jul 2025 15:09:39 +0100 Message-ID: <20250704141018.674268-13-mark.caveayland@nutanix.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250704141018.674268-1-mark.caveayland@nutanix.com> References: <20250704141018.674268-1-mark.caveayland@nutanix.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS4P250CA0002.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:5df::20) To PH0PR02MB7159.namprd02.prod.outlook.com (2603:10b6:510:16::8) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR02MB7159:EE_|IA1PR02MB9087:EE_ X-MS-Office365-Filtering-Correlation-Id: 3aa5132f-d997-44a4-c7c3-08ddbb049d89 x-proofpoint-crosstenant: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|10070799003|376014|366016|1800799024; X-Microsoft-Antispam-Message-Info: =?utf-8?B?S240V3dUMVVzMHVXemNZYzUvQVg4YVlDOEVRUTVTc0FoZWp5ZlVraG9aZ0xo?= =?utf-8?B?NXBGdklPVVBLVTVidmlMZHRFeStNZmxBbGdvamxnNGFkV1NGOUhXUEZ3QWt1?= =?utf-8?B?enlXcFJnQ1FXY1Q2eFNpSXJVakV5d3VNSkhQcUpvYUd0RGFsTHRRd0lrbUFG?= =?utf-8?B?bU94TkNPa2xaN0hucVNwYWZ6YUcxN0k1K3hzam91aWFVdkVUeWlxTGRPYktr?= =?utf-8?B?WU5kT3VVZTlSUXNPT1BUZTFjdXgzY212eEUyZGZlM053Qlo1NVFNNVBaVHU0?= =?utf-8?B?SFdDVTBlRXppWXcwQkFoNHlLOGs5blpDeDVHcks1TWs5NmhIVnFQR011bmxE?= =?utf-8?B?UlFIU1FFRm5xWjF1OFpMam1uMStWQW9PVjRKeVBhMHd4b0NHZGpaTVd0dDVY?= =?utf-8?B?UmVkeEgwMlh5cmk4Vk9hdzZ1WDMxVkpoU3AxM2NoQ2tFaUJSeGZnRU8vRERr?= =?utf-8?B?ZlhZMGhzS0NWWkpwaGxMVkljbWg5c0pzVTlFWGVWRkFGU3ZnVndPRk5vRjBa?= =?utf-8?B?TWl6VS9kV3BGZGxTcXV0c1Jva2NrWDFRQVA3bzZ4MjYyZTRZWU5SWDFBbFU4?= =?utf-8?B?L2hHTzU0bjE1WnQ1ZWZibExORy9sWmJqOVExcklZN3RMYmtJOW0rSS9MYjZK?= =?utf-8?B?WjUvU0JncGFJMjRELzBrREgwOERBZnkwNWY4bEkxaW5weWtsTmI2eEt3aWhG?= =?utf-8?B?a0xOT0FvTHJyWW1maEZrY0hCRUdVQnp2UCtIT2tVSWt1MnREVG1sMk1HRWlm?= =?utf-8?B?ZGRJN1d0MGpLZlMzR09pSnVYMno0TytpckV1T3psd0xFTGRpMHNJb3RPazJV?= =?utf-8?B?R1hKUWVHMXJ5dURBaFMxR3pKV09tOFBpUVpNbDRZUmF5YnRKdVdFQy9GalNF?= =?utf-8?B?Y1dMYUhQSEYveHNpTDRkNmVyNDBidUVoeTM1SGs2NFlPYUl1SG4wUzRKcTJy?= =?utf-8?B?dHlEVjRzeG1lNDRvbDlkb1RyeWZFbCtrREc4SEo4RHZjMkVUZU1VTVQvM25z?= =?utf-8?B?bzVvMjVYaVZKSXBtR3FzUnFMbWVKWmFNczg0ODhYNDFORGJoNG8wYk9BcVVH?= =?utf-8?B?bVN2cGNjeWNNYmpBVElUUm8zajVhSUw2Z0JWSXBkT3lmV2dmeHNwNXhYNWJa?= =?utf-8?B?ZGp4dC84MkpIazFPdHY0aUkxVm10TjI3ay9xTkhQTW82dkVCVzVlTjhXcUxu?= =?utf-8?B?OGJoTGJaNHhnV2lHNW92MDdVZm8vZERLMWg0V2tYZHF6cm9HYnh3VDVKTWZp?= =?utf-8?B?NE9pcGQ0Tm1iTXJpRTNCanNQbjdZTVc3QTFtTE94TVQwcEo3aXhUKzJqL1pJ?= =?utf-8?B?bXdkWUVpbXplRll3ZjFmUTN6TjJZblVQMC9HVmdzRGVrb0NMaHoxVFlmUXJu?= =?utf-8?B?L2JoUlRtcGhLcE91QVN6b2F3aS9wVkV5Y2h2M3NLMGRFVG5xSWxya3M2SDJB?= =?utf-8?B?aEpjSGFkcTUvQkdkaW80UzA1UVRnMzZBL2VRRlpYWVY4MVJyNWJVbGpnWmVa?= =?utf-8?B?czloendEcS9tSGpDV2NFRWtQWEkwQ0VkUU9RbkNaYkcybEptdVdxdXN1aUFM?= =?utf-8?B?LzlVT1BhKzkvY0E0RC8vTi83WXFLWFpZdWl6eFdISkhBWVdKV3NBRjQzeGxJ?= =?utf-8?B?dVArN091NHQvVUxKWC9wNis0RnJkSk1iNE01TjhkZUxuK0lSVU4xVThDbTA5?= =?utf-8?B?ZXI1eVo0dnVQT0hNY0FoODAreCtLZmtUT0V4WENuUkFVaFZIenV2Z2Naa3Z3?= =?utf-8?B?UjlUZ2JBbkxjazY2VWd4NnNtamZ3eEpHUXhaalhYb3BEZm9DUUMyMUY4SkUx?= =?utf-8?B?MlJ0eklzY2hSSjEyeHBvc3EweFdIZkJ2YWI4RXE0dDlpTXBEb0lhNm1lRUpo?= =?utf-8?B?NkpyWHQ3WXlPaUVDTDViMUJYTDFva3lFZHc0Ykpra25iR05JR29jYm4zL0pC?= =?utf-8?Q?ceLqrIcJrA0=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR02MB7159.namprd02.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(10070799003)(376014)(366016)(1800799024); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?U05uV0grN3JzWWRsaEovdmtZa0g2QmYzaWxNY1JGckUydkwyWERUaU1vS0dy?= =?utf-8?B?RU51ZzR3VGZCMS9hSFF0VEIyUnhHZURHY3VGMVhybGVVMWk3c2d1c28rM1F1?= =?utf-8?B?M2N1LytxQVpxMFhDY1NzUmpuZWhob0puWFIrc3VMa295Y0FlTnVwdzJoTjJ3?= =?utf-8?B?dGtPNkkzNG01ZGZaMUV5WWVhN3B1UWt1emtFSlFWS2loN2IvaGFMSlZsU2cr?= =?utf-8?B?ODFha3lDUFMxQ2lwMXFhem9OU3krSldWQ2RUWlBEMDdML0YxanJnTDM5QjRG?= =?utf-8?B?MG90S1VKb2hBT1JxM0NxcjJ6V2pHbmVxdGVMN0ZjbGV5S0NwczdrL1BNL1FV?= =?utf-8?B?a0JTWTFnY2gyT2NjVnJRUnhOK2tibGdoQTJxTmVKQjRneUVDRWhXbFVESXVS?= =?utf-8?B?UENlK2NZZ3VwOVozL2h5TnJQaUdNbUxXdHVIMVl0VlQ3dU1taCtpTEJNSTRM?= =?utf-8?B?b0g0aTJVTEpnaFZXZmhrQzJiRzgyUWdoOTZNTWg4TjZrU21ZUXA4MWNEMkdV?= =?utf-8?B?SVNGSEt6dFBFUUl0V2tNWHk3cUtWa0xJWmg3QVkwcmpNQUd5MEhwVi9RT3NX?= =?utf-8?B?d2FkRmdnNk12alJtRGh6OG9KU09tbkd5KzgvQUlkVkp4S3gyNGNtTDdWZFBz?= =?utf-8?B?ZGpxbnVkcUhLSkJwV3NmZDJrcVRVUEdHcHBwOEo2b0xpUXJMcjlIMDJqYk1p?= =?utf-8?B?am1mYytwb3phclFVUVlWaEF2WmNWNGJQeFdYcjlBY1RXcnJYYU1jcGRGQmZW?= =?utf-8?B?U2xYK2ViNEFNWmZtQ1JZcVc1TzFQT2JDS3ZpOWlkdkhFa29oZFJhNC9NNDNR?= =?utf-8?B?NFBqWlhtdzQxbnpFdmhUWm5xTE1pRnZ1K3U5QjFrMWhSdHJGR2MzTTl3M3l6?= =?utf-8?B?aDA5b3JoaFQ0QmFFa29qc0MzTEVCQjF3SEt6bzU3UkQxMlhzdUluc3p1Nm5O?= =?utf-8?B?QkxKUy9BQXV0bmxMdmE4TmRTc1NhWmFXQjNjNlZjU0Jjb3FhVDFQSFZ1TGFT?= =?utf-8?B?UG9QazY5UVhldlVaSGU1cTZ4emZQc2JZdWVoMXNWSFVHWmo4dXNheWVFM1p2?= =?utf-8?B?RnFSMktqVzErbUNISjJFRFA2UmVrSWphb0NaUng3bUZQWDNQTUlIK0t3eFdM?= =?utf-8?B?ZGhONHJWTTdJTklBVVRTNTBkdzB4aTQ2VlRCYmNBZVdUMThlYU1wbmxZYXF4?= =?utf-8?B?ckNpN2c1a3FCMHFDTGkzWm9LeElZOUZlb2dSZ0JYdnY1cjZMUVdUZ2hNZktj?= =?utf-8?B?aWZyZ1dicTB0R3F6aU9WTUt5SWtpb2Z6ZjUxTmF5WHBwUUllOWVyb1RIQXNQ?= =?utf-8?B?Y3dleXhFSjc5SUlQUFZZbXJjbFNmeW5NYTlqL0tRMUFEc2pZeWJOY2l5cDNY?= =?utf-8?B?bnA1OWhmS0kxVE4xQVhlWnQvR1lhWGFRY2NibzZDejVJN1cxYWhrTDEvdUZQ?= =?utf-8?B?NHZDUkNOdm5mT0Z6UU5jS01nWUNhdXpzSExucEdLYW8vcVZPQUpDR3YxS20x?= =?utf-8?B?a05iZmNrYm12Qi9iTWMxVTh5M0FsSzArY25jQnczaGwxdTBzcXR0SFdIdTB3?= =?utf-8?B?OWp6VThmcnVxSHNhRVROa3hJM3p5K0JtUGJWRFJIMjlwWU8weWlHMjZDaDRS?= =?utf-8?B?YzR4UHYzOFRkNThUUE4rN1NUSnRDYlJrMXg5Tjd4QjZKVmxyQTFoVWxNV3BH?= =?utf-8?B?Z3Z0dGV4bEtIcEpUdjNRVGFjZjh0ODJST3ZyQUtkdkVTLzA3SkRwaXF4a0hV?= =?utf-8?B?ci9pYi9yME1mWjZQY1FTdlBCbkhadzZjTTVmV1pGdTg4RlVLV01WWlc2WjdE?= =?utf-8?B?YWJvR1pvMUNCdFUzbzVlWWlHSUhOdTRkdTZ2bTgrenlaaWpnOElVbG85S1Za?= =?utf-8?B?MHROUzJxTGtLd2p4NnRjR1BRbUcrZk5zY3NFTUl3YlVacFBWbHVYNngxcWpD?= =?utf-8?B?MXoxdjFPa0tHazFtYW9JaS84dnN0WGpuMjZvdm91WEJnMFBRUkhETVB1OWlE?= =?utf-8?B?R0hyc0t3dUdaVnJyd3dUWm1rQnd6YUFyQ1ZuZDA5QVdiNTNvUEpqaUJXamJK?= =?utf-8?B?QTl4UWh3dVZXSTRRUjg1dUZ3bDVVbUZJZWJLaVQ0bENweUtlS2l2Yk5qNHA0?= =?utf-8?B?Q1kwQ0JabWJCTFgrWkRFOW1lQUk4R3VKYUwzMG9nQlBJQkR3M25LK0EwdkNl?= =?utf-8?B?YlZUSGk3cU4zQTBOSG1zenExT3RSOHNMZFIvVVd1QUxpeE1vVXErUHl3NlhI?= =?utf-8?B?RWRXQUVDVnpuZ0VEMnk0eEkwL3B3PT0=?= X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3aa5132f-d997-44a4-c7c3-08ddbb049d89 X-MS-Exchange-CrossTenant-AuthSource: PH0PR02MB7159.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2025 14:11:05.4687 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bb047546-786f-4de1-bd75-24e5b6f79043 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: yLWADZPc4Ca3fcTNVrQQ6wcLhiSb60o74c93zF4zxoIomh09svj408ActW+xq9M45fHGsnVcd5AujkqpYCAe23xh8zhSKOVyyp/k2aRwiTU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR02MB9087 X-Proofpoint-ORIG-GUID: MmJLhz2a2teV9MMeufOVZ-92B-4FTiLM X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzA0MDEwNyBTYWx0ZWRfX1p25YGGjNHyf ZNPZpumF+EtlZUDmUN6PFV+T50+tQs1JRiXf2ccI6ptt9SfEfF+DAcTzR+EhedMwySiwRVMRLTz r7BjfZY9Gl3j2sM01DArmEyKAWAwDyZFucwsbsaTG1sEgFnEQRPl0HOX7Kdt5Ic79hjrjcsQCJU 7b95g4Jz3L2d1Jb3dxv2X6xFAWn6DCaVZufZn1kJgqLCnE1pHTOp4IZP5FQt4xj0zyPZghWzVzX uuSgjpmNOWMpwvaiQT2WjYADmbsdN6ZER12vyR3Q4sYtg6TIeRoWV9cqWk7iqXLh085QFjIknHO ekDK9SONBthUDcr6PT3LOk2IkUEp6ijDcz4ONC3w1euc1KSQe5lUR/JwVZA4nXl0wthiijgxFbt SlQZ6GRYAiES+vjz1DCL+eE6en5StnPPglldQ50+1Mn/qZ5MUQu2yLWAFxEBlDCFs0O+zfgW X-Proofpoint-GUID: MmJLhz2a2teV9MMeufOVZ-92B-4FTiLM X-Authority-Analysis: v=2.4 cv=aomyCTZV c=1 sm=1 tr=0 ts=6867e0fb cx=c_pps a=GE11VYRMVHt3yMfnQg1OWA==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Wb1JkmetP80A:10 a=0kUYKlekyDsA:10 a=64Cc0HZtAAAA:8 a=KKAkSRfTAAAA:8 a=m4-MuDShih0a2sssyXkA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.7,FMLib:17.12.80.40 definitions=2025-07-04_05,2025-07-04_01,2025-03-28_01 X-Proofpoint-Spam-Reason: safe Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=148.163.155.12; envelope-from=mark.caveayland@nutanix.com; helo=mx0b-002c1b01.pphosted.com X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.218, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @nutanix.com) X-ZM-MESSAGEID: 1751638418865116600 By definition PCI can never be enabled on an isapc machine so hardcode the = PCIBus argument of pc_nic_init() to NULL. Signed-off-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/i386/pc_piix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 4e3fb17506..76b8543bfe 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -501,7 +501,7 @@ static void pc_init_isa(MachineState *machine) pc_basic_device_init(pcms, isa_bus, x86ms->gsi, x86ms->rtc, !MACHINE_CLASS(pcmc)->no_floppy, 0x4); =20 - pc_nic_init(pcmc, isa_bus, pcms->pcibus); + pc_nic_init(pcmc, isa_bus, NULL); =20 ide_drive_get(hd, ARRAY_SIZE(hd)); for (i =3D 0; i < MAX_IDE_BUS; i++) { --=20 2.43.0 From nobody Thu Dec 18 13:31:22 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=nutanix.com); dmarc=pass(p=none dis=none) header.from=nutanix.com ARC-Seal: i=2; a=rsa-sha256; t=1751638359; cv=pass; d=zohomail.com; s=zohoarc; b=eBLlsSocTRFtZGhh5hek/H6cESlaNpC4kdAuO2CtDh3cvIbz+CnhfAm4zvw6UU2uSL+3e+RDurgQEhRHZAL4FK3OcwrLT54uglHdsVPL4GJTkHGkO1dEvB8b9NtddrmDe/n3P7qAcR/ddymdHNngMVcyK4Dc+9TQRzEiyh61U5k= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1751638359; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=18vanALuMVLigKxx01ISdiOkUhjNHnr8DZe/lZxFq3Q=; b=QR3cohihHgTyzcji/07eByt5hxLwm1DfefSpbfsBMWeAb3utLy7wnePIbqTLgRMEVy6CPAo7vSYE4ZtFw6MOx9e8ztBf35gi7U3th4FRQDosTi5PRd72QgbAnuwojGZHmGgaOcnZewyPAergrhGKUtlo59+lTQyBruraj/udJf4= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=nutanix.com); dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1751638359328211.87414255931265; Fri, 4 Jul 2025 07:12:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uXh8Z-0001B0-J1; Fri, 04 Jul 2025 10:11:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uXh8G-0000vu-Om for qemu-devel@nongnu.org; Fri, 04 Jul 2025 10:11:19 -0400 Received: from mx0b-002c1b01.pphosted.com ([148.163.155.12]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uXh8E-0004pT-It for qemu-devel@nongnu.org; Fri, 04 Jul 2025 10:11:16 -0400 Received: from pps.filterd (m0127842.ppops.net [127.0.0.1]) by mx0b-002c1b01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 564AfNXO010658; Fri, 4 Jul 2025 07:11:11 -0700 Received: from byapr05cu005.outbound.protection.outlook.com (mail-westusazon11020073.outbound.protection.outlook.com [52.101.85.73]) by mx0b-002c1b01.pphosted.com (PPS) with ESMTPS id 47nqmnuess-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 04 Jul 2025 07:11:11 -0700 (PDT) Received: from PH0PR02MB7159.namprd02.prod.outlook.com (2603:10b6:510:16::8) by IA1PR02MB9087.namprd02.prod.outlook.com (2603:10b6:208:419::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.20; Fri, 4 Jul 2025 14:11:09 +0000 Received: from PH0PR02MB7159.namprd02.prod.outlook.com ([fe80::6cf9:b35c:b143:bb88]) by PH0PR02MB7159.namprd02.prod.outlook.com ([fe80::6cf9:b35c:b143:bb88%3]) with mapi id 15.20.8901.018; Fri, 4 Jul 2025 14:11:09 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nutanix.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= proofpoint20171006; bh=18vanALuMVLigKxx01ISdiOkUhjNHnr8DZe/lZxFq 3Q=; b=0SQxqaEXNbdqmKNTbbiFXpegG2fZI+sbcwhIt/XUuR7Vgcy24SRbA2/7e arK1QR1geLZlLMGRlgkDqW3W5lzcBZNe6AGNTJX79/0akHbHmgvtXGDUuBvcV2aQ wOKHQTYTnF9cbfcNdLXKjk81Ba8iEHLkdPinRLb6y4fU4+XVdi5ZI93nGIKprxPp PDQL1hBakCLcP4rEtrWPI5xXw4ZyLz35wN/ZlAZ/qjm4zV1hZodFgetItShjSCcf 42iRDDqfS9lwcIc2wsbTlJ3NTtU5m6EnL3Ls/NzQaHV4bcEBsVqm1NBFokwkFhzM 3xUblOsK3ACtHnwQfpnZis0Xlt2Bw== ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=m219v3YflHudM8UGX7nIGFWnJ8r7R40c8l9wVSJz1XCd0ffAYZaJ5i/+6ZJVVNrmi5YgEEn0tqZONg6jZJuNJ9mJFH2nq5SpU85PdcZ3inN7jsAgMFG3UqbBREzNDsTXT/u4rg2xn2u6ft1+Z3pFlB9/OBbxOF/dhZGA0nmQjU/B4pXxAS/6z+22IGsisLej95lD94t4xv1BkrRlK+9iBUlLvJsn6K4c3HO2Cebz07Db4Ot0PeZLH7w7s4avKBqE0gNsbusyh2vY0gr9a+F62lKqTEDHeFo9PiV06ZVxrqaRChz+IblAMyxk9fm/fe6JMHT9u9bMo/k2pdlnZRd7vA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=18vanALuMVLigKxx01ISdiOkUhjNHnr8DZe/lZxFq3Q=; b=TVjISbxpnrQ6ZtWRfWtGSB1KsGq6PGcENxoqpqWosOoRFPhyWWrXj3pvQbLAiIFYDjXCfW+1hkWnU4k63cuNwk18T7belMnH5izwpxwBi/UBEfpZUC06qQvHEx48NfKPihshSNYbpCF/glAh8mKV5o5WRDmftKfJ+MX/iURGsHhLEzNG9EjZW2Aj13KFahdN/Ku4sEDTcOY4wUh88sDNHW6Kz2FEV1FKhaJQCKCcyYv8rBEJxq8R/+ydRmjJlkxsXH9rQ8cycxmfxuj7XUd0xurJ3gc2bNADULAxF9mdAfr1zxdz4z5P9KRy5ZwNLQsErMYKdZNFKKqCnkILMR2u7Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nutanix.com; dmarc=pass action=none header.from=nutanix.com; dkim=pass header.d=nutanix.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nutanix.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=18vanALuMVLigKxx01ISdiOkUhjNHnr8DZe/lZxFq3Q=; b=dQEIh0eaMp5b+Xd44sb1zZCBp+2h3rA+OSl3JmLc0S+aOTzx7x2Kj14P5OS2XcfUokDtv2CdCLM7wJ1AC/C5McXKzaLJi4fp3lhdCL1zVZolxmXFLUXcjgXlPaL5FrXYnye957OOXgxffWl2HjgSg2uR2vTmGcFHgAnmhfl9P9n4ytVwUnmXHu1oPN0jLY6VTmqlGsREYjrIf350vCbyMpwKNUUWgvBGulv9tHA5FHzLc4VmY05EvqCVgeBS/KoZ1wF11s9tLllBhIZluJcDquephnrxPlxnMvu8pFqJKYDfs5ySYpA39272+tqQrYFzwqBN3aPFqwWZS7+4la1p/g== From: Mark Cave-Ayland To: pbonzini@redhat.com, mst@redhat.com, marcel.apfelbaum@gmail.com, eduardo@habkost.net, imammedo@redhat.com, qemu-devel@nongnu.org Subject: [PATCH v3 13/14] hw/i386/pc_piix.c: assume pcmc->pci_enabled is always true in pc_init1() Date: Fri, 4 Jul 2025 15:09:40 +0100 Message-ID: <20250704141018.674268-14-mark.caveayland@nutanix.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250704141018.674268-1-mark.caveayland@nutanix.com> References: <20250704141018.674268-1-mark.caveayland@nutanix.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM0PR03CA0057.eurprd03.prod.outlook.com (2603:10a6:208::34) To PH0PR02MB7159.namprd02.prod.outlook.com (2603:10b6:510:16::8) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR02MB7159:EE_|IA1PR02MB9087:EE_ X-MS-Office365-Filtering-Correlation-Id: 55910f74-2aa7-4349-4529-08ddbb049fb9 x-proofpoint-crosstenant: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|10070799003|376014|366016|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?vCSxiNrQdDNDS1NLq8OaYD9atfoks9a7ydWSwlBztGTuvM7EDQAnFpTK5RVT?= =?us-ascii?Q?MUoXB/weeXDV5ZerAfUokKjinGDYYKJ0LrOArR9d09sOXXDcVxcecvzl5D0t?= =?us-ascii?Q?sT89LClE5zIxLHI4GehHCTiCpqFaR4NVrtI1w92b4yAG2tF9/8P7UXw62g4G?= =?us-ascii?Q?Gd3v1jR/5TnrqqXQUp6xV62dzI12+DipWUMw/hdDyo7Lfl79PNDJdkbeydy3?= =?us-ascii?Q?Lo0Q2fZSlMUD0/6IMFtSlK0F9QWjxycPy0HbSgdkOscxzbH6Q3iS7SW6wVZY?= =?us-ascii?Q?ca3xZkxSC8DhNPzJT5FHXgQcs5G3UdMpyrCltBrdptY9sr51vPAT9mdBiewY?= =?us-ascii?Q?Bkphfh7/xRwRqhJneuA4gIikmeysMCluwks/VGTVXyNbJFLoklDSrHlw4s7H?= =?us-ascii?Q?knLAYcuwAlWvxw+33UjQTrfCb++zmzSwl46u/3fJdvIBydZ13IGb4VaFn18d?= =?us-ascii?Q?IbwsPlFNDujOHVtZ2DYRP+UgulZB6jcPosDyFAGHceBihvd/Qpzz9cj4jYSb?= =?us-ascii?Q?3SSqNQ728wTR2A+KiVzAFg8wgHbaT/Pog9PgO5noRjc2t7McRJ2+jX1c/xBB?= =?us-ascii?Q?1w3Q3q0/Kbq8eNUyE76wd9rZYVscK2+660h0szAbqtqrHJFEI2unsZQI5wTS?= =?us-ascii?Q?V372Jyunr4aV+SHdfVWWV8P7b9Ykw2ltnHwm4+8UKK/5r5jIqPUDKcmPkSsE?= =?us-ascii?Q?Oa1WmAlihGmMJGohvFIrKBkWm1y5p62We/+fWMHRrKM6edkb648LVKWndz7j?= =?us-ascii?Q?E4OBC4I80tocZShEMrpjHcBw46/vkTXZzOu00PC8ZYrAjds/D4B7uxjKLW86?= =?us-ascii?Q?k/CsNdeFe8DYuc43c+I4qmi7Hlijx+yl9RiWX2jPmmCR3J9UW8ACYlwFB2dp?= =?us-ascii?Q?ibIMXKaCXOvn9onyx0WC98l+KURv/G6ceAS4E6hEibiFi8WkTCoo5ikwAxft?= =?us-ascii?Q?cMcRPysx54do9jvt5SGkMTOeIxi335OeqAtU6TYcb1gdw7EYZTAG1wFkUPfR?= =?us-ascii?Q?BLgC8at1ju//2Op7geYuQsAtwPvM7irPNVTSiet9o7+wvlkGjhQCwhPTO3q6?= =?us-ascii?Q?BFpMla9iHNdLmw1O4RDbWNl9SxK9gXZalk0NC0JVRbvrW1acpGLcjT7SWICV?= =?us-ascii?Q?D+8sxW2r9Daac6WGJOm7Y3T8AUYm9wp2ZkXKJbr/kxv8oEB3kxwdY5alTYJf?= =?us-ascii?Q?DuX9vyE4xbd4qgAACFEZbPf0UMmxoFcJpK3vsQP9J+GEfDaoWYUpqZBf6es4?= =?us-ascii?Q?jBFMmvs07J9sFYYq1zarvGHHPrC+gB8f+1bRVBTQyLkAm2cJfGRi/cN+6ily?= =?us-ascii?Q?1FxDaX4WtrFxxEjfrV/ID7PrifNiipK+asG7zZ3vuLPcqMGwx2hTzKfeY+e7?= =?us-ascii?Q?O/AMFLzoA6heFSOpCkkm6T2oSyxVyACZKTHN66KbB+EzeLEWX0fODPSVArk8?= =?us-ascii?Q?j3v5t+w/9ak=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR02MB7159.namprd02.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(10070799003)(376014)(366016)(1800799024); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?jH03L1Ml5YLQ1Hk5VMnJktSYaQqRdFLQ4GN0uKLiwe49zyBaXkI9gzTkQuG8?= =?us-ascii?Q?EURb43qMC/kd9xxD1yPvA3Ryd/DfP+wSzAPpNYGH3+tHXTYaqe7PZlDlB2AL?= =?us-ascii?Q?iOe7sT1hQvbjLXKiX0bEbhD9mthPj3EGhlz76S97S9+0X91I5sXlEqSYKr8g?= =?us-ascii?Q?56S78EUt0ZbfZL2BZgQTfho7Qa8yjLao71Qj5WiSVoy4tkgWz8JeB5wOXeJR?= =?us-ascii?Q?+xMaibEixDCyX3ohMrPCxjb4TgknqAm19kEDjXfbZAul4kijbaTH9+8fBGk8?= =?us-ascii?Q?oE11ez519nFRd6fD6tX12SF+GSM3x0GKKtPiNRxWlZQx8Xx+SkSyBHjAYbMJ?= =?us-ascii?Q?B7K6Id2SWtaXZVfPcVTTR97WPHQ3pS7aj/a4PUSBl+QDfw3uZ9csEv4LVK7k?= =?us-ascii?Q?ouHjuMIqonne2NblaF59Nr+JjI4epyQgZZHulYmP5UALpQxuzP/FcjMywgP1?= =?us-ascii?Q?MDP00TyVon1busA9nfr9ezjE8sSvs5EZbvhW7bEleIi3wLXTZoRxtCfMq4At?= =?us-ascii?Q?6NTRPhUek7rWuEWDcTk3pGtbyljoSPT8D5mYcpwvHqTZ+1kRP3Fqlzp0u0+N?= =?us-ascii?Q?ay9BDipNCzUvowOl36i4TBUZjjXMLxwaCub5TluTpCHG8unMpL7p7q0hjj61?= =?us-ascii?Q?Rcjk5dZChNVYAkzitgbwm0cklgCiHdUfxD03BTOmu6V1N+9P/WCy0FvqkxeW?= =?us-ascii?Q?40qoep4ehKIL6/8WNYXvLttjt1HXA2xdg29iFsZFhvFJdZwxy4a7KRd10XMT?= =?us-ascii?Q?v70rvi2YXgPkk9+tpRDXLEuOC/AKpw8deYYqvNrxlC9cIrhrKHCX55m476X+?= =?us-ascii?Q?0mdUnvqs8unf0GOyFt+DM0zAAErmOGQY9ss56kQ83PL2huwBBdhWvKHwSq2u?= =?us-ascii?Q?sSDJhxMobNrlnYSEW3h57y5beZB8QoWdWuaO1CcQVPHLh2j+RZxrOyXr8RAb?= =?us-ascii?Q?0dy2Ior3gQcaNFGGHzG7zrfWFo1t920msPS0DYC/60PJ/EreCYQxYADMVtUP?= =?us-ascii?Q?FqycXam1nVhctROj5/NPuzN4YRKvfpZS5bN5k/yBt2ucUjUQ70HADH5FbgeD?= =?us-ascii?Q?oj55vfyFlnY6Ya3764G8ZUIsT8QODNUjNnUV2yxb5ywltWQUww+90+aBoo0i?= =?us-ascii?Q?/4zzkuNdL+jHTpRCgMkD0wrskRSfTuyTLDRPAvw+2oFjU7o3mGfqJBjSQXlk?= =?us-ascii?Q?9Cf23JCURfBjW3UrcOgF+2/oAJ95yjb/QSMvGn28QGbJatHsJUnjC4nRrirT?= =?us-ascii?Q?c5sKwysv4VTddttgYMEc59cC1saedph6mw/NCTcPh9PvTyhbFao4t/yCYMzM?= =?us-ascii?Q?ayQTHF+YEk35efmhPWOg/P7a7eTfJgrjbRviRszgHXV4G0U7Ywk4Au6GmO5H?= =?us-ascii?Q?MCXbP0poDMlavwaglkqOwuFVvVZyQE+KXwgY1vrMqSWgO38PFXM2JjvzxIGW?= =?us-ascii?Q?j4NJNU18/2Q7uU0j/ZQVQijR21/sTPCir39l/2uLKNpiH3FnOMixjHGNr+RK?= =?us-ascii?Q?+MtqmxqJEZM6CbI17clmQ+mfAMFZiWzfq7p4QhzcW9NXne2Af6hUTMqX6Ppr?= =?us-ascii?Q?1x5NVIr/NHxqGdRxT16FCaez/XLneqxKQ2ykW5Qi7zVnm52FdfGPyyd/8eq5?= =?us-ascii?Q?xd9N2ksuW639Ly4TrqS2nWMynsEwE3DfkHJFA2WYFzRaXvb4+OMcakJ5EuE7?= =?us-ascii?Q?wLY5+Q=3D=3D?= X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 55910f74-2aa7-4349-4529-08ddbb049fb9 X-MS-Exchange-CrossTenant-AuthSource: PH0PR02MB7159.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2025 14:11:09.1522 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bb047546-786f-4de1-bd75-24e5b6f79043 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: iJVyEugfC9UXW1RaonFNjhdeF2RGjfsLM9NIZr1+U0lQMjk8nEtvVy7D7Ks8aZXUtN2guC9EgaGGXvksEPdwo8xkaq0KRWSORkLB6bKBvVo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR02MB9087 X-Proofpoint-ORIG-GUID: 9ChSWsawEjYhqp1RYJuzHjvGtrPHjxFM X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzA0MDEwNyBTYWx0ZWRfX7bwydgJ4B/yo 3GYumXlwNEOoabjJrNj8C/Rw/qtdKs+PUC0V4zzgKpbt334DyoktQwj+/+gNcn/DG5dIQyzrTmm 0Uo/uU8+BwaDTIVn/EJXL4b/kHlcM1PO+zPQUyPugfJxoEYny1ZEgKerOGj4FBFWxQAgSP3ANzS pOI6JKbH0fIq0WQpdc1WV3mzcra7e2bn5VjUgSmux8w++RpZ4d9pnzFRKSPk8oHjq52EUKP/QdH NDp7Qu9GEMELX4KzqSaItsAd/SERw2mCvfhKBOBmyNvWIFs61jpQf+LhYKviBahhnBOyf8fqXmF UPAdKSjDwL2rtknNT+LgWzP5I3K0FkTiuZ2L3oyzuVlPBKO0e2uoPcNEITUm7DX2sO7HBZJamv7 pRKYiMDeMywl1gbnxeOSfpfiHSEU1cZhyt2IYWKCMT91d0/cWN7gDYwVITjSQCLq873wx0py X-Proofpoint-GUID: 9ChSWsawEjYhqp1RYJuzHjvGtrPHjxFM X-Authority-Analysis: v=2.4 cv=aomyCTZV c=1 sm=1 tr=0 ts=6867e0ff cx=c_pps a=n24abkD4YvNTwWi8vj4pqw==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=Wb1JkmetP80A:10 a=0kUYKlekyDsA:10 a=64Cc0HZtAAAA:8 a=vpq99WT75Wyq1KrgB2QA:9 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.7,FMLib:17.12.80.40 definitions=2025-07-04_05,2025-07-04_01,2025-03-28_01 X-Proofpoint-Spam-Reason: safe Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=148.163.155.12; envelope-from=mark.caveayland@nutanix.com; helo=mx0b-002c1b01.pphosted.com X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.218, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @nutanix.com) X-ZM-MESSAGEID: 1751638360573116600 Content-Type: text/plain; charset="utf-8" PCI is always enabled on the pc-i440fx machine so hardcode the relevant log= ic in pc_init1(). Signed-off-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/i386/pc_piix.c | 194 ++++++++++++++++++---------------------------- 1 file changed, 76 insertions(+), 118 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 76b8543bfe..c9d8a1cdf7 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -71,7 +71,7 @@ =20 #define XEN_IOAPIC_NUM_PIRQS 128ULL =20 -#ifdef CONFIG_IDE_ISA +#ifdef CONFIG_ISAPC static const int ide_iobase[MAX_IDE_BUS] =3D { 0x1f0, 0x170 }; static const int ide_iobase2[MAX_IDE_BUS] =3D { 0x3f6, 0x376 }; static const int ide_irq[MAX_IDE_BUS] =3D { 14, 15 }; @@ -118,6 +118,9 @@ static void pc_init1(MachineState *machine, const char = *pci_type) MemoryRegion *rom_memory =3D system_memory; ram_addr_t lowmem; uint64_t hole64_size =3D 0; + PCIDevice *pci_dev; + DeviceState *dev; + size_t i; =20 /* * Calculate ram split, for memory below and above 4G. It's a bit @@ -188,38 +191,36 @@ static void pc_init1(MachineState *machine, const cha= r *pci_type) kvmclock_create(pcmc->kvmclock_create_always); } =20 - if (pcmc->pci_enabled) { - pci_memory =3D g_new(MemoryRegion, 1); - memory_region_init(pci_memory, NULL, "pci", UINT64_MAX); - rom_memory =3D pci_memory; - - phb =3D OBJECT(qdev_new(TYPE_I440FX_PCI_HOST_BRIDGE)); - object_property_add_child(OBJECT(machine), "i440fx", phb); - object_property_set_link(phb, PCI_HOST_PROP_RAM_MEM, - OBJECT(ram_memory), &error_fatal); - object_property_set_link(phb, PCI_HOST_PROP_PCI_MEM, - OBJECT(pci_memory), &error_fatal); - object_property_set_link(phb, PCI_HOST_PROP_SYSTEM_MEM, - OBJECT(system_memory), &error_fatal); - object_property_set_link(phb, PCI_HOST_PROP_IO_MEM, - OBJECT(system_io), &error_fatal); - object_property_set_uint(phb, PCI_HOST_BELOW_4G_MEM_SIZE, - x86ms->below_4g_mem_size, &error_fatal); - object_property_set_uint(phb, PCI_HOST_ABOVE_4G_MEM_SIZE, - x86ms->above_4g_mem_size, &error_fatal); - object_property_set_str(phb, I440FX_HOST_PROP_PCI_TYPE, pci_type, - &error_fatal); - sysbus_realize_and_unref(SYS_BUS_DEVICE(phb), &error_fatal); - - pcms->pcibus =3D PCI_BUS(qdev_get_child_bus(DEVICE(phb), "pci.0")); - pci_bus_map_irqs(pcms->pcibus, - xen_enabled() ? xen_pci_slot_get_pirq - : pc_pci_slot_get_pirq); - - hole64_size =3D object_property_get_uint(phb, - PCI_HOST_PROP_PCI_HOLE64_SI= ZE, - &error_abort); - } + pci_memory =3D g_new(MemoryRegion, 1); + memory_region_init(pci_memory, NULL, "pci", UINT64_MAX); + rom_memory =3D pci_memory; + + phb =3D OBJECT(qdev_new(TYPE_I440FX_PCI_HOST_BRIDGE)); + object_property_add_child(OBJECT(machine), "i440fx", phb); + object_property_set_link(phb, PCI_HOST_PROP_RAM_MEM, + OBJECT(ram_memory), &error_fatal); + object_property_set_link(phb, PCI_HOST_PROP_PCI_MEM, + OBJECT(pci_memory), &error_fatal); + object_property_set_link(phb, PCI_HOST_PROP_SYSTEM_MEM, + OBJECT(system_memory), &error_fatal); + object_property_set_link(phb, PCI_HOST_PROP_IO_MEM, + OBJECT(system_io), &error_fatal); + object_property_set_uint(phb, PCI_HOST_BELOW_4G_MEM_SIZE, + x86ms->below_4g_mem_size, &error_fatal); + object_property_set_uint(phb, PCI_HOST_ABOVE_4G_MEM_SIZE, + x86ms->above_4g_mem_size, &error_fatal); + object_property_set_str(phb, I440FX_HOST_PROP_PCI_TYPE, pci_type, + &error_fatal); + sysbus_realize_and_unref(SYS_BUS_DEVICE(phb), &error_fatal); + + pcms->pcibus =3D PCI_BUS(qdev_get_child_bus(DEVICE(phb), "pci.0")); + pci_bus_map_irqs(pcms->pcibus, + xen_enabled() ? xen_pci_slot_get_pirq + : pc_pci_slot_get_pirq); + + hole64_size =3D object_property_get_uint(phb, + PCI_HOST_PROP_PCI_HOLE64_SIZE, + &error_abort); =20 /* allocate ram and load rom/bios */ if (!xen_enabled()) { @@ -235,72 +236,51 @@ static void pc_init1(MachineState *machine, const cha= r *pci_type) } } =20 - gsi_state =3D pc_gsi_create(&x86ms->gsi, pcmc->pci_enabled); - - if (pcmc->pci_enabled) { - PCIDevice *pci_dev; - DeviceState *dev; - size_t i; - - pci_dev =3D pci_new_multifunction(-1, pcms->south_bridge); - object_property_set_bool(OBJECT(pci_dev), "has-usb", - machine_usb(machine), &error_abort); - object_property_set_bool(OBJECT(pci_dev), "has-acpi", - x86_machine_is_acpi_enabled(x86ms), - &error_abort); - object_property_set_bool(OBJECT(pci_dev), "has-pic", false, - &error_abort); - object_property_set_bool(OBJECT(pci_dev), "has-pit", false, - &error_abort); - qdev_prop_set_uint32(DEVICE(pci_dev), "smb_io_base", 0xb100); - object_property_set_bool(OBJECT(pci_dev), "smm-enabled", - x86_machine_is_smm_enabled(x86ms), - &error_abort); - dev =3D DEVICE(pci_dev); - for (i =3D 0; i < ISA_NUM_IRQS; i++) { - qdev_connect_gpio_out_named(dev, "isa-irqs", i, x86ms->gsi[i]); - } - pci_realize_and_unref(pci_dev, pcms->pcibus, &error_fatal); - - if (xen_enabled()) { - pci_device_set_intx_routing_notifier( - pci_dev, piix_intx_routing_notifier_xen); - - /* - * Xen supports additional interrupt routes from the PCI devic= es to - * the IOAPIC: the four pins of each PCI device on the bus are= also - * connected to the IOAPIC directly. - * These additional routes can be discovered through ACPI. - */ - pci_bus_irqs(pcms->pcibus, xen_intx_set_irq, pci_dev, - XEN_IOAPIC_NUM_PIRQS); - } + gsi_state =3D pc_gsi_create(&x86ms->gsi, true); + + pci_dev =3D pci_new_multifunction(-1, pcms->south_bridge); + object_property_set_bool(OBJECT(pci_dev), "has-usb", + machine_usb(machine), &error_abort); + object_property_set_bool(OBJECT(pci_dev), "has-acpi", + x86_machine_is_acpi_enabled(x86ms), + &error_abort); + object_property_set_bool(OBJECT(pci_dev), "has-pic", false, + &error_abort); + object_property_set_bool(OBJECT(pci_dev), "has-pit", false, + &error_abort); + qdev_prop_set_uint32(DEVICE(pci_dev), "smb_io_base", 0xb100); + object_property_set_bool(OBJECT(pci_dev), "smm-enabled", + x86_machine_is_smm_enabled(x86ms), + &error_abort); + dev =3D DEVICE(pci_dev); + for (i =3D 0; i < ISA_NUM_IRQS; i++) { + qdev_connect_gpio_out_named(dev, "isa-irqs", i, x86ms->gsi[i]); + } + pci_realize_and_unref(pci_dev, pcms->pcibus, &error_fatal); =20 - isa_bus =3D ISA_BUS(qdev_get_child_bus(DEVICE(pci_dev), "isa.0")); - x86ms->rtc =3D ISA_DEVICE(object_resolve_path_component(OBJECT(pci= _dev), - "rtc")); - piix4_pm =3D object_resolve_path_component(OBJECT(pci_dev), "pm"); - dev =3D DEVICE(object_resolve_path_component(OBJECT(pci_dev), "ide= ")); - pci_ide_create_devs(PCI_DEVICE(dev)); - pcms->idebus[0] =3D qdev_get_child_bus(dev, "ide.0"); - pcms->idebus[1] =3D qdev_get_child_bus(dev, "ide.1"); - } else { - uint32_t irq; + if (xen_enabled()) { + pci_device_set_intx_routing_notifier( + pci_dev, piix_intx_routing_notifier_xen); =20 - isa_bus =3D isa_bus_new(NULL, system_memory, system_io, - &error_abort); - isa_bus_register_input_irqs(isa_bus, x86ms->gsi); + /* + * Xen supports additional interrupt routes from the PCI devices to + * the IOAPIC: the four pins of each PCI device on the bus are also + * connected to the IOAPIC directly. + * These additional routes can be discovered through ACPI. + */ + pci_bus_irqs(pcms->pcibus, xen_intx_set_irq, pci_dev, + XEN_IOAPIC_NUM_PIRQS); + } =20 - x86ms->rtc =3D isa_new(TYPE_MC146818_RTC); - qdev_prop_set_int32(DEVICE(x86ms->rtc), "base_year", 2000); - isa_realize_and_unref(x86ms->rtc, isa_bus, &error_fatal); - irq =3D object_property_get_uint(OBJECT(x86ms->rtc), "irq", - &error_fatal); - isa_connect_gpio_out(ISA_DEVICE(x86ms->rtc), 0, irq); + isa_bus =3D ISA_BUS(qdev_get_child_bus(DEVICE(pci_dev), "isa.0")); + x86ms->rtc =3D ISA_DEVICE(object_resolve_path_component(OBJECT(pci_dev= ), + "rtc")); + piix4_pm =3D object_resolve_path_component(OBJECT(pci_dev), "pm"); + dev =3D DEVICE(object_resolve_path_component(OBJECT(pci_dev), "ide")); + pci_ide_create_devs(PCI_DEVICE(dev)); + pcms->idebus[0] =3D qdev_get_child_bus(dev, "ide.0"); + pcms->idebus[1] =3D qdev_get_child_bus(dev, "ide.1"); =20 - i8257_dma_init(OBJECT(machine), isa_bus, 0); - pcms->hpet_enabled =3D false; - } =20 if (x86ms->pic =3D=3D ON_OFF_AUTO_ON || x86ms->pic =3D=3D ON_OFF_AUTO_= AUTO) { pc_i8259_create(isa_bus, gsi_state->i8259_irq); @@ -314,7 +294,7 @@ static void pc_init1(MachineState *machine, const char = *pci_type) x86_register_ferr_irq(x86ms->gsi[13]); } =20 - pc_vga_init(isa_bus, pcmc->pci_enabled ? pcms->pcibus : NULL); + pc_vga_init(isa_bus, pcms->pcibus); =20 /* init basic PC hardware */ pc_basic_device_init(pcms, isa_bus, x86ms->gsi, x86ms->rtc, @@ -322,28 +302,6 @@ static void pc_init1(MachineState *machine, const char= *pci_type) =20 pc_nic_init(pcmc, isa_bus, pcms->pcibus); =20 -#ifdef CONFIG_IDE_ISA - if (!pcmc->pci_enabled) { - DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; - int i; - - ide_drive_get(hd, ARRAY_SIZE(hd)); - for (i =3D 0; i < MAX_IDE_BUS; i++) { - ISADevice *dev; - char busname[] =3D "ide.0"; - dev =3D isa_ide_init(isa_bus, ide_iobase[i], ide_iobase2[i], - ide_irq[i], - hd[MAX_IDE_DEVS * i], hd[MAX_IDE_DEVS * i += 1]); - /* - * The ide bus name is ide.0 for the first bus and ide.1 for t= he - * second one. - */ - busname[4] =3D '0' + i; - pcms->idebus[i] =3D qdev_get_child_bus(DEVICE(dev), busname); - } - } -#endif - if (piix4_pm) { smi_irq =3D qemu_allocate_irq(pc_acpi_smi_interrupt, first_cpu, 0); =20 --=20 2.43.0 From nobody Thu Dec 18 13:31:22 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=nutanix.com); dmarc=pass(p=none dis=none) header.from=nutanix.com ARC-Seal: i=2; a=rsa-sha256; t=1751638348; cv=pass; d=zohomail.com; s=zohoarc; b=ZczFj9WK2Q57UftifX6oP81vriKHM4ELakWS0PLvQOU+be1EUqc4auetUwl3P+Lms/GyyyyUwdHVBCEGyIKoFhNQJQZyWZoGBF0EWywF9f2xgaMI2gfuUROCd5MUTcunBFBuyrMkoi1GPJKrQndAZpYwHjNJu1yd+la5g6PeCFI= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1751638348; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=SOZPaQfj495WEziRfAVvWeBm3xYiiQ/+WzdVz72+yDI=; b=AZqBbq23rUtgzcgI4216Dnma/JchP0gMahcnyJxH0f+go/8M/OLgbY2PQZFmgugHcTzkg4AgZm1wnDI0Hkxqx+tQ7ZdhDpJraqMZdVJBGc5a/zfLjuPUA4BT8hxvYCUIO3LoUDNrWzWFbdX19DkyUZGPTLjqY95qTpWxUJBamzA= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=nutanix.com); dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1751638348674850.2547664688499; Fri, 4 Jul 2025 07:12:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uXh9J-0002VP-V0; Fri, 04 Jul 2025 10:12:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uXh8M-0000wh-5o for qemu-devel@nongnu.org; Fri, 04 Jul 2025 10:11:26 -0400 Received: from mx0b-002c1b01.pphosted.com ([148.163.155.12]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uXh8H-0004qU-OL for qemu-devel@nongnu.org; Fri, 04 Jul 2025 10:11:20 -0400 Received: from pps.filterd (m0127841.ppops.net [127.0.0.1]) by mx0b-002c1b01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 564CA2ge006302; Fri, 4 Jul 2025 07:11:15 -0700 Received: from byapr05cu005.outbound.protection.outlook.com (mail-westusazon11020133.outbound.protection.outlook.com [52.101.85.133]) by mx0b-002c1b01.pphosted.com (PPS) with ESMTPS id 47jdxb8t3m-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 04 Jul 2025 07:11:14 -0700 (PDT) Received: from PH0PR02MB7159.namprd02.prod.outlook.com (2603:10b6:510:16::8) by IA1PR02MB9087.namprd02.prod.outlook.com (2603:10b6:208:419::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.20; Fri, 4 Jul 2025 14:11:12 +0000 Received: from PH0PR02MB7159.namprd02.prod.outlook.com ([fe80::6cf9:b35c:b143:bb88]) by PH0PR02MB7159.namprd02.prod.outlook.com ([fe80::6cf9:b35c:b143:bb88%3]) with mapi id 15.20.8901.018; Fri, 4 Jul 2025 14:11:12 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nutanix.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= proofpoint20171006; bh=SOZPaQfj495WEziRfAVvWeBm3xYiiQ/+WzdVz72+y DI=; b=w734zG+53/oDGzerrj3CQ5aIkCLlo9EYPbEsH2yX6VqcDWpArepE9i7n6 MN8kqR25QrLdxuNiQ5DZKOouym2TmIypp81xonTrLTiOeFxi3aLx+/hAp5jJ+CuG PyDddxT62XgVxiVPKeB2iTjHpXGqqd7fA56qCFpbNRi32SoPiH5wXKmBrHxndBzC /WEQ7HTJru3XmbLA8mgHxq1+bhHTghad4jZSchNXGkX1L0AOY8NAJvYhP/u39kgC S3iZz2S2kBIwmeky6NRfaNxsbv47fOIkadgHRh2IQXHoVpnKcKIGHNgTJm4RjP8Z xbIxKPyCwxVH7/Uq+DJPlaG8gsjaw== ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=RhdrQRdQfyJO4y+r8MpwB6X+rYxCMBGWAe08gC7Rk0qpenKYm+2VDLq6mEzekDzw6fMwBxNW2mp6/gYUDXJ/RRyp2jsLkxSEvndrqSL+pYrDxIRz1GjagCmemCst6kQzciHVTIImAVCU0YM487v4Ja9MJARtwPMaQx01AfXwanq+QularyHr+7ZlXPU9Gxm5qhIHvyQIRIMG3+6IKutR9BroDpvRZnTs3OazoBFKcVWXRjxk2I8xop6AxcMA+ZEkL2tkMSqPeL5YpNxKQSHCwLxJZfNOoOlDl3wefqaGFWYkSPy3oVbjrcdaEjzN51C95ce1E7nwlVbuGNm2VuzgtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=SOZPaQfj495WEziRfAVvWeBm3xYiiQ/+WzdVz72+yDI=; b=xoMdINDP4zugOGTatj4hoQDBLdRp+eDkNlcISrS9mWZS8gdDr5wR27DiZWKkshFdIsXrbkv/QnysAIsQhaJf+OBueZ3B0meApAzEhxWmP+BA7io/v5lrZv99Aa8R58EF25hjPJOFs3bP/QR0eyLd3t2VeE4p0bUFSiGRQw4SeJNPuIiB9lsrfr7cuszfZox+aZxRnCj+5fu5WEhnEh8q8YSu75kw1TJ3+IpidrsvkNvItCFj60bkeu72/koAuVg1AGQS3ayXXJ7yqpdDVhqm9ZzMGPbnzZLGN7B2s4AWaLEo34wHidzvRD1ElvzLZVFraDNXaqnZkjoEq20540DpDw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nutanix.com; dmarc=pass action=none header.from=nutanix.com; dkim=pass header.d=nutanix.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nutanix.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SOZPaQfj495WEziRfAVvWeBm3xYiiQ/+WzdVz72+yDI=; b=PcOrpRFPCr1403vCKEOGrIwdX5f4TOQEb/5ABbdz2HS7zuV/h67DV3km5OaCdUixZTkM5ZYBsTK+MkEEEs5p/lhm8LlYeScsHtWJDOmSqdGCC/v9cFTwNKMWb/zDT+Uccd+Jpilh8ZXIWzzBuZ3o4Im42yxVi5GmjJIg9JJSoX86a6HqVnDrqVHPZ9PvjVUfPy/DzKe9kDt8APf/1PPYXxIORNakCNbPY454dltwmciQRU7udtCzt1Ae2Pf/6xSHkCQ+y44zeb1Bpp2IuaHnGl1yo0aidex7yeCx/c9rXyHuNLtq287ArpA45EHz8koSSdOZZeWbe7/NuGTfD81rGQ== From: Mark Cave-Ayland To: pbonzini@redhat.com, mst@redhat.com, marcel.apfelbaum@gmail.com, eduardo@habkost.net, imammedo@redhat.com, qemu-devel@nongnu.org Subject: [PATCH v3 14/14] hw/i386: move isapc machine to separate isapc.c file Date: Fri, 4 Jul 2025 15:09:41 +0100 Message-ID: <20250704141018.674268-15-mark.caveayland@nutanix.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250704141018.674268-1-mark.caveayland@nutanix.com> References: <20250704141018.674268-1-mark.caveayland@nutanix.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS4P189CA0045.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:5dd::17) To PH0PR02MB7159.namprd02.prod.outlook.com (2603:10b6:510:16::8) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR02MB7159:EE_|IA1PR02MB9087:EE_ X-MS-Office365-Filtering-Correlation-Id: 249d315b-4477-4d1b-2d6e-08ddbb04a1ec x-proofpoint-crosstenant: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|10070799003|376014|366016|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?12Jo5w943+57t6H4L6I3Wawv21VTLY3Rlc8hba++/A0PzNC1Zw6a7JQqBjVx?= =?us-ascii?Q?I79GIGnHtqblpHp8U2kyME2wkXQRus2jsC+anbcZmNjb22pTW70omSmkiQRM?= =?us-ascii?Q?aVXh9Cjc4YqF7lHCmfSg3rg2KwcBnMp5NklLGBYgSkXfQowmCRaENWGe64yE?= =?us-ascii?Q?2hiQP6WVx/M3Gj07A39CX49OPDaem4NY6KTGAnv4zYYJSuVe3IlW58MnZmiC?= =?us-ascii?Q?JIB8UU8Iv0qMBXGt5LzqfS/MfI0PRQnLtnhiIRMQI02LnF7gvT7dY+OffeS/?= =?us-ascii?Q?tScqOJQaB6pbTb+ydPNUBRYmCJqC9+FmZSLXLFjblcm5Jzd0KlvDa6S7F/zZ?= =?us-ascii?Q?/MgTKmbVmNs3ttvQEovuOC92l13QSzv07Rogp0NfNAU0wNr+fd98FZ+niSyc?= =?us-ascii?Q?AIB9IqWxyyNuaA32AkC94ox7QrSv7Sdn+86yYcPB1AVTPAI70U2kKa+tYoAl?= =?us-ascii?Q?/81KvCclE8sOdjU+Sojl9YXODghUZmRqnw6silJjuR7GhP6jzxDvzInQ+7at?= =?us-ascii?Q?mMvNy0RL408OAJ6c/0OvZuar4+/sMs1/qtS0oVPW4SJAl3gzYuYFSFzhx0u4?= =?us-ascii?Q?Mbwz2G294CVHuES9r1MnW1XDWL0DBSVsKB2Pvwllpq8a6KUdBw3KvMnj6Q1I?= =?us-ascii?Q?b8IkBFtjtQ0lhfTQYf0vWSrJ/0NPbve/UQDxjOHdoi3vpeWFp2Pf2NonysAA?= =?us-ascii?Q?wlEaNljYTNh7dwgiulPlCNoshNiql4rOTmOlPxgYsYd3FIv772yELLTK2WJE?= =?us-ascii?Q?3Jjj42ljk9R9V+LpTFRlr6TijIAFvAw08/Ka8/9Y4DO9uHdACSD6X4bQsu1D?= =?us-ascii?Q?/fGi+u2tia35fSspdvfAfGat4V2tKUYb/gEkj0xxqCxdoKW0BUpiJFxUcDf+?= =?us-ascii?Q?4W/pWeOVo8vfUxw1xeNJrQknghfZ7VE/sCyjMhAVmDON2L9t6GZGwdVpm8T7?= =?us-ascii?Q?7WKo/bUxg5VX0NC9LPZcne/PuTS+2elaEfR56s13zdP0wCxBc8YdGGmvo7Ck?= =?us-ascii?Q?3yFg8WclBD3O4XrtnW9rUFo5Y6jmOq74YJI3L7IQTv5kZp1ItsC9zCnx9sF5?= =?us-ascii?Q?xxITOwCa90TTQ7AL2ns8qZRNbtzyHbNq+MsCOq8NOJNIfoYnRulSzWqgdKGk?= =?us-ascii?Q?IxTIXICCm9CzN0kxP4XwSxSVFSRv8nCXEhSOdd1I4I5RR77Hq0XVneywgWaN?= =?us-ascii?Q?g9NtTo33cZWxOp3p6fI4IBaRSrpvT/VDoX+enI4TVTmI+lAORtCSKJJV6Fjg?= =?us-ascii?Q?c1hxDya9V46giOXtn9eqc0nLOGtkQvyg43pg32W0NSSMs0EQLj74PbrVb9FP?= =?us-ascii?Q?g3NpSpP6pEyypbf1oMJBn+A7vu4CrrSZMZk058bkYEwXEm9yQTkYxrA/z7vU?= =?us-ascii?Q?rEJYFXrTgXhUtbX7PJg1KA5KZPDt5hUTSBla8/LUxraw+wuLXeSLi17/Hsmq?= =?us-ascii?Q?qOrJkNaEGbU=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR02MB7159.namprd02.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(10070799003)(376014)(366016)(1800799024); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?hmRAS0f7VIgTrZ+XFBH3ywZUPQl7UMnTPe6D92PmXhhjuqNwpaKiYNY8rv7p?= =?us-ascii?Q?vWF2sDMiecJHUjXv/aVJZVUzIVbG2KejJTXusm2nphFm4r6XhW/MJqefnxwx?= =?us-ascii?Q?luBgYwpOlQfG1oI4Y/yZ8X22szzoOZtqz1jS8BlhffPnKTyozx/dGDdcisKp?= =?us-ascii?Q?qNp/tdcLXPDrzjWqOI5H7FsGhxmk1mLZsHbRFORJBz/GxHBrV0MCPZ4pHcqd?= =?us-ascii?Q?L2Vnfi5K/LHVH2tXYjhSMPWw4uqXiSPO0FEeZT9PnZ8iA5PVcmWc7dIC4Bf0?= =?us-ascii?Q?HMgcBpxrUq5n680EJHv+yG8/GTILa2Hg5ltjtR/OgsLZLdeWP8xykYslQqt4?= =?us-ascii?Q?q3SN0xIFWmMrIE5QEFkhUlQ16l918wBL5MzQxxQkONnCUfbAy7im4jq+0gn3?= =?us-ascii?Q?r8C/dMdWvF1fGdCjGnZ7tiTno0PUpPDh0RxmkdeJN1pFIhJvoocfPgQkiyNx?= =?us-ascii?Q?sPIxMt2Kg7ePbn1pLK3HdW5Yd3GJV0eZ0cNdmfa1PQTASU16PDIm6O4SFGro?= =?us-ascii?Q?ZB19NjoWVXInlp5OoF09JrAvqp+eihbVHhZJ+IfsbgPKx0C3P4TmzF/gfJ3Q?= =?us-ascii?Q?QmL/YEwXdxRxJpDyMtybGNM6A9WfZadEKbsBY304N9LXs9uKZyGs/FPOnDw+?= =?us-ascii?Q?KpR/cy2gHY5Dxq0HRXguijYDUaM934kF1vQLa4ytOCNpkaP8lalt7uLAvBD6?= =?us-ascii?Q?F9CCVNe/D7gwy4uxj8yBE+fTTb/rv4sJuo31sMoWOh927N8IvVGSd/47cPXm?= =?us-ascii?Q?IOa7bqRvcmT1LcUuY7o4sRXDQ1psb5EaEkk4ZHJl6fVAOYi9qElcdRVOrUub?= =?us-ascii?Q?C1MEo2Aawjqz7gP8bLZ3MAuUVKsQq+y805J106Wj20RnDVWkRXC/u8s11BnC?= =?us-ascii?Q?2NGHrO/CjaritCVQ79YoaIbP8uEvz4B6nUXvqXjdmwQrBQqjNMIMrYH+JHhH?= =?us-ascii?Q?I79baIjuGDGNALl2Mghj0wLg9esrinjgOtsx/Ln60+533i9s9kULa0/+uzgj?= =?us-ascii?Q?pCzUTjYYBZUyXYuusoTpzp/Q7CnIBvNXzQt8r8u7s1W1u34BVPtyZtUXmlp2?= =?us-ascii?Q?9Qsp/9WXYHYGBPLJnH0HA3gywqOz4zyVPy4+SdH15afk+RumFycQ0fYJIyeS?= =?us-ascii?Q?/A6B5CJMXzgqFcfIS42+G3CGQJhLt1G86nURe7jG99nPJrPaYpoNt6VEMVBs?= =?us-ascii?Q?jeaYdJzA5IQ9+mIuaVro2+WMiOl4EZPdeSbb3WHOismRpZKDw72OMkynvryI?= =?us-ascii?Q?AVA+/MnykYxsyNcFlx1GkySY1YZnfhv7KtM2j06l15SqgSk79RAmkU8gkI4J?= =?us-ascii?Q?kBrBlFjGldbVtI3gFHOdOgOzmt5ffnCILnI9W17Gz22D6qBnhtlnGN4Up2Kf?= =?us-ascii?Q?A82j2z/PXWeJVKpb6J2Eh9sMAc8NwRe3+Zi6FHQAClvq1pbj8+QbBVFcRQeJ?= =?us-ascii?Q?FGKC9jRpmdFT5QmgwBBWBqaGVpWROEJtW+fR23MQ+2GwcmdeaI5kWCFwGrcX?= =?us-ascii?Q?TovonQAr18JCsTvM4k6/AKswUU4sUfZZLnbapoMDrgz0dX08nZpT/mv7CYEd?= =?us-ascii?Q?QIsFtWn0hVHbH/ZBkXRTRgsLu6eFwYPzPhRoWVGHjHi17SpDE7AV2qn+LEAD?= =?us-ascii?Q?v0Ft0mnOxOxyQmQLgZsDVWTQRYEQc9PcFRCURwSXmnxH2wYcywFB6hM+XjrL?= =?us-ascii?Q?71DsnA=3D=3D?= X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 249d315b-4477-4d1b-2d6e-08ddbb04a1ec X-MS-Exchange-CrossTenant-AuthSource: PH0PR02MB7159.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jul 2025 14:11:12.8357 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bb047546-786f-4de1-bd75-24e5b6f79043 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: pPF4UGlOXwAQAxvbI8CyXKJpXPykzhdWomj6CB18h9rB17KYxT9CCEq6gn57W+9pKqV8QIfu8g0KAoBer8E2Tb6PvYef8VHBAUt9USDuHB0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR02MB9087 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzA0MDEwNyBTYWx0ZWRfX2f+jKB+FLlZ9 yLJ1443DSbb71hu60hrkKcVxR8ByBRCHLN6kqQaqQZnbv/oi9Sj5E8B901PhpG4pxpsEDciSCk3 5a9uPzOT5BUFCjGfuFG3rGPqHlkORDIVhMFpjPywQVzbeEXhLH6zTXNbBNHA4hgDLkLtGmyK7EJ ZfaTjmziiDAALLuyrM1qLqRKVnJaMhCoUHrwWjB7dq3maDinJHf7DHqGUXGiru2ZVBDZ/FslWwv DAdpeJaB6I0IxkIYCYfrWJV1r3vog4dyjwksOmyLhdbFq5ZfPqVg3SmY+ysT7H3SHOGJ+7aI+ES 9PhgqZ9+pyE0SIacKA2EBeQ6j4otszeoaRlWVRCNMM6jNsDhBTTZR94S0y1no0c6uO7uZlBqePe O51bKnXVlPXWuZm3aqXQXY51G7FhMf/b4uetN1gdbH23kZROELMFEe0ehNsHDEEImqPPjdoa X-Proofpoint-GUID: D3Vn1O1D1aQJdKHHmW6MAPcyY_YJn-qp X-Proofpoint-ORIG-GUID: D3Vn1O1D1aQJdKHHmW6MAPcyY_YJn-qp X-Authority-Analysis: v=2.4 cv=c+2rQQ9l c=1 sm=1 tr=0 ts=6867e103 cx=c_pps a=HNo1bxtHJBcBpsuwJpMK3g==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=Wb1JkmetP80A:10 a=0kUYKlekyDsA:10 a=64Cc0HZtAAAA:8 a=Pbl5c31VFoorxvNN0s8A:9 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.7,FMLib:17.12.80.40 definitions=2025-07-04_05,2025-07-04_01,2025-03-28_01 X-Proofpoint-Spam-Reason: safe Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=148.163.155.12; envelope-from=mark.caveayland@nutanix.com; helo=mx0b-002c1b01.pphosted.com X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.218, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @nutanix.com) X-ZM-MESSAGEID: 1751638350182116600 Content-Type: text/plain; charset="utf-8" Now that pc_init_isa() is independent of any PCI initialisation, move it in= to a separate isapc.c file. This enables us to finally fix the dependency of ISA= PC on I440FX in hw/i386/Kconfig. Note that as part of the move to a separate file we can see that the licenc= e text is a verbatim copy of the MIT licence. The text originates from commit 1df9= 12cf9e ("VL license of the day is MIT/BSD") so we can be sure that this was the or= iginal intent. As a consequence we can update the file header to use a SPDX tag as= per the current project contribution guidelines. Signed-off-by: Mark Cave-Ayland Reviewed-by: Bernhard Beschow shentey@gmail.com> --- hw/i386/Kconfig | 3 - hw/i386/isapc.c | 169 ++++++++++++++++++++++++++++++++++++++++++++ hw/i386/meson.build | 1 + hw/i386/pc_piix.c | 148 -------------------------------------- 4 files changed, 170 insertions(+), 151 deletions(-) create mode 100644 hw/i386/isapc.c diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index eb65bda6e0..a7c746fe9e 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -96,9 +96,6 @@ config ISAPC select ISA_BUS select PC select IDE_ISA - # FIXME: it is in the same file as i440fx, and does not compile - # if separated - depends on I440FX =20 config Q35 bool diff --git a/hw/i386/isapc.c b/hw/i386/isapc.c new file mode 100644 index 0000000000..5ac077a860 --- /dev/null +++ b/hw/i386/isapc.c @@ -0,0 +1,169 @@ +/* + * QEMU PC System Emulator + * + * Copyright (c) 2003-2004 Fabrice Bellard + * + * SPDX-License-Identifier: MIT + */ + +#include "qemu/osdep.h" + +#include "hw/char/parallel-isa.h" +#include "hw/dma/i8257.h" +#include "hw/loader.h" +#include "hw/i386/pc.h" +#include "hw/ide/isa.h" +#include "hw/ide/ide-bus.h" +#include "system/kvm.h" +#include "hw/i386/kvm/clock.h" +#include "hw/xen/xen-x86.h" +#include "system/xen.h" +#include "hw/rtc/mc146818rtc.h" +#include "target/i386/cpu.h" + +static const int ide_iobase[MAX_IDE_BUS] =3D { 0x1f0, 0x170 }; +static const int ide_iobase2[MAX_IDE_BUS] =3D { 0x3f6, 0x376 }; +static const int ide_irq[MAX_IDE_BUS] =3D { 14, 15 }; + + +static void pc_init_isa(MachineState *machine) +{ + PCMachineState *pcms =3D PC_MACHINE(machine); + PCMachineClass *pcmc =3D PC_MACHINE_GET_CLASS(pcms); + X86MachineState *x86ms =3D X86_MACHINE(machine); + MemoryRegion *system_memory =3D get_system_memory(); + MemoryRegion *system_io =3D get_system_io(); + ISABus *isa_bus; + GSIState *gsi_state; + MemoryRegion *ram_memory; + MemoryRegion *rom_memory =3D system_memory; + DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; + uint32_t irq; + int i; + + /* + * There is no RAM split for the isapc machine + */ + if (xen_enabled()) { + xen_hvm_init_pc(pcms, &ram_memory); + } else { + ram_memory =3D machine->ram; + + pcms->max_ram_below_4g =3D 0xe0000000; /* default: 3.5G */ + x86ms->above_4g_mem_size =3D 0; + x86ms->below_4g_mem_size =3D machine->ram_size; + } + + /* + * There is a small chance that someone unintentionally passes "-cpu m= ax" + * for the isapc machine, which will provide a much more modern 32-bit + * CPU than would be expected for an ISA-era PC. If the "max" cpu type= has + * been specified, choose the "best" 32-bit cpu possible which we cons= ider + * be the pentium3 (deliberately choosing an Intel CPU given that the + * default 486 CPU for the isapc machine is also an Intel CPU). + */ + if (!strcmp(machine->cpu_type, X86_CPU_TYPE_NAME("max"))) { + machine->cpu_type =3D X86_CPU_TYPE_NAME("pentium3"); + } + + x86_cpus_init(x86ms, pcmc->default_cpu_version); + + if (kvm_enabled()) { + kvmclock_create(pcmc->kvmclock_create_always); + } + + /* allocate ram and load rom/bios */ + if (!xen_enabled()) { + pc_memory_init(pcms, system_memory, rom_memory, 0); + } else { + assert(machine->ram_size =3D=3D x86ms->below_4g_mem_size + + x86ms->above_4g_mem_size); + + if (machine->kernel_filename !=3D NULL) { + /* For xen HVM direct kernel boot, load linux here */ + xen_load_linux(pcms); + } + } + + gsi_state =3D pc_gsi_create(&x86ms->gsi, false); + + isa_bus =3D isa_bus_new(NULL, system_memory, system_io, + &error_abort); + isa_bus_register_input_irqs(isa_bus, x86ms->gsi); + + x86ms->rtc =3D isa_new(TYPE_MC146818_RTC); + qdev_prop_set_int32(DEVICE(x86ms->rtc), "base_year", 2000); + isa_realize_and_unref(x86ms->rtc, isa_bus, &error_fatal); + irq =3D object_property_get_uint(OBJECT(x86ms->rtc), "irq", + &error_fatal); + isa_connect_gpio_out(ISA_DEVICE(x86ms->rtc), 0, irq); + + i8257_dma_init(OBJECT(machine), isa_bus, 0); + pcms->hpet_enabled =3D false; + + if (x86ms->pic =3D=3D ON_OFF_AUTO_ON || x86ms->pic =3D=3D ON_OFF_AUTO_= AUTO) { + pc_i8259_create(isa_bus, gsi_state->i8259_irq); + } + + if (tcg_enabled()) { + x86_register_ferr_irq(x86ms->gsi[13]); + } + + pc_vga_init(isa_bus, NULL); + + /* init basic PC hardware */ + pc_basic_device_init(pcms, isa_bus, x86ms->gsi, x86ms->rtc, + !MACHINE_CLASS(pcmc)->no_floppy, 0x4); + + pc_nic_init(pcmc, isa_bus, NULL); + + ide_drive_get(hd, ARRAY_SIZE(hd)); + for (i =3D 0; i < MAX_IDE_BUS; i++) { + ISADevice *dev; + char busname[] =3D "ide.0"; + dev =3D isa_ide_init(isa_bus, ide_iobase[i], ide_iobase2[i], + ide_irq[i], + hd[MAX_IDE_DEVS * i], hd[MAX_IDE_DEVS * i + 1]); + /* + * The ide bus name is ide.0 for the first bus and ide.1 for the + * second one. + */ + busname[4] =3D '0' + i; + pcms->idebus[i] =3D qdev_get_child_bus(DEVICE(dev), busname); + } +} + +static void isapc_machine_options(MachineClass *m) +{ + static const char * const valid_cpu_types[] =3D { + X86_CPU_TYPE_NAME("486"), + X86_CPU_TYPE_NAME("athlon"), + X86_CPU_TYPE_NAME("kvm32"), + X86_CPU_TYPE_NAME("pentium"), + X86_CPU_TYPE_NAME("pentium2"), + X86_CPU_TYPE_NAME("pentium3"), + X86_CPU_TYPE_NAME("qemu32"), + X86_CPU_TYPE_NAME("max"), + NULL + }; + PCMachineClass *pcmc =3D PC_MACHINE_CLASS(m); + + m->desc =3D "ISA-only PC"; + m->max_cpus =3D 1; + m->option_rom_has_mr =3D true; + m->rom_file_has_mr =3D false; + pcmc->pci_enabled =3D false; + pcmc->has_acpi_build =3D false; + pcmc->smbios_defaults =3D false; + pcmc->gigabyte_align =3D false; + pcmc->smbios_legacy_mode =3D true; + pcmc->has_reserved_memory =3D false; + m->default_nic =3D "ne2k_isa"; + m->default_cpu_type =3D X86_CPU_TYPE_NAME("486"); + m->valid_cpu_types =3D valid_cpu_types; + m->no_floppy =3D !module_object_class_by_name(TYPE_ISA_FDC); + m->no_parallel =3D !module_object_class_by_name(TYPE_ISA_PARALLEL); +} + +DEFINE_PC_MACHINE(isapc, "isapc", pc_init_isa, + isapc_machine_options); diff --git a/hw/i386/meson.build b/hw/i386/meson.build index 7896f348cf..436b3ce52d 100644 --- a/hw/i386/meson.build +++ b/hw/i386/meson.build @@ -14,6 +14,7 @@ i386_ss.add(when: 'CONFIG_X86_IOMMU', if_true: files('x86= -iommu.c'), i386_ss.add(when: 'CONFIG_AMD_IOMMU', if_true: files('amd_iommu.c'), if_false: files('amd_iommu-stub.c')) i386_ss.add(when: 'CONFIG_I440FX', if_true: files('pc_piix.c')) +i386_ss.add(when: 'CONFIG_ISAPC', if_true: files('isapc.c')) i386_ss.add(when: 'CONFIG_MICROVM', if_true: files('x86-common.c', 'microv= m.c', 'acpi-microvm.c', 'microvm-dt.c')) i386_ss.add(when: 'CONFIG_NITRO_ENCLAVE', if_true: files('nitro_enclave.c'= )) i386_ss.add(when: 'CONFIG_Q35', if_true: files('pc_q35.c')) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index c9d8a1cdf7..8d0dfd881d 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -71,12 +71,6 @@ =20 #define XEN_IOAPIC_NUM_PIRQS 128ULL =20 -#ifdef CONFIG_ISAPC -static const int ide_iobase[MAX_IDE_BUS] =3D { 0x1f0, 0x170 }; -static const int ide_iobase2[MAX_IDE_BUS] =3D { 0x3f6, 0x376 }; -static const int ide_irq[MAX_IDE_BUS] =3D { 14, 15 }; -#endif - /* * Return the global irq number corresponding to a given device irq * pin. We could also use the bus number to have a more precise mapping. @@ -373,111 +367,6 @@ static void pc_set_south_bridge(Object *obj, int valu= e, Error **errp) pcms->south_bridge =3D PCSouthBridgeOption_lookup.array[value]; } =20 -#ifdef CONFIG_ISAPC -static void pc_init_isa(MachineState *machine) -{ - PCMachineState *pcms =3D PC_MACHINE(machine); - PCMachineClass *pcmc =3D PC_MACHINE_GET_CLASS(pcms); - X86MachineState *x86ms =3D X86_MACHINE(machine); - MemoryRegion *system_memory =3D get_system_memory(); - MemoryRegion *system_io =3D get_system_io(); - ISABus *isa_bus; - GSIState *gsi_state; - MemoryRegion *ram_memory; - MemoryRegion *rom_memory =3D system_memory; - DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; - int i; - - /* - * There is no RAM split for the isapc machine - */ - if (xen_enabled()) { - xen_hvm_init_pc(pcms, &ram_memory); - } else { - ram_memory =3D machine->ram; - - pcms->max_ram_below_4g =3D 0xe0000000; /* default: 3.5G */ - x86ms->above_4g_mem_size =3D 0; - x86ms->below_4g_mem_size =3D machine->ram_size; - } - - /* - * There is a small chance that someone unintentionally passes "-cpu m= ax" - * for the isapc machine, which will provide a much more modern 32-bit - * CPU than would be expected for an ISA-era PC. If the "max" cpu type= has - * been specified, choose the "best" 32-bit cpu possible which we cons= ider - * be the pentium3 (deliberately choosing an Intel CPU given that the - * default 486 CPU for the isapc machine is also an Intel CPU). - */ - if (!strcmp(machine->cpu_type, X86_CPU_TYPE_NAME("max"))) { - machine->cpu_type =3D X86_CPU_TYPE_NAME("pentium3"); - } - - x86_cpus_init(x86ms, pcmc->default_cpu_version); - - if (kvm_enabled()) { - kvmclock_create(pcmc->kvmclock_create_always); - } - - /* allocate ram and load rom/bios */ - if (!xen_enabled()) { - pc_memory_init(pcms, system_memory, rom_memory, 0); - } else { - assert(machine->ram_size =3D=3D x86ms->below_4g_mem_size + - x86ms->above_4g_mem_size); - - if (machine->kernel_filename !=3D NULL) { - /* For xen HVM direct kernel boot, load linux here */ - xen_load_linux(pcms); - } - } - - gsi_state =3D pc_gsi_create(&x86ms->gsi, false); - - isa_bus =3D isa_bus_new(NULL, system_memory, system_io, - &error_abort); - isa_bus_register_input_irqs(isa_bus, x86ms->gsi); - - x86ms->rtc =3D isa_new(TYPE_MC146818_RTC); - qdev_prop_set_int32(DEVICE(x86ms->rtc), "base_year", 2000); - isa_realize_and_unref(x86ms->rtc, isa_bus, &error_fatal); - - i8257_dma_init(OBJECT(machine), isa_bus, 0); - pcms->hpet_enabled =3D false; - - if (x86ms->pic =3D=3D ON_OFF_AUTO_ON || x86ms->pic =3D=3D ON_OFF_AUTO_= AUTO) { - pc_i8259_create(isa_bus, gsi_state->i8259_irq); - } - - if (tcg_enabled()) { - x86_register_ferr_irq(x86ms->gsi[13]); - } - - pc_vga_init(isa_bus, NULL); - - /* init basic PC hardware */ - pc_basic_device_init(pcms, isa_bus, x86ms->gsi, x86ms->rtc, - !MACHINE_CLASS(pcmc)->no_floppy, 0x4); - - pc_nic_init(pcmc, isa_bus, NULL); - - ide_drive_get(hd, ARRAY_SIZE(hd)); - for (i =3D 0; i < MAX_IDE_BUS; i++) { - ISADevice *dev; - char busname[] =3D "ide.0"; - dev =3D isa_ide_init(isa_bus, ide_iobase[i], ide_iobase2[i], - ide_irq[i], - hd[MAX_IDE_DEVS * i], hd[MAX_IDE_DEVS * i + 1]= ); - /* - * The ide bus name is ide.0 for the first bus and ide.1 for the - * second one. - */ - busname[4] =3D '0' + i; - pcms->idebus[i] =3D qdev_get_child_bus(DEVICE(dev), busname); - } -} -#endif - #ifdef CONFIG_XEN static void pc_xen_hvm_init_pci(MachineState *machine) { @@ -839,43 +728,6 @@ static void pc_i440fx_machine_2_6_options(MachineClass= *m) =20 DEFINE_I440FX_MACHINE(2, 6); =20 -#ifdef CONFIG_ISAPC -static void isapc_machine_options(MachineClass *m) -{ - static const char * const valid_cpu_types[] =3D { - X86_CPU_TYPE_NAME("486"), - X86_CPU_TYPE_NAME("athlon"), - X86_CPU_TYPE_NAME("kvm32"), - X86_CPU_TYPE_NAME("pentium"), - X86_CPU_TYPE_NAME("pentium2"), - X86_CPU_TYPE_NAME("pentium3"), - X86_CPU_TYPE_NAME("qemu32"), - X86_CPU_TYPE_NAME("max"), - NULL - }; - PCMachineClass *pcmc =3D PC_MACHINE_CLASS(m); - - m->desc =3D "ISA-only PC"; - m->max_cpus =3D 1; - m->option_rom_has_mr =3D true; - m->rom_file_has_mr =3D false; - pcmc->pci_enabled =3D false; - pcmc->has_acpi_build =3D false; - pcmc->smbios_defaults =3D false; - pcmc->gigabyte_align =3D false; - pcmc->smbios_legacy_mode =3D true; - pcmc->has_reserved_memory =3D false; - m->default_nic =3D "ne2k_isa"; - m->default_cpu_type =3D X86_CPU_TYPE_NAME("486"); - m->valid_cpu_types =3D valid_cpu_types; - m->no_floppy =3D !module_object_class_by_name(TYPE_ISA_FDC); - m->no_parallel =3D !module_object_class_by_name(TYPE_ISA_PARALLEL); -} - -DEFINE_PC_MACHINE(isapc, "isapc", pc_init_isa, - isapc_machine_options); -#endif - #ifdef CONFIG_XEN static void xenfv_machine_4_2_options(MachineClass *m) { --=20 2.43.0