From nobody Sat Nov 15 23:39:34 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=1745582174; cv=pass; d=zohomail.com; s=zohoarc; b=BMEqtoXoT1cCMrdR9sJMLyvFoOVw1KdmAq4Zd/Qf5k6eCjB51POHj1MwOHEjbcS+0wpnKAOPqXKIt94CxmW2aa3BLdCz0M+v1FYnaT331shBfcSpSMbss4ZrpeUngr7skWlluCslaGbhoknhHjrD2OokYoo939ugPJ0VGP/hGk4= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745582174; 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=U2NEKqiSH51uUeN6jrStXnM53WxV4lHYi8lZeFPMWaM=; b=eyX+8jKu2FOvS1aFdHDn0TLnKAD0cFmpwTtBvKmEFg2xjQQu/bJ00sH97qV1Qc+Of+VSkVkjwyPjfCkkRCYG+qq4UZu3CBfALZUKlTZrKHC2agVhjdR7usVeSYhdqTb0/W1Tp2tCcL0lBQo6sO32ginWWQYVCWCQOQJi8ik2WMs= 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 1745582174682434.62196547046653; Fri, 25 Apr 2025 04:56:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u8HdM-0008Ko-AE; Fri, 25 Apr 2025 07:54:20 -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 1u8HdK-0008KE-7K for qemu-devel@nongnu.org; Fri, 25 Apr 2025 07:54:18 -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 1u8HdG-0000Nt-A0 for qemu-devel@nongnu.org; Fri, 25 Apr 2025 07:54:17 -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 53OMD4jC002322; Fri, 25 Apr 2025 04:54:09 -0700 Received: from cy4pr05cu001.outbound.protection.outlook.com (mail-westcentralusazlp17010004.outbound.protection.outlook.com [40.93.6.4]) by mx0a-002c1b01.pphosted.com (PPS) with ESMTPS id 467ww7s9ua-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 25 Apr 2025 04:54:09 -0700 (PDT) Received: from DM5PR02MB3356.namprd02.prod.outlook.com (2603:10b6:4:61::16) by BY1PR02MB10337.namprd02.prod.outlook.com (2603:10b6:a03:5ae::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8699.10; Fri, 25 Apr 2025 11:54:07 +0000 Received: from DM5PR02MB3356.namprd02.prod.outlook.com ([fe80::72bd:6790:f9e7:f241]) by DM5PR02MB3356.namprd02.prod.outlook.com ([fe80::72bd:6790:f9e7:f241%3]) with mapi id 15.20.8606.029; Fri, 25 Apr 2025 11:54:07 +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=U2NEKqiSH51uUeN6jrStXnM53WxV4lHYi8lZeFPMW aM=; b=mPjGL4a6GL3ROEyQVRJ6jjtXnYTD3M14joUd9XXJnc91LeOlbx0Up1s/x GD43vX8PxbCQ8hblmzXAlFWrIDXbM8u32Z0pLZDSJbsBz/z9QMGpqI3uEjwmRDl2 xs0JNLEuA1Y2wVaKmS3SIqh/J3SI0/k2rvEr12CVOr9KxyNwJLpIdB3hpUIQhEa1 iRcKXfZuoYZoQ6lEtOY/lSgU0uXm6J40fTbquLKVO/X44vitphSs0OzJ2x3ZY371 EWTrwNhq889kkktFW/mwr2Aw3dHEFpO5IVFPLYBdEZ9PCDPc2FCt2yJmZA3M4WEZ 7UMHCqSWocmuk8/NpawpCOKdKBg5Q== ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=r7LmUJ5Fnd3+3+efrziRqdXjN3bl+ywE5Se0S5qcAQwUU0huWLHl8mG6e1KO6seLmyctiJ0LT5nortsOkMO8MxbFMWXM/+Nr44/EnQ/if770hO/0at8rO2gigF/voW4xerFG/J/jioSAy9MgpCDld5CraMRhee6EvRp/WFDRMshQmMYMrjoirutJJe1cPekWFSV0A7QqYnSJv/O1qUe0xSLbNeJsYHukSdEfI89RCJ3CQ7QYFfZzsprvHDkdut+jwzAlLG+523Ur1RRRBNMmT2KMdAreZQ6XHLKkpg4uNPjegy2X7jk0czSb/7GnVoksvhHmPvM77a0qDucJU6PAXA== 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=U2NEKqiSH51uUeN6jrStXnM53WxV4lHYi8lZeFPMWaM=; b=jh0vlUUPK3slE1czbIR8JdQC9JzJF22rVbtOCNW4pSYJizL1LYC+hLFxo3Z0QcvTU5A1tJC8LSYwx1BA7XU5Y/1maP4BTBYyzI4/b/MzK+6iZ9fdSTTJCMZZ0RISORjs8d+JtjTuq8wD3vrrROD/SYHreow3quRzeWOF6KcsFlyCuXyEdnsLu/kERGi81XK8baQEB6yoiG8k5uMPjC3FPBrQiULoHg9N1Q95CljFyYE/xFvukyYZp4uBD9Dv3nvbKZcqaRXXV0R8npQo//7M+mwlJ+PY1x8A76okCHednYcT3QeWirD43EkzgBRn90uYwsvkoXZfPJLfnUO8RpAImw== 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=U2NEKqiSH51uUeN6jrStXnM53WxV4lHYi8lZeFPMWaM=; b=ViPDfIt2pONGkMFfepePIwm22hHmp+qXQGWROGUAGx7KVjijgnMhgGimhVboET1JnEngJsA69ggmO2w+wyNlMtVH7uP3nJmiNzPsQ+dqtNyo2oKf5d6jOc+y2vCGOAoVUd4bVtlqNoKxmYHYKVLBLPn/dpiNQFumyAZqSmywJHvbiZJWhaPU9MNgu8+594xw40iS41bd4t2yj5AcPtZ9a4baLQv/4zWNZ7h4oBzXu1TkJ7xXc9mmKS3FtHRaL3NOV2uqZpX5CU0e5kJD6XS5fnsHDeh6p0yje2mPgdqR+Ogq6f2kxT76X/QBVYA0kTGSUcJP67NEN0i6sWj3T6bZAg== 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 01/12] hw/i386/pc_piix.c: duplicate pc_init1() into pc_isa_init() Date: Fri, 25 Apr 2025 12:37:48 +0100 Message-ID: <20250425115401.59417-2-mark.caveayland@nutanix.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250425115401.59417-1-mark.caveayland@nutanix.com> References: <20250425115401.59417-1-mark.caveayland@nutanix.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM9P193CA0030.EURP193.PROD.OUTLOOK.COM (2603:10a6:20b:21e::35) To DM5PR02MB3356.namprd02.prod.outlook.com (2603:10b6:4:61::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR02MB3356:EE_|BY1PR02MB10337:EE_ X-MS-Office365-Filtering-Correlation-Id: 55c45f65-fd5f-44f5-0c3c-08dd83efe20e x-proofpoint-crosstenant: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|376014|10070799003|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?dLJUik4IReCfivINTFpfxUiMq4DUCoh3ZBiiuVCm4FJwaKLdpzAWHwFiN5jL?= =?us-ascii?Q?fKHzv4v5NqxJa/Ek6bMbDuREsGBbwihmbqvZr5s9SUbYhSBbQpdnfIr5fVSP?= =?us-ascii?Q?QDvilhVy/sa0wkrW1rc4kjO5n2HnqGXTW09ZbWY6BtzmvlD0bRUv94mY7SVx?= =?us-ascii?Q?7tg6eFxs7rq2TexyQTSkDZJT9bJkJswcPzBrn1/PW/ECTxedG0pca6T1YEAq?= =?us-ascii?Q?OyTOCml8tkvdwKbivurTajKUqabSbiPaOgxUpkVzIgaNGewoLroBvQtb0nCT?= =?us-ascii?Q?9uz7+wsDBTT7hFX+elbb9k/gXtaQxomOzyBGCCOXDjDQqGI/qBSQnJUVpGl/?= =?us-ascii?Q?BmDf606+9O3cvenCWvGwC3v9d/a+iRFkJwvFHEdqwn4bW3Ijr4yZbaIRVs5z?= =?us-ascii?Q?IqLStyOHSk4dm1nk81Kef7veOetQp8rynFv4ktqce13m+cd/vxlJQiD9gqkB?= =?us-ascii?Q?jbtNw4ehMxVfWhDEavQkbfjuKWFFbdHIJFgIumOErBYocsJOuEIULLokOLfr?= =?us-ascii?Q?PNbI9gmqA8MhnbATKDHgUCdDCSl9SMj4ka5/C9P/I4bl7vQZ4YIk0oQUso95?= =?us-ascii?Q?I685xLJgZEdTcJUcNX5XBRa3PERDBGqVM6qbzlimQ7nULNPPd9Ln6qXVcy55?= =?us-ascii?Q?2aVCM9Y91UphUFgoQ2AvrNnR20gMfqh78He5odOL+U80rXrj9At9XoGYAptA?= =?us-ascii?Q?kunjn9eNmPXz2iqYsjPEHWkMgoDv2QIzY+K0wP6x+L0vak/dFJfG8oYbOP70?= =?us-ascii?Q?hUsw085ciahGoq1ugPc4LiIthG6CFsf6Bp3UR4bV+NBpZfBZEGhTVDbuckYX?= =?us-ascii?Q?zPXgYGl5WD7gdOG1qZlFajqxHkdtsFX5JmlCg5iFhNCITy7dLkug2mmsRHaD?= =?us-ascii?Q?eRnKP9lPRk7KnaPjUegAcjOGIteoS/iscx3aFCiUMdBQKoz4YHzleMxTDMBE?= =?us-ascii?Q?6OuhvCqHdGIJyLqLq+Rjepz9iBlh8mEPBQy3Czs8FeSNp33dPr+hHGGTCorC?= =?us-ascii?Q?ykKh83EQvmXmxQyPMzgqK6tXwmnbX42DRbxebN+MvAQXoafYdC7JF0GT6duJ?= =?us-ascii?Q?pDkrlFvlVOLZHVC5RkPQwcDlZUtwQ5ddH+rCjgfnnFinr2Wc0G43R7GFCPOE?= =?us-ascii?Q?pntBGL0UiVZ1zCBL9LcvnefrQMp58H/JOMlSVXh10pr5txUrD9OlEgoXyi/J?= =?us-ascii?Q?vhXQQc8inPAu+PA1lBtCRg0WGlUNrvn67vMAYXGokh5uMEJI6Bs+I4DxO8O4?= =?us-ascii?Q?ohYWc+20M5nNyEyV8fhoQveTuSxJ7AGBbWrfHOkJND9Iq7+EgQgrkAzjxM4z?= =?us-ascii?Q?Wj9rXERscf18XkTvGzqp5NuC7/iAfZJkCAYLZn+kpY6I5B4jkGx5BeZznQBp?= =?us-ascii?Q?sS7r0qbtyFDmKQ8o9eZ7g8EOSfhuhOFP0z0HjLQIOZy9kZnH5KR5xWYh6TUN?= =?us-ascii?Q?yJTGe4I+MBY=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM5PR02MB3356.namprd02.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(376014)(10070799003)(1800799024); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?hdSl9qYcnLWSh4SikxJFlsBBUHcsw3LxO1L1m/qsZVpd1zc8KAQollLvrePL?= =?us-ascii?Q?Q3qvnyFgkXUiUD9T/X9yrbwUUxW4CRd1E6lt+Q/hizRbqOOzwJvdZlyOdU0Q?= =?us-ascii?Q?HfYG8UtyXFjg1cN/xTSMQaLVvIF5qk/E3DdQE5zFzdSY4PzWoiKMHBR+QobQ?= =?us-ascii?Q?E6RtnBK97k0WRf75nsABVpT5wE43geRsHrOeDNoITczmo+1v2i+F/P0q9Yki?= =?us-ascii?Q?ywizMXI8ejMwC18nE916Qk58ynCKil7G121jWJpzwxtFVtcmut6jHFBr4ZJ+?= =?us-ascii?Q?vFw+47gXsmx59BRbTcOe9fUdafWnp4YPsA5GfTFfVrUmH6Oka43MaZCbIFwZ?= =?us-ascii?Q?9Cqw6rQXXMriSEPoizvoJ3cXZoGRIMxjM4OJFUFyCZEBYi8Iqy4e/GWSUQLy?= =?us-ascii?Q?Nqx38mkvpQwUOfbcx7QsUSha3xlTfhdksMPAEccWUpvMENdHynpGFxYF2idJ?= =?us-ascii?Q?NClkmlM/yxMErmFYoBDI9TXkRxc7xrgAKd0OLxb5dKjwXk70vLga+NcwBGad?= =?us-ascii?Q?/q7dyJjbLYh2kmmRF+1DZkmZmf6yF7Jt5HCnZ1aRsa6tzDyPGVnBawAxy8/t?= =?us-ascii?Q?pc07beak1srmTmdpEkVlK4FD3b/kAcdKMyqukXAC05Po+tSD74jqAmlp+Rcy?= =?us-ascii?Q?w3s+6xZuVEMqIg3PX6td1YF7rHydDLR/FNF+APxLqtdqO88onq2u8+kZhGAc?= =?us-ascii?Q?jXWDyOMR8N9GdUZbyrrAoLF+n8LrUorvnDCk3X71kK8FbaryOfFX5bAlGAvD?= =?us-ascii?Q?iP3WjDKZU7Dg+utL9lun8xl8dZasnN8pkJtGlbStBMBMDppK+d0r3uXOgJU0?= =?us-ascii?Q?AQCASaAOFE5QNZQScmKOcK971TKOokFSuxznTRBxOBIXGrcor5DytPE+gwjK?= =?us-ascii?Q?e/vfipU3e/uf1WnuWkR5ss8dGVB0JGzFsPwe9SS/6W4eS+6/Vbdi0db2k/Qd?= =?us-ascii?Q?M+PUVHujK3NAq1hOmLMaMyGVmcDz/g2dY8pW6uabtOYmlnL5vpxjhafv2Mmb?= =?us-ascii?Q?Qf+lFfxfIAAMkP9+JnE6ouhGiW/GSxQKctMhd6DKu8uh7HYYbr31ynYIb8pk?= =?us-ascii?Q?4hi4/TH8LPIhxZ7knc07V2MMrEIXvwwN3TbXRxFocr6kdqGNRcULO8kfVrw5?= =?us-ascii?Q?ridcwmcVfOZw4QPXIZ/86gljePH/W1vq7pnERC20Rn2UaBMoNbKkhNviD59+?= =?us-ascii?Q?gYIcn2srwhulrJAkUdSQY98sCgtzXFxpsZP6Q4cCt+/4BgIvvyzUbwumhQbf?= =?us-ascii?Q?oKFO+PDhINdzXCyD7esOj+K3UuRkzxXaTNslGg3bClOqxZhBzVma1u/XfhMA?= =?us-ascii?Q?Jy+YuXeVUYl4noBuzgXiQiAUnlHSIZp7fQb9MMpuX3goifqgFboX7Y2Ss4qx?= =?us-ascii?Q?QqfG4ouYaM5gzrjvbB1szrMMNZr9Um5SXUocp694Pf104mg3pVM+A9sAQYdy?= =?us-ascii?Q?sgHDdj6Pd/ri3s3EBIS1TuaNZfpy7e3A1v/PpwTgR6r1W090z3knvc76CC+u?= =?us-ascii?Q?BmJI5IIDNQ5b0W3U/wFht53gvea0XBrNh+tnJjP5WI2qo7gD8z/lQmRIMXKo?= =?us-ascii?Q?0vAz83SYioKcdCMcYKHTsV8BDKln2QaBKkYHYrQ0Uu8QdgvBPnNgprprXR4p?= =?us-ascii?Q?uLHm8qJj+A9IS2gWHL5kXRy0Vtk28GrS8rgkiJExpE/Y2s1Ejo1Pi4KJwz7W?= =?us-ascii?Q?Mce+Ag=3D=3D?= X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 55c45f65-fd5f-44f5-0c3c-08dd83efe20e X-MS-Exchange-CrossTenant-AuthSource: DM5PR02MB3356.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2025 11:54:07.1622 (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: r+XptDXmksYTjhnQvixNOFTLPWjgh1uVn9kX0ULfCWAdGTLy860EvI4aQ84Sj7iOp50GsvnpYHc32I3o3hEyQi4SulHSzArAiPh3oT2cxHU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR02MB10337 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI1MDA4NiBTYWx0ZWRfXzUYSRen2SIQn eCfLoRHAfMiiL+65JsGdsCEbZBwOlvD6iYuwvkTszWCD9kc1NeCtYfNAA1Fqly3lQVIwD1MCORf JPprcYUe9B0kcwAS2zcIClUcbIamqsqvdD4oCx3OjCAJ2r5d2A0UwpnKtOdGXtsYsghRrXCawgN LjtxXOD1ZUFIkGYWG8Nyq2k8xJBDgWWVD7Fx6CUJwa+plt3zErTkmQ2E+jOLVW+RprCOF2V3ckB 4x9OGOSNxTRmJSfu1todztgaAKbxnZiRd7NdIP89IfbjWBdfNdnMxc0TNl3skF9PYvYuOmycEJF U1pA6pjfqkqv/cbP6M6KhQ7IiGvOu/s89PVDo64cLnA7ouH2Ron0Mm/HlEmdkhxQkkqbvViFdBV 4dpoBrleWUPZhi+ad1x/wabku7aD9mJnCbq46Bkt+oSk/XMni53q7sgbk6HxYt+zbQaO3E4y X-Proofpoint-ORIG-GUID: ctX6krt1_cT33v2gwht-W-L_17mEgli3 X-Proofpoint-GUID: ctX6krt1_cT33v2gwht-W-L_17mEgli3 X-Authority-Analysis: v=2.4 cv=ZvrtK87G c=1 sm=1 tr=0 ts=680b77e1 cx=c_pps a=YCJezUkNvC3bKg1Ra8oh3A==:117 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=XR8D0OoHHMoA:10 a=0kUYKlekyDsA:10 a=64Cc0HZtAAAA:8 a=tUpV8ruPn8K-tSSEYGwA:9 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-04-25_03,2025-04-24_02,2025-02-21_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: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.314, 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.001, 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: 1745582176691019100 Content-Type: text/plain; charset="utf-8" This is to prepare for splitting the isapc machine into its own separate fi= le. Signed-off-by: Mark Cave-Ayland --- hw/i386/pc_piix.c | 260 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 259 insertions(+), 1 deletion(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 0dce512f18..79e5d75e97 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -413,7 +413,265 @@ static void pc_set_south_bridge(Object *obj, int valu= e, Error **errp) #ifdef CONFIG_ISAPC static void pc_init_isa(MachineState *machine) { - pc_init1(machine, NULL); + 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); + 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 Sat Nov 15 23:39:34 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=1745582328; cv=pass; d=zohomail.com; s=zohoarc; b=JlZYzy0OtvgpV1j9r+rR4T2LOtx/ZRBCmq0ZgPlMTXCJCU/w8xGMc4bDOpQZ3FsX18meCkpc8AD/chrUx9Gfdvu97K7LmLKjDzrfAGOl4n9of8C32MZZacz1cMuY/BHeUNTXTy9PFiBA/YYSikWLEkCL96boT9sLnY64QbVvRyE= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745582328; 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=8m3B9jIRTTcjpTS2XC4kRAqYoPgxy50lmvX3ocq8Xb8=; b=iiwyYp5VH0RJT8hHZU9fJmpx8Cays0a/WJiy0ajGjod/ZREL9Ys0llpJNe+E6dqsYLYwbCOOR8jX7skt7/O6GNTlOpHFBo1O6G6iW1AYVeZNzW/7kvYgWUsx1SxYvDxer4/FjxOXZXd6gLgkp4GXS3kd0tSkWIE1Z1WCg+p2+uU= 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 1745582328915954.4385529044935; Fri, 25 Apr 2025 04:58:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u8HdN-0008LA-8d; Fri, 25 Apr 2025 07:54:21 -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 1u8HdK-0008KC-Ak for qemu-devel@nongnu.org; Fri, 25 Apr 2025 07:54: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 1u8HdG-0000O0-TQ for qemu-devel@nongnu.org; Fri, 25 Apr 2025 07:54:17 -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 53PBGe3d002622; Fri, 25 Apr 2025 04:54:12 -0700 Received: from cy4pr02cu008.outbound.protection.outlook.com (mail-westcentralusazlp17011030.outbound.protection.outlook.com [40.93.6.30]) by mx0b-002c1b01.pphosted.com (PPS) with ESMTPS id 467ww49b1c-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 25 Apr 2025 04:54:11 -0700 (PDT) Received: from DM5PR02MB3356.namprd02.prod.outlook.com (2603:10b6:4:61::16) by BY1PR02MB10337.namprd02.prod.outlook.com (2603:10b6:a03:5ae::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8699.10; Fri, 25 Apr 2025 11:54:10 +0000 Received: from DM5PR02MB3356.namprd02.prod.outlook.com ([fe80::72bd:6790:f9e7:f241]) by DM5PR02MB3356.namprd02.prod.outlook.com ([fe80::72bd:6790:f9e7:f241%3]) with mapi id 15.20.8606.029; Fri, 25 Apr 2025 11:54:10 +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=8m3B9jIRTTcjpTS2XC4kRAqYoPgxy50lmvX3ocq8X b8=; b=d2I4X4RXOIZJs33bF+ccb2ouLhtSMmf0SvSIMpxoCPP2g6fLwJxkXWVDA 8w3Tt1O7Vr/0Y0cuxlzrGwkLVtfXUX8oKZHiHJCbxCkC6eeXn0Pul+75stl5eq+X LF9sOAhomL91+IY86EMJnEaHtMhoae7Th4p8Xhr8uDAUfMPkfKcg/daMsz1RjCZA s1XFwVF3n0mLjQI/+u3oRVmmnPbEgt9bYddRjwv4obTpipOuQ3TnBnR10IeEVjaN wYty9LC2DVdBN6l9M4vpIejoS/6yV9BG8DF5KQFpN7aHgdAZOKYFyTTaqSdbLtx2 jJPsmWXvUfRkpFjq0U36QowzN2ogw== ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ameDAQ9ddarV6bNYJXpFjYDP6j3gkDGK9kDz/ByM1/nW8ZkO73nyev6Wx0tkVCsvqsIfV5PU+yLBLsDPGwH1DWdw2r7ODR6weFN0SPLyPIv+uSEBWEuA1G8RbmjLJNm0LhBYNKNURaVTG9pIFMgEmCmYaSW+7cqUL/FrLe9uYijOQgntwkywzEP8fgB/x5YsX5wWJ4/vcD8m//XCBSx63WCmCxjTlGQ8qfdUv5czwBx0M7I89NoWhRkjZ337Syx+/zASCvgWcYjiWmyyecl02yRKxJV29StdVH52e9y+Pg8lDFTyt4xB+pgJXNW4hLSEo2R6Ykv6cwt112pRgs522Q== 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=8m3B9jIRTTcjpTS2XC4kRAqYoPgxy50lmvX3ocq8Xb8=; b=qABO4SVfore/SrNWT5tzwh8gXzBuUzMkqUwjxIdgjLH+61+Wu+D4zhDrVp/knECtRA4v4J/v61Lm6pLoA3Y9ehgS21tuuoUAeME+kZugoEFH28VcvB5bXo4rygshFk/bSVfp4nc+iteoUcqk8n4HxnRdKn6NfTeXUQButzIX4LdnDaKUmPtZoI6CMevCQel/wonccDp5wA1QYvVJbsmKAvy5sJVRqS5M/qZPzYv9bS1ETQDfdcGAGW1ORaUj2Mv/CFNWjyGlJz8Aml2CuPVqLuBrd9L+/ZS97To1uM19NXa43jdskabdgMVc5gNpZSo6r6CJmReL4FtcCtLi8D7asg== 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=8m3B9jIRTTcjpTS2XC4kRAqYoPgxy50lmvX3ocq8Xb8=; b=qKu/OO3rBZXqtFwWhpKFbOnWDxqoSrIq6yn1bEU1GuUzEIfTF3euoivAnFj3V9zC0beLGvx6MJCpii7Vuziqur10vfFM22I58fxGSIElSERndorsZ2xeN0pqriZA/8ZqzPZrBug0VXYv6mw6HTia7uP3OWgqaXWNmPqGCACvfSH+IYo+PJuZx0W/J0A9Pip3iDwYZZwJgtMUFdXRdv14IchHBmmBC5Stz6ua+ARR23nG72JAY6fHQX7izh0Xp9PWysaxIOQRgtaSYPpwj5C9E8V2Hln4mYYGs7Z7yb7lPwzADKVwikyZ+TqfEnyqio55cUB9Ienmj+OHfh5Yry8wvg== 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 02/12] hw/i386/pc_piix.c: remove pcmc->pci_enabled dependent initialisation from pc_init_isa() Date: Fri, 25 Apr 2025 12:37:49 +0100 Message-ID: <20250425115401.59417-3-mark.caveayland@nutanix.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250425115401.59417-1-mark.caveayland@nutanix.com> References: <20250425115401.59417-1-mark.caveayland@nutanix.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS4P190CA0039.EURP190.PROD.OUTLOOK.COM (2603:10a6:20b:5d1::12) To DM5PR02MB3356.namprd02.prod.outlook.com (2603:10b6:4:61::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR02MB3356:EE_|BY1PR02MB10337:EE_ X-MS-Office365-Filtering-Correlation-Id: c5e08e0a-6b4f-4e1c-f117-08dd83efe3cd x-proofpoint-crosstenant: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|376014|10070799003|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?vijpbj4h3z5lRzf2xW3hqd9XRTcQWlt9IVnh3iNMoFDlNYRV7EOoDHPdkE0D?= =?us-ascii?Q?HEiaAOmWpmP1SHRR5cHenH56sFdddILdhIyMXdHlHAaVjUTno0m7nyG/LMvD?= =?us-ascii?Q?bzST4rvaOMJm+55zSyOSl+UCzQgh/FRJgGIvOCPhx93EcHyxAteJCeccrHsD?= =?us-ascii?Q?HfbrOa77tz9l1i8b0Mes3ywMngqCpVUjKthgQiJpULR+mdAInN8PuR+iu+fw?= =?us-ascii?Q?Im+mnAaaiZuqjMgSewdBiQnxIksQC4vD8awXWQ5XF9jrFo4LBUSEuk7vcz08?= =?us-ascii?Q?Pth3PHHSsaBg8xCl3HoUQv60uNrDPk5J7DXqznhAq6FNadjSaKdBZDMYWMyz?= =?us-ascii?Q?txx21uMVIFBqEp2+mj7wSisWbAsbgyxAzG9NhEA6XU6nP46wi+PS2YAh+EWd?= =?us-ascii?Q?MicVk7TdYGGceOovS9kQeXjGNb4gS0YeAzDv2sie8GUdnVYNIX5IRizomGmO?= =?us-ascii?Q?nzUzdwG3Nson6w7HHM89x31Ai8M9npKTKVOiktseolXhneUg4MfvEaz2OqgW?= =?us-ascii?Q?9zl1JNRQm4FZ/4IzwL9SX0n4VR2ThUAH3zy8VZtAuM0j109Hb1moMOWxE9mL?= =?us-ascii?Q?dzRLSX2fI34VTqHnkswXzRF/9li/4eo1OIPVyFtNhhnm6sJStVDFpYCndCMY?= =?us-ascii?Q?I67WPcFYMdKhboYYxb/mSLEJHURG+205mAHqNWTjflbwiH0BktnpG1D4PpuX?= =?us-ascii?Q?ipBDlEJyEHK/yHgEq7G/Bxf9tiItkNbl9YqaM90j55ukkc1CB08QKir9CDh4?= =?us-ascii?Q?gmuGhwXg0qLBz2+owubp+bI9tYWOQ/MsuDXx5ogDcMyE86B+Itn1GO9jj6R6?= =?us-ascii?Q?sM7GLqtkUNy2EfYWmNoJL2LaWE2Za9IIeUIiAZZRQpfK9QN7TTNoT6Mwi1mt?= =?us-ascii?Q?DtpPkymDTEV6dyfBaFNVbGqMrgtzvi5s1+G0KAlOdMwIzXAiQ1hpsUZ5m+or?= =?us-ascii?Q?xjA1Z4hmM1McGaOXNbV/N03n7Y4VLkFo9N/d60K8je9r8iC3t9CnSW/KwobJ?= =?us-ascii?Q?SOdZQdrCtyHHIDlqhIbHc463iHnCMXGicr3L+aYVhQ8jgqDlVtcC2OckGNFR?= =?us-ascii?Q?xLl4AGKzUFvU6NT3DkUJ0+OP2YmB9YJUukw+2OzAd63vjoshVdTnsXoc8ppN?= =?us-ascii?Q?sIN29gJjW7UGEIQABYlUfCep/9SA25xFui7z8j1LHNAp740D7RZjqBxp8Hjq?= =?us-ascii?Q?9bjJM8+58USPyyn1GgeQNI6mMCKmtV8YMbNRuJ1A33n0F9/TgiWTRurvtuft?= =?us-ascii?Q?51e7ZpwXEUUHcWW0kzCGmH9rKlhRSb9icRA/P9/fSaPthsPwXmYZXw3X+QEL?= =?us-ascii?Q?JSs45f49QrRCN9V7Qbjp6rdfcVuR4dn3lA1spMPxx2EmzH7agjuBtJNPo3BK?= =?us-ascii?Q?3GteVncOYXJW4bS15+5D2D+1WvxNJn722pAn/m3NPsSu8ltbAz9TvKCDprHu?= =?us-ascii?Q?9qq+Zy9UDMY=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM5PR02MB3356.namprd02.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(376014)(10070799003)(1800799024); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?C58uK5EQ0SxOJYoLksM7TE7fDCga1qDrMzptvTRrWNG+H0SOzCb9I0g6+PNv?= =?us-ascii?Q?kwR06ki02x6pClBp3onsDma85QnFpdFm2k5GMQgCJ6vv6hXbHP+BVSC8G1a0?= =?us-ascii?Q?kSd9rhCAgLVN1XMFiAisoQPlvaAlL9avmWURtV+s3kezSKPUcMrnh/ZqPJgb?= =?us-ascii?Q?Nqr50p2EwYqqRioXYW4yUgAm8BJ0+CM2yTNw9M6NhoLiH9n+NIPBSLLW42Pc?= =?us-ascii?Q?UYptVuMc8uhKhTJQBBcdvz1Dfy/uM4lSb9boWYG907xUwzZCHkXc1Hu5vgp7?= =?us-ascii?Q?KoYjl92kUQjx5yzTDQKYv41QVl+08MQRrk++cIGPA7s+zAzO4Di4jUrpDCjh?= =?us-ascii?Q?RR9djNzKB2RL9vKcNC+t2iaiJ7FcVF1b08KM6/lqkZ/ZJbtpBFM1Uh3Yttaz?= =?us-ascii?Q?kk9bJgM7qMSzbbVfhb/0SkjRGJJ2yrbvSrJy9p63aAIZbw9sReKpXxzkUHeF?= =?us-ascii?Q?xsVlD1I5qkAQ0q0oaaPxWZ53rIywr/9jz6vSRjPX6JWEK6RaIhGq1jC/5XPC?= =?us-ascii?Q?FthL+e/dMK4jFbPZ1BJlwhH3ITu/wfmyNigZox00T7j4LZX9qD3fubrDBuj/?= =?us-ascii?Q?eCZg9xwFewEREAh/YM9x2kODYh3wt9sAZk/jJLbqfbrSiyXtfuTNzkx/QuIR?= =?us-ascii?Q?Jh/fuhI6XxCyIflsSzfG0B0j88d8mC1/TdRqK2WUnK36hKBRrkQSOUuqDeVr?= =?us-ascii?Q?0jXIFmbE56U4vgo3HCK2LxJ8xmIVXfhcvmh8W1wEpRuljXtrRH/Bjfp8Hgvp?= =?us-ascii?Q?MELZK3hey7bRGXtScuVRLXsrkHdPwXNeZRR7B4ZcyHneV+ZiVp+TG3sWqwAr?= =?us-ascii?Q?1Ey9eP8XjvUk7aboaUXoLWVrL7d38Bt7DjaYLBZ3rCosyA5YOsmL3IKSmtFq?= =?us-ascii?Q?7vKVIPFu1OwSBgQ3j8wqKm6BgpX2s7T3MRgqyWSr0lqkyrmD0Mnt/EnmhNLH?= =?us-ascii?Q?9WpB09ayvC+tdaoeeEb3+6Z8LV9mLH+9gIMlQvoWBv74waNZN2sfIfTHBAFR?= =?us-ascii?Q?m8brGzJpQNr3yJxBIQao7OvyC1SFz/Ab6URvf2d0WoQa/K6vKQo0un3Id5H3?= =?us-ascii?Q?LFUVqNgZLY2NSruDxrhTi7IWbs6K89vh/xtWNesPgeELbdyEw5+hpROynN49?= =?us-ascii?Q?lPY0P6v0q8Q1H6y9h0IUap9RNzDnr/3apWn7ulM4l1MIAnLmNasYVesWQFwo?= =?us-ascii?Q?8rpvTbf7IcO20EbDkbsfyLAVTNoCgS6hIp0iycTCq/Mq+5fMxA16JFS8JSMU?= =?us-ascii?Q?1I5Ujnx09pB/asV/nAlldc9PK3FfforB6WNzKYrA3XW+w8HdAFHwivcvV5wD?= =?us-ascii?Q?Hk/CGve8VprD1XwD1sy7/wreB7wlNO2iPDTyy9usjrycRGWScMfg5Fe7bLh3?= =?us-ascii?Q?TMkFbPNst2uE+stAErnhppRWUGKkb81UiM0KFzOlpDJB9G6mWoMfIg5S44gu?= =?us-ascii?Q?dalw9YFiALesHFscygjRa31xDh7U7USI2N1ftt9zQJNIzV01Wq6oue3HimpA?= =?us-ascii?Q?2IKwqNPyvZnSUQ9KWtPChEFnqfqh7jz2RYqrY/ERfi4J72pjxIVXya1Faq46?= =?us-ascii?Q?GjoR5C6NCikqVOy/ROl70Anw+V1e4D6B3NW9r1NgnUxm9cbWbXrUQiVIxDDi?= =?us-ascii?Q?05ol1nuzyRh7JMfbpntG/OPIFe8+xS0c9nyXoTCtOKUY9O48fvY2NuBNt2B3?= =?us-ascii?Q?ukP0SQ=3D=3D?= X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: c5e08e0a-6b4f-4e1c-f117-08dd83efe3cd X-MS-Exchange-CrossTenant-AuthSource: DM5PR02MB3356.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2025 11:54:10.0822 (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: 8brodgA6ECEI6OlWxisFM6TJkxtH/qH/4Kf8IuZNViMSIpOgYnDRRvb1DbG81z+X0PhXYAZ/t/Fp4qJO1Ir17a1pWbiS/w+bNTZiu2XCjo0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR02MB10337 X-Proofpoint-GUID: KRafq2IED0TWiO0pbwX5XJStT89ykuAe X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI1MDA4NiBTYWx0ZWRfX+E5RPGfzzbgE wifyy4d07YsB4tpGhUyb2m2FBv3QGpdRJHxwQFoBaWNROPLAbCVjELaKwvS4dLVxGP9vpPARu5G GrVXFCKS4LQ4WDTOEZJgfaqEtsElLlA+Cv6bto7HtErTcHVS0o6gfaE/pPQ8pb2ADI3Ncf2nTSo o6QgPiY8OKU/FxRtJCyP5mEWysjMHlVfjR0gf41IiIzHfx8s0m6DB7g5P/vhEqW867R+QASq0Zn khAcc5N2ARyX/9x6PmpT03+RHf7y0UWHNbPfkbeRnUu5FXveI6K71Df8VGw8gXQjbQPtMyr7J4z U4caaYYbo0ygjnOzWC0aP6+cOblurqWHht0vs0vvlfQbVtwzYA/Ijvsc2fXdIz40FvxuFQecmvH /panFajw4kQzhiC33Moa08yWqPssWpg/oxKJIoGUAknX5LzzlqWv132g0hEfoNclHfa0fgxS X-Proofpoint-ORIG-GUID: KRafq2IED0TWiO0pbwX5XJStT89ykuAe X-Authority-Analysis: v=2.4 cv=C7npyRP+ c=1 sm=1 tr=0 ts=680b77e3 cx=c_pps a=yZcDG7BW7OBBh6O1hU8nvQ==:117 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=XR8D0OoHHMoA:10 a=0kUYKlekyDsA:10 a=64Cc0HZtAAAA:8 a=WPMpiUD6sP5E2puXUuMA:9 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-04-25_03,2025-04-24_02,2025-02-21_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: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.314, 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.001, 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: 1745582331327019000 Content-Type: text/plain; charset="utf-8" This code will never be used for an isapc machine. Signed-off-by: Mark Cave-Ayland --- 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 79e5d75e97..0c71d16192 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -413,19 +413,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; @@ -499,39 +496,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); @@ -548,74 +512,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 Sat Nov 15 23:39:34 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=1745582212; cv=pass; d=zohomail.com; s=zohoarc; b=d5KxRWAr96Md3WXmf2quHC5kSznQtAg+lDeZV0c5s56zNBKHyq7snmw917s2mpS3Ue6lAVylCgbIzMSkMvXDHH7lguxoP61i9TBeFb63wz0VPrOFIcm5R7q7bNG45rk+0RsSOYABNsiRuiMZDrCbR4olro2z4HeBXEgb4dN/E9I= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745582212; 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=4+Dmd9YpE9AAgIEm090VciJOhR1hVHKCElRC4CejkmE=; b=KbyGLv84N93PG2ulDNam9khZD3XoTYe9sJwiYfjYNcAxoXVN/CNfhjZ97usspRKd928FHgaz6yTcxCw7zfz8mz0Fec9uJVrzhumHtTY5uKvaw7VJ8AxR1J7hdd6JUvl2U6BeckBjMkpd4AhWqe/AHyTueV2H5n2tmdRLhC5sEKw= 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 1745582212076505.6059523070994; Fri, 25 Apr 2025 04:56:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u8HdO-0008Lq-Uo; Fri, 25 Apr 2025 07:54:23 -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 1u8HdM-0008Kl-8T for qemu-devel@nongnu.org; Fri, 25 Apr 2025 07:54:20 -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 1u8HdK-0000OI-3E for qemu-devel@nongnu.org; Fri, 25 Apr 2025 07:54:19 -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 53P29BGO018385; Fri, 25 Apr 2025 04:54:15 -0700 Received: from cy3pr05cu001.outbound.protection.outlook.com (mail-westcentralusazlp17013074.outbound.protection.outlook.com [40.93.6.74]) by mx0b-002c1b01.pphosted.com (PPS) with ESMTPS id 467ww8hask-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 25 Apr 2025 04:54:14 -0700 (PDT) Received: from DM5PR02MB3356.namprd02.prod.outlook.com (2603:10b6:4:61::16) by BY1PR02MB10337.namprd02.prod.outlook.com (2603:10b6:a03:5ae::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8699.10; Fri, 25 Apr 2025 11:54:13 +0000 Received: from DM5PR02MB3356.namprd02.prod.outlook.com ([fe80::72bd:6790:f9e7:f241]) by DM5PR02MB3356.namprd02.prod.outlook.com ([fe80::72bd:6790:f9e7:f241%3]) with mapi id 15.20.8606.029; Fri, 25 Apr 2025 11:54:13 +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=4+Dmd9YpE9AAgIEm090VciJOhR1hVHKCElRC4Cejk mE=; b=CIRroitPPRbDXJ01JUcleCrjF/OU0/CUu5e3TYB2nkc6muq3w4cZU0UeB jMdoy2LZRjkpwNGwgsHnr8G3FIb61XnePMLXKwv/r9/5NxB88V++dQ2RPXM6Acjm tZ6sv0aM4Z24AyHHyMt8ldUspgUTkQrAeVq9V7DsFeOioNh+XfbRyjNcYG9hCDsQ gDEVwYODqn297j9zlNlYNLlfNnxoFDFM/zlWWdNiIunJ6GL5TvMfNdd3ne8sFRTJ sYZQlPFD7hUkSP3YofXDT4QGGtQb/3ujimUbHX7atNolQBik2OKbO8UbaXyzAvln Fhc0Rz2N1Q8BjJBkDRcgemgpxzK3w== ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=IF7YWRo83zHU0XMUHm28BmbNp/Bexqj0BnfNrlkaIJybUebGn8ZSoZEx6v9VlNsl047Lzt+8sx2QYSGFbD6SpfLXpdbiLc3zCysoN7yumLwC9SF9K++8jEaiqoiUsk1qV5OiF/VmJc1PjoZAZF+5UDf88CktGOrGEIfQ+qdhhEDDeuUpJoBjXbEP1+5tPoRtJkC4S+f3Vms6sYkf539ysnIfqDpZ34n5C3e+spRxJ3Rm3Ki0W1c68e7SHdalqt0mfNHuBxeLyv2bxeFoRn758ga2JfzgKc8GM/2HhUjhPCIUsC/1nTnya4chfS4Bi063IcdIEeaNn0cm2lDcI6SCmA== 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=4+Dmd9YpE9AAgIEm090VciJOhR1hVHKCElRC4CejkmE=; b=Gg7Zy8zsm4YlMVTTlQ4zrM4VnThM2ajXOSMP+kutyYheFnahx6Xubelv6UPSfsn0hK6lSzG4PloQzZ5U8Yw+OsmyRskN4ZyT9SR7uKKhL9TAL/zU7sc45aWZ1jdEMlo67Abv6YNfT9FoYASIHMx7dFT/UVMAg0mUFY6MDmhSkPl20OzeQ7CflT8WyIYiJ+QXz1uZNBacfbW0zyIs2TQfo8m9T6RwepbmeBdWwwg21UyQJwxd1URU1i39Nln83zCFaJ8zwuBzWrUWUBw2yxqAGHTu0/UBJ+DOhuqfp4F6HkjY1XtWb5WFJ7WXsf1NoJdEy7Z0GT5gyBl0ezcCb3ChdA== 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=4+Dmd9YpE9AAgIEm090VciJOhR1hVHKCElRC4CejkmE=; b=kEteIq9cnOo88/yl0U9ipTV4g9U96dQXegU4tzfWO526hIBZW0VdDXOg+mujOjWso1YUtd1FQLTiHVeAczlESfZw3KPNEymng+BfVt8Zdkrf4kU9XVaYcJ0XETNGH+6A7WQjMZHZ5bN6Cf3NoyOcURFk2GFwehWTfFSu3FwveSW0H/bpUZ13u1Gejx6t18XF2Ebf2kB6nE28RswxQmFLPIynIT1ivbG5T+kdrZszEZpl7F7XYAhXpdwfOITJ73fgjyQJqwoELqHG1W70zVTsczajFI0G075ZUwda/xHBIJoodvgkf/M3xnaO6n8AJgXUB40tvcV1nL0XwXm9S5N2vA== 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 03/12] hw/i386/pc_piix.c: remove SMI and piix4_pm initialisation from pc_init_isa() Date: Fri, 25 Apr 2025 12:37:50 +0100 Message-ID: <20250425115401.59417-4-mark.caveayland@nutanix.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250425115401.59417-1-mark.caveayland@nutanix.com> References: <20250425115401.59417-1-mark.caveayland@nutanix.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS4P190CA0045.EURP190.PROD.OUTLOOK.COM (2603:10a6:20b:5d1::16) To DM5PR02MB3356.namprd02.prod.outlook.com (2603:10b6:4:61::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR02MB3356:EE_|BY1PR02MB10337:EE_ X-MS-Office365-Filtering-Correlation-Id: 134163e1-abd8-42ab-db51-08dd83efe59b x-proofpoint-crosstenant: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|376014|10070799003|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?jWbmN6W9BWClzLr2J1BUtaIFP9Zf/csv1dUZZXF1lLNtaTElt4mhO9AinKKl?= =?us-ascii?Q?JvJeVPndYxDFdgMW4nTxcYsSQUFR4XbVB8+F+CTm5pnGhBEdFPbpb5glr1lk?= =?us-ascii?Q?3KdU8WWCAahFaTps94ZQj86uG9SPyBVcvzqt1PSC9un0dDm21Bna8rxtaXlc?= =?us-ascii?Q?ffEysYoO7yNSNmw+ZsLsnMEYlruZN+9czlqN1zU0VF5QVTMJ/omUG/6QxrcB?= =?us-ascii?Q?Nb3aNzY1z1EoUI4x/sDBBa4xRXS6YOF815au1GYwsirjg1MjU02M1zy3mqy+?= =?us-ascii?Q?8uIlNFYudu240izeHxSfeRszh5YJLcdQz3paOqXOfWJnZO0bm1ivVy6FC/0K?= =?us-ascii?Q?HhUGdIq4/sYbriNc5IbmnxVWyIMjoZXeUsujU5YtsCKQvlv9Dt29MP9bGgMY?= =?us-ascii?Q?RtjGsuYX/IFXhY+VEKDj4omZ+QUhMifBp/FhH6jzkg/YTAVnjra6qbzjXfzN?= =?us-ascii?Q?4wqi+hln8WgqsxL3dvThICoJANSEm651VVnYDAXooJeP13BVVXfwYaMJj8EU?= =?us-ascii?Q?E4MrKDoB44zgQIrKv5bmhji9eCr3QP0+FPnAYLveCUQhH58DGbZvSaGGYUef?= =?us-ascii?Q?j0fOGOry4KIvzzIzZ/TVAJL/GIfUxVxpcRwOsaHwU+MhqeRJ2jBanOcm6sNY?= =?us-ascii?Q?nVqJfHwB7J6yA9jRJwJuD1QnYSZxqmo0St5/QrobiJaMIfC8VooVPWT8Ux2h?= =?us-ascii?Q?ubofG2xzmzV7juP8n7ZCbohoBA+ev0P41yg7GxDxlnU9hBYTOYM+vuRJOLc7?= =?us-ascii?Q?pzefMnfYjQy71ODzb8NUNHCA1305194PsKJ86OAs+tPi/kq7XV8hWltSeFjc?= =?us-ascii?Q?33O1vvsHmgXcBrR2pu+K04B5bW4Ft1bDL8g5Wff+HBbCrOv3kI2uXicaNebl?= =?us-ascii?Q?W6RfzSX2r34prL4g78/Mw7ip9Hd5OuHSt7TrDcFH/y6ipEEHAqHBe6UlWjd8?= =?us-ascii?Q?KF53Z4aLtkxdqCKCp/DAh45GSEUmm27FdFb+MJf0/CEJx1U/MSqzgoWG6ilC?= =?us-ascii?Q?3q4B0eSwDI0UYW0OxPUckQXV0zdpRSTCUsGBQXpTrcKkxOBShuz6tFZphpaK?= =?us-ascii?Q?F/tKjPOI1D2q7lNO508gF3TMFVSNDCc4JekgRq0y7KiSpSK7i2tIGI3SSrXd?= =?us-ascii?Q?3kexaGMe/Uc/F9oboqY30SW61L0+t6piouUh6+zfvO3VpXgVcg64SQ/vGbMg?= =?us-ascii?Q?zxs0MvU5pezhDLs88nN6hvTbaoJhfs0SEklp5D8GGRrrk6KIVcObwQA0Ox/h?= =?us-ascii?Q?fBbAKipVtn0s3bKWZDOwZjq95dwGXohFR1v3Z2u7HnQpu7P5BQ2noA/ubl4A?= =?us-ascii?Q?lvvXe0ZqXc9IUuy77z4c7oqltZoisrdY0ZTKuMXKKeyybDbVyKqeq7E0iBgu?= =?us-ascii?Q?gSXGPSYogsA6uzZvSc5YhBthLY9TJdgdMECgTF+AKUIiiv/la+kOgmY3iMn1?= =?us-ascii?Q?EiEZmTsAn1A=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM5PR02MB3356.namprd02.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(376014)(10070799003)(1800799024); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?PjDYAP5R5erA1e5cC4c/ZaoFRaBmEXRxkMRHDmBlwjIxsLjZwkb0liiGhava?= =?us-ascii?Q?SJzDpTedEd9NGcl2hc3pAa64EqqY5V4aE2eURMeXDvwvpLV3A774V5crQjTL?= =?us-ascii?Q?abBVhHMdJzyBS+v1oFTmCOP7rTZt7BL5yybNAASMmZoHEnZTA1v3utrVsh3o?= =?us-ascii?Q?aKwDOJqQcp8d2+2+haobIisfIcqGrQFhhZVHpqAJg1oRl5RalIa2QP8mKqDQ?= =?us-ascii?Q?AFI4gP496dd/3sybW852ShLm1gKOruPdHfj+lqix1TXG/SvGVDo0803Fw3mV?= =?us-ascii?Q?kHSf9MXloSv/NOai6zD6NIU9fIFWkKt0MX5aw25AZAde1Pdzz1A2vTySIRkZ?= =?us-ascii?Q?oeMLe398gHPgdoUgoorTALQIyA0OVxvoVyP34VpMkJ2I4NfUKR+jG0byzv7j?= =?us-ascii?Q?0oqZA/vfXBXjZWG3UQV/Wk3Fs/mS8eYNZAjuXV2rsUkGm5YujnMtVXdjF51Q?= =?us-ascii?Q?Sr+TPwM6UGhuGxMcn2QG+QpDgX6L26ClmUe4alW4FR4NKYO6XyBMo2jzr6S8?= =?us-ascii?Q?oJXyYyjyk6lOBV0I1Pcbh//VOAK0zl/I1pRAkv2bNYveOrMC5jk/goZ9mjaU?= =?us-ascii?Q?6Xzvy8XTAeMYC0UT7Mu/FRgs9iqSnfURVVRHbPLdsdrVnK4LWoO9A1z//R4a?= =?us-ascii?Q?tj3NcdRJsW18ao0bY6VRSSjXZ/r9UkK6EGfA9dMdJ+jBKswhOUTl3wv0rrin?= =?us-ascii?Q?kdYZFFU2PZ6RWJ09cetJTHMhOyQlbhBopSAs79L82u7EjN1DMacPLvWb64l5?= =?us-ascii?Q?9sMeGDvmRNrhgESYnGP+8wpJJZ79NYlMyYwgoVO91Rxv83QRJY38MRVRCZXf?= =?us-ascii?Q?000HfylLQo9k//V/4rJRutEZujuRurBkX05oWD5N0xoizCH3b+TeQmZuD+na?= =?us-ascii?Q?STEADl499pBj9L56TP9XoBIjK+43ZylPfXpWXxDZ/BYQU2af0fYYxDzzHf0t?= =?us-ascii?Q?2oQuA729UZ7fpntSYUlNBuvyQ9iHUy3ScokJJXr+1+7cIH9428v+eRKQej8j?= =?us-ascii?Q?i5eoTpd+3mOUjeUaKVJQvNSiHoyMVbtEO9+CYG4H7z9J6mMj+tvlL/1CFxKM?= =?us-ascii?Q?NLseeqUpFTtFwMOCUV0r8dMkhje5KbXaiuQ458kJJBRaQKZMIAk+MHTQ5CYd?= =?us-ascii?Q?KehljvrXLOPGW/NLMlf+X0obDfxGnjvjPMrqfU/GMA9XLroBT301cfzkt7lK?= =?us-ascii?Q?AunCTxIt0+SgVCIBWggmgrS1FLn7guKalTNDGnWYaAW6FA6c4+VR0qmWAW5n?= =?us-ascii?Q?QTXV2MpSsQz+L/PyBLEIhdEcNahA8G8TkFKr8/RokAmHvuzKvzLI8ZES0Lc5?= =?us-ascii?Q?wkjMz5V+hC99KzZTLwCf9lqYEz1xFdldGxH3qx3hettmvuIjJyWSRZx8gx7/?= =?us-ascii?Q?CM9uVDKqZWH9bF0schS+rovWvKUiW3rL/QOdGYVBveU76gd3TMplqs0jg+Xq?= =?us-ascii?Q?FOKD2UoIY2cSu2voPoucSW/ODjfpIGNifT0vENhfU96CsfslBgto+CZLtGzX?= =?us-ascii?Q?s5gAygTrAqsehRUYub6WSt5hFIeG/8gEFACYgnDk/6h0Zor4QPwjxG1ZbcxI?= =?us-ascii?Q?1+FzqMXSD0ra7o2zVK9Mlu2QBO47A80ffWOWW1Hhe0CiwwPbFfjNJP1Pv8Pz?= =?us-ascii?Q?4r0+q5KWXR0Cn3lHovO/Cl2TI+doW2boYiwCaJlb61bjs/N3mNcFz1iuDqp2?= =?us-ascii?Q?Po9FBA=3D=3D?= X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 134163e1-abd8-42ab-db51-08dd83efe59b X-MS-Exchange-CrossTenant-AuthSource: DM5PR02MB3356.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2025 11:54:13.1364 (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: 58pvI+JHRAr79bBL5jTlJU7PfOCFTB/8HOf7DBUHFaDrDiH1swEz5hTt0vCTFjpuI3LiJdqlmpumERWAgzE+ezQ507huO8UbIS9w+eWihc8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR02MB10337 X-Proofpoint-GUID: PSpXE70AEkONQl017QLrrGdhHhCKUTxj X-Proofpoint-ORIG-GUID: PSpXE70AEkONQl017QLrrGdhHhCKUTxj X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI1MDA4NiBTYWx0ZWRfXxYZFOtRYBp0T BcLN7c0VzyREvDqJeApulh8vm5BFH1S9l6VWEzypN7YvlVuXiRK98XEN6GDK818wR/7+AvOFl3Q ZZpZmO6gTa7mrff30e7c+c0zZ66qpIv/uGHW725oHBXD/wh1XA1vqfibNYXUDx6zyOzzsc6AjBm AGyVkIYlrOenQRS7V6kETJopeJRbw7MlcAYJ+lKcG3mHHa9Pxq6BQFM4XSS1VZVe3z0Aqw2rEOL WndwKLowWdCRJD8tOHBdXM9JBzrpdbaK+M4UOsuV/75EH9YHbPAwd0Mobvmgk42xtCkuyX1vNg2 nZfQJwgnO5cQAtEdHYQqEDu7IsFGH0MMZYM6EuMwg3dfGUmDGc3DX1J46FULQRqjyYJacGFqC0c nb5OqNTMI5Jc0nuSKe/tdYJDphuOgO7SjsiqiaqDnYHGuJ1P4GATLb/JPyvawx0MwJD/O2TM X-Authority-Analysis: v=2.4 cv=DfsXqutW c=1 sm=1 tr=0 ts=680b77e6 cx=c_pps a=4/dVwHrG2xlZHl48ITU9gw==:117 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=XR8D0OoHHMoA:10 a=0kUYKlekyDsA:10 a=64Cc0HZtAAAA:8 a=ufPb-6LLmzJJysA_M_UA:9 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-04-25_03,2025-04-24_02,2025-02-21_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: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.314, 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.001, 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: 1745582214680019100 Content-Type: text/plain; charset="utf-8" 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 --- 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 0c71d16192..34f63a31cf 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -419,8 +419,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; @@ -561,23 +559,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 Sat Nov 15 23:39:34 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=1745582088; cv=pass; d=zohomail.com; s=zohoarc; b=MrYsg7qIXqTS6KFGxYvEQ2jYp1bAE3KX5R++tipf758qpXj4vAl9vzu8w8QNMErDQjgmdKV8F80YfUQiimyRhkB8nalJN7CBH+MLcZbjZWSz62Waso1iBFAqKQqjc2yGFU4/K5XIgdrYV90kJLpw3toAIzqy+c8+B1oKdUaraF0= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745582088; 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=rAiJsSFPPagroq8l2wlQxkZJKNVi/ezYamaZX3FnDl0=; b=J66FifFqYQb6Qq3nHMFZQBHyjqxFqC688rsU65jVz3rBHTcDk4ZceYf/vl0UQMNxdNqGZTC6PmeXmgC9qHh9Wx/xLCm5CMcVeR0tbCWTxExOZl4wmgbDjxA65bUtWmW/HG5zvKQjIRp3FORJcncHtYVhOLWDPqRO2i5BR5HIC4I= 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 1745582088586224.49873263921063; Fri, 25 Apr 2025 04:54:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u8HdR-0008Mo-5h; Fri, 25 Apr 2025 07:54:25 -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 1u8HdP-0008M2-Hx for qemu-devel@nongnu.org; Fri, 25 Apr 2025 07:54:23 -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 1u8HdN-0000Og-F3 for qemu-devel@nongnu.org; Fri, 25 Apr 2025 07:54:23 -0400 Received: from pps.filterd (m0127837.ppops.net [127.0.0.1]) by mx0a-002c1b01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53OMCg3m009062; Fri, 25 Apr 2025 04:54:18 -0700 Received: from cy3pr05cu001.outbound.protection.outlook.com (mail-westcentralusazlp17013074.outbound.protection.outlook.com [40.93.6.74]) by mx0a-002c1b01.pphosted.com (PPS) with ESMTPS id 467ww499st-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 25 Apr 2025 04:54:17 -0700 (PDT) Received: from DM5PR02MB3356.namprd02.prod.outlook.com (2603:10b6:4:61::16) by BY1PR02MB10337.namprd02.prod.outlook.com (2603:10b6:a03:5ae::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8699.10; Fri, 25 Apr 2025 11:54:16 +0000 Received: from DM5PR02MB3356.namprd02.prod.outlook.com ([fe80::72bd:6790:f9e7:f241]) by DM5PR02MB3356.namprd02.prod.outlook.com ([fe80::72bd:6790:f9e7:f241%3]) with mapi id 15.20.8606.029; Fri, 25 Apr 2025 11:54:16 +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=rAiJsSFPPagroq8l2wlQxkZJKNVi/ezYamaZX3FnD l0=; b=emMHXsSGm/3BSB+s6vHTb+AxgrMM1Ujde/tlPd5mDPZBdI/eeVZlcv31k Fr3wAm6PMKUEnkydnaxaRpzBIPCH7r5oxjvo5V1TaJCQY0DKdEBF4RR1egpK5CHx wRc5/JgpPwkFv/YkJk55g5//UTxq062bqe4dJ7CAlB8rwItpKZH83ypdeRw85HBL vHN1li70/oUPzieLgv3WsRWJHl1VOKnG+2RizsQaVb2q7nfI60zZjAFS37bBZevk kHKynD/BlvZlIeux3V3sQ4NkwAACrciMiQ6In3P6D61+80rDEwKPgCaLmKz65Wvb jD/TCUNrd+ZciOS1cOdEtYdZNF4MQ== ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=AIZQuREPEbpZq91QJZCL+gxFZkSsv0n8Om8wJwSjW/3T0tqDtt6eWE9sHprwTOypY2dP7X5Uc68m9AKMTYaBzb0yOuyyIGOvdxBiaUJba8sOeIWUxmf2QE43LqLGEa8BInBGtnTClCsO6/COWfWyxi1FaTJROOy2f9od4QFbwyWT9mlPQaJp1Y4UMAdB/WFUfvS/T4WHJUDxcGziT/CNiv05ME32c3Lau6oNPbUk85/2qnomdKhwA/M3dM9xSiPZgm/9zJWX/mbfjT2rriLI+KeUnJYtaKmyAIKy2iDA8NJH6GuLFkx1Mko0oMXifs4Va8bmnEYLWe10Y30tF1eZaQ== 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=rAiJsSFPPagroq8l2wlQxkZJKNVi/ezYamaZX3FnDl0=; b=VWFThA8AtOJEdCPh8G7QXYlvKodYUMs9oXwRShPpv9ZpKv8VhdIHNH3iiLBQq1P37lknpFXcJ+XH5h3Smv3iO4f2RSWb/tiA4AI93W7yyUXZmQcWdB03yVBz9rye5LITXLG6kYXWIy99L3+zIk4Ffosm8puYBC/2hjfCp2GLRNrhi7ZUxHIrrwcH7d61ZmS30S/LA1qk8xufY6bE48D4pptXQAhNrMQupItW7Ked0K4PtAtMycCwNZaDV/gPCKQzXWA4H6VJ6/izo0KqslhQS5sU1IES/icmy9rcqPV4GHIKsDQ0AbeXnoJdQrVcarV0p2IgSc32fTky0krzyAGiWw== 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=rAiJsSFPPagroq8l2wlQxkZJKNVi/ezYamaZX3FnDl0=; b=y5WvDfybPH1lVdXZNu0ishQxoG/1TtnO43zyugi7R0XvDTfNarz+ekwslnjchnEawFwMw7jwYlBDV/Kf49OE/k6kBMpkY0HihKdc9x+quaaBxwtp1v6AOAn571Timile1RVAqq7X6PpN4a9Ac6qwMHxdqjMVWHIl9BMSumixgUG5ciiZeZdY2l1y9E01M7GiKETVxUsNF1+ui4HotIBzxps3JsNWosrVtNYM5+2N8ZCCyJDyRBOIH0aJ6Yvq0rPY2z01B5XvFhW+12VUEM/iDlqUSOCUZey9BUJsa9TlYWv+Dow2AgpTFYHDur1Jb4yflKCabvxzXpR9uM3CX+V6qw== 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 04/12] hw/i386/pc_piix.c: remove SGX initialisation from pc_init_isa() Date: Fri, 25 Apr 2025 12:37:51 +0100 Message-ID: <20250425115401.59417-5-mark.caveayland@nutanix.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250425115401.59417-1-mark.caveayland@nutanix.com> References: <20250425115401.59417-1-mark.caveayland@nutanix.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM0PR01CA0140.eurprd01.prod.exchangelabs.com (2603:10a6:208:168::45) To DM5PR02MB3356.namprd02.prod.outlook.com (2603:10b6:4:61::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR02MB3356:EE_|BY1PR02MB10337:EE_ X-MS-Office365-Filtering-Correlation-Id: 910beb1b-b94c-42c1-bffa-08dd83efe7a8 x-proofpoint-crosstenant: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|376014|10070799003|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?ygOrdwB6diKkyKo7La9PyI7OgYhJUanBaDJyBj+1DvN4JIMIU1U7kKGSCECG?= =?us-ascii?Q?ExtXArfeBpisIwRx2LEBZsVpr1I0V5rwI0HDue7LGDGicogEqojlhiU5m3Ks?= =?us-ascii?Q?AJVPlga2Awey52O+sOaCpg309FCQbhGGJ6A1Nr1/W7glmbd18FkmNGSdemil?= =?us-ascii?Q?E3mmyMRGatUc0aHbHa4Qo+X5r+7Mx6Gj1xsKwin6WvODRiUvrgJMl52ORBAv?= =?us-ascii?Q?BqS0DBnliPd2QlnHGWkBgiCE89YFXSH0nDlX0PqXfkBlvtCjTvXBlsTjnsXC?= =?us-ascii?Q?SrLgPV6zb+v/uyVReqqVZJKClo1Q+LSxdA2G9XI/35m5QDCnpR0tyTfMCMrr?= =?us-ascii?Q?0td8f1M4Rd9VnObA7SZ35zxtPEn5crDzcCkzqDWTSLZ0FUuGqGusDv3AxxDR?= =?us-ascii?Q?IAA9G3LvZLNw2kkIdQwCH75mIeNlFhUYba2Wi22gbFVlG73FV4B7RR1mc63B?= =?us-ascii?Q?ST1I3pSwGXqrRNqNzLz7ZH4tJUKSJcu9J2CVe52kjauuIxhU0AfpYQJbx9ti?= =?us-ascii?Q?JyO1OyrqxEKOz3xKGX/LZjHT7HNyq6y+hXmQKLf5mgeCoorqDXCX/6O08YKW?= =?us-ascii?Q?wpP8pGo1x62/pHIiQybK9W2pE+DgRcSYSjkj4aMFDi2sTttg/I/uznAITMOp?= =?us-ascii?Q?zFMw2nkg0r/ntZZec+UpaLK4VNSXhuQgdQX2a8BWwxpmN5dKXIPXhBvE0lmn?= =?us-ascii?Q?H3Bli+VB4X0YqyVdgpdNWvM2hX/KP5/nXJTqKsKk4ghsTjUrGhq9xZqyejtF?= =?us-ascii?Q?igF9ZYvM8ZOQDKfOduksnK36WOckWS3c4DnQLVA7igbOfA/Eu2cd4JYKKb7E?= =?us-ascii?Q?RzQv2LEwvTI3VCVyZYzEUa1HDAnTOy50oixA2RzKHvi7E2G0sGawwXaF0oOp?= =?us-ascii?Q?xjPcnwW1XIYNF+h9mf2v3rnIhkR/XixAiRrl3sJyBEM0J2yJX8t+pPukZ8PJ?= =?us-ascii?Q?u25sC9xVObucyUR1vQr8HtW1bNXiCUQ4Dwp6bvv2EOeu5OHv27LpBl8FMG/G?= =?us-ascii?Q?b2cZvCQMtlFoFs9WQkUsuzL9qAz2LF9v4TxKW25UVTYarIlDfJCLzvvnekv3?= =?us-ascii?Q?myv67wMOBvqABBs4zPvNdQXlBlDPkFxKL8hNv84Fu+tj1nyGLJsXGyjiqCt9?= =?us-ascii?Q?pSXAxKi2I9EdXUk4EyqPNhRCBptKU0r+LFr8frM9IyWlYl0/fBra1OT/srKF?= =?us-ascii?Q?oe7SmiQfSOokXvhFyVEEN+CE5hyK9Y4gWPuXwgrWGE6aKXH1NFl7UXw91DJi?= =?us-ascii?Q?kdWg8J5UUtxqQGDqPpY099zZRhF52vzLZgdvfur/VDr8sEHM4Oeeeqa82MDI?= =?us-ascii?Q?6mm/Kha+FHdIO6+06e9zu8KncWVLri9j/JdWSL1pf+ceTJov/CfZvGmsya30?= =?us-ascii?Q?tJWGZUIFin9Dr9O8BNnpeookci6/M38as/PloLJa+fLG+Ex1qjkZgescfsz7?= =?us-ascii?Q?iNMr+Bja6RI=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM5PR02MB3356.namprd02.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(376014)(10070799003)(1800799024); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?TNRKHKj70krTQThK1oNZLfsROQYT0K6gyytNzmJ5n9rG4hBlJiZ19Bwv4x/2?= =?us-ascii?Q?un/PvLo5wLqQH7E4u0mykQZO0MrRH3OuzAzJC3WBK6qTguoO/ACi7gVIWmhe?= =?us-ascii?Q?8IwEmWZTG7+NoffxkqrUFlqIDls6A3Bs9BTGPMtUFxJv/e2XArhznX8gElIs?= =?us-ascii?Q?oLpPVf/lq1vywI/fbi9MiXmlZM/kWgef6gKMmhWwbSL8kNEJPB/30lN9BTjG?= =?us-ascii?Q?jOS2t0f4XlffGVrF7617AdP+/k7EzDCok3EMexB0zYuA4H2ylzA86PP/pF9u?= =?us-ascii?Q?NldydkrIQgyOhxVtddTYu1oW4KyhsYiAL+W0P4ya5Q+k7VZ5Ez5KqvfiSrnE?= =?us-ascii?Q?Up6tEZerfmeqxbJEmGcplcgdXhpxdZoU0de2V9sfprsQA87t6ptjnPocnfzV?= =?us-ascii?Q?cAIeg4uPkq3o8ze5iHxIVYitk+Glwc2LOLNnA+P9sX9BBIvpqsoFvBClZxDJ?= =?us-ascii?Q?Zu7mxZng1jeqijf8vWv2IYqfkHj9du1FnvfEd89Krse/vmBZXUQo9b16YNaD?= =?us-ascii?Q?LVZNXCx/T6s/taKKXDOHPAgRUpyiurRLRltZv1kJQt55CtTaSDiszVrBikMe?= =?us-ascii?Q?mKzuWrOZAxVS1lyI/fYNIYw3pi6CQSAbE2oFxZ9+xLhRq+ID2y6vXHVxKGaa?= =?us-ascii?Q?lCLq02RRvfk6q2ZcY0aogN7LSctzZYgwlgYWMXWJRs4HnsOqLsNiTp5cFNGn?= =?us-ascii?Q?xhfURUL3zGJIPP2gi54hv149zLl4JtB3bvj9I93B/Vq+CIPc/OEHqH7KGIWF?= =?us-ascii?Q?58marTClECox2xp7aORFs99TFw4LCYHt/fR0D1MRzJhQzJux/kN1b6edJCnX?= =?us-ascii?Q?WNYCghwlWrDBOL/ILJf4iJi0i4wgX8Uhv08yX7EocInv2YPTHeXVn+SRaLOY?= =?us-ascii?Q?jM08u0CrMeq6jqnzKpLxThMWHdlParDPObJGANB8gIYB4ZVmnO2oA8u+C31z?= =?us-ascii?Q?6fPUwPn7YGnHh/4ypUxPv75DXuubMJKZp5nP7yzEXwc+kwM5ndMy4gsgHdwj?= =?us-ascii?Q?ihRXGTU/2D4oNjNPXDOjwpMqacy7fpCbIVbv7a+3ZbudiD2I7XClukfAoi+p?= =?us-ascii?Q?uLkoi1DOooHE1G8QmoDf7wJkP4I799V0/tECptjiP7cNgXuPCJa4UAKAD6QR?= =?us-ascii?Q?H8ttc4S9QQThLeA6EScozJgqS515nUNrc44sGKWIwcJRBRhoOBy8tMcJytUF?= =?us-ascii?Q?GaQd13LB8Q0CMZJ6bZChux0RoGs9JPjSsoDpTU4Jw3FxWVim89nMFckCtZ20?= =?us-ascii?Q?01CVwtiSF1dpcpFihXjcKDTUXEqEVBWGRYaN7447zzV6+qtlCz2Xjmhs2pgD?= =?us-ascii?Q?hYQk9GJFjEJKqK3/AyD86qbOg9DPKQupNTwHNKnilXcLuWniqB6BCyg4k0Q5?= =?us-ascii?Q?CJWpirS6LY/tTKS7YdOg/wNC8FYEvWoyyDzT+ZqgAq21Awi8iiVGgk8OqnlI?= =?us-ascii?Q?/21nGAN/j8YeHD7MEUyup0tOAryQrM0UohvzaplUgbHSuJLgmOs82vB5xao5?= =?us-ascii?Q?5DalSGjlLj5Gl9URzxNZRHkdQa56AA0k/0MOpcS4v0N5tWA09ZZrpBV/kSh7?= =?us-ascii?Q?Zr0YCRSPyfAlHFehAQ/GXcqo+csvL6qCSPaifFJk1zHQJy/5J7rh5hUyUAhj?= =?us-ascii?Q?+JOizPBEYRvZl/niZEQozhLKBuwN+YTwDxNA5/Tfpidmv9LinZ8Xh/v9r5Gz?= =?us-ascii?Q?J1t9ww=3D=3D?= X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 910beb1b-b94c-42c1-bffa-08dd83efe7a8 X-MS-Exchange-CrossTenant-AuthSource: DM5PR02MB3356.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2025 11:54:16.4719 (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: X8GiM+jqay3En2vsY5z5Ki25DVvn3/by/8Ned+9RyXpugTB9smdsFHvi3mtwjCGVbtAarqXYi2dELZ+AIv826Z4+zSKvoMLgUxnHoctaGKk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR02MB10337 X-Authority-Analysis: v=2.4 cv=boxMBFai c=1 sm=1 tr=0 ts=680b77ea cx=c_pps a=4/dVwHrG2xlZHl48ITU9gw==:117 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=XR8D0OoHHMoA:10 a=0kUYKlekyDsA:10 a=64Cc0HZtAAAA:8 a=rnFr0Qxienu5vtaJ29UA:9 X-Proofpoint-GUID: lCY7mABh8rrkPnrr-s5EmESGt2gZ7gbE X-Proofpoint-ORIG-GUID: lCY7mABh8rrkPnrr-s5EmESGt2gZ7gbE X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI1MDA4NiBTYWx0ZWRfX5X+P0vPTTyoo 3oBVHAR2cGS+r0tIek6To9r7VYq47ph2Kp3WD+deekSOpGyRcrMPBBt7iWF98wIocY4oem8IMos Y25q4BAO9cnUpuyhawB5lP3F/fN2OdC8Q19Kos5GFZiNNHOCNFseiUYbdEnLhFY1+I9MuDGhlFR XGte82ukosQbPby4A/nbsx0uQ3M+xS5f2z+52dGnse+y6aQMH+iHCEgeXrAJ2Zrjqc7f1FOKGCw wqXgb462ajFvewQPOK8mFIut6/fts3iMxsUxI3mrvmb9JKV8ReTeO04EMLAOrF33pircGvXJMzf joU67eXz2wWHd21SloAPYxGFcL1NeMKMRW9w5igMvcoU87r1fmdC4ogBts6TtmNu3a1iehsqsqB UPE60GVQk8VhLSvhyDe1zT7McEIN34MPKgHltcFo0KJaWO3NMCxDkObJcdfY2TiM+fnOTGEw X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-04-25_03,2025-04-24_02,2025-02-21_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: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.314, 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.001, 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: 1745582090242019000 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 | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 34f63a31cf..a12f63dad6 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -487,7 +487,6 @@ static void pc_init_isa(MachineState *machine) } } =20 - pc_machine_init_sgx_epc(pcms); x86_cpus_init(x86ms, pcmc->default_cpu_version); =20 if (kvm_enabled()) { --=20 2.43.0 From nobody Sat Nov 15 23:39:34 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=1745582168; cv=pass; d=zohomail.com; s=zohoarc; b=an6jiFJDL/pP/sh+u1FTFZbEZUgMKZfhEjXfBMyMjWFGELrelIRZG9Rk8Ud662+46VH5V2qsp+V4qwvfw8HfCA0zcGABmte9W9Y6g6wyVpDueiOkOfob2EySDMJ765xBBHwPrlkYcboAlynqF/nT4PNTijwfDDITrSA/d6nJjv4= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745582168; 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=6Re5N110ep1ueTq4DBCf2DavH/LCjXqGi9Yc28YcatI=; b=J1t/WHJhhORY3mL9Frqu0ahoaLskX8IHz7hlT1mym1dKlqMgxrqhsV5LYG/o7aAB9+bQltzeLVw8xci0OneNpx8yPoq/25BSiWYjO6tvt6qPayPlrhsC6NqA4BC8dG0RdcJuDH86SVUSVlL1Vu2aN89gHRzG7mO7HYqINE8q1SU= 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 1745582168852533.8404950437275; Fri, 25 Apr 2025 04:56:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u8HdU-0008Na-Jg; Fri, 25 Apr 2025 07:54: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 1u8HdS-0008N5-0F for qemu-devel@nongnu.org; Fri, 25 Apr 2025 07:54: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 1u8HdQ-0000Ox-0D for qemu-devel@nongnu.org; Fri, 25 Apr 2025 07:54:25 -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 53P29vwt031395; Fri, 25 Apr 2025 04:54:22 -0700 Received: from cy3pr05cu001.outbound.protection.outlook.com (mail-westcentralusazlp17013079.outbound.protection.outlook.com [40.93.6.79]) by mx0b-002c1b01.pphosted.com (PPS) with ESMTPS id 467ww3hayn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 25 Apr 2025 04:54:21 -0700 (PDT) Received: from DM5PR02MB3356.namprd02.prod.outlook.com (2603:10b6:4:61::16) by BY1PR02MB10337.namprd02.prod.outlook.com (2603:10b6:a03:5ae::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8699.10; Fri, 25 Apr 2025 11:54:19 +0000 Received: from DM5PR02MB3356.namprd02.prod.outlook.com ([fe80::72bd:6790:f9e7:f241]) by DM5PR02MB3356.namprd02.prod.outlook.com ([fe80::72bd:6790:f9e7:f241%3]) with mapi id 15.20.8606.029; Fri, 25 Apr 2025 11:54:19 +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=6Re5N110ep1ueTq4DBCf2DavH/LCjXqGi9Yc28Yca tI=; b=ojs8JvIo7Npm4RzKbTsAAy2y4kgElE/+d2cDCsfFIPErrM3U0AtsvWDXE PcSyI6NhOkgBRxBmapRXT6ZpR3lC/zoB6SRjKN0b3SSk5hRcopXizAiNS/JfXW58 0QBGRCKmJZdkVrAPYfLKB0GFMl2au491rtvF9zwBw/YZP7jr3d2UgGYaRDWKIK3v ZhZjMc+XJvqsqxV4+IvkWJMcABgZf9XngtgYqKBNSf6HQ6jCnVWlylri12eSpGqH /Tm80boCv6+SHz6fGZd733i/gYAt3Zrn0eDtDYTcaXs3mWzQRiFoyke16r8MKYMm Kv7Lc5LVIYzNyPWYyx++DaSL3XwhQ== ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=j3POsufyBCKBuYQG9FGtKCGUvPiOdZ+rPG1UTlyyb1jmLK72CPnkXtFgclD+Bcg+BZsaeZ3VsSQ4oBJAmt+WargwD6UZHCZC2hxVbzOLjrWuYqahkHf9g5K5D2ZGF+g38kS0r5IPlHLwzEPl8b4Y1z70TMpqy3GbGxUQZiEur0k6S0j7WDrpNlmMPsi09C8U6UlHhk98wXdZb0KOjTGgN6TG6kpOXtOiWtt7zf5+kH9dP+JRb0I+YIs5hiESA5DS7eve/21VPbJjTK6HSqhbfN6Z66YytRulrMHruTFm70+CdmAUyJ/JCimxUgkUetbC2ljpr70Js+6QYAG2GmqVDw== 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=6Re5N110ep1ueTq4DBCf2DavH/LCjXqGi9Yc28YcatI=; b=j29X0ynprWruMGdkx7fg4yK/h4h8O2RNGdQXu9ZxPzbcNOgLt72g6h95F7l9BZTGiQU0Q7A9f7UfVFPv7XPcv2sfv0mAknqMto03uC8Z8i3ONvEz8LzVfFpsZsd9oziDQ5T+IsNbE06KTisZ25fuchwixOH2k08td+/JYALRH/fg0ayiSsQRsleySwUTVbHpUmcCpPl3gzf6x67W3ge+NV9y9lkz35ZisWdH/2Lcpp9k0vpS5Idd8K7EOH7ISN4NJVwScxXiSqAQvNXvi96+GtOQ/D74DWr9BmrSmJngjrgpldt1hWHQtegyjcdOTvVrkq13OuKJxuW1puDPAPBouQ== 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=6Re5N110ep1ueTq4DBCf2DavH/LCjXqGi9Yc28YcatI=; b=LZo+nMkYPYzQHBWUs8ZywHcJSVQeEvOlhBv6cG7emUr2kxbSef6mUzs51ZaVNEjlLf3uMvysxgs/UpRr30Kv+xelNtnCo+EQP8XQgJVC2KrgMUkCWbiR8mKKaZqw6+XfVxvz54Rc2fpM5KNKe7Ljq+UV26v4o+cYnaQpcWt4ccfQ8pq/DInMe7fW18xzdjw3gBAIRqJVNrjBtPfLwZD09UE1vk7m70HsP0kWc9YMTdq7iHqWJ+eH4/SfmQBLBR9IW+T23Uk04DxM7qXS2sUqYyHTAWlE5BxtDNNK+8zvNP/h4NpJoo1L7Qj2i7UWef5nczXzbnugYdJuTsn0m+bnhg== 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 05/12] hw/i386/pc_piix.c: remove nvdimm initialisation from pc_init_isa() Date: Fri, 25 Apr 2025 12:37:52 +0100 Message-ID: <20250425115401.59417-6-mark.caveayland@nutanix.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250425115401.59417-1-mark.caveayland@nutanix.com> References: <20250425115401.59417-1-mark.caveayland@nutanix.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM9P250CA0008.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:21c::13) To DM5PR02MB3356.namprd02.prod.outlook.com (2603:10b6:4:61::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR02MB3356:EE_|BY1PR02MB10337:EE_ X-MS-Office365-Filtering-Correlation-Id: 770abdd1-9cad-4cfd-ebd6-08dd83efe988 x-proofpoint-crosstenant: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|376014|10070799003|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?JcXEa9vc/PjIqF7BGhNQi50lUKssLYyBBn0osKEHEoZShlxylyxUDTDSTKac?= =?us-ascii?Q?RS2IjQF+lnpS8s//tV+PNIEn8pCf9mTl4oN81/u4Hpjur+JBo+MLL9wimcYO?= =?us-ascii?Q?iD+sxt0at8utviRYLZCEok4TsXsqZg9dl5Xxcgr5Sfont1FDeltewOKSSBEd?= =?us-ascii?Q?f0d47HXAp3vDEk0J458oCV9qOdQi8z2eS3iqVTDTdx3h3BuzUWfKsg4gN4x5?= =?us-ascii?Q?62C5fEvs77UIIrUEj+KP94f8a+Qm/7df9VgzGUCKFsdw2538P87T84bETFd1?= =?us-ascii?Q?A0jDAt4PJwEMzZ9iQ5EuGcgd9+jugFM2RrWufSm3x6kYnwm0Vfw5t+mj9KUk?= =?us-ascii?Q?mG6C2dTb+KdRwU1geIc6ddNMjaCXEpfzX055S2+k7Rrb05qF/cGZGOiRBeex?= =?us-ascii?Q?GveWsfp0HF2QBy/f5jRpPoOHlfi3ro+SKY0Tes3NJhE3JjyIs5c3oJ0QD7k+?= =?us-ascii?Q?FaiLgkmsPudLJ6YWPgUue4X4G4Y+jHS+QGE+mFerGx86INoZoZERitqKnZY1?= =?us-ascii?Q?cFhfQ/qHqfOjJ1VOz0SKzEaVpV+xoI7MIns4NImHObW/LzZhqCggVpXb4Dl5?= =?us-ascii?Q?iZwMcUKvb7seOU8LucJEKH0RsQr1T1fHnURQMl5cXcEzcg/brK/9PTpoHmcH?= =?us-ascii?Q?CeHlTKsMjHsEC4aTZ57WH2TqXtB7DESw3izirEVcANnUeBtj097xeT8f0CH0?= =?us-ascii?Q?4+ox12TOSdUgYS9b9EkU5a3ITD506BmCRmdbS4djk2L+/0dgJYIQSCEi2evK?= =?us-ascii?Q?u6UiPf8qqy7w/A4sQYLJIh7RIF5cblk+GsIAHl1o46TXdnAHmzhOAd/Bo5n/?= =?us-ascii?Q?ZhTnd7XbjbFj/IcoAXeNvmlS2Ojqbm0oCHU3EhUPx31oLN528pRSgA44nDc8?= =?us-ascii?Q?+k5DP+v3N86PKu8wKXNaYDCrb7KJoNfycTHX67Avwg8JIAr+iVoODZHsgO9S?= =?us-ascii?Q?H0szna/gg1T/ykHC+MGzOvAqvX3DJW0JGOZguUSoNGaEngULs27RTYIxtZvj?= =?us-ascii?Q?VUogVQGybm6F9kfHvkDr5JFWzUrlPk82OdMD0xrQ7Jle5hi/3EyXIMF1BTS/?= =?us-ascii?Q?e3TaC70T2WgTWneEqymWl9GJiKZTEZuZ3uRGgpeiOaa2oRXAxF9tw+tglbN9?= =?us-ascii?Q?sJP0XNHfaJTqKgQ2qw0qH/2RJP3oiida402G83m8+P9cfWXxikroRKArCmEI?= =?us-ascii?Q?NL1GNfQGP3/bR3CX85/RJDaRnu/MYvgRNmy/XjzrNXtkZjm13IJdN2It8Ka6?= =?us-ascii?Q?R1FgV+DyFHe85c2MdHo9uvIzZAkFgYNOtBYJ9sqIDlnwE17ep6v9K05OMsKt?= =?us-ascii?Q?OxvCHmhyNXHddPB7QJN2ZTT1VkQzZvyTu0Y28PZhiz0lcH9CjYeU0FWA7DrA?= =?us-ascii?Q?9h7FOHpvJ/HnhzDyp2R8C0RHa8aLxKN14peQZOP8kfUKVKty4IR6Y2wNdEsj?= =?us-ascii?Q?aNNFHN2JYns=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM5PR02MB3356.namprd02.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(376014)(10070799003)(1800799024); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?P4ECl9cxLEU4xR/PC/hiscmOJd24AbC6oTocUIBBcTZVsYKMCsgmALRB8l2P?= =?us-ascii?Q?6dC/zTNeoe0KzekbznASupgUeGIRXMANoodIMd7L/iF/sZ/Y/iaC2rEKy2gx?= =?us-ascii?Q?2DcK9RfszhejwsPgyBcjfhLvCb8w8g8QIWlPjVQjsLhnUzqOzZ4gVsWIQRhp?= =?us-ascii?Q?o4p1zAwdfcnaSVT58DwwA+FPfIXEfVImMSeQLHwbNRiWkBBB+DG2Ch5NHbdd?= =?us-ascii?Q?6hGhpO6ZDvUy8rYthEHSficV/n+aJPwYHfpOONZ8ScJzRzoEmpkBdtPLwN3B?= =?us-ascii?Q?47saG7Hue5UHZkCivFIwPYvdT6eihUU+5BvSNAWzCuBYjDCJ2t8A37GX+5rY?= =?us-ascii?Q?82IcTdsKN/c6EeF7DD6paEZDhfWmH7USb0NKD/5o985oYABW72PjWnvIs0iH?= =?us-ascii?Q?f1rylpMWunJt1EtyR3LCpiY8oU4bG4zBxEj6FFTePR7af14GLzQ3coQGozI5?= =?us-ascii?Q?X1i8d/HUFpG0vyyx0HEvYoGguQ8jEQuXdn4iSTAuYOvvRmVON9XZ91GyZNBF?= =?us-ascii?Q?Wn4/JeVW8hzb2g4hJ0nwAtHEq1kgrbFHDvU2klINX08rf0d2D/NCB+/nDDXf?= =?us-ascii?Q?MiHZrkSXY/GsPEFH7fXiy+ggp5a8zlc1u/IUXLgwJJr/i7gmnvLfl4zYSjNj?= =?us-ascii?Q?ePk30zalRJ7YDfMinaqq0y9E859VGZmzk6qzcmmdTac+lcjtfUbGS5az2puk?= =?us-ascii?Q?q5EJJF6HLFqvTXswkUiuOkpt2+9Z7Lw04l0OHfl+lZUK1VSFpSY4OMubRagu?= =?us-ascii?Q?WbXiU4z6je/+jpwgHwVyxGRTzXlDGIhlphRdJI/L8zU+DbL9P3GTeq6QOOyS?= =?us-ascii?Q?USqa1qEJCXp1TH6AeyiRYPtG2xH4+xRf+LL1UXxdwSgtubvI4yfwN2bJfFyr?= =?us-ascii?Q?4PXccehfKA5zeNXMiUTO5oMlr9PHS5azrf6/zW5oYQk1vXXJKpeBhukRlIq/?= =?us-ascii?Q?ElJJkmXRwMLDIsBBZ6ykQampoOXKsJ2iLBKfDF/LNYfMVWLPO9Px9DjS6eMq?= =?us-ascii?Q?OLSJDHuWnqHUNtE0W7aentacmbi9603fT+nxI2n0T8hiUfLNNnkSRmfpMlZn?= =?us-ascii?Q?nxUiP2G02mL96SLzleV1HRxpQHNrRJ6zPoiH1qwAh1T3p59Jo7+ZQH+6/vec?= =?us-ascii?Q?SlQ6jPA5XxJi2NPKFv/PZv+fgESQoLlirGFDxN3xZLpTNM85gUVyW7heKji5?= =?us-ascii?Q?pUEXHsUcCIVttfuo8OMmQAAUkexkLJiLQjtT+loBIgQIgvRaPOrjuc7LnuGX?= =?us-ascii?Q?8MxZPkC6EhuSfk7aDycYkpt8fnutpN9lLeQy/MBD0A924t4Yrn9G+9gsdNgp?= =?us-ascii?Q?bXAbbqLQTmAs+pcPpwUa8QNi7R10gON+gng4iahQfcQGqiHMfvbnpofZPX4o?= =?us-ascii?Q?Paq4HqPcB4s0zyFxAkoFwoGIbS12rjo9sciMi9mg66fnNvMWlYNIs2ZItL7o?= =?us-ascii?Q?vBa7VWFEg/we0uU+QjfP608EZRelekfErJ5ycnm1kereO/rasS+oWhQYrCND?= =?us-ascii?Q?yORUQr7QaBRSWmrRlhRzGtw7FGMMZ01ZavAkKKHLnBVjTTSk1tXdZejRv4Wm?= =?us-ascii?Q?nwXy7psOZN/vCwA4As/HAVATxNJ1DfiXficRB+OZ/gUkcFLGVJC8yIPazo95?= =?us-ascii?Q?rMWd4Nf4rmjEMsvhvzSy3o40THUZPXOBnhnaw25lNgZ/rYxb3Isradf8vxoW?= =?us-ascii?Q?0pQcxQ=3D=3D?= X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 770abdd1-9cad-4cfd-ebd6-08dd83efe988 X-MS-Exchange-CrossTenant-AuthSource: DM5PR02MB3356.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2025 11:54:19.5785 (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: zjmiqNgqT0RQQLl/7xj4rHglJ5dSWPoatyVUu/s2WrMdANEWmRgee22BEamEi50zL6jvcr3GnZOPOyXEh1OVS/PUOWBIBVxWVjwL8RdGrrE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR02MB10337 X-Proofpoint-GUID: FfdjiXVNJtAHgGovhm3C5Z5nPlFrVMh0 X-Proofpoint-ORIG-GUID: FfdjiXVNJtAHgGovhm3C5Z5nPlFrVMh0 X-Authority-Analysis: v=2.4 cv=AMUSjw+a c=1 sm=1 tr=0 ts=680b77ed cx=c_pps a=K1+iGLXgNHoxMcL4Lb8acQ==:117 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=XR8D0OoHHMoA:10 a=0kUYKlekyDsA:10 a=64Cc0HZtAAAA:8 a=XL6wrB0Zc_gxRR1ig4QA:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI1MDA4NiBTYWx0ZWRfXyxnvsAkt5FLj xAMBqMPtgyyHO737ZWmhTSbW9besOzpEBsu1PUVZd3IbvFdcf437Mp41PR5vn7FlzaVW/seTIjy AHRuuMxSbDsrXqxSx6YkSAhCI1X4YkK/VAvUgHPD7bfFQeh40qOIU+WMCF/UKxIs8rEN+yFi2Nk srG5dOsMEojkflSt3kiO/xHSzlH0Hb1wKjyi+FnboNctP7EGmy5kHoDs295ah4n+pjsLxbkPznJ iI8srR4iZph0dIUYjN0BGc0Jj33ryUkO9iaa4a6qixoIWJ5ucPTvLOS3YyvsHR2cAl6yPWyrJg4 2uBhDEMkELb4iLYpjdWf0fjenGt4XjnPelpvY1fuI7dlN8Nb+tJ7h1+EK2/5H4liw6VFgfhdhg4 2pIyEjsuruaKhunpx0ncSshfYh1QcyzcsbK26mUzQqa/aQc00s+yESMy21UZEk+aHtqp5RLt X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-04-25_03,2025-04-24_02,2025-02-21_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: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.314, 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.001, 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: 1745582171480019100 Content-Type: text/plain; charset="utf-8" NVDIMMs cannot be used by PCs from a pre-PCI era. Signed-off-by: Mark Cave-Ayland --- 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 a12f63dad6..1e364ddf26 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -557,12 +557,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 Sat Nov 15 23:39:34 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=1745582217; cv=pass; d=zohomail.com; s=zohoarc; b=RXDXyMl/qU78n3hDvFknPrflfjHWqXkCIw6FJuWU7KHDV8OxH2SMjgaD5XqS+1u0+LDo4hlrPfZX9nOonoIKXysADT4hkmvx+ENNesBXYvpaXtr8ytqzJ0vSLHXt7oPSvM+FR6EiELF7NBdIGpUr1Pn7rggcsNahcG9GEHNjW0Q= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745582217; 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=glcW4HkFXcqKcyAqMzImLGtwh1T387kUvZVRErgpiwQ=; b=b/fKYo/lxQwTDlKvwQnnjXpxk3Zi8dimd7wFZlXDIor6SDJ5W0lYe1W2wHb6ocDhRRGk9gJfcmJdoW7E1oa9B8R1p83iIINUVbFDMdjjfUKuMZLL18xz+I93iFXSFe43V7kkuQ8Jrjv0RqvGWlF97Y/NiSaQNLlRkBU3lYpsDs4= 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 1745582217954191.26955798775168; Fri, 25 Apr 2025 04:56:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u8HdW-0008Nx-G8; Fri, 25 Apr 2025 07:54: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 1u8HdU-0008Nd-La for qemu-devel@nongnu.org; Fri, 25 Apr 2025 07:54:28 -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 1u8HdS-0000PD-Gk for qemu-devel@nongnu.org; Fri, 25 Apr 2025 07:54:28 -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 53P29EKh008884; Fri, 25 Apr 2025 04:54:25 -0700 Received: from cy4pr02cu008.outbound.protection.outlook.com (mail-westcentralusazlp17011031.outbound.protection.outlook.com [40.93.6.31]) by mx0b-002c1b01.pphosted.com (PPS) with ESMTPS id 467ww49b1u-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 25 Apr 2025 04:54:24 -0700 (PDT) Received: from DM5PR02MB3356.namprd02.prod.outlook.com (2603:10b6:4:61::16) by BY1PR02MB10337.namprd02.prod.outlook.com (2603:10b6:a03:5ae::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8699.10; Fri, 25 Apr 2025 11:54:22 +0000 Received: from DM5PR02MB3356.namprd02.prod.outlook.com ([fe80::72bd:6790:f9e7:f241]) by DM5PR02MB3356.namprd02.prod.outlook.com ([fe80::72bd:6790:f9e7:f241%3]) with mapi id 15.20.8606.029; Fri, 25 Apr 2025 11:54:22 +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=glcW4HkFXcqKcyAqMzImLGtwh1T387kUvZVRErgpi wQ=; b=a/vzbRH8zrIFVEU46ADW+m+NbgMCuwLsJStuUH3J6/ao7KaTgmbZd3T1+ gaij1rbLt54vyCYe3egWiSlxYbkCzT+FVYJrRcEWzQuZelHsPAW0bm7tSQlftlGe 9bC69htkAqcBXDXwLt8+nZGqGNOfy4GFl9+jMUlVhYk20gFURslBAbmeAIYbi0wS B0cBEKk5Dx9ljsLPRnP9XxuYdQryLJiNTFZTc6Yk+rukTo+Noj2OUnfNb+Xips+U qaXYewitmmRrm8ZKe3gdFmq7fNJLk9n3vyXwp15DUtYWJQ4By5nYvrNeEAUKwZBs GVKoqiDOuBozXHUh4lhxdamv8NloA== ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=jWh+GTMAld/k2S2BeWLaCq6ABYdYOE5tuZUxHlZXE39rM9xxxsEU5YzwUhSzpQZXrpVObGX48HPtcBMhAFlBF+PzxLHLODYyQXTkeRbk+AxiYAVTFNkEZ6v/Cp4t+tq42FCc921+MF8j64FxvK+Ibe7HppaM9qDxubnFxG8MacDc10uQzsFGdLr6FwGD2ktI90BhFtkvHm4xhSrjx3gYI0fwYY0jJwUUk2EliOnWFzneWOx3PJevfA9wEIxEYznzI/FyDJhFZi28bubseEwoKNDYb2i2++xmWTqsfOuvQQg8stVddLiGEIT5otxgPfPpqoJPritJvVAOhQKMJTK9eg== 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=glcW4HkFXcqKcyAqMzImLGtwh1T387kUvZVRErgpiwQ=; b=bKlRXADmCBEDYjPFgsfv7Vub+f67GKk4AKhnAMEIUgx9u2J7YZv05xzyB83js9cp97r8jpFQxRSn7W43XrYbxrj1IandMbrDnOfMf2cvL7WLB/NcDCOLH/bEB5aXxjsA3iCb9+Lut8bj6WwTAPffsYbdImsRei0kQJ5eUJffXsKC512pPZvLGqt7hqpuxe1gBVc1X4mAmn6sQeodP7uR1VwTIc8JXlSGh9LWvB+5epF8ci2nuJYV/nHdSd7p1iBMohJXUNhvaLkgWdsse3SqWHePbeqhSlct3TYueJDP8BgeS2FpqOq6axoI3Oka6+6pd73Am7mgCUJqPpCHstnpzA== 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=glcW4HkFXcqKcyAqMzImLGtwh1T387kUvZVRErgpiwQ=; b=Lv/MLhcmp3aFWIgETivVNe0J348/UagoNBixa08VEyJ6ciOeEX7zLZ24JRI7+7DmD6qwlkMwWa0YI47vhKlcbtD3Yr2JeSc8waQBSGF9i3YQzL5pnU/jUMu7fwmUlJdfaGY+B9H8WjKAr56iyN3qp8OWa1gC3QVpfYep3BZm1vZULBhyy5L/xJnSGuWcYLsA1iKZ6SyrJTjNYkLt8L+5ksg0kOgyxfZwfOCtIna+eR2e3hlpMh3M6zh9wbQZlyrxTVVdgt+9UE08EFArMr3cV2vGWlvgXsrohj9XS0h7portznLwcJOZJ0XSxrJJUXngrdVwC4DU18IEbOgjIzy0Gg== 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 06/12] hw/i386/pc_piix.c: simplify RAM size logic in pc_init_isa() Date: Fri, 25 Apr 2025 12:37:53 +0100 Message-ID: <20250425115401.59417-7-mark.caveayland@nutanix.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250425115401.59417-1-mark.caveayland@nutanix.com> References: <20250425115401.59417-1-mark.caveayland@nutanix.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS4P195CA0022.EURP195.PROD.OUTLOOK.COM (2603:10a6:20b:5d6::10) To DM5PR02MB3356.namprd02.prod.outlook.com (2603:10b6:4:61::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR02MB3356:EE_|BY1PR02MB10337:EE_ X-MS-Office365-Filtering-Correlation-Id: 8c629714-fbf6-4f66-0d46-08dd83efeb27 x-proofpoint-crosstenant: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|376014|10070799003|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?wrppmUhrgy2ps8UGEF9kvgj9U+QIF9iWYQimmSuwkFpTn/ZfRSVMinoaazIz?= =?us-ascii?Q?tEjrSdX7M04/FA8rhaN7f3pulVSluMZVFM8cke5AHH/US4em2VpdYvXLHHk9?= =?us-ascii?Q?bDlWQ8U9Q/8Q2sV3C1Y5M8iCDdmAV/iwA5PDYzIoCyetRmYKWXmfe3eQZVkV?= =?us-ascii?Q?3rK1jm/2IzQkwZApVrKvRyfvlTvXtbHQVHQv5fWkhTU2b0W/f75sE86bFq6r?= =?us-ascii?Q?l3Rtk1HMjxUXKhGKbuik/POxD6Nu+Fh0xJFoaQfnccPSB4cj3oCxrYSV7GQ1?= =?us-ascii?Q?+3NbbXOFaQXX+geQESPGGLi9GmvR5IYkM2GiSJiQsF+ZfBXLaoabiILcIWRu?= =?us-ascii?Q?71DZvcYV/LMSRjMz/fX6+yBJHK5c8v59iWj1/0w2OL+ZcsNJVYmp7dTGEvP7?= =?us-ascii?Q?UGuBOSP5Aho5bjFCZtPgrdSiP59H5b6LOab1gYnBzu4eVQndR1IITjN1jsFY?= =?us-ascii?Q?NBUNN2OVqJ1YQFtgLvQvY43tibi4+UvN+89nBxJ9+Npum0rztCOHhw2kSOf6?= =?us-ascii?Q?UQVhDHxZNRRRwioPoEj22nqLG0c4qyvGclMCeK9y6AzebJwskQ0T4btNAIwD?= =?us-ascii?Q?dBZsLBihTPtIytYR4eG+0IQBVoQkNA/08Drefl7HjgEAhMa7f7hM9F64gXxR?= =?us-ascii?Q?1V7E5Tlcb+xyUaO2uWbwrt3C4L47Cdwq88cwoqwXObaMYxqhTCnSehLOarQZ?= =?us-ascii?Q?tYBmGORBeV6FzyRp0Ddvrv2e8sGe+LliOl7ejplz20hDsVuqfqOlX9HkHN6s?= =?us-ascii?Q?BzKn/nmX63qcTZUF2aP5tt9aewHIT8JqMEIFIbASCuXB1Z2MpdzshUoZ+CuI?= =?us-ascii?Q?yvLiQ7dEXsUsBczKbnh1XWu32g3MWJoIJNNWBLQdZM/kznCWoU7stdpCL0JQ?= =?us-ascii?Q?vY9gDUN//6R/aSMTTcPDGEeGeeQR0FZrf8vCAz7TF/EvrBDEWYMWrzd9lh1x?= =?us-ascii?Q?UFiumyoZWt9qc6AToo77Y4n6p/t3tL4QB9UMJU9SUnBXkmAflhDQu+QJvhQM?= =?us-ascii?Q?ABTZnram8JrUQ/nEIetmEkYOeqinP6fzNzMshSZp3UC0zGnZLfP4MJldlVi6?= =?us-ascii?Q?KM63HTl9GH1tdLTJPuMosu3ByBsGjitgBoBTWRKjCex7afcB5UVMsAuMPi3/?= =?us-ascii?Q?9QUghltjVww6U88GWoMgErEMyf8MzkdcipHOMQDLVdh28gIQ62P6GF2mQyRs?= =?us-ascii?Q?AcqO7A1qHwM95B4pIhY//jTKWsyQWl7yOSpT/vn3G2Hd8RaZf6pn48TXGu+e?= =?us-ascii?Q?/JHbm9zrmmVRK9ZGLEOhpESTGQ7KA01QG6AtM2OqX6ymB5238vDhVIULXzPb?= =?us-ascii?Q?+ZCotT+Gtm+OVmOwUTTsHaCgexNL4QFlJf7u01D/6Xgm2uB0tVy+7idptYpX?= =?us-ascii?Q?UHKwA0UPgD8RG06grQBCnVRb9kz3a6YFMsNosyH03Z6K4M4wQO0U4rhPdXHy?= =?us-ascii?Q?Ze9u/rsO8yc=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM5PR02MB3356.namprd02.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(376014)(10070799003)(1800799024); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?5kqfLDJuELFHTnYTasrojxaSPeY/oIQpw6R68QD2MR3c3ROH3VIyYws1UrxA?= =?us-ascii?Q?d7GahyxNpaRyJjqtGcX/5xTi6niB4thq29/r3bht/OKjQfWN1ZlxyCyJRxYN?= =?us-ascii?Q?OhOWBRZO6tRDODeDaFD2zJNQ/judkRwGKrUbq0lqjnnmC/RRRcJqTbdZ1FUU?= =?us-ascii?Q?5PaaRnkizTH/+12Dt68WQ4SU3wEupVSZN7hIW/w/VIBHyzThLGU5pXzkWg63?= =?us-ascii?Q?1xcj43dDNwJOLV6xMt+TLQrnmfXcrcUnXdeNi3S6QAhxyB2NIPbY09HS0e68?= =?us-ascii?Q?1SoNHmh5F84jO3et8L230HuI2qnJwyTUnayx0+Qhd+QTfVSazEXxlAgJSveX?= =?us-ascii?Q?krSJWfFovwgKHwc1n1m+uT21l1/c3LpwTZAm10P+IhRhaDXAEc5LwyRX/N4R?= =?us-ascii?Q?ShUn1tCDUQ3KlDrrlAxm/RvbMNTUFcxAy/EiuY2xrKOzwqZZKhi0+o0u8rmZ?= =?us-ascii?Q?CL3okcu6nKiWhsD3RQoY+g1MNW4kJ5udOi+G7aDxQaMSVdyf9q05dnmkZl9t?= =?us-ascii?Q?mGDV3NkkuJYT4IrBn1xjUj6FVon8I9yPHSnbWhsWiXjovcEynIcLmBXL/0CS?= =?us-ascii?Q?2wyx0sF1u99rj8XfVSga+4zl0Yvi9OS6JphSuh+LyS37GQ9l+32duFijoUaV?= =?us-ascii?Q?oqyNKfsPN5/sMadvGbSHxidINXtDHXeBDzUmyGTo28oF+aQJl/88uGlA6BgP?= =?us-ascii?Q?j9DILOxVz7iocCp2XsG4VcgANF1l8izEpuRthlZCB63YSPVaZrXsQ1a2w7+H?= =?us-ascii?Q?ZFyegsqdBhpW2QHiB0O5lcL5le+r91rpeBijscArCa1eTyELwrGMnt9OXm7c?= =?us-ascii?Q?LfkcdpbAh113S2wJV0u5T56tQr5y616ERsqBsvwuQxRqPKCn1J8EAsB/ksH5?= =?us-ascii?Q?qSxoBWKKoWoOoCr+NZ1g19hxsYVj8+/7mdV6mywe1ua6Vj2ozPEwS+56x19H?= =?us-ascii?Q?TPvb2dfHFfvFAbBaFA3WmMz/y2+tzGQlQLMhWc7MM3avX7GWKovB7d3Fye38?= =?us-ascii?Q?4tD7Ww6+II3+VSmCmkriDMAI0VoTIbf9fKuC0vGS2SiS3nCzIYtRLtMJGilE?= =?us-ascii?Q?GwZuDGuDT9rYrd4tFe8a9FkQHBqJkW2Jx3SY062/GLxJ4xa+/8BOVQIn4Bjy?= =?us-ascii?Q?ZDB9HAz4dqh7eDUh8dy+qPl4JD+YfqNF90rGJfQ4zJkWqvTdWRX75sP67Pk1?= =?us-ascii?Q?jGKcBQwsHGpZOn/80qJ2w6h9pwrREiIpY28eT4M2AIIHXPC0H+VlC/rg/RnY?= =?us-ascii?Q?nb5HldT/IP6cGewncaXJJgyHH9RlnPelIOhimLAkAwB7+pt79Zsa3OZbupND?= =?us-ascii?Q?ZoiEQV1lCfpITVgAQG0SnlYfvT4X109YcGcL4rd1W3MJktrB3LSSyziLv9nh?= =?us-ascii?Q?iIHOk05kRMOjEQtDV7h5EftHbmKPV3YNHckxZTeyq/n//SjjEv5EqXjrvNAe?= =?us-ascii?Q?TgScQ3qKHtNU07OJVw0nCRr/M0FP9eS40EPjfh8lEGim22zHEREZOpFnaRwj?= =?us-ascii?Q?7f4+0C/2fDCtOqQUYG/pXoDxB0TDwmCsutn/b//RpzbcTaYkIU11OrLCUS5W?= =?us-ascii?Q?BHOj6Zk9+MDGiNPMyZdPWd/P3MyhYnwVu4lmGB82UxV27RaChhN8GskVfHkW?= =?us-ascii?Q?N6tZaQUpi7qtQShAjqG8QGOBoZKdcVc2mOBrNF1wd3G18EWk2LJsi3CyMoix?= =?us-ascii?Q?Nlhr6w=3D=3D?= X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8c629714-fbf6-4f66-0d46-08dd83efeb27 X-MS-Exchange-CrossTenant-AuthSource: DM5PR02MB3356.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2025 11:54:22.4490 (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: aFymRnnlDcM/Mgqu/szWj7zZaA/AaKTqn+FksDPxUn9BeK5EY12Tv6oZbj+HSwiFvb5/aeMeVwUSLygMg+LGlmfeuDNM20e2r+/jPe2R4xg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR02MB10337 X-Proofpoint-GUID: B6fcUck5UDllKjt9zmOI4eI3mJz4Sy1o X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI1MDA4NiBTYWx0ZWRfX90nHVinWKZSW BQnyrtV38FdyvjhG/trfNWyS8r/vuno7g6luyN2xSvL3/DH3bBjR4frJydFXULkyKlElnsZ/XJn BldH8xM5BVU3U4VKOwgYhdMhH1t2NQiaM7t1PNdnKsan7xQaYMZnuykfZBC9zJRO4Sd30K3ZpS7 lNlDHr+aiGMxLN1Hm+BAtC9x3IyWzhmUisES3X0OfSn4AGq6hU1KQN22Mg4wcToE9u3Q21yT5jL 7/Q86RsBiHdWAv7Dundiam/AVp/0E6Ih1NPhpfbFaMhiET1wMgIS0gUQgPuFfmtBgc6DzE28uaZ rUzrrmza9Ua/J5TpZPX2xGpibZeVdJdgKsswoxQHaZHKn054trntFt3UGj/hwzU0woNAfeRrpAi M9jJCXXmXAKJmO2F+UoffkeQFe2JG4Evm9429GkNu8OK7/dQJiknDyVrqgP2tquLdc4J1g3T X-Proofpoint-ORIG-GUID: B6fcUck5UDllKjt9zmOI4eI3mJz4Sy1o X-Authority-Analysis: v=2.4 cv=C7npyRP+ c=1 sm=1 tr=0 ts=680b77f0 cx=c_pps a=BzboTkwgGU/iU5aMRKiaVQ==:117 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=XR8D0OoHHMoA: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.0.736,FMLib:17.12.80.40 definitions=2025-04-25_03,2025-04-24_02,2025-02-21_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: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.314, 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.001, 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: 1745582220650019100 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 1e364ddf26..61097c1e15 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -422,69 +422,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 x86_cpus_init(x86ms, pcmc->default_cpu_version); --=20 2.43.0 From nobody Sat Nov 15 23:39:34 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=1745582330; cv=pass; d=zohomail.com; s=zohoarc; b=mX9JmpXjXxP/DT7g38B+rprwuyYSxpqY/PR19qa23QElp9XZVf6R7rHqZGtx2i6nG/HUsK+gO8uwbcKLXvTN8Ik+javC9HIogRoyHmXijvBeps2UFcaerSvFba43PX+20hH998K4qubFt9SmnPw4eXsMLMD341O1Elzdza02HPM= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745582330; 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=FQSW0lJUE9LgixBAJNeDS159zjhevv8syPCFaMuKJIc=; b=PIUHszNBRKZvNmbI0Q8HSHqkJtKq5rt7YA7smnAYKwJGZhO1zvJNkZPgn/J0iZKYCoYSaRK/bQne7KyNJe+KRb85/6/IZ6ZfKvglCvOMvyMD+0bXcWZZTtVYxEgEjLb3rX4qWjArluQAL8WGNO2ERk24rSIRZr87jlW6HSHGBnU= 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 1745582330045194.23074984094376; Fri, 25 Apr 2025 04:58:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u8Hda-0008PL-9L; Fri, 25 Apr 2025 07:54:34 -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 1u8HdY-0008Od-3A for qemu-devel@nongnu.org; Fri, 25 Apr 2025 07:54:32 -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 1u8HdV-0000PP-KZ for qemu-devel@nongnu.org; Fri, 25 Apr 2025 07:54:31 -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 53P29EKi008884; Fri, 25 Apr 2025 04:54:28 -0700 Received: from cy4pr02cu008.outbound.protection.outlook.com (mail-westcentralusazlp17011029.outbound.protection.outlook.com [40.93.6.29]) by mx0b-002c1b01.pphosted.com (PPS) with ESMTPS id 467ww49b1y-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 25 Apr 2025 04:54:27 -0700 (PDT) Received: from DM5PR02MB3356.namprd02.prod.outlook.com (2603:10b6:4:61::16) by BY1PR02MB10337.namprd02.prod.outlook.com (2603:10b6:a03:5ae::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8699.10; Fri, 25 Apr 2025 11:54:25 +0000 Received: from DM5PR02MB3356.namprd02.prod.outlook.com ([fe80::72bd:6790:f9e7:f241]) by DM5PR02MB3356.namprd02.prod.outlook.com ([fe80::72bd:6790:f9e7:f241%3]) with mapi id 15.20.8606.029; Fri, 25 Apr 2025 11:54: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=FQSW0lJUE9LgixBAJNeDS159zjhevv8syPCFaMuKJ Ic=; b=0LROL38HCjxI9qo/1rDwGn57WIZsJxWw8sVlbJOVMuW9zXQLu2wlcF9/2 CcV+vvywYEg02iQis0Uf0kpv2XPpJb33rv47EGMIlGZIXPVeRcb2AHOcMXog0xMS 9sqncClaNC4Ernrf36jqHVk9RMLjxGBfRO0MYx7zdFEYtNR+FeVMt+mFRJJL2uR6 ufvya5tJzkqu+apAxO/j+17S6+/JGC189DQS7ytUXHIOujoq3y7lUZni9BvsZuFE 54vubWfN4evCfKjwUzR61ZuR5VrOgCZn+PEYJQZFF5PpkXjp4GqIXWKjB+8L893Z 8qP+u1VFUS9swPTcRTCnQMlWXQWxw== ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=u3wtJ2hGL97CumsLxLhw1omZfLrG9eWeuFNODcPh49oentxhJ564+G4+ZNyhNb9a5yiN05aCwJkvpGOQPr/1Uscr9cNmtL96t4Bb1yIqg2DQtw+RbeJ2SrFKWQolMeVVdIz6hqMZO0nGFunWEHmpfAKt6Xk7OkmIWU+R4ywelbdieWTUzXY5sqn9fswZQ2Fcq/EL9KMZxyhei8adiYP4EiBJgYyPL4Oi4QB7VZNiw6oEoTN8ZZaGGYyqMInq4g2pC7w1zYKXahkvqh16D/HRtuKKCGMk5quUEEUknmYLVfJLYRJMK536eGcS/d5/5ZBB226g7Z3ZMzzl6LKKoSHJbg== 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=FQSW0lJUE9LgixBAJNeDS159zjhevv8syPCFaMuKJIc=; b=gWgjvsk4cMEnRiSAZ/SR6JBE3rfyz1DHpteBoTrnX3Gfd2mewuI1Zc8k1Asa3pIBwa9u09U5QAOimMyshfZCU04Wegij3bZlNR/1dawnjSRmrqg+bE41KWaV0mjTZHjtT2LsjIrr7Vh6QOfmb8epcWxwZ4Nt0bd9KClRQlZiW2Os+hoi4yvAnGuuqTCnmR9VyYb3Q7HnsnVODNIXOmatkPQKUOwdCoe4jNDgAry+9I/c/Ld/SxhWrehm83QR9jkJKs76377bcHAG9zAkTtnuJzgYeF4GcCoEVtnWZeakiK9Es3Eea2aHDrfKO7mFWJvxlvVoeWC8XT2b6ySA+QKtFw== 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=FQSW0lJUE9LgixBAJNeDS159zjhevv8syPCFaMuKJIc=; b=ZQwUt9RztfIQQ50MoBUumLhr9+/xA0aL8qYsoC4CwwOAUQvgm+jAD7iTzPl9Uf7lu4CM3xDqrzMsVxYwkiiib8Uk88jn9b94ifbI4kLU+dTg1CxyHQZkOv+9C4VW/Vy749KpljgQbrVTvh7LfAqQR8BB+NjzGhwsxHfKU9aYBdghOr1eYpubPhldD29bGmfSR329AHjZ35/ro+4FY6rPqsvpAlaPnxeF6aoX2xXDfduehKyU5Y+QN+DmVF71NFG57AivGhi73U8N7vT/er4L0R+9iheY9//qXloid3mjzrLryp3l4bWGcfE5p7h63ymjskTaRl7KZpPho/FbfslbBg== 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 07/12] hw/i386/pc_piix.c: hardcode hole64_size to 0 in pc_init_isa() Date: Fri, 25 Apr 2025 12:37:54 +0100 Message-ID: <20250425115401.59417-8-mark.caveayland@nutanix.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250425115401.59417-1-mark.caveayland@nutanix.com> References: <20250425115401.59417-1-mark.caveayland@nutanix.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM0PR01CA0139.eurprd01.prod.exchangelabs.com (2603:10a6:208:168::44) To DM5PR02MB3356.namprd02.prod.outlook.com (2603:10b6:4:61::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR02MB3356:EE_|BY1PR02MB10337:EE_ X-MS-Office365-Filtering-Correlation-Id: 8507dc69-772a-4a75-6325-08dd83efed0d x-proofpoint-crosstenant: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|376014|10070799003|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?+hEZ3+7pf+8A1S9YFumfPhH+zxwtm4GhfdXkAe6xE92BbA6b741yImRZbEAB?= =?us-ascii?Q?e0PoCkqRShQKyKt9RDpoSiPlwvuGAIa19Mm4i/LN3CgTdDgKfbnBh45EyGKn?= =?us-ascii?Q?2+7Ynd9BEf0tZQeVeqBTu7GSuSA6Cw7ESjpzhUOdpG9qscCxVtBICXqY3v9I?= =?us-ascii?Q?w7b9yy/7cPvL1kRIi1BsFN6PNCAkeM8OPyB/HRn+7U2FkOmesjtU8cIo2yMG?= =?us-ascii?Q?c4EvNokVDLtvuUwnMmpT/STJCZcTyodK3CSz0j/bbNIkM812Fg9XLDh2XqJt?= =?us-ascii?Q?uJOii5RfFoMJBoVswUhL62hUTef+2DfLsbQIZ4e6QJtEgvWzjZqHmVZwq4A1?= =?us-ascii?Q?N4X9piPtSvfPdKOse5SwywN4Opxt3HWaiushdk0wJxgH2Zx0A/44n8xWHy1K?= =?us-ascii?Q?NjoTOKrEGCdaEtH2LDV6nPmGQh+CStZCuiGNMc4xNJihlHs3seSoJ/jWFaV9?= =?us-ascii?Q?GgsvUIf9Nza1pBIkH6H4N2cvK/oDhX/KwJdMxAU3sWdayew49LzhjrGMwMTS?= =?us-ascii?Q?TWSlwNKHUJzHDWhlEPC3yjIodzNxwGvdaev6v4l3U5TvLYE15jayRZ7mVcBg?= =?us-ascii?Q?qfWvKSM35rCHyn6jL03uTjCFGlsUfAw3xct1L8zOk15hitUif4K+glS2oZvk?= =?us-ascii?Q?1dBhyMLIU4pNUiaiV9sPY3+Kq51UpH3lFUfiLez1tLt4wDsY8ogXQtRvWXky?= =?us-ascii?Q?g4KUys/MoZvpI2eAQvCXKf2jKBex7CzNk6L46qVejhzCEonZkRM7uwm3XdXK?= =?us-ascii?Q?xlnLzs8/+8FKXzEZ3F9v4amZuRZ0/b2D10uayu+8p8PznW0aXpaC4XIPN7PR?= =?us-ascii?Q?dwO23TYXHuuZUGBvtM1reiKPL+Aw/nMVQ8MR9AZt435QEN5K+xueiH35Wvqo?= =?us-ascii?Q?yBY/y+ytW6j/1tRINLRLq2q/K1uwGH6ZbvzqDpdZSnRSECaeLW6c7T8ZCdzE?= =?us-ascii?Q?NZRSzJqrhPvXcvlEP2ba0uimg+qOVVl9YfEDS0Z0mjAYtj5+NvIenbW3RhjC?= =?us-ascii?Q?qznTCU0rojPGWS7fgy64DRV5RWyPfT0upTjxne6FbS0NxJxHUl7WVO8MkF17?= =?us-ascii?Q?Aw48iESyTO+SB6popACt5uM0kWHgEeiy+soaXDX20O6QqJgxHbCXJCr0PjN5?= =?us-ascii?Q?KCX4eNzUUje3/rni+p1JuNfjX0kVsgh5LjxCjD1+v5pMS9xC/UNl1+/7Gaki?= =?us-ascii?Q?oSj2WKo96IK37TakEFOiF6J6PvlZy5+p/MXIf9OBpl71z8a0rr/0wm160n1p?= =?us-ascii?Q?61x8UXD36L8VI1Q5BuAEZ+chZzRG40J9JlvHyZDQnn7Kv12QS53gBYpYbTcV?= =?us-ascii?Q?1UpHd96xpbyJoxaDAuajrUnDIqS2qGTqVBQbAaXL94nPEhQmrvDnrxuevkEC?= =?us-ascii?Q?vM8r6Upk0sfT53RwThNT6oXUyL/zJhVmIFZw/Br3usbj/Xr70w=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM5PR02MB3356.namprd02.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(376014)(10070799003)(1800799024); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?G03LNhSdq5nyikCciaAf5y2DhknkO7ER6oliHDv0Gy3IkotpilUpRrSxn4HB?= =?us-ascii?Q?lCxCCUUnawoaWWItlI9rkswqN0k3Vp8okws1o/KMbU5/7S879f1jHEsggFOV?= =?us-ascii?Q?12DMZ+4NuHUwG+mOXJ1nAtS4AElkfpnlWwXvjYfGfNqexOy1ZCZUdzC6roH+?= =?us-ascii?Q?yOwknBZNng2fIUD8bvSdHnVemTCMv4kA9yi/69YNnZRsVRhJ8eqC6Qi69ZJt?= =?us-ascii?Q?xwQH2FB3v5eTb4+eaNUtMGQsTYOXk/50Pln/KaGyymn9mdSrXLvtNI+R5s5i?= =?us-ascii?Q?glZ8tEJPF8Nl/vNgYCZsedJHwgBDjBNuBhDXfGO7mym0rqd8blP/O29/Kclm?= =?us-ascii?Q?vVrbZgxWG4VT5qoicRMWuNKVwGa867fTaSLkSJ55CQux7VP01WHEsdDpMo6z?= =?us-ascii?Q?8XTG9GEI9ybFBbTbY1ElRfbME1Jn1wegk1ZiTLLfxf2jdMMstKQp/u5WV7G5?= =?us-ascii?Q?aV20+jB69i0+HM8Brc/yZ/CvPvKdZfuOP9Y6pv6clTwMTu+oJgTdKxyqwp8D?= =?us-ascii?Q?1mRrcFgHuyeMUWf2ErhtzvG2djLJVWBypn24Tmxkb+Q3jbv3/QXNj+pJMQlH?= =?us-ascii?Q?PtvLSNxN+sAr6CjgQnDkfsgyqqk1poU7GSDiGLHXt7D+9eR6r3Hi/+6Uc1Ky?= =?us-ascii?Q?ja7xAnOzmDqsdeq4XfF7ItKy8HhzDu2pYnFWERehmZW8Lqyggxz/17jE+GU8?= =?us-ascii?Q?EWgShAz1/JyELeRqEufWK4LOzr/eEqmb4FSBPamW5SDQ/JuxLEz/2zZHfWq3?= =?us-ascii?Q?Lcwm7S8aXBRUwJCpLun5NfQ7/Y/JexR35wXiUrSA55ETsdmyqoiYw5jsHpld?= =?us-ascii?Q?/dc5rUPW9zEXUbMQR6keBC+f9cpZBeBla/TnEhFn8U3J9sXZHVjlJ1o8QLkK?= =?us-ascii?Q?8YTqtM6FSUavR8AEDESkwNw6dFEfH/NPI/fNB0bH5awPR0QryqtptONkIpZ9?= =?us-ascii?Q?1h5RYkD8FTMLjuLgP2qE0VMURerPaCBYcFcx4S0OWEIhOzEupvVdpHzLlLbS?= =?us-ascii?Q?6QfaDQKCkGpIKNvrtVOLYE9XJlS6KQy/6W5AbibrqxD7ctk60c6nnwB+lXlG?= =?us-ascii?Q?TXKUxP9wsGR25xT32zxY7eXd2OBDMs84NQxYOlZVfKLvgPm39oNHi9vWujAM?= =?us-ascii?Q?8bOcGvIVqnjDm9XhDa3/OMz18bKXY4vdw6/ENFST25RAxSiD601mXc2/YMuR?= =?us-ascii?Q?vI1VcyBaeDKzUZijkEkAT3nA24gz2DpLIkGLLc/94sev9tEDSmp6rwOGpqJp?= =?us-ascii?Q?Hrtr8jyP88z2tvV7SXPcc2+TXcoK1rH8cGOuR+OEeYs6GbVyg5I5yTnWgfRG?= =?us-ascii?Q?mgpa1DS0zmSru0TsoZp9tTEsb8naPGOsRSFl0NslqlNJi+tjVuCd8UEjgjFl?= =?us-ascii?Q?68TxsA7SnHZouWt46gHEK9cL/8dR+hbHvRuRxu5502Ad7SqEsMTRDF6oUWKa?= =?us-ascii?Q?1c3yk8BhWCfh9aa0cOebUNmYw2qIc9M0xWz+MHT0gt1VR8N/iK8tyFyk12BL?= =?us-ascii?Q?88b6JRVW+aqnptyA1hhscHWChyhpNWym59rXFMWD+UtMLb/zSfDCEhoqAthO?= =?us-ascii?Q?pHEit0h5/h6Xy+3CPYHtIV+fsuvP/2m3zZX1eQHaAk1Xt0yvxsDyETytWX9w?= =?us-ascii?Q?lm3lZu06cWVxU5q7CEufLwPVOkWy40J9etznmgOqPmKlfOBP7KyTbVbooevs?= =?us-ascii?Q?3k3fUA=3D=3D?= X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8507dc69-772a-4a75-6325-08dd83efed0d X-MS-Exchange-CrossTenant-AuthSource: DM5PR02MB3356.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2025 11:54:25.4969 (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: 4fFBt4irzUjVoWRg+zipFsQKGH8mpunpY34jpSG+MNENeDNDI20yxlyx3D/hvHr4p/JFJR2GtUR4a1OiOgzTLWLoLWNDWG7aWm8gDVVJFtI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR02MB10337 X-Proofpoint-GUID: DUteSMtIgUK89bGZA_UN54QwqykBFk-8 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI1MDA4NiBTYWx0ZWRfX1KF2v/a4eOdY 0/owglsmJoUxeL38r8v37jCiQkc29c+bTB16NSd88Yf0oLP6V4or5A2noIOXUk5Rx2UU8Ill8LA 0yjqp2kHxEJF8A1j040jJMot2w1p5TC/pZk+TXE0oNhcFkZ09Y4095O4ie/nH6yZ51BTEkEXj5W /81bC3KL1fAjTcfJVFAz7ElBuVapCzqaxohmtmpFidMePb+TbHiHO88WowsJnj9Ufe2oQbwMKPr JkNhwVicqrWNkjtNPq9KzL2y9vL+fTT9meXHcMaU2ueGqmJKhc+5h7MOeFKyInYnmJxVj2Y6XI/ Eeaz8tUBxu5knEiQAbLEZ6QW4v+pWEQF0M8qDhoMTvdddVZFj2rKbZLAz7wqnxW8401TMbY0B7I rZpFBDUXxSr+nI9GsdlOpsubPXUhrHLsYvZNG87XbD/tnT2sVmVWQp2fhNJMFkYjIwllVKbx X-Proofpoint-ORIG-GUID: DUteSMtIgUK89bGZA_UN54QwqykBFk-8 X-Authority-Analysis: v=2.4 cv=C7npyRP+ c=1 sm=1 tr=0 ts=680b77f3 cx=c_pps a=MGIL9jhmtb3Hqg0nl2vIzw==:117 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=XR8D0OoHHMoA:10 a=0kUYKlekyDsA:10 a=64Cc0HZtAAAA:8 a=cJTHVYagl2foYDAtDiYA:9 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-04-25_03,2025-04-24_02,2025-02-21_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: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.314, 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.001, 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: 1745582331173019000 Content-Type: text/plain; charset="utf-8" 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 --- 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 61097c1e15..9c78f485dd 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -422,7 +422,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 @@ -445,7 +444,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 Sat Nov 15 23:39:34 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=1745582169; cv=pass; d=zohomail.com; s=zohoarc; b=i8g3AkgHxqfn7u/8hs27G9Hn84Wt3elJXld7qkGvQg6aHkcf6EzuGN+XdI1eIx8EhyHGGkh8GAh8nk1Z8Tb4VKNSWUxVzl7tMJ83XKGCGdzvJPtkrbB6+2oO1x6P36DZ87mS4Ig1LP1ywZWzPV2P5X9gk/J6f3a5Xj/5jQ1nc4Y= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745582169; 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=TccoNF3C5j/PdSr3M46QlvDbmfPnz6zbifM6re68HeA=; b=gnxp/0FYtwNkYOWV5TBbhQx6yWTVhQAxdrGQv7xK8XKTSqWH6XRN2xItN5C5N8HNy8UYjiNTSrwMCGp+yjEnnDBg6IhrXhya3tf8mCVUmq83qc1iWeGDTf5cxcZQrKvcgii87AkqdVCbw2VSDBLZtbZ5yrhw9GMwCJMJ29J/YUI= 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 1745582169043811.5395123192685; Fri, 25 Apr 2025 04:56:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u8Hdc-0008Pw-Ro; Fri, 25 Apr 2025 07:54: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 1u8Hda-0008Pf-O1 for qemu-devel@nongnu.org; Fri, 25 Apr 2025 07:54:34 -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 1u8HdY-0000Pb-LQ for qemu-devel@nongnu.org; Fri, 25 Apr 2025 07:54:34 -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 53P2ACi8022644; Fri, 25 Apr 2025 04:54:30 -0700 Received: from cy4pr02cu008.outbound.protection.outlook.com (mail-westcentralusazlp17011029.outbound.protection.outlook.com [40.93.6.29]) by mx0b-002c1b01.pphosted.com (PPS) with ESMTPS id 467ww21b9b-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 25 Apr 2025 04:54:30 -0700 (PDT) Received: from DM5PR02MB3356.namprd02.prod.outlook.com (2603:10b6:4:61::16) by BY1PR02MB10337.namprd02.prod.outlook.com (2603:10b6:a03:5ae::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8699.10; Fri, 25 Apr 2025 11:54:28 +0000 Received: from DM5PR02MB3356.namprd02.prod.outlook.com ([fe80::72bd:6790:f9e7:f241]) by DM5PR02MB3356.namprd02.prod.outlook.com ([fe80::72bd:6790:f9e7:f241%3]) with mapi id 15.20.8606.029; Fri, 25 Apr 2025 11:54: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=TccoNF3C5j/PdSr3M46QlvDbmfPnz6zbifM6re68H eA=; b=ZiTyZX0+/GEMcGxDTchCcGFnHV8aGe4xmRSZeCxfnQJse7xWsR3glOL+L Tz58NHWhyt8LYCcTSvDvBPULcDPLn50t8JJaa5e9RYjW8VDN5i5pmx13YIdgCWTS a2U0CvD0Alx5uVFT2ITVdem0DZrotmtNK9Cy0LdsJNO7UxYFtmoD+jZGTh9/4c5f TNsOKIsviBCDVofrjBnYdq/2dPDNxJ3I0CUFbkjjI6QE//0/FKVhTM/Ew3GXXKz8 QHIPrgNL3uajt/afzrVxYdL1fRalS+iXbJNNVVbsJyPuRFlwXNyoaNxIoXe6zM5Y VBEX/tG7AzrSNYtb4Gla28O+wKhmA== ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=nybb/grG5P4J3ThVophv9oalTSmzyb8htmHY469v+cahSS9BQ4L++xBOd18xZXPxMzdh/JRSV698b6pyOCbNznSMGsI23Kj/R6WAv7l56jyz0XyRPLd28JzeRT2FL3EXFX59cBAGVmLbobD8sVkw2zSyOwnj2YDmcL8hG3QpXCrukGuJUZxhAgIKYlJDN2vmPvZxKubx/xvEnnPcIzPVsiM5Cxp4USpw8utK4h6QYPXp3sDNdlT/ex4Gh2r718j5eDc1Vrc4kcwmvWyAzmKHY1SU7tclDytjHPf9GRsIL4+dcyeHL8Qjsfp5Px6Fj4tf5QI2AJDAmQd74mEuBc401w== 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=TccoNF3C5j/PdSr3M46QlvDbmfPnz6zbifM6re68HeA=; b=JmyPwmkFLBtmFxAs5H5mZSocVwP/0j/6yOeRIbcRwRnxGOiB8MeaV/c2eQOgWkca2pZqOAyVHZ7INlFuMjkPSVLadtZk4nCaaOzyrqhqWR4iMRZ4J2FzQDhTaHjpLVN5jDXhk4QzYQj2nifGB3gsMBYPCoJ2sWVwmqkQowCDEz6Jmkpu7UeChVTFWSOVydbPHzIEnAXxmwQEe2LYJfirm67ANq88Wo6qPa06skO/rBa99xfLOdpawyELYrNEJKXj2upFGUsYdGIJ0Zi1GyeFW89o+iS2A5Sg6weuGYDOP16sdWP5l+CK7OwcFGL/sx+lvr9UThpWtkCfP7smlAVW+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=TccoNF3C5j/PdSr3M46QlvDbmfPnz6zbifM6re68HeA=; b=nQZAEfJ5lX2rsww87bx3Ql916rQ5h0d3KBG+gG6LAcVz9VI6S0PwHTpacE8d9RhpFQ/h3Svw7nkIqMtPb+YWm4+8b5XShRvKiS3iBJ7q/ma/wIuyhIaeegAmQjUhGIp1YSp+gaLFXqE5kMUaQoaUp/FCHg1uuSJ6Rob4z6hxnqqbcM2TxDkdHQWtA/IN7xh5grme2DJDeqbs5w9YgW2B134DV2n5JW4RJOqcOms65TeXQ9YPw624vraVoJ2Ntsh2IZzTVFO0AeAqLOxNGVf69GIyntV9L4J6TIiRbNTqdLhkPUpnoqxxYA1QmozlFuG269jv/OMqVhh6Tdd9VUfPaA== 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 08/12] hw/i386/pc_piix.c: remove pc_system_flash_cleanup_unused() from pc_init_isa() Date: Fri, 25 Apr 2025 12:37:55 +0100 Message-ID: <20250425115401.59417-9-mark.caveayland@nutanix.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250425115401.59417-1-mark.caveayland@nutanix.com> References: <20250425115401.59417-1-mark.caveayland@nutanix.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM0PR10CA0045.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::25) To DM5PR02MB3356.namprd02.prod.outlook.com (2603:10b6:4:61::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR02MB3356:EE_|BY1PR02MB10337:EE_ X-MS-Office365-Filtering-Correlation-Id: 4c8fc600-d11a-408d-cd5d-08dd83efeee1 x-proofpoint-crosstenant: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|376014|10070799003|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?LuqAlN31xSjgGcmesr32zHzLyoBpTtyr4iK9Yd7Z1AndCtXNGLe46Ge6m6Pj?= =?us-ascii?Q?roEk8dhW2y/wGAJ+bpomAPaSvuJ1KO8+RbK/mnqZRTC6byCytP4GSYw23EEB?= =?us-ascii?Q?VglDhSvK0TnCUISRGqq8YK7JGCLQGlYXLVyVa5f5MuD/G84rsDcniRKfXe5l?= =?us-ascii?Q?fHHlsJ3VguUsYROJr80mKSa+H2QuFzoPocLINyYzdeP0/7P8p/FwihUeNsos?= =?us-ascii?Q?HsC+MLCqgZkcgHvwFVSrjRc0mZYNcXOn+fwjAlpuohwiGNbh4Wene6MxRjTq?= =?us-ascii?Q?8ztSl+ffe+mjfaLJiolR1mgOJAX6J2hE/QISDKXyoucBE5PeZj81DU+fva2l?= =?us-ascii?Q?rps7T407qhok4bOsJKbDNoRb9c7CM/RHRnhg2t2G9xQ6Iau5L0f03rfbBZyr?= =?us-ascii?Q?VJHX2riM7Wgi1hDTDMcJiK28uL6Q/NDoVme2XspxMhcjrThcOhCk1ZCnk4J7?= =?us-ascii?Q?YENBuyzyAC0gbiOY2QeUQ+6OVwsfv+V3ZiMuPSCC3IYY8qJ3kbfuAdDi5Frq?= =?us-ascii?Q?KioG1QrGBvdV3wsmmN+cved+Wns3qbMq0+eATYnIN/Ud2Rrm5oTOPhaNobZl?= =?us-ascii?Q?XzxgTO1hJEi8v0QwrNyLXisUygMAMmzuTXn0oECLepS6/WNCrfcvMkg1yDkY?= =?us-ascii?Q?1+ZbwZBNVbtUiSiOOdFqh9fyBiYKhYPsZ0kTNG8JISW/UGG+cTPVUO2Y5ygk?= =?us-ascii?Q?/dV7pXN33FHrqP9k7KSSXZl7XtBi92qbTvx5ERHQOdqG0pAQGDC0neMCHW3r?= =?us-ascii?Q?1FiwTVczJrzL3N/Xb6LVzY7dP7uCj5swe27BtqAxp3oFZge6rwuv8Z0MCK2h?= =?us-ascii?Q?/n3RSkdONZfpLGxaRmQYxE2vstF8x7TCGbIaKlchtW32vTPrMX6/4gTbhHRz?= =?us-ascii?Q?2sCCPuis4FaoVl5EkZzVvBuh7yG5CfZoB8S9qO5tYlwI4NRMs5jV3Me1RGFc?= =?us-ascii?Q?/gmNOhsdzGL4ftXKkn2XbVyQ5bAcoD/VxHlNKOHzKSdBY+lIWmZcYCuT2qO+?= =?us-ascii?Q?LkBmnD+8V+c7ts5m2eQaCk16KimuMbFqvt1B5dZ7yk7EhbIO1UmEU95XtBIF?= =?us-ascii?Q?BCnZ3oI6AUu7Lp+ilUycVm224hAJm3qLCn+Z038MdcrgSd21nWYyHT+fO0s7?= =?us-ascii?Q?Kg5XNtEnMa/XoKOhjaQ8MUmlZ+/ku9jbhVilNIi0EdsmPUGhbaQfCS4iCCur?= =?us-ascii?Q?pwFgfkgBG0RmrIJJCLXsTIZou+Px7FrOBVY/5CmJd1ZqopyUYQpX3IvEyw3g?= =?us-ascii?Q?kDGtnzUhThsKdANyJGB5azC3jdbB4k4XtO2Aq0RBcMxcE3rjv00IohZPi1sM?= =?us-ascii?Q?JwQdDx4aLSAq9+UuakXZg//RMO0Cu6DqvDUWQUJvdHtcGl69tfzIuip9yz8n?= =?us-ascii?Q?OvkGhVoNl9L7iH2UG+aIaRyx6mwDmsgQj45T8Td+cWYz4DYKbl5QRBmgoOYE?= =?us-ascii?Q?Rv5nodGvrgk=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM5PR02MB3356.namprd02.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(376014)(10070799003)(1800799024); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?mUfdNTo/2etedPQ338DwYtQB3UztZEnhU9su0XScPgrkA4/uh/vWiMcYMGIx?= =?us-ascii?Q?zi2Mj+r9FmZin/0nb5SmkhYmb5bQgu7eA2uHL5PHjiNuZvIiE7I/vvGmePtV?= =?us-ascii?Q?nyxsk4oO7fetIWSX15IOBRfS7Ympr3sF7PqJyW6y0M2bCNbBIDm2kXSESbsa?= =?us-ascii?Q?3l86QXswIFvfvtjeBF7B4/DHIYIyfabZeekWOzY10v46G+uKT20AG9gSF68c?= =?us-ascii?Q?iWe+9jv27pOYiB5hW3pWrv6y6/HRccURcLQ1lBTTxRmLCDnVUIYlQIzvb+LO?= =?us-ascii?Q?xej0ZuZMZ2wD5LgXkVEWbWUpobK4SXiioIEtbgMiArSG/rF0m0O0Mmbfr7hv?= =?us-ascii?Q?lEW0AHOxZ/PQBEeEy48RYtklMC4c4ipj74WHfbxssfEDc/GFL7ew6XRa5puD?= =?us-ascii?Q?CYUaJIn+YSIlyWFLl7YPL0wm0ARvscWo9RidOa0NVmGlwh6OXuvWQeoNv25d?= =?us-ascii?Q?dWPIQuLJSksUw17NwP1I5Id84MEfh7s7lPNunN9jToD/8rOBlCt5G7ZhBdLH?= =?us-ascii?Q?+j7UA7cW+d6mBVdjTFDwgf+wFnO8De7Z9m+isl7YyfQaifu9XpvSv5nhPonZ?= =?us-ascii?Q?n00X1Mg41hHem8FvVIo++DCpS7O7Q/SUnxrsVLUkAL1GOfrBeK6dCHEVcvRq?= =?us-ascii?Q?PWmcWk6tfd10PuK6qI08bWL+RCEfU8kmVGCV3ST4O0W8ZAoyHE1g9+UNS1Vf?= =?us-ascii?Q?jvdO3SeVasOXfZi5dlbxVhWSna+93qkqFlWea4wDzzGQ55p8Tj1LF4+zr/+T?= =?us-ascii?Q?RP7qUgY5PEi8Ol0d3ThGMVybtZksvMwet2oMqSsYYS7Lmf4VY072V2+FUypa?= =?us-ascii?Q?A3UdTeLlYPBhaCOISXB/Ol997hgbqW8fO6/peoVP7KM7d2x889bxrRzUlDnF?= =?us-ascii?Q?TIMTHeFFx3WmTT0VM4YBq90uzvAcDPtm2DC1M/Xmi35nSjJA+kncrWuTnvRm?= =?us-ascii?Q?nDIM09rNwR4BQbBwC82VMeyQHeABZ3aLSCM/axqcWaeczJ+s7Ye6kX/9druR?= =?us-ascii?Q?lhULUO4Nji9rBYcnKVeDK41yzrOojBdMpE5b6WTACGhfj2y8K0W6NjaVqGpy?= =?us-ascii?Q?XaYOMs7/eoCElmYTR2FVzqNQjfUsSdHIa2ki2vmMVafQDANRspdVRgZVROdm?= =?us-ascii?Q?hrl6rMsxBp0R+pufba/k/VUgJwY1n5EKwKovrmsJZ5CSACHCLCjmCNCnEfJq?= =?us-ascii?Q?YZMmurPEG0u5p+G5fCuAUVgu82FgLz7jdIPbzHDiFxC/xoWmTyIpvzicMRvq?= =?us-ascii?Q?M5VPUftW6Is4KTrhOICz03jZX++wpr4Ucn/Ckh58AOvDL0EZ2fzMEW14bHNc?= =?us-ascii?Q?WYlrg/O/NGC6wIDwpKuBzhO6D4Ya1hyOsBtB862oxsHJ0mQczne/V9EHoUMZ?= =?us-ascii?Q?C73+hFUbZTQ5XXnxCwfWhvebU1DmuegKVJb/Q0BoWWWx0pjJmk+fB8ECUxtB?= =?us-ascii?Q?rhg6NQvx5tj4equgJAfEaWDm+6sxCTKqVZ6zeaBPNDr7w8HMjEFESqVUv9kH?= =?us-ascii?Q?3h7MR1xtavirtzVCpXgSqoZSDwIV2m26UhYpdbF6Ycbh+b0hj5ojD+tBeIG5?= =?us-ascii?Q?fUazGZRMU5x4p60YNkUkFsH1DfUedvmp9C6O9asV+kNa/UWNV2OQVwYsyoc2?= =?us-ascii?Q?1HoEWp4Zr44JgVVL0NWq+Kqd9JkbgA1GWgPdSToowK+dszn8afxWSTumdXIu?= =?us-ascii?Q?fSGXUA=3D=3D?= X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4c8fc600-d11a-408d-cd5d-08dd83efeee1 X-MS-Exchange-CrossTenant-AuthSource: DM5PR02MB3356.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2025 11:54:28.5702 (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: 7X8nfpUQULjgZrmL8ksjkbHxrNXGzE8uwJnw7PJczGm0JGmYGsIOXkiXJGgOWr4AhCRhQ1iateyu0qtlNldQ9Ix0Z+oHTzRBDsDZpZHOsuA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR02MB10337 X-Authority-Analysis: v=2.4 cv=BevY0qt2 c=1 sm=1 tr=0 ts=680b77f6 cx=c_pps a=MGIL9jhmtb3Hqg0nl2vIzw==:117 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=XR8D0OoHHMoA:10 a=0kUYKlekyDsA:10 a=64Cc0HZtAAAA:8 a=mnHwG4yJ6Weg6gPWIr4A:9 X-Proofpoint-GUID: VjVQQIHR0zaa4-Vkal__C4PhNKY-v5iG X-Proofpoint-ORIG-GUID: VjVQQIHR0zaa4-Vkal__C4PhNKY-v5iG X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI1MDA4NiBTYWx0ZWRfX32ucln85ZfuS b73qRAsyv+mvx1LeE1o72pdtNnszM9FxZBh/r6rp2qCTGG5t/QUDVH74GmeOHABO4fazNgH06Sl Bqu0Ig1R45mdOzh9Zdsq6XD90GFdx483CdomTSximDHNXNHCG0mkiMfb/Ma+qBxCMLX55tfqpqv 2VrdYwX3QR1xloLGqbT1KbPSfeMs8M2y9hMKVGVFbHBHHpqagOT4ddW5S/R0eif/kmo1zJcwNAs YZhmH6Mtpwjwy2sKgFOKa0gK7itpR0vK4a21hVUuKwa9f0FnQgjtq6SlYsBE6Fh4uUbiYcYzejR t4MX3r0MsGrTpPosqyN+sQSKGUK0lEpt9v36fNWCSVmehpnkXe8BPHGQhgiterRZO6n6Js4V2uU hSU3bn9fxJAb0A3yc1y4+HTH5G+0oUf1McQgGJzSQCSp0lMOOocQ9aAJoTb3xXxGYyBEkf2Y X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-04-25_03,2025-04-24_02,2025-02-21_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: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.314, 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.001, 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: 1745582170502019000 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 --- 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 9c78f485dd..28e5158f5b 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -449,7 +449,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 Sat Nov 15 23:39:34 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=1745582244; cv=pass; d=zohomail.com; s=zohoarc; b=oJyxt8vnBEjl+Iko2qdmWKg7ZZrjx1ypbW5kr3NKtUtJnJyu0h0ryk69QV1IkTfWcisaR/adqfY/cmuZG4OO4FVDp7anm7VTvDPGougQFknkTDx99LYSNWbwsXJmsj3IS6XIOdGOa3mBDF1FX2s29JUuHwiBXviQKcGzFSNgE8A= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745582244; 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=+6UudWA7g1UlkyYSQEjdq083k1toq9cXzfwQzsXtQ48=; b=gP8PZ9sMT/5D+ZV7vNpzgtl+ipskOB/RCUWmTxKt1ZaxkJUgJaW/kTQ5Gv/0KB0Dqj3XhHXSz0SLbgFoXmZ62H/KG91eDaP5gkoJj9UymjS1umNMxGXCHolsGz7oBP5rLe0NXy6S3z1SDmBHUsJ5eqMujSpFo9BzWnwZWN7HOr8= 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 1745582244159929.7347934132782; Fri, 25 Apr 2025 04:57:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u8Hdg-0008Qk-Hv; Fri, 25 Apr 2025 07:54:40 -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 1u8Hdf-0008QQ-17 for qemu-devel@nongnu.org; Fri, 25 Apr 2025 07:54:39 -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 1u8Hdc-0000QK-Jf for qemu-devel@nongnu.org; Fri, 25 Apr 2025 07:54:38 -0400 Received: from pps.filterd (m0127837.ppops.net [127.0.0.1]) by mx0a-002c1b01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53PBn7qo009826; Fri, 25 Apr 2025 04:54:33 -0700 Received: from cy7pr03cu001.outbound.protection.outlook.com (mail-westcentralusazlp17012036.outbound.protection.outlook.com [40.93.6.36]) by mx0a-002c1b01.pphosted.com (PPS) with ESMTPS id 467ww499ta-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 25 Apr 2025 04:54:33 -0700 (PDT) Received: from DM5PR02MB3356.namprd02.prod.outlook.com (2603:10b6:4:61::16) by BY1PR02MB10337.namprd02.prod.outlook.com (2603:10b6:a03:5ae::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8699.10; Fri, 25 Apr 2025 11:54:31 +0000 Received: from DM5PR02MB3356.namprd02.prod.outlook.com ([fe80::72bd:6790:f9e7:f241]) by DM5PR02MB3356.namprd02.prod.outlook.com ([fe80::72bd:6790:f9e7:f241%3]) with mapi id 15.20.8606.029; Fri, 25 Apr 2025 11:54:31 +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=+6UudWA7g1UlkyYSQEjdq083k1toq9cXzfwQzsXtQ 48=; b=RtzWVtoyOP9m8E2B4B1DE3EvUHXbGEqGo+dyYQ0BthAItiuNpFd6iF2U0 bdJth39987vPSdRGPyHdPtwyUGOFWsu5ZdOO2wHm/LLtFo6DEMj45gnso9+qw6Gi PG64aYnDQ+j5XNNhv+zDUfb94X3BNixbiFmibFEYsXJOUcCMX2T2uBwMaBgfFVlE fAGrxWPAM1flCQl/7G3zZ9dGM/b+p506GRgTgWHjOMf1dc1grY1hJENsVU5zLSA8 wTWDIeDSRnnofQ4K1kPc6OHvtHD/Wbe4cgfvZjjB4xBV3hkzXLKm+yzFEuwLbRwC YRN0Psjh8ZVs0Nt+uRccubeY2Ul1w== ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=HTpN+7kjp0T2eYeiuM0YpcovR0lh5f4rgeP/4QzTBSUxj6eQEjYIwPaHvctQCXxbKSUtj8hlc3mAvpzgYLImZ/GUDyN1VEMI24aIpqGdochZn4u1msSit5zUI7bx+x5WSa9DbeHdF1/HQ4+cElbdz1hd4ajK6uefakInIftQq8sOzaUXhZH6WilEIZI8I5FgnlNxK9EUVqbDtcB8NhvkbeSAczDpg6aG1ICeVmKxs9A85xaNfPSUGDCk9Ef4QanqaQckYgY3xVlwigqnYFE+CNeHmDxg/ozcLPqdKXrO8eh+ePm53/y12HiZgjXAgO7IH1QnjxebNCm6JfWUXePUdw== 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=+6UudWA7g1UlkyYSQEjdq083k1toq9cXzfwQzsXtQ48=; b=HM7vJ8660+N8AiKvbegVHxl9X4tcoUHeWR7UUCr+xsTTejD/TFAVh6aLYbrDBxcdB6pd+xqCgud7ifV45WFIzvAfZpr384uZj1D2yH5tXy61uOjwcz5IaGM0RPcHopSp/XnxGo8Hl8DyCbQaVqeG3bVaKubXlVwUkVH5c1Kox++euWj3qLO+WVOgao5O1pH34falErHhwrGcTuS+0vfv5yrApETLIH6oSN4f5mRUsVVdMBwkLmanKO6sMdZrD8KdsyhLjw1QMmpugPd3K2i/Ix4XeI3AVld8eSGKD6eH9SlL/pp8ohyyKSU4NROEh4mCymb3YxnfisCw77do8yXYpg== 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=+6UudWA7g1UlkyYSQEjdq083k1toq9cXzfwQzsXtQ48=; b=fOCmvrHotwk5+bI5ztTmmEfGBtM9esaMOzb2/CVUyQX1qNDMjcKLoFpbgJ3dXwRm4lGw1yiRULU4vjt/3xWHBAdyroslmdffyEyScJzMMlU8mPWQ3v8F6ZpOVGIiylr42/a1TT7/q0fmrypd7v0WY5E3uKA0QOmVv7dCzY3AKsbQ9RDLvBavGKf1lW0jro7/IFVGcf4WPB6hhrK42W9qH4F8ZvXZ2zT1ZMkt/xqVz6/Bd6VroPQ5Bz4g7JD8Zfu4bK3iyn2e/5q2jI3vxjziDRMR+SpTvQh0SDuHjMjIL+6bJWslZXUwEbU2k8sN0l/ztUq35aJ0UUX5uDvpVl8H2Q== 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 09/12] hw/i386/pc_piix.c: always initialise ISA IDE drives in pc_init_isa() Date: Fri, 25 Apr 2025 12:37:56 +0100 Message-ID: <20250425115401.59417-10-mark.caveayland@nutanix.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250425115401.59417-1-mark.caveayland@nutanix.com> References: <20250425115401.59417-1-mark.caveayland@nutanix.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS4P195CA0004.EURP195.PROD.OUTLOOK.COM (2603:10a6:20b:5e2::19) To DM5PR02MB3356.namprd02.prod.outlook.com (2603:10b6:4:61::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR02MB3356:EE_|BY1PR02MB10337:EE_ X-MS-Office365-Filtering-Correlation-Id: 3bb4b512-5986-4d0a-b052-08dd83eff0aa x-proofpoint-crosstenant: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|376014|10070799003|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?TJtZpWGQepb992HZ1oluwnc1IjtLh+P2tNDIApfSR3NdEZwfsK6M9iFqnQin?= =?us-ascii?Q?2uXVSpvOCeMpWKtE+OPLyI2X0v/Wbvb9eK5+4+Dglfhb8ipqj60L6Rx9tTDB?= =?us-ascii?Q?z2jbFTxeicgGwlKF3alpBRx/wX40wWjhr8wga/2qLHaJ2HYTyaWdMedZB3rQ?= =?us-ascii?Q?I4zJ7rTcg9feUnT6HVGcbexxzmYdBaGOI79raXkT7zWeF3gifGmaicXEIHMu?= =?us-ascii?Q?yxmYu0TBs09JBDh+AvW3HMPY71qPtGN1ZCD5qU1h4wV7MAtNNnSOKvkfcb1n?= =?us-ascii?Q?JjDP8Oh8ATCWqwC1ythFPWXDFNH49SadSSNZkR1LPz9IcmF7aeedFpM7BzMi?= =?us-ascii?Q?8xL/1DisHj3KrepYEEzjDoV0xeOMy83S3YvKdtE10Hd7m0GoK/+V6GHhU36C?= =?us-ascii?Q?DMWeWSNWUVZOFvzOYpC+/JlGYyNXoMnEs3zqZBROO/2+us4NkQYninlEO/gs?= =?us-ascii?Q?p9nkJwPHcm3jydlrKhC2H1FawaT5443LljOLDxs1OaHymbI1QLxMaTffZF9O?= =?us-ascii?Q?tbN25FipjLInZV0MBlU4FosR/NRsXIuLxjPsb6q7PKH95EHSCXVVUqIkSdj/?= =?us-ascii?Q?XhexPjl2J99D1NdcFKUwTE78gT84o7q2pzvj81X0vXE9cynKzzxT1SS6TvFu?= =?us-ascii?Q?2ZK94p6pMiFCEzpsE9V1QnweUYf6+604nCaji3M+cELnRSuYfDl3kZsnWWCf?= =?us-ascii?Q?G6gwcAXzeDinu6IjLu25dME2O7FkBH2vdtHWRjNKleaWYpw917wm5OfSNDzq?= =?us-ascii?Q?ZMAElZp8pnR6S1ouasdA40ETU0yk/o9x7YCN4VlRLf8Z2prr1TqkiVIH9IjB?= =?us-ascii?Q?aUJXPtOb9WMNMhCkaUVkRv/3m9wqB5Ktz70ahYPRhUluM3ZCAcZlxneqpc/j?= =?us-ascii?Q?JB8QC7fireD3tEoGBpkTeWP7pROEW/J/Oq1GqC3ZjIKrt+vgU3Gd/wEyPXgO?= =?us-ascii?Q?nNA6kwQdD01cCy6fDcseNbl2ytrym/HNvWP/cF3uUqTjeEdZ4i6Xqou9KooR?= =?us-ascii?Q?/wt/CwEkRJsgZsyZ+j4BigI+3SrVoxdvGTzyvnxSMblknRCP2L0Yxf7udOu+?= =?us-ascii?Q?KV+ePIKD7EAHmFpIqCRY/7ccRU+6t6qO4Cdj2g0aUt9tqQIzkSb+iMaRreqy?= =?us-ascii?Q?PE2rAnvjYlvYx8qkFzVThAdwYlfaT6SXL5hQY2QvYs3mHgoikqmZwEIw2oB6?= =?us-ascii?Q?0X7qg4EIcjBwTY/+4vR3Cn9OIGBhshy6mtT33lGEPxNo3pjnQvbxDKn4Dnmh?= =?us-ascii?Q?IvlpZJ/JyfScJLt4fwz6NoWAhegjf7t6DPTosD9FIims7orjNO/10mbGFFw9?= =?us-ascii?Q?5dpLbc5ZRc7Zd+NNGRuPdivQqvmzie1ZcAT7z45+8IdMEswLLFEzKeVORADU?= =?us-ascii?Q?KPG+zmypix7h1feVoxg2c3wDygb76RSz3yrVDHSbWPm7lx/JmA=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM5PR02MB3356.namprd02.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(376014)(10070799003)(1800799024); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?uTATEPuhNLQnu+VcECOQE1FOyImZxYCpzHuKkFQ9wdvmK5aC2aruRsVHWI0y?= =?us-ascii?Q?jyozlpLQR4TbEprLcLOz3/G3a2MHTXMrr4rm3yqTQAJ1THpIaBNiHNqrHfPW?= =?us-ascii?Q?4MwmQcrdHeym6CnUYEgBtazt1ioU99MBxAaQz+7ePaKkTbuE/btEfOSC2uov?= =?us-ascii?Q?dNGZ2bh1LQT4QxhGcsw14x7tmek4Zt4e6t+jFb60grvh135/v3+FmJOYFeKJ?= =?us-ascii?Q?3OG2WP8EH+COhowWp7FaOEZcOJeqBhDEYn6x+YrBf7e9WWiE+yMoonzyA8z6?= =?us-ascii?Q?8A9rlVIow/bPTKNu85ob0kYCe0tZGWEzX+naayPHSAtzjfhZ79bQDniUA0Qr?= =?us-ascii?Q?eD/DgKrnDeZ6i14iP96SqXzhflOuWni+5fjCudPRmkTkxmpUPHB/KMKDnnNJ?= =?us-ascii?Q?L59Aa+Fg8tpdv6IbHU7ctHIbGO7aJ49tLTFJqAL3iG5+Cn3hcbckD1PXqDIp?= =?us-ascii?Q?PfY/fxUL8Uq5eIrCuI+bag/rUf1ymrSWwKxO60sxPNgNTOm56aAs7x23VP+x?= =?us-ascii?Q?VBs1jaPCYhuDNEh/okAVs6imjczltjVs9KOnCICP9nhIrvPYCXpNDCZrsbmT?= =?us-ascii?Q?coWW4usLGXKUx9oIWYa/rC/Ojo0ogUMsT1G0ZpTFKm1OQL5i1pLDFjoLh26Q?= =?us-ascii?Q?x/AaOgVyEEFcjKATJkI0H4xqtVXjY5Gw3DKyfHYoBYBkH6kuILV6dRwIOu+A?= =?us-ascii?Q?hj7NqPpn01hF5RClKZharZmSnt+4NDj0CwE7l+1vkGAT0sWfTlK/Op+NrYq3?= =?us-ascii?Q?XVEWCAlUqmTFZONrfX0+KWmJB+CTIXMYLnV80CUZ37vn89JotqnUPQeD8uV9?= =?us-ascii?Q?rnLKnCevknpFU6t6PJDH260rSIJecB6VQrWhGktb1hdTxW5VJMB1uR+gzZ3g?= =?us-ascii?Q?Ym8CfQKB+YzR4bakzXb0FWHqCNF+RMe7oVDB3M4ktnxuWMguAMihjuASHX7e?= =?us-ascii?Q?nqd0E4lT7yqJpCk0n2owmvDsSlWtsuQJDA9J2N5/FEZRaQ+1csClmr3sL+5N?= =?us-ascii?Q?xIqx+M6rI58Pyzp9oy/UMq3etik7WVJIGXINyeJoDlgXJz+KB1U9vW1o7m0k?= =?us-ascii?Q?7gyihLxz/OO9J1kwiwErPSTe40ysGtRyi30ue/MQjDDZ1ZiDJl3cz7vtpzHz?= =?us-ascii?Q?/cjsv7JacFtMz6utM7BaVxu4aVt/rUJRxHui2Oy21BtjN2knMFq0kJTfrob/?= =?us-ascii?Q?SW+GbW8PgIEYqRfWEZDrYTvveDwt7GGH816Klvp5l/nS+zWqXcSYhXrWHmY/?= =?us-ascii?Q?jOgvdpdW0dwk1wGctw3MKQzALP4CcNv39OBq8SCfXdrMfjcQweycPE9k85Be?= =?us-ascii?Q?GaqJ/bA2jjAJKI77CmXoGJTyIN2F3BQu5+rQXZ4dciRgk/x5ys2Tc1xrcJLO?= =?us-ascii?Q?qNyVBTHIe1XO9GFlJIUTu4lR21ZIakQYfEWX+gdcPD/Uivs3muCKluAm4I0I?= =?us-ascii?Q?jlOOyO1dfimxWyCfjlDYgPD3eEgCee3/WAuFLkDs/B5/NtpvGZsZOeSuddfs?= =?us-ascii?Q?xHPgd9yCqLYyQqFlcYFEO5uZ8oxLXLVK4Ir98GGxEgM1uemcTnacgFrr3B4O?= =?us-ascii?Q?CyWvYpU9egbapI7HshpLFQyoPi9OXRgTuGYGzVJDNqZzGA3NeDwCGCNjHek/?= =?us-ascii?Q?3o1XX7bQP0UTwsp8W7xzG62lDFjQraAfZpT6rOVcN/DHrp1iJB/ERVYwEiP/?= =?us-ascii?Q?KMjb0w=3D=3D?= X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3bb4b512-5986-4d0a-b052-08dd83eff0aa X-MS-Exchange-CrossTenant-AuthSource: DM5PR02MB3356.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2025 11:54:31.5518 (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: KZ0F4t5vQu88pY3pYG1CR3apSN/S532dyuBLHOZ2z8alF+YIH6UV2aV3OIA/oJLwbvcT0O/mOcXFxcBazfxpjr8mhOp1BixoSj5oOk1UA+o= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR02MB10337 X-Authority-Analysis: v=2.4 cv=boxMBFai c=1 sm=1 tr=0 ts=680b77f9 cx=c_pps a=dbnGGe82Z6Ok/5ez5STjcQ==:117 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=XR8D0OoHHMoA:10 a=0kUYKlekyDsA:10 a=64Cc0HZtAAAA:8 a=jyrgWQ1ITgniNTwgz5wA:9 X-Proofpoint-GUID: NDlXRpFkSLYy8fmWZxNybZwF6xBR3irD X-Proofpoint-ORIG-GUID: NDlXRpFkSLYy8fmWZxNybZwF6xBR3irD X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI1MDA4NiBTYWx0ZWRfX0PYR+cbtDiwc /qIGgNAWYOWLyYJ2P2i7Q0knB+DulbHNbTnrwaQ+Ac6SMmJCrkXn+jJecpmRGpTl+vjmarPlADE nLWdz0bbPHWKPFuV7Hx2EwnWEQAG9ywp1Vg/3TW3GviFJTb/aOYC8ubjygNK7nCs8W3vanT6lAj e+f9x9vI6FcQ7vGh45RWti7zVCcXvyUUpcup/RO12GdZTmvS1l9Z+rnUk+KB678EDfXoPUr5+n/ HgiQzJtSdm/X6+QtoNM5drUKwagJMhZq6JbSLZxTOVrGzGh16K26xOH1h+PDKcy2ojPKQt7uOcX DyXVhAnSiOePfSBjxWP+EicbusEJ+gf1iipzvfiAZ+ucn2ouiCElrDL0Ia9Qff6jSf8O6XoBlmP 3HW7x/AWJhSaypSrqRKdNxNIujlG1yR9vQhfqejOqNj2qizix3CZNsdY/WwHvZHPVuAaVAhq X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-04-25_03,2025-04-24_02,2025-02-21_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: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.314, 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.001, 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: 1745582246929019100 Content-Type: text/plain; charset="utf-8" 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 --- 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 28e5158f5b..ac9605c45d 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -422,6 +422,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 @@ -484,27 +486,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 Sat Nov 15 23:39:34 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=1745582175; cv=pass; d=zohomail.com; s=zohoarc; b=Bq0/xBoeZVThdq/EOQNWjUCLrXs7MfgCwdpUacxJr7kbTqr+rnsoI2phchRJlytOHgmxREcva3FluACNDwfYtjLSLotC7s/moAtoFoT1OLOaBTfREuPz59ASTd8LzYO5jKfr3QkCTeChtfvvVXP+sRslfxudvoCyRQdAw2x8ddw= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745582175; 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=DgzgyConiexY88ymzZhrnjE0h6lbEdwIy26TW7pA5+A=; b=En3v0RL87ySdJDxOiLZ0rJ0OLiD+qOVJGcJO8t9nl9VW/ZqQHgj/dN/NHkejyN98RvEDCImawm7yov8mThweYxUcFKI0Hkcnl5GzpDy0G1wCe529RlmTAxfm8icsdv0+1JKC043zCTT7G8YAlVomQMwA+N9uPwxWd+dH5lhrpQE= 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 1745582175457222.7183361340367; Fri, 25 Apr 2025 04:56:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u8Hdk-0008VO-HQ; Fri, 25 Apr 2025 07:54:44 -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 1u8Hdh-0008R5-Ls for qemu-devel@nongnu.org; Fri, 25 Apr 2025 07:54:41 -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 1u8Hdf-0000Qj-Ep for qemu-devel@nongnu.org; Fri, 25 Apr 2025 07:54:41 -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 53OMDC5D002614; Fri, 25 Apr 2025 04:54:36 -0700 Received: from cy7pr03cu001.outbound.protection.outlook.com (mail-westcentralusazlp17012037.outbound.protection.outlook.com [40.93.6.37]) by mx0a-002c1b01.pphosted.com (PPS) with ESMTPS id 467ww7s9v2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 25 Apr 2025 04:54:36 -0700 (PDT) Received: from DM5PR02MB3356.namprd02.prod.outlook.com (2603:10b6:4:61::16) by BY1PR02MB10337.namprd02.prod.outlook.com (2603:10b6:a03:5ae::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8699.10; Fri, 25 Apr 2025 11:54:34 +0000 Received: from DM5PR02MB3356.namprd02.prod.outlook.com ([fe80::72bd:6790:f9e7:f241]) by DM5PR02MB3356.namprd02.prod.outlook.com ([fe80::72bd:6790:f9e7:f241%3]) with mapi id 15.20.8606.029; Fri, 25 Apr 2025 11:54:34 +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=DgzgyConiexY88ymzZhrnjE0h6lbEdwIy26TW7pA5 +A=; b=LPwiNhSwok+ugWMibD/MBGA8/K5hSaamXuqaJKir/+D5q37QtLkKLyJUy QC0N045bex7U6JdZdSl9Z3Opg0toBFf4XOnoInqHaYwahIq8q5qJNODiw37ej/ur aQthMpyU+5Dz2pUWQy+Xhu5PF2e+5lYeW6p4qUJJT1iXqn0Ja2zaCqfbYT9u2K2I RcAyF5mClXnlGfyubFlJ9o26gMvik7eomQgcl1YbrIyai5JJy+3C/ulROo5l17m4 c4vten3mvB8gcHtfvouY+4xcA4PMYJgUOT/GXYzdOPamRnwiDPO81DTd2bkxc5YL BtzBEWRQe+Sy27S1g9L0mX4/wIu0Q== ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=nCgRbJV5QvdGpXDzmlpcrWggnh2GhEq35SixAH+IixkGszl/vqfyMHAtGyL+Z5w5BsTxIdiB5ITzfMhu46fCSNgv8VPdU+xR9NEd5Vtr/YljH1J2JlXw9boVJxy2a7h3s6OHo6iJrh5Nva4o95v42504OC/9D87Jf9qRwC9wlWIDSLknCQwmJmyoApO/MOMrguYz3Zz/5mnDLbqEX6zJskm1TFOoxJLnwYcBWx2AFomEhP07/vIOJmNBkbfPOe3eCFNDurKDU26+gFAjKDRH/xWfJXU32LiYNNobTqike8BQrCSia2iNi+fEpLidNBYFDEAGDyWDrEl/Dqp1djIZ4Q== 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=DgzgyConiexY88ymzZhrnjE0h6lbEdwIy26TW7pA5+A=; b=lq1/ySaXYH6hB0JEPaBjYyS0S2hWT1rVznaDYktohe6NLFhAJF+a+ljJU7Ze4fC72XWZjcJi+SagPCRH9cd5c1DSA6NZgDVXvi7UHpBs9eZjaCrzKGFinC70VPh1L0d/0XugM0h9EizMKgGyXXe6I3FE1xqib9aVgdIMakKoPnzbI8B+I6jTZgV18HxrQ/0asOg7+HgrQOEkyGq1a6WoUi6C5B9GooXM/pgl/WlAdxwIw+5uDvYEn/iKEJOysTZSGUMaj4TBFlUW2wHK3poef/z3UnlVYvdYmrASPn8b0uSi336EBFMZIGuij3JcCcslPtS0B49I/GdKIjfJsqObqA== 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=DgzgyConiexY88ymzZhrnjE0h6lbEdwIy26TW7pA5+A=; b=KcPqSwl7iEz960IfJaL38iRsObtwdnF0iXrp+lFt9yUydFhmUbFSmhV9xAHhrLQWjgqaQfDYNLO5RItFpQKN/GB1aLkPURSrLhILoJZY9Ti5DQLf290ImfsAGeXKodFplNyk6RQmyKzob4SkDATFk6eCh8LwN0snn1zGyQTDl9YFPX3bGO57oBMEeHYhb7x6F09tMFbJEdrEVSUQ/JP2mP81JyRcj3v7nayq4XS+EM4CkWk0t2lYFKd/uNCyYLL10mwh6bW8+mZ/PRfAnW2w2aBuftjUwVsRlND8D77WnGvPMOwtGbyj6gsVHVDNcIP5OMS+06lrBtKDisjdrOKY7w== 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 10/12] hw/i386/pc_piix.c: assume pcmc->pci_enabled is always false in pc_init_isa() Date: Fri, 25 Apr 2025 12:37:57 +0100 Message-ID: <20250425115401.59417-11-mark.caveayland@nutanix.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250425115401.59417-1-mark.caveayland@nutanix.com> References: <20250425115401.59417-1-mark.caveayland@nutanix.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM9P250CA0017.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:21c::22) To DM5PR02MB3356.namprd02.prod.outlook.com (2603:10b6:4:61::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR02MB3356:EE_|BY1PR02MB10337:EE_ X-MS-Office365-Filtering-Correlation-Id: ad428745-9a41-431d-af81-08dd83eff28a x-proofpoint-crosstenant: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|376014|10070799003|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?MFGnz7FvfsBOHj/3mKYzJhKcOmgsoE+y0Sj4TtOg9XRsysugke4YS6Oxx8NT?= =?us-ascii?Q?b6iJpT8GG22gK/9z/y5quA8fQzn4PcDGisUpIwR5oOMhaz7i5clfexYetlA1?= =?us-ascii?Q?0gtsbam8fwOhu+X9Ex+4TP7FilBEVYtblsp2ngmXkhmo22yrC5NXajIW4YW7?= =?us-ascii?Q?Ky3iZ599i6dBeo1Ir6ZSLwxrv1AM7Bwgb714z7uVorBTR6tftPVfQr+ehTmx?= =?us-ascii?Q?dUow7JwbYj1ExEj5JhH8Jc4UKNpSS9XOgzkaNz/WP9GGRqRq+F+7N5e338B2?= =?us-ascii?Q?+QzvomLmAPQoiM4FGJyzFIywN2FTiZtURW2rk/50Euv1jiTWn0kdUdCyHt8a?= =?us-ascii?Q?Jnsr6HrpvRXKyVrLwBvcFY87XJ2j/yxTb4bk8bz6IrzuYLcaBeWUGngi170r?= =?us-ascii?Q?zNxzCXufE/fYgMq88dvPPixrXS7R8YgdcM0TdPdlhZr+B56GrxJpiF6gurse?= =?us-ascii?Q?Djfc/X8kPJfbu85LZvxOGRej9dLqtXcGR9wNJwvKGLtU/e7zAFaXuMO7FlHM?= =?us-ascii?Q?M/BqfyF8+bC9RzILAyCcE5+S6FOqm/oIpaWjEzeFZWiBYA4zxvSanW68kdgU?= =?us-ascii?Q?YfzodPTc2yprtiLYm2YbaNwDy+mrEGrA/SUN9LjGRuI4Gh+2tXQGQUv3EjJ/?= =?us-ascii?Q?2Xrh+1Whg5XJQctWKIStsrn1+/Fvkyde6gijSOfooiS2D9Mq8VF8KkUXSEh4?= =?us-ascii?Q?5bhrjaFlKLFDgNBrk6HCvNvq1vdEjwumr3xSIDlJBKrVhON3bAyrSocx/Q3+?= =?us-ascii?Q?urWlVobKggcrTtiTTBavAqnHqO6P5Y0V1uVGVgRzSL1k++4y3MXrGMMCHoUX?= =?us-ascii?Q?3DUItfGKiIvlu5IJr5XAR8h0DznN+IB0lzylG/3OKpGs+V7f40dt50NDvjDx?= =?us-ascii?Q?bKnibB/5R/fDENYYfeAgQSErFwyt07T4qllmSoYoqsJAwZhcLPbqkdGeQxOM?= =?us-ascii?Q?aexKZgLRawEaNp8Ga9JXSlUWYe/VKEe6XqU2ICDhRfDgAZa/fdJJXGmb9ofD?= =?us-ascii?Q?XkDZqvXUHkO8k1a1RKMKK1Gq3f5gXRxAYAgDo2yNQiz02P9L3bIm/6Te5N3Y?= =?us-ascii?Q?of5BvXLgNFUT9vk6NV0TiDNhvEKyxyMQkneYXDCKBtvCisqcTz8Q31zZPca5?= =?us-ascii?Q?bQjcEqhD+zryymNd4EgboQ7/5WZGqnXbLciMh2fIWfF511Me/N8+fsmGZa0C?= =?us-ascii?Q?xdbC/2tIr7xNCibNDCCV/TVexXCoD9TUwDgacydWjCkD3IAI12tOcJ+MEowG?= =?us-ascii?Q?0+cWDdzerf4UluCVNp0g3yXhOzzge2I+ofdEwfq1jhReC2deXRUK91qYyzai?= =?us-ascii?Q?eGsq8X2OK1MHVX456vag/WIcMlBH4qRB11tAxLKi8AzwVsmnZ2ZmezRIm8Q1?= =?us-ascii?Q?ekryE9f34HY05vJrh5KV97ROKqI4aT2+37yx/hX/T6gtgj2Ye7xR7EWY7hYY?= =?us-ascii?Q?vHcWBFyg9Lg=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM5PR02MB3356.namprd02.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(376014)(10070799003)(1800799024); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?P/QnzOYdbJwmgTn+p28+dx0vxR/Fbfk4VCYw+4PLAXBtZ8mfQwzjjVMdinha?= =?us-ascii?Q?AzCtBVRSYcNE9j/Q41NVpA/9zHB4wcULVfKnfDJMvU/f2kRhtQvCsRNUT35t?= =?us-ascii?Q?xaH+tXoMEhgCCgwtqFs864xM0ziAZUWsHsqHeKkBdWzdU2WiofeOdsquANeA?= =?us-ascii?Q?KUPImW84/TMF6pVRpPTr84frDpUR9aNIDhJgYTRXnlg7Ha+huXaXK6Y1lhrU?= =?us-ascii?Q?TXFsptikPvfCuSe8Z06mIgxNfsG3Bl0MeW7Wi9uaST++Do/tnG0hfViMH7Pk?= =?us-ascii?Q?3IQ2qT7tAcs0c5JnbBnY1LUDxuQzXpVuO1uMuvFNdzulqxxsEpwqoUy9Vvsr?= =?us-ascii?Q?z8nFRB5hv76VFQQiGtdkKR32JVMDmyAT+0OEqQpnXiyyKphElLqZSsXAz2jt?= =?us-ascii?Q?Ru8BzhUJrvsdFBlvZlZ2jjF0wYMK/cz3PYcHxOjrziIjkvXetrbdfCuwQw8v?= =?us-ascii?Q?Mxe71OqSMPX65Fx32Dc+jQ95YHEyceGYd2sYR4iUaMeIC0kzs3glseY1fKo+?= =?us-ascii?Q?gDARkzGJZEfD+9Hf2N0jOZ3KvsPMYDCQy5OBMQKivAfqfBUZgrZvUZpbXp+o?= =?us-ascii?Q?0gEzqOCLutiPiX5tEphaXQp6Kpp31NigQ4KmUaSB+nVtnoQxejEweM37ZYzn?= =?us-ascii?Q?qZ5mgpUk+jN2K13hJkI+emrZdAlmnO71MABWV/yv0bq/MPsDa60J3Q4OVxC4?= =?us-ascii?Q?ZfyP2EFcV3/6H9NriYTBJmA4VWOTnNSbAucX1Of/nDmT9yFATS2O4gJ+TpO8?= =?us-ascii?Q?dQQbxm0vgyVKRh+lCPE4uKJmeznNWzPCXVhfycpKLT7+2QkuqVRC0OZV2hO7?= =?us-ascii?Q?931XC38V8FQg+44Vg9LaoGp/sT5P9GDlqDMilT1JlO/tkqo6CWZs4ZhT0uzu?= =?us-ascii?Q?CBCunx19p9lK/gvB4Lr2ZwdGH8Lri+3FD4sJTVfgmmb9+JbAVR7Asv/jHCKd?= =?us-ascii?Q?INj0G4CcEiiUYzysr60ghNQySl3E/2W0bFClghsUDoKBb5eucdO64Te0vxRg?= =?us-ascii?Q?tqG9vqWZp1BD0FlWU3GzIs+4JBAGSdD25KRXFriD454Qzmy1pjn7BMqWBlLY?= =?us-ascii?Q?XFjkZJoiC63RLV3B0Drco7kVYLaToGlarLhSJaVlIHmDAEn+YBPw02TvxJBI?= =?us-ascii?Q?6+kuq3pkgd0vD3ddcZcWpdI6G23MrI71W1cq7Ql5wnGTh8uRu7JpCRB+I7Xh?= =?us-ascii?Q?3ipF9UwGzvfQa8prBy1n5CVwFNixF8hNzPu8L7QErRhZGaPenXud11jFrymV?= =?us-ascii?Q?VXHBsqu7W3Ntj5CF04G0BejiiUswoV1U5cnLbAxBoHuYwBVdH4AfyiAi2nWl?= =?us-ascii?Q?tbhme5ak+NQiOVnaXuL9Isc9IALgYLo1CJLSxJ83a9zXJdkuyhqBq/q6gFFJ?= =?us-ascii?Q?6lXXK/uPgdP38GYm+f2F9w7I53Dx3DfiPFdWZR3z8nJ2qGYwn7OSikKS7A9x?= =?us-ascii?Q?yr/Jx4fDFu9coBVYMy3+vb/p6kWxaaDNHPJv3TUoHylL42bwE88JhNAJZoz9?= =?us-ascii?Q?SpGfZUDwtE+fd51mjLaJqBpHeZbcgxs4OSrF5FE4nO/CDT/pQDBchoiUgLkG?= =?us-ascii?Q?zM5TjAcp8VvJtw6yjByyFllM+HxcblXXg+VmcDbZYXuDVb6oCAqcsch9gSMx?= =?us-ascii?Q?f0WtQfZJwHdIWTRtIrNzpYTnJEBBmnel5CMT0m0R5WycJyeXG/HbsxRzezFt?= =?us-ascii?Q?PLa5HQ=3D=3D?= X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: ad428745-9a41-431d-af81-08dd83eff28a X-MS-Exchange-CrossTenant-AuthSource: DM5PR02MB3356.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2025 11:54:34.7131 (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: w9uYOIsNyXBE/N6kF8aZItswM3MD6a30hB+0ENwKpKSjCgDSh8f0IGxYo5dUcQKkcbabqvNmyevnlAst8sTozhitFJn2yLGiqEAmkDqJLA4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR02MB10337 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI1MDA4NiBTYWx0ZWRfX7b/167ehTP5Q FmvL0tlat5y7nujfvpMlHdiEWAaSFKONsbUKwnFWha92u7r7pmyDyrhKKqz6QF/0hBb3TY1vs7v T1tGkXtjacigc3Hph4Fwri5pDNojgfCS3MLAK8a4/Yj3rhk4ONE69Cu0WXakPiCbgjUa6XgV1nP uYhQ2SPZ6YtbMGlKOHzr8eGjqABWTNqTaXwQSzKtjBK8l4AYUdvCgkPQ0hq4AnzySXvVjYuVbhK XZdyEBwUkgnQwk2727PP6o2zavKivz0ofDJc2iEor8JE+OxWgl6QUxp/SQ0JuAa/04vPKCHZyuf ccPtXS2gkP2og7/vlTsrsm+B7K2kq/qH09one4tl9MgGFyETyX+xqRHuguCZi5E7vju7jj+KMj7 SatZSZDtUyqqbhkgDS8wkhWfApVgtfE5r85/Be1PPSWJ7PKTXJpwv5smXZASxEpsk+NElNxV X-Proofpoint-ORIG-GUID: jIJeMurgMDTs4jlClW7ej0tUpHMpav3c X-Proofpoint-GUID: jIJeMurgMDTs4jlClW7ej0tUpHMpav3c X-Authority-Analysis: v=2.4 cv=ZvrtK87G c=1 sm=1 tr=0 ts=680b77fc cx=c_pps a=dnQYvCYIB+Ymp8NUOuD+qQ==:117 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=XR8D0OoHHMoA:10 a=0kUYKlekyDsA:10 a=64Cc0HZtAAAA:8 a=Hus2Nip8kLtf5UjimwgA:9 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-04-25_03,2025-04-24_02,2025-02-21_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: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.314, 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.001, 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: 1745582176613019100 Content-Type: text/plain; charset="utf-8" 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 --- 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 ac9605c45d..c12e5423d1 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -457,7 +457,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); @@ -478,7 +478,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 Sat Nov 15 23:39:34 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=1745582292; cv=pass; d=zohomail.com; s=zohoarc; b=m+dROY0Ho6obytD3sRD3miODQJ+Do3CQdBVKtAdDwy1eeeHyOlmzoMQYxIkwso0XdSxOe4zNeVvtkJAWCua4OEi37PoavS8pdvoO6DxUm3taZlavZmEsjvhXVtGOF+QLOI+rUIkF7eXF3t/Lv2/NtoefUpTXQ6upQPASFIDMZrA= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745582292; 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=qmYFPPIn4zIPPz1OziAuDyUCxSGo6GXH3u8hjZ9WclU=; b=SU/aKYFIGqgSkkgpBER0HrswuQZ/t0RQiX5l3Hq53dYdDjfcH6rx1IlLoR9PxOIPIo5DnzFqui3PkxQ5IicLLQWLBQj5BPqKP+dtiM2aD7sEHUdZ7aAmyDzPxQvITkZk7gQDbxtGpQCMxoLpqRUx24/nCmVOs1pr3jfs0rS6X9k= 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 1745582292277169.5414360291701; Fri, 25 Apr 2025 04:58:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u8Hdn-00007d-0E; Fri, 25 Apr 2025 07:54:47 -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 1u8Hdj-0008VV-Vf for qemu-devel@nongnu.org; Fri, 25 Apr 2025 07:54:44 -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 1u8Hdh-0000R4-AS for qemu-devel@nongnu.org; Fri, 25 Apr 2025 07:54:43 -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 53PB3tXZ013239; Fri, 25 Apr 2025 04:54:39 -0700 Received: from cy7pr03cu001.outbound.protection.outlook.com (mail-westcentralusazlp17012037.outbound.protection.outlook.com [40.93.6.37]) by mx0b-002c1b01.pphosted.com (PPS) with ESMTPS id 467ww21b9h-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 25 Apr 2025 04:54:39 -0700 (PDT) Received: from DM5PR02MB3356.namprd02.prod.outlook.com (2603:10b6:4:61::16) by BY1PR02MB10337.namprd02.prod.outlook.com (2603:10b6:a03:5ae::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8699.10; Fri, 25 Apr 2025 11:54:38 +0000 Received: from DM5PR02MB3356.namprd02.prod.outlook.com ([fe80::72bd:6790:f9e7:f241]) by DM5PR02MB3356.namprd02.prod.outlook.com ([fe80::72bd:6790:f9e7:f241%3]) with mapi id 15.20.8606.029; Fri, 25 Apr 2025 11:54:38 +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=qmYFPPIn4zIPPz1OziAuDyUCxSGo6GXH3u8hjZ9Wc lU=; b=c6sItbQBUxFeMQoDp0jKAbvBkSzNXn5816F90L5eqUjaLMMxQrcGeFJAI g5nS7gTi1ZAzbuAWg9r88J5Zk8xpkhsfCtqpYwt3n96eXnpxO16D/qHCggZWPmXM GLevFnH5I388/0TGQMn8oO1rEiYPy0TQhAsOc3T/ajbzkNwYAyDsCPKIHGlNalen mk7ZbmnOAugilvoTWxJIe9xRi0xVV3B/oezJiy8s2yvbhEEqUqDlXHsHWMVoFDsk w1j3Vw+0hVrYGetT7Cr7U70mR/KhKO2vgX2QvyWqIuFAnnr6AuOAqXcfWwNKK0ez O97QehG4UwcVL6WGKNfc2UXWuPVVg== ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=IEozzAPRENvQ2qNeMpd3ucL1qiEtRZA8YBtgDek/xwfAesiEsc612xSzHvK/LF9K9qxqCIj/DE3Aq3BuyucfqWITMwDHLtzloXochr3UeK8FwLpoXFN/JWWGiy0vJv0I4dCLmItyLUETwTvgphWBFBoGAAxQpPjCCLdMcA2/HW7Qd60Ie2al1gBTwQrQaNxxVQDVZMPEFzNHe3GoAEepoXaaOlv3AI1/jYBpupdo9FRzWI6WJnNRlVzZ07ipZ3GdRKihSgWexmG92bXV/46Q7Hts2fwh/MfrL5ZDg6QshMHbp6DvkYHwsx/j8dWkAu3tFc58TpeZL7DsLWAXHaQkSg== 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=qmYFPPIn4zIPPz1OziAuDyUCxSGo6GXH3u8hjZ9WclU=; b=plk+/ffzQFvf8ZdPmF5LO7/kxXrzplhv8o1V1AIdHeGFZTuOv0r5Qllxq2f9Q0YMjUUS8RI1NI2Mmnw2qrQI+KTFtANUPRvORaUe8n+FXXnqOypScAcLV3X9ZIRyJmkqXmH4LQVA+OpOyNi9avbG7Ln65K4sUB60JaiAPioHywIhMxhvs56DCG++2FUt2yR3II4/5xQmK273CGoi2r4K1fFjz9TKOZOkQe4TC9lxvhGbpDKZNxIfj3/AMz/Sjyn3RuGgqI1K/A7m+/Eu0aKaHVIuoOrE274kNjcm2hGQSG2mhfz/S28c/5hBBvRiA2WeJKjzf+FdW6sBQWznCtwlCQ== 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=qmYFPPIn4zIPPz1OziAuDyUCxSGo6GXH3u8hjZ9WclU=; b=hqMJfuML0M7X6g/fwWlONVqg20MHS1VCT3Z3c5vZlDX9VNrTyXpDPYeDbRYZtvQQjrNfBhUTiybCpTdrMqfpccC+yOkex8f0QIyq+Y65Ds5aZMfhAUtVKy8IMUulqaFO17uy6RvsUcVJqgIkEa0sol5OHyHvfr69N9pqZRkdqCK/93F9i2ZaFH0Jck/PjRJmGql+b/mvWI2kU3pnWFtebYJjEAonhHDx5LKTeJC4yEHi4Rxm1lbRzJfMiO5R6JNF4EZQgnAFtINKd+/YMgOr5BBqDlqWXMph2153M97i1gGUwLpjgnSeCmy9T98Z3mehDLuLizG20Pmo+4b8VefEIw== 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 11/12] hw/i386/pc_piix.c: hardcode pcms->pci_bus to NULL in pc_init_isa() Date: Fri, 25 Apr 2025 12:37:58 +0100 Message-ID: <20250425115401.59417-12-mark.caveayland@nutanix.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250425115401.59417-1-mark.caveayland@nutanix.com> References: <20250425115401.59417-1-mark.caveayland@nutanix.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM9P250CA0023.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:21c::28) To DM5PR02MB3356.namprd02.prod.outlook.com (2603:10b6:4:61::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR02MB3356:EE_|BY1PR02MB10337:EE_ X-MS-Office365-Filtering-Correlation-Id: 42f97338-02fd-4ba5-8f7a-08dd83eff47c x-proofpoint-crosstenant: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|376014|10070799003|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?PkF83yoPkpzcGVw44whj4Im5Il37eYeltUOZKlae6caTsWE/p8hL3yFzch1P?= =?us-ascii?Q?Y1sednri2jdgKgLEpZNKBYOGJ9fmB9ZjEwH91kiSMNm6TcT/Fg7xuG0eU4Hu?= =?us-ascii?Q?CdF8xyGQcE6Kzd15TS3cma8mBcHLt8WjTJNOKo9iX7vYQMR3mXZtywHt9MXt?= =?us-ascii?Q?nM6pXKPSBagcWplap/A1DWwH9eG1diJelq3CQybbtIDFQSdlRtUieTaZ+4tu?= =?us-ascii?Q?WA0BxBKYPmn55DhbuNEmyPdFOnF0LqLs+TiypQz8k2jEq+t/h4S0JeFn6YDt?= =?us-ascii?Q?wZUuo4Xg/q3rBWWWuKFeN2yIueGKACfcub7ClGfEFfRAp5ChV+i0aSmsHEIq?= =?us-ascii?Q?Juxpo3bBVOL4VfDANoFAljagxI/hJ1mHuhHgbzx0tPlZOY5w3QDJ6/iYlc4x?= =?us-ascii?Q?ckJnTNsIgHU2nZ/EKlBT8sgeQM/1lXtSUnZwRpkfrU10RWg9WnBnc5QaKMlj?= =?us-ascii?Q?wvFF8+Qr2yGfsDhflY2fHjNQKgabhB/W9WbngVs3v1gJIxTfo9fiquThONRn?= =?us-ascii?Q?ccYf519arytv3iNBhdRlCgBoBuMugck0R9lYcQYe4CcXqAPmfqDWxxTT44Pp?= =?us-ascii?Q?2deq9MC/F/qXp5rlkbp51biiDSaUudDZ5trtGEFxz0D5yJEp720aj0Qafhm7?= =?us-ascii?Q?dtLoNgI8COt3zS+qGk402JQLq34KCZPfHcQVGR8HcUSz6Yf20UeCfr+K4yxj?= =?us-ascii?Q?puAFAWX3dykkRlil2aNNLoMPiR/zcUBKEiEav2cEHk+Kp0FvP3P3zQpM+bb9?= =?us-ascii?Q?vmn9anQfTwZpsc24FO9XlQ2b/9QREfCzFYvy2uoRL2QL3T1YU6TK23LqWgEl?= =?us-ascii?Q?SJnUV9aTJPwi6r5wZDnlNvEPzmmJY40+yeghZ965p2KK3CvbpB35CtIh5SvH?= =?us-ascii?Q?9U/H6jR3fzHkvYWMSlIqcFEcE4l0HhtlhKtD0pGVXqIe97qHoqVUjYkveO99?= =?us-ascii?Q?+dro7kWgPFXv6/X9vEXITkYp7rcaNLm/3PkyXH1+fQGCg44hNn4r2mRZjxFG?= =?us-ascii?Q?IOi4QObiq/2yFSMKhtjIZJrChh8j5+/xHp7JmbFNbhXPesZfHHevhkNR4/9f?= =?us-ascii?Q?HhMc4EAP3R9KOKk3Cie9MEbkeYDadIvXe0BH+3ld66/suq5AuXe69SvWTa11?= =?us-ascii?Q?OhXX5u40HtGD/FyvuPMX+d9MRoitJji7LiTan+4vfDX3AajmtAnKJsMTopf8?= =?us-ascii?Q?en4vUzY8OTdy1x2cxOtNj5acnFnNQTDXHQCF7rJDX7qxAgLCsK9ppdtC99RH?= =?us-ascii?Q?5Hqvb1Yzp3dDQOW2yFuRl5mdBEoGhcr6Tq/e3HQ22FTB51vhUZZlwiAhFEdA?= =?us-ascii?Q?L0G+afRS7pY5eqQI+ErqexoskCNDV9NhCmjWUwcIdaPrW2vkiXYif1ppGA3Y?= =?us-ascii?Q?sn5Kg5LorHJQXgrFnNqYxPE8kHBCcNKlfsFqGYnZsJwFNlqOx7env4PI/tOB?= =?us-ascii?Q?jkb7lbTQqF0=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM5PR02MB3356.namprd02.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(376014)(10070799003)(1800799024); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?6ZcW6Pq+87qRZi2XiWrwybhS1GwwyPZlSjafySnKvabvM+/W1noQd1NHed4+?= =?us-ascii?Q?DF0odmkIMfeF7/MkoB23AmfyPI9QxH5I0w5ZLwPbXP/ytyWSg3nOpuXzNztM?= =?us-ascii?Q?z/KjrToxYD+/ex8pj3ayz7ZXKYmjDKW7z+Tzxoc4xnnmANqs8tkqMUIkDP5O?= =?us-ascii?Q?qg+5U34HGeGuiCBIRVOufLrAH7g+ucuKfIf4Y81lfnnRla5X69BlUB8d6rir?= =?us-ascii?Q?TxSZqdJRL3nQ5XJ4cE6U5E2OlqQmnBEzkj4gXpDw7U06F3XeiOCyTGzKbs8X?= =?us-ascii?Q?oW4mmTCotVBAc2bkti+PTzIWSWfm92DLLAcgfuxl5McGlxXzFiRB8h6hMHM3?= =?us-ascii?Q?qY/lQju1MZb5fmG9VXvKevMvv1Yl5aFma7YKNwFcgy5NI2EidJuxe9OpeHpj?= =?us-ascii?Q?pIQU4mldIw4LrDd6R9oiNVY+zQBkI8TUZyg6OmdlYxcRv8iYveQP43lItteR?= =?us-ascii?Q?fZPwtmjwgj4jx1V3PJvMOcwwX8Q/1d96roGLzcfZeJqMcSyK7A/JELnOYbDW?= =?us-ascii?Q?Iq595NdekxuoPLokkQ2YPnhk+DP9upnvfEL4HA+iUerBCO7o9YfgdXOS8kq5?= =?us-ascii?Q?L4urtBAebX0w503+Cf1rG56qR9YCEfo49OOCx9EqIHrTW79HqQ4mS6IKSWOb?= =?us-ascii?Q?Q7CYwfnaZ/accGZmQibc6s340CdXueHQCkge4Vdtx/6hLk/nxZ5FJIP/o+qM?= =?us-ascii?Q?jER/8Qf+kF4QrLrRnpbAYAuqJZC3cCW7Z01r5n46nHsTHL/6IDEm7OAktJ4E?= =?us-ascii?Q?+nn9nMIeqZTK/4w+35dxrljxzr5Pksap+wN0TGgDwkzF1YyX0/fx3jgb7B7F?= =?us-ascii?Q?dY2niSC0A6b2AAO1C4REx2O+regcYszDZN1/fu6a4cvKKb5samvf5EmKOnY0?= =?us-ascii?Q?hXHMZpHd3VFMLufF8Mxg9Xl0W+AbhcxAA031t6eYvbEWgLlS4s5GMICUon5E?= =?us-ascii?Q?ydEXKJSSpcuf5J/f4zydLeefLq10BplUKKWCe9HUqoqbmd9xNF1EtFnGpESC?= =?us-ascii?Q?yCOw8nai2UdixIS2A02ZPQcVELLx+irIrRBQx5F/m6iCY4qBY2+aTGufS53H?= =?us-ascii?Q?r44pIxWuqdgEesghRY4EN43Kg+7jK3G1IKJpwYWEIt9dpNODSBubtfBRMSAM?= =?us-ascii?Q?PpCIfQSARQ2RAerigjAPsvdkUNTAXGl+/G1lizgNCu2YOAw6WHhWDyWvxnLf?= =?us-ascii?Q?T/d2GAQNgr9i+jQEvIdebEoLx8c0Qyt5cF85io0wU6Wnt5y9t0tYFwQmedPZ?= =?us-ascii?Q?UaxNKExx4wFmoQIuSGBuDX0Ok5QptB1DbF29nckkTIYu/CJXrEuFvYfttrXF?= =?us-ascii?Q?2E2CfLYn1p89qqs/fejLetJq1lJEft8DIBeuI+oN77u7tVpEHa7Ukn/plqrX?= =?us-ascii?Q?XP4P0/dVliyaWJAMJXe3J81is/uz5MsXhdA8W+b8hthFNQbGdgs29UB3ULiO?= =?us-ascii?Q?H77ZjzAM3SAlyk7nfhPKxt7PUGzW+NAm8XRwbO1y3IoXJVdglekE+SSwO4PU?= =?us-ascii?Q?A0xBqWi5P5QaAnZ4X7cw8ZCEuARZ3XOxQWCQn0x9QJ30GsxAcoSU2itYsyB+?= =?us-ascii?Q?j0LpgWuiIi9//5BUpNbQ8jXExZoWF5+Un+R+Nz7bucMSp8OwZ0L6EOygWPFd?= =?us-ascii?Q?f8/OFPIMxVq8R8wA22NB3+JQMoZvJJONBJtA/6+NPHDFIBXOW98Z/Rx4z/Fj?= =?us-ascii?Q?ykcWEw=3D=3D?= X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 42f97338-02fd-4ba5-8f7a-08dd83eff47c X-MS-Exchange-CrossTenant-AuthSource: DM5PR02MB3356.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2025 11:54:37.9785 (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: v/FUPMlS+7NM47ZBt9D4wCoyPFY10r3JRbl+3JsCosdaaIUmzQAk24aPiHY+O5n958zwXU4v2jVn/JqrTUMyc4YtMfRSeYVk6Dq3WrLxrSg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR02MB10337 X-Authority-Analysis: v=2.4 cv=BevY0qt2 c=1 sm=1 tr=0 ts=680b77ff cx=c_pps a=dnQYvCYIB+Ymp8NUOuD+qQ==:117 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=XR8D0OoHHMoA:10 a=0kUYKlekyDsA:10 a=64Cc0HZtAAAA:8 a=t_IIakVZT3XxnDp3cAMA:9 X-Proofpoint-GUID: CeDmZAVuolx0gKNFsNw52tJL-Fc-pzKD X-Proofpoint-ORIG-GUID: CeDmZAVuolx0gKNFsNw52tJL-Fc-pzKD X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI1MDA4NiBTYWx0ZWRfX7D597ezv2DVr qc+se3BYZsKZJcVKz2QNmw8AzNpK6r2o5jvW5jiP4sobrOaXnJgcQExd1NDKuX99+RTbTtAM5og LnfwL0fi7MhL9RNactwLaOKIZbivg3zM8PguwuJzxJDIRRkIycXQZVUm7TU5+11nRqXhN2Wy+6W vA2tt5WLN3GkxlwiYrKrZW5non8jbXtdp3ajyO08rtNSM6rcxg4pWl0yskrGf2SrWCdCuhygZC1 xJO57yOBPN3Ktjhnf6XFRfpPpej07+bT3uEIi6Pg/IeHd2W5QdjJvX7EiTI4SZ2G1kDeBh9Ew9R ynMl3GywNWxfiNFK12cVVB+nU75i+1gVcDFVvO76v/A9553yVbpwCQE5kU3FylR5kYaCrGKxBGJ QvkW4aL5naRLMiS/ksPy4clrt7qzaqfkSENBHnHLjdnDQRCNcCdbmjm+hX0XC7MMMLa/9DgY X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-04-25_03,2025-04-24_02,2025-02-21_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: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.314, 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.001, 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: 1745582294723019100 Content-Type: text/plain; charset="utf-8" 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 --- 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 c12e5423d1..d165cc9427 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -484,7 +484,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 Sat Nov 15 23:39:34 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=1745582295; cv=pass; d=zohomail.com; s=zohoarc; b=lyONYlHFbers0JLVdRazdERFybJaDio5HNRK1O6/J4FC4jwk04MXv73HgWddgZR8WWwBM6tZOwwE2ezAXwtYnsl4RNMnL9VeNqo0S5vHTZiDkhKP/Ag9AvEagXtBDWuCHPcrCgpSGU9SVkmGmNwGBdms3TvOu8y9puyh6ykBhUw= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745582295; 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=T/Z9In6gXnmY9SNsrZmmhD/hJJptw/wuExen7uGaBZs=; b=NxFoxxzKmFIpKd4X5J4iQvDWDpwxeX1PddZIi/bZMK00w+fDRGSPGw2moTUT6ctdXfmkhSUvRNx58UWnFrXA8mNcpMJP2zD9HQi9xE9b89yesh7www/UmSxcP7jwPwl27gzhUs4vt4smPBCeLA3LfoPoXh9vt96B9bGQgpQnwHM= 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 1745582295608264.46435223046876; Fri, 25 Apr 2025 04:58:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u8HeN-0000m0-Uw; Fri, 25 Apr 2025 07:55:24 -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 1u8Hdp-0000FU-Tu for qemu-devel@nongnu.org; Fri, 25 Apr 2025 07:54:55 -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 1u8Hdm-0000Rc-TU for qemu-devel@nongnu.org; Fri, 25 Apr 2025 07:54:49 -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 53OMDC5E002614; Fri, 25 Apr 2025 04:54:43 -0700 Received: from cy3pr05cu001.outbound.protection.outlook.com (mail-westcentralusazlp17013078.outbound.protection.outlook.com [40.93.6.78]) by mx0a-002c1b01.pphosted.com (PPS) with ESMTPS id 467ww7s9v5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 25 Apr 2025 04:54:43 -0700 (PDT) Received: from DM5PR02MB3356.namprd02.prod.outlook.com (2603:10b6:4:61::16) by BY1PR02MB10337.namprd02.prod.outlook.com (2603:10b6:a03:5ae::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8699.10; Fri, 25 Apr 2025 11:54:41 +0000 Received: from DM5PR02MB3356.namprd02.prod.outlook.com ([fe80::72bd:6790:f9e7:f241]) by DM5PR02MB3356.namprd02.prod.outlook.com ([fe80::72bd:6790:f9e7:f241%3]) with mapi id 15.20.8606.029; Fri, 25 Apr 2025 11:54:41 +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=T/Z9In6gXnmY9SNsrZmmhD/hJJptw/wuExen7uGaB Zs=; b=DRJncDrQ4M7cJn1GqTnZjw64oJ7hOrRLOx8wq+isejt9dgucm/rwxSJE2 LYleqcmnjQdKOHhK5PiKtaSA2s5/yt31rvDJ/no9CvbIA4g5MMQhRfMxQc084CUg tXpwtDnL61aZXrKrZqB/jF6JQfe7zLN2YQS3K2bC2Dm5770OygIPNOGT4LxB9EDT emNeitcMFpcuSldBjaAgCmCfpKke89xX8a7MzI4/V8mhPrcFFfAEhSRyPJW+3yIF 8mOFhQQIrWgn/9+Rlax0+5aUkwSuRj3zMHLcfXNFl/82z6H5ylbw7eKtJZJfm0Ie duvVsBtUSuSRdC5UlEVnHf5KnmXUQ== ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=LIasdrVC6IKU6iwFWoRjao+Rvti5viZkdI0SCIbDb56Kc4ekONpehP1Dl8lLhuUmqiUGpHbAGm7u8rYhU6yaldGjMnp+VsQDrXTLUhuTU+ndLbXaLNCpulaKKH9o9lyXmx07cQOm12/1esiSuuB5wq7+MFydjusOdn9ggnF6sMKzXCcp5CJNnjzzoo3iZavgOliT3E6SqkivJBdYdKGMbwF+4o06qNWk+29WRNZTm3XILoscYDzXstbgkT3VzXTuU85tzLhU7iOyS+TAO1/oL0aXk1VaPm/CahLkrb9eotdHeNkeLvTjnZsKHi4sb7c0yNwoT1aeHAFdmRa61ZXIqQ== 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=T/Z9In6gXnmY9SNsrZmmhD/hJJptw/wuExen7uGaBZs=; b=anfUwYK1gGMCBtqiHdNS81BxJBAVGgv+0gx0Yorg6JbejnAWaSh28UNzSzANMtshuC4U/3uf3FBANdoZz9f3ykvRZDvX1r3VRAe53xG5EJrfJCAKMIWNXe4KNMcP2bvPPuOdFI02miOisUWMzMW8ZyxcHtHdK2X00ib1gbTa9DeJ/YQig+FIizklUtxArs3oyZMpF56j2MF/yWnogIjbDzj/29SnlW5vL8zJ1bfC8aQSYg1ZoK86FF6R2pWaoZP17DEGeBNeFhfA9t8KnfJWvXJcZc/BG21JCCXB/3w/Ux2h0zML4QgU5hEBY5EktvVr24Vo0/+zR2rXgMThEJGnMg== 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=T/Z9In6gXnmY9SNsrZmmhD/hJJptw/wuExen7uGaBZs=; b=n2G7TyR2c6oDpcHz3YokAikDrfbEa5ap9mLpBC3KJHluJrw3CUWeFXRBzzg3+6zBoQMwBtvVwmvDiXoVMHJ8wVV/luNoAmUifQ4dvBim/OvFio1ietZiZYtXenKS5TFcWJ4C9dpss7yQXIWfjoQg9jHR+s8z86r40ncNR5yhjSU3LVSyaAQCmiitRtg+nP3AP/qLEU5sA8Fd3e5KHfc7jsVZ+KhDi0V1MscxqezX/yLDc/ZBfUAQh3cXOLs4cZR0+Su3+g4n7G0vWfS7UkCZ+vYFZGbQYiafwc2aoSFcsIWasLDcjypsHQOZ9EJwPfh3077JbTCiUV48vdESbmCzpg== 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 12/12] hw/i386: move isapc machine to separate isapc.c file Date: Fri, 25 Apr 2025 12:37:59 +0100 Message-ID: <20250425115401.59417-13-mark.caveayland@nutanix.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250425115401.59417-1-mark.caveayland@nutanix.com> References: <20250425115401.59417-1-mark.caveayland@nutanix.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM0PR01CA0156.eurprd01.prod.exchangelabs.com (2603:10a6:208:aa::25) To DM5PR02MB3356.namprd02.prod.outlook.com (2603:10b6:4:61::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR02MB3356:EE_|BY1PR02MB10337:EE_ X-MS-Office365-Filtering-Correlation-Id: abe46679-001f-4093-991a-08dd83eff632 x-proofpoint-crosstenant: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|376014|10070799003|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?VlCGvu8w1dc8rizugdCYP0CB+hQYj+wR+JBjKsOITQwzci6//6tmhUU3igvF?= =?us-ascii?Q?oQLyRtgt0poA3bVUvrzrYe0IkviG1klhUvddGHK0Cto1KaLrNPjOydgSvvTB?= =?us-ascii?Q?VTgD7hTyLRwhap4mkX5q2iEvJAXFvaNa4PYkGFKYPrFh8TMmlz3UFHl9Qn55?= =?us-ascii?Q?C6PNoBar0G9s9ZkjW6l5pTvapxys0MfvwGcxZlAMd+PjXVBndpO/aaUVN//5?= =?us-ascii?Q?u1k3ubSKBJoprxquxFMg4MbN4X/zR+jY6/arkel0rGYPXNlCs8s595agZhwi?= =?us-ascii?Q?IOwXkCiOJudeMimZskrK8YnoOFoYc9P/+gEF3cd7TW+PrKOlwHQDPJP1W1PH?= =?us-ascii?Q?kWO9nffhFxH3VTr0rcv5yF+PYkDWTG4MnAl/3l5Vqh9B9jcs2C7cO3G3SqtN?= =?us-ascii?Q?DJiTxrYFTNfiAYLG5ALDJQOxo3PQFIae3xhx3RAw9RYYlTUU6Fbkf5AU93lh?= =?us-ascii?Q?TX2vJlVUb07M7e3h52RhawnHcetCJ5Jywz0E+rEKRTu2oWdX5rvxvptmjMTG?= =?us-ascii?Q?oD+ey3haQlumv3qbBSBX5z5x6V5DZuSoGLyYeDlT2c8XYC6lUFYcCGzhAwpu?= =?us-ascii?Q?3AgG/hjnmW7CgSMvAuUBznb+rVtTCmqwhQPFUsqLFB7D/ZgyAZMX1vWOc9fc?= =?us-ascii?Q?U6XqpfJhQXL7bRLogl19FcjWXtQkCwnlZ1n3Fij8JLTJLxM5mBP2qAAkqdM5?= =?us-ascii?Q?xRyYlDSwBtTT6RlqiNId/OFZET4uX6qMI1RoVDo1Y7DWzDGH4F+yvDwR/coI?= =?us-ascii?Q?Le0bfZH768Da/XFY2AMxKHKEro7WTW0VnMAAlFC9+l41ln5ddy6rFKOojeYe?= =?us-ascii?Q?nVk8DKGSLkM5e06qZA++2Y+aO+SBrJx2o24oP1qyMxN48fbthIRPnqCW3ZYF?= =?us-ascii?Q?N6k9ONIqdqB9yriv+bLd9NqPvAMKLHzwGGaqpTHex+THY5Q3i+RtqnUmRvn/?= =?us-ascii?Q?polKNTwdXrcY3zrGbqwjOV6tr0u2XHFSjVRzdoypu649QoK6pTpwrVyI/58p?= =?us-ascii?Q?6tA/r+5/js3448MxzaAALF2cpby2aG3oYqwhhfC23otDCpUweF44vAkqOhxC?= =?us-ascii?Q?UAs0fUC7hipDFv8c2sG6VhfKuchXRE32JlgGDfxLIlSmUOZ60WwSZZ/rZHyy?= =?us-ascii?Q?5AuihQ99kUd/Yk7wjd+U0FlGOxRNXxE+mhclicQPo+0+I+i0zXy/xXGDalb+?= =?us-ascii?Q?yRgamYB6WONPciJc2BTWTc9bqc+0s7yApwVC458ggjLxbh3zTT36jiI9X1Fk?= =?us-ascii?Q?O8SMucOOy/itJbSomYkFyUtBJaG1DxwNisv8O9jB3nWS6GSM/4S6pXYcqIGc?= =?us-ascii?Q?UpH5r+um33JtGj3bjf6atsMJlhqecMrq2f32tjwFGgfjL0C/imEzQG50cMOd?= =?us-ascii?Q?pNvJNiwGoPLn6F2OMOms3sweCHqSUdcTfcGla6/45/OCt+XcLOtizYY/qeoR?= =?us-ascii?Q?nXPHFpU6dSE=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM5PR02MB3356.namprd02.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(376014)(10070799003)(1800799024); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?I0LN+ijqfUVas6Au1ioQb6BDJTEMKiqiFaumgthxyC2j8aGrl4G3gzQKhNHB?= =?us-ascii?Q?Wquvr/CvOxtTDx80Cbf5D+O+ui0L043PsPZb+ZqKcOftMT7qAobt7I1KY6YJ?= =?us-ascii?Q?KUJNU/2ky51B5Yms7ZBw1JWpxEUaTHowuY1fBW6GdRc9EQKKC4iPp4SjrGo9?= =?us-ascii?Q?J2PYz28Is+CYe+lBk+Q/UUbcWXoHbazDr3bHUsL7Ycdj4pzotZOVybV+YZsi?= =?us-ascii?Q?WdZZoegIBHVB3NzlMY0awzb/0QphGvuT63eA2N/hY40hnNz3lpSawA8jpTXd?= =?us-ascii?Q?W2vEIaqNY+FuErfwIcPEsZUFVLpLVVoUTnPe4OZ09JFj+EoYA+DIfy+bB+ET?= =?us-ascii?Q?zOpH1xr/DP5QuSW/yq024IejbOJjETkWzJyLfGN68SM5gEvwFHZp0+5dYpql?= =?us-ascii?Q?sjFyN0LpSkhfaL5nvkJAae9cFDBIw4fmDbMj3GS+j0rVKG0Bh/GT7EF0vVdt?= =?us-ascii?Q?CREowB0R/jsl0sZW8OlsGqoNX8kk/FZTbrk3zt/fyievOm5uFp7jAAfOyTjx?= =?us-ascii?Q?/IZJ4pUVk7H9RZBEFeFxGBXj2xDjS3Y3NyqAegxGm9sHy07bLDiFX8/7O5rS?= =?us-ascii?Q?kXK7eC2F53BCV6NuaWx6Wyn5lk4F4swApL0c3DqB4iZTKrNtTTuCHYoBxyCz?= =?us-ascii?Q?UKndVsyU5OMnvCkWTjENqhDYDa/nNxxrgwxGTaVun/2TJVFcIcQe74HS04sl?= =?us-ascii?Q?YryoRGMeaugX85R/lcPo08ifrWK4vhJX1Yg5sEYWOn/yQuKSAVM7Uuxti90y?= =?us-ascii?Q?RKXRr3Pu1ulG/JGBOU3QGoM7L0BzF1ucyngX8rXrex8zSAQGxu7I2C7XeZx/?= =?us-ascii?Q?1SUIAaUFfdW1Zpr6zIXtp/toClDtiOWGJuHSJ7VNhBGrpnKZE8ETcIX16zyw?= =?us-ascii?Q?l0GFpFUt0CAdDUf57cloCrAfUiAfZpWKjQosEXJW7MQvx17yTshNxeVhEpJl?= =?us-ascii?Q?OJwKAwn6xTeS3RYE3TLt/400DtmvEU+x1Hpy9WuMz2/xQxKhl4fkPoCzsYiq?= =?us-ascii?Q?lQvjyE/vyuBClXk1Roufs4SsJGVuIG8U/jnuybxylX9UHWF2eA5ELFfzIw7o?= =?us-ascii?Q?H4Wq6w+q7j4l4jWRX36g8V+jdHhRAm+nIrbLpVr/cfi6A8Trn57tjNUBZ9y3?= =?us-ascii?Q?R/BU+WkkISZnrbTTdSxFmtuV54Q760buwpKSZFi0d/6t+jOy0xH2EujCsi5h?= =?us-ascii?Q?UhNo8/YcazeVoW9surzG0jMtnnnYkztHUw52rpIWobvaDRfehk7muIGS1zap?= =?us-ascii?Q?PNh+dbtDYgUbKJNyR51HG1/UErIXcfU7nfKQwe38Y26Sy5MUCGImoOxgW1Ze?= =?us-ascii?Q?F+1cymgCEvLPl9L0hZMH5wfR2/C7hIhz+rCfvp1pce6hV8rgutGMvGX2e19l?= =?us-ascii?Q?IyCsUpuIsFjraKKrGZGpLPZ+08pz91/Q/XkJq9asMu48fVyz8KCT+9XNHV9v?= =?us-ascii?Q?Byh+HBjYtQeGYTxJtb1x4Ea8yf+qTwHT5IrDd08+NzAN1g3olYEysxGVGMvE?= =?us-ascii?Q?8kn/Bxo8RsuENZuXob2gt8h0CV6icw3OKJaDeUVPfDLivV0sbKwJT59yYura?= =?us-ascii?Q?9nWRcaWzcP7Oa6IuIQ7EWOn6NbgaHe+xf39WTcSuOLVRoAfmFamWJ9FqBZsG?= =?us-ascii?Q?TspYkXNb2ZB6oRDChde36JqUWD+z5jcmhmHjqwQxJMtMxYHLDlOVsLxDLzwn?= =?us-ascii?Q?SB49Bg=3D=3D?= X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: abe46679-001f-4093-991a-08dd83eff632 X-MS-Exchange-CrossTenant-AuthSource: DM5PR02MB3356.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2025 11:54:40.9322 (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: A+VwHbuVE9IBruG6XWgmJDw3sU+BgJJdIYhkU1SoXnkNSyq0U74T4sKM2pVNq4ikFH4/6tZ8nLnmqVJuFEgK7vCvLtmtgQ0vD3Zbz2kwE7k= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR02MB10337 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI1MDA4NiBTYWx0ZWRfX7MiXiE7SjUXJ wc4bNtCZ4r7N5WScZKxAGttBYb4GnJVygZzHlq3/KVedJDCxsAvz+e7vNJpg8cJri2OQSe+hkXu aEGXo5joFYo1Sc2N+2Vrcv/v4FMtzJFcCNmaxm+8JDYklGJQfuGocwvhfhJnQzMixzfppf7/yqp VQbxLE/VyCM5kw7WhXxJmvctlm06lJqMYDNtyX3+edXjOM4H87+Hv/kMkRrPOA2JtEUyNqi2VQo UCrWlnJ7cy99ydTapboL+qRM78PkmYzbLY3kRLfGtr953Au5hQgEZSlPrdVZ3Ss4LOsdhXN3O/J Dj68Z+c9a1mAA1RHIIIVhy9t8ersfWwOa67s8Leu/jACb/Dq9Ecim2ei4R/Y6S1AlOhxsnm4ukK xZAta3XYnuuaH4l7g57x0o8TuJmt3WLu3xAv4aMaM1Nrt55tck+9mPxbgMH0IWgYsIaE8pF2 X-Proofpoint-ORIG-GUID: mMfbCl4hoxfsoOwTllFvLcZY_CkaGyFy X-Proofpoint-GUID: mMfbCl4hoxfsoOwTllFvLcZY_CkaGyFy X-Authority-Analysis: v=2.4 cv=ZvrtK87G c=1 sm=1 tr=0 ts=680b7803 cx=c_pps a=BALyy5icRfvvzfOMzojctg==:117 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=XR8D0OoHHMoA:10 a=0kUYKlekyDsA:10 a=64Cc0HZtAAAA:8 a=PTNn1_KP_szlgaPjY5cA:9 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-04-25_03,2025-04-24_02,2025-02-21_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: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.314, 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.001, 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: 1745582296925019100 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. Signed-off-by: Mark Cave-Ayland --- hw/i386/Kconfig | 3 - hw/i386/isapc.c | 156 ++++++++++++++++++++++++++++++++++++++++++++ hw/i386/meson.build | 1 + hw/i386/pc_piix.c | 117 --------------------------------- 4 files changed, 157 insertions(+), 120 deletions(-) create mode 100644 hw/i386/isapc.c diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index d34ce07b21..8cdb1fc414 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -90,9 +90,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..e6f261fdcb --- /dev/null +++ b/hw/i386/isapc.c @@ -0,0 +1,156 @@ +/* + * QEMU PC System Emulator + * + * Copyright (c) 2003-2004 Fabrice Bellard + * + * Permission is hereby granted, free of charge, to any person obtaining a= copy + * of this software and associated documentation files (the "Software"), t= o deal + * in the Software without restriction, including without limitation the r= ights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or se= ll + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included= in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS= OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OT= HER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING= FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS = IN + * THE SOFTWARE. + */ + +#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]; + 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; + } + + 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); + } +} + +static void isapc_machine_options(MachineClass *m) +{ + 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->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 10bdfde27c..2f9315a10a 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 d165cc9427..1eae11609b 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -410,99 +410,6 @@ static void pc_set_south_bridge(Object *obj, int value= , 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; - } - - 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) { @@ -890,30 +797,6 @@ static void pc_i440fx_machine_2_4_options(MachineClass= *m) =20 DEFINE_I440FX_MACHINE(2, 4); =20 -#ifdef CONFIG_ISAPC -static void isapc_machine_options(MachineClass *m) -{ - 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->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