From nobody Sat Nov 15 14:11:20 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=1750246170; cv=pass; d=zohomail.com; s=zohoarc; b=AOUVmisz2F0NyPN1jyIfa+8IrCUnTxVq5MnjY/mgEPazH2FIYekhT9aS8mBymBesIYkztw1w0DIH7q5RzI+ZWq8dKCNdnU6TBwFdzbvgfJGcggkcIZ8c4WgxgCW2c52ykHDQvFIMjDZkJD0P8qmU5GluUigXK/MMoElIfuINCKA= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750246170; 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=pyfMFTh0lc8B5JHIDXjH7NNnjrDlecuQZ/6deU47gVg=; b=cFHIYyubjzEXZkqFk1KAa0wnjPdj/X3htFZ/udRDOr2olGJRTtzBAam9nrZ049R3loa6hW4jIU1ycbqjXMFdRkO6yDOqndQv/BnlJ5b+p2iRn7rcbv6V9YT3BwUV+PGci4XeW766X910EjT7lTa1Atg8p5d6PqJ2fIdUQP3FZIE= 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 175024617088145.8615637365815; Wed, 18 Jun 2025 04:29:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uRqyH-0001BM-0c; Wed, 18 Jun 2025 07:28:50 -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 1uRqyE-0001B4-IM for qemu-devel@nongnu.org; Wed, 18 Jun 2025 07:28:46 -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 1uRqy9-0002TN-HO for qemu-devel@nongnu.org; Wed, 18 Jun 2025 07:28:45 -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 55I4kHJp009560; Wed, 18 Jun 2025 04:28:38 -0700 Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10on2130.outbound.protection.outlook.com [40.107.93.130]) by mx0b-002c1b01.pphosted.com (PPS) with ESMTPS id 47976j0kvy-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 18 Jun 2025 04:28:38 -0700 (PDT) Received: from PH0PR02MB7159.namprd02.prod.outlook.com (2603:10b6:510:16::8) by IA0PR02MB9632.namprd02.prod.outlook.com (2603:10b6:208:3de::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8857.20; Wed, 18 Jun 2025 11:28:35 +0000 Received: from PH0PR02MB7159.namprd02.prod.outlook.com ([fe80::6cf9:b35c:b143:bb88]) by PH0PR02MB7159.namprd02.prod.outlook.com ([fe80::6cf9:b35c:b143:bb88%3]) with mapi id 15.20.8835.027; Wed, 18 Jun 2025 11:28:35 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nutanix.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= proofpoint20171006; bh=pyfMFTh0lc8B5JHIDXjH7NNnjrDlecuQZ/6deU47g Vg=; b=GIqvVTGMrwZySIPeJv7dc5fAyaKOpi5IlhrvfOs5ehfYhIGljVTWNdaEH xSREeu8iiJVZowc5bReXu80qH2FN6Ev4uvLFLhjLaKbFdyO66lfNu9XkzqGYT/n7 HN+fDx1e6qDHG3GIVt+GwRTh6Ql9vqDR/Fd05mnqDNcz8KKTHvR7ECRM0MONnQkE C82UbbT15s0SI2gp/rVJ/az2T9b80Q1rbCpE3FdQ4CiAwBKsIGOPHdmRDjrdZEci 1c/VRxE92bqe7u3MxspKUIuQ2SzzR4vLYnagK4cZIuRKoxOOqWSrkLVtg7pQsQ5R xjg2QoBrHaizXS/r0EQACcYlC+jmw== ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=gKyVB6TbIb5tOHhxnL7w8wyGSxQVIweVWUUQThRLqIm7JVpJWerO+j+p8OtppwWUpvdHG1XJCoQMXnNbpzyaFchvY38v9fOUhMaro/gjLvMfwAfodwx2R8mzoOQkaapt6mQ3ctRGhncU534u1igKoO+LYnhZ8s9ul8W3FfmIv8AxLPL9MozI6q9caKx0aOKK3mDH187fujZwLe1NRKwd8lbnmzM/uaszTiwXH5J2sok1dO7mLe6KfjNSeN+v3jHKB1F7KAEkoRkaAabpaD9p3yPRm7BMt8sGM2xJmeyzDeCAY1wyqTRa94kn869jrWgmcOXDciUbu01xW7zOHgFRpQ== 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=pyfMFTh0lc8B5JHIDXjH7NNnjrDlecuQZ/6deU47gVg=; b=hnlAduxEKggb+FShJVslOJARjEBDjUTxJhDoNY+UeBV079HPkBK8fC4EKxJhYr3L/DlSc6qggiEEEBO1koViLpBaVWnrwwghlSiOv0J54ZQwjJYSF7rHkx6NuO9OPD6BlYtORI/YelWdg+yBHyw9zXe2pGsvLnViowqm1NopqIrj3W80JvNHjgKQYS9zwBqtyAeXEfVwfxGG/xVQoeO2jgidQBinJ7tUJTTL7juDiFLqmZD68sMzpUYpho/PORyfszPpL2HQmzyqIz+RTlLOISTeEUMIQiyiIIUs6aPPK2HcQsaa8VU7KWNcy/79dPhaSDQAXK3dEE3p8t6WILOB3Q== 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=pyfMFTh0lc8B5JHIDXjH7NNnjrDlecuQZ/6deU47gVg=; b=nk9sIHwx1tQSplCr0Y9nWKAy9pstvR5pI752vN5ZGJNFaj30BWMz1LSAivuMsqyOmGmBoesF2yK1RvPLsca8q/nH5YppBNK6v5awuzxT4MZUTNrguvIz19rzsclwfqpBJabophpVHMHf/J/uaM5h4Ft08fpBq7yB55bP3gIM+GKwDuYCXfx7eTPvQ3pRLiuUDY579FeoD2wWdcbHzIzpicp7xUl8xMZSerpSZKNQf7AsxqCZuH/XjUku8kpaHrMPyWc1R/1Ve0UBPeE5VaM4mx0zEmrXi98kWKHUWvI8/J1Zys2qoXimsybhFZRQKKBFW4eySKMB5yjtMUVbTWsrUw== 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 v2 01/12] hw/i386/pc_piix.c: duplicate pc_init1() into pc_isa_init() Date: Wed, 18 Jun 2025 12:27:06 +0100 Message-ID: <20250618112828.235087-2-mark.caveayland@nutanix.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250618112828.235087-1-mark.caveayland@nutanix.com> References: <20250618112828.235087-1-mark.caveayland@nutanix.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM0PR01CA0175.eurprd01.prod.exchangelabs.com (2603:10a6:208:aa::44) To PH0PR02MB7159.namprd02.prod.outlook.com (2603:10b6:510:16::8) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR02MB7159:EE_|IA0PR02MB9632:EE_ X-MS-Office365-Filtering-Correlation-Id: 4b007e8c-cbde-4a26-c1d4-08ddae5b4372 x-proofpoint-crosstenant: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|366016|376014|10070799003; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?LUUkX6/GoNkDDv00pE9rVAJK6LHg3lragVcErF5SCsa5mPNIZX1n4XgopmVL?= =?us-ascii?Q?3wwWFmlse2LkPGWWj/+ArlHzOeJPQBhFOOxMeFEzWKVVuu4WHCvxiSZdIjBV?= =?us-ascii?Q?MMvvS+J1PdMCqt1QiQ8n3uou5HPJLGkpRQDM4MOMZMzLJ95Lgl87swvOe1YR?= =?us-ascii?Q?74WdT+UWH2Ptfk04ZKf/h6mPQ6umAvs94USP5TllPUuNNki7+07TzNiAvwyb?= =?us-ascii?Q?iqkarV0cMCK3ksREeMevVE60B1xzIw3ab6IJLwIm8b5tTA4qjjY3NQwB8uqD?= =?us-ascii?Q?3itjtpbd4vjxTtV7hlbUROet6jA8Uqry2gXz6k1HLZ0bsWul4IkNZbT7ZHIQ?= =?us-ascii?Q?gtu54vsLvCxIpJXvzBKZTwnZBpd8fPTdQz3doyj0vze6rwVYrOPNe4Dq6vdZ?= =?us-ascii?Q?fzZ65Ubn0VbR7e9l+sf6sc/JRx39i78zeQ6FoAfxu6vK9tByW+p+AaSPBvlv?= =?us-ascii?Q?Vn59WJcr7dcuxcAQH/SJBuzsKvByzXa+8Jml3X6UK3qYfowGwHYrgX1mFPua?= =?us-ascii?Q?BOg15/jYRk35M2aTeqoehUeVv9EFVENbpNGX4tYzZXNok6BZ1qsZiymQBLBQ?= =?us-ascii?Q?poSz7WtICMifbjNWNQOdcZuSInvXIXoUfatZtMnrBBEtjf12jlZRWtj+Gprs?= =?us-ascii?Q?oEy4vEl7eOxmU+Rb/eGEksedpf0qGhka7r0v5M7yBI+LyuvYYb2ufyRF4DPz?= =?us-ascii?Q?/gmArCzAsYhBDkk5rYaHIr8BwnZEKlX+Nf/aKpWvHYVeTrCXpVac8VS8GjlA?= =?us-ascii?Q?1F7+lpfQT4U2SCWEgCKIVGbQL/t5Ff8Ej8Kvg/x046vZGNCkr5PKBmJvAz4V?= =?us-ascii?Q?tA+SgCvgf0SM0c0i1eUL/wprRx2652k5m+pl12s0MmreWNhDvX3Z0pcw566c?= =?us-ascii?Q?z+N7txecT9Asiq6gmFJkLnZICoNFFKPPdVaLIaeCvCY8furf01ta/5ZEoAw6?= =?us-ascii?Q?DGReE0OvUTDunrOStPGeZ6OuXPlbaXjgddeYgsauhNQeU7wel0aMQyXt/JUZ?= =?us-ascii?Q?XJ7SUfsBHgI5cKNMbnd0SzitmrbD9wS28pnWp0gGATOefriq6m3JlnYbym/v?= =?us-ascii?Q?bc9KT13tpIhmkm7+nMR+jt6aknsmSrZVHLio9f3qzyNQENhInyhK0nUu9jcP?= =?us-ascii?Q?nculTOmva4S2VxPY/vjle1JajKhALIqgBGdTv7I8M6MbbG0yfgzvKy2CBnOG?= =?us-ascii?Q?Ct+1is0XJsK3ciX4CXvK7cqQFEV2RmuFQAhB/7NebX+/ViSzc5M/ifYDmg1k?= =?us-ascii?Q?lSXngcNKKdJpI2q7SBDC7lYJJyBcOSiek7P/Bp0Gl5tZwGdqkyLJhyKUMUKV?= =?us-ascii?Q?ri3nyvSQnar8jEkmmDrNEzv7PIF+gyYMZ0qErIHmXNzRxGkUOwE8hLd/bKlY?= =?us-ascii?Q?Qg53Y+LwAD9w5FfeQCBHFMzwKeiRBcN4vDLCEDL4HQhvvNmvB5IH+U7BiRmH?= =?us-ascii?Q?AdPKlHvV6xY=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR02MB7159.namprd02.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(366016)(376014)(10070799003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?3zhxDpHFUyeTAsVXLZaC3l8naH+tGs/pZgngZf+NmIi+13UjdTyyUROvZQpj?= =?us-ascii?Q?VqMB/r+3GDI2/U6YEH4VEZtWi759MbuTRHEXSibp3MbjVgQldff7rfADkWQs?= =?us-ascii?Q?bRT5OyJHdodhD8YU+B2uI96WE9rEWiF9Dj297b917Y/DWKpeGFycE1zaEag2?= =?us-ascii?Q?flsf05qlFYAgSe4tDQlYc2rGv7dtFxKUUrYArpQ32AySwI3N6do60xYOGkHN?= =?us-ascii?Q?2TDVBDg9RDdNie5mbViwiwueujXQCb7Q8uyxVTmy3z9fMx15Dbue+q1fqUEK?= =?us-ascii?Q?xjFjg1wdj6/NLuYqVKfxnTkYLXyY+x6Tok7/akEmwY225R361cO/B8Th9Bck?= =?us-ascii?Q?xp67MHZvBPhJYpz9o6jxkafTlbCX3l8O4Mg4BPxs1x3h4qdOV9UpfIo95qBT?= =?us-ascii?Q?MnYhIc2lRoRFuQfiKB3E/eW/YZ847bdo5QxcYx+r8GObmBKwNBULnZVg5aoZ?= =?us-ascii?Q?bVlNiMH/9YI8oqMKVD9ex8p3PM5upm3ClOBIUCShoaX9/d7bP5oVN/X537U3?= =?us-ascii?Q?oaBm4z/doW7v7HIN+XY+f3m1OR0fKwmD7PEiMrPiFl9zbEELZ6GBHTmOzXvf?= =?us-ascii?Q?p3/5DBpYUXUFOMPZgDiv9b/X7Ga1xZlIiHWw2/e1jS/8mcj3QwqRt72lUDj3?= =?us-ascii?Q?vFoEiwxPTEglbon7n838F5lTu9l6CiySs/Dybz2673eQupNEl8M6q752kXOZ?= =?us-ascii?Q?5fUK7HvhH7xe/ghBChauhX/Ct23yXjW1zUPzedbQFh4LKSQH87XT3hsTjpoZ?= =?us-ascii?Q?GcrcpyNbhmWq6kYn3UmM47qEmGV1vcebQMCovQbOFC9Ie3AkDlO9qLEGD6Ax?= =?us-ascii?Q?7vNHt568pTbawc2PmNZdKS91vg1C0CA3uR8AJEupZSorgX7qGoSmQrzZq1SF?= =?us-ascii?Q?/NDVHZebETN+6PZSwE2UaDQ/nzh8hzUqHOkYiKKCAkArgrmPUY1H7GACfwKO?= =?us-ascii?Q?+mhzysRCnC4TGEDCyspYWB+oytINRXZ3ogK74hYZodaU6hUBKlMiocCfzkdt?= =?us-ascii?Q?xTWe/0txusiqAQxL8UH5TVgmIJlfkOQS825zPpV4JuujhAWNIh11TzEjTG6N?= =?us-ascii?Q?FjurLRSxzJ4eFCdIB5gKTas+dwyQXJVT9/RlhFGv9aiqHefRPGXgkBN6Yqoy?= =?us-ascii?Q?+b5KG1qjjdvW1brzBCEW3QIlSmkSUwjUDdWnMCI8aWbkTbCU4ZvWSJdiHkt2?= =?us-ascii?Q?SoJWzaAuTTDOEA+8HGmqclmgP8LnDZa0Oeu1tDdwlG7Qtubp6NzsK0XoU58u?= =?us-ascii?Q?BcA4VDbgGzmOUL55tfvyvvY5kO5TrfixWH8zQxpWghEtTR6k8sMLQLZjguZd?= =?us-ascii?Q?nRKMK3RtirtVxdMl7iRyR+vDlDHFrQSTxukjtNKO4BzqYtxKqaJsMCBrU65j?= =?us-ascii?Q?4neZouH02pHK8vGgscwaQIUexXD0NRiuCAuGCtnN9OYlniI67n5Eei2J557E?= =?us-ascii?Q?lyr1YcSr/FPaexotsSAJ5l+KmII1hyiuMK6nqPW5DVixPH0Q6vpMbTqJPwE9?= =?us-ascii?Q?CskvHeb5e2On83+lOkPaEUWsj3LbUyPfeBkfe96Pf6ncTaqW9dtDQxF+WpMI?= =?us-ascii?Q?rP0c0vQCrfrfM7vxrIxCyv1lIqbQAloRhhiBz+TRNRPjq7mh+L0H2ZBy6Vl0?= =?us-ascii?Q?HyRB8JqplJXtC+4U0SCNJZE3+N5hjACutf4mI71wlyjsmX1JyOaPXv5oW/8v?= =?us-ascii?Q?GiUHmw=3D=3D?= X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4b007e8c-cbde-4a26-c1d4-08ddae5b4372 X-MS-Exchange-CrossTenant-AuthSource: PH0PR02MB7159.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jun 2025 11:28:35.5384 (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: uipjEEXoc+fkw9rfHtDv0SIh8LSBwAcrhW2KYpBIYYz+yNLmvOrdBvdq7WEPFN4MauAwSLWPv3HMCz0vKzt+N9zBeu7M0fFSqqPwwsj0dcI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR02MB9632 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjE4MDA5NyBTYWx0ZWRfX8bGnP5WfX9Vz EBFiOr7Q8/rc4KD7CZB4uEL+pmlG3Bh0+4AiF7lvXquvDglvMd3gAePecl7N/4Qz91DIjGy19bc 7wXvUcdgXalzNf/IRd1NxXt7t4dUIbtc9jsMESsER23jIh9s4qfnoceVm9DzOlC4UhWgrBuHj8j XXThI6hBPDKG2etvxmZzBphXXjPzXtsvx2VIP4xz+5slhRDs1aLZpNOvLZlEdPBQFKSWFu0YFGY VKmFPpammmuIp05DCLTSWowjaLzq8jo1N0nw/V1zUfr1g36h9WTXyLfEQTziuU5hTuyjZcIPc8d /BFwFdFifIqni7Tbs6GDSczR3EqgjwvViPUDpZ5QhlnxZ8K2cgzMhPM2mwulNTnvnHNFDqwccwj ZXxBkuKTK5dKKaAjoqMygMVe6YBV79FvZ12qG6BriGHoJi4gF/hGrFvBuHU3kR6JHVKZ3+qG X-Authority-Analysis: v=2.4 cv=RcqQC0tv c=1 sm=1 tr=0 ts=6852a2e6 cx=c_pps a=0CBzKAtbur25xjsvgbLWCA==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=0kUYKlekyDsA:10 a=64Cc0HZtAAAA:8 a=tUpV8ruPn8K-tSSEYGwA:9 X-Proofpoint-ORIG-GUID: 7mWxVgJRkiAV_hRm_GNeTzE4vD-A1C0e X-Proofpoint-GUID: 7mWxVgJRkiAV_hRm_GNeTzE4vD-A1C0e 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-06-18_04,2025-06-18_02,2025-03-28_01 X-Proofpoint-Spam-Reason: safe Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=148.163.155.12; envelope-from=mark.caveayland@nutanix.com; helo=mx0b-002c1b01.pphosted.com X-Spam_score_int: -32 X-Spam_score: -3.3 X-Spam_bar: --- X-Spam_report: (-3.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.895, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_BL_SPAMCOP_NET=1.347, 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: 1750246172782116600 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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 ea7572e783..9842d2152b 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -418,7 +418,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 14:11:20 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=1750246170; cv=pass; d=zohomail.com; s=zohoarc; b=dctWlmPIvRTg6tSlU9XXW6/z3Q5Z9kQoJ2eKJ39giBhCShG8pBQgOoFIWf6k9WmmtXJI8R/fxUQ/BhKsAe2dmtZNOv+6kQV1sK8w21BEGwu8yf180eN2btJlRavcWQe84w5EbPXFfm8VQxpu5tHMZ/CUltlKHFVhl/URBc3V0bI= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750246170; 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=OZK75Lu2dz8MvdvkFTLvGRLkdhabYrtLItj6pbfvi44=; b=Z1NmzqqdJ90Ze2qIVfdqJCRWzLROnxGhpsaZABosJnqonfpS7J3+9OJeMRUqZhXrbv0kHFn+7wEMsNXaaIDEUn380yJtRaQ6gP/XYowUiiDXtL1+RZz+9JQ0WEpNGjt9rfjS3vQ/VFQVum8nmIy7EKmtTMoYM+nQT7odLcEcSZo= 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 1750246170538114.24797988605576; Wed, 18 Jun 2025 04:29:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uRqyL-0001CW-1c; Wed, 18 Jun 2025 07:28:53 -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 1uRqyG-0001BS-HM for qemu-devel@nongnu.org; Wed, 18 Jun 2025 07:28:48 -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 1uRqyC-0002Tw-Co for qemu-devel@nongnu.org; Wed, 18 Jun 2025 07:28:48 -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 55I0AaZ5024895; Wed, 18 Jun 2025 04:28:42 -0700 Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10on2128.outbound.protection.outlook.com [40.107.92.128]) by mx0b-002c1b01.pphosted.com (PPS) with ESMTPS id 4798dd8m01-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 18 Jun 2025 04:28:42 -0700 (PDT) Received: from PH0PR02MB7159.namprd02.prod.outlook.com (2603:10b6:510:16::8) by IA0PR02MB9632.namprd02.prod.outlook.com (2603:10b6:208:3de::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8857.20; Wed, 18 Jun 2025 11:28:39 +0000 Received: from PH0PR02MB7159.namprd02.prod.outlook.com ([fe80::6cf9:b35c:b143:bb88]) by PH0PR02MB7159.namprd02.prod.outlook.com ([fe80::6cf9:b35c:b143:bb88%3]) with mapi id 15.20.8835.027; Wed, 18 Jun 2025 11:28:39 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nutanix.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= proofpoint20171006; bh=OZK75Lu2dz8MvdvkFTLvGRLkdhabYrtLItj6pbfvi 44=; b=BWMv49FvKNB1pPfn1H0ozkMUmngnPIQNWUMen4zCeigTmvB1c/8fEXPhW sKFqEYRVcfHw0SAWDyvBo/pLdD2Y3YhvQyTTh9YRktvySenScQT1xLwbZ701OgcN s9/8aznjZsQg0LBBZK7jfBvHCf7h8NQ6NZ6ecHGuCVq+/EY/UhdKnaRmZCTXPi5O AbVUGmgRLwR94RidaqyQiKHoNg4aVJyxlN3tITC9c0HYCF9fpUFBHZIjUOgMgj9k 2R9y+0lkCpgvyp3hldHZdm45h85geNZ6LMHew/W/nwXsZPLwhCnWlRBK+Wg5Onb3 eKhYyFeX5jVoPTSZCX72230Y0d64w== ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=HcxsV/tfofMIyRwfMMaofUNRaLc6JPRUfr1lMj1Ojxi9DQRo783AFQ+XWbbM/H5rJLQimKCaHXmhOml0NYoYpBQi649M7O2uftf1oCYpZLEL3+U7Q+p6RNJvzYa1rJNzwj7A+DjLZC3SdpjWyoGDm17yvY1KYrdQZzP2cBjWV9dAe53bitIqxP31reCrFxTlYeawBy7bDUtkv0A/qNCPv4/AJM9s6cdOcqWIv2+KuK9JJyxAen5urs3tm4IMUur5lZER3FWJ770jnYh06sf4lR9peWUS1W7BQqvz0VJoEqhvIoT1ZgfPRu/xpZMfbKeSG33oSSCqhFxrK/LOlYU3Kw== 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=OZK75Lu2dz8MvdvkFTLvGRLkdhabYrtLItj6pbfvi44=; b=DZ6dcJKyFxHvlWU6q+oEehKddwIPEG8VeefEZd0zJSAml1GXppVrsyiDMmh58nS977fAxuu4kC1D7MTvS//Ed5GLojVNtKesueIE9tsDdueki9L9z+U0wAIZF08YRfSlteuSWS1K692Mz0njS6253wNngdXNVFruyNO5hiZCSrRVs2CMc8y+MHobhcTHTMjPSAERfNBbIK4a69RuxQHtVhq2c6FYu4xSmQYCNPVtB2/m4Nv+tHfmjHWo1UQRl4h1wxtMssG9DWp4VMo60ncyzit3GZm14e0Brxw8LKgFbFhMGODrPxZwU8Jy8WkZGFFwWG3M8C0EbujBi+IqFIS7Nw== 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=OZK75Lu2dz8MvdvkFTLvGRLkdhabYrtLItj6pbfvi44=; b=mZVwWYw6XvSgmQzSBJ/SeZPr2bkPMlF49YV8+F5C07Y7Je7PhAoxE0kIuwPRuA3bQKuvTNewZpC+Ucm9q6s/qLbRoZlncxx/ribpLb3aqT8HpWPHAZgCNCswChOPGVRPNENcnlw6mulxHVU//djVB60Xz7K1DrAhDwLw6k+fswpiq7enAcUyR8jxhIiEYOYhCslVwSzxV5NxsfV0av8TSUzfYGx9wSKe86lvfDRyOqsaVZUOg/Micgk03o3iEh2zO+TJbM7nhRdD5RtKyiEr5IZpnJe73hf2slpyZF4fgxYuj9ea9berl2qZzabEMQHG/+R5F/D6T6jiooI5zLQh+g== From: Mark Cave-Ayland To: pbonzini@redhat.com, mst@redhat.com, marcel.apfelbaum@gmail.com, eduardo@habkost.net, imammedo@redhat.com, qemu-devel@nongnu.org Subject: [PATCH v2 02/12] hw/i386/pc_piix.c: remove pcmc->pci_enabled dependent initialisation from pc_init_isa() Date: Wed, 18 Jun 2025 12:27:07 +0100 Message-ID: <20250618112828.235087-3-mark.caveayland@nutanix.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250618112828.235087-1-mark.caveayland@nutanix.com> References: <20250618112828.235087-1-mark.caveayland@nutanix.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM0PR01CA0081.eurprd01.prod.exchangelabs.com (2603:10a6:208:10e::22) To PH0PR02MB7159.namprd02.prod.outlook.com (2603:10b6:510:16::8) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR02MB7159:EE_|IA0PR02MB9632:EE_ X-MS-Office365-Filtering-Correlation-Id: 2fec00fd-769e-41b5-f4a7-08ddae5b4594 x-proofpoint-crosstenant: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|366016|376014|10070799003; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?EsS/38fhESNegTG2p9sNgAFrPYLNK5f+1+gdQIz8fODDX8Bu6yE+N/6uWpa8?= =?us-ascii?Q?8I01NeduxXPR2EcfBM7EvxHkg113W7xoaxlOYTft38loAPvw7gFAjGZYOifV?= =?us-ascii?Q?OSLXFNGrp0R6BW6UC7MaYE06bmQiptGe9nhdQLaNu4EiM75Ur/4FDPhab+PQ?= =?us-ascii?Q?YXmCwh6T7S3xC4/58M0FUgvscebIbk8P208JyKqviVRk1Qe3+D/hIGvpLL4z?= =?us-ascii?Q?wQA0p5q8GISTK1jvLUw5hdD1MtYRwOEfvLKNt4HdAPg5og7fSOx67UbRRBYx?= =?us-ascii?Q?Ay81y6wbRgCzcxLkXUSjp618Dg7WuuoMdFv7sJW4rhcMS6uyXWmmI80WJfXH?= =?us-ascii?Q?pHvUOplo1q0FI1MQ13mK9jZWkxYN9VpYqcEscBi0c5CfOxncQ0xR9OLJ+vxm?= =?us-ascii?Q?Mh2NzmsoF32Wj73yCMH4mq0DMvBwuah7P7q4SzrDkufJLoaopznk/6Pq6UyY?= =?us-ascii?Q?Xb1fpSATRR6y/x1yJww6ozVPLul3a62i0y2qyJT9TlwpTMCPsnWJSn6z3sLn?= =?us-ascii?Q?KcABCcEzmq5SesX3h4p6GEngOsjiVVLM/WqbYmpgSFBFDit5dg0uibnuIV/S?= =?us-ascii?Q?O22g+dsVIpFtbqIC5x2jUMTCdfotg7MVpZeXmMYcbFpnmzQ/yJBG/mLLpFIY?= =?us-ascii?Q?07kNTLeZjD/3nFmBdQqGD2JrBscnzVe+SF51G6UXZfBondvi1E9IeWN/MA17?= =?us-ascii?Q?1jgri1Bg0AXk73RWQpxujhBIufU7PrWQQ6QSKu6EoI7rrhaWSAjDe+ZN3snG?= =?us-ascii?Q?p7J3xuRZrS7eUE5gfdO+E3tTOUkQmJWaTwKDyQ40tiT3x77vX0cgebo5eJWQ?= =?us-ascii?Q?gDV1LXR2F+j+Z4FRo2LmBMAjvpYVuKEW2+/Pw336wrKVtvtDyU6YJ7jE0g8w?= =?us-ascii?Q?RNvmJjjM+wvT4LJ0EFRui1AWz/vM1zAa6ZupCunVOqSxn9BgyLT+AVbvPhtS?= =?us-ascii?Q?NK5sv8G4YAHnuxndhs5KtoHnO3SfHzP4PH13zzXLZUzqboDNYipV+D+tr6tA?= =?us-ascii?Q?isQdERfn7Lwrj9AxTZLifLoUE1tvbA71G9zqPEmnkMk4v19WpNH1Qux8uvVc?= =?us-ascii?Q?wjyc4e25FTTMLX6O7JQ25HirO8RKjVvtDlVPyCHlVk5HLDKu4eQdf5q/nH/q?= =?us-ascii?Q?B9c54ndEHmuhIfHrEfX4/gMPuJSEr+YhMbyPRtAHH4h/VJkmZPtMnIi6qAma?= =?us-ascii?Q?e3ZyDv+JgfwNu7ur39CiX4WY2v6v7mEJwf9Gn+g7/hCJpnNcqUzTFIAublE2?= =?us-ascii?Q?t7IKOGnTohec60rimU9fihuLROlb8azOTQs5ycaKgh7Sc6dZ6e91PGOSg/yr?= =?us-ascii?Q?ZmG8PWt0u3OXQmcbVJsKuS7zKzpnx4hD8IXQLXNC9aCjJbCbLHnOcNqP3FAz?= =?us-ascii?Q?e7a6cAYubz4U1CyKtM6dDio0w0vIQRvzmXt9s/aQQ7eOS8To+RFYn9m+Xjm5?= =?us-ascii?Q?Ef/Ph2UmONs=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR02MB7159.namprd02.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(366016)(376014)(10070799003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?bcd5JrwcJVWK8vlUaIBZSfurOe3PPAfcgV76YWBYZh/h9OKkn4czl0A5obag?= =?us-ascii?Q?yBL5EN0Wc37AHK0UMlqedqrrNI58tn6FNwDe68nRMDoJhzCo6psDyNQl6wjj?= =?us-ascii?Q?igQvTFVpwoBST7mcEG+r5rAvyVZogNEAcTig6DWXh2DD+kYnwwvgmcHtUQu2?= =?us-ascii?Q?utAxroe11pmZ+KKmxXkyu4GR5shUOewczSl1Hr63VTvik4MR+pd/Wbq9JpiQ?= =?us-ascii?Q?b3YP3JY5BocBrEKt2gYrkSYmnNUHAFCmp5o0cJMrmnGUm6xTR/0X/71Jnkzd?= =?us-ascii?Q?GZvfW/oJzF8/LoE+3oH4ROEBZSFCThHGkbkYLftvOzlThvia6Dbl1Q8432Vp?= =?us-ascii?Q?vZA2MhdISzJdgYZCvIZ6jSPYvekiUxCwkrznS5Sa43c/nyOpChGU1IhN1FSs?= =?us-ascii?Q?IELXGEFOc3Uw7IEiPW1cLRq3miIr6X6RpgmKMmo0DAQkbK3ubXSZEcQr48/5?= =?us-ascii?Q?3hDcPdv68GGv+y0IeiZ5QARFfsfPolVKFgQwCdG8t7FX8gtfugmB9l4yziid?= =?us-ascii?Q?veCDvnmzX24CLF694KNrTYXAlUpiW8Dduin+R0MbxRtbToyUB/6efUB/f9XQ?= =?us-ascii?Q?ej9FZdCar/A8iGBkNakQy/MfngRAsUAknTR4W0APOYlgUKAu67ICloXFXcnt?= =?us-ascii?Q?Tf9RJYiKKn4M1rAdtqkZHwY9xYNYHyi3RTr+MNKDdOKeJQXz0RAebR8yBIzJ?= =?us-ascii?Q?g/y/G4RaGvsjP9Tm3Ewlcz0/KKuW2R0YyuUqpjuxd3aS/DQhtF2ZGS9YW94g?= =?us-ascii?Q?kZdBBAW0cuS85ABxblpfZnxBJc4tZ8FX+Uk+YnGTUMRY/27mAt9taW69DdIU?= =?us-ascii?Q?MJbluc2vCijAkrFfljXb3a9SX2+xcuz/a9LdKnss+v7XLo7ll9Y3IC6Nxw5t?= =?us-ascii?Q?+fZ6tAe0qWHby63lLIvAHXiPn4MqvKLRwO5HocKgZJAALagb9v2CtqiL7Nfh?= =?us-ascii?Q?SAYiTVn/Vp7TBd8iUz4FbIKnADIDtYaE5xgUkH/rOhYsIV1wDGkxDYopxCZQ?= =?us-ascii?Q?R1I8Nu8tHUpdWV0liRIF7C4AFfinutwh7GBT9wY82phI/zN7juKGoV+cKun5?= =?us-ascii?Q?AxvNFMBpaqcS6ka5FQf5eacuNMtU/B0gNry74W2VPKphAUaKM3lpyG8jn3jo?= =?us-ascii?Q?HmGJH+WvduAcUg+AYJrL1LZzrpwaMnPnjYlokDwZ//yfuueD017lbZYITzCR?= =?us-ascii?Q?jWkH6g1L3dt7yePQcUHKOZeS+QRu1EDxsSNdIs9FVM0s/Rk9TQO3t+ceGBdT?= =?us-ascii?Q?Lr7G8h+y5mN80Cb/knCYM+SESG5Ro2tDe9MvN3kN7A2qkqQeLCkaPAovGQ9c?= =?us-ascii?Q?1QSC7RmlBKXuRk8ALVzG0678ya011LITSBtXN7mEVoYlRp+jtKjkdUvnGNdD?= =?us-ascii?Q?fxe35mfhc9efhVE/5IPYi/f3RXH+sRF69C1Afp/5b7sGTs9puf+VBQCl1whO?= =?us-ascii?Q?XZEYCZtHXPhrWtq99PUd7mWQbPZGQdxOEMXw2I/6eIXt3X6Pa923bsLnB7XW?= =?us-ascii?Q?IJYfv+NgVEV6Qn74+b0TLtpds9WwE4ZmhaYqKBZxpGyCQA0IEGbBWx6PHjnw?= =?us-ascii?Q?bhcSO2ltZ/nMUzJO+FDHqbr+0Sx/6A6QOYFa07JgTyfcPvMCLMbeAnyHFx7P?= =?us-ascii?Q?7GhPUb20QW+YZ4QS7d2PwCTo10q4/OtE0o868be91S3XJcvCmeDJr8Jhrp2G?= =?us-ascii?Q?06BUDg=3D=3D?= X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2fec00fd-769e-41b5-f4a7-08ddae5b4594 X-MS-Exchange-CrossTenant-AuthSource: PH0PR02MB7159.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jun 2025 11:28:39.1260 (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: XnTI7qKOtsNp4PEMQ+ECnri++KHPfpaBaI7BgzSWqiJu7fekMG3cguFOy0Bco5HWL2RlI6FyLByVPUr19HMyVsPoBFXQVkb7DyU5+F/bKys= X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR02MB9632 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjE4MDA5NyBTYWx0ZWRfXzugjL31d+tEF MjQ0Baofyh9e3YbdYkGMMA8SYuEfMSa10FnXoTsaU8OC20S7yynVLKilgjGCDXQGuM03lcZiarN rsbHwx/oKYPyEr08OgukQLwlF66+pijFslz9jRfXtUY8PPVbM73oF9JZC3uQAeqasE8tlab0Q1x O034DBivtz0j1uo5kT3cWompbvGsO1JrFItuCXJGVaXdvuu8atoQNcRmb7HEULsfJDuDYjmHnY4 F+w5nn/fJCKV376Z7gt/laB4gVqqtAlrGN8on+3ATSxS4dY0lev0GhoIoBp+NWEz5fPEZhQsaFg RPVPDkjAIENwrWA7n1owx5TiKz6+1WnaYH+iNq4iwlWhpt7P/aAYeCcN0GETmD1E48bmH2RKnuQ e8t7kt0Aybh10y+fYb8fGyjKt01xNpJOS//8ur01qHsyptwZGpUD0M285oou7sTn6QAbyr6j X-Proofpoint-GUID: 0pwEBEa9BmzU1DA4wA1Jfs-ufUV9kn4x X-Authority-Analysis: v=2.4 cv=WdoMa1hX c=1 sm=1 tr=0 ts=6852a2ea cx=c_pps a=jzLUcr/A6iKde+6uBY7ZJg==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=0kUYKlekyDsA:10 a=64Cc0HZtAAAA:8 a=mbAAzmQ2ag6Hd_HGWNEA:9 X-Proofpoint-ORIG-GUID: 0pwEBEa9BmzU1DA4wA1Jfs-ufUV9kn4x 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-06-18_04,2025-06-18_02,2025-03-28_01 X-Proofpoint-Spam-Reason: safe Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=148.163.155.12; envelope-from=mark.caveayland@nutanix.com; helo=mx0b-002c1b01.pphosted.com X-Spam_score_int: -46 X-Spam_score: -4.7 X-Spam_bar: ---- X-Spam_report: (-4.7 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.895, 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: 1750246176606116600 Content-Type: text/plain; charset="utf-8" This code will never be used for an isapc machine. Signed-off-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/i386/pc_piix.c | 105 ++++------------------------------------------ 1 file changed, 8 insertions(+), 97 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 9842d2152b..102e785d27 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -418,19 +418,16 @@ static void pc_set_south_bridge(Object *obj, int valu= e, Error **errp) #ifdef CONFIG_ISAPC static void pc_init_isa(MachineState *machine) { - const char *pci_type =3D NULL; PCMachineState *pcms =3D PC_MACHINE(machine); PCMachineClass *pcmc =3D PC_MACHINE_GET_CLASS(pcms); X86MachineState *x86ms =3D X86_MACHINE(machine); MemoryRegion *system_memory =3D get_system_memory(); MemoryRegion *system_io =3D get_system_io(); - Object *phb =3D NULL; ISABus *isa_bus; Object *piix4_pm =3D NULL; qemu_irq smi_irq; GSIState *gsi_state; MemoryRegion *ram_memory; - MemoryRegion *pci_memory =3D NULL; MemoryRegion *rom_memory =3D system_memory; ram_addr_t lowmem; uint64_t hole64_size =3D 0; @@ -504,39 +501,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); @@ -553,74 +517,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 14:11:20 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=1750246254; cv=pass; d=zohomail.com; s=zohoarc; b=T1Na3choF/XzmeHWHqCRAIxDuWFoCdkZi3oDbfK7wHUDCLy0dWF7/qe1KtWBMkzvoobxeW+0lK2PQccVEuRLGzXYv4MOLkdl6Nzkpii91fMUfyN5ixFIEQ5ttdFcCSeg17qeXCbJjq1O4i9CbCcOfV7nkH5tzK+4RY43L9jsUDs= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750246254; 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=+nlGhnacqd9PrvZ4eDkZ5K7nZI+9vKXwBzEgx0OEVPU=; b=bFMU4LegTw4C4mw/MmPjFSIzSBdZro9YhBV+6Y7/pnmkQYfOxrLxtwqyW+8lLugZH54Ote6h7Ks6IOzXnRJBBbxsAyWElQkvUmBOJ3+/UXpV9Kr0S3E3nONgcftc6AXMezLIZASTHVNSM2dohmTLBY74a0qP1idwglVpJbwTyuM= 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 1750246254987683.8765758447728; Wed, 18 Jun 2025 04:30:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uRqyO-0001D9-6e; Wed, 18 Jun 2025 07:28:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uRqyM-0001Cp-AI for qemu-devel@nongnu.org; Wed, 18 Jun 2025 07:28:54 -0400 Received: from mx0a-002c1b01.pphosted.com ([148.163.151.68]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uRqyK-0002VA-96 for qemu-devel@nongnu.org; Wed, 18 Jun 2025 07:28:53 -0400 Received: from pps.filterd (m0127840.ppops.net [127.0.0.1]) by mx0a-002c1b01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55I7bhX0005685; Wed, 18 Jun 2025 04:28:48 -0700 Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10on2097.outbound.protection.outlook.com [40.107.92.97]) by mx0a-002c1b01.pphosted.com (PPS) with ESMTPS id 4795dus26x-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 18 Jun 2025 04:28:48 -0700 (PDT) Received: from PH0PR02MB7159.namprd02.prod.outlook.com (2603:10b6:510:16::8) by IA0PR02MB9632.namprd02.prod.outlook.com (2603:10b6:208:3de::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8857.20; Wed, 18 Jun 2025 11:28:43 +0000 Received: from PH0PR02MB7159.namprd02.prod.outlook.com ([fe80::6cf9:b35c:b143:bb88]) by PH0PR02MB7159.namprd02.prod.outlook.com ([fe80::6cf9:b35c:b143:bb88%3]) with mapi id 15.20.8835.027; Wed, 18 Jun 2025 11:28:43 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nutanix.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= proofpoint20171006; bh=+nlGhnacqd9PrvZ4eDkZ5K7nZI+9vKXwBzEgx0OEV PU=; b=INE5+z0zOOcDV1QwXDPqgIC/PImJKJhPHMX/z8NCER6oiBWDIIsBmhcUx +Barq33CIpvMTi/bX1Ev4/fjLD3lyEMNNTtE9HE+jv2ozqPPT9NXfQccmtFlx5ZV CEj1HW3TjuD5RL0cPcnB61FDvzHtwgMfQYpS+d7npi4n9+sFIgfJq2hFwNzm78zG xhzR4l5GrTFj5hrp/zkoCvd5w2t3/gKd/f3aPFQ+Lp6rt4eDbg7nKB5VPp5UGy2Y CvXjpUwGx1TZvBUXAK69bSlGx45Ut8VG4X4PMxYHMb3fVsUaaTp8BwSknZhPWTZM tShiE73QthxxetmVQvPfAAlQMgOOA== ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=zCUWHdiPNXJOCtqssMyE/CiJWbEgemnciesJzG7HDJRu0xj+aifLcCtWDeIIvklrghXGQI4Lolun2JRfUtZK2NqyjKsWfeZAjbuC2rWoetEHX8PiQDxWKEMld7MVHo3e9zCP5d8rbsRZzyzh8CiZVjta/4DuumWy2hjUmph9qElAZXx4ILUFgLqOJ0aPPhPgM/NmWqDzV5TtMdHuWTCGaxHBFX1LsjkhbQDJEVNflvLggJ+s7EJP/So+GiLAi3hwoA5L0dCqevAyXeAJEy4BtY6JsMKWYditHKWMAUlwFDI83YYHQbVGVy1k57pjh4blwu2/YCCuM9pdjA5fl9tGgg== 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=+nlGhnacqd9PrvZ4eDkZ5K7nZI+9vKXwBzEgx0OEVPU=; b=bOyiqlscNlPSZ/1FvowSXGgDP7GH36pYxLFKFybYpvEluWWmTV07oQ3m8s36wB2F7OU4t7WZvzXTiWvypIt9cyvw/S/SRYTGBhtxWiYcaHtk2DGJt11CfYDXpG2tTiohFbyL+Zdc/ZbaYayAwMjJDoQNMwsqTh6PbYQHV+yRdr9Dkheut4g6OHYZ2jWIC8PZlcgaVuFStCe+oKTNL9wMrLN2jrJResxJOmJBI6AN51f5umD34M1D7Tlfl011sndLqJ78KB2i2rIcAk3Hv9M1h+wUrhQskv2XD13H4Kql6rbJsXaEiqze0WrVbRPsbW3dBz8jNGndWTgTmMutCOsU4A== 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=+nlGhnacqd9PrvZ4eDkZ5K7nZI+9vKXwBzEgx0OEVPU=; b=yiMDisk+VXEA8miwl3o75Uck1atOvSb/vxA27WfSV10fVqr/iZ6veUc1vMF1LZmGZKQLik624NTqt3dv2pOynU09GyA8TgP6LtfF/jrr7u9//ys1sRjy8jq1LAz7H/IM2vKxCZaukaY37K1OAHpmv9PWf/MhdxtudOmdHlt9NkpMQpVF8gyB+ab0ALpAp16+NcrKLnO37u0ZC7kzzns6kXISPB6xO2gghkOLv3yEhpp4lhvUhUqQC7oIdeyj+ToBOG+xqhCgS3NgT6P9T3cvp1HJGzSV5z7hnk4BHLnWqHWUh0SM1IRwUGX1Eeg53YEWRAZtzQTc5eA+BUhbDAWblQ== 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 v2 03/12] hw/i386/pc_piix.c: remove SMI and piix4_pm initialisation from pc_init_isa() Date: Wed, 18 Jun 2025 12:27:08 +0100 Message-ID: <20250618112828.235087-4-mark.caveayland@nutanix.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250618112828.235087-1-mark.caveayland@nutanix.com> References: <20250618112828.235087-1-mark.caveayland@nutanix.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS4P189CA0010.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:5d7::14) To PH0PR02MB7159.namprd02.prod.outlook.com (2603:10b6:510:16::8) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR02MB7159:EE_|IA0PR02MB9632:EE_ X-MS-Office365-Filtering-Correlation-Id: 773f9cb1-a4fd-4002-8ae6-08ddae5b47f7 x-proofpoint-crosstenant: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|366016|376014|10070799003; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?MpuNnC8KDiUPA4Oz7nhI4eafR/jpWj0a50g/UUwZLaeCCzBKj+dEIfB9D1Rc?= =?us-ascii?Q?xblR3xI+xtqnHFF6O0XDaYGNFEG4GLraUelGJYXt3ld0xxUQAf6qK0zOOxxF?= =?us-ascii?Q?Eu5ePMkXcImteCfLetmUqgC5mVTCI50EMz2N5Sprl2Qwzlr5MqskDgMlWRQy?= =?us-ascii?Q?6GAl2vKS8Cublghh3NKRjtm948MAdkUMpJaiYwYQnU7frPtjcTaurAVK6hb2?= =?us-ascii?Q?WgQtN5fTnuSlcUS5Idp2ZlHl3DQVkyNZ4aTy8l1NZ0fhI1FSNRfc1sskHcXb?= =?us-ascii?Q?YBjotdC/KvTWyYqOa0uep8pi3jwtbXfKmyo5JPrGh/djPphL+fPqvR08oRBm?= =?us-ascii?Q?hMB3PQyGffwVmQ40isaT6h9TTEl+Owz9mrdxnITohjdCsT2MRRmbTCnZuv3f?= =?us-ascii?Q?ZTiGy68hspxG3BwM7bJt60LeyWXpOBklGqxraFaUi8HR4KGazYSuoGy3+KSI?= =?us-ascii?Q?TuNaH3wYZvf2YGGAN1D1CepSKySWCgQebD12ySGIVWxhC6CP2Cyr+O9Wcwms?= =?us-ascii?Q?5ZfvMIhvhL8t4F8nOKWxihU3XdAzSyoJA9ha7MQkHriuEKObPDdE4JO9tfGI?= =?us-ascii?Q?HGBf/Nh/l7thBEQpkenUvWQasrYogfze6UpSVsz5mgkzZV5cyRQ2+pIk0A/h?= =?us-ascii?Q?vjPpQ0bq9uuh+GgUZnmlTivCnS1JYYCarwA7gBtMfXImI7iyPYBBE3to5AVl?= =?us-ascii?Q?mkyE1lDMJs6JNaB0c+TfhFqHNTi3gM38CUiAz8OLOxYLEHG7QQerTXGf8Khp?= =?us-ascii?Q?DIsYdPNkvPnXDKCgWxZ6WroedgkAwtCLEKTDh3y8SxYbXtH/UAThalu0Gww0?= =?us-ascii?Q?BbNAox3/2AHUTQ3pzUF/aLw7h1uGzXYblU3WwPurj9AVpU7Ig/mhp5aGu/yy?= =?us-ascii?Q?D5mvQ5s60WebIaFYVT31ihTEDMjsT/7ct9BeNc9BoILwb48ORxi6Ed1McfH4?= =?us-ascii?Q?fAf0ORmT5n0h9I2mv2oxgcAPYbsTLwe9F4OckSNEwSupOhfe8qa9GyworxYy?= =?us-ascii?Q?cqdxhfTSNbUX6vQy4ARkJiYn2+47IC4C+ZxFMXAuMxNKLUhYGmLF1E0IZPJg?= =?us-ascii?Q?M2HqihPxO3c9ODkrKSoSpe67arGbsdQRO+zefhlUEhi0fWxnugca0pzOba0B?= =?us-ascii?Q?o8CGnBb8ovWV7SSyJS2uaGpetMGRgDZyQZSZ6Unuu0zSr9tC36newA4miqVc?= =?us-ascii?Q?X3waHcQGdKRJTrr0a4FsKPVnbSFmjYNv/8vOJ9V/HNmuxaJbV3rUwLJbKpAU?= =?us-ascii?Q?8W3nUeKaktUIUOshbRcu8FG07Jq7sEroL888EBZDY6Wsl+pJDynr6wkzpuR2?= =?us-ascii?Q?EVVNl5fopyXZnSGPFaTHNcyE9XGTp+WcZd6PhMTkdXI4Ju3N4qOkWG4mLUyp?= =?us-ascii?Q?VXJFUSlb4lg8Sh9CubJszvI8Us25qudGDl2vRNr3w3yLF3HjtG36mhY695Oj?= =?us-ascii?Q?KHLGRO4pEnk=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR02MB7159.namprd02.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(366016)(376014)(10070799003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?wiARccoqULB1GDl5SoAkT5p3WiZTkFjt0A6KQuY2E4OkPoavjWVnSybnv8yE?= =?us-ascii?Q?SInG+vq/435pYSdP3okVG1LvnxKzANgdR9Cc1egQsJ4wY/Rk+5QUPookXWdk?= =?us-ascii?Q?1XSlDznaW089aqMH620y3UpgzUKpFu+cO0rS9ymrKIPwPGJIFiOgOona7QIZ?= =?us-ascii?Q?wBsGMQiqfOvKmgxwnkfFaWZhiSyXlAMne9l2eIEPnYg1RSPuKdtAeEGkciru?= =?us-ascii?Q?pX5cQnCbpLSndvchnrPW5rkX9lwEHTb4cdmxWltrekQKk6eglsE9TYc0yvxp?= =?us-ascii?Q?yMapX0nHC7euG0B+4kjzjVe4T5vJuhruh7RLaUqX+XXTCqXLmA2/oNjKwq/h?= =?us-ascii?Q?Ah5a/Wtg7v9AbVA+nijZhfJ/bNqQwpxe5G50BaqiUHsi9/ZUFHgPgTzm201v?= =?us-ascii?Q?fxNw8m9WEDRYHxpssuWn59BnfdwayNkI5Ue2bAjLwGvv3Wgp7Dz3UBsxoL47?= =?us-ascii?Q?ZQ34/0SA4S5UwiSdA5ZaC6qFgwQeLBVZhT5BI/MoG4qyAwI5pNohXEqEiy1k?= =?us-ascii?Q?TpPA1JZ1Nl7nPUlOTIKvdWZHquPTdvO5YduSPtiLsqjDgqLA7KCmcwgD60WE?= =?us-ascii?Q?QNlWa+FRG1W65zE4Avarz+CLnCwSgj4v6uea+cCMnpKx8i4SFdehEYx/21Cz?= =?us-ascii?Q?0drkdT879tug0p3MUgaD2aDXKE9s/OSZ7RzZsF8eOfHtG0pZTYusUlbdUnHN?= =?us-ascii?Q?tn7BcaEZ07BYBIjgmiESqPj3aFbSWiuSF7TLnnwFygOiVnhwZLkxhx+ygZFi?= =?us-ascii?Q?2pGmH/ProI6GKZU/5PzcWuxsPdD91lZ+VvtnSmLDqZ3ETy3WURq3spqEWj4T?= =?us-ascii?Q?G4+2U0RCnzPwkLfegTVbE2dqRTZd0ZCzQh8ARJfIMY0B/hYH7iMcYlUv3LgD?= =?us-ascii?Q?ryPlyQOol2wYrkZJCdoi0qt1ZuVJqdxTHoJY2atjUGtrV2GqtUyMpVGtn40M?= =?us-ascii?Q?dcqhg/16nLtqeoX5PKFer1izvmA8OQNRqUk/jy369o2GDTMof+vBNPfIrDX3?= =?us-ascii?Q?9ReX26DaJkEpXpMe2U1TR4d/GBhHHLBvJWylXUSiyrEYPIGXKloUx6co95Ri?= =?us-ascii?Q?nP1RVC+wnXcxxfW5SvGAn+OG2SpcJWO9led3Vm9C62tUT5tmXca7RTnQt38s?= =?us-ascii?Q?CsENv6ts98nQNpp22rDxsRyz9+hNMVsPHDrjZoOKyzieQD1r3jzE8Jl8d0Is?= =?us-ascii?Q?jzPL6D7uuh6H/eXu+skd+6ja+NIeZZ9gr+weV6+SctzOC0sCbbnyVv57jFxk?= =?us-ascii?Q?GTzxgJIqoFGETH6biWts5v3taJVa/mg7Mv4cr+uYHJ7JylsZTenhqxJoJ43s?= =?us-ascii?Q?6bKNLtuxK/uJg5TUhP36cZCtCAvpcBGkCkDfbOGC+DgqpXwLh5SMTuUyuXsA?= =?us-ascii?Q?rV4kE1xBs6QJC4Lxm+deXotrpkvashnJcYzqCbFTtuyD/vVvPK3kk+NXPNCE?= =?us-ascii?Q?vFh9x8jcd1ARIjQbJVyGdQZY1NXmr5efVtm67Pp6FSQ7VumNDbq/E5PPM3Nf?= =?us-ascii?Q?BraEyx4hB+7qgtuwy+0f+ehzOUMErTolGJJRxs1+tN4rKC3TVkjUhvs+nHvP?= =?us-ascii?Q?YxGN7k+v7J4WpGQMo5t1sFMS6c6bNUq6PtPTKgEVYhA3bdkVuXlKnl94kiC4?= =?us-ascii?Q?ImJQ1UmAww0iINbbybvjU7d00X852IaoCtCSt0i8/T0KE6tuCBmQjyLDZSgj?= =?us-ascii?Q?VBAwsg=3D=3D?= X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 773f9cb1-a4fd-4002-8ae6-08ddae5b47f7 X-MS-Exchange-CrossTenant-AuthSource: PH0PR02MB7159.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jun 2025 11:28:43.0005 (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: 0JmYWWRKFpGxfVouDKZlqWmFjA3CygS1Ilv3uExXlwBYj9KF4NA81s20NcPeNJtAoCS72rQUctaZ4Ikkl6ezeFxttXpYOmcqWDCSeWlzlC8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR02MB9632 X-Proofpoint-ORIG-GUID: o_Q1UlzxCfFvUpZZPNTkq5dw_8Txilal X-Authority-Analysis: v=2.4 cv=VfT3PEp9 c=1 sm=1 tr=0 ts=6852a2f0 cx=c_pps a=AtfF7QnjuUZK6qv3K7ssFw==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=0kUYKlekyDsA:10 a=64Cc0HZtAAAA:8 a=34rjppMlHknrnf9OHTcA:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjE4MDA5NyBTYWx0ZWRfX0u8va4UHkFaM UXGMnQOEl2a2zvrL6JCp8kS82Lw1LIWxAFkpoy5apjxsKWIfpNmbvK4BlfWYbHGvXmbDgf8sxoM 3DcCmeS6FIfbqfCjMtZl3dzmGYVn4SEh2oH8zlz6a1Q/RntMlg8yNPQryPCoxdqHPr98EfpasLS hMCoCheLfCNK6Os8K6B/INn3Jj7fXlA25oZdHhkRCaRnx3qhpTB6FTit46Vr934R3EGUwSGIFdy VM9P9KGz11OcJPNLMQM8E5EnTCYnKi3S2rKJKF3Xa8BT44wgUVZW6yxBybrfBUaJPWftb68JPde ZJEfziTyLn/kg+NTVqhFMZCH7pxbExtA/A05TAJXysmi1Le9PNspcfrs9RdbkoqVn8BP5uydVaJ 0LZD6Lx4cIWSYV9EV2QtsGNbY3CGLSJgjzP3RCTmLSf5QqttHDJZiFUhjOtwymB+UM3J3bRI X-Proofpoint-GUID: o_Q1UlzxCfFvUpZZPNTkq5dw_8Txilal 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-06-18_04,2025-06-18_02,2025-03-28_01 X-Proofpoint-Spam-Reason: safe Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=148.163.151.68; envelope-from=mark.caveayland@nutanix.com; helo=mx0a-002c1b01.pphosted.com X-Spam_score_int: -46 X-Spam_score: -4.7 X-Spam_bar: ---- X-Spam_report: (-4.7 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.895, 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: 1750246255661116600 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/i386/pc_piix.c | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 102e785d27..2ce3a3463f 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -424,8 +424,6 @@ static void pc_init_isa(MachineState *machine) MemoryRegion *system_memory =3D get_system_memory(); MemoryRegion *system_io =3D get_system_io(); ISABus *isa_bus; - Object *piix4_pm =3D NULL; - qemu_irq smi_irq; GSIState *gsi_state; MemoryRegion *ram_memory; MemoryRegion *rom_memory =3D system_memory; @@ -566,23 +564,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 14:11:20 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=1750246315; cv=pass; d=zohomail.com; s=zohoarc; b=hgq/X+yCK25zzXktSGPzh9wtrP1vQhvAZikOflPPSwmTPaaD7miAWgw+wMMo04VGfG3EvHdaTPY6jg6/mR5y5ab58bpxNQqFSdmOQEKHk9RneH8KsbQv7CmO5vhtpbw2dTU8nG50xvVrBfHMsrGLrKxpCZdNTt3k1y/96CWmTqQ= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750246315; 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=2yFNSjTsdtfNcVmJlhnwsIUAE/r1iYUfJVDqIrUtUIA=; b=KW9KkQvnvj/zmyiorfTEiXpdFGmUzsc+q93wJ+rp2rb/GuRodQH4QrPie6q83zOHDcKrrrjBqC/b7ckXP+I8Tz1BSxIDMj3rNV66Jt2uFD4OCZqy9Js33f2+vUiF2l45luA8pL1pyOCJXHw3J+nciUzETruomXbH4Od/NFHFnLU= 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 1750246315736567.8901171693277; Wed, 18 Jun 2025 04:31:55 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uRqyO-0001De-Uw; Wed, 18 Jun 2025 07:28:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uRqyN-0001D5-SS for qemu-devel@nongnu.org; Wed, 18 Jun 2025 07:28: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 1uRqyM-0002VM-6c for qemu-devel@nongnu.org; Wed, 18 Jun 2025 07:28:55 -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 55I812Co027364; Wed, 18 Jun 2025 04:28:51 -0700 Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10on2100.outbound.protection.outlook.com [40.107.92.100]) by mx0a-002c1b01.pphosted.com (PPS) with ESMTPS id 479508h33q-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 18 Jun 2025 04:28:50 -0700 (PDT) Received: from PH0PR02MB7159.namprd02.prod.outlook.com (2603:10b6:510:16::8) by IA0PR02MB9632.namprd02.prod.outlook.com (2603:10b6:208:3de::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8857.20; Wed, 18 Jun 2025 11:28:46 +0000 Received: from PH0PR02MB7159.namprd02.prod.outlook.com ([fe80::6cf9:b35c:b143:bb88]) by PH0PR02MB7159.namprd02.prod.outlook.com ([fe80::6cf9:b35c:b143:bb88%3]) with mapi id 15.20.8835.027; Wed, 18 Jun 2025 11:28:46 +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=2yFNSjTsdtfNcVmJlhnwsIUAE/r1iYUfJVDqIrUtU IA=; b=MezhHCSwcQQUmAaNgOQlL4lRpHn2vqQiCtqJww1OJtRx2d8wdSYoBLeyu iuo/sa8pzUW5QrH+CL5ixRsG/UvN2PxIf4/iysBqBw5P5hcxAmGdr7GdO/DTGVk+ KKUJh8JsnmkNwhcpmDHYyZJC6QjvsGeLQMVJh4HJ/NM5uPP97UEr0xmIEJ+ZEBjN H8yIv220glw7YtGA9Q0owZO91ZQcd2V/Y6OD+rPDtP4+pTL1pTrvuY6TybQ2cx59 LnQ6sPp1tGC+RPBF0D6PH1TTzWfwzMzSWaKTInScV++hXU9iC3WVrbBxGl/qHt6K rJeH+UUPKvoEHZTWqxEERjd5YECcQ== ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=FQVty2a7bRsohCH8YN+NMTevqGh4Ij24/uov/upiMBxkhXvB4B+VpDPUYJVEclrseBWIuCFHTexN/qD3ibdOtOZ45ns+cOIq/SeiQ42cED7TfU8k4KuWjQ/IP+Gp4LiGv+XcfpCI1ScaKw4vE0FJNMwrl2T7brvyKGkPhg7+RMepGs3YNAsW+ZA2w/YFYDbc8da8BARH9/qaNRFJ/yhOGqYh6+fVHzRyrNlFGoiHkjSYskFdso2LFlXC2Tw4vw2brjKI/nobQdwoTIZbmxkePHQt6MIZYHW76cLP7NUBlUE57t9UxfpXJ6zb+WrECHG0nVf+qGYHeuDAPGY0jzjajA== 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=2yFNSjTsdtfNcVmJlhnwsIUAE/r1iYUfJVDqIrUtUIA=; b=UUlGCoocm8QwWID7sFU0ULN4l7eEAd4M79LDYqh13XsnctI0EF622JRgZlnTQj6M+hpFbjb4nszyjEohaaCLBbE9Jj/jLtTBvZTBo0Krd4FdxWyZE0EFunt/YniMFccHYCfBmJKIkclkhatbf8wd9G5JPePYc4y0Dk1nvXRZwiL8vwzfc6+y6RUI7A1U1Ucbg7vDzxVkC1GzjGaYB1AkcOZYJQDISXZI1+x+5HA21Ftw9ruqgERUftuy1tW/1mlokkVPeRx1PF7ui8TREBscR7zelS26ZhcQdcpcHFDDysIiS7uGfr+K/QvHnInSp7Etf2cJL1KkPOi3AchD2EAdRg== 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=2yFNSjTsdtfNcVmJlhnwsIUAE/r1iYUfJVDqIrUtUIA=; b=Dh/Xh5na0hv14BJv5uLDKeRmN1uJ8tLDAQviaUpFyajICv+jcw2sPHC3JewMG0FtjMZ3ofITJdY718b3tYz9qKTUi0SbeITTAcLUHYLHOvoL8Bbpnp6OBuug+s4ckSB4uHs/0dcA0C0kkQaMOiLvFb3MpVwtnnrTP1pvQyDjerfhZcpHn9K99lFp73UCh9c9QjBcVL5iKKWQJaf2rI6UAR2OSPg250nuCRq/pEu5EkohBxTWktlbYPVVgZsCIGKe5LLXKcyblISrOSwg+Kt7Xd28f7ZaGyyF9/jwdp/IOWlh1drSNlZjVqND3mkDBjF9Em2duvFEenCGD0GUUrPbtQ== 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 v2 04/12] hw/i386/pc_piix.c: remove SGX initialisation from pc_init_isa() Date: Wed, 18 Jun 2025 12:27:09 +0100 Message-ID: <20250618112828.235087-5-mark.caveayland@nutanix.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250618112828.235087-1-mark.caveayland@nutanix.com> References: <20250618112828.235087-1-mark.caveayland@nutanix.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM0PR03CA0051.eurprd03.prod.outlook.com (2603:10a6:208::28) To PH0PR02MB7159.namprd02.prod.outlook.com (2603:10b6:510:16::8) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR02MB7159:EE_|IA0PR02MB9632:EE_ X-MS-Office365-Filtering-Correlation-Id: 57b168c2-f5c8-41b0-5bb3-08ddae5b49e8 x-proofpoint-crosstenant: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|366016|376014|10070799003; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?jUBoVE0OxI7ymPlJa6hZKe9pBMqmHDBog0orgolb5YWTBgtSmgFqkJSXIA1n?= =?us-ascii?Q?UMYoMYQYQYdj9LwoAsHT9aU+zi+B3C2DohLqdcTtSReemp6IDIyF+FohwOvI?= =?us-ascii?Q?qm3a3KEoTyP3sDudyZ5SzEuFZptgKVDp2Rmiy5sDM9a+tqKGkxb/fAUwFoCL?= =?us-ascii?Q?TtIO36ZMsMmR5niBT44nQ+wfzBra2hRQm1RflMz++FhgPCCZ/n6ybv97d5K8?= =?us-ascii?Q?/nIdnE99W9t43oa4FPqFlS6BlInl+k7JF5EI4YFFZqhxMyceQ2GznN3miLWa?= =?us-ascii?Q?lh5EFPNtNrO3ehtLpj/tn1oZ1FgQYLuQbUe3IwQRMunm5xPioVIEZU5YLJC4?= =?us-ascii?Q?wCM4N50s6GiWioIxQucB8m9YFPGhyUdgmgjMhzBP4ub24TizKqLpZOAC+0/0?= =?us-ascii?Q?XGcYC1bYcm9M/tk9x6n4WR80lLOwlBa31Roo9RYGLCC4ZY/bsXxPYY9tq4Bz?= =?us-ascii?Q?inqTB6DhnjJjjTTTQTw3n+emFhlxyfHEvx/Kr4aJp9kNjT0YbPVbnxIcJtlt?= =?us-ascii?Q?LFQZJKQAThAsS2EAujAotu66iJKOEbtMtpWwn48zbYrCE4BltYk9EN+VjxaB?= =?us-ascii?Q?LMotLvbKI266rp6rU9Z0tzDZZu7NFqPdtL2n97xKmTeB0+ia9flbPeqvSEKQ?= =?us-ascii?Q?4HRADvD1woAIQm6IvpAtoTEJbrGneFmcgH2grDJpUG4oXEtkHoziAli/BEO/?= =?us-ascii?Q?dd9FrKMKaCUh7DxoejNR8PuuHeGWHP/Y5m74oYvLtYfafO5sT/ZTWZhiZ1o5?= =?us-ascii?Q?bNFFUwo/3/keQgK5Lk6OluJ9/aB+dc1Rs+WCp8P39ymBKQe7BlMjbMZvEfmG?= =?us-ascii?Q?2cRN/ATdhyx9c1/H0Latl5/JznyHVoV9o9Db7v5gjBpw8/pjnZFEcGMO98EJ?= =?us-ascii?Q?Y16H7kJ9ZYIF/dB8sz7x7GgVQqhAwRSMVyQUFxppMdau68rBP6+YCgEGGCPK?= =?us-ascii?Q?oDHhSgCITtb7KDkzHtmsFZolVpx7Aw/Cp0QlpJ6WD1vXH75hoQAIC7k+06JF?= =?us-ascii?Q?Db/MNYvizrlaVF0ACQV9dMylkRYM4e5v8UQYsj3UJQmfOEhDznCvkHCW38vk?= =?us-ascii?Q?fs+k5epy8oGPhP8zKagLzDzKj349cVtOWEAYpBXxfMsKTxGVLc8B9ZXpcBm+?= =?us-ascii?Q?0UW942ZYVk3Hrg9voKN4VvMTnE4DhtSe0a0FXNi2Frk81L1950HJ/SL/DBCh?= =?us-ascii?Q?7B5jSu/n3OEz9h8h1OMZ18kL8wWlmwYp0TO3VRwtP9TOkFIJP67QFKDbvqHx?= =?us-ascii?Q?c9ZT/iEdaWCIfdHRQnhPQrr+TL1P+c3YQaMqnjwtBz2zYKshh7/xO3q/0A0/?= =?us-ascii?Q?IF7r99mCA4juj0aRl8ztzLDgxbsvAJ/NOTWTU3KNLZairOywavJlx2zFDmXq?= =?us-ascii?Q?RWPkQmMoUegNfTYmY1+5HtkBvsqkYuDy631oyxFxkNzKbnElZI0bwuOjFz/Z?= =?us-ascii?Q?5rUW9Fa38wA=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR02MB7159.namprd02.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(366016)(376014)(10070799003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?MqLk6dz8xQFn1eALWGz4TzyRnsP1zNibTbDLZ/1BhAJx1qkK/Bpast+h37j/?= =?us-ascii?Q?5dd2cnC9qEMWEkHvkKhpD7gE6s4X3GiiOsJ4qleEKknHwa14XpArpT3UT1Am?= =?us-ascii?Q?HuOPKNFZ1Qb8fhZAyn3a23vDJJddntohrkktAFLSHfG8R0zJ90nfqcaVlaF3?= =?us-ascii?Q?lUyJo4IhUzaG9v6Eq4RSIZV5mnthnRCLYYACxNhyk7PTq9g86gNB4YL1eQY1?= =?us-ascii?Q?8lRkOFsBZtgkQ/laoRqIYTsE1YGLddoxZPQrY7E0GlxznVD6Dnh9WIzbTaKd?= =?us-ascii?Q?+pRF2OkS5KGRz72a7yi+AP4n/vlD7QGqY2hX1ZtfxhBb8Q6UqYourLVL4gfY?= =?us-ascii?Q?lO4Xua7BravFgTT4uiKHcDsytYlVTfMD96X48hWROYhCyDhHejiDKEIwsU4L?= =?us-ascii?Q?EGcLPz3Arh3ksfxowKDjccQFcURBw3nNIZKD6urEZfpLjZFTV7dkPrdSreLJ?= =?us-ascii?Q?DtZKFdd04y0VUkv88KTOKElYnXha7U045xz1vHp61dgclCHk9P83TI5flAvp?= =?us-ascii?Q?DbvIWfHFghZZjieLIml7LHiMpAi81kIuZnzCyl6AhNDGxiIG83UKKeWHhepD?= =?us-ascii?Q?NWNelxAcLWrImOimPxFO5Bi/zPB4+TL2vb8EH1p/DmUKwj9MhkV64DGTdJX5?= =?us-ascii?Q?NVKBN1nJL7l5vcAl9sAEYW0Z2kzw4v+ubRJ9qEs0lNK516ClJTPE+l/POi6Q?= =?us-ascii?Q?SdO6vtx/pWfvPIKrY+tj1Ic3q51SFWMegb5Ar0waM1/PEA7DAIfzIdYonJKE?= =?us-ascii?Q?58UnAHLBk42znQVguZzWj+czx5udaomZXjH+SaxzNuvhoACNB/0KUMxYkoGs?= =?us-ascii?Q?jseuzJV/0gt0hyR5h6nyhBgcYU8Frk18Uy1EZw8pNBKvD5zoKG0CVH4wAMJ/?= =?us-ascii?Q?Zk92dSMufBnAviVnDPqrOGLhhcFh54Tk+VZrzC6nQeSR+TsxlQZcUpMxGFqe?= =?us-ascii?Q?7LmJBbtx6bjHkIGXEOuXs7fc3411PDqyjuRBjiOCMKVviP5gIqR3WhTglnpK?= =?us-ascii?Q?464lShBm+ZQcleuCFuEy9RpoRmUseKy2kdeoROLM81bdkfPQap2uR/My9JkA?= =?us-ascii?Q?0wqTUNTdd91Bma0f7vpM2gjuFwT5uEH/IgatvEf0tqNbsTBkeDy2l9r0NSbO?= =?us-ascii?Q?YddOLLNj19kU1L8rzamHImCVMsltjMCKsD7OPuJFyqmTmWlXD6HJCFpjU6xQ?= =?us-ascii?Q?bhQULkhbnEqOemHg09Z0VZFofqIc4H0o+aUe6jVPE+GYpxwRyhfTVGj7eCHV?= =?us-ascii?Q?hmTaiAwyU1DW/irLCbPCfMlcH1gV83UgIA0KH4GpA3jxtjs4cgCw2E+LHJIf?= =?us-ascii?Q?ZqTIvvJ+5P7v4A+YcceaRSYrPiZ3tdDHqgcwTz6sh3w4hxCfVUkEk+60Jsdz?= =?us-ascii?Q?No2wbMxtMehFJ0mgi42wkODJ1yYNAJKEoMkzhEADGD7hOyTZHgZSESgkKA7R?= =?us-ascii?Q?oSVWMCpnyH4WSinV55ljNupLgW5gMvva5nsrVedSiVpixkjJCLuU1pT9K/eG?= =?us-ascii?Q?/Lvzsn7oLplDGHeR01XBlEMcz4KCxdeqAOH9uW78kE3jpZhnwBV+gRo3whXQ?= =?us-ascii?Q?E0AITfZKIBGwhBjVJ/74j6VKpOtqRYYHqvfi630OitedxjNPx+gRKwxVH5jG?= =?us-ascii?Q?QUybDsyv3o/PP/Dxty2H3KOKhVIvecQnLUzjLLR8sc1lDRbQ+hYq+c7sRz4Z?= =?us-ascii?Q?eSL3QQ=3D=3D?= X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 57b168c2-f5c8-41b0-5bb3-08ddae5b49e8 X-MS-Exchange-CrossTenant-AuthSource: PH0PR02MB7159.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jun 2025 11:28:46.2410 (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: QIkoagPy2ucP+KXh76w/Hh1ICeKhmQW42grR3DErqZOzd6cp4dNxGZ+eMx9W2230HAVUMF9VNQLEHqlmpykslsgwUiKCGK05owtPihZQ5/k= X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR02MB9632 X-Authority-Analysis: v=2.4 cv=HaIUTjE8 c=1 sm=1 tr=0 ts=6852a2f2 cx=c_pps a=NE+w6TL7qZ80L3NA32co+A==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=0kUYKlekyDsA:10 a=64Cc0HZtAAAA:8 a=rnFr0Qxienu5vtaJ29UA:9 X-Proofpoint-GUID: dlTaZqV605XSyuR_Zr073WOflUNT1czi X-Proofpoint-ORIG-GUID: dlTaZqV605XSyuR_Zr073WOflUNT1czi X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjE4MDA5NyBTYWx0ZWRfX+5UzeGSlWhKH EULI4GIen5xWmXUfqxoV4ur+A6gt8/UXVj1aDXKaFhWkAf6y5a+O4oxUOHFsJwXdmtgp2b4pxPG c7wBev3ZIfvgY7dihnFu+CcyeblAYIQj/CM0VvTlBzqOsVqHL7xuIomwH559Pc52tpkFzHoBSY7 YXGB0Tv/YJ1UpLDz3s3KTG6XbSV67CFsQD4K+lDOnM7SPihO34WAW54ajT4T/Q/lMH2isVFysfP kJxiCi5gGH3X8OJMxtokn2qSDWp6GslpXg5Z7fhcWW58qtrdIj6jBe8oYdvVpL9TmkmZJFeuxwk xzkK2SlfWpZyCxH7TD9Do3zLw9+iLfqYnN6UpzJbX8ipJoN7FYNUslB+J6xcrt86aP4ycR/YQWI IPSVs6t1hm45+dEonSLi9RSv3DiX22EU86t9u1y8NBC6zJDjXcte7TlsmP9px407GQPE2WAh 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-06-18_04,2025-06-18_02,2025-03-28_01 X-Proofpoint-Spam-Reason: safe Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=148.163.151.68; envelope-from=mark.caveayland@nutanix.com; helo=mx0a-002c1b01.pphosted.com X-Spam_score_int: -46 X-Spam_score: -4.7 X-Spam_bar: ---- X-Spam_report: (-4.7 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.895, 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: 1750246316253116600 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 2ce3a3463f..d4fb9787cb 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -492,7 +492,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 14:11:20 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=1750246184; cv=pass; d=zohomail.com; s=zohoarc; b=dVdSh4454YnqZCoxHj5wGV38KzTMv/LE7u1MzcGdi+IsSlHxYYGtKLb1oVDU7PQI9WRzOONShnLpvjPiwAoo3q+2PSP6POjZXVTmvzS5pbe+T4BS8gguX6jpBsW0iov+hUutq4lkFT/b/MIrBqgyOyQ8Msxun2ZUIw2MT4F36Uc= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750246184; 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=pLbtbWDdlXSLqKwPsy6zF9dGqeF6Jq3BtA2lKcWyo9Q=; b=m2CW+acBKCwnj/Y3eMevAc89SLd1hGMnRcyo0YMJAg6GR+LQqVnLXNN8FYM06TzAi8yjOj8948oMtNHO6mVjLET2VHjVlVmyBjVPjAmuOhysmIj8TIWOP5YnSMKqpNjoauqsgUUMy8YxVF2CvriWqyZ1Hz03EWB5uAME42LXSjc= 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 1750246184890834.8496061127216; Wed, 18 Jun 2025 04:29:44 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uRqyR-0001EC-Hs; Wed, 18 Jun 2025 07:28:59 -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 1uRqyP-0001Dy-Ph for qemu-devel@nongnu.org; Wed, 18 Jun 2025 07:28:57 -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 1uRqyO-0002Va-45 for qemu-devel@nongnu.org; Wed, 18 Jun 2025 07:28:57 -0400 Received: from pps.filterd (m0127838.ppops.net [127.0.0.1]) by mx0a-002c1b01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55I8AU4P013249; Wed, 18 Jun 2025 04:28:53 -0700 Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10on2131.outbound.protection.outlook.com [40.107.92.131]) by mx0a-002c1b01.pphosted.com (PPS) with ESMTPS id 4798mygstq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 18 Jun 2025 04:28:53 -0700 (PDT) Received: from PH0PR02MB7159.namprd02.prod.outlook.com (2603:10b6:510:16::8) by IA0PR02MB9632.namprd02.prod.outlook.com (2603:10b6:208:3de::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8857.20; Wed, 18 Jun 2025 11:28:50 +0000 Received: from PH0PR02MB7159.namprd02.prod.outlook.com ([fe80::6cf9:b35c:b143:bb88]) by PH0PR02MB7159.namprd02.prod.outlook.com ([fe80::6cf9:b35c:b143:bb88%3]) with mapi id 15.20.8835.027; Wed, 18 Jun 2025 11:28:50 +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=pLbtbWDdlXSLqKwPsy6zF9dGqeF6Jq3BtA2lKcWyo 9Q=; b=DGkcwqnoyi87YbxkxBYDagY4MmbM3GWlktiHrx9XvdVV3VyJVUqs7eiSp Cexshr5JWdmxZ5n04sBKyxujlzMHTRSE6g42wVbZAW+oJBogn9A3gT6dpQLTARdl C8idkUXb4Qiw6TDAC+QF7nEMdX22m0o5ewAi9VGlw2Hm1Sh/7mo5WiHA+bHMTyHU vZAYXL8omp8ywqAhQEPs0BDm6uIw7qH1TAJe/IWYdBnhodWKBsfawBfjE1g33Viz S6zIluGivDALrCa7l30nU24kiDpFKc8XwwKTE3IzZDmC+OQwQWhIJW35jeBIhVdM sj4o0HDdN7d94WxP30aFF0NL35SHQ== ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=aPo4OAt+0H5L7q6lCbOuKgNJekR18k4dJfwff/odTHAvnnaD3e1hPppjFkPTNEaK9ndHh0P4xinTMPKjB7pmeKrbU/GoAaGN9RAlmi1bvUybfZG+GsG8pTocgxgKRIbzilJrvyLLCiW7n4QYl3CfIR288H1P0f5LaXeZ3W2Wl/GgazP+V86hmXFNJsNsG2PlCcjuL8n+aVvZ/0HU/R98sRos0MClJWGfllw8ZwcDuq9n4u1qy87kZwOWkS59XnprnlLgUnECUnR950IbscKaM5QXDoDW0gFebEXIGpiFhLB65ErZIqpg65R41TjfhmbOf2fC9v19iLYuy4ltRG65rQ== 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=pLbtbWDdlXSLqKwPsy6zF9dGqeF6Jq3BtA2lKcWyo9Q=; b=AFBbU6LLXvCUY/GzaAGR30T+oncPJ/TscOOhk9Sn+Nh7LVHWrpph1hUanuqwQy4DIH/gYVGqs/6g+fGgFuzyeMxMbo32+JgLcywnXAKYgWXN6zmLWZTvCQavkOSiTS3en8s9WvEErVMTV+oWfctN2NSU2Sw6IXBkp6WrVK8nBG5gUpuM79BnPAFtjahM9XJoQ07V/+r55FZYcW678BKFKsEMHpVsZlVwLA2lMvj1ZHNWwrPtX1vxWQw1esFLSuBTVNOJlnGLwAFxLhHt7wf5rg70NwQ6CsgORCpzkFA+54x8hjV9CRUMHKvcA62A8hgNn5/ukLPXjxtOLwdluAK2qg== 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=pLbtbWDdlXSLqKwPsy6zF9dGqeF6Jq3BtA2lKcWyo9Q=; b=MCDO378AELo9FbC+ZVLcdkBVlwbBVsCbbIpohSkds1b/9wDkiSFP7lVCAsR5bS7UEa/shgDduu5pjU0L7HpGZWWaLd+GfABqLBzd+KJLmjyylVW/G6SDfd9dxkAday6+W9vnIG+GIw/PUHJvIGnzloI2gKt0bvoZXxJ6cYyXhJDJFX9Tp3kQ+Y3CzFunRo1HVMXluRfJDCoCQUeI/oztjjkwkoWaeEp1dd3BHE795nViIHlAFWIlIskJPPzLIsfM3iw7VD/8GdbydZUALra9khbV0J8vRTJr7ft9gq3LPe8NQMc7FnNiteXVn3sMphgu9IkkRG8PpyXGGh9aey5AEQ== 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 v2 05/12] hw/i386/pc_piix.c: remove nvdimm initialisation from pc_init_isa() Date: Wed, 18 Jun 2025 12:27:10 +0100 Message-ID: <20250618112828.235087-6-mark.caveayland@nutanix.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250618112828.235087-1-mark.caveayland@nutanix.com> References: <20250618112828.235087-1-mark.caveayland@nutanix.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM9P192CA0027.EURP192.PROD.OUTLOOK.COM (2603:10a6:20b:21d::32) To PH0PR02MB7159.namprd02.prod.outlook.com (2603:10b6:510:16::8) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR02MB7159:EE_|IA0PR02MB9632:EE_ X-MS-Office365-Filtering-Correlation-Id: 5ea772d4-f01c-465b-8e25-08ddae5b4c49 x-proofpoint-crosstenant: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|366016|376014|10070799003; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?5UyW9T1VgJShsM5L8pl3hgBkpBCGFlkLtPhbC3Qr3C5Nsbf0xGT7y2ClLFz5?= =?us-ascii?Q?lh11Yh/9JPp4Ro+GkqB5Wzdxo4ZyA8blIDTiKhaSwekMt9e+F5/BnXsLvA5v?= =?us-ascii?Q?pINppJnoLgEdsMCXaU7wHAjycccMss0m1u0Uu95DbaipyEJZBZBJcN7tMTXT?= =?us-ascii?Q?VqXT5Aeo7d7gVJojb0B2yPfFlTkV8ogUmnp38zOU602vrItJ0XdR5iA8CTp1?= =?us-ascii?Q?+lIlArwA98/jWl1/65S2D4geago01UnSulACnaMSarowhi/wUS7PA3fKDP3x?= =?us-ascii?Q?hB/nhnILK9Q6OyAeSRDy18f7FdYtTu9pG3McSXnZr5jWuRTDquzT6nHVdczg?= =?us-ascii?Q?z3JLwG1K93Xqos4rK9NvnHTtFZySYMeacRIGajxst2n6xGpkMdKLIGtLxh4p?= =?us-ascii?Q?sQmJcVztgAdFbqDdGrPuyqI6PeaLUvYzzNaMO36JqKgzf1HTp8fnafC3OtmR?= =?us-ascii?Q?vO0KmO1X0vXuVC7iXAX4O3e3g1q/TKc+K+IEV/87P3ESxYBchpPyda4F+5Cw?= =?us-ascii?Q?31q4j9nVfIIUsvUvihsKZgfMrzIhQNrlyB/tdZ0UWdsixV91faCe+ojBF7vh?= =?us-ascii?Q?IR9B/E9BJ2K86vvQC9ulgOyUAR55nuCRJ076ZU4LkVKN7LEgDIQDwhB52+Bc?= =?us-ascii?Q?v1So/7+Rv9ClRXgZcjtguUFuoM0U+1p2vsobDoDN0zDeG0uaHmvyUS1pIwsA?= =?us-ascii?Q?gMRpKfk3seYbnRUpTVAlAbwK1JNO0dKcrI3rBTCWqyI4GaqX/R3EWtmOeNeF?= =?us-ascii?Q?VDbD1s7mkInntg0ZBsPXttWsCAyIjonnjNP+q1YKgX3sGnqUwiFh4w5M8Vew?= =?us-ascii?Q?Fd/ORQXr65av+d96+9s/VZecKLtJxBff+m2g4fSuQsxF9KP98E5QGI4iQk9T?= =?us-ascii?Q?CaYtSebT14mhWxK8A7Xz/svLb2XnMAujwZzknZc1vqIFYLetsr6VdieCI5CZ?= =?us-ascii?Q?T5cCzP2K2N/l8t/b0ZHJS9Cz8v4XoXWxTgmlKTpCgmGld8aDdDNMRZuiOxqs?= =?us-ascii?Q?vWBWVQqA+lRc9KcMxa/mmZ5MXF5howwzFt3ruznRXS8uA2gGosAcrcuGgOBH?= =?us-ascii?Q?+DlMEF21OYwkC6EtTiwHeaMiHQ8mztc+W5RWJi5iCLeka6q+6UQZENzU8m5H?= =?us-ascii?Q?spD3PlkiOssc8aIgHH5UN9v/VcgJ0FDwp1qmCL5nKdNBeku9earoA5zAEP/J?= =?us-ascii?Q?KeItY2tcSlGVmgGvdsfrMve1/DkYth7NFLCuK6omRQWs3/cXj7ee9S/WzTKW?= =?us-ascii?Q?+dnslYJir8buKZe2jc6s7//Fe6yIqc96B6W+3SKzw3yvSyLH8CJRb6FOy9KR?= =?us-ascii?Q?TAYoNlkjCytALiUQymsNsvvEJlbrG822+gvYQrFX3DVdGK9yZDoFaltcW4hI?= =?us-ascii?Q?dMQRbvgOjcGe3zNqK5QriX3/0R1iMuIip/MEt3xW1If3W0HolW2VhRmmk/dx?= =?us-ascii?Q?pFDTlQCzijg=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR02MB7159.namprd02.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(366016)(376014)(10070799003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?iNjOUi/0nvTrCNYVM1tJgvCc2t1MNgE/6/5bYO9ldGSabCycVpUPgxBZHn2M?= =?us-ascii?Q?IX3uJKA82DbdtiNoFI72YertJrnBTDNb0Jlmyol4Nn2f8qIcAqTSQfyclYld?= =?us-ascii?Q?A2MiwJGj+wQg9FidPWVvgnqa3VUhADkouDCuAplWXCr6GrfMzuT+zq+lj8EL?= =?us-ascii?Q?CgOGZYLy+/AC1aLMxWqgPK7+/5FTno0XFXOBwAhODbDr3O5HbcHpqd2+mnDM?= =?us-ascii?Q?vNbJZEBgHOQ0iwrnhVZuMYYAChJTi47U6mdLeIMA/VgDyzHDuq7pvHDbx1H8?= =?us-ascii?Q?4c+cZWwgdlTKNrm3dI0ziQnd/34fpLuuyMXEe9poXDOt7qo8nWyzxI6JFh45?= =?us-ascii?Q?jUtj0bvQBxRoAc2AyCXgFMmFf7Sxk8jDk2+5HONygA0KfH8bY4jO+12RCjWY?= =?us-ascii?Q?9OY7xg1MDRa/CUcDNmO4V7EITeNjoMOw26eChD9F+ANWUPYExU9hLOlpbsYX?= =?us-ascii?Q?GFzZPNQW+TaCigSMCB4qr0vjh03nrnIyitGhfMi0ErAvpnjaGZ/hsc3hhb1P?= =?us-ascii?Q?lICBsqTvePxsMEJVUssCt6gp4jIPP5CaLw83TguYxE8F+rNGM0wchSSMScao?= =?us-ascii?Q?XutkKKHmjkzGJHwM545YdsCOhaq/yv18tj/lfsd0Dw577ZGVQjny7aZiNCbj?= =?us-ascii?Q?zSiulIgzuVqfiyJoPWZTBm2cYPS8sGwsazOFXy3PgsXtNr6wXYewUB0P9zXW?= =?us-ascii?Q?/UoObcplwex+KmTXo/twJRtnfQqV45otivIbpJaB7l6f268CLClhbPtk90Jd?= =?us-ascii?Q?8mGf9uljLjT5wQgMVxzgDcwkDNz4Kbo7kFfszXcUIrGDhqzKoawVrrQPNUn1?= =?us-ascii?Q?/yA6xW46cG4yO4WCSKy5U+dPTJrmo06NY1pAHRWI2RyIm+hVaM+xbTa9AG9c?= =?us-ascii?Q?h1lOExCWtEzD22KrGcD3V9AdDy+sjSZ8oUfGC/qz93xhzEPUzdn2Qi8sZR+T?= =?us-ascii?Q?xb+1bq5actUqz7s8cQjFH9GT4TVI0A9n0imSlyAC4+QJrtxfVv6D03TvffaI?= =?us-ascii?Q?elZpKvXo8MtTyJLcTe03EbAA6WdUUybACMbuz2PkeVRljzj03SAP0yP5G2BD?= =?us-ascii?Q?/KgSMXKdwDAGNA5BQPCQiM7rW1a8JG5QsTozvhTh3+Gz7lNwfZ19Z5sChje8?= =?us-ascii?Q?7THNzVJOfn9VIDDJK3OIGndS9+61BjM46fUF+3GwmCsuIozUksd9fuQHXUOp?= =?us-ascii?Q?2jAxCxLqtAwBHvD9PeABmBcnAnc6GdNiTiUQ4ibbNtLV6k6b622JIfA2KgAc?= =?us-ascii?Q?6shUc0zjW4XjVe21qqoxmSkzVj+czHGm0tbW0Q/F0PGNh9YvPfnyiYSADfNt?= =?us-ascii?Q?Yhb4TkOTtYZpkinfQPIy7t+R8ICkPBWgRHHo6Gck6ha5oLCUcQgZWcXdXRN3?= =?us-ascii?Q?CoEKLnkupfPbhTm8qdnvfnFGuA9amBpp5JenJmCP1LuoKVYbj3FQbQ1AGUBs?= =?us-ascii?Q?zMXoJ5Nqj3C3CJdOQbQvNbLXaVDDB2Dck4oxwAgttHPTMS8ukTl3m2rzMHDH?= =?us-ascii?Q?WnAfnoK2QCp58KpX6eN8jOGDGGxFz7oZ5DCAp5B/3RI7Q7vYhJa6pq2/IRgP?= =?us-ascii?Q?A8apvWsvIs0x/wf6okgT0sPg7piyYQMEcz2S/MrkDyNdW5vDz6ILjbSCv+I7?= =?us-ascii?Q?rxJ0xpOUNyOm6b09Wc6j6Fq6RCVluY9CSPOp+7+l8HXEOn4+TxeELRiDmlY2?= =?us-ascii?Q?8QcH0A=3D=3D?= X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5ea772d4-f01c-465b-8e25-08ddae5b4c49 X-MS-Exchange-CrossTenant-AuthSource: PH0PR02MB7159.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jun 2025 11:28:50.2301 (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: cTR7ApVuT1ryNr9pG7OH5oJHZ/PSjOvFTjMqba95V470TZi0qyFLb1U63wtVwjRAblYNTmsZ9HYosEsHmZQrD8vqrArmY7oAIWzK+VuF1E4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR02MB9632 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjE4MDA5NyBTYWx0ZWRfX9DmaGlHBtCPH wVIrZbNxFvjn4SZOIMY8X5qv1YvTjXaOJdKT3Hz5f2j3/zJjHdbfQNzdXbgRC/veuGKP11kfLTc dRgdk5iK7uO8GX/WlpL0Y5VZ810Sh6mJ5+gO9Pa51YVeHyYzrtCn6kC2/TfeBNCAOMPUbgg6cv8 LGA4Pq+7jrJnMUWq2E9dVr6vZmr7VVKyiPgeVBpec0AicS1LWDCXRL0UckYQxrJEyUOy+LlHl5U Y8vRAhl5kIXJSVeTsvBq9Mijvsc5Sen9bm6SY1lzV7U+vTWlfzSmZ/0yf9zXcbt+848hx8HbfBQ 7TOJcRe4JQfgOiMfX+LDcW5rJkwuK12h3uKI0V0fD6JQyG5kSO6Jqd7dPnR2Kn52+edHDAf6Wsf YFPLOa71eQmMzvoSo5tlS1pGLxf5v5pE5hH3Xm0sWYBAObReFTEVptL9HiYVd36LuOl3uOQQ X-Proofpoint-ORIG-GUID: jDNs25VrK95MfKozURfowsamOHNaxTnD X-Proofpoint-GUID: jDNs25VrK95MfKozURfowsamOHNaxTnD X-Authority-Analysis: v=2.4 cv=LIxmQIW9 c=1 sm=1 tr=0 ts=6852a2f5 cx=c_pps a=3xgE4jxeEmi8nvdmdzTCVg==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=0kUYKlekyDsA:10 a=64Cc0HZtAAAA:8 a=XL6wrB0Zc_gxRR1ig4QA: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-06-18_04,2025-06-18_02,2025-03-28_01 X-Proofpoint-Spam-Reason: safe Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=148.163.151.68; envelope-from=mark.caveayland@nutanix.com; helo=mx0a-002c1b01.pphosted.com X-Spam_score_int: -46 X-Spam_score: -4.7 X-Spam_bar: ---- X-Spam_report: (-4.7 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.895, 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: 1750246186652116600 Content-Type: text/plain; charset="utf-8" NVDIMMs cannot be used by PCs from a pre-PCI era. Signed-off-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/i386/pc_piix.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index d4fb9787cb..640583e163 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -562,12 +562,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 14:11:20 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=1750246227; cv=pass; d=zohomail.com; s=zohoarc; b=IGgVnLxoJogN4m+FMiZXNnTlhx65v53WcVf3QIL3XcPHfwDpFKmr+vSSkPHNgTSrw5GFuKN5oiFV7EOlS6oAUqgbY49pUu1aKsdA8HNcytAKYoCkJ+sTA/mWBWEbS8DJt500sVtoU+L2cqmcd+MwQW0PcD7aizYkEk/4CB3YR8g= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750246227; 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=Fc8ol85F+iH/sZfCKX59n/ihC3eAawnTDNbFRvrZVnU=; b=jwP4T5WIS+sQ5vdIZxJgh39oqcaAaCeqCKAxWArhZu1niPDaFZyIxsatohU0ugO1Cr+ch8eTYvqUdx7Ta8I2yNxVG4sy7pMeHgPzTS3vhFpDpSbLg/PIT6/0CS1FRxtSI4eKgfmMMKvzDExQKnWX7nYd+kNneoWJcuy0M2gIF+s= 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 1750246227037931.4404385170449; Wed, 18 Jun 2025 04:30:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uRqyV-0001F0-Q4; Wed, 18 Jun 2025 07:29:03 -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 1uRqyU-0001Ef-Di for qemu-devel@nongnu.org; Wed, 18 Jun 2025 07:29:02 -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 1uRqyS-0002WO-Fq for qemu-devel@nongnu.org; Wed, 18 Jun 2025 07:29:02 -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 55I7t11K028395; Wed, 18 Jun 2025 04:28:57 -0700 Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10on2132.outbound.protection.outlook.com [40.107.92.132]) by mx0a-002c1b01.pphosted.com (PPS) with ESMTPS id 479508h346-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 18 Jun 2025 04:28:57 -0700 (PDT) Received: from PH0PR02MB7159.namprd02.prod.outlook.com (2603:10b6:510:16::8) by IA0PR02MB9632.namprd02.prod.outlook.com (2603:10b6:208:3de::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8857.20; Wed, 18 Jun 2025 11:28:54 +0000 Received: from PH0PR02MB7159.namprd02.prod.outlook.com ([fe80::6cf9:b35c:b143:bb88]) by PH0PR02MB7159.namprd02.prod.outlook.com ([fe80::6cf9:b35c:b143:bb88%3]) with mapi id 15.20.8835.027; Wed, 18 Jun 2025 11:28:54 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nutanix.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= proofpoint20171006; bh=Fc8ol85F+iH/sZfCKX59n/ihC3eAawnTDNbFRvrZV nU=; b=VX8NlCrcRJgCtZq5cVPk8LFcqR/IIpAjegCUp+5a7zryqI8pNHaGnxmid DxGXvMRb+J+jIxVwF+8nHCFG0/uHcSkQq2VJPnnLsjHY0JTkhwmmn6QUMNxeSrjK FtrtCr6vcjDG9yx2N1sIR9uh9eawSlT+WAleUycPgn4OdsGsKbGmkVl912Eyktcj pcjlO8OOqaFSBvDBMmfUHz6/vbf2oHcj8KZpcR0nvl9vCSN0iF+Y+72qGFeK+nVv 4bdjVjXRYLZX5vLbZ2Z44ZwTHDxgrYrx0x/J+danzZUzBq2Ib/72qmc4ZXW80fCb g211LOh3RLSYMbUEBivyNsKaPM16Q== ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=YzDMY07SlD63hR/qs9Z0Kb0sse3RHnxw5/JH+r9BE3UWtf15/qNLEy23xECbqwSHmeXJ49XYW9E5hEG7WC4u2aKYPd0K1yd5dqVMVRGq0Iru2NX9oecXl+xF5WTvjvyE8ZvH34PEKVpAhMJtu/FAG8E4/ScG597+Qu+KgkcLyC6E4EPcVfidezXSguSZ9WaISH2j9k1SWp9YkMXQejyiKzkMndp5JnYDG1ndReN7KMM/TqoxA1oMP00nDi3wUJyipHiFXrpskStNJ3K+nr5wbuTVk8zBmMNvT98cnCn5cAtYhH9HZ75kHm4LpjnjXw53GDa5gWGQ9MgJaleQ64/jhg== 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=Fc8ol85F+iH/sZfCKX59n/ihC3eAawnTDNbFRvrZVnU=; b=r8aM1V3UnZScfvTX89ChAqZXsPq8nbFNIQvTtJmvLJqGE9eO1s+UJJ0rSlESJg2vI12/DLbGIRMceNEd8BeGNnpAiAPk+W7bU5k0Y+9Fi/1XwP1pKb1X1OIExHoShaAPeOEV6v41QM2MEWByPZIzsRpYZwM5JA4l439Fpj3YwDBFG8HcfQySjLH/mJUOJ3qh2WwUuPko6VeaxIcm4ngMkgmrLHX58w6lUQm9+MuoQQSXn4xD8fCpBHAg5nXcE5wBiPw/dn4zvjYNRTxCj8RFYNWDBD3P8aPG3Yg0GkEcotZAyhlQNC+9yEDpZ+tk8lygwInwIaEaQOsW5EqVsf0rHg== 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=Fc8ol85F+iH/sZfCKX59n/ihC3eAawnTDNbFRvrZVnU=; b=DmHO5jvjqhweqgjr+v3CJvds4OwOtZ8ET4M4+mBUsDgA98nXfzd6QY2UUkOUy+VGsLUjCagCb4awKB7HczWtqQJXeDd/I9zXeg56CPpy4ZiSpMOszKgTBPGCa+epHy0009ZlJ0ZRSut6g+5Rup1eQAA8XJ4Zk1kZ9s9BMPa55HcWFWaPFfoQadN9QK4fw4Gbpc+z361CwazUare87/LMs29G72j0RvpZM/PYfqF+AGjOk1g1+BYgl2JJBCuM+X51qjUoHtpWVKCAPATK4BpwpqnxZhg/++DKCRDIwh5HUDp47OwDA1LOUgkZeBN9mlmsUc1uaddmHtQ+A8XCfq7qvg== 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 v2 06/12] hw/i386/pc_piix.c: simplify RAM size logic in pc_init_isa() Date: Wed, 18 Jun 2025 12:27:11 +0100 Message-ID: <20250618112828.235087-7-mark.caveayland@nutanix.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250618112828.235087-1-mark.caveayland@nutanix.com> References: <20250618112828.235087-1-mark.caveayland@nutanix.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS4P192CA0046.EURP192.PROD.OUTLOOK.COM (2603:10a6:20b:658::26) To PH0PR02MB7159.namprd02.prod.outlook.com (2603:10b6:510:16::8) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR02MB7159:EE_|IA0PR02MB9632:EE_ X-MS-Office365-Filtering-Correlation-Id: d72ca80c-7944-4dae-b435-08ddae5b4e8d x-proofpoint-crosstenant: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|366016|376014|10070799003; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?AZjbinRzX926Jzd4IiOEFY/RnuoHiM5JwTSmljE0vKV6ACoWLZE//CubONKi?= =?us-ascii?Q?2DTTvoIghNCv8y5/uSwFwndulSHNn21D2zvEfD77iJRiQlmY5l8yeFWybumV?= =?us-ascii?Q?p36wYeN9gw0X3j8JFmmphcC9oa5CuT7J2M4NpDBUA2HxrneAIuY+pc9Mf6B7?= =?us-ascii?Q?86YxOi3QH1UwXB9U7JMnB+IdIvTroB2kDKIQXboiWiT2PqxUhoj6sqU5mgnQ?= =?us-ascii?Q?aQRWxzBTi/S+PnQrRB2IOlt8VTR8Pht3HHXoZmK1YnHvglzhuGreajePU0Hm?= =?us-ascii?Q?7snOdSdOZkd+QUTdBC50f3oiRHsW/60fsh/JBqbBhXfHUAE3V6sTD41UThrU?= =?us-ascii?Q?EA6wuY1fjh6YUVbdcSDkMLv+WdmmfbgfrxZ263nyPxhnlkyXWLjEJb04wgJt?= =?us-ascii?Q?fcKJF+hCKgu8HjnUyufZlB8eq1fq0c7v5nwM2AlDp37WFEcEh9KRRcfykRyR?= =?us-ascii?Q?jUYogyPJWvOtZCG5QPoLYny0qzE9Y68wpciLXPU0SzoDzjkbXlJa+vKDXQIP?= =?us-ascii?Q?ts+M/I9HVDTeztPMv2bik02pment6KV6k/XMtp/BeUwCPjsOkd24unp43FFN?= =?us-ascii?Q?gKDmhJ0R0fFek7ILPPnIlO18neioATuEkb+ikZhyHRSjtga0zOC2d7U0pNrt?= =?us-ascii?Q?Ex6uYNw8mo7vxLcG/oqI9iBwrcdlnd38lVw/7sVAluyYNAN47iJ31CIhAF/d?= =?us-ascii?Q?yf18CWKnHFmJ5fQ5byHhgyBbmvnz9pGapMWBTcgetuokTi4bM+eiqeEN94Rf?= =?us-ascii?Q?rYcqC1d602TreNS+u+gLkH0JX7fo5yXd57lyLfPWo/UwcRxcApR+ee/uBV0c?= =?us-ascii?Q?/Mi3t58Do+Ea3PJBoa9LukOPwnB5SPQE2h4sanYw7x4rSTvGE7pnQ5BB94Kj?= =?us-ascii?Q?qAtV+8TCTX+X9w1RNr7n0uyXVBMCuh++hVOUavY3z376hD4L5J4gHrOiDZsZ?= =?us-ascii?Q?ro2cXFBVyhPSAiVjLtRD6S56S/HSpbEdPSsr68SSRD4Nq+lokSa7tEVhXhzu?= =?us-ascii?Q?huUUwnwmOqs6rZmFvueqI+3L+BczJKlSTmr836g1hxM0Y4QjeY+60nTBx8zo?= =?us-ascii?Q?wvgohjAzSM/EjZFs+Ib6T0jTe8EtywTcQy0YW9If6wyWfMgsjevGyr8P4o/T?= =?us-ascii?Q?wxdEALAkMDB8t4hKF7ssR3wzboAZxiiwJw8IMrNNV0bbp7nqFfJKjVkroFfP?= =?us-ascii?Q?/OLbzaaTZuooYDIfK4MgldHfgStssGva132lf/dkcf8W7Ogc/xW3UZdneYOV?= =?us-ascii?Q?SnnjgyImJI9ld1BVZFTMcQURa+4UB8Iqgt7agc9X1IujHnvK1W07QWhW4T8c?= =?us-ascii?Q?Z0IyvWV3cpKxX4OyQLnhjGZfhiLQSQ5FKLq7uBbXBNMF6PS5sMJHTGgzNT+d?= =?us-ascii?Q?DYzt7qumwWd7bWY00Yo+Aa8qDJDgJydRdJrvteiKAlDIRzqFgegtrQUcCmbf?= =?us-ascii?Q?87V81O7UmjY=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR02MB7159.namprd02.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(366016)(376014)(10070799003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?VUKnhOWJxazLvNTOTTkksFeEuRioxujbBTvoa1xePkuxiInHTqhpoFtB1gh0?= =?us-ascii?Q?6nsIbQ+osumPsBLlDlP4JUZt6C7PwebutvD1G4ESRdzOIinquLkZmKdZLE0I?= =?us-ascii?Q?K4UNZrXR2nYm92I9+i/qTQ3oppjoEAaYgVCRlRv6iLaK71Bg9FH6m3P+lsCa?= =?us-ascii?Q?yjzeeGrnaPTdg16dSQPilKfjgHTzHVDZ3XqzWW58MB5IKfqi5DUBrosq1qy+?= =?us-ascii?Q?4xJA+0QCHWj0i/PFoHr0TXZcmkvieXbzAcmcYHUFhZxgPJEKLJwu4ywwOtP/?= =?us-ascii?Q?5iwM7MzVEWAZqXv7wwchkOcu+kHRhIsufbrafGR61thYaQYlIA91otj8Y55m?= =?us-ascii?Q?ttSjDkpreiDXasPsWJRFvmhUnPfO2vxzVM+zImYuOrhhfZXypDuAKtqBGBcF?= =?us-ascii?Q?8wV3VbJgACqkVovJ2SKzcfDkIKa09Ixr4H7OvL5y6TMWLDm8f6+gBjVmfRxZ?= =?us-ascii?Q?3jbM1iDIIKj8u+b93wA3km0w/feqtLcd4eGjuozm0ueQLsVSETJIH+1lc4zt?= =?us-ascii?Q?4TcphJPgPgCzMllx0fMOa/VzfIc+EIrLjuR4kE0nLLdfGbnjkw/8CFh+tMR8?= =?us-ascii?Q?gLBRWU/dSPBJFI8ogVq+8ey3Si/spl74DNe28WOkfuAl60rGEM3474Re/o+6?= =?us-ascii?Q?u5KfoIDFultBRGoru6rLnpoviwQDuorKHv4PH4DRHt8WSLVtOJKXF7nGEkPO?= =?us-ascii?Q?HcbbexYURR6Imvwz+eRRiOOriKLeBX51ow4WE9Bte91/AzOuP/TwtZCtK9UU?= =?us-ascii?Q?5msM2ZENRl6/x2Phv2oX4v6ZECC1sb8yu6JCLZR9yDG23FgvMtNnELZKXeHh?= =?us-ascii?Q?/z6bOuiPKmZT6wRRNyb1CIaogXwvFW3MQN1Bo4zkkaC0RlYepOMVIzFYKRPE?= =?us-ascii?Q?RDNxKtG+7YI4ukn0FePG+SOTCmS39tBLvIJom64XBKBoYpTWrztknAbvF53y?= =?us-ascii?Q?d/3M8cb6K7XEGNg+aV2Q1oQIbK1W/1OVCFPWxn/zEVny2Fb9pM1jCSEVbVug?= =?us-ascii?Q?bEcCbDqGCUjJZd05pWDrvQaTU+HUxWKQowv7cxa7xp+ai2/m/lwjr6ll5Iyx?= =?us-ascii?Q?hGotqkuiP7qguNPhR/DljK4RK5OmzthiUKEF6bwhlC8qpr2QBDtkd8T6Eqc7?= =?us-ascii?Q?ATnxSp6gliSPKZs9fjQ2RVqaw7VO8gGWbA5MIF+PmUjEEnfVWRBGM36dUsZy?= =?us-ascii?Q?77N741smihqtEkJeAHekyDwPJKufHfnBStZ8+p+pD1+ahwIVqoENEHtxXsMP?= =?us-ascii?Q?lV/WfkWLDm5ZegHCuP3E7CUDc0OmtQr9u/Vl32+DIYpNX1Yd9BbSPFh895Mi?= =?us-ascii?Q?LBFVKjrl3AV1lfPRs9TrOm8nvxGhTU1eayADnN9LPZ/w/z/zEZNFA1k/UrtL?= =?us-ascii?Q?RvjEFYiUtZoWcoFEGxTuzQ5Ghipzi3vxymKtC1ZSBGI8tIn7l/77zXULjroJ?= =?us-ascii?Q?Vjm0SLz5SOr+s9Q/ulC9o++N6aO4miHHIyHmf1K+BiOOvZ6+SWT9MTHEiO0d?= =?us-ascii?Q?zYoqLEO/MpyL8iq1bwYC2r3Q/XAo2SMcBCwsGv0+tRxKmhSOVpwBGPSEHteK?= =?us-ascii?Q?CRYLd6KSmv8G6Zuu9ETJ7FCkZgYlyLF73Dco7CezNT28nz9VVvWWvtIb/sZT?= =?us-ascii?Q?VVOsp0QRsKGd+niexncU3K6u/Dd51OhAVwL7Yp6eedc+F8MT+FAvRstC0ZAO?= =?us-ascii?Q?F9bT4Q=3D=3D?= X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: d72ca80c-7944-4dae-b435-08ddae5b4e8d X-MS-Exchange-CrossTenant-AuthSource: PH0PR02MB7159.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jun 2025 11:28:54.2194 (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: U58/Yyd2w+c5u+qfyM7KPcpCrC+ICAeH03cIIu/QjR2PEI2t85ztvvtpsbqU6kfKT1rXvhRan7XJ5C+w3XA0WXZzkUBv3ZdU3ahdDMjW77E= X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR02MB9632 X-Authority-Analysis: v=2.4 cv=HaIUTjE8 c=1 sm=1 tr=0 ts=6852a2f9 cx=c_pps a=ne5f6Wayux1SoovUbtzCnw==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=0kUYKlekyDsA:10 a=64Cc0HZtAAAA:8 a=puX-rZ3iWx3qy-NnaecA:9 X-Proofpoint-GUID: VWgTGaUA8GkFFE-HJPuBqzI5KZwjeJo6 X-Proofpoint-ORIG-GUID: VWgTGaUA8GkFFE-HJPuBqzI5KZwjeJo6 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjE4MDA5NyBTYWx0ZWRfXxtA7nETgaMSS XH5tEEonL+zPPxmjoV/ydiFmhq8e1cOYQqv8b6B53BMz7paRB4FTPNGIgXc6mO4z1gbDEgpmLn2 Eui6aRPD0bDEKTghFCmeUCMJzq69XX8qAO+/sLCsMmbKmAh2929wiqjrj5nacKwmo51NvK9KJKg j7j4lqgM63zSicyRkP659CxnSyz2DClpZZSzPMPwGEQu8U/Y5DFXHagySEhoqztFKruD0Cdsu4W HKw3Lc8+k6a0gvcW/6vtFKQ4QHhUBkd2IjSaUpgaR03Bc2XcocM1YNL/KWvSnBtoPKWoJm3E8Om rHoNldpaRrV3olwMJpYdlzMsZnCTgMq5ekXOeQuCtthwlo6t+Q4odzu+SVtRvE1LoqaY4smlX8V uVWIqTEu5wzAC3BmnpVpqTWzSLORNVWBk/PgQO6zvV28C9/rmbepIGp3+GbGPUiOyxVO4vAB 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-06-18_04,2025-06-18_02,2025-03-28_01 X-Proofpoint-Spam-Reason: safe Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=148.163.151.68; envelope-from=mark.caveayland@nutanix.com; helo=mx0a-002c1b01.pphosted.com X-Spam_score_int: -46 X-Spam_score: -4.7 X-Spam_bar: ---- X-Spam_report: (-4.7 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.895, 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: 1750246229394116600 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 640583e163..168469457e 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -427,69 +427,19 @@ static void pc_init_isa(MachineState *machine) GSIState *gsi_state; MemoryRegion *ram_memory; MemoryRegion *rom_memory =3D system_memory; - ram_addr_t lowmem; uint64_t hole64_size =3D 0; =20 /* - * Calculate ram split, for memory below and above 4G. It's a bit - * complicated for backward compatibility reasons ... - * - * - Traditional split is 3.5G (lowmem =3D 0xe0000000). This is the - * default value for max_ram_below_4g now. - * - * - Then, to gigabyte align the memory, we move the split to 3G - * (lowmem =3D 0xc0000000). But only in case we have to split in - * the first place, i.e. ram_size is larger than (traditional) - * lowmem. And for new machine types (gigabyte_align =3D true) - * only, for live migration compatibility reasons. - * - * - Next the max-ram-below-4g option was added, which allowed to - * reduce lowmem to a smaller value, to allow a larger PCI I/O - * window below 4G. qemu doesn't enforce gigabyte alignment here, - * but prints a warning. - * - * - Finally max-ram-below-4g got updated to also allow raising lowme= m, - * so legacy non-PAE guests can get as much memory as possible in - * the 32bit address space below 4G. - * - * - Note that Xen has its own ram setup code in xen_ram_init(), - * called via xen_hvm_init_pc(). - * - * Examples: - * qemu -M pc-1.7 -m 4G (old default) -> 3584M low, 512M high - * qemu -M pc -m 4G (new default) -> 3072M low, 1024M high - * qemu -M pc,max-ram-below-4g=3D2G -m 4G -> 2048M low, 2048M h= igh - * qemu -M pc,max-ram-below-4g=3D4G -m 3968M -> 3968M low (=3D4G-1= 28M) + * There is no RAM split for the isapc machine */ if (xen_enabled()) { xen_hvm_init_pc(pcms, &ram_memory); } else { ram_memory =3D machine->ram; - if (!pcms->max_ram_below_4g) { - pcms->max_ram_below_4g =3D 0xe0000000; /* default: 3.5G */ - } - lowmem =3D pcms->max_ram_below_4g; - if (machine->ram_size >=3D pcms->max_ram_below_4g) { - if (pcmc->gigabyte_align) { - if (lowmem > 0xc0000000) { - lowmem =3D 0xc0000000; - } - if (lowmem & (1 * GiB - 1)) { - warn_report("Large machine and max_ram_below_4g " - "(%" PRIu64 ") not a multiple of 1G; " - "possible bad performance.", - pcms->max_ram_below_4g); - } - } - } =20 - if (machine->ram_size >=3D lowmem) { - x86ms->above_4g_mem_size =3D machine->ram_size - lowmem; - x86ms->below_4g_mem_size =3D lowmem; - } else { - x86ms->above_4g_mem_size =3D 0; - x86ms->below_4g_mem_size =3D machine->ram_size; - } + pcms->max_ram_below_4g =3D 0xe0000000; /* default: 3.5G */ + x86ms->above_4g_mem_size =3D 0; + x86ms->below_4g_mem_size =3D machine->ram_size; } =20 x86_cpus_init(x86ms, pcmc->default_cpu_version); --=20 2.43.0 From nobody Sat Nov 15 14:11:20 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=1750246254; cv=pass; d=zohomail.com; s=zohoarc; b=l5CyssbqLKDJOagcX2Zzw70ZRcL3LvSoz+iuJQuPQyUOxWvZzjpgsgqDhgbCt58LcIA5lwuCuYeQ7jQ5FUV2DVSyNH/395qUOs8ttaxKU8xdpPekU4ESer6ZsJ6goAmwGKTPBFhpIzx+A31ISW7vLAqn6HA60GFBXmFNzmXtJkA= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750246254; 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=UnUz9vkn5v/ojD/ecEjKdXlYLJCOuFr1pSR+VvzboBQ=; b=KlfmfyoGAOQQ057aWSKvxnuf59vQagOfgsDdjlHZ1ZwcINYRV7YpGpTAaPN2H0a3ymVim5B9+DFiYqDIlXO3MkgSToRfdr2LeMc7Czr/u7fNW3oBhuCBAkvrtClwIyCjdMXO5VfZpO1wlIGsQKKpJkRK3zvog4OKgHJbkdMRrFI= 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 17502462543861004.4636224836458; Wed, 18 Jun 2025 04:30:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uRqya-0001GB-FY; Wed, 18 Jun 2025 07:29:08 -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 1uRqyY-0001Fz-Py for qemu-devel@nongnu.org; Wed, 18 Jun 2025 07:29:06 -0400 Received: from mx0a-002c1b01.pphosted.com ([148.163.151.68]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uRqyW-0002X2-VG for qemu-devel@nongnu.org; Wed, 18 Jun 2025 07:29:06 -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 55I7pYx6002539; Wed, 18 Jun 2025 04:29:02 -0700 Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10on2114.outbound.protection.outlook.com [40.107.92.114]) by mx0a-002c1b01.pphosted.com (PPS) with ESMTPS id 47b63wb6c8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 18 Jun 2025 04:29:01 -0700 (PDT) Received: from PH0PR02MB7159.namprd02.prod.outlook.com (2603:10b6:510:16::8) by IA0PR02MB9632.namprd02.prod.outlook.com (2603:10b6:208:3de::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8857.20; Wed, 18 Jun 2025 11:28:57 +0000 Received: from PH0PR02MB7159.namprd02.prod.outlook.com ([fe80::6cf9:b35c:b143:bb88]) by PH0PR02MB7159.namprd02.prod.outlook.com ([fe80::6cf9:b35c:b143:bb88%3]) with mapi id 15.20.8835.027; Wed, 18 Jun 2025 11:28:57 +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=UnUz9vkn5v/ojD/ecEjKdXlYLJCOuFr1pSR+Vvzbo BQ=; b=nt2YsBb2kk+GgbNLtWK9PNDAS4S2AF9l3los7V5ZtxS9fJOmEJRPTICYb p1WE5O/Kg0SPFWZ3EqbllXG8p7cgCJs6Igu2NTdmEkJonjtsARUopwEFU81kxwd6 +PWIWf2u60K1tmwQ/c4OrF2ytV6tQP+er1h7PNM1mD7FUSBvPrzXWT3HrEN6peDB UM1IrZcBIIpJywfw5osmVju6qKr5+YFMGunfjIJezXk3XUuuUmTXF1QnrBikuOTi lMUZdDBLzN+5xoyorSNN40u325KaCPPY0TrzT/pcAeCkRiDs4ok89WCmO+RHjlyy RHVC4UX+jVeBRID1SdeLKCOObQG6w== ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=CQr5IXmApUuxg21HllrSLhfr2L+2jBH6ERwK7L6H1T6InGDUbTW47PGr4snxi8naGPjVlDZ76DwegInrts+jh/1DFR8KGcVlCYrwPYFGllCDjVqGjgNfwVsAqep3LTWAn5lySts0bzTXdQK838NGsIJEakQKDosTI6WXmJU2DU7xtZnNza+3A+s7zG5D7ZypUF4DrU0RWsBSYX9hzUeQ2o/ZBOIYFAcUTTCHGbRAJJIWsJhdY3f48n9mXAISc3A4zsxwVsTjH/WeoOotaDfCK/yEsf3kgJf4Ul0QxUH+P3L9BtCmRNjq/nxhJR4RBn+o3gEn3EY1MIAnlIF5OANn9A== 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=UnUz9vkn5v/ojD/ecEjKdXlYLJCOuFr1pSR+VvzboBQ=; b=ULjqIeOiIo8xfjuJ+pwojzPFwsrNcX5JhmpgmXBJA45KBTwOdzTub7ZGbyYJHI+fL4JJqZTwmC9jK+pWySG8LDlFTsqv0W4XwlIp5pzD5sqQTEKgQBJKKM4kzmRDIHEmEKgybBmUbxoS80BJGDMCN9snIq13Qr/KXI9mErmZ23cHsfv6GUFNKnHYeF+f8RPOpcKYazUxnIXBosap3pGafRBWMczWJMbSbSRnCTo8hXQyQOieQYA//hQ5/nqB4+NaQMr9V43mFj00uCCaTKQTQMnJnR6ul81byBLJRxKosmJSl2HVhlyG0toSuvxEpAGVIj65ZvBpfLqwHlwVwY7S7A== 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=UnUz9vkn5v/ojD/ecEjKdXlYLJCOuFr1pSR+VvzboBQ=; b=Jemz+XMgAPNO4gpyLZ7kRuSRohkSZp9eb3poe1GetCe/JWzPcEFxkGU2X4hqJTaNnC2qkcpp98zKcqfIsAt9LRAQnRtP9djoPHXMmGE9E7dW203YvengBVEDRTzUa35Ui1SK3AVmPo5pLWHDFiS3LL1y7kb3q7mP8fN2eVw7nN/83FstlvtIRfKUsdCWehdqL2T0DgDscP8q79S8V2oYzB5TC2twQrBK+9VLGsE5sK7pSsz/iwwNNBfzOCHm9Fjro/KHf4k/h5YSSkREt4N37U6PlAQI1F/dSNcuan4wzt2WZMd+XFVv3xZvXpdfLIyJ4uyJ9M3qVmxBOBrPIgGUCg== 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 v2 07/12] hw/i386/pc_piix.c: hardcode hole64_size to 0 in pc_init_isa() Date: Wed, 18 Jun 2025 12:27:12 +0100 Message-ID: <20250618112828.235087-8-mark.caveayland@nutanix.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250618112828.235087-1-mark.caveayland@nutanix.com> References: <20250618112828.235087-1-mark.caveayland@nutanix.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM9P193CA0017.EURP193.PROD.OUTLOOK.COM (2603:10a6:20b:21e::22) To PH0PR02MB7159.namprd02.prod.outlook.com (2603:10b6:510:16::8) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR02MB7159:EE_|IA0PR02MB9632:EE_ X-MS-Office365-Filtering-Correlation-Id: a00621c4-2033-4127-41e3-08ddae5b508b x-proofpoint-crosstenant: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|366016|376014|10070799003; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?MUm68OzDx9WEjVYMZcwStlI1Qn3btvknjIxcm6IctqvsyjIaUGryHd7tV5NC?= =?us-ascii?Q?oWpsjQUUJj7uGUgACZaBxClbXQANOZ3iEPMtf7jhwbGVd4g5ZCWKmxm3Ku/k?= =?us-ascii?Q?oliUotW6s6fgMeXOiNOC40vSUGeSyk2AQEAS8cxXrF5yd8Zkx6TkWYJjg5kR?= =?us-ascii?Q?zdNdigdJy7dNxU2QBA4fYOow0n1ETWCZTQB2t3S5i9wUu4bt1rsUU94Vtr9y?= =?us-ascii?Q?VFjYM/GpA3ZS2LBIQlYUfsU+2BilT+BnMvq2WMnR3CxYq4WBJJ8QqjhIkKar?= =?us-ascii?Q?0RCTClStZOWp3nazibsXLs79fZ/w8m9dBxtyWAJBWOto6E5NnRFHjnMkqXvu?= =?us-ascii?Q?fPArzkubWsFXqEtmZ/4O3o1yIqjZVm3AK5Ubb8AD2VZLKgvGbCp3e82AGN6B?= =?us-ascii?Q?6F1KlHX906c+mOO0BkENviBDqUknClbHHZ4msf2kNKvlqqYt3idLsdf1Vofw?= =?us-ascii?Q?WsU45JrvLgfOlvpyyLKPdMZsFee/lrpcXjSFw173jB9blz/B7G9wd+TeIfTr?= =?us-ascii?Q?wHNZCHnGriAtgWjEXwTdz2LINVuZG4b5iU80c8LRw7MsETi6sdLKp2WqAYWg?= =?us-ascii?Q?lLfR7uSD0ykCW7C3IJjEvgWPU/yeEajMBFhoGJ5j5a1PPa29pypxYzurh+21?= =?us-ascii?Q?SE4P7fE/K16DUUhzeukWqDI7u7EHXOadXlrPfbv1auoVKd4wclXyd9n4Dt22?= =?us-ascii?Q?4hiSHOofNFXG16tI18qnRT8ITjDifMT/NJjWiB02mKtNWp2sPIt8ZbrNm/AK?= =?us-ascii?Q?enPio3P613AoCLwbfSjudmkZgXhuNsQJ0vkY2OPzOHK6A4NdC7XvVoRavNeR?= =?us-ascii?Q?8qukn4GgFIRuCIaQDbraanvOSqJF6fR6TKtc4QuC8FyPRr3dduD9lIFKhSPx?= =?us-ascii?Q?AYQ1eW2WIY/dHEmUNTfyvOD4CL4P8qbx9NBFivBe1m7ISEshmok+ecCEPw+Q?= =?us-ascii?Q?bWzGW/6/kNkftU1F0Nd2wB9uYPrTks1vlPo/sX7lwhrCQFTSTWFvdPgPqbga?= =?us-ascii?Q?22rjVPSmoFevfx7Zq7r9GjKLwsvwo7G7vvXWtVy4uWd9D8k3l+Vhs2BHck3/?= =?us-ascii?Q?efMlpLX8DQ8dsj7k5bE8Kh/Vv0NKxGrUbx3UD+gVY56e8f/1CfhQWZZcdltP?= =?us-ascii?Q?EZx/28E7aLMKDIPcNfkjYAuWmWH72BqJi4z1V3cOCSogDIxEfGxXp6dLBvRu?= =?us-ascii?Q?94n5KRmwFXaAYcuLL+qm+Ws57geaNApj2Z/hdMDix6LiXt6BigTzSnlqFvp4?= =?us-ascii?Q?sETAjCuCe07873oNPKwup11+5ARGBA/EPUQAw3Bekh5NK/xgBs375tV0Uvg0?= =?us-ascii?Q?Efpt3qZgyEkfNvfxqZUw7uV3JO3cOD1C0BePiL9mo54TzUkoIVr/8c/BbmXO?= =?us-ascii?Q?ARZXDtloA+UOruwi2/pP2vNpvLBNj+ZPIhO9T7Mr6l0lNmtvkA=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR02MB7159.namprd02.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(366016)(376014)(10070799003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Ll9jXXDkMUe4oMJUtgJI1rFdOfdyK9oUJWcuqxTwwYCkJWbu81Vb1wmlfX/V?= =?us-ascii?Q?dM29grgZZMKcKaaTr1MfYtwBi4bzQB170tKzUTGpm3VAAvgfifBqgkkePtZk?= =?us-ascii?Q?wHaG6JT+i679a/pmiWb+Kap7b/aXV/cfYzH2Cp3taJVpkHI6FIwUKfu4Jpd/?= =?us-ascii?Q?q+vxc2aQUhM+EDLiU916Ip+V5dckcfRJzYPqI1uVN/DPYCMihAbNzLU/u0Wq?= =?us-ascii?Q?ETOuGHnMCFt4R5kP6STYQYqzNS6BGB9baLO6ORZD5i3I7ZRCwPYSBTTJ0FBT?= =?us-ascii?Q?a0i1N6Ih88ExrqL4DfJ9oGYOvEeUMarHYsPKf2hDECrJjoeawx/k0tRFVhwc?= =?us-ascii?Q?nzp6tew1b0crLkQBEIr6VIovGNTov/sPHsgUi3SPEnui5I1i7MaBHRhEeyvY?= =?us-ascii?Q?+v6bXoPczcja7LPlDMduNtCrHyy69zOWyPg4BjChxCzPyOKdlUxbzj8oDov8?= =?us-ascii?Q?VHLqKesvTONDyLzqj3WF+MBrOu139+J5XVjX2naKhz61Xa8KBKBsPC4q1y97?= =?us-ascii?Q?xSWbvfaF76nAe40Zb/5QYTQMTAZeJas8aVohn1aHWiZ5NW0vgRupNOJBmxX3?= =?us-ascii?Q?kyVL7hDiUruiGDMdI4FsY3W8QG5Gv3rJ6wxp/d4aUR/L4SOG9lveYcGOacaQ?= =?us-ascii?Q?hqgvKW3WZrdYNRpWyVBXk0nhDBhdi3LYUAPk8yPj+h3WRpCrFDDSl6Y6iI9w?= =?us-ascii?Q?HKTQQ+BOboBeGm80kP0/tIQVJHFNpCT20gIQoQnUfdehzMxLsageg64IQayv?= =?us-ascii?Q?IRbdQ2kKbMrcCzyAeaPc/N7KJj9mfUZgDIA7ijEkCjEexD6K/8R3ORjXdbI8?= =?us-ascii?Q?d4abSoBbe81UiGFPF/OPhlby6lPEFSxI03mJ6N3sOPFNYGoeXkUwW1CE7KYg?= =?us-ascii?Q?KUNvsOSgDA5DfwYNIJE5T53j+X/CqMyqL8YkRqAS+vYYgJPPFmxioETcNe6/?= =?us-ascii?Q?6vK0eu9XaAdPV64y+De1kV0I2+dMDyHXYY1WzzGblA+gYJgly40WOMof/F85?= =?us-ascii?Q?3riEoCv1z1hMSARAxcJLMV08tjtawWzF43k9u+xjLcus4CgHu5kwazXvTinc?= =?us-ascii?Q?g7mu/4IxDgsAFZE8ib311GsX/BFbl/46jI+qFAjo+Xy38MPrWUJVA6YRc2xG?= =?us-ascii?Q?apMZEAfKU3El5IhJDqCAEdZsgABvaar+JXAf7Th6M0d+yvSpI03x6sL3h0Jt?= =?us-ascii?Q?8RkZig5sbdO2qv7wyX33qgXEVeW3oFLTeNgxddhHhjNTNJy2FUyx3zDYMBk+?= =?us-ascii?Q?1V/KFEi9Y/d4/TK1te+WwAeD60hGxkKXkaXgo3cjOC7l8Qln6EyZx6utnZ0b?= =?us-ascii?Q?ZhKBKk7pYfd7WEl2QknDWzlt7uOO66MgyslOPGTF01WUMl7mnGuaO1IDkiKi?= =?us-ascii?Q?NGvf51xz2VdtLtuNrl0MZuA+AbC/bFXsrmeQE8A/gZyaJtcAvUyrgUd6U65P?= =?us-ascii?Q?HgHdqCgSuYR4jDxFVleT2YySdt3k4ZJuH6dyxtfsPPwP3/VOYk9XfBMmRlJx?= =?us-ascii?Q?M6F4KetbsOsoDv8O8BkK8OYIGxb9Owu2yqFhBafiP9p4hp8cOHX5eMuwYxL+?= =?us-ascii?Q?RgJITxOQvQGgZwoJO9vY+tZUK3FGsrXNzTvp1SjpqM7I0Nq+vOuyeXGUweTI?= =?us-ascii?Q?QlhEvDpZTlghOi50e1Y2m5mjux2lhgCxCL8wEIAo7k/1Ay6MoQa1aGrB1Xry?= =?us-ascii?Q?KBBUeQ=3D=3D?= X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: a00621c4-2033-4127-41e3-08ddae5b508b X-MS-Exchange-CrossTenant-AuthSource: PH0PR02MB7159.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jun 2025 11:28:57.5233 (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: il9ANEG0LsDyXKX92mjk1ViDEaS9IXkrrUW5ZPaicEMWMJeHnVlPAek/hhqnSfMelGoS6RSC1GNZy5UxaJChP+EX/sOdP7EVMA5ULZ9WODI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR02MB9632 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjE4MDA5NyBTYWx0ZWRfX90TqAj7Cnm4U EKZj4lCtGjTlg3AHEm1ws75I/oafN5nQmKzn89LFdhhb4NUs4sAmAtNe2aD2QiDPYIcCc9T/XHj +itHZO1u3PFJpAf+YCLOuXtNxr0gGvN06rf5EMSmVBNo58FSUIq3q1finclbk4q++dtBTfCSW9X F98Na5bFBvlIe3Senx7bbV4PNVv5oa7zRqdjM5BPAL7/aKOgOHE/SBbnUOiMgdmr+ENJq3iOvoo CyL1dz1rFCLkqiXtlTSZ9QrbVJ//qXSr+40mRQWrf6H29DgBS3+8TLIEEOmKILbZ89iqmymZbK1 GL7SSnEufNBKfTaGJkNHr3aYWRoBBTL1be9rVB05N/1CL//w3ItXhlFpYXdRN+3JsYuO4+XobFm IDLAIC/oiqGpm48KKzghCDaN4j5biXNxH1dpbfFh4tRGnwyS5a+ojH3oJophosyUsOS8C4sE X-Authority-Analysis: v=2.4 cv=EurSrTcA c=1 sm=1 tr=0 ts=6852a2fd cx=c_pps a=1agHWDAk2Ff3ek/eqE8klw==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=0kUYKlekyDsA:10 a=64Cc0HZtAAAA:8 a=cJTHVYagl2foYDAtDiYA:9 X-Proofpoint-GUID: WJ1MvtJhoVXULVUNO_AtiWPf3lJpoW8n X-Proofpoint-ORIG-GUID: WJ1MvtJhoVXULVUNO_AtiWPf3lJpoW8n 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-06-18_04,2025-06-18_02,2025-03-28_01 X-Proofpoint-Spam-Reason: safe Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=148.163.151.68; envelope-from=mark.caveayland@nutanix.com; helo=mx0a-002c1b01.pphosted.com X-Spam_score_int: -46 X-Spam_score: -4.7 X-Spam_bar: ---- X-Spam_report: (-4.7 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.895, 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: 1750246255627116600 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/i386/pc_piix.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 168469457e..cd9a89f7ff 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -427,7 +427,6 @@ static void pc_init_isa(MachineState *machine) GSIState *gsi_state; MemoryRegion *ram_memory; MemoryRegion *rom_memory =3D system_memory; - uint64_t hole64_size =3D 0; =20 /* * There is no RAM split for the isapc machine @@ -450,7 +449,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 14:11:20 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=1750246182; cv=pass; d=zohomail.com; s=zohoarc; b=IPNuiAx5cKaFc3HzFXZjgNhQ6TwT263VYNDULQbwB8Hv2BBEjfZhIL/ImlUPOmYaDV4xVCIW6c485GWcUkVIynztuB9GGHJ6uF9AMrQRc49S56brqEBXFhwCu0AW9URkZBYqxcTZPMaoNcHRI7UPIOiM6qsf+agaaaPaCuqJw2w= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750246182; 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=hWA3QP2lYEsyPRPmUhW879dwu4I2vMjxpMVHNC+VtC0=; b=hElmVDzfhNaw2QspapA1SUIeccfmHhaQf3+nTNY+CUcE3rR+BtNz98s4bpl429cNPZ88+gUTXKoRPcD36vxVQ+KQ6zSIklUMdm86h0ZD58L9hK6mY833qR7ZSeFm5Nx2kzDNLsG+rfeLSrjTh+UHoKw0vfw+T2sIJ0FIGSZFCUU= 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 1750246182475365.7057881754474; Wed, 18 Jun 2025 04:29:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uRqyd-0001HF-1x; Wed, 18 Jun 2025 07:29:11 -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 1uRqya-0001GN-EN for qemu-devel@nongnu.org; Wed, 18 Jun 2025 07:29:08 -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 1uRqyY-0002XH-Lz for qemu-devel@nongnu.org; Wed, 18 Jun 2025 07:29:08 -0400 Received: from pps.filterd (m0127838.ppops.net [127.0.0.1]) by mx0a-002c1b01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55I7qwBQ012989; Wed, 18 Jun 2025 04:29:03 -0700 Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10on2091.outbound.protection.outlook.com [40.107.94.91]) by mx0a-002c1b01.pphosted.com (PPS) with ESMTPS id 4798mygsub-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 18 Jun 2025 04:29:03 -0700 (PDT) Received: from PH0PR02MB7159.namprd02.prod.outlook.com (2603:10b6:510:16::8) by SJ0PR02MB7295.namprd02.prod.outlook.com (2603:10b6:a03:292::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8857.20; Wed, 18 Jun 2025 11:29:01 +0000 Received: from PH0PR02MB7159.namprd02.prod.outlook.com ([fe80::6cf9:b35c:b143:bb88]) by PH0PR02MB7159.namprd02.prod.outlook.com ([fe80::6cf9:b35c:b143:bb88%3]) with mapi id 15.20.8835.027; Wed, 18 Jun 2025 11:29:00 +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=hWA3QP2lYEsyPRPmUhW879dwu4I2vMjxpMVHNC+Vt C0=; b=Ayp82s3++G+/QuR3YDOl2yxES3kwuFSFyeE6/rT6kn1wYldGLPHQ+Lsml VIIVLL0DzXtaLyoYtnbA4TPGvOZ7qWRxFAOmQxRteSQK0d6NpKI9VNoQJjs6ORat EaXeOmu/3nZD33D+HzyC7+ys9y+ybhVjNzewsQGB1Jkho5SjbFMRkscJDO2KsqSZ qvHpqnwqlV+w15hXtpIRhfNtsdGJxEZ52Fm6WFngLfCCDB9CDHZAqhboJLRwt2cw w3MBW7aSYoQDZ+D3HCT0602yei15qZVYnzjoIAVFy9DZsBJPz2O1vK3LnAMJWPj7 Q3lhjkvM/6uH6QtBAA5X/y4IXd0yA== ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=JJPKr40EVnxFLtaZcjE7noP501WvXFtykzCbJue2IWBFB5xx6T9mAhXJ/aVpMGcxAbginEa4Tp8oChn8314QsBau4UKyEaBSTMUL22vCBPHhvp+Iyd8t6OQ7FhL5F72/zpx2JqgaBr+erN6M1FF24aTrnrn07edqUJlHR5RXYRxKxn/JVV2tVqa9SuiQAP4MucUUx02HkdgqNbRddo1TLwsweSTPDz2SXDUk9zJnRlJD3jz09qItp5UzFV/8KvKEH24JXjDCk2HWX+COSIHp/906KCvLnf+GN12jn5PO6pFxU1rvt2FBWzQwwCyzxYUIrW6I7XLUS61qwydGgu1CTw== 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=hWA3QP2lYEsyPRPmUhW879dwu4I2vMjxpMVHNC+VtC0=; b=SgtPK7e/QlrExt5+faPFxXZJ/iLcLM3uWV4wmMdJeoDL1uAODAyO3MDltxiMDzQ12Qrl6GLpnqE2B6iyQph9fJjsCW/nVcZ2t4BKZOWkofZTJt4hfK8j22m/85Sb1dZHETDdi1SJf+VQ+VsHDktU9KeuI3VDrPFjkcLUTmTcsCRwhJrkTGiMMqnF//PCQRE7ybbPXQcNsX5wDEJjZQrEJACcfT0dyrz6kKQNNmky5MtsLrdh4LYhWdhVhizZnPzHVZ5ooTlBJQqXRb00EBE0ss3r0rUOFtYiCfgPu9O7SWqw1lVz9CEHoPW62T1Babc9QUYh0LdmpSMegkkTWdIh0Q== 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=hWA3QP2lYEsyPRPmUhW879dwu4I2vMjxpMVHNC+VtC0=; b=jtWlPBGpGS5tNgyzPXHBFRCl9IZ8l3kz3fDdtLZCRZSJeXcJm1EMohKMfI0U4rEqPUQWrNGd9AV5nhoh2PCgR4rMqG+6BhRd+CUr9KyIM/4Pla8HGi0llmHvlenIneNeyd+n6JUtas2zWzoM4gsCX69KdkH9jAzkfTnmJ39wl9grJnmSLqDNWRh6NsMrb7FgXLu1Ll9/x3TTatKCT5k2TgASX4NZkYov8QL83q3vIZRZv52aaEOcrZzhtsIVvNljd0SPOUr+ECFWu5Sh4tmp5Oswik3CHDE6cczx4QVlBicHRX5O8jeUlnZta8w9yfnxh+jdmsIpYA51n9IXdMNKRA== 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 v2 08/12] hw/i386/pc_piix.c: remove pc_system_flash_cleanup_unused() from pc_init_isa() Date: Wed, 18 Jun 2025 12:27:13 +0100 Message-ID: <20250618112828.235087-9-mark.caveayland@nutanix.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250618112828.235087-1-mark.caveayland@nutanix.com> References: <20250618112828.235087-1-mark.caveayland@nutanix.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM9P193CA0021.EURP193.PROD.OUTLOOK.COM (2603:10a6:20b:21e::26) To PH0PR02MB7159.namprd02.prod.outlook.com (2603:10b6:510:16::8) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR02MB7159:EE_|SJ0PR02MB7295:EE_ X-MS-Office365-Filtering-Correlation-Id: 79f6a9b7-e054-4096-04bb-08ddae5b52a6 x-proofpoint-crosstenant: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|10070799003|1800799024|366016; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?n06RSiOEOgm1XiPn4249MCLr75VKeMc3GtIg8f1V5o9C9YOaeUDGQ/AxlA7d?= =?us-ascii?Q?txuIS+3Ti/fMv+8/8ZCQkZExFX+6wyJd5ErFakkUy51q5ht891oJYodaTqBd?= =?us-ascii?Q?sgNrhaBPRPorUL75at3OqPUQtV30GrnXV88x1HTDjs2wo+uUrycqz2vRQz7p?= =?us-ascii?Q?y4pOgdSaumQJdGyrAxzqU1C3D1ioWni0ZD0wQ+n0295s1p7ia6Yy6zs+BpRL?= =?us-ascii?Q?Sm1fqYY49QCqyal8JjWsWDFY0dFgR4fxBT9v8Eg7DkwD0LebybQjUDWrt7g7?= =?us-ascii?Q?Z1CpkqL2z9jxFbbE49eqFJWP3uMMR9zm9ziHDW4Ov+WR72hUnSalHq0PPscQ?= =?us-ascii?Q?HnrT4unPtk3LHimT2Z37e/UIs5pDG8OcixreXXaXBF3cAckIISz7HBYAnK3K?= =?us-ascii?Q?IxceJ+k7Xy5koU1WglH9XhNTUe2/GCffaZgwRM3VgcpOB8LJjeB2tc8W2bSb?= =?us-ascii?Q?M7w7xCZ+NADXjZTGR+wQKUHMFmEWITyA+IBzor/51eqKG8zY6Irt2FgvVNKh?= =?us-ascii?Q?CQ9nXI/NA9H1PQNCurAlZwPpibifIUPZNdKKFEQnezkA3z/0gQWewBcFyVeU?= =?us-ascii?Q?yQdf5okTa3w95SjpPSxDsKTzD8H03SnfwGg3zoct4q3QpGbTDXv8LcgMbO7R?= =?us-ascii?Q?k6cNJ4Tdd0FslhNoar4cLf69/bdMxNT5IaWrYPYcFgjNTyR284oYPdK7K1QF?= =?us-ascii?Q?bgF9BY+T2/LLRzryVSfBmeh72wmcuIY31Ix9E/D4sR+cNPEKt7A3BHIA6Izx?= =?us-ascii?Q?06KLbTJahX+qV88pBVdwg61ZzNX7qcRkR5EyLx5XwXqlm3V5r945rHu/673n?= =?us-ascii?Q?CgLAIuKhOM2GdXX6CgjXX336EdLEz9mpSB81BBsTPHAOLvSHmjhs2m2II3EY?= =?us-ascii?Q?hpOi0S0l4gF44yjVwRwD5ilV0vTDexbE03/CvkTERBBYalge617VSLDpSoih?= =?us-ascii?Q?RspuMsl52Y2PaqozmsaTat7rFygKKfinIl3phGBiH5YpEKjAzYvR/ZOv4O+R?= =?us-ascii?Q?ml6D6hntbzx/bQznpf72o8A8f8H/Lg4Z8j+r6KsCypZifFGET95QnU7tJ8L3?= =?us-ascii?Q?My1UTkosYyDh3LaS4Hep0+LR4JSFvC1J0KnMQ2xf9nSc7KobAaK4x9+n0sw+?= =?us-ascii?Q?GlJglzWY8iaZQToHI0gMgUELc0FagRzZgzaQbfkValanXLcqi+TZ4xl5PQT1?= =?us-ascii?Q?CPQ9MIjbNocwNERUVLp+WMuooT4xd/zFeCft8aDncAdzlhGoDc9sxFZVP6E1?= =?us-ascii?Q?Q0HzxdD4izZdpZ45jYRAtMSRsWycjWPh/6JHVXeRn6ZScn8gj5Q0aAiJ3ee2?= =?us-ascii?Q?HgLjypDsQUzg00kS3r/wAcpb4VRFFXeJ3QcEi4s5Z8Oyvtue/C404AzHMcc7?= =?us-ascii?Q?2ADirGHiPjg4r3xLMOFF/zDROzmGQXffXjKA3/ZnsSTYytJFwy5yRdjwK+J+?= =?us-ascii?Q?6uA50Sajk8o=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR02MB7159.namprd02.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(376014)(10070799003)(1800799024)(366016); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?/9St6hvHNKoGzWlhwd8EIF5qJr20AupL9JSQZXGpIb1Tg9EpbA/xim0l7tj/?= =?us-ascii?Q?vEEUbayiYX2gsOXXP+p6BeWjCBBdtUBh6TReAMnOfoBoSivrWKFh1aOf1y22?= =?us-ascii?Q?fBn/RjiljtvryBX4Jnt4WMkr36GaeQ6zJ4xFoElndDIGqh5Iz3LvFyBpLZs+?= =?us-ascii?Q?UegldbQhdW/HoEbd99hbNn4T1+QYXXg11QrOIvU2daTMCHMUEX+LJi/arVQk?= =?us-ascii?Q?wwIbjmP3JU0ctwQvZ6zvXY+GFYj+LaJU7ZyAptfwyKyK55T2rOcLvwBMqy0/?= =?us-ascii?Q?cZ0C6vHK6mo6wzkLpomRPbvoHH6GNYpuF5vHP3A8QJRgM3W3CzWDd6npFyFS?= =?us-ascii?Q?wbrRxwEK+QOWLN+LG5vu4IaqgL3RZGPCcJDDLu9K8eUuYfAU4FKO+K+Ywq50?= =?us-ascii?Q?KaDjkEg3UKvAcByVruXF6N3XjgSap3otTpGOJ7BD9xtwB2o3lcZ19lvnqE6E?= =?us-ascii?Q?ChuL1SaWDpjnEF3XyDqi7OnrlciaM0uHgwx073T30PZKqdd8078bQiN2X3U0?= =?us-ascii?Q?ouOmEw6W9bMzfP6bM2jSkhuVbc1R2hx7c94oEcuD87n9oajspt5ciO85iati?= =?us-ascii?Q?Iqzb894lWp5E0qzGiifLXSjALc8WF71nxhHBYvzVEUn9kX7fM12ZmRQ6FBkV?= =?us-ascii?Q?mgGfuyiALHefcAfnuAGXQ2KxgxM6RAckxazpqI8UV8N/5HggTYalPESxsqmf?= =?us-ascii?Q?CmZnCVugE7sAMa7DZgYDpsiijGMvYEGon85/WwAsrJsxwepmACdnyk4PN/GQ?= =?us-ascii?Q?ocdr1vecRdHpjI58IhSCk34sckRWMdHZNIs2rx/JDdZYnUHANzhi07NyUA94?= =?us-ascii?Q?npV/6YxTHWXsHHymH08t3H4gk6srfFvbkiUJ+BaY3uetswuJdFGSyv0ohiEh?= =?us-ascii?Q?Ykv3zXBs9Mm2PWbZH15Y4vU89LlEGfv1T6P3HP5q7WdcTVrZvfEYEUMAAINr?= =?us-ascii?Q?ye8GVJ43pZHyGuQQUfV8ygLFUkXczt5kTHNnlYd+HzbV68bb7SEsr56UE+Dh?= =?us-ascii?Q?skSkw8BgmzQEazC4u+qHMXeoj4c6LP//2/xk/Phru9JDGmyDBgAP2FPI2e9Z?= =?us-ascii?Q?0/xaQp+baZOM1q+iSFnE0/SLI+9ZL5WD2JwZ3mw25hiBAgLvpCsFb7SXOJ1d?= =?us-ascii?Q?Pr11rgdHLyS3qZAir+EKO6MdH48LbFhNmeJkkMLOdlpz8dHZ4WWE4449NGLW?= =?us-ascii?Q?34zGIUtH2hV07PNnusE1rlmEttq9pY0JeA7yBqIpZkjN3fodDrriqEiQEGPA?= =?us-ascii?Q?Uo20IP8Se84pHVOYLrIDj7Fxx4kl+UK7nED91COqThmzyoijV2gp8oxNPBjW?= =?us-ascii?Q?V8Aw34rcsdGOTMd23jUHinaJW4074h1IbwKH2Hp+7lIk6FhMt2ktj1HVFyeN?= =?us-ascii?Q?U/tPudYOJNPa6u3mLdQ3K2VCBAG5jq+DQFPBH/BOlsqiAWCztnsjqut4c4V4?= =?us-ascii?Q?7v1G74LBFNrG45h6BZvAp58ILSluaawsidVS5pFHylsMbQeoLsAeK9CrOqpg?= =?us-ascii?Q?GMZOwmPjQWSuTtpyB9+yXbGO08g1ebcPTHu0vDRWcl2m2FAGbJspPWmsWTab?= =?us-ascii?Q?00ChmMlRwZMAxkwUnwHGTWBGdwPg019QLQ6KUmWAOkKZ280VN6Tw4b+SiTYA?= =?us-ascii?Q?70/5XiIqn0YRCiJUMS+RQSa74+A1rzQ3fCORGCY4qzMVeSZHMYvi9Wc5nw9e?= =?us-ascii?Q?88ibqg=3D=3D?= X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 79f6a9b7-e054-4096-04bb-08ddae5b52a6 X-MS-Exchange-CrossTenant-AuthSource: PH0PR02MB7159.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jun 2025 11:29:00.9207 (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: BBDfIz3VcyJAZNbmakKy8f1wMV2PHfe3cO1c3POHJh1gYeGDnfL/sFZJmozx0NIVyRqZCr0Ccd5M74sOlugBzwcxdSb6euGd6TFdIiRdYtQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR02MB7295 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjE4MDA5NyBTYWx0ZWRfXx705SggNx7Sh jBrFjC039d7HtOlUkF17qYcuRFWWFe577BZQ35MrnarHb77gv6VEOjCY0qfw1BtvSTA0jkYCOAO CFCljr/96ayJN85yW2fMkAjMT/Y8ouRrOrdMwzUQr5L3eK5f1CbFzh/DqhUuUe2lRGV/dIw3rnK yGkHUgYKN5R6ZE13ttEi+Lso1MPaiV4BNPqF5pSF9V8c9B3NVLNnRI9Uo1S1mUBKndxcKxBe8br cPJqXlbCDD6TBzXGGeMx2fWLX4vI9AMdbYOHZk3qQE8FAaqXSjLr1fbQ3jJqLF3EWlQg2VHTtLC ThND/a60p06+8gncUXWdw6wwCTXptyAtQNXB9fBoLqYtKCAqa3dR44dbgViPw1vmW5thg0svBSm Jhj77OhFc0sVt4n3OuVUaKd9CC6YnIZbM2IN+pawEUjmTEdQINAHhvJXUbSLb9lZZayzJYWl X-Proofpoint-ORIG-GUID: MRybgD8qiffmBrf4WRsMlu2zclvI1H3M X-Proofpoint-GUID: MRybgD8qiffmBrf4WRsMlu2zclvI1H3M X-Authority-Analysis: v=2.4 cv=LIxmQIW9 c=1 sm=1 tr=0 ts=6852a2ff cx=c_pps a=uYP7OY3RDfiCMgYFf1WVkw==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=0kUYKlekyDsA:10 a=64Cc0HZtAAAA:8 a=mnHwG4yJ6Weg6gPWIr4A:9 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-06-18_04,2025-06-18_02,2025-03-28_01 X-Proofpoint-Spam-Reason: safe Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=148.163.151.68; envelope-from=mark.caveayland@nutanix.com; helo=mx0a-002c1b01.pphosted.com X-Spam_score_int: -46 X-Spam_score: -4.7 X-Spam_bar: ---- X-Spam_report: (-4.7 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.895, 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: 1750246184637116600 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 cd9a89f7ff..69c4c001cf 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -454,7 +454,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 14:11:20 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=1750246315; cv=pass; d=zohomail.com; s=zohoarc; b=i8xBWGnOBYBafzGX5/Iu0zvpt+KgzxbhAyus3OY2QgGGdc4CN0Cz2yHKENZxTMK7zfPTFt7NG9PglCfOMozjw6w++tLAnDwXZVpbbvBxr/dSaranOoK+47deN+LqwEbbt/KICfx9apUAg4gpEgIBQ2vXwa08CeoNMzJ6vCeVh9I= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750246315; 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=NPlXhadgFJ/MptG6YMm1EHMUC5cr8jn3WwLjH3xcG94=; b=VJnbrYbvPshXw0H7clN4PxCl2U8xCeZ0N534xMFDkNoqs1cgbghkX7f6C2Sv1btwu+F9N/61hn46NucpjA+mk6biS59E+FMjWMo6HhLWE1LUDuUTKRviO29fS6r+DHjf8qA27gYVGSQuvM1C2S/QfFXllCdjE0nkfR/FD7V6O4E= 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 1750246315759502.4842428681901; Wed, 18 Jun 2025 04:31:55 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uRqyg-0001Hl-Fp; Wed, 18 Jun 2025 07:29:14 -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 1uRqye-0001HK-BG for qemu-devel@nongnu.org; Wed, 18 Jun 2025 07:29:12 -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 1uRqyc-0002Xj-JK for qemu-devel@nongnu.org; Wed, 18 Jun 2025 07:29:12 -0400 Received: from pps.filterd (m0127838.ppops.net [127.0.0.1]) by mx0a-002c1b01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55I82QxJ014676; Wed, 18 Jun 2025 04:29:07 -0700 Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10on2133.outbound.protection.outlook.com [40.107.92.133]) by mx0a-002c1b01.pphosted.com (PPS) with ESMTPS id 4798mygsue-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 18 Jun 2025 04:29:07 -0700 (PDT) Received: from PH0PR02MB7159.namprd02.prod.outlook.com (2603:10b6:510:16::8) by IA0PR02MB9632.namprd02.prod.outlook.com (2603:10b6:208:3de::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8857.20; Wed, 18 Jun 2025 11:29:05 +0000 Received: from PH0PR02MB7159.namprd02.prod.outlook.com ([fe80::6cf9:b35c:b143:bb88]) by PH0PR02MB7159.namprd02.prod.outlook.com ([fe80::6cf9:b35c:b143:bb88%3]) with mapi id 15.20.8835.027; Wed, 18 Jun 2025 11:29:05 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nutanix.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= proofpoint20171006; bh=NPlXhadgFJ/MptG6YMm1EHMUC5cr8jn3WwLjH3xcG 94=; b=bEbdX5+MLgcrVjFAWlDXWatG0+j1cBf1bb6DMjFXBaNOl9mKKbSWUYGEv rvCyjFNkyde/E46xlP5cCc3qDN4nrdxHMn3FPmwnHIa9tnaq3ubOeYCmml0jHH+P xLvhwTOHxTZjXKkmjyz2WdSTHEgW9C9H28l17dHV3ZTnMEqGH3qpaCPW7myjVdW4 yHxg8hcjP6ElGA8mnPIydisulC3ORYS9oKe2d5179Sdc7EUyqVHxIFGyWF9mQhvT 204HLAwaxyfQ8oHj6GFH/BdCQVd6BS8OWz1CAf3cfwuqLzVdtk2tGIyuf8wTSiUx opqSLXMFXKED5PSm+V9LtCY9jQ0HQ== ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=CvSFMC73Y5Jg6+BGBpLsg2Dzt+j/fxs2V6ZlOfKNvQJyg8JZWEkH7LtQzfQnr2kupKYxOTLINA58rGMRFUDZ+qXnLakqBVJPyP5116DEwdBEV+84WRQOdgRbsBiS5L8pr3DY3js7JHlkGjoRCxpWYhzCJG1PsRWRwemi4I15x2lgHyfHv01P3A9ZT9DTKsZERFndAvwerlJBZ0KOo8GxHVwHgP9FbksYyJez9L/tSpCUlW1SACHaTb9NXngEpuPOoP0SoXD2Ll3wVzRrvJho/4ostJtTerj6T0LJmBidlau1UGn26p3s+lN9gEdvYcr7usZXgjtYYP0J8NSRpmVWNQ== 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=NPlXhadgFJ/MptG6YMm1EHMUC5cr8jn3WwLjH3xcG94=; b=Y+ZzNG5DO2GR+KhqoW1fwIOEWddpyaa7qZCxPlVQ0IhFaqwpLIomI3pQuD79A67iHK0kt4jwOFYQDI2Xfebcz5OPrY6mdKisE/siQweyvkAm6nTWJnVgRxx+nE1Y+S8xEj+JSdSmWqfPuZh/lug3KBHixHev0r0htEGoKhrq6buhVz3BRMRTr7wSskO4p+vDmEo+GFo2+TPvlclkbUanO5tRVNG2QrvchvuI+54LrCDYdkgMx1nLvAWHjRVfT5wTwI1gy0P7zXOgHC+hvYZ62EwQ9dFCF7RmYqnt11gI4Q6rxtgiPp6LOl9xR8zILwfyFz2RX2sOntwS9leM9LVa7w== 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=NPlXhadgFJ/MptG6YMm1EHMUC5cr8jn3WwLjH3xcG94=; b=PpFOPTTxH9NLabf/qcldQETNtSggzuOmvXtDb58miySuPqLzaLhx2niMtdwvhyplkSBFvk3EOX2KGqS5Pb68/Y73ouiFQbbLLdDWXQ0sbmy7LMVZXPgIUzCpSmqdAI5sQBgRJA8tUIO/JPgPeldDyp/0LQDRzwC7mDABHQ31vK7/t8aTEgv1DwT6mWHcxSa8OB7EhuuxCOjRI+HFlPMKOBYHioHPsIePlSQ0vivZJbwgoziFhM+mUJMQn2lMQGiN4qQ3OEk6VRvbyDmYwqSyPnBdP6P9eW764ZuTzaPbnDVrk302VXSq52R2fHsLBVkoN+08FysJOnqJ9d7Z1zPXQQ== 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 v2 09/12] hw/i386/pc_piix.c: always initialise ISA IDE drives in pc_init_isa() Date: Wed, 18 Jun 2025 12:27:14 +0100 Message-ID: <20250618112828.235087-10-mark.caveayland@nutanix.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250618112828.235087-1-mark.caveayland@nutanix.com> References: <20250618112828.235087-1-mark.caveayland@nutanix.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM0PR02CA0168.eurprd02.prod.outlook.com (2603:10a6:20b:28d::35) To PH0PR02MB7159.namprd02.prod.outlook.com (2603:10b6:510:16::8) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR02MB7159:EE_|IA0PR02MB9632:EE_ X-MS-Office365-Filtering-Correlation-Id: 7fc2baa0-5a60-40e6-5532-08ddae5b5536 x-proofpoint-crosstenant: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|366016|376014|10070799003; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?xd9x+7YOOD7FFJFbmj9tnhL4/PiZ3Cw0AgC5d+YFrzfM8hCeKpeQ6iiFrHYQ?= =?us-ascii?Q?lnjI4YqhvChbq83Lg83nSmNvHR3C/JpKtnZF05jSvU6yKb0LkLyffNru9jpH?= =?us-ascii?Q?lI6nJ+tLGsvUlZtuwkXi1zUTarNc5hpQqqJ6dsLZ5jyQroUCDOr5tIFbND3X?= =?us-ascii?Q?kb06jUd3MUQoS8hESgryffrFvP7nP028P7DX8xfF4gNISihoFw2d4yEUG6mC?= =?us-ascii?Q?CaCxoqjuylGdsILKZDBd09M9nRxUbCFMD5eE8b4VKRbbay76l4BSHAupbKDD?= =?us-ascii?Q?4vdkzJ1NSJ5vVF+SMARkNxCaRPhpqDXObUBk4s/38QmFyLakoNXyzFLI/QC+?= =?us-ascii?Q?jvXSctaNcixWLIklR9zctA1Cox6iokFPZFBVJIV3setmjmoJy//hfA73Fjth?= =?us-ascii?Q?YmRD6j583rmXHclQ3qfA+iupnsVFvXhcfkBDHH+H+gHb6NEcDTLLS7xFeqBj?= =?us-ascii?Q?Yb0SgQdfVF4XJaF3GJYsia9DlkaZPXpjt98v6yeyOK8It7mSlB+RYIMKd9jh?= =?us-ascii?Q?zNLBkgUcsPXPrx+Ef+2mwEpve/BcB7gy1Bq49UnFOUxdJtgnfZ7AOTWyEkFK?= =?us-ascii?Q?buNhztoVOKSgX9bu9AYfYrryyXa7WCBSdEGwOXcvd5FNBe68ohmBQ3ncJTUM?= =?us-ascii?Q?DH5bXKk7inJn7ZTBtNdlzyqrAwZH2Be74JmLuu+gilgp75yHL0bs+2NPKvPm?= =?us-ascii?Q?ePTMTQB5jrcugChCxs5yHuDsr61sUOdtiDcJXF741dGyEmu3YlF+riCFLkbe?= =?us-ascii?Q?DIqP0aIbz9zLBb+2DkH8OV2R7UqtlIIAWNNBDORRDo4kabN/aUQIB6l8mRN9?= =?us-ascii?Q?13R2VgIP3K/mxM58VFkrs3AVAFZXId8Qf4lyO6FZ4cxSBoa8jBoLKhDQ2SJd?= =?us-ascii?Q?2geS2intuyKTCgIMCTo0kFhgfXT1ZcQkcAc9UBkEQum3ASTkEVLq+HvXTjhL?= =?us-ascii?Q?5C1LtZMCe8odtYumqv036i0Ls67npmOu65KblmcGV/43KGm2OF/ClQYWUqzU?= =?us-ascii?Q?OqmlSOKz7kYYXCvFlxsyPKzpq41/pROt11v0O255pkTRpQeEvLl22oq8WRIo?= =?us-ascii?Q?uznL7xPxA6UQbU3blaBxB7yGjgEx+7G3lYyQfAwobShqKyxMBIzZXlxuskDt?= =?us-ascii?Q?zNJqAdUAIWLWi/Ru+gSB1eN+4Tdf38W5NQEeFILVLSMNymkg4eAYUu2Glz0S?= =?us-ascii?Q?PN+7M6fEYDx5U+7mxHx5uMJ1/2hfzwmGB5Gw69crrXMzenGj616ZNbhqxelv?= =?us-ascii?Q?yb+/otDDqZ5Bwuk3IAsTQNHj6ksHYHc/jrKtmyImE3L+dG4gVPZqlx/vKO5X?= =?us-ascii?Q?2rmHxOBvhnx+JwAErGFou6FY8x7nHiRUITM4tgcS7yqYqGfHwTjf7IhMYFlE?= =?us-ascii?Q?mzMz2HLNdGUr5dL0AuK91OS4jEZI7nThpGR/yhR7sTRlkQ4pyg=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR02MB7159.namprd02.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(366016)(376014)(10070799003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?GKYJHgBFnSQubpuyDfh1v6452XaYP4WaJPYh0o4fQVWi+mzPvBrY85+VlqUQ?= =?us-ascii?Q?TzhGtfk+EKG6HIAiFysMIE8Cd8tprzAMhmIce+EmEx3YJQTPP9zCIpruPRNF?= =?us-ascii?Q?S7HODi7A7ZEqYnyHRAIEtkFrTABe+2PpYIulzfdnAxXhR0/x+VkEKbJUd+Hb?= =?us-ascii?Q?hi/1GtIyfqAWYoXGY8pnDOGycmqaLOeUs8VAqChcShehvoG2mOofHFdiGbFm?= =?us-ascii?Q?MaKLVWHz6aJ7n5Be/ZKrvQl6yB204vMRNK5nnXSoXYdhQt6p63O4JFdhRMqU?= =?us-ascii?Q?v60qrYPijX/aKM3m/SXu0s3JtmeNDk9jbzv/OqofKqejC7dRUL8YEIo9AKhy?= =?us-ascii?Q?mv+G6UBLHQMgmVm3QZMqe20J7+bzyIyZMHDtdXeLby503agTA6D40Ioq4lny?= =?us-ascii?Q?Qcn9L4srL4LYL3Lf3CyjPebSOtcDExiY1o+vgcryu1kmG1nan9NqeElc83kB?= =?us-ascii?Q?aRdvYkHFCAvLbV+LlYmJd4F0JE0tCi6cD/T2dFWoeKrlmrYQEDR06kb2TWJn?= =?us-ascii?Q?gmE+lWDNnXBfyYA4naQN+iVe2dJLs1w7WdBvBun1RMLi+OTgBouNQBwOcQN3?= =?us-ascii?Q?1uUm/9dCNcZSJKTe+uyHrHJPpsD/nMY8xF5xMaHz3GjYb2wu9TOyQq20sRbO?= =?us-ascii?Q?q2yz1TvF1CPWBA3gA1k9mYSwtAiKcOufqwVaKGv2m9kztLsGHK7jBuVGJcYO?= =?us-ascii?Q?lT4f3UbBq7RNPbVs7zWXlRGllOTN7Nb24JcdjPYTUrmaCWHTzcO1iYWy0gQR?= =?us-ascii?Q?D6nA3+G49iFfEGX+l3e+/QqJyJ8o0bkxR4mQV95Ptt5lHUReGG5kyawjPhUn?= =?us-ascii?Q?J/wMShKYN8OzN5gx4GItfrRPE0/zrbWhhbc5E93kF7ZcezFeQfqjZvJ+kNNb?= =?us-ascii?Q?o9CC9r68gwv84Lkib6yUc/Il07svs9P5gDvXe/DBJ9n0t/OlkP2RGflh59NH?= =?us-ascii?Q?FyrXNdujnYNMJWOuanDrJeOEs3sEQwUmKIPzXMMxQUwLiv0gaJCPKK60egw/?= =?us-ascii?Q?2LV4qqHr+RTQsC1hByl8YgmJElOynjE/Vhc/qnlPPo6mDHCR56fuuBM/7+Mw?= =?us-ascii?Q?G1jul56ei7LaN08/wFNqdnGZoRdDhIENmkNUMRR4pnPNTFXaSuZnN5F8D5pT?= =?us-ascii?Q?9zoFWUfAWvH7psI0H/SvJTOaywWdIMr/5ntqsNhVZy7IirQFMQIJRfk20w0x?= =?us-ascii?Q?NSe7AHTznsusn2YjmtiK2vUYDTh+4faKINgUQrbw4Sqj1S16eGWEpKSZXPqj?= =?us-ascii?Q?r3xUjxkRDm5WeAW1ebAooWvOQKFbfizRzTojQwXyBo65e3tglZI+eoY+dxcq?= =?us-ascii?Q?djqycJcESOvPKnrwlQbCU5KVPBwtnQ8ki9unFxK3H0amOzAkMjKSFCraZF2R?= =?us-ascii?Q?S720Yjv+9S7dLZ8Pal7l0NG/vHnKqNphyONkxoCp5l6rBxj1LqatKd84s18r?= =?us-ascii?Q?GW9/WgHbh54ky8ScYffRgYtShu0FhIZfJBVNcG+3bATMaERxdg3Ys4Rkp1l+?= =?us-ascii?Q?y8+i10nOG8dlj1BFBo+4/jQLMa8iL60pMLSSUugDKFSv1/w8SvA1qhpOU41+?= =?us-ascii?Q?xbLdQ46psgTtToShKbQVjzKd96+vggTOty+UNLgTKSpIJ+oUltCS//QRCR6O?= =?us-ascii?Q?xfN2rOiiHGo6efWZ21/gvp3SGP9vxgvCBGZmII9PKsrt2o9PUwZipejwaks3?= =?us-ascii?Q?w1cOuw=3D=3D?= X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7fc2baa0-5a60-40e6-5532-08ddae5b5536 X-MS-Exchange-CrossTenant-AuthSource: PH0PR02MB7159.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jun 2025 11:29:05.1975 (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: k1IGesW5yMYCrU3/NobQvIOak2NzmbhqQoWeRS3aLGsR9pc0eIHYWxMSlTDO6MmX91O6BSEaDPaGhbahX3jdh4DVflmN/EU8YlMX3q0rH6k= X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR02MB9632 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjE4MDA5NyBTYWx0ZWRfX8lCwM6eH78uk 8NQHMTIow3ActQ35BLLrsC2afCeDg8K8r3tHzRrZhAOIagv7nXdbKQg4XCoXLz/ctA/N8WUDtu3 W435Trzap52jQJ5yKUjQmDLObyr+X+NL9kDv80mQX3bfGO6AVclirEkNuHOUFWJSe5QUxLtk8kn zHyu5Tjy/0uLwwf46npCxwczprWVP5biWzV+gH8ZSLBe+CQmGnBYctQ464OLcOHIgyLzvBq9aAZ RmiPNhTluqEzUfRq5VSUxFQVe6dJ011BCVOZ+n3Lz9UoEwX5SHwL8oN9u5h8GINSXYX6iXHxtNF vdlqnFufFIdN/5d0ZXBDxnNOvckzT0KwWdS2rNYeh8CuQUG+x4BCJi08DEu8eCmB53HHRHcu9+k bXSDveuWzH5PmIt7Bz1EIyykLMfG1EZe2WMeQHXy+eAMVYoswESurop3eqR3U/oPoiSvXKlD X-Proofpoint-ORIG-GUID: LS-9dBjM7oCqftSx8AFuHaKbYbWpaBFK X-Proofpoint-GUID: LS-9dBjM7oCqftSx8AFuHaKbYbWpaBFK X-Authority-Analysis: v=2.4 cv=LIxmQIW9 c=1 sm=1 tr=0 ts=6852a303 cx=c_pps a=IA3z5DP03+00aNcgMV2pVQ==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=0kUYKlekyDsA:10 a=64Cc0HZtAAAA:8 a=VUPP-S39-c8G-0SaL20A: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-06-18_04,2025-06-18_02,2025-03-28_01 X-Proofpoint-Spam-Reason: safe Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=148.163.151.68; envelope-from=mark.caveayland@nutanix.com; helo=mx0a-002c1b01.pphosted.com X-Spam_score_int: -46 X-Spam_score: -4.7 X-Spam_bar: ---- X-Spam_report: (-4.7 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.895, 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: 1750246316340116600 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/i386/pc_piix.c | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 69c4c001cf..03bd09f680 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -427,6 +427,8 @@ static void pc_init_isa(MachineState *machine) GSIState *gsi_state; MemoryRegion *ram_memory; MemoryRegion *rom_memory =3D system_memory; + DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; + int i; =20 /* * There is no RAM split for the isapc machine @@ -489,27 +491,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 14:11:20 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=1750246262; cv=pass; d=zohomail.com; s=zohoarc; b=mgNLIjUw07bGtm6zAc1SV2aChwl5q7kd0XadC8MKclq+1BVvXyXnWxLPWhtWjedc2tuThwxS+60jbcoC+IooGmEI3iAD/6IZ7Efal6sT/inSAB5u3gJEe8KYiKRJGDVA+feHWX38ByqJCIidYSHzOiQO9jP/yTXjnpWCJEJR2h8= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750246262; 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=gSn77C9x/auiRQJuuHWYjX0/vtBeTGAzLAkSeoNP6aA=; b=lLgx28yc+K8Ich63ptSy8gamfN9ytZnMrphtDAV5PNbRxfW8L13HBVBvIzLXDFS3agtKXC1xOiL5DedKZhDUZY++5NSSv/XgPtH1CNHnHZc6sxcbS41974UghRrPm1CwmIKkQIrOmup3/IKVbvyeKNu4hhe5KwEY/aXvTB0TVLs= 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 1750246262552302.2514459109344; Wed, 18 Jun 2025 04:31:02 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uRqyj-0001I8-2n; Wed, 18 Jun 2025 07:29:17 -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 1uRqyh-0001Hs-Eq for qemu-devel@nongnu.org; Wed, 18 Jun 2025 07:29:15 -0400 Received: from mx0a-002c1b01.pphosted.com ([148.163.151.68]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uRqyf-0002Y5-My for qemu-devel@nongnu.org; Wed, 18 Jun 2025 07:29:15 -0400 Received: from pps.filterd (m0127838.ppops.net [127.0.0.1]) by mx0a-002c1b01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55I7nAAL012959; Wed, 18 Jun 2025 04:29:10 -0700 Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10on2098.outbound.protection.outlook.com [40.107.94.98]) by mx0a-002c1b01.pphosted.com (PPS) with ESMTPS id 4798mygsum-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 18 Jun 2025 04:29:10 -0700 (PDT) Received: from PH0PR02MB7159.namprd02.prod.outlook.com (2603:10b6:510:16::8) by SJ0PR02MB7295.namprd02.prod.outlook.com (2603:10b6:a03:292::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8857.20; Wed, 18 Jun 2025 11:29:08 +0000 Received: from PH0PR02MB7159.namprd02.prod.outlook.com ([fe80::6cf9:b35c:b143:bb88]) by PH0PR02MB7159.namprd02.prod.outlook.com ([fe80::6cf9:b35c:b143:bb88%3]) with mapi id 15.20.8835.027; Wed, 18 Jun 2025 11:29:08 +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=gSn77C9x/auiRQJuuHWYjX0/vtBeTGAzLAkSeoNP6 aA=; b=wSlFuIPRcC/DcQaSeKK1hZ+BK/YsoolO01Xtv53roooO6lMqHo3nfOmLi d45RE3PQfUVL+4nrBZO7gvPZdMLm/I8bTnUKkmO6fSs5ZTyyyHkRg1x5Di3ZZ3ZV VU90NMqmIOqSpWInSYPFLXHT6ExYBOs2HppB08Lc6O1C+GMcGbm7iNYzMcshmXHz d11h9UCcxLJyll+0DiSh8f0jdLl4cdpH4YbKVDq9BvdSS5wZmeqj8HhaQG2T/UYA YRMiAG9vapRbL5Dey+Nc8UU6zqPYSUadjzSjkrC/v4Rxts2RzxhpZvWZIDaQxBV9 LIacQfR+l5x0vhZom3JyKWdLomEgg== ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=PyPsL89gFV1JP+jw95tdzw014b+zxUCI3bnfPF/mSpxAUJpoh9VEyWSu8hEHJ1XIQFPn+jjfh4U7IaehY6u9p91vC4m2rztV5TC+RYiIjQCKZ4WihTS+QznWE+2QGx5QYg4veH7eCRBxKMV927X+UjmPempt484hvXDBkyHjw4gTLl3N9ZPrm5f4ZsnLM3i0X7QmYxsZAWWfagDbZf5/PwXbasW5VSPhjZ1ji/E9C7u4az1+0dfX+rpDI9sR6EdFwFjNkG7v+7GBsIuXwmQm8MJBgU/xxMFVGp7OFexGqFy/DjLljAUjCMDl0aM5LbRxINCacWI4D+1CDGpiolc2gw== 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=gSn77C9x/auiRQJuuHWYjX0/vtBeTGAzLAkSeoNP6aA=; b=ve3uswrWKjReUA0iNaE2ebI104To1dgz2zwQ6mTaF/FoxQQrBK/+xmqPgSeWQNpmOfbfG4VM1JDgpTRojuKyxDjnmMxvGBJG+tF7ZJ0137A6XJwmQZYYZKkq8Kgiygy1UJQ3P77IeBL1A/ASGCRkns24OznsNG4yn1fJiv9gV8MnhpBJinuEiBT4QOdQNBJWOld8X4/rRMBrlWYOmyEXT1rlzhj2oWM+mIemhzfHZzn01gRtaXBftE73ys+Jd2jEvqOeJAfvzRPJBdzgftZQQ0qSSrBLPUBpviCsb4QNjCvPwDKWH4ApvX+8vaignk1YhThZK9OAxbb7gSlN4Q6Q6A== 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=gSn77C9x/auiRQJuuHWYjX0/vtBeTGAzLAkSeoNP6aA=; b=h6m1pAvQa3tBbBc7aTCLDP1nSNOzCtJtnKRP/eOFHwHtKUG+M1k2oU8EOjKw4G1lugTJA8Hd9apeQqQPr2Q1qbcO0o+Zo2FVJNseEK8XymAZ+gzLRZUdNIoaWxv3v0d9wTWssvDPyegc5HevlQH+iU1og4/ZZIo8/lxQvuQnr1xSXMP3NRGUsqMhyAKAA5DcTOPQc7IA+coy6Porvr1w4XNkireD0guBJNsg6xebyipN2/fyXlsVeQXqj1ul/tna7n83/VzVCEDiJXyTsN5HB09btRSjx6J+blA1+lYZDyLYtm+aQ0/1XFHJxcktpC8vTTleH7GmIeol83GY25KOVQ== 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 v2 10/12] hw/i386/pc_piix.c: assume pcmc->pci_enabled is always false in pc_init_isa() Date: Wed, 18 Jun 2025 12:27:15 +0100 Message-ID: <20250618112828.235087-11-mark.caveayland@nutanix.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250618112828.235087-1-mark.caveayland@nutanix.com> References: <20250618112828.235087-1-mark.caveayland@nutanix.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS4P190CA0037.EURP190.PROD.OUTLOOK.COM (2603:10a6:20b:5d1::18) To PH0PR02MB7159.namprd02.prod.outlook.com (2603:10b6:510:16::8) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR02MB7159:EE_|SJ0PR02MB7295:EE_ X-MS-Office365-Filtering-Correlation-Id: 1b92beb4-1f66-4c7e-28ba-08ddae5b574a x-proofpoint-crosstenant: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|10070799003|1800799024|366016; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?MeMQJj5RRQcHxpbelYPddBW7cS1UQs8OAsPER3Qi2PTNbl2I/N5UBKtnmKQ9?= =?us-ascii?Q?Qa8vFthdNlyXBYFdPodOMnm4/hfscEn9xV3+E+uB4G480L9p7l/zM0iTTH3q?= =?us-ascii?Q?iPBpORPDwxFjvA7uLaN7Ex/O0ayrjyi8pNI3aHaz42Bha3UU9sfZ0Vpdz4Me?= =?us-ascii?Q?c2eya6bdrCFeysCFnNEphLSCWBO9t+HKqBYuX8JxxA/Tp4vpWK6hHAv/EtBf?= =?us-ascii?Q?AF0DGu9WH+blMHl1yrb0de2+gZJTH+NGRAksjLnzPs6+H1Ot20DV1ZWwzige?= =?us-ascii?Q?JZKQzEL8VnRcaod7Sb6zyUpIBeTQcskHdwc+OWoSEKeZ4AJ1o5C8e20siSKX?= =?us-ascii?Q?RVrDDHUS7FHRDhVHDgedCv2p3KXu6OojxJ/GwGeFMNWHL9V4HprKNlOWb1TK?= =?us-ascii?Q?labYSdIcsNkw4G3C5ksfLefxVxasudY1BKoH0VAs/W93KwfBq69YbzJveX+i?= =?us-ascii?Q?uJeF3O7Vpb2JsXnlQKHc2HEwr9BZgmFBJsMWsLmK6EX6TqpwCKWQFSqnNAMl?= =?us-ascii?Q?n7Cf9LEwpXGpYIspoeZUjztW/CysOw03xj6zsR8QZ7FsTTqRtdkmDsfYWFta?= =?us-ascii?Q?XsDoOgrxWeBNLDrLCOA+EiBxmcsMagEk40UfAUtKdE0q70lvtzAXsaIM+FZj?= =?us-ascii?Q?uNajkuTDi0IFbzonCasqR5AdUOlJFyiN3ik99ddteJaiXtDTKB/Etrf+h2um?= =?us-ascii?Q?ZxiR4lyiwLuku9YdPo8aAnjDev5kdvfxP2vVK8+5klr/31f15BXwjrkqms3e?= =?us-ascii?Q?6/4W27XR1v5oa7IB4SkStUGZ3toGoZpvam1x7OC84pSGljtm9kAx/qKDzkqt?= =?us-ascii?Q?II9vzFidS2yj7xFZtnsbwuGQDaf5hWeJjpcv8f2dgFR33waXqGyCDU662CUS?= =?us-ascii?Q?HXBimSYcmN8pDAaIS1JjDNn58ZT5VZKeynzQOnS+jZq3Liws52ggqbpa3YtG?= =?us-ascii?Q?yJje4Ekd6H1YJfzLoaWeHujUBahhjuIhLpQO5smVMcGoQod88jFz8EqRgnOI?= =?us-ascii?Q?YjhhQdVPHgIzhJJU0bOPJLN/Yvw7ymTdUjvJU4UsRHcE2TbqUE5auIAt/Zm4?= =?us-ascii?Q?mcxT/5pwfS9uhgBOFC4WSHgW/T8jaReTx4NU84Te4zkSPehFKxYRuAF2LcQT?= =?us-ascii?Q?J2zHDWyew5X2m1oY2H6XGumkgNZAFwGXYpE4hNsMVAhpgw/T/blUG/L72lfI?= =?us-ascii?Q?Ii8vmMXbwsDlmwNUd555VjlQhYhV2C6uzW/AGv65tK4CH93QtAoxx+ZURQft?= =?us-ascii?Q?WzWNhqDUQ0M4PkKCxRt5RyzBRoFq3xKxFHV2S7HpbuDdPIlKBfwB2L3fSNiy?= =?us-ascii?Q?R7lUKhyq78OD3TfsMUEMg0G+/wL0al92vDNewbv3jWQMt1AAkPtl9vsSm3K+?= =?us-ascii?Q?fSfVbUk1bKr+vhEu9fF4zSlJkJwBIxXuHProCUpBvqbfP6Y9AbdKsT7Mqkdc?= =?us-ascii?Q?1ddFNsmcu0k=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR02MB7159.namprd02.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(376014)(10070799003)(1800799024)(366016); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?wQUbidhPZGqcrqRavGaPOtG4zfCIw6zsuTpPZBfXAmMpqZhcobR7wM3fkyPF?= =?us-ascii?Q?yuaZ1nJKt0FxGpzRuL5jtdBICz9O4Jl87K8rklYBmCOd641I3BqdJOsKwYC3?= =?us-ascii?Q?ch+Ipf4x/dbL6QWGLNld0aBixbEZLpShtPIyzscAko1RlKnwkkyUrh5VPbJ3?= =?us-ascii?Q?pczQgjJtpXLi0g37LSii1Bfp4S31Rkw92gw1FyTENoUI7CIvwVY1FKH2grWN?= =?us-ascii?Q?9hV+zGk2574E1MxCT45VY7lli4TwHJGJn9bggjWgc+5IEC94g7kIWIfqXogb?= =?us-ascii?Q?CoZolWVQCRzNLpaWw1S998empnsocNJ/P4y+JQZpl9JrTvIha71Fjy16Up+P?= =?us-ascii?Q?sGTvnsJ3aYN3bve5PWez5TSSMuFvJj0ruTcbzm+ERnXG3ogdpbH2htJvk2ZA?= =?us-ascii?Q?Vry6Q6jizFkjLvKWbE9q7Z+Bji+SPaVM6rEPKVCGqgIXBM533G2hDm4omuvw?= =?us-ascii?Q?tRZPs1Psx8/vloBKrCxgUfY/Q4mKMT7AZb+7ZhXIZO/9GhJ2IMPr2oI986tr?= =?us-ascii?Q?27nn51kFJCZZDIrLf2w8JmHdnanp8f3wG3Cdt2c+tUvVib+/Pr6Huwv9aHTD?= =?us-ascii?Q?m2eoMnFOHHQzt3O2taCS/v96h+71x45nBiA3nQ6JGxG4tF1JpkSgaqXtHPCJ?= =?us-ascii?Q?MdTCdXpZ3NmkZRkYqHiKJ6AFr2YQi7r+D1ODNh1v7xkeFQfNfV0V6fQImMXC?= =?us-ascii?Q?8+9zp7LQM8FX0zk9Wgua2oJKQN2fOvJ3N7u3DN++mTRyBE4F8/8WQoUTTyXs?= =?us-ascii?Q?JLqNgIRdgW1Lmk5DQvJ9JHp11OMpfEEURUZsr31xhAcbK5k+1sscWCeFf/FI?= =?us-ascii?Q?kWABjmGzUVV6av5tM4p+HsykUMcVpEf4+3ozLUFj8jXtD3mYCjsKX673Cvu6?= =?us-ascii?Q?rPuyAxZxw87vE0Hu4RPpeN1LJFidzTH3bBdZ0pstBqYbx4C6+Cb/M2T8ksom?= =?us-ascii?Q?EkprsOmVVDAI+1UPYDDfqiKzvOs0wu0GCi9QdyVIVVxdUSBZ+T373qoUOKuy?= =?us-ascii?Q?gtRZGi+gA1tRku4JyOSah0yB0/3oJCI2B0V+HR9GQAqC1r3ixwJF1x9tTZEL?= =?us-ascii?Q?NVHSuTCkYsxwl5XLLGH/BR3/xEtNO7+VsucejDRqHU+rJZ8hFfK9TXba38gU?= =?us-ascii?Q?lA/GJipp7aVPFdn2xlbxKlELe879rXusljDr9dcRZQysZ4XG4MC5fR5fAsHH?= =?us-ascii?Q?UhDhqpB4lRxEKS6SmBM35NOMJD0EUzcOCY/TisZIVzncMPNrP4kw04LqQ6uy?= =?us-ascii?Q?+Ru+jiNxHZswLCbO9ltIpc+zd70v0ZFfVzpTBRZq3U6jzZVmH0UaCNvlR3MT?= =?us-ascii?Q?Q6BC6NBgo0y/lIVYOlIdIpsO7MLwdGFDLbanGRN8ysrlo3GBI2VWFL27OVGa?= =?us-ascii?Q?Go5L5rtwN6K9nz+riuRuGzL27/U5Ogfneug6sGk4n54WzdQk3VuuTUv80S2n?= =?us-ascii?Q?qkNI4Q76sSJ0o/37UfrfeJMl8shTWBHQCfWDEM5aoSd6/5ALY4FuCdT6cuP4?= =?us-ascii?Q?NkaxZdfiLL32Itq05ISmoy3uCEJNSFtCWCR8NzhzGitYAxfI4ywI0Pc9n0JY?= =?us-ascii?Q?zbQqW9UHnfQW3OCk5lCXNl3/Ld3YhC2GrxYdLfQkWJI495qSQwcvm1rcHITf?= =?us-ascii?Q?cf9T5HKJZs0VsqshjRTctSC6CV7S6aMANSE7/NItMUV/UzfMjL8LdGa58kmZ?= =?us-ascii?Q?7uNUAw=3D=3D?= X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1b92beb4-1f66-4c7e-28ba-08ddae5b574a X-MS-Exchange-CrossTenant-AuthSource: PH0PR02MB7159.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jun 2025 11:29:08.7151 (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: gmLKMbaIOp5tLdPFu+mQAIEe17hxsT4He4nrKfI+dZiQFbvAor9kvcyM5OVKgrrkORQzoEMsIRL8mWQzkiYcbjAefw+tC8iO4gqvrgyv0Ig= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR02MB7295 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjE4MDA5NyBTYWx0ZWRfX6O+THFY9EF2C tJEIsKkW1UJW1vQtTGpiimWh4TGKh30l3jNw+0ROnoh0bir3aHETEXpwDkzYG0z8RF1ftob8ggR 7m9OZRt05s0VrqqsRZH4ehWTeLV1k08ZD0WfS2yG5x/L4b0Er62SRTGmP6Q6yOakidgrOcjXUuW ch2dBVV8SMuRjMbBK1dU02S1iMp1jAYhvEMJskbf4jB7sQgdCzhehwC09ABf6pQhv8tGh9BHP9e nh+dj/iNcFj6vbmYzp8jCfJegQQ/DTLxzcT3Zq8nFB75ZHCrQeY7i1+qd2CRE+y7M84hB5hSgc6 AdezlmcFdAsLwfZD0l/+LJ4nYjSzuYr3mzRS7Q6Psjxeh/yQ0Y2nvMOl2Sg6y2b+8dbvfMqzbaJ WGjkTVnEwgnO6gwgVlZlTyuG0fRuPrHoPhAU9+HobRkJI0nwXHwVl8q+jFSPle9xhBzXN5Ea X-Proofpoint-ORIG-GUID: AY9tJJJqkYYyCE2_Ltf-BwEHyUTCoenI X-Proofpoint-GUID: AY9tJJJqkYYyCE2_Ltf-BwEHyUTCoenI X-Authority-Analysis: v=2.4 cv=LIxmQIW9 c=1 sm=1 tr=0 ts=6852a306 cx=c_pps a=bSwf5PjAXtVgaDY3/5TY7Q==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA: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-06-18_04,2025-06-18_02,2025-03-28_01 X-Proofpoint-Spam-Reason: safe Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=148.163.151.68; envelope-from=mark.caveayland@nutanix.com; helo=mx0a-002c1b01.pphosted.com X-Spam_score_int: -46 X-Spam_score: -4.7 X-Spam_bar: ---- X-Spam_report: (-4.7 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.895, 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: 1750246263650116600 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/i386/pc_piix.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 03bd09f680..279eab10ce 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -462,7 +462,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); @@ -483,7 +483,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 14:11:20 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=1750246249; cv=pass; d=zohomail.com; s=zohoarc; b=VE+VDp1fj/hJctyfFC3q6qiU2VMPnmd3Zj4HsfCowzMf3FgaQ4NwN7yHsLtMiUE4p3UFpQOlb5fNc+aMZSnuPD/uhRH8TdseKxxh3Yuck0qSN4iT4vVJICukdaQd1fGsIUIhxtwmb/1wB9UWwDNQMIGyfmT3/tw8F5e9wWnS8xo= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750246249; 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=YXgNAcT65xEeiKBmtNJjdXPE3i48Zr8lTpDcjhf1enk=; b=B1jyIlQt3RqHXzDtMlmrXSZvgnpJxi272FGA9OB/98Rmb/q3FWFNx7hwoYNrpxWfpZS7DWjIiQUpQ8Co41CXEh+D/vWit3i+MermDIFsXMFGEnQplfUxfFQCY0EpQZXH1kFHVUq+OfX6g57TCDceFf4Y1hL6GUVCzh9l7BGeneQ= 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 1750246248998388.86254782214087; Wed, 18 Jun 2025 04:30:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uRqym-0001J7-JR; Wed, 18 Jun 2025 07:29: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 1uRqyl-0001Iw-0p for qemu-devel@nongnu.org; Wed, 18 Jun 2025 07:29:19 -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 1uRqyj-0002Yl-Cj for qemu-devel@nongnu.org; Wed, 18 Jun 2025 07:29:18 -0400 Received: from pps.filterd (m0127838.ppops.net [127.0.0.1]) by mx0a-002c1b01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55I7qwBV012989; Wed, 18 Jun 2025 04:29:14 -0700 Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10on2132.outbound.protection.outlook.com [40.107.94.132]) by mx0a-002c1b01.pphosted.com (PPS) with ESMTPS id 4798mygsuq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 18 Jun 2025 04:29:14 -0700 (PDT) Received: from PH0PR02MB7159.namprd02.prod.outlook.com (2603:10b6:510:16::8) by SJ0PR02MB7295.namprd02.prod.outlook.com (2603:10b6:a03:292::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8857.20; Wed, 18 Jun 2025 11:29:12 +0000 Received: from PH0PR02MB7159.namprd02.prod.outlook.com ([fe80::6cf9:b35c:b143:bb88]) by PH0PR02MB7159.namprd02.prod.outlook.com ([fe80::6cf9:b35c:b143:bb88%3]) with mapi id 15.20.8835.027; Wed, 18 Jun 2025 11:29:12 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nutanix.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= proofpoint20171006; bh=YXgNAcT65xEeiKBmtNJjdXPE3i48Zr8lTpDcjhf1e nk=; b=BEbVEROKRTJuiAH1YDe9Sa54WrYm/ht0WSLeaJ2Hl8t3yA9QB4ij6NnnI rP4hlQIoEJ4ra0e26RuJmtly2l3rfFG/gEH7b8pg8NZQsVCIWd50Vby99/FmZvbS IDKbUPH305Y/rALI0g+PNryBueS7DWV6ZnYJbGes3682/kpCjFlrpkQh3gdWQsac x42GB9+LmA1KgQe7aCIOUAevPKOG3iDtv1gYHPnNTimax7YgdVMJDeyULBgpUOJ8 Q1gy4iSi6tYI/DrLmCYFTSSgX9kMoOwNo60hK7c3i/ERbryYmKvETcptVZB1bwIF OsMxsqhTd8I//EmqqvkEeKtpQtXDA== ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=h5Qhd+MBZpYTPMlpYcTrKV6zaDfvWitt/F5QtJRxhPUdN3SIGF+d36i5Ue4kgzMZ+EdnKUjacrI8ylK1BI+k8RO8KjkmrO5OeHo1GOIoQOOqyR68dKfl7gMW658igm/3T/Z9UvNdeLLfhbEGfweIXOXoc8tyNj9SCVxrImc6K0d1C1AhInRVSNWayEg7LWlnOd6afCoBQws2nwd2kZBIZAee4PUwJ7XxoZZGKVCx9dLf312h1ObHypBcxnnjcUo/c9MtJ1dxIMZvqwPPLSWAEAVPiLSax4lyA8U0srft6YB7lMcVpSJCOEpS+rpzp+1YDptgyaDrAeYkReXs2ysp3Q== 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=YXgNAcT65xEeiKBmtNJjdXPE3i48Zr8lTpDcjhf1enk=; b=okp8gVVy1+p7iBxke9nYgKFmNMsYFSbqJ8BrIKD69eb8VAbROJIUReoSSi5lrDCzcy2FodjkjacZ6sbtc63TwNmQjlP8iUu4U0aUr6qLJqbap4HaV8P94uZ0V6mbpg/Oe23YyIfAE6WZFsIecte2i1M7iZfvaOmuDINXDLrC74I38OxDaO2VeoqszIX2EO9+9MYN43hQm5rRgPlqDyZMWuv7fP7+/TDpdk3ysT/ZdfCdAxzRxn0Wf2z1BLCfnkkZaaTBCF6K4U0oJZ6tEPEZnfKS1drds2EEemvr3n46W64gabKbIr7ef1/zTJ9KqEXeaOActPR/33kobYfAO1P1cQ== 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=YXgNAcT65xEeiKBmtNJjdXPE3i48Zr8lTpDcjhf1enk=; b=pkOvqQnhra70Wo5cL0ojevY8tIiFiwQdl198bwG3ZEfCvbX9zSXVQS9xd/VECX1Ssmu2LBpsm/r39OOvtoYoVjwyloQjWjqh9w63bOe0H2i5OyFrcatKQNRdCeC+PHAPaHpTi3NsgyGHOjRLkzNWPWfm6Y1SYxrFghJ9UYfTjS5GBjOnVWCCC1EeavBD+D5ys7JPZJFs+wGxcrXuCQqmiEC09Iobx9iaiO9X2HIZLkZLbwHkmX+D1CQ3cvSMCK59cvJBvZYI26nNMsA0egi6Ty7d0zLd+zHzrCwyPq4fW5yJjpDPpzq2SHCcKUxPIkFswVHH/SLZVna3ATkeznODow== 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 v2 11/12] hw/i386/pc_piix.c: hardcode pcms->pci_bus to NULL in pc_init_isa() Date: Wed, 18 Jun 2025 12:27:16 +0100 Message-ID: <20250618112828.235087-12-mark.caveayland@nutanix.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250618112828.235087-1-mark.caveayland@nutanix.com> References: <20250618112828.235087-1-mark.caveayland@nutanix.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS4P190CA0043.EURP190.PROD.OUTLOOK.COM (2603:10a6:20b:5d1::14) To PH0PR02MB7159.namprd02.prod.outlook.com (2603:10b6:510:16::8) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR02MB7159:EE_|SJ0PR02MB7295:EE_ X-MS-Office365-Filtering-Correlation-Id: 9cd99dfc-7323-4a86-1564-08ddae5b59a6 x-proofpoint-crosstenant: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|10070799003|1800799024|366016; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?oCyAAH/aWDWgpkDb7mwHcLl/Tmesvw5tx8Zi1JpMz3PICYgyuX2OHlVCTzOk?= =?us-ascii?Q?P9oKRRs5Fg9dQ+1yV+eMmHrneRRz12zgZDc5d40zdeR1xflSohfbHEqY6SRQ?= =?us-ascii?Q?Jh9bPybqq8xBBEXRTuOsbJiDlZPIcSSSEl0E3cLtlk8VyQuxWo05r4HuINfa?= =?us-ascii?Q?yQxBC8+t9b2pzS9AhzyQAR3tlrbC1tBH8EIR4c7RJEe5EufWURWQjIryC4Zd?= =?us-ascii?Q?i/HiJ1/IiEKXG+8IzbMzWryP8xyMVnfAYG8Rks6KqJ+lL09GxWRm2XZSLvDE?= =?us-ascii?Q?01OJREKoHkvrG80QR6XHE8LbkmKFPNrYW6dQxcHTpCsXh6i/yUFgS5Q2twQC?= =?us-ascii?Q?TowM6Ph4gNNZ2oVkf/7MkdJ+OVworH8/6LOJYzVhjoWYwH9ogAEVKKWusWRB?= =?us-ascii?Q?0SkS5tZQ83Jpde8QA/atEz9FS4E5zu8NSSJlBERC/ZQOw3ALoPzq3gHQh0wq?= =?us-ascii?Q?1rroUs/XvHFbYBDrUcK3gQMci5eAT1mWLJrf1SDH+6cmoJe3KUtDpYTfhUQk?= =?us-ascii?Q?bWhzaFGm0ASv3FUYagl+hwTDqmkP5wYUIPvSc9ICW4bkG3u5hsOm+mrrTmBk?= =?us-ascii?Q?cGd084p1VeuFxKEdYIEseR39Vpp8jV/NMo/CxNyZMXyIvd0tri/Au3H4JhAr?= =?us-ascii?Q?Mz2VfOn0pK1dx7oimRl37O00zJHhmwBMYx1rtFVN8G+onAxUPsWSMlyhsasH?= =?us-ascii?Q?ODb/BDC7zEwSkKtqHPx+Iz1pylsdB2cEuBsA5SGyw/4pTg7CARWbCKLyu0+f?= =?us-ascii?Q?YQQtHVi1Vf64fhaoejWhEn7BNoGZXM69iEAdVFdLgjpx0cBziqaisdn03OPJ?= =?us-ascii?Q?P3U9We5eFneJZF6z7M6kc6hoCDknPqS6fMpU/Kf5hNeoWdci/xzxEgUUyupe?= =?us-ascii?Q?+edGZfyAOAprY3P761QBCECLm1+VuYmFHxKnNBer5pzZnx+DSUKsMTdCz74t?= =?us-ascii?Q?nljwFXO+429+9O4DwdHXHE5QkY/TLeD7C/mVeYXrLVeeW4cdMHxpO9mxQIm8?= =?us-ascii?Q?A78zIIUnFyfxJwloq9zpnOTK6dDvqPJNCVjbf4nKpaH/w+AS2Czs6iu4YVH9?= =?us-ascii?Q?yUPUdfy151YLXGxDuaWwE+l208ORUkm4noBW0x+RSGLARW7p+XZWMcSLB64Z?= =?us-ascii?Q?zVZLhToIlWVNeiZDSfSWLzkIm6vo6gTkEg9vq8Fz6PgxNSBy8YWfZIaLm8E0?= =?us-ascii?Q?mmrGsQBFfOwkQxEF7wGmzbbXjKAzDhYiRdwwW0j+X3jBxG3g3JLLjmK/47rV?= =?us-ascii?Q?NrRzR4hTAwnpshwqjFrZaC4ASLQ541vR/BfHcuQmdgiWEOp/e5h96hb5GTMH?= =?us-ascii?Q?H5NvAhOmIiHXRoMx+TGFsQWuUUqVJFaPmlF1L7f6+KhM9+RuVh+qq+0dTwIG?= =?us-ascii?Q?0r/5k1RG95zhsk82AJgw5OOl5qJ0mTcvr3snrR3toDBNe6e0h5sQUjM/tfP4?= =?us-ascii?Q?SUS59F2NyH4=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR02MB7159.namprd02.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(376014)(10070799003)(1800799024)(366016); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?0d17yyvD12UdmFuYP7s3Hh18DAIU/NvT89yoQkzZWjkGgzhXKsXJn9BFsEwO?= =?us-ascii?Q?SHttxb+PrBjNu/tC5MBsF6ifpUi390iHbkbwODHyYXHmBjEsQLsdhTXHrkjp?= =?us-ascii?Q?oAu4pywzytZlsuy1tw+XYQE51OCZy+QnsvKsMVZRhBo3PZ7633wpDADSHoXl?= =?us-ascii?Q?wowZaOG8PhlVHKVp1RQdDpgNL2G7nloOb/j/xzZveaPLxaF1JEoyeiBZWR0z?= =?us-ascii?Q?VvhKDxEeMfoUJpin5LFJZ8a1+F7OZRbFXu2NTT+c38XaPtkHc5vIpCPiNwdb?= =?us-ascii?Q?FQsB8NYxHFGQBIPdWrha7nkuEJRz+NiocKlHpnZqlH4EaTVsFQPcJaVzOEEf?= =?us-ascii?Q?bEqWuyUS4Ce8XAf+zpX2x65MoQtBzpTHgScdr7EFf1DOGTRs1FiQeMx9gRG+?= =?us-ascii?Q?j+rEgxxF/e9qksOfRq+dySxJx3nVdJmNikgN5GWfh0+D1Vh5Zp8+/0NxTqHn?= =?us-ascii?Q?hTrZb5gTTPO7yqrSnLAzej/v+aZyhRMjRfjWmwNp95reRJa/8mJeQJFHA868?= =?us-ascii?Q?Uekcb9VbbWfkvGFvBFRiXpqP0EcvGdTuLSPif8pFb5SalCacTpak1hKsBNhm?= =?us-ascii?Q?s3LEaUlJ3uKPKi/mVgdlpfGUES4a009VoKMcLkQlW9Ted/NeDEVQXxN3a/X0?= =?us-ascii?Q?CCH2OLXfHnZGJdEcGjioxmGPwAuIwaQWAv+DXWaSNkpa1RW/iK4/cxgEDRqq?= =?us-ascii?Q?2sXIseloYHBANsFQqaj7MXv05VcYTvmoUjL3eMEMrF9wkSsWVUP8twCJxaS4?= =?us-ascii?Q?KYqrJp3s8KRPkSIJYyucoDzH6QMBxUSILYTyJljg+x43pa10QholGUeksSPf?= =?us-ascii?Q?PDvzf3p33Ah/G/6DHV+hs638T92/f+4MCCUSfPu+nkH7/zEWWwJZyN8JqOCd?= =?us-ascii?Q?SqDi8+HvCiUNBkBP9d6ZuyQ/WX7oJKPBi+E4lkkzGdXaZz7vKzZUVpFSB+yL?= =?us-ascii?Q?LGcr5TLJ2w+KgO6SCNDvVM9vqR2ccc+S3tfv7irwvL+VgBJ8ZxchIxWChvg5?= =?us-ascii?Q?dpPToHsRX29v91x4PPjIGp9VOWcv+ERDUfOC+/E16RPIy3+8TZlxIhkjBYvZ?= =?us-ascii?Q?D8i0l2heFiPK3+JKk140ot6oH9KfZ5Wkyu4ZozvIMiebl5umnUv9tUMu2fKt?= =?us-ascii?Q?mt8eAOYFi3QQrqAIVocgiCNrMi1Ib+f6YCoQ6tjAm6s1Qfguu0UbSXYf3S6x?= =?us-ascii?Q?zrp5fRpgNhoInNWZOVjpdOCsnHCf36gjoUNPObis6EJvoluIyIi4Frywy7Mk?= =?us-ascii?Q?VHil6sChkA9mKuqosb6ZLVHj4I1T0dZUVUMIfhdk7IOp1g+4LpgAu4uGXb2u?= =?us-ascii?Q?1hWlY1JsLyOJLhDUhFOraMIFBILHWs7Y5am+1wgDulLdk7QbRF8wGv8Ctysj?= =?us-ascii?Q?ra8WDuGMigR2JyZQ3Tec9kzVYJ4137AveQoi0ZZMBZnEy1/HX1U1OVsg84q0?= =?us-ascii?Q?UceQ4hvAC9R6gyt3vCVgYIf30DLiXLjhzzXW1thfMSWoDEzQ9Q7jQe2VQxs9?= =?us-ascii?Q?sM+EzuSY1k7ceJEKXz2qQEWxbiHg8jMvBgO0WH7WORWNSHtUcqKBgky1WneI?= =?us-ascii?Q?BxMkcyN86crGu2xvpNlYp7SriXvZd1opo+YmNKjNcDewNsvNMptcfizhJLWd?= =?us-ascii?Q?bFM7CrfJf62Ol2c7Jc7AVd5MXuDoGHrHiFno4Rs6sO9HlpiIofGBmO2i0otm?= =?us-ascii?Q?9YoPyA=3D=3D?= X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9cd99dfc-7323-4a86-1564-08ddae5b59a6 X-MS-Exchange-CrossTenant-AuthSource: PH0PR02MB7159.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jun 2025 11:29:12.7604 (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: KuVudy8DChAZdpAwc77CX4G++dzy7CMy44FB822ZJj48AI2cCbebrxVi9QzH5p27d4EAlguLGZN6NC0Z6UAz3Dxx7aTRerBhRtR56xa8P4Y= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR02MB7295 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjE4MDA5NyBTYWx0ZWRfX/yAu3c7dP7uu 9d0Gl57QGlRU7ch5Gafs/BIP0W7iE2oO2WR0kxiKgX+5+TLXQyo25a2XCsyuvyMLL4gO5FJWczu U5POeArtFd1oQM1aQIMcZJl2UbgBt+jW+62UjsWONsqSE4aQ/QLm5f9Xd5ip5JptmbPInJ3/aCK ayLSFwsNjsyYA/iJagN9UO3xSfpSZqeeNgQuZznPYW4GhG8Y6BQF5Jj73y44OzVDjxGWNzOibHi KguNo2qxWvDmAuOVkRudHOC2MC9w6qk4rAAfUHnCXfWyDdcRYwKYcXdh3hGoeCqYjKUPaFO8kFP 0LOtUEFToYnmx78EdvxBFvutCJftqr9zb9d9xzj4s0/ptIIisT2kG1DzCw0qWzrMd987Iw20GnW XlO9B6SK9GyLrAXjjpvXGO5mr8h4/r+4GsBfdqG07Ab2+Afjz06UjhIOLu8WJ6CuTFEooE70 X-Proofpoint-ORIG-GUID: bWf7ndCApHvRHq9m0xA5OUjUgs4UgyvT X-Proofpoint-GUID: bWf7ndCApHvRHq9m0xA5OUjUgs4UgyvT X-Authority-Analysis: v=2.4 cv=LIxmQIW9 c=1 sm=1 tr=0 ts=6852a30a cx=c_pps a=74iFmKrLo1AlckCWLuqWvA==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA:10 a=0kUYKlekyDsA:10 a=64Cc0HZtAAAA:8 a=t_IIakVZT3XxnDp3cAMA: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-06-18_04,2025-06-18_02,2025-03-28_01 X-Proofpoint-Spam-Reason: safe Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=148.163.151.68; envelope-from=mark.caveayland@nutanix.com; helo=mx0a-002c1b01.pphosted.com X-Spam_score_int: -46 X-Spam_score: -4.7 X-Spam_bar: ---- X-Spam_report: (-4.7 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.895, 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: 1750246249743116600 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/i386/pc_piix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 279eab10ce..f9d7967dee 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -489,7 +489,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 14:11:20 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=1750246214; cv=pass; d=zohomail.com; s=zohoarc; b=jRE0RIiX2JOg8BZXd9wIjluB1egju5/8PiQIKb85W7bgPyKLfcJibkFmSEOKHZkS3aThxAZgOPinX1qe9U5n3+ejEfl8UROpoxQLDT3PahGLAwVAnNIeynRDXfimgL9Qn7vmo+MfnWaI5OiNp5EZlftbCkyG33cYtLsH4Nq2z1w= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750246214; 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=sUhS4BwRsQGCCetPr0N7vU6RlEldFxH529U2kEOpb+M=; b=jf7v24JSV3T6BzrDQgEpHkq+RXfVy5t/opZv3Hy6C7Ax24msl0buLOQ6uux+JDM605+MSQCM4QyLy0nFfXHLmwyOBou430GzEXZ43VmYq+0ttis41lldtzduXqLsMtvhpAxa/C4/FMOLZIseSH+cXRwcKXZZ79KFuajcO9Ztq00= 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 1750246214898442.09488845598685; Wed, 18 Jun 2025 04:30:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uRqyq-0001KA-JI; Wed, 18 Jun 2025 07:29: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 1uRqyo-0001Ja-Nq for qemu-devel@nongnu.org; Wed, 18 Jun 2025 07:29:22 -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 1uRqym-0002Z3-Du for qemu-devel@nongnu.org; Wed, 18 Jun 2025 07:29:22 -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 55HNt88q012156; Wed, 18 Jun 2025 04:29:18 -0700 Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10on2134.outbound.protection.outlook.com [40.107.94.134]) by mx0b-002c1b01.pphosted.com (PPS) with ESMTPS id 4796mbgp6v-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 18 Jun 2025 04:29:18 -0700 (PDT) Received: from PH0PR02MB7159.namprd02.prod.outlook.com (2603:10b6:510:16::8) by SJ0PR02MB7295.namprd02.prod.outlook.com (2603:10b6:a03:292::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8857.20; Wed, 18 Jun 2025 11:29:16 +0000 Received: from PH0PR02MB7159.namprd02.prod.outlook.com ([fe80::6cf9:b35c:b143:bb88]) by PH0PR02MB7159.namprd02.prod.outlook.com ([fe80::6cf9:b35c:b143:bb88%3]) with mapi id 15.20.8835.027; Wed, 18 Jun 2025 11:29: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=sUhS4BwRsQGCCetPr0N7vU6RlEldFxH529U2kEOpb +M=; b=24AHSx+6KiS7qeLDQ5gvogyJsIe8ShUi2rdd7fOPCeFi1K4UvYB0APLqn K4jYSBSk5qNnPqbtMZjgJKV6pGXvfUOSXdjjsk3jhjn2F6Q+VcLXPzRVa4OJwcn9 CYVyVYjd6OoK4gYgQEzU8X35XUEFlwc3ypeTA4vZa7/2xaWm5zG0ndSfUhQ4IS4a pqysLcJ3tpLCQcMQ3d4PRpW7JkfYAOc1KPHasAq+kKvw+XwmTR6xCEeGrS1GkrI6 zrm3OKzAnJNCxYB+hMof41fu7hXmuB3lA+ve3pV5YG+XXf/Ti018tcsJYGQlorzs AXaaU115AnPQN4L1qQ03Z2AZ2aP/A== ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=gBWqgyoIS+nf9IBYmSNz1LtCYkmYtNAuRvltmzMnZD8Ghy+KbK1OmfUy8Nx7a0aVbLJ4CfkBpbd62x4i5oT2PER5WcJKQACkqbWNsPK5EJPqrrCJAPbuJsorvD728aWzIcwDdcxv6hJJSTEzxWLL+pz8QY2c1jmNLS2yyZyZewgQzYgDKEp+LuWA2DGRkJM8YVGlZVsvUD5RXRlnqyz+gnZfP+g7OKNYfU9Psez8XWD5ZLwD9iPIaLiaZCRAHlM0fSlbWdd7SG2DKqoDk0lXhjuem5ld6byAKRlq26vGKscqQqc04Hc3cEor+ajxtEwQgRWoGCSACkwE4ruE3ZCaOw== 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=sUhS4BwRsQGCCetPr0N7vU6RlEldFxH529U2kEOpb+M=; b=QXix6NDzdVy6Q3ntjpahw/sVDG7NM0bSlbvNQ1TLSGG1MRjH4SpUIgh24TMrtOmXrIpO69uA8J6q0VIdNPxgVL8Fkq2Npao5RgulcwPoJ+tTAHMOSy1IwcZP+WT7QLPhXtv5ic3hYIxy/rPpIPa/Ff9ZjAxaOWBwN307p1DK2N1+R3Qv7GKxs5Qd7kfN8cu4iYsilPDFTRkUtY/4z3E46Gha1MHKWgXyNc3eRJsiLW6Z1JiIhjKmh5O6Zj/ZJvXVGmFh5bM2lOBCT/ekPJi7FzKNuHzlJCxXkBzHeZvIoLZWEotfpra96JD9KDS/6OcEvVFRFhv6dFbKcSaH/Kxtxw== 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=sUhS4BwRsQGCCetPr0N7vU6RlEldFxH529U2kEOpb+M=; b=VpRLVTrKhY5DZbXLOoMZ019TlrQF/eGBZ33poMwkLN1H0trDgNRowfcjD49JUupiQLuKi5cL1AY0+5j75GHu9LqCuVDmF2w64bUbBz+/Iole5urL3/Ig5FCT0JB94GajmbaEGJtzfXQNFBKRwyjXsGM5KcA4OuuHa+i3muFv6P6U/ViMtw5a4/R8wLIQvA97yWpPdzHvHRWGSqyU25+i1FN7DI5lRv2Hg4HXTFyFFsen0TbN5YPBnWvxRPGmyKVU/78Tch0YUE2XLYh4fpWvK9fOa760SmlpARnPk2QB0HjGH0Lh0UtXy++ZLVYro8D0m27L3XCLhAj3om9Nwb2oew== 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 v2 12/12] hw/i386: move isapc machine to separate isapc.c file Date: Wed, 18 Jun 2025 12:27:17 +0100 Message-ID: <20250618112828.235087-13-mark.caveayland@nutanix.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250618112828.235087-1-mark.caveayland@nutanix.com> References: <20250618112828.235087-1-mark.caveayland@nutanix.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM0PR01CA0074.eurprd01.prod.exchangelabs.com (2603:10a6:208:10e::15) To PH0PR02MB7159.namprd02.prod.outlook.com (2603:10b6:510:16::8) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR02MB7159:EE_|SJ0PR02MB7295:EE_ X-MS-Office365-Filtering-Correlation-Id: 399c9ab9-896e-4445-d6e7-08ddae5b5bbf x-proofpoint-crosstenant: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|10070799003|1800799024|366016; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?SPQEGmEWqj3vwwuWbB9DQHDTHMICTQkfI/e7gAvk99vEk1THEmvqehHTwoKl?= =?us-ascii?Q?0DhyL6mPwqlKwcvbXgiw+zq+FbANDHfnMyRdozYuBulwWi5ir+VjU9PLDCJi?= =?us-ascii?Q?BOHuUtMKQNuj5biJelUI09iFrEAmaOLtU2nMk0HmsOlfn8jJ19CsMY5z8eRp?= =?us-ascii?Q?560o4nDTTHwe0JlebbzK1n6UIVvKXw9O9YAKYQNQwUepBFQojzNpoz6EIutR?= =?us-ascii?Q?W2aABKSPoC3jhqRCTlFaJO21v/ffRYQOCsOXPp/EeYcfI4q6akQJNG18RqTL?= =?us-ascii?Q?sOPkVaAyZ8Wt9OCt2C6gP9khdqV0Ge3tLzjctrw8JcblMeDkET7bCf/sxTdL?= =?us-ascii?Q?7DmwFZdhQqSjap36F518z2/jnAzj/nFuQ7MwMbf2HegUBtO2ePNBPPSRMBHl?= =?us-ascii?Q?mHGLNFkFKQyR77s9woRLQ5oViwFRiHxdZNdEOEofeYbKgn9xn3cblQ5EY8Kf?= =?us-ascii?Q?5rMr/X+eAP0U/bN77lGW6Qlz3vVAlMPBkKtSxHl38T4Lc5zvOi9sh8YOZdF3?= =?us-ascii?Q?UER/72wmpxxhFvb4rqu9J+B0u56Q9oWEaE8ltquZlXVa86xflGX60wRtBBVz?= =?us-ascii?Q?gaqD1WyNLY6iPNMQYrfRRTlGyxDkDlV0SZ7qa0rq772HLrHGC4Rg6AqXyR9e?= =?us-ascii?Q?aJTSb4N+34CQ91lIhGmwaddl5nS3x0ow0hBtqbkJbLM5AJNJZHMKCgNbG2aL?= =?us-ascii?Q?zi0oPkVDNclJZq1SyeMf/WYs4gLBVLVgjd7Sam6pYzL8XS1lVP5hhJ+InP5h?= =?us-ascii?Q?B8UCC3Onc9sLm+Sgjyp0dNBDnyMKuLc3d110HwIh1PFNWTIM+nTyVQYWofBH?= =?us-ascii?Q?oJFk4ll+ppshoud4pyTG4N1rjYW3oGvjg32OMFiTiyMQXwrwASbQP+uxu32W?= =?us-ascii?Q?mH8Pe4ogZKIi8EuXpOmZxOv6ZzIFSjdOmLRKscHzPPe5MX/FNPAqKntSCYwp?= =?us-ascii?Q?tjf3M+bO3L+Dl4QOiuq3PIWZ8MJ3WUKX8l/CAsnjWQ44foitqDuBW2YTm17i?= =?us-ascii?Q?UAey3vxRTYEtZpyvURLu4Dy1wTJCl6gxeVS3wIZ8A/XPS04wp9xKPt5HenLy?= =?us-ascii?Q?bryEAp8XYzKHRKlGv39Oj1x6E7hZ0t4GqCSTL1me/2IzbbOI85A4ql96D6y9?= =?us-ascii?Q?bq7k1kKTrHZdYuOFkQK/oalzi0TizRfrjXyMgbmz3zWIvkNUO7NOb5Fe0NT6?= =?us-ascii?Q?/FHbAPjL03LIj3/Qwv1dUFfDhuRgrBdgXZl6ROdi7ZiNMM0udqa2qGsAaWM3?= =?us-ascii?Q?BufUfLLN3aOTu6mpb3WaOQ2+nxDF2D7wpN6Tg/0XPZBKvEf5imU/hBInsiCN?= =?us-ascii?Q?ZqlMj68Z/NBnwV0INJimDXPZ3tUJJ5BWBfxEMGkegtoC2uwpzy5g+YkNwfLM?= =?us-ascii?Q?XzBjaVwZyrlHOKKoE+hxmOW+PtazcK1SCsOJZDe5WyREGfgm89b7yGEjSwpB?= =?us-ascii?Q?SKrKWUMjuw4=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR02MB7159.namprd02.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(376014)(10070799003)(1800799024)(366016); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?HWE19n/eBtorI27fo/3noN+ETXR1BM85ne5Yo6Uoc/yMZ9bdu4bjy6KZuW/R?= =?us-ascii?Q?jaIFzTGAVMuSNggnLHCF2s+5mOQ/EEvb6ii/zbx/Hq5pHmSBlcav7d5H5OJg?= =?us-ascii?Q?0RQ123UnmEIrZmhs0YaoZVazw8FejGMGMwsL2vuKwxxVrUaK/AGfA3TuARr0?= =?us-ascii?Q?0BEPSgMkkbL8BnA+tbC0cJ0vFTUZ1RbpMPzRU8s1DH9K3qc7eCTV6T7gcW/A?= =?us-ascii?Q?hfqRzShH/Lm1yWMFFnSsEeOEVW388iaMY/8BM47Le8eb7PlMp1NN0E0d8/hs?= =?us-ascii?Q?cndDSRplhgd6mJNw5CWJ8jWmX1da6t4d0MXOW1ZQ6J+YRz/td9+GcckRs42X?= =?us-ascii?Q?7KsIGYbgzJcRHHgrhXIOOkGsPfu6vMtIBVmeq7Wyb6nze7IoIDtBWuD3ld3c?= =?us-ascii?Q?KSgqHvh6R34kfRcFtE0m4LW+5yDcisKc0sdDYNxL8gVWSDpxm6++Vy+5D7Mp?= =?us-ascii?Q?/OUubFfKYQldlsIbkZq+xVSLEjLsYypKpjoCLkgTR0LDVIkwA7vMaxr5jDhh?= =?us-ascii?Q?XlC9cbD7YFcgEA1KiAdsuN1G0Y7YcAvC9ii3EKTxDIedjepiD/ORnHfUImOx?= =?us-ascii?Q?KtdFhIfKi9P1ac7BnZGZ0s3q2BODTf4mhsmy7HmRXmy0SuC82KfgS7Ma4PfY?= =?us-ascii?Q?sYcEOzDMR0fC46FADZnu6fYqGIfcytzElVx5+nkn438in6TYQi/mIOrJERNK?= =?us-ascii?Q?Tk5K/xG59l6QVfGtD9ToRc8B7r2qxwIZ2U90RwbSUYEElkIRTRWTMrdQOXyz?= =?us-ascii?Q?tHQrs9pzkbcY8JAjpJtRRcBu5SmSLNpAGJ+QEWVJIgijA+6LmPFsUeLSHx/5?= =?us-ascii?Q?HRtWHn2aupu6lBDSiOGfenOrtw3BedmXVkoInysvtf9ZFlMUDqoitvwMHVYE?= =?us-ascii?Q?GNBcmrYjsgsa0lP0miFBZ0QCmT3vS0YkbDWfHtzTI+vmUEfx+k172eji+ESI?= =?us-ascii?Q?kEH51TyjhaxE5a/0id1zEGIimRv3SRXM9isS9VXxplebVRbFMDfkS0ctdY1g?= =?us-ascii?Q?x1cBkO1Gm9oE2HluPATpc9JVE5s4kMVjUIgJ8dZhy6Jcpy4e9KMf3pOfHpSH?= =?us-ascii?Q?pxfW7NkykU3MH59DT8lCyYL+Yr6/S0fmyWIuzkF6IaRPF2E0oGrax79gJA66?= =?us-ascii?Q?PruV1LBZEQsQqXG3LckWNwR2dBuW0vvlQMQ+P4lJ25mL718+UeKNrw5j6XPI?= =?us-ascii?Q?btcqN7m/SxgNY3Q0Wjuf7hD3SeL9bx0LipuK1UtlPbjiVMgF1U6dBEqeXv1V?= =?us-ascii?Q?lVDv1TKftAkVyQRHBNVqmGxQtyFfOkWUZBB+hJaw1nW500F6cE5MiUXjCWIV?= =?us-ascii?Q?93F3elAGx7Pbv6/QPBnmtouSfOUqE9E/EebCDEuOGtB5l3AsoOh53/bzCIGq?= =?us-ascii?Q?2ObLf/FjNBtosUKbmw1XRHRidAV6P3obKHpQR2J9BHIpLHqU77vVVWEXMix2?= =?us-ascii?Q?MmUdDI4iNIiqAt3G+JYO06cixTMdCqxlBW9BxuHnFNrVjVKUVjjTgofe1Otf?= =?us-ascii?Q?TiktA/gaJftPU7SpaFJiidNs1bDmstZiM15+YbFQKybX5ocH1l6dzIYVxnwZ?= =?us-ascii?Q?ro4nZKvoD+p3SEs0DWekItgDPviEm9S6cPnzszTtFLiAOPp15wFneayy29zW?= =?us-ascii?Q?XJwgQSrgGaE6zR05xRVVEdfatf8QHVkWWV6Sq60VZzzBG4ekFIEKmKhUb63u?= =?us-ascii?Q?Y/v7nw=3D=3D?= X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 399c9ab9-896e-4445-d6e7-08ddae5b5bbf X-MS-Exchange-CrossTenant-AuthSource: PH0PR02MB7159.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jun 2025 11:29:16.1929 (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: 2uuNRwwpWm1wR5oislHxmiCCPVlrzzTLBBtxNW7Wo6kD2j7RNT4qisHFCGLt/5czw+KSjoN7ya50K7BX0IZ54pm9L8YUIv+Qwz6MRucgRpE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR02MB7295 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjE4MDA5NyBTYWx0ZWRfX+xQAirzlgWy7 xctM5oMmxZ4pafaEDsk5ZKRiCO7SnqLRdFNXw26q42NCKSrrv2J2U+TwPIIiVsYDCC8EE0vvuWJ 2D2b+9G31GQfYQEO+7G6cn/YTRBcbAjgD/EBivqB4JuP3A+mS67rIkTfoE0uQBMMOZ2rtuwm0uE lb89tzkDOKdDRvx7oyR7Ra/zx4HSIIrdSZ8pUUdr+CbRN8fxIyTF35RShbhaCybZMq/39iS/jnJ hBeN8dQDy5Mq4R+/MYudC8QWA45n0/3FntaZsXuLLY/Rsh+wRVdN4RR1lG2iYOwL8wpYCiVmok2 G9VZK8lUG/XaAkS3DEsdWYins71gAmBKYEAduKuGRjfSy7oe2Is8SvFHdA1/3G61Vz0AXmD/tsv ngv9hdcCZmMDieML89UXETIRxLUuBT7tWKBe4hU+XdJFo9pZb0g5ZqYKPikFla1lkkOvYPxj X-Proofpoint-GUID: 94mZcSnFujs0jjggavmLcmNgyS8lePAe X-Proofpoint-ORIG-GUID: 94mZcSnFujs0jjggavmLcmNgyS8lePAe X-Authority-Analysis: v=2.4 cv=cJXgskeN c=1 sm=1 tr=0 ts=6852a30e cx=c_pps a=PAifPqZgaDtQ0C0O0TEnEw==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=6IFa9wvqVegA: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-06-18_04,2025-06-18_02,2025-03-28_01 X-Proofpoint-Spam-Reason: safe Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=148.163.155.12; envelope-from=mark.caveayland@nutanix.com; helo=mx0b-002c1b01.pphosted.com X-Spam_score_int: -46 X-Spam_score: -4.7 X-Spam_bar: ---- X-Spam_report: (-4.7 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.895, 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: 1750246217511116600 Content-Type: text/plain; charset="utf-8" Now that pc_init_isa() is independent of any PCI initialisation, move it in= to a separate isapc.c file. This enables us to finally fix the dependency of ISA= PC on I440FX in hw/i386/Kconfig. Note that as part of the move to a separate file we can see that the licenc= e text is a verbatim copy of the MIT licence. The text originates from commit 1df9= 12cf9e ("VL license of the day is MIT/BSD") so we can be sure that this was the or= iginal intent. As a consequence we can update the file header to use a SPDX tag as= per the current project contribution guidelines. Signed-off-by: Mark Cave-Ayland --- hw/i386/Kconfig | 3 - hw/i386/isapc.c | 145 ++++++++++++++++++++++++++++++++++++++++++++ hw/i386/meson.build | 1 + hw/i386/pc_piix.c | 117 ----------------------------------- 4 files changed, 146 insertions(+), 120 deletions(-) create mode 100644 hw/i386/isapc.c diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index eb65bda6e0..a7c746fe9e 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -96,9 +96,6 @@ config ISAPC select ISA_BUS select PC select IDE_ISA - # FIXME: it is in the same file as i440fx, and does not compile - # if separated - depends on I440FX =20 config Q35 bool diff --git a/hw/i386/isapc.c b/hw/i386/isapc.c new file mode 100644 index 0000000000..74ffd19307 --- /dev/null +++ b/hw/i386/isapc.c @@ -0,0 +1,145 @@ +/* + * QEMU PC System Emulator + * + * Copyright (c) 2003-2004 Fabrice Bellard + * + * SPDX-License-Identifier: MIT + */ + +#include "qemu/osdep.h" + +#include "hw/char/parallel-isa.h" +#include "hw/dma/i8257.h" +#include "hw/loader.h" +#include "hw/i386/pc.h" +#include "hw/ide/isa.h" +#include "hw/ide/ide-bus.h" +#include "system/kvm.h" +#include "hw/i386/kvm/clock.h" +#include "hw/xen/xen-x86.h" +#include "system/xen.h" +#include "hw/rtc/mc146818rtc.h" +#include "target/i386/cpu.h" + +static const int ide_iobase[MAX_IDE_BUS] =3D { 0x1f0, 0x170 }; +static const int ide_iobase2[MAX_IDE_BUS] =3D { 0x3f6, 0x376 }; +static const int ide_irq[MAX_IDE_BUS] =3D { 14, 15 }; + + +static void pc_init_isa(MachineState *machine) +{ + PCMachineState *pcms =3D PC_MACHINE(machine); + PCMachineClass *pcmc =3D PC_MACHINE_GET_CLASS(pcms); + X86MachineState *x86ms =3D X86_MACHINE(machine); + MemoryRegion *system_memory =3D get_system_memory(); + MemoryRegion *system_io =3D get_system_io(); + ISABus *isa_bus; + GSIState *gsi_state; + MemoryRegion *ram_memory; + MemoryRegion *rom_memory =3D system_memory; + DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; + uint32_t irq; + int i; + + /* + * There is no RAM split for the isapc machine + */ + if (xen_enabled()) { + xen_hvm_init_pc(pcms, &ram_memory); + } else { + ram_memory =3D machine->ram; + + pcms->max_ram_below_4g =3D 0xe0000000; /* default: 3.5G */ + x86ms->above_4g_mem_size =3D 0; + x86ms->below_4g_mem_size =3D machine->ram_size; + } + + x86_cpus_init(x86ms, pcmc->default_cpu_version); + + if (kvm_enabled()) { + kvmclock_create(pcmc->kvmclock_create_always); + } + + /* allocate ram and load rom/bios */ + if (!xen_enabled()) { + pc_memory_init(pcms, system_memory, rom_memory, 0); + } else { + assert(machine->ram_size =3D=3D x86ms->below_4g_mem_size + + x86ms->above_4g_mem_size); + + if (machine->kernel_filename !=3D NULL) { + /* For xen HVM direct kernel boot, load linux here */ + xen_load_linux(pcms); + } + } + + gsi_state =3D pc_gsi_create(&x86ms->gsi, false); + + isa_bus =3D isa_bus_new(NULL, system_memory, system_io, + &error_abort); + isa_bus_register_input_irqs(isa_bus, x86ms->gsi); + + x86ms->rtc =3D isa_new(TYPE_MC146818_RTC); + qdev_prop_set_int32(DEVICE(x86ms->rtc), "base_year", 2000); + isa_realize_and_unref(x86ms->rtc, isa_bus, &error_fatal); + irq =3D object_property_get_uint(OBJECT(x86ms->rtc), "irq", + &error_fatal); + isa_connect_gpio_out(ISA_DEVICE(x86ms->rtc), 0, irq); + + i8257_dma_init(OBJECT(machine), isa_bus, 0); + pcms->hpet_enabled =3D false; + + if (x86ms->pic =3D=3D ON_OFF_AUTO_ON || x86ms->pic =3D=3D ON_OFF_AUTO_= AUTO) { + pc_i8259_create(isa_bus, gsi_state->i8259_irq); + } + + if (tcg_enabled()) { + x86_register_ferr_irq(x86ms->gsi[13]); + } + + pc_vga_init(isa_bus, NULL); + + /* init basic PC hardware */ + pc_basic_device_init(pcms, isa_bus, x86ms->gsi, x86ms->rtc, + !MACHINE_CLASS(pcmc)->no_floppy, 0x4); + + pc_nic_init(pcmc, isa_bus, NULL); + + ide_drive_get(hd, ARRAY_SIZE(hd)); + for (i =3D 0; i < MAX_IDE_BUS; i++) { + ISADevice *dev; + char busname[] =3D "ide.0"; + dev =3D isa_ide_init(isa_bus, ide_iobase[i], ide_iobase2[i], + ide_irq[i], + hd[MAX_IDE_DEVS * i], hd[MAX_IDE_DEVS * i + 1]); + /* + * The ide bus name is ide.0 for the first bus and ide.1 for the + * second one. + */ + busname[4] =3D '0' + i; + pcms->idebus[i] =3D qdev_get_child_bus(DEVICE(dev), busname); + } +} + +static void isapc_machine_options(MachineClass *m) +{ + 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 7896f348cf..436b3ce52d 100644 --- a/hw/i386/meson.build +++ b/hw/i386/meson.build @@ -14,6 +14,7 @@ i386_ss.add(when: 'CONFIG_X86_IOMMU', if_true: files('x86= -iommu.c'), i386_ss.add(when: 'CONFIG_AMD_IOMMU', if_true: files('amd_iommu.c'), if_false: files('amd_iommu-stub.c')) i386_ss.add(when: 'CONFIG_I440FX', if_true: files('pc_piix.c')) +i386_ss.add(when: 'CONFIG_ISAPC', if_true: files('isapc.c')) i386_ss.add(when: 'CONFIG_MICROVM', if_true: files('x86-common.c', 'microv= m.c', 'acpi-microvm.c', 'microvm-dt.c')) i386_ss.add(when: 'CONFIG_NITRO_ENCLAVE', if_true: files('nitro_enclave.c'= )) i386_ss.add(when: 'CONFIG_Q35', if_true: files('pc_q35.c')) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index f9d7967dee..8cfb228f13 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -415,99 +415,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) { @@ -869,30 +776,6 @@ static void pc_i440fx_machine_2_6_options(MachineClass= *m) =20 DEFINE_I440FX_MACHINE(2, 6); =20 -#ifdef CONFIG_ISAPC -static void isapc_machine_options(MachineClass *m) -{ - 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