From patchwork Thu May 1 18:36:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 886353 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp463492wrq; Thu, 1 May 2025 11:38:29 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXarv7ry/uivu7isWM1EG2FS/EopbyNlSg/trJaR1nHUe43dJDqgXkwiCXTI20IKZ7N7INjDw==@linaro.org X-Google-Smtp-Source: AGHT+IGzQlMYYBTUG0dgvt9xs7t/1J5lKZkcXj8eJwITX5OwulIRST4UCIw3GA5nUlgk1t3qgjfK X-Received: by 2002:a05:620a:1a27:b0:7c5:d1b3:d9b with SMTP id af79cd13be357-7cad5b2e1f4mr24258285a.10.1746124708935; Thu, 01 May 2025 11:38:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746124708; cv=none; d=google.com; s=arc-20240605; b=YGhXETSC52oZmsqOAvesE3Ztkm0p1Sw1I75VJBiGEHCpz0LweJ7s6GOBzXOYDLGEdC zPy7aofkvGNZ+dyLbZo5V3wA+pf1GWzV7ssgeIO46efodRTwAIEJTbRBO8ehR1LjGhjN E09ALqc7l038fbJgTyWzqXaFvg/3mdq3JHOuu0IUUyADz1kRcjlOAbO5Uq9MkQ1eqCBK /A5X3AACWklf016T/XCyJh8+W2IvE1DCANZWUaMf7f+leqZGAO7NBoSH8qr6kfWRZoNw SLaa2z966gS0Xyb2J9QBmuPa/pDUW0eZQFxmz6CxtfFsBELsEBxdsqGp37uPZU0Mb37I AzhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=+ppxPoByuVGLWvliwBsIadaJ9pT2YSnGBDzsW7kKKos=; fh=hoe06aprcDnk5P3d0vwgQt6uC5al0E2l9mfTIGTxZjA=; b=LeyzskdX4e9GjPJsR6PhbA7laNsrBxSsWUBx30RymCLDa5AQlzgYpVtoGBjL2NCgu5 mChr/FJlmdeYWlX3r+L/s+llfqQGyaiptElM+1NvtQrHbmia1rbHi9zVFn0/Kfs2XnYv cVcKTdglaX1x6OX0EhO3qPrpCPRpZP6E73IaZKzS1kRWpgdtP+PqNnpKYLhCT5b0fYqv xcAc3IiXvD8zZE124l0lbOLxGkdbRElwOu9iCziKvegsFy0mX8bWhCZ6Iwy7UGGvvjQF HT7P+YLqzlNA3jZDa7ulyIRZPMh1u9S/cqIz0nr6v9LVX7nQvtga3QON98YB8d6lcike cBEQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YeCEHs1s; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7cad241bff4si124063885a.201.2025.05.01.11.38.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 11:38:28 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YeCEHs1s; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uAYnP-0000NN-LC; Thu, 01 May 2025 14:38: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 1uAYmH-0006lr-3U for qemu-devel@nongnu.org; Thu, 01 May 2025 14:36:58 -0400 Received: from mail-io1-xd2e.google.com ([2607:f8b0:4864:20::d2e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAYm4-0007uh-Rs for qemu-devel@nongnu.org; Thu, 01 May 2025 14:36:46 -0400 Received: by mail-io1-xd2e.google.com with SMTP id ca18e2360f4ac-85b41281b50so43688639f.3 for ; Thu, 01 May 2025 11:36:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746124603; x=1746729403; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+ppxPoByuVGLWvliwBsIadaJ9pT2YSnGBDzsW7kKKos=; b=YeCEHs1sam2dJ0PFYaARpBQm5vvL2c22luPgu+7rtqJ7v6OEx4pF0WtJvXBaxma9aq SLPfFhYDG5tW+rJ0pOfccXscKUlSJDDdSnBfNpvnooeKaYE/PgRPvE1rw8WLRv4lh35N 76B4GbPu5S9Nd4vlsr/NmFTIc/VLg6/802HecgqDOvt6Q8iAUwKovmyvBDTYBWSDo4CA +YaJ8ezl9ymUAei06AhnUxfBZs4rzwn4t45EwOTapWK8rYZCI+PUUSA1L5vDqr1TZw0l uSH+6+qlmboJ0D1BLQMaD5rGX3u19/oJj0sJPc4ebwXG5RD5roO7VL5SxqkVZuwyxKYm Vneg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746124603; x=1746729403; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+ppxPoByuVGLWvliwBsIadaJ9pT2YSnGBDzsW7kKKos=; b=S1zX32GLOveMmmJGunJwmOxdxrBUigD88qcZOH8BXPWfT/5Z5oSEBN8bK6EiL7lAyT +BucFNaF+t6eMGXQxS6Qx+9fCvhA1aweYofHdu+BC66oOhAfS0n3DP8iYTN0d0qVP8z4 ukEK9+w/GmDE92FWscCyW9A3yhjrx15qbtKpM/oJVsSJL6hMXzST3+h/EaJCUn2FpZrR Di48mgsXGhq0CsSTl7B8lQ4FjTGhhuqTkl91MHA1tm9OkCqMHRlFgBw2tHpfbp1iDWdi haZYkN5tdI0Ux4Fs3592IQBBVoWWk10zxFEBQp+sLJyLlW0gqEsc1sk1hooqwKpqLVxY WtnA== X-Gm-Message-State: AOJu0YyTIHqlE8PuyGbRwKrr89zWSJGR0QKvzWjll13zySua3Hkby69e uzm6/GrZRS1uvS1ySKvITwLXl059/wnj58r/cz97sQ5HFItzF1X291ycltyUg+TUVz/BsJi5D1n P X-Gm-Gg: ASbGnctFRSfLy2kwCuf58I/0Gr2cZZvygVCap+FJUUaklGL+erF9Pp4ypnn49XlVaaj ppkbPpPNIjO/pRZQhnI2g5k38h0T16yfcs/JBj1LcrsCzDEQIVRY6na4zTR5wJWxh5ELtLOoVes Camg7vZObZEUtkhlWw6gqxFV5I9gaTGugRaLMr9R/uYRCq4710AKKMJ/xx0YG1eVpa+HrRe2X9V eJFfNCdn4ljY1SolzAs3d1lKUtklh59263ng6LlYQ0224jDGmZX+YFll6fHjwMt6/BCSoloXN+w dx5H96T5hZAjYZoBjlf4WTc9rcmUiMsNbD9CpuCMZZYPo9iSgZ8x4PLCZ/X6SC5lrj3qK+1NjsU z7LV6a5eBtVnoMOvBBYGx X-Received: by 2002:a05:6602:2983:b0:864:4a9c:1bd7 with SMTP id ca18e2360f4ac-8668c263a5dmr41655939f.0.1746124603367; Thu, 01 May 2025 11:36:43 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4f883014747sm295913173.107.2025.05.01.11.36.39 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 11:36:43 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Igor Mammedov , Gerd Hoffmann , =?utf-8?q?Cl=C3=A9ment_Mathieu--Drif?= , Yi Liu , Paolo Bonzini , Amit Shah , Zhao Liu , "Michael S. Tsirkin" , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Richard Henderson , Sergio Lopez , Laurent Vivier , Jason Wang , Eduardo Habkost , Yanan Wang , Marcel Apfelbaum , Ani Sinha , Thomas Huth Subject: [PATCH v2 01/16] hw/i386/pc: Remove deprecated pc-q35-2.6 and pc-i440fx-2.6 machines Date: Thu, 1 May 2025 20:36:13 +0200 Message-ID: <20250501183628.87479-2-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250501183628.87479-1-philmd@linaro.org> References: <20250501183628.87479-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::d2e; envelope-from=philmd@linaro.org; helo=mail-io1-xd2e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org These machines has been supported for a period of more than 6 years. According to our versioned machine support policy (see commit ce80c4fa6ff "docs: document special exception for machine type deprecation & removal") they can now be removed. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Mark Cave-Ayland Reviewed-by: Thomas Huth --- hw/i386/pc_piix.c | 14 -------------- hw/i386/pc_q35.c | 14 -------------- 2 files changed, 28 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 7a62bb06500..98a118fd4a0 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -764,20 +764,6 @@ static void pc_i440fx_machine_2_7_options(MachineClass *m) DEFINE_I440FX_MACHINE(2, 7); -static void pc_i440fx_machine_2_6_options(MachineClass *m) -{ - X86MachineClass *x86mc = X86_MACHINE_CLASS(m); - PCMachineClass *pcmc = PC_MACHINE_CLASS(m); - - pc_i440fx_machine_2_7_options(m); - pcmc->legacy_cpu_hotplug = true; - x86mc->fwcfg_dma_enabled = false; - compat_props_add(m->compat_props, hw_compat_2_6, hw_compat_2_6_len); - compat_props_add(m->compat_props, pc_compat_2_6, pc_compat_2_6_len); -} - -DEFINE_I440FX_MACHINE(2, 6); - #ifdef CONFIG_ISAPC static void isapc_machine_options(MachineClass *m) { diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 33211b1876f..b7ffb5f1216 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -658,17 +658,3 @@ static void pc_q35_machine_2_7_options(MachineClass *m) } DEFINE_Q35_MACHINE(2, 7); - -static void pc_q35_machine_2_6_options(MachineClass *m) -{ - X86MachineClass *x86mc = X86_MACHINE_CLASS(m); - PCMachineClass *pcmc = PC_MACHINE_CLASS(m); - - pc_q35_machine_2_7_options(m); - pcmc->legacy_cpu_hotplug = true; - x86mc->fwcfg_dma_enabled = false; - compat_props_add(m->compat_props, hw_compat_2_6, hw_compat_2_6_len); - compat_props_add(m->compat_props, pc_compat_2_6, pc_compat_2_6_len); -} - -DEFINE_Q35_MACHINE(2, 6); From patchwork Thu May 1 18:36:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 886351 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp463110wrq; Thu, 1 May 2025 11:37:19 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWahK2qOp3mIgd+amr4Tcw+8WOQMAhTsWNxifApatydJiX+hro7xXNAO7W+vIvDd6ss7Uwt/w==@linaro.org X-Google-Smtp-Source: AGHT+IG48+fFKz15BlKmzpl+/+PivBiRs7moAQa9/ityzEJBxv5zYYPuB1DUN8uz2IWW3XNr9Vnu X-Received: by 2002:a05:620a:bcb:b0:7c5:e283:7d0a with SMTP id af79cd13be357-7cad5b570b8mr19947885a.30.1746124639069; Thu, 01 May 2025 11:37:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746124639; cv=none; d=google.com; s=arc-20240605; b=B6UFspeqAnK3Ib+YQeb30zib3cHLW3bnQ+MAiU8hgu3Ng+xpvhUnC/QS/E6WV0vgSd innfWle5qiCwUxYoygFL1+bkJ4Pzvs6hcIi4OMJKOwOpqo3Gdju7YOVUs6TfxiA8iFtL kbfghijzkSNclDeR0y6MJzaJiLd/aIjMpqVjKlhw4SUngz0oDqqx8ddZpFRNnnsxTthP IkRWTBPKPVP+tzjT0Tz1HDDT5jLWdGhfdiiDOXhwFgO67pEfNQCPhOzhOL3hPI9QryNi NR0BguAt2vNKo+EUkh/7t6cDRD3k+byGGwAnURIM38wQc/X0ZRobpFQGh5nZMFT55ASy kuMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=qiohr4MT6BWGS6u7M3UfoTFyN24o8cqdcAs0DiC3HNk=; fh=hoe06aprcDnk5P3d0vwgQt6uC5al0E2l9mfTIGTxZjA=; b=hlLMktV749PsnHmRnwz9x2a+rtoI4OBU8UQX4I6KV7++K9nwjB3jnGF5vuzwluoHyT DRa4t57b7vKnsE5/BFtGgWM2bVrxXY/QIODxf+y471EvsJ09qisGJyHTIkq2fXAWsqJc 5HgpdOil8p650pQr2F/a/8sNIwhKj+znN6J6dRtzvC83ZKRJEdqy4xRv82bHF2IQ5rQi Mdi6AjA0ofl57ZG9FSXsCPvXoB11Lc8jIHpjb594JVY+OmeboamgAvShNliiBEN/4mL8 meJ5K+2/pcO7fal4BEuhCAruKi9t1egQHvSwC3Pzloc9UH7NSrm8Maxx98GhtE3qQDt9 E28Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=b0nxMbd1; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7cad241c6c5si126520785a.233.2025.05.01.11.37.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 11:37:19 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=b0nxMbd1; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uAYmW-0007Gh-MC; Thu, 01 May 2025 14:37: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 1uAYmH-000715-47 for qemu-devel@nongnu.org; Thu, 01 May 2025 14:36:58 -0400 Received: from mail-io1-xd33.google.com ([2607:f8b0:4864:20::d33]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAYmD-0007wE-P5 for qemu-devel@nongnu.org; Thu, 01 May 2025 14:36:55 -0400 Received: by mail-io1-xd33.google.com with SMTP id ca18e2360f4ac-86192b64d0bso116669039f.3 for ; Thu, 01 May 2025 11:36:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746124612; x=1746729412; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qiohr4MT6BWGS6u7M3UfoTFyN24o8cqdcAs0DiC3HNk=; b=b0nxMbd1ACtu1y468TIvbTBDqIPTTENE/dfxYLLTXgJLNF26rrSzM5oVTNTDyd9AZe MUlKkZ6UQ0wBs1fI2nMkcbsO6muvyg9kDx91dRrdL/18G2Y6f2kEP5SNDNAiHgMjP7Ma CDj/tuCI+Vv3Z8BmM5zD6V6Beie4ls/pMLF1AE0CyrqBSsbFswxCQbG5hr/DYhXTUDHR YjXrlR27CYg2f8eaiS4rfUyyurQpD96c1gOEtibp8ySWRUSerpVkLTQ8VkzWkE9rpMgo T1UXAvB2Q5X6iEWO4iLU2AwcPcDG4+cj9ghGGItE5POlULsOO2rZErcs3lTQQV0/AelK Fj+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746124612; x=1746729412; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qiohr4MT6BWGS6u7M3UfoTFyN24o8cqdcAs0DiC3HNk=; b=P5tPOa35FfmML38mxV4y4yfYM32V4s9FqTSI40WIUrYIPyWOmmmnUcp6nPWmI8ThPf cDTXxDx8ETM4SSaa/2uUDYUcMkObWnIRM6Ie1tOSflnUu3sq89ybsdrq4GkUj0ZRc3Oa G0PkBSudZq8fuaLv7aCAUV3CzVo123tlLLdRhaEV+x62auEV42QMb/vMfn4X0+jhPRCc 3aPXILN+f4zfiFyqbULsogP7U+78/lG4B/PLRCk2l2AZ5zQqEULXqk3WrJmf2Pit6r/p Y0uE8KC4AgPRwk4tisI4KMOM16mTqCAQv6DHBWRRH7olkCV+33ngwmT2Qs6rsHb2DAeM JOBQ== X-Gm-Message-State: AOJu0YyR5+wvQPtfDJxav+gFH4qRtn+ItKciocJSrCIL+QLvHx2QZtvN V9bFtuc6zD2HjXQY0X3FOzLZV72YQ/BUvkVC5dllvF9el/2QjvdCdY6ost+EdQNhuz0OrFRALPq c X-Gm-Gg: ASbGncs+piFQ5+dy7wjEQDECMvFDfMSslMgnlmsdwqjr/yPY6jKqxrrXgFGpL4cAQuy PCSS4Ypy4GgL0IeLh8nqp2BOFB9ZYXjMUnhehefjLoJrtEoQzgT2h0hb7JjKGIxPYFYfCW+Npgj 9b/7syOaXf8QNq55OME4LVBQVvVKY8K6Dd5hREt2BiVJWjX8u3H9DVHRfdsJEzNxQCbHBT55Tdv Wi0oLvsM5LjQGG80VntQUskWqxSgwuH13V9tCHGDTe+qtdyV00vte1FPEpR820C6x6XPGBfpATE BZLV5z0gZDBwBdMBZ4EsG7NfjTrAo8Fl/jXhCEG9bn318N2GUXxFsEkG8sTSnnDNAWD9W6NYKaH OzMHIgJzY3TvtoqpGsMsB X-Received: by 2002:a05:6602:4088:b0:85b:482b:8530 with SMTP id ca18e2360f4ac-8669fb09e0dmr33611339f.2.1746124612153; Thu, 01 May 2025 11:36:52 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4f88303be7fsm294879173.142.2025.05.01.11.36.48 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 11:36:51 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Igor Mammedov , Gerd Hoffmann , =?utf-8?q?Cl=C3=A9ment_Mathieu--Drif?= , Yi Liu , Paolo Bonzini , Amit Shah , Zhao Liu , "Michael S. Tsirkin" , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Richard Henderson , Sergio Lopez , Laurent Vivier , Jason Wang , Eduardo Habkost , Yanan Wang , Marcel Apfelbaum , Ani Sinha , Thomas Huth Subject: [PATCH v2 02/16] hw/i386/pc: Remove PCMachineClass::legacy_cpu_hotplug field Date: Thu, 1 May 2025 20:36:14 +0200 Message-ID: <20250501183628.87479-3-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250501183628.87479-1-philmd@linaro.org> References: <20250501183628.87479-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::d33; envelope-from=philmd@linaro.org; helo=mail-io1-xd33.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The PCMachineClass::legacy_cpu_hotplug boolean was only used by the pc-q35-2.6 and pc-i440fx-2.6 machines, which got removed. Remove it and simplify build_dsdt(), removing build_legacy_cpu_hotplug_aml() altogether. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Mark Cave-Ayland Reviewed-by: Thomas Huth --- include/hw/acpi/cpu_hotplug.h | 3 - include/hw/i386/pc.h | 3 - hw/acpi/cpu_hotplug.c | 230 ---------------------------------- hw/i386/acpi-build.c | 4 +- 4 files changed, 1 insertion(+), 239 deletions(-) diff --git a/include/hw/acpi/cpu_hotplug.h b/include/hw/acpi/cpu_hotplug.h index 3b932abbbbe..aeee630cf05 100644 --- a/include/hw/acpi/cpu_hotplug.h +++ b/include/hw/acpi/cpu_hotplug.h @@ -34,7 +34,4 @@ void legacy_acpi_cpu_hotplug_init(MemoryRegion *parent, Object *owner, void acpi_switch_to_modern_cphp(AcpiCpuHotplug *gpe_cpu, CPUHotplugState *cpuhp_state, uint16_t io_port); - -void build_legacy_cpu_hotplug_aml(Aml *ctx, MachineState *machine, - uint16_t io_base); #endif diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 79b72c54dd3..a3de3e9560d 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -110,9 +110,6 @@ struct PCMachineClass { bool enforce_amd_1tb_hole; bool isa_bios_alias; - /* generate legacy CPU hotplug AML */ - bool legacy_cpu_hotplug; - /* use PVH to load kernels that support this feature */ bool pvh_enabled; diff --git a/hw/acpi/cpu_hotplug.c b/hw/acpi/cpu_hotplug.c index aa0e1e3efa5..fe439705bda 100644 --- a/hw/acpi/cpu_hotplug.c +++ b/hw/acpi/cpu_hotplug.c @@ -116,233 +116,3 @@ void acpi_switch_to_modern_cphp(AcpiCpuHotplug *gpe_cpu, memory_region_del_subregion(parent, &gpe_cpu->io); cpu_hotplug_hw_init(parent, gpe_cpu->device, cpuhp_state, io_port); } - -void build_legacy_cpu_hotplug_aml(Aml *ctx, MachineState *machine, - uint16_t io_base) -{ - Aml *dev; - Aml *crs; - Aml *pkg; - Aml *field; - Aml *method; - Aml *if_ctx; - Aml *else_ctx; - int i, apic_idx; - Aml *sb_scope = aml_scope("_SB"); - uint8_t madt_tmpl[8] = {0x00, 0x08, 0x00, 0x00, 0x00, 0, 0, 0}; - Aml *cpu_id = aml_arg(1); - Aml *apic_id = aml_arg(0); - Aml *cpu_on = aml_local(0); - Aml *madt = aml_local(1); - Aml *cpus_map = aml_name(CPU_ON_BITMAP); - Aml *zero = aml_int(0); - Aml *one = aml_int(1); - MachineClass *mc = MACHINE_GET_CLASS(machine); - const CPUArchIdList *apic_ids = mc->possible_cpu_arch_ids(machine); - X86MachineState *x86ms = X86_MACHINE(machine); - - /* - * _MAT method - creates an madt apic buffer - * apic_id = Arg0 = Local APIC ID - * cpu_id = Arg1 = Processor ID - * cpu_on = Local0 = CPON flag for this cpu - * madt = Local1 = Buffer (in madt apic form) to return - */ - method = aml_method(CPU_MAT_METHOD, 2, AML_NOTSERIALIZED); - aml_append(method, - aml_store(aml_derefof(aml_index(cpus_map, apic_id)), cpu_on)); - aml_append(method, - aml_store(aml_buffer(sizeof(madt_tmpl), madt_tmpl), madt)); - /* Update the processor id, lapic id, and enable/disable status */ - aml_append(method, aml_store(cpu_id, aml_index(madt, aml_int(2)))); - aml_append(method, aml_store(apic_id, aml_index(madt, aml_int(3)))); - aml_append(method, aml_store(cpu_on, aml_index(madt, aml_int(4)))); - aml_append(method, aml_return(madt)); - aml_append(sb_scope, method); - - /* - * _STA method - return ON status of cpu - * apic_id = Arg0 = Local APIC ID - * cpu_on = Local0 = CPON flag for this cpu - */ - method = aml_method(CPU_STATUS_METHOD, 1, AML_NOTSERIALIZED); - aml_append(method, - aml_store(aml_derefof(aml_index(cpus_map, apic_id)), cpu_on)); - if_ctx = aml_if(cpu_on); - { - aml_append(if_ctx, aml_return(aml_int(0xF))); - } - aml_append(method, if_ctx); - else_ctx = aml_else(); - { - aml_append(else_ctx, aml_return(zero)); - } - aml_append(method, else_ctx); - aml_append(sb_scope, method); - - method = aml_method(CPU_EJECT_METHOD, 2, AML_NOTSERIALIZED); - aml_append(method, aml_sleep(200)); - aml_append(sb_scope, method); - - method = aml_method(CPU_SCAN_METHOD, 0, AML_NOTSERIALIZED); - { - Aml *while_ctx, *if_ctx2, *else_ctx2; - Aml *bus_check_evt = aml_int(1); - Aml *remove_evt = aml_int(3); - Aml *status_map = aml_local(5); /* Local5 = active cpu bitmap */ - Aml *byte = aml_local(2); /* Local2 = last read byte from bitmap */ - Aml *idx = aml_local(0); /* Processor ID / APIC ID iterator */ - Aml *is_cpu_on = aml_local(1); /* Local1 = CPON flag for cpu */ - Aml *status = aml_local(3); /* Local3 = active state for cpu */ - - aml_append(method, aml_store(aml_name(CPU_STATUS_MAP), status_map)); - aml_append(method, aml_store(zero, byte)); - aml_append(method, aml_store(zero, idx)); - - /* While (idx < SizeOf(CPON)) */ - while_ctx = aml_while(aml_lless(idx, aml_sizeof(cpus_map))); - aml_append(while_ctx, - aml_store(aml_derefof(aml_index(cpus_map, idx)), is_cpu_on)); - - if_ctx = aml_if(aml_and(idx, aml_int(0x07), NULL)); - { - /* Shift down previously read bitmap byte */ - aml_append(if_ctx, aml_shiftright(byte, one, byte)); - } - aml_append(while_ctx, if_ctx); - - else_ctx = aml_else(); - { - /* Read next byte from cpu bitmap */ - aml_append(else_ctx, aml_store(aml_derefof(aml_index(status_map, - aml_shiftright(idx, aml_int(3), NULL))), byte)); - } - aml_append(while_ctx, else_ctx); - - aml_append(while_ctx, aml_store(aml_and(byte, one, NULL), status)); - if_ctx = aml_if(aml_lnot(aml_equal(is_cpu_on, status))); - { - /* State change - update CPON with new state */ - aml_append(if_ctx, aml_store(status, aml_index(cpus_map, idx))); - if_ctx2 = aml_if(aml_equal(status, one)); - { - aml_append(if_ctx2, - aml_call2(AML_NOTIFY_METHOD, idx, bus_check_evt)); - } - aml_append(if_ctx, if_ctx2); - else_ctx2 = aml_else(); - { - aml_append(else_ctx2, - aml_call2(AML_NOTIFY_METHOD, idx, remove_evt)); - } - } - aml_append(if_ctx, else_ctx2); - aml_append(while_ctx, if_ctx); - - aml_append(while_ctx, aml_increment(idx)); /* go to next cpu */ - aml_append(method, while_ctx); - } - aml_append(sb_scope, method); - - /* The current AML generator can cover the APIC ID range [0..255], - * inclusive, for VCPU hotplug. */ - QEMU_BUILD_BUG_ON(ACPI_CPU_HOTPLUG_ID_LIMIT > 256); - if (x86ms->apic_id_limit > ACPI_CPU_HOTPLUG_ID_LIMIT) { - error_report("max_cpus is too large. APIC ID of last CPU is %u", - x86ms->apic_id_limit - 1); - exit(1); - } - - /* create PCI0.PRES device and its _CRS to reserve CPU hotplug MMIO */ - dev = aml_device("PCI0." stringify(CPU_HOTPLUG_RESOURCE_DEVICE)); - aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0A06"))); - aml_append(dev, - aml_name_decl("_UID", aml_string("CPU Hotplug resources")) - ); - /* device present, functioning, decoding, not shown in UI */ - aml_append(dev, aml_name_decl("_STA", aml_int(0xB))); - crs = aml_resource_template(); - aml_append(crs, - aml_io(AML_DECODE16, io_base, io_base, 1, ACPI_GPE_PROC_LEN) - ); - aml_append(dev, aml_name_decl("_CRS", crs)); - aml_append(sb_scope, dev); - /* declare CPU hotplug MMIO region and PRS field to access it */ - aml_append(sb_scope, aml_operation_region( - "PRST", AML_SYSTEM_IO, aml_int(io_base), ACPI_GPE_PROC_LEN)); - field = aml_field("PRST", AML_BYTE_ACC, AML_NOLOCK, AML_PRESERVE); - aml_append(field, aml_named_field("PRS", 256)); - aml_append(sb_scope, field); - - /* build Processor object for each processor */ - for (i = 0; i < apic_ids->len; i++) { - int cpu_apic_id = apic_ids->cpus[i].arch_id; - - assert(cpu_apic_id < ACPI_CPU_HOTPLUG_ID_LIMIT); - - dev = aml_processor(i, 0, 0, "CP%.02X", cpu_apic_id); - - method = aml_method("_MAT", 0, AML_NOTSERIALIZED); - aml_append(method, - aml_return(aml_call2(CPU_MAT_METHOD, - aml_int(cpu_apic_id), aml_int(i)) - )); - aml_append(dev, method); - - method = aml_method("_STA", 0, AML_NOTSERIALIZED); - aml_append(method, - aml_return(aml_call1(CPU_STATUS_METHOD, aml_int(cpu_apic_id)))); - aml_append(dev, method); - - method = aml_method("_EJ0", 1, AML_NOTSERIALIZED); - aml_append(method, - aml_return(aml_call2(CPU_EJECT_METHOD, aml_int(cpu_apic_id), - aml_arg(0))) - ); - aml_append(dev, method); - - aml_append(sb_scope, dev); - } - - /* build this code: - * Method(NTFY, 2) {If (LEqual(Arg0, 0x00)) {Notify(CP00, Arg1)} ...} - */ - /* Arg0 = APIC ID */ - method = aml_method(AML_NOTIFY_METHOD, 2, AML_NOTSERIALIZED); - for (i = 0; i < apic_ids->len; i++) { - int cpu_apic_id = apic_ids->cpus[i].arch_id; - - if_ctx = aml_if(aml_equal(aml_arg(0), aml_int(cpu_apic_id))); - aml_append(if_ctx, - aml_notify(aml_name("CP%.02X", cpu_apic_id), aml_arg(1)) - ); - aml_append(method, if_ctx); - } - aml_append(sb_scope, method); - - /* build "Name(CPON, Package() { One, One, ..., Zero, Zero, ... })" - * - * Note: The ability to create variable-sized packages was first - * introduced in ACPI 2.0. ACPI 1.0 only allowed fixed-size packages - * ith up to 255 elements. Windows guests up to win2k8 fail when - * VarPackageOp is used. - */ - pkg = x86ms->apic_id_limit <= 255 ? aml_package(x86ms->apic_id_limit) : - aml_varpackage(x86ms->apic_id_limit); - - for (i = 0, apic_idx = 0; i < apic_ids->len; i++) { - int cpu_apic_id = apic_ids->cpus[i].arch_id; - - for (; apic_idx < cpu_apic_id; apic_idx++) { - aml_append(pkg, aml_int(0)); - } - aml_append(pkg, aml_int(apic_ids->cpus[i].cpu ? 1 : 0)); - apic_idx = cpu_apic_id + 1; - } - aml_append(sb_scope, aml_name_decl(CPU_ON_BITMAP, pkg)); - aml_append(ctx, sb_scope); - - method = aml_method("\\_GPE._E02", 0, AML_NOTSERIALIZED); - aml_append(method, aml_call0("\\_SB." CPU_SCAN_METHOD)); - aml_append(ctx, method); -} diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 3fffa4a3328..625889783ec 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1465,9 +1465,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, } aml_append(dsdt, scope); - if (pcmc->legacy_cpu_hotplug) { - build_legacy_cpu_hotplug_aml(dsdt, machine, pm->cpu_hp_io_base); - } else { + { CPUHotplugFeatures opts = { .acpi_1_compatible = true, .has_legacy_cphp = true, .smi_path = pm->smi_on_cpuhp ? "\\_SB.PCI0.SMI0.SMIC" : NULL, From patchwork Thu May 1 18:36:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 886355 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp463496wrq; Thu, 1 May 2025 11:38:29 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWSCwqeFcLURSm6ZEHouFEpKRqemo//X80+hwcIoeL7LoRP2814+QbcursaQVR0w0LfCMCXBQ==@linaro.org X-Google-Smtp-Source: AGHT+IGgBeMoDir345W0Enseijq/LbUBpSnEXYeTp9IIj9W7f7EwazM8pTrQEDOg/uVooGGdSj/I X-Received: by 2002:a05:622a:228e:b0:476:884e:52f4 with SMTP id d75a77b69052e-48ae77340a9mr69060071cf.12.1746124709455; Thu, 01 May 2025 11:38:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746124709; cv=none; d=google.com; s=arc-20240605; b=lpMuHG1huc/fGuVsbb0FGd6gs9UK+agVg2BMUjqdG+eQCus6pUPqnsyr2dXYtF1skb /kXeE20xxSzXh39GD5lwwqIBLvLxMufpvS6QFQwgCJzK5HQ5DGl5HLNR3scsgacSTPoC RRj6f0ABySZF4qtDKX/q6Cj1ngAvVye4/ncGxAXMBXtW7VvGQpm0OATUk5ZFNup5LS0d 3GC7VrfETyGqWNJfROqvtibSnvBIFomLqddS+ET4yQluQhN2tyA+YzxmFfWl2//scFOj MAN3Q9xg5R+JPKUsKrskHctmMnB8g71RboJWdVDpIjcV08tOPAmQGpl+SmHFcemiIpyQ +3hQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=J7AMA5ZLAGtFwb46rBtPIk1KAapPoLENY9+BSCyDrfE=; fh=hoe06aprcDnk5P3d0vwgQt6uC5al0E2l9mfTIGTxZjA=; b=cW7P2w79IV78xLz64IFV+39CT+l1RCodjgWBr8IDW8C5L/wbmBR792nm/dL2nYdhg2 mEaNkOvxbClHKcEp0adO+tMShiEHTa6AqSwwFAlu5vULKfkr+D3cOgtjXImMH/a7pkD3 OiaZHlvB94VQneQj9mR8zaiU/SVTwz2p/d0QWAM8v41EOF8Pw41YSngLjOvzNVjIdn0K kG/W57qwH60vs8L4z1QhM0DAlEPDj4l9ZKp2qm+mx13pyogTEelxNVc/GTabH0xNbikj 28fw51DRhHoKEyz+1f2z1VhUxaJr0xyJ1m/gd1zaTwa6GeiO8bRFqaGdQnYlni5It6Xd Rkmw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ueT0FKpe; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-48b98247e26si11509061cf.308.2025.05.01.11.38.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 11:38:29 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ueT0FKpe; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uAYnV-0000ps-C0; Thu, 01 May 2025 14:38:13 -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 1uAYmO-0007Kk-L0 for qemu-devel@nongnu.org; Thu, 01 May 2025 14:37:07 -0400 Received: from mail-il1-x130.google.com ([2607:f8b0:4864:20::130]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAYmM-0007yp-Rw for qemu-devel@nongnu.org; Thu, 01 May 2025 14:37:04 -0400 Received: by mail-il1-x130.google.com with SMTP id e9e14a558f8ab-3d5e43e4725so3588475ab.1 for ; Thu, 01 May 2025 11:37:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746124621; x=1746729421; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=J7AMA5ZLAGtFwb46rBtPIk1KAapPoLENY9+BSCyDrfE=; b=ueT0FKpe6bnPG3qkhWpWNhUu/FJ3RbNGXnMPWKIpb1TUPzuLl7MCHXwzj3BFiVRXMy /VL/NwSDIqCh4gYRqRVrKBF7/g653H97U9gRhHXsp4ZZebN6egjNPM2UjAFHtP7kHAd8 vb4J38hEHx9ZHUIe3Z+YpDXlbZMjHG4vTglYQoGhvnRi+TJmnfTXcIstXz13z9GEJC+H vzeDLgvGaW0HbHAFl4WJl77QppyBfN7I9W+UQV6sH8ax6j+oHflXtwTAg9/pXh5k1061 2ZNK/yQGp4fL2fSjvO5Ya3SSCsaB9Ni4VqRXIu7iFhdApj+v4zIFj03NC2O96bHkMW2g fdtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746124621; x=1746729421; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=J7AMA5ZLAGtFwb46rBtPIk1KAapPoLENY9+BSCyDrfE=; b=xUom7FnwMtvo7NWe/EELz+9zmE5L22AbWQOKWO4ogqQKN+bDIjiYUTRmXnlhP2VC13 7JRsMm9yMprHYotAVoZZavFn6FO2NDPbnlw65Yul7+JwP/nfwudWd/VWrGlAPeu+RR7z WSd/Qx2leTHY8n4d8gFiUrHcoEHBoSYR3jKX76MEawEFklxUGto6/h1RIqnNX8dP+IzX /l9QFKNFc+lhr0zbpACrg6gB4o0bDLo0x3VQyOBIlApfqejcc3JWs8hXKbBiDNec5DnP Xwt6Gdk0a+8IRI6Q2Xo/uoNV2S4ThJFo/eyJv3Hhq5aBCN7d85UvORXY+x6f0pA3pc56 U75A== X-Gm-Message-State: AOJu0YwG/oxb8GGVoWjDiITeDZsoXPwOCsnyaP3QQuTZrkNg4bPk+mxv 9agCtCeI9f+4oApGAKAUmttU8eMkNqmKtyOByWOnNtgYofkujXACXWJcgydkTNIOSIhvWIVfezB U X-Gm-Gg: ASbGncuQrNc1MTQNMjFnV8diYsgL/FhyMTJAeMt8jrdHnTLYDxAhn9j/UW6PdbGL5PA 3+DLZU4Dam2KspZMTlY/hUpJ6LZrdiX+V6GPU8rhDu9HsSsiHFQUxck+giWDK5YNO0HRXzpQcAC pTbE/42krwscPBcFKAo/0kM3V2dTNznYcMfVvkBnvRuIyK0bRikx2+J+vSZK7yJUEN0I9I5h+3/ vR7I3FuMtzyH/kpjvrEBHkRObNhNFtC9iH2+qFBf6W8mHumhwUriVW4aDmDCBmtzUJv1sOGBteu 6A0zhlKR1z8/GzSBCghLZIzPfRWHl5zbSy/jSIDZyHYCMkEaTPhf/iN43DJ/0CbKolM0s/U4UEV pQhQLvxHBTrnkTWvkfzJp X-Received: by 2002:a05:6e02:1c07:b0:3d8:975:b808 with SMTP id e9e14a558f8ab-3d96f1918famr56293115ab.5.1746124621120; Thu, 01 May 2025 11:37:01 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4f882ee3c6dsm309119173.44.2025.05.01.11.36.57 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 11:37:00 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Igor Mammedov , Gerd Hoffmann , =?utf-8?q?Cl=C3=A9ment_Mathieu--Drif?= , Yi Liu , Paolo Bonzini , Amit Shah , Zhao Liu , "Michael S. Tsirkin" , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Richard Henderson , Sergio Lopez , Laurent Vivier , Jason Wang , Eduardo Habkost , Yanan Wang , Marcel Apfelbaum , Ani Sinha , Thomas Huth Subject: [PATCH v2 03/16] hw/i386/x86: Remove X86MachineClass::fwcfg_dma_enabled field Date: Thu, 1 May 2025 20:36:15 +0200 Message-ID: <20250501183628.87479-4-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250501183628.87479-1-philmd@linaro.org> References: <20250501183628.87479-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::130; envelope-from=philmd@linaro.org; helo=mail-il1-x130.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The X86MachineClass::fwcfg_dma_enabled boolean was only used by the pc-q35-2.6 and pc-i440fx-2.6 machines, which got removed. Remove it and simplify. Signed-off-by: Philippe Mathieu-Daudé --- include/hw/i386/x86.h | 2 -- hw/i386/microvm.c | 3 --- hw/i386/multiboot.c | 7 +------ hw/i386/x86-common.c | 3 +-- hw/i386/x86.c | 2 -- 5 files changed, 2 insertions(+), 15 deletions(-) diff --git a/include/hw/i386/x86.h b/include/hw/i386/x86.h index fc460b82f82..29d37af11e6 100644 --- a/include/hw/i386/x86.h +++ b/include/hw/i386/x86.h @@ -29,8 +29,6 @@ struct X86MachineClass { MachineClass parent; - /* use DMA capable linuxboot option rom */ - bool fwcfg_dma_enabled; /* CPU and apic information: */ bool apic_xrupt_override; }; diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c index e0daf0d4fc3..b1262fb1523 100644 --- a/hw/i386/microvm.c +++ b/hw/i386/microvm.c @@ -637,7 +637,6 @@ GlobalProperty microvm_properties[] = { static void microvm_class_init(ObjectClass *oc, const void *data) { - X86MachineClass *x86mc = X86_MACHINE_CLASS(oc); MicrovmMachineClass *mmc = MICROVM_MACHINE_CLASS(oc); MachineClass *mc = MACHINE_CLASS(oc); HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(oc); @@ -671,8 +670,6 @@ static void microvm_class_init(ObjectClass *oc, const void *data) hc->unplug_request = microvm_device_unplug_request_cb; hc->unplug = microvm_device_unplug_cb; - x86mc->fwcfg_dma_enabled = true; - object_class_property_add(oc, MICROVM_MACHINE_RTC, "OnOffAuto", microvm_machine_get_rtc, microvm_machine_set_rtc, diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c index 6e6b96bc345..bfa7e8f1e83 100644 --- a/hw/i386/multiboot.c +++ b/hw/i386/multiboot.c @@ -153,7 +153,6 @@ int load_multiboot(X86MachineState *x86ms, int kernel_file_size, uint8_t *header) { - bool multiboot_dma_enabled = X86_MACHINE_GET_CLASS(x86ms)->fwcfg_dma_enabled; int i, is_multiboot = 0; uint32_t flags = 0; uint32_t mh_entry_addr; @@ -402,11 +401,7 @@ int load_multiboot(X86MachineState *x86ms, fw_cfg_add_bytes(fw_cfg, FW_CFG_INITRD_DATA, mb_bootinfo_data, sizeof(bootinfo)); - if (multiboot_dma_enabled) { - option_rom[nb_option_roms].name = "multiboot_dma.bin"; - } else { - option_rom[nb_option_roms].name = "multiboot.bin"; - } + option_rom[nb_option_roms].name = "multiboot_dma.bin"; option_rom[nb_option_roms].bootindex = 0; nb_option_roms++; diff --git a/hw/i386/x86-common.c b/hw/i386/x86-common.c index 1b0671c5239..27254a0e9f1 100644 --- a/hw/i386/x86-common.c +++ b/hw/i386/x86-common.c @@ -634,7 +634,6 @@ void x86_load_linux(X86MachineState *x86ms, int acpi_data_size, bool pvh_enabled) { - bool linuxboot_dma_enabled = X86_MACHINE_GET_CLASS(x86ms)->fwcfg_dma_enabled; uint16_t protocol; int setup_size, kernel_size, cmdline_size; int dtb_size, setup_data_offset; @@ -993,7 +992,7 @@ void x86_load_linux(X86MachineState *x86ms, option_rom[nb_option_roms].bootindex = 0; option_rom[nb_option_roms].name = "linuxboot.bin"; - if (linuxboot_dma_enabled && fw_cfg_dma_enabled(fw_cfg)) { + if (fw_cfg_dma_enabled(fw_cfg)) { option_rom[nb_option_roms].name = "linuxboot_dma.bin"; } nb_option_roms++; diff --git a/hw/i386/x86.c b/hw/i386/x86.c index f80533df1c5..dbf104d60af 100644 --- a/hw/i386/x86.c +++ b/hw/i386/x86.c @@ -375,14 +375,12 @@ static void x86_machine_initfn(Object *obj) static void x86_machine_class_init(ObjectClass *oc, const void *data) { MachineClass *mc = MACHINE_CLASS(oc); - X86MachineClass *x86mc = X86_MACHINE_CLASS(oc); NMIClass *nc = NMI_CLASS(oc); mc->cpu_index_to_instance_props = x86_cpu_index_to_props; mc->get_default_cpu_node_id = x86_get_default_cpu_node_id; mc->possible_cpu_arch_ids = x86_possible_cpu_arch_ids; mc->kvm_type = x86_kvm_type; - x86mc->fwcfg_dma_enabled = true; nc->nmi_monitor_handler = x86_nmi; object_class_property_add(oc, X86_MACHINE_SMM, "OnOffAuto", From patchwork Thu May 1 18:36:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 886352 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp463412wrq; Thu, 1 May 2025 11:38:15 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX5ybRvGcCj6+EG9mijnuv1E5QFJTWnymlnD+Sw1EOPJXezPOTQFDf9NUqSShtpg+NSijYHng==@linaro.org X-Google-Smtp-Source: AGHT+IEP94SkiRSLncbWw7OdRDPuFKWjDJJnZ4oRQZpQSD76GQKRsL6xiyVEorMiAzdjBGu97zpk X-Received: by 2002:a05:622a:302:b0:477:7007:7055 with SMTP id d75a77b69052e-48b20781035mr45103681cf.12.1746124694877; Thu, 01 May 2025 11:38:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746124694; cv=none; d=google.com; s=arc-20240605; b=PYNiLKU0GFrDQGYoydn6igfsUm1Hl3trwzqDA17EfcAgg1Llo0BjKABSU7XJQIWibb 2TEZmHCDsyhdUrBYKcp1iCDt44+PqB6/pNv7nKgBIG59f+UV5hf2jXnw+LDAItZU7R8t 79RcJAXlztLMpufJQqMuKggDBK5jNQjr40o+S+81x57VcsQYF/ukzADI4Dhe3KU4+wnh 6ffgnAgocLgR1CXPjwO/5LMmyyBY1g+r3AdplnA4Efs9+WV1S1G02OYSmeBh2F4WxO/B ldoevyPrlQoAQHhhCsdPhlBi415gyuapjieLoqO2uTsPwdxm8lENO4pz4nnJ1ljs/jZs FHGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=zXADTJwgYK4rQDoTBJwmSMh4WIgzI1vWgP1J7gzagsQ=; fh=hoe06aprcDnk5P3d0vwgQt6uC5al0E2l9mfTIGTxZjA=; b=iePbUImWXPZXzo8Ey35/Sr48hi+lFkJWFEvpo7tgYrTchBzGwmuDxjWxZmAYys6bTN tUtKRJqizvIEuBGLA/iz8MYjzugiHZqFUQLqbbe5oTYtO064zgAvQFDglXBGTafRKiQF KmNxm3gqsbm9Cv8jp3faCzAZmeRNoFUEcomPDzi1qBedOySHNu12OwQOHA1R0ZCkImzG GJVIW+JXcxLxfJHd7FMfLAHGc/Mh5lQrgkL/dlQBwuLMDbYXPNiA0PUWL/K7hKw2DAiI bpI+Unr2y/b5s7cFXUiWzdMv6DpwPQAq5kCs27ein8U2opkuLEE6Se8G+Hi007Q/Xu8B IsmA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=KdltTTsn; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-48b98d0fe43si11687911cf.480.2025.05.01.11.38.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 11:38:14 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=KdltTTsn; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uAYnP-0000LF-Jh; Thu, 01 May 2025 14:38: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 1uAYmY-0007Ug-9d for qemu-devel@nongnu.org; Thu, 01 May 2025 14:37:16 -0400 Received: from mail-il1-x12f.google.com ([2607:f8b0:4864:20::12f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAYmW-00082F-Ja for qemu-devel@nongnu.org; Thu, 01 May 2025 14:37:14 -0400 Received: by mail-il1-x12f.google.com with SMTP id e9e14a558f8ab-3d450154245so10673655ab.2 for ; Thu, 01 May 2025 11:37:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746124630; x=1746729430; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zXADTJwgYK4rQDoTBJwmSMh4WIgzI1vWgP1J7gzagsQ=; b=KdltTTsn3Ni/h/oQJaeelw3ESJW7W7A2+G9lR0c0TeVqnLBx6Uzj2CeqoXCI63kGmR /ha07fqZ6oxT9KwEruLWaQeoqJ8K1upqrbTCbAMosdgsU06BhCYJnDN0/0ZSxQOVD98t fkf0g7dyIzSaJ522vquZHoCJ579Vu2xCAKKJ+PEXXA2rzenzaaXaZnchap5E47x1wtyl lqa27/9ikY9XT4lgFNdWrKNnLQrCNtYBgioWmTtQOrZG4WDp9oTpChprpkg1kYvS0dLM P+4BqF3i/bd3+nDGyE66m+xyrLSM1y5n8ER9SzJksM0uaTGcdFLn9Px4bT+sWyA2pNbK 1n3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746124630; x=1746729430; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zXADTJwgYK4rQDoTBJwmSMh4WIgzI1vWgP1J7gzagsQ=; b=ZLRiZuLSC6eGSoXrGBfGR9YjA/u+/tJNRubgy9cx5/hPxN/1G6Mm733lQxhLEgkVuR 8RvPpwqFuyNIzXmQXIM2d4bLIu2uHvXv0BR+LixBRidXsgwcOHmSmJyf9aO0yAHUvFkH 2Y/qHgh1krvqHT5/oIDAh+IoMCSz2JH1cwniW4huo8SiaNsTsEzgkm8hkxaIx8EGzYAT bOZkwHRoP9Ji1u2sItXyOcaJIq9FfyVbm+K4R+vAoREMQrAfnzt392nhlGVlL9evR4Nw gl4DNFdrwottvLP0ER2uQXkHgRrjX2Flg+gRd1eAnF4AI2Kr/3Bm1qePbPDA2jC2DX2r +oiA== X-Gm-Message-State: AOJu0Yya2iA2/bAU+U+MBKszSfVI1iudPjz1Fh+/ewy/4oe+lT+fXqrg 0HvMbJisBnVd2PJuJtQvX2eUDG1d9uO/fIDiOC4xaM7fYG+twmbsCgSqVomq/Euau0U3KuDcZ7b 6 X-Gm-Gg: ASbGncuFt6/inla/p8QsBlnZzlvcOegjWaIg6GJXH6GaNrRsYkljPa+AHcJLM2yF5OF 6q0LQiUUGz82vM/0OhEDsz1EZjT3WOlKkldDNouG3BQEUvJG1PpjKPeSBuPsolJtT8MQ92OVG9h v9fwq2+kaAufXzlcEpi/KTwxT3lfxY+k2ccooN0cyp9WBbIRuimuF9cvxyQtoATajSTl2Ttq0Kb xd7Eu6OayDkN6x4XCGC9StVgzw3IWmGUq2PHt31ZI05xY7sESi8p5GU+7d/Y/5+H7cKDtg7410a llPZdP00MKpq3hSIrXMnhqoxUJkUdspWM4i/17GY+HeyUzLf4IWDIY0pVfyhFefE6f/I6VmFkCn CPBstnoJYnv1XiLEPZN3v X-Received: by 2002:a05:6e02:1f05:b0:3d8:1cba:1854 with SMTP id e9e14a558f8ab-3d970198c59mr55748625ab.1.1746124630482; Thu, 01 May 2025 11:37:10 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id e9e14a558f8ab-3d975e7808esm2526775ab.25.2025.05.01.11.37.06 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 11:37:10 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Igor Mammedov , Gerd Hoffmann , =?utf-8?q?Cl=C3=A9ment_Mathieu--Drif?= , Yi Liu , Paolo Bonzini , Amit Shah , Zhao Liu , "Michael S. Tsirkin" , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Richard Henderson , Sergio Lopez , Laurent Vivier , Jason Wang , Eduardo Habkost , Yanan Wang , Marcel Apfelbaum , Ani Sinha , Thomas Huth Subject: [PATCH v2 04/16] hw/i386/pc: Remove pc_compat_2_6[] array Date: Thu, 1 May 2025 20:36:16 +0200 Message-ID: <20250501183628.87479-5-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250501183628.87479-1-philmd@linaro.org> References: <20250501183628.87479-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::12f; envelope-from=philmd@linaro.org; helo=mail-il1-x12f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The pc_compat_2_6[] array was only used by the pc-q35-2.6 and pc-i440fx-2.6 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Mark Cave-Ayland Reviewed-by: Thomas Huth --- include/hw/i386/pc.h | 3 --- hw/i386/pc.c | 8 -------- 2 files changed, 11 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index a3de3e9560d..4fb2033bc54 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -292,9 +292,6 @@ extern const size_t pc_compat_2_8_len; extern GlobalProperty pc_compat_2_7[]; extern const size_t pc_compat_2_7_len; -extern GlobalProperty pc_compat_2_6[]; -extern const size_t pc_compat_2_6_len; - #define DEFINE_PC_MACHINE(suffix, namestr, initfn, optsfn) \ static void pc_machine_##suffix##_class_init(ObjectClass *oc, \ const void *data) \ diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 49632b69d29..7573b880905 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -251,14 +251,6 @@ GlobalProperty pc_compat_2_7[] = { }; const size_t pc_compat_2_7_len = G_N_ELEMENTS(pc_compat_2_7); -GlobalProperty pc_compat_2_6[] = { - { TYPE_X86_CPU, "cpuid-0xb", "off" }, - { "vmxnet3", "romfile", "" }, - { TYPE_X86_CPU, "fill-mtrr-mask", "off" }, - { "apic-common", "legacy-instance-id", "on", } -}; -const size_t pc_compat_2_6_len = G_N_ELEMENTS(pc_compat_2_6); - /* * @PC_FW_DATA: * Size of the chunk of memory at the top of RAM for the BIOS ACPI tables From patchwork Thu May 1 18:36:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 886357 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp463936wrq; Thu, 1 May 2025 11:39:41 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX2a8VXdJUvznhy0dBi13lGHA8dIsPzk4Xxiebn0ljQUm6e0VnG0LKz/H6nK3ifcPOYwPzEDg==@linaro.org X-Google-Smtp-Source: AGHT+IGfW51XFdnZvlgFbR6G+Aco+ohFx+c2h/PKWP4L019QmGO0n6leuCXuA1+18/TWRwHqVHBS X-Received: by 2002:a05:6214:1cc4:b0:6f4:ca47:af99 with SMTP id 6a1803df08f44-6f50b209147mr56989376d6.8.1746124781224; Thu, 01 May 2025 11:39:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746124781; cv=none; d=google.com; s=arc-20240605; b=KOA/3HPlUAnEeDiXLa9sOP/H8vCMAlxfRBtKfUJ2VmmBrymH391EbAirTfqcP68n// dms+umC67FnJ2lgq93IMYPbwZ3Dj+otIHiEl8Evn3B6on+YODmyuL0ymdZl0zWOrlWZ4 Bosf2VCYxrIHBNe07VKoXFvcGg+dnliEgd2od3zuAWXp5KGFYz0AU9lv7VjyIcBwl5sA Birzp/BZpsnw3GU+QiGzkQuFEF7PkDo9UuYcM6WkJ9Kh1bJNzQNzV9TodIc3SaQs+e+L Ua2PHwH6RgyGoB6yBFxb8X3bnv0xEzzd6Pr9JE7lAcVKGkPHAD2+MJbyYvaKF3hh1CsW xwPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=6ubkHzu7s1cOcOgdA3It0e7Y2rG2MJsOlgRmMsxMDKU=; fh=hoe06aprcDnk5P3d0vwgQt6uC5al0E2l9mfTIGTxZjA=; b=flVaAL36JIPz+c+hMEssPz573cGLO7gucK4YFZgLTlayIkN9gNQye14HID+oEgLtVQ svXqSb2PpEOTCQ+3RkWC8OYy+RPPDLoXpyEhCaIEfxLrnqBLJAU+Y91LUBSvLOJlLosf 01afjpUXviGG7hDoFY70BZ5nr0SsIk0VbfH0J29h2MBoUiwdnatVAFrVuK+JZzzS9G+L XU2cxtXuKPPwxefR2uWBtHLl/FyqxXgOrLKY32irfwDqLto7VrZ6rIwrEPmyzobQo51s WNYyUUrMn90KuJC+kSNvHwajc/unGvdrYIsT8x49CJogKukGHGF95+Z9Dw2crbhBzPSy g/TQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="coafaSM/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTP id 6a1803df08f44-6f50f4abecasi13209266d6.433.2025.05.01.11.39.41 for ; Thu, 01 May 2025 11:39:41 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="coafaSM/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uAYnX-00010T-83; Thu, 01 May 2025 14:38:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uAYmg-0007ul-JU for qemu-devel@nongnu.org; Thu, 01 May 2025 14:37:30 -0400 Received: from mail-il1-x131.google.com ([2607:f8b0:4864:20::131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAYme-00084Q-Nd for qemu-devel@nongnu.org; Thu, 01 May 2025 14:37:22 -0400 Received: by mail-il1-x131.google.com with SMTP id e9e14a558f8ab-3d8dcc7cd17so8171615ab.1 for ; Thu, 01 May 2025 11:37:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746124639; x=1746729439; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6ubkHzu7s1cOcOgdA3It0e7Y2rG2MJsOlgRmMsxMDKU=; b=coafaSM/Jjfkyj60O9BgH+ZYCFQnvYB+iogKCi0XTjKhQwQvWRyx+8pRZv9JyhzoTv Qt4RwHcFmD1TOrwoszCd66d0mrHJ/ZatYe20D5KpfMiJWQm3jUlNZAvyWWEzL3q86Len Nebl7VML2R5P1K9zvMGvjFz87jKK0M6ud/EAkhmNCCDyLmGzXr9WaBacKSskZxEVfwY+ bcf3jQsiPTONkOkVOZ1j2VyOp8JqQxKgbuspB+31lBP4SxXWIyNB6uHo97tE4VCNQCBB E8PtNV1DLW+MdIzGMnNZ6AVUcrpBwQMsNItlnSJI1rOym/KW7Kgs7Hbd4RaOc8Tg1NYr UiDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746124639; x=1746729439; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6ubkHzu7s1cOcOgdA3It0e7Y2rG2MJsOlgRmMsxMDKU=; b=ZGD/dF/ZqG3aTnZZROFGG+hF0isagSg153DKJFT8lHbMVPeNK68biDBm6RMrRRJaOO Jlm98Msa2oUwnA1i27gSBVM2HyZ/cthx+pXcTnzHCrUsG/zWlfvBBMKc3HORHdF8snS3 XoqDqpXbyUw9CC4FlzZ/zkKgdfe2Yz4s41a2JhePxUFCRHvBjKyVIgGzHsXieCDzIuvy OMJFfzxdJcBpB/kMkSkXgiNGhDj7H0vhM6Q0ChEvsC8POAXHW4P++oZQo7v5BH3EczLy zoV39v/8Pcy3s/MXp/ru87sc3dYpanuHzis2VOoCryGR+ofYSVbssX/AXp57uhJIpNQZ g+fQ== X-Gm-Message-State: AOJu0YwbCqTp+Jf11Ck8opCoIipvHX6KSdN9sc9wp9sjZBfxOSBJTg/7 bu5/rxrA4Ad3vqdR9W8Frz1p8Wo4CGDvxdiu2BO1kjMA9zUUO1ZW1cR93a/cA4gXuVkhPuDyTyy i X-Gm-Gg: ASbGncsfLFuKEcKdkHimgGqBR5NXcSfpFwWZV29Gw+rdwMsRqh//O2sVgEIg20mnnq9 XI8tQllQR2HNHJ5liPqAiKtLCQbHp3a0QMpEg/lIfIZTdxVLgGP4tNpzBMbuC4qAGiDW9XsVhcA yHPgmnC6rsS8Vqxd3vnJqeI9UzLr9EUTgZmUyS0Ce44Q88YVkxCm3NbJ+4BCEi0Wxia+yj6a0Gu T/adaSQXS7W6O4LH+3WRVi5AAc8NcpMG7Lz1NoVB4kkpPxYMhx5XDm73bqc21y+QGT3JiPqp3/K eg6e0Xq0shfEtPM8BCxGB/8EqbZDSuzad+RSqi6sURVT0ftUjJr7nFC6Zj4y0Lx/2inDXcsRg9J v/TYSJETRz+bHkye8kBmZ X-Received: by 2002:a05:6e02:5a5:b0:3d2:af0b:6e2a with SMTP id e9e14a558f8ab-3d970ad6a68mr36486965ab.5.1746124639251; Thu, 01 May 2025 11:37:19 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4f882fc9ac6sm304331173.75.2025.05.01.11.37.15 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 11:37:18 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Igor Mammedov , Gerd Hoffmann , =?utf-8?q?Cl=C3=A9ment_Mathieu--Drif?= , Yi Liu , Paolo Bonzini , Amit Shah , Zhao Liu , "Michael S. Tsirkin" , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Richard Henderson , Sergio Lopez , Laurent Vivier , Jason Wang , Eduardo Habkost , Yanan Wang , Marcel Apfelbaum , Ani Sinha , Thomas Huth Subject: [PATCH v2 05/16] hw/intc/apic: Remove APICCommonState::legacy_instance_id field Date: Thu, 1 May 2025 20:36:17 +0200 Message-ID: <20250501183628.87479-6-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250501183628.87479-1-philmd@linaro.org> References: <20250501183628.87479-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::131; envelope-from=philmd@linaro.org; helo=mail-il1-x131.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The APICCommonState::legacy_instance_id boolean was only set in the pc_compat_2_6[] array, via the 'legacy-instance-id=on' property. We removed all machines using that array, lets remove that property, simplifying apic_common_realize(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Mark Cave-Ayland Reviewed-by: Thomas Huth --- include/hw/i386/apic_internal.h | 1 - hw/intc/apic_common.c | 5 ----- 2 files changed, 6 deletions(-) diff --git a/include/hw/i386/apic_internal.h b/include/hw/i386/apic_internal.h index 429278da618..db6a9101530 100644 --- a/include/hw/i386/apic_internal.h +++ b/include/hw/i386/apic_internal.h @@ -188,7 +188,6 @@ struct APICCommonState { uint32_t vapic_control; DeviceState *vapic; hwaddr vapic_paddr; /* note: persistence via kvmvapic */ - bool legacy_instance_id; uint32_t extended_log_dest; }; diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c index 37a7a7019d3..1d259b97e63 100644 --- a/hw/intc/apic_common.c +++ b/hw/intc/apic_common.c @@ -294,9 +294,6 @@ static void apic_common_realize(DeviceState *dev, Error **errp) info->enable_tpr_reporting(s, true); } - if (s->legacy_instance_id) { - instance_id = VMSTATE_INSTANCE_ID_ANY; - } vmstate_register_with_alias_id(NULL, instance_id, &vmstate_apic_common, s, -1, 0, NULL); @@ -412,8 +409,6 @@ static const Property apic_properties_common[] = { DEFINE_PROP_UINT8("version", APICCommonState, version, 0x14), DEFINE_PROP_BIT("vapic", APICCommonState, vapic_control, VAPIC_ENABLE_BIT, true), - DEFINE_PROP_BOOL("legacy-instance-id", APICCommonState, legacy_instance_id, - false), }; static void apic_common_get_id(Object *obj, Visitor *v, const char *name, From patchwork Thu May 1 18:36:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 886354 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp463494wrq; Thu, 1 May 2025 11:38:29 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUp/dHT5FY1PhAIAxd5oO8GOUqoIuvBuxWRno4T2Nn6isbTddEUKaKVMoLgNgO7LplxwtPhOw==@linaro.org X-Google-Smtp-Source: AGHT+IGys08w2kdxhyVzauZ2iA8MRVcgTos0qOm0zXT/bXKnZe7Dr+GPv1k7Kth1inwdjU8qXnbC X-Received: by 2002:a05:620a:3728:b0:7c0:c469:d651 with SMTP id af79cd13be357-7cad5bb7e7dmr17170885a.57.1746124709096; Thu, 01 May 2025 11:38:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746124709; cv=none; d=google.com; s=arc-20240605; b=VS851FxFv5AKlyQMYPXQH6F7pW3l5wpj6gPbyUmu/3iMHSWUYXRjSxX9gufrRVcsyD 3to5xqKK+4IQYgp0Q0PjnQBGiKRoW1y7axvK/u4flr619+dO5O14cqldRcv8J5MELoTL zUtNu4jZEzacns/Xm/mVStmW9FXXIG3rFrfzufur1oz+dknXVg2v43n44P/LWMae4ulU mu0C+QDf82n5MwHFYAZeoOqkXEpZ7bBsRF2LKIQsMxZAubVq29C+FYeXOdUc0FfWf74H zITa+24E/75BvOc3cLnl8ShrgIyUi1e94ioyJQgvmUJCfy1lvzf7+b9Gu/W+ppFHr8IB jvPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=1oEZ8pcFL0QpEheuXUBBXfN5IHyToSd/0wmZn4AbYIQ=; fh=hoe06aprcDnk5P3d0vwgQt6uC5al0E2l9mfTIGTxZjA=; b=iyEAphM8xD8/2FY7SNRjd3zk/9Q+I69L+86Y9lbMETEVKe/5kYB2MLZQq2tdWK2oTB 9dk5Qyo7sDn0VD0YR9LUnbUTykMx9zDUpRW9h509OYKs8+xfDNsfzbQxkh1Z67qR1nWe Plgk1NC9K5jPfxoWX0eTftxxXw5CvjghaceD+zcUJkxHPcegbDFuoWLwW7DgNPSFVuUU 73q7scWdswx2n/RilndkZmQkXdx1HG6i3OKVKptT0hxUZxtPZgsB5Um25hqUH2JFmFfi P7FRbyKB8wbArgMd3AD3LCcI2at4h85Mcr6TEy/GhXsKH27cPZC+6Zn40FjN8GqZRwlx oAEw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fGaBVytx; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7cad2421bbasi124188185a.283.2025.05.01.11.38.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 11:38:29 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fGaBVytx; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uAYnb-0001VF-VB; Thu, 01 May 2025 14:38: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 1uAYmr-0008BR-Tz for qemu-devel@nongnu.org; Thu, 01 May 2025 14:37:37 -0400 Received: from mail-io1-xd2a.google.com ([2607:f8b0:4864:20::d2a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAYmo-000874-FJ for qemu-devel@nongnu.org; Thu, 01 May 2025 14:37:31 -0400 Received: by mail-io1-xd2a.google.com with SMTP id ca18e2360f4ac-86135ad7b4cso45849139f.1 for ; Thu, 01 May 2025 11:37:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746124649; x=1746729449; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1oEZ8pcFL0QpEheuXUBBXfN5IHyToSd/0wmZn4AbYIQ=; b=fGaBVytxzxAuWA9JvLK6PXvZVoQdxLdKxrgwDbWtso+ixf8RN85HORsPEdJPZU36ic FexaJt6Ij82KkHHis0cCnQVplna9XmcgJ4D9x/X/wH6+HdYA7NCR6GJdk44o2CUGMtdd Rbe2QTcr0qb0gTCJqFYapP7Ux2eVB92NVyh3LmmGXpmInRboJPpbkjSzamXrmcMTgI+s SVMd4M/sCwLKW6bJATVEhOh48M+1Eaq1rlhOkm98Bx4cdKdEi2GV8N4R8uuhWM3pgs0m DXOZZaA5y68zxPxfvnBFx06le9tUWE9NFEov69f60E5cLBk0TfZBraURGZWu+fgwOjvH bssw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746124649; x=1746729449; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1oEZ8pcFL0QpEheuXUBBXfN5IHyToSd/0wmZn4AbYIQ=; b=kjnspykLXqipZCLVzciGMVEN2i5dnCvQDm1WbF8/lyoosXnBZx1mUnwmT2eUzZOc65 Sr4twLYUVjooVHLDJbXVILI9uYRkGKHhQCXcDl/ir0EaPR7UjbTSI2ROaFK7VzY0Zaro TfcCGoV8PVMdyNAblUAqnmX0zc5Djl9k9TRtqGr5D+eDDNzmDM95S01cFU1yxWkL7KGc L1FP7IRZsGO8LWtbkX5ImH4Pg1yQKCG0s75mZ9ep89AZVITieZFgvi+W4xOIupMBOF/b NSZIKBu6/Sej0RPAKjkP6kEZ/rD4B/7X+3nX+REK6j1d8MdAwhXydnsOgxKpw5G9hXTB U12g== X-Gm-Message-State: AOJu0Yzmaa3asTYSbuBzqJergrRIFczvL+pm/8Wg1yQtwUxLUjcKErQ+ C9Fr+dAvhGV9OxtN0ljqkx2o1QEwIW27xWcJcEhsPek7xepztTPOrMBPdXr6ofw6jPRW+JPVHVn h X-Gm-Gg: ASbGncvehENs1Jnt4c/f8AVZE6EZwdKdSyuZImpXO82hGSjfFSqfDYzqEUGo0LJE3ag aJuOwJ4xdHCw/KnDaGdoPC5RIrvuwYrsgnQmPE4OTz4w2nM9gt4ghkr11TYLicXtz24qp92pWGp dgUbdxstgGiDnBQ/XMiYax19H4mex/KJJqmMax4yi5pvnMaUIoYZojfnsOBeAWrCylPMyygt7Kn 4Z2xNPkK+/IfNkq+XOZtD1LY0zrqx8HfkrjYkTfjbC/cZP0NmSEB/UMBAWI4SsKMTNI350ucBYq NRb5qcEKAf1KHEwgUBzuMSTxAmQXDVkBgh+HzM0Mrl4FbJou26rTXtZ9+Or79EY40A/vohTNZSF nTmrgJT6eWv2+IUsGTRAJiOL0ZJMwmh8= X-Received: by 2002:a05:6602:3890:b0:861:7d39:d4d3 with SMTP id ca18e2360f4ac-8669f967ce1mr37488939f.3.1746124648901; Thu, 01 May 2025 11:37:28 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ca18e2360f4ac-864aa32f7cbsm21510239f.28.2025.05.01.11.37.25 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 11:37:28 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Igor Mammedov , Gerd Hoffmann , =?utf-8?q?Cl=C3=A9ment_Mathieu--Drif?= , Yi Liu , Paolo Bonzini , Amit Shah , Zhao Liu , "Michael S. Tsirkin" , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Richard Henderson , Sergio Lopez , Laurent Vivier , Jason Wang , Eduardo Habkost , Yanan Wang , Marcel Apfelbaum , Ani Sinha , Thomas Huth Subject: [PATCH v2 06/16] hw/core/machine: Remove hw_compat_2_6[] array Date: Thu, 1 May 2025 20:36:18 +0200 Message-ID: <20250501183628.87479-7-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250501183628.87479-1-philmd@linaro.org> References: <20250501183628.87479-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::d2a; envelope-from=philmd@linaro.org; helo=mail-io1-xd2a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The hw_compat_2_6[] array was only used by the pc-q35-2.6 and pc-i440fx-2.6 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Mark Cave-Ayland --- include/hw/boards.h | 3 --- hw/core/machine.c | 8 -------- 2 files changed, 11 deletions(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index 5f1a0fb7e28..a881db8e7d6 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -841,7 +841,4 @@ extern const size_t hw_compat_2_8_len; extern GlobalProperty hw_compat_2_7[]; extern const size_t hw_compat_2_7_len; -extern GlobalProperty hw_compat_2_6[]; -extern const size_t hw_compat_2_6_len; - #endif diff --git a/hw/core/machine.c b/hw/core/machine.c index e7001bf92cd..ce98820f277 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -275,14 +275,6 @@ GlobalProperty hw_compat_2_7[] = { }; const size_t hw_compat_2_7_len = G_N_ELEMENTS(hw_compat_2_7); -GlobalProperty hw_compat_2_6[] = { - { "virtio-mmio", "format_transport_address", "off" }, - /* Optional because not all virtio-pci devices support legacy mode */ - { "virtio-pci", "disable-modern", "on", .optional = true }, - { "virtio-pci", "disable-legacy", "off", .optional = true }, -}; -const size_t hw_compat_2_6_len = G_N_ELEMENTS(hw_compat_2_6); - MachineState *current_machine; static char *machine_get_kernel(Object *obj, Error **errp) From patchwork Thu May 1 18:36:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 886365 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp464569wrq; Thu, 1 May 2025 11:41:28 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV0lrFh8rWQ/ziHJrAu8BTBEEI+HOtCQdfQZcPRuZA2C3niLh0oDpQXF3O16u7jf+8LZzgd8Q==@linaro.org X-Google-Smtp-Source: AGHT+IFSxNR2mTmbUPBBhEcg+zVj1Dg7NA4naMNgLm++SgdeTF+bZ659JfyEf1BGwB2xcFTMRkZ2 X-Received: by 2002:a05:622a:2515:b0:477:4213:33ff with SMTP id d75a77b69052e-489e4f6db3cmr97414331cf.24.1746124888720; Thu, 01 May 2025 11:41:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746124888; cv=none; d=google.com; s=arc-20240605; b=N9aD0vmKdokTmCKGFVKjt/G7e/75JgaTwHYbkJ4zadIrYg7Z8BRP13ou5LxZaWLD3Y auDQKOo2sR9Of9GTnxO0jozyU9wA1R3/xCFlks0tuSpyOTyD2TNlBDvKAeSmC05HJSZ4 2vWa2Avbu3aGJZ6BF0WYmusk3iUXtY/51fWt+N/z9btMArFu80fgoFT+kNue42a2bRxo 0BnPKr4wwpj6mr4DWR85K+C/LKamx/4amR2ZIfV7vAohDrToRx9WS0FydbNA0sRssl3C lE6m05dXGHhavB8wAEm5mY5xTQvs7/YY2tId9JigXTut1mS5R2Je6AQMuv+OQ+gT8wMp 0Abw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=LkLoJeHjOZe5nRnVptyiZRscDcIvghHTBUySTfzCR5w=; fh=hoe06aprcDnk5P3d0vwgQt6uC5al0E2l9mfTIGTxZjA=; b=kJOxm4k7XMIF9hyJMEg5L6yHNChbG64fStROKxv1adsgxOojq8PUqlMPQ1ZrP1J42n 7INQfJYQw2mylMCS7AVIFCFipYR3gqj7ZvrGn4oT8qDGJYHinYOVmpT5tet7tIsxvai7 5NOjoWxYtEXyZIekM0nCpX2xlF0YgqHvk+sfkxvDJCaDngvU0x+pPfky3ZhkeOwxAdWZ /xdoJFcBWGfHO0qvWLoEyT9cFld67A9A3ex1laMqC92mvKhcpe8GQX5H85UennbHhktJ JAIKn9W9UnyIBA7fFUO1dU7MMLjH4Tcwyh7gY09Oj/upl69o86OBUhatjgIVl/UkTTDz qzpw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="M/hqND43"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-48b98246dfcsi11846911cf.204.2025.05.01.11.41.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 11:41:28 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="M/hqND43"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uAYnd-0001ez-5s; Thu, 01 May 2025 14:38:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uAYmz-0008QH-FD for qemu-devel@nongnu.org; Thu, 01 May 2025 14:37:44 -0400 Received: from mail-io1-xd30.google.com ([2607:f8b0:4864:20::d30]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAYmx-00088F-EH for qemu-devel@nongnu.org; Thu, 01 May 2025 14:37:41 -0400 Received: by mail-io1-xd30.google.com with SMTP id ca18e2360f4ac-8616b7ad03bso31234239f.0 for ; Thu, 01 May 2025 11:37:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746124657; x=1746729457; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LkLoJeHjOZe5nRnVptyiZRscDcIvghHTBUySTfzCR5w=; b=M/hqND43bvbB7QLM/3v4/H4pmsw4F66fMr+AMjMTiSzC1bjQDYdBmoKzuLNR21mH/7 fKuGAiRbaXLzJAiNYYO/u1UMAmLfVZ6/C9JHBtdc6MpHge6S33IVyJwP08BrybQ8vd5o lPSCfquUdAl0Si1R2ibf93zGDzCgp0eBydsikw1UgTEla23iiGyTynUiGkww6YfUPxPc Dd+c/7KWZjlYoD+POpGAAHA94z0or+7z0LUIBsPKOboKi8rTUti8BYBFbXaH5zQ4e5M4 XnFirRAIA+cauJfzl1eO6HPN9Kbmv0hhaSbdVx3d1fLeuFdqmwosENh+78sySntUprIZ VaYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746124657; x=1746729457; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LkLoJeHjOZe5nRnVptyiZRscDcIvghHTBUySTfzCR5w=; b=eO/YZTJ69vlD1LGynaeIIIzwmOamlHV1M3bjccaaQMYoIYYk+D7EhCvpvr+OVBcoXl aH4Io+b8gmiiT612iFWqawtusuX5gSKnF43utebeaoBmQNIy/6fiB4YhHtPFNss5TegH fgaMym9OaTEqHmQWgOt5Akrx6m2/t68q+tiPtk5UlgIo5XAH7MsJzObuGT95OM2ToGKB 2CF0j3b583Flq90ahYVVszYazDAfSwmskSYNeJYksNbz2FNz1Q86vkzBxwjZZeguAHzH YH5j1SG329Cx4sAJDZuaB4rmESKaaTu5SLUPCFsiH94GBAtqUa2YT1pRNp3slL3nO61I pZpA== X-Gm-Message-State: AOJu0Yz3ev9MLugwxRvG0eWGaYc2viMsiUX7FWEMqJ5t4exW00zZcHds RNmqAyd8Q5CdYJM18pJyOOtNNLvZUeHJB9p/NW1qi31gu/JUDDQZ3FNy0LIkUc5/6nPatbal6MV 4 X-Gm-Gg: ASbGnctjJP9S54D1DYmwSlEn2n8rD+d4OAFJgiTTTgKLFScV96WAbWnr4dSLXh0OW5n A9FOZJSJvY39DOyRiTCAnxzR7yZiKOQAx0g8lRmSPqGGBA6gWgWw0yEZfKuPPw65lLwn5izHOHQ CPW5ax9RLNdxkHI4a3Ru44dc+4nn+SN7QjpKRuvZLY9vWhvkLkngis/x5dHc/948aiGTnqKjxM1 WXNhUNkOkNfvK6CJMrhcgD+PmDsp1kiHdnRrwrqNlJyur8joC+6FQd8kPBy9YmaVdU1K/4lx1MT j6DxlVZ+QY1+plALJH8SM3Y7F78xF0eF+L+jZTug1Iw+OZdaUE5pofZXQ1+gAIzTINHLTtF1Qhi dOawdr7aFrK79LfQ1O2GA X-Received: by 2002:a05:6602:360e:b0:862:fc1e:43c4 with SMTP id ca18e2360f4ac-8669fac62f5mr38157239f.7.1746124657585; Thu, 01 May 2025 11:37:37 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ca18e2360f4ac-864aa2b9400sm21179339f.3.2025.05.01.11.37.34 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 11:37:37 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Igor Mammedov , Gerd Hoffmann , =?utf-8?q?Cl=C3=A9ment_Mathieu--Drif?= , Yi Liu , Paolo Bonzini , Amit Shah , Zhao Liu , "Michael S. Tsirkin" , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Richard Henderson , Sergio Lopez , Laurent Vivier , Jason Wang , Eduardo Habkost , Yanan Wang , Marcel Apfelbaum , Ani Sinha , Thomas Huth Subject: [PATCH v2 07/16] hw/virtio/virtio-mmio: Remove VirtIOMMIOProxy::format_transport_address field Date: Thu, 1 May 2025 20:36:19 +0200 Message-ID: <20250501183628.87479-8-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250501183628.87479-1-philmd@linaro.org> References: <20250501183628.87479-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::d30; envelope-from=philmd@linaro.org; helo=mail-io1-xd30.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The VirtIOMMIOProxy::format_transport_address boolean was only set in the hw_compat_2_6[] array, via the 'format_transport_address=off' property. We removed all machines using that array, lets remove that property, simplifying virtio_mmio_bus_get_dev_path(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Mark Cave-Ayland --- include/hw/virtio/virtio-mmio.h | 1 - hw/virtio/virtio-mmio.c | 15 --------------- 2 files changed, 16 deletions(-) diff --git a/include/hw/virtio/virtio-mmio.h b/include/hw/virtio/virtio-mmio.h index aa492620228..8b19ec2291a 100644 --- a/include/hw/virtio/virtio-mmio.h +++ b/include/hw/virtio/virtio-mmio.h @@ -66,7 +66,6 @@ struct VirtIOMMIOProxy { uint32_t guest_page_shift; /* virtio-bus */ VirtioBusState bus; - bool format_transport_address; /* Fields only used for non-legacy (v2) devices */ uint32_t guest_features[2]; VirtIOMMIOQueue vqs[VIRTIO_QUEUE_MAX]; diff --git a/hw/virtio/virtio-mmio.c b/hw/virtio/virtio-mmio.c index 532c67107ba..b7ee115b990 100644 --- a/hw/virtio/virtio-mmio.c +++ b/hw/virtio/virtio-mmio.c @@ -752,8 +752,6 @@ static void virtio_mmio_pre_plugged(DeviceState *d, Error **errp) /* virtio-mmio device */ static const Property virtio_mmio_properties[] = { - DEFINE_PROP_BOOL("format_transport_address", VirtIOMMIOProxy, - format_transport_address, true), DEFINE_PROP_BOOL("force-legacy", VirtIOMMIOProxy, legacy, true), DEFINE_PROP_BIT("ioeventfd", VirtIOMMIOProxy, flags, VIRTIO_IOMMIO_FLAG_USE_IOEVENTFD_BIT, true), @@ -815,19 +813,6 @@ static char *virtio_mmio_bus_get_dev_path(DeviceState *dev) virtio_mmio_proxy = VIRTIO_MMIO(virtio_mmio_bus->parent); proxy_path = qdev_get_dev_path(DEVICE(virtio_mmio_proxy)); - /* - * If @format_transport_address is false, then we just perform the same as - * virtio_bus_get_dev_path(): we delegate the address formatting for the - * device on the virtio-mmio bus to the bus that the virtio-mmio proxy - * (i.e., the device that implements the virtio-mmio bus) resides on. In - * this case the base address of the virtio-mmio transport will be - * invisible. - */ - if (!virtio_mmio_proxy->format_transport_address) { - return proxy_path; - } - - /* Otherwise, we append the base address of the transport. */ section = memory_region_find(&virtio_mmio_proxy->iomem, 0, 0x200); assert(section.mr); From patchwork Thu May 1 18:36:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 886356 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp463704wrq; Thu, 1 May 2025 11:39:05 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXtrPJaGlUQ6yaixo+RfaJLsPXhD/jKN1HK45XpBfwkE4xt1BGQ6T5a03v3wDjsveG4Vv8ZrA==@linaro.org X-Google-Smtp-Source: AGHT+IHt/mSqCPsWotYqeT4nht5RyXi6+ZPee3zANhgWupSOj5a+B5R0X1PpHNJMYWsBDpXFGu5O X-Received: by 2002:a05:620a:2682:b0:7c7:9a1d:ecde with SMTP id af79cd13be357-7cad5b23818mr25676585a.8.1746124745639; Thu, 01 May 2025 11:39:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746124745; cv=none; d=google.com; s=arc-20240605; b=Azys6J6IDfGS7V+s13N0qJ9KSl7Lsn8u4RF9zTAstrj79PgcCHn9LtsAWSi6qYE6NI acoDnUdKmwaa+kFQEn/cRtfsGCQXu5Gda86c2f4QlDzrUn/XzitoIBYQXd3wXeyHyNnh 9NOBa9wvh+kW++cgSIzM3wTaUj6ceEsmblHxAzcWm3k3PZzNAmPS/z7S4vqcMtIb7rGG bj3C0ZOFveCpcZTsN5+f9/0aoSbtgnIXx8h9gVRdYrMdosb562L7JUIOej2uoKypMij1 GiGaPvU5LjKl8hz8mDDje5yyDDwZAPEqtJrje32IhF9OFq/2HV00v0WDvSCdHjgHwNXF ni/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Tug16kX0HED2B7MwReNyhMxMcx758vAMRXpHEaxoLXs=; fh=hoe06aprcDnk5P3d0vwgQt6uC5al0E2l9mfTIGTxZjA=; b=kh8+Y84Nmq0w6wK8mvpb/Ua7c4oqDR31GCn53Cg8h9Ez0DWoRv2dS0dAwnn1W/KvWw Zw7H5YfVmApIbGy1SkKMEcnT42GSErVcoew4jbfy366ti+C9vF2LSiZFh3AgfmO2gLfv YlC10DCCAOph9ABtVlc6ntUWAnizbPXc19Ve2U+HeZWrV3CSVq/x0zSdLeIcOWujvZON qlVPN40g46//nusAsMUi1eQXIE8wNNkxNJ/ZqYkayh9jTg5cy/j1ENjFnsGFN5bHPkYX CbRldyDxldTy7mieb9mEdf4KAmQY+AuXyUnyrpnCv5vX0FN2G9jzKx/NwLbmzSks+z5R 55jQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=r2z6ks27; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7cad23b9db7si130240285a.110.2025.05.01.11.39.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 11:39:05 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=r2z6ks27; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uAYng-0001yE-5X; Thu, 01 May 2025 14:38: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 1uAYn7-0000Ar-QU for qemu-devel@nongnu.org; Thu, 01 May 2025 14:37:51 -0400 Received: from mail-io1-xd34.google.com ([2607:f8b0:4864:20::d34]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAYn6-00089d-1y for qemu-devel@nongnu.org; Thu, 01 May 2025 14:37:49 -0400 Received: by mail-io1-xd34.google.com with SMTP id ca18e2360f4ac-85e15dc8035so45428839f.0 for ; Thu, 01 May 2025 11:37:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746124666; x=1746729466; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Tug16kX0HED2B7MwReNyhMxMcx758vAMRXpHEaxoLXs=; b=r2z6ks27SK4Q1t+i4QjMnyAA1bSf+mM1rUb72C1Htf2XZo2Vc82Cz5rMNvHloN1IA/ kDEJ9pud/uxO/lBTJYnfbhp7aQPz8tWHEOsPjio6EBGUE/2bK9YNPfLHZ/j2myPB1lkS BTSMZqMs22wIAQOGJKRPe5rEjmBG3FFM9f46RaWyIy/OJ5hhYVq8KXmCHiGyksh/uznd 9v+kgQVcjJmgHSepTeGMPwcqgLSweQDGtZzI9qPNq1vNh0/omWWvEamE7SKkK64kuCTs ZSHV3qeKwSCExbWs9iQXn3MZpvqdkD1Whear97EqlA6eApImLHl3Z/QXZQwsFUzs809h PhKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746124666; x=1746729466; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Tug16kX0HED2B7MwReNyhMxMcx758vAMRXpHEaxoLXs=; b=fUcI2LM9NHV9hvBupkfPM/4q+5vlgjoTQ1EVYpZ4KH2ry5J7xq+vDtao9OY6UxPfpC xWdEHSu2xNedNohq11uAxRetfbBBYu7kuPmwcuHaIoW/RqI7sAA0oUnNpwEeX9HElNVC sFuDKf6F7YZuE+DAW5LkMjefVa57NpQGLvS5IkdvTNeFGkSYeWTq6xk1TTNWDwtru0KF RQLsCKvJO1hCHLe3q2+4pq4RAI9tZE/IS+59U+XkRnE/Jtd/DnAN85I01L2poom61jLw z3T+mkeiEDLhQZNsdyuVkoL5BcMjqgqnMgPSF2Q6maPTwg2n7VpNWmzAwTeQD8rxgKrk rkWg== X-Gm-Message-State: AOJu0YyGoFCJMraIYx2pHhTfIjhqUEO15vHUDrl88P1ioQyaTKmL39rF BczU5AsBmpfccnE8Jib2BxD04nigWruww/B4al9nTMSLUep+cTpZt2lt9RYRXqSHlEmty9vcbJ/ P X-Gm-Gg: ASbGncvFyLoViAznEJ2Gl8FKUAhhmkyE/ROaE7Z/wvEwqL6Nb7lmFygZlNZ1hC2Ds1y wGOre6luujO9ysaDlkKtSwAhqsGvwp42avHGlUyWqkom7VyMZIdsyLzOAVkegx+4sb+5hCQ59Pu ZYSQqbrlIQEQxr3MMtpsLJrlWjl0LAxgx4WHJWdNW3mBoddaT4ISn7fI038erYq6Qo5U+QpY3Qy SXsZ816ZACb/9cfx/Gf+1Gl2RVpFqfNe6T7hM3TNO4OEdOIMQD8t48xWtCR1UmNsxvx/R1mMg98 jCl/sie+0hj4ou12AHrF3I8vzHplSU5a0bK1Hs0ruWeDLHmRV7l1uwfgtzaDbxeV7aQGnfR66Cc F5hSURAcksrEAsdaR3pkh X-Received: by 2002:a05:6602:4a08:b0:861:6f49:626 with SMTP id ca18e2360f4ac-8669f9adb4dmr38788439f.6.1746124666305; Thu, 01 May 2025 11:37:46 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4f882fc9af6sm293583173.100.2025.05.01.11.37.42 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 11:37:45 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Igor Mammedov , Gerd Hoffmann , =?utf-8?q?Cl=C3=A9ment_Mathieu--Drif?= , Yi Liu , Paolo Bonzini , Amit Shah , Zhao Liu , "Michael S. Tsirkin" , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Richard Henderson , Sergio Lopez , Laurent Vivier , Jason Wang , Eduardo Habkost , Yanan Wang , Marcel Apfelbaum , Ani Sinha , Thomas Huth Subject: [PATCH v2 08/16] hw/i386/pc: Remove deprecated pc-q35-2.7 and pc-i440fx-2.7 machines Date: Thu, 1 May 2025 20:36:20 +0200 Message-ID: <20250501183628.87479-9-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250501183628.87479-1-philmd@linaro.org> References: <20250501183628.87479-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::d34; envelope-from=philmd@linaro.org; helo=mail-io1-xd34.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org These machines has been supported for a period of more than 6 years. According to our versioned machine support policy (see commit ce80c4fa6ff "docs: document special exception for machine type deprecation & removal") they can now be removed. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Mark Cave-Ayland Reviewed-by: Thomas Huth --- hw/i386/pc_piix.c | 9 --------- hw/i386/pc_q35.c | 10 ---------- 2 files changed, 19 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 98a118fd4a0..98bd8d0e67b 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -755,15 +755,6 @@ static void pc_i440fx_machine_2_8_options(MachineClass *m) DEFINE_I440FX_MACHINE(2, 8); -static void pc_i440fx_machine_2_7_options(MachineClass *m) -{ - pc_i440fx_machine_2_8_options(m); - compat_props_add(m->compat_props, hw_compat_2_7, hw_compat_2_7_len); - compat_props_add(m->compat_props, pc_compat_2_7, pc_compat_2_7_len); -} - -DEFINE_I440FX_MACHINE(2, 7); - #ifdef CONFIG_ISAPC static void isapc_machine_options(MachineClass *m) { diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index b7ffb5f1216..a1f46cd8f03 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -648,13 +648,3 @@ static void pc_q35_machine_2_8_options(MachineClass *m) } DEFINE_Q35_MACHINE(2, 8); - -static void pc_q35_machine_2_7_options(MachineClass *m) -{ - pc_q35_machine_2_8_options(m); - m->max_cpus = 255; - compat_props_add(m->compat_props, hw_compat_2_7, hw_compat_2_7_len); - compat_props_add(m->compat_props, pc_compat_2_7, pc_compat_2_7_len); -} - -DEFINE_Q35_MACHINE(2, 7); From patchwork Thu May 1 18:36:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 886362 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp464390wrq; Thu, 1 May 2025 11:40:57 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWPmhDAQaS2667H9FkP+W8PzxKj5pFk6dqH+3wSFG7o0hBO7CfKeSp5gGTFYk00tUIzd8in2Q==@linaro.org X-Google-Smtp-Source: AGHT+IHy5w+6G1fUD6eGLXWIooH1rl6ZXyf+9ecaO8NTkc/02UoxzE2CJH2+cd0g8iFYY0SoEBH6 X-Received: by 2002:a05:620a:25d1:b0:7c5:6a40:6a7a with SMTP id af79cd13be357-7cace96e8f6mr501330085a.6.1746124856781; Thu, 01 May 2025 11:40:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746124856; cv=none; d=google.com; s=arc-20240605; b=SKiVjnuLiJzQkCkJtlrre47fdohNcalRYQnUHSzNF7HJdNSC+kuobCvHGKjvgsZim9 QaFJzwCRCJ4SypsEgam0r/O7o0gCJQpyjTj4kzKkhvn/kSC+wJx+Qwvd+Vlyx2QlwLSm cOfU8S+v19UXzQ6jwS1RRVCU9LIfgU1iIp+zk7Yg6tOM0tqQnV0KTmVjigykQ0ec/3ox /3JFcZlL6UqHEUUdLOt1hddNBQNM0EmwrswSALpnevJzhh28LLdDEfGOtfR2JOQiC1gl Tvv9cr7iUlg+7PIv8ehnX3ZBp1ufahs4Dzw3RZ4TWjQifc6jbIc8NRcneHwq5IQDPbH2 nkWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=rVL17Qw9Pu2E631HFpa6VOArtgxoydyEsXC8wSAHBfg=; fh=hoe06aprcDnk5P3d0vwgQt6uC5al0E2l9mfTIGTxZjA=; b=MDpoihNUNYo6BMDmfpgaaB2njiHJXML1DskUoGRizWu16gIMv2OeKYdMD7onEc9Qip IY+uaRaaaZ9uW6GFkePPr2vs95dzO7E4U7iFsCFeEnLyW+Cfhg9/q+jhUW2guW1ocORV R31pO/oRs1qKcmwZFOkuZoxlCVFdnJnv7PZAS2JJsC7WGOFhZOfm6peesZ4DAnIQFlIg PSMqrPjYh66mKoefAMnoWnPYog0+a2umnFE5ehsecUgB/tJMXa7odcl2q/+RZNyWp8cb wO76MIoARulwj9gG8b6MtDTYKlUh00rtvss7CyqD46GNd2Nx2P594A2sFfu+UDpfUgRY mYTw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BAd41zSk; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7cad23ba88fsi119268685a.29.2025.05.01.11.40.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 11:40:56 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BAd41zSk; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uAYno-0002PS-Cj; Thu, 01 May 2025 14:38:33 -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 1uAYnH-0000KZ-PA for qemu-devel@nongnu.org; Thu, 01 May 2025 14:38:03 -0400 Received: from mail-io1-xd2d.google.com ([2607:f8b0:4864:20::d2d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAYnE-0008Ad-K2 for qemu-devel@nongnu.org; Thu, 01 May 2025 14:37:58 -0400 Received: by mail-io1-xd2d.google.com with SMTP id ca18e2360f4ac-85ea482e3adso82855639f.0 for ; Thu, 01 May 2025 11:37:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746124675; x=1746729475; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rVL17Qw9Pu2E631HFpa6VOArtgxoydyEsXC8wSAHBfg=; b=BAd41zSkDlk74zr7cp5pRMBxqxvCoQYA+zScB5mrYS3sQ0Goe1IlARGtIHIXwqJwY3 sOJncMeISF1mGy3fN650UOL51EbsIgbB4Z+3eAAH23w78eGBI/6QtPiLZLWo35odfMy2 zua3n9enr1ytPFoDj6IH4W7oQUJp+9L1Hj/dO8cidQz5WEQUDDYsKbx2GT1zPSvvQxV/ G/rijq8O+dRMf0cojqeNdjzE/orsgyFm452QN2GHYso0qIdGvakz7TP+yb8WbHlWfKFk aCO4fIxeWmtK/I1/O0TNzblWJVydR9s1BnsnHAKCYgQsxebQiyocCtf1xWoHxLqpZYx9 Evsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746124675; x=1746729475; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rVL17Qw9Pu2E631HFpa6VOArtgxoydyEsXC8wSAHBfg=; b=Tid5GDF0y1iYsCj2TNgIaGaP1ylAhdWPDouvVh20hekzLqJ6Uq5r41v1ilmt/35Y48 S4uBcl91I7eQslbkxlKExJFblcEmoPGR7uYrCyHj3D/mmI2tuseY5tptO2M/mG73IPjD NgrEgHe6iOpKvFkW8ptVieWEm1N/topRhAyLpzoUqGPJunrlVz8jvaEUjHEJG887cruJ 2XLydb0gVPdwDtC1NYHvh55B/J4gvHltNdx3E5gX7VynGeaCLC0E+bXKY35oVX49z/QD E9JY8K3WD17S6Y1SJopl+OXbBDXYiQjRBzRp1AhYFKJLTohes167VH1HJY5w1nM/qSAw 9o2A== X-Gm-Message-State: AOJu0YyfHjUY1HuzixSidUQmJtqBvjrkvuk4EhFSnN4Am66wcElfHsKE FAwZHquerMTstR9n0Xuypta87/DqjtJfOD+bNOvny3ILLs394VFDh+5bsMe1jF/nfSQYQ9wq0ET w X-Gm-Gg: ASbGncutZY9Mv9ye6zlHy/fxybVZ2aR5gopeXedP9teJDu3EBtAxAzu3NIPBBCtuUMZ avsIwavE253ZKtaHZ3FbO9Nv+iIjJPD1cuckhuh7v5+d6Sd1V+x1O33+aHLd4ma+Urp+SQar1iU IISiyCSS2L4PWoAt5JObAn1GHoetaprcXYfEZKGjjON4EXvVU2OQw7xUQMuqG5NdVn/R8Nqqyvb KJgr7jcWKZsGmIP92RDQfrza07y+TNk85fTmOHjWPaS08rPN6vShRuV8N5Vw36R9ng5KjyRxkq7 2hK2eIrtvbCaj0do3YAFhfxo7jo4JcTMD1w/Ro5eNOxLqxr9SzAlFWBPcy3aKOL2IsjuaGHJw+m UizsM+srYvdO/6GJUbhd2 X-Received: by 2002:a05:6e02:1211:b0:3d4:346e:8d49 with SMTP id e9e14a558f8ab-3d970b7753cmr37711295ab.9.1746124675173; Thu, 01 May 2025 11:37:55 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4f88303c055sm303070173.138.2025.05.01.11.37.51 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 11:37:54 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Igor Mammedov , Gerd Hoffmann , =?utf-8?q?Cl=C3=A9ment_Mathieu--Drif?= , Yi Liu , Paolo Bonzini , Amit Shah , Zhao Liu , "Michael S. Tsirkin" , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Richard Henderson , Sergio Lopez , Laurent Vivier , Jason Wang , Eduardo Habkost , Yanan Wang , Marcel Apfelbaum , Ani Sinha , Thomas Huth Subject: [PATCH v2 09/16] hw/i386/pc: Remove pc_compat_2_7[] array Date: Thu, 1 May 2025 20:36:21 +0200 Message-ID: <20250501183628.87479-10-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250501183628.87479-1-philmd@linaro.org> References: <20250501183628.87479-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::d2d; envelope-from=philmd@linaro.org; helo=mail-io1-xd2d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The pc_compat_2_7[] array was only used by the pc-q35-2.7 and pc-i440fx-2.7 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Mark Cave-Ayland --- include/hw/i386/pc.h | 3 --- hw/i386/pc.c | 10 ---------- 2 files changed, 13 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 4fb2033bc54..319ec82f709 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -289,9 +289,6 @@ extern const size_t pc_compat_2_9_len; extern GlobalProperty pc_compat_2_8[]; extern const size_t pc_compat_2_8_len; -extern GlobalProperty pc_compat_2_7[]; -extern const size_t pc_compat_2_7_len; - #define DEFINE_PC_MACHINE(suffix, namestr, initfn, optsfn) \ static void pc_machine_##suffix##_class_init(ObjectClass *oc, \ const void *data) \ diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 7573b880905..ee7095c89a8 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -241,16 +241,6 @@ GlobalProperty pc_compat_2_8[] = { }; const size_t pc_compat_2_8_len = G_N_ELEMENTS(pc_compat_2_8); -GlobalProperty pc_compat_2_7[] = { - { TYPE_X86_CPU, "l3-cache", "off" }, - { TYPE_X86_CPU, "full-cpuid-auto-level", "off" }, - { "Opteron_G3" "-" TYPE_X86_CPU, "family", "15" }, - { "Opteron_G3" "-" TYPE_X86_CPU, "model", "6" }, - { "Opteron_G3" "-" TYPE_X86_CPU, "stepping", "1" }, - { "isa-pcspk", "migrate", "off" }, -}; -const size_t pc_compat_2_7_len = G_N_ELEMENTS(pc_compat_2_7); - /* * @PC_FW_DATA: * Size of the chunk of memory at the top of RAM for the BIOS ACPI tables From patchwork Thu May 1 18:36:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 886363 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp464400wrq; Thu, 1 May 2025 11:40:58 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUisn0bCQGLu1kdZ+Z4BsYos7zRmumcQUez6tYLhtNAkG30jHXgDuvnTftL71ZegtmdKdt9ug==@linaro.org X-Google-Smtp-Source: AGHT+IF848sV6LcaqRTsFuTc8Q1rGhfgqJj1/J0YlNyHngvwHUTdP6T8DsWeYUOidYTPy5IMqEr7 X-Received: by 2002:a05:620a:2953:b0:7c5:3c0a:ab7e with SMTP id af79cd13be357-7cad5b20805mr21035385a.5.1746124858087; Thu, 01 May 2025 11:40:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746124858; cv=none; d=google.com; s=arc-20240605; b=FqqMMMCyOxAfdqn8uHiXNfKgrKkXFKb1EfWCzi1ARGmu3NGQMPaRwRlRR21wIr3Nau 8TGPePl/95NrCG77my3pbiZypsqHkvk+OqDuziRlYTjcC9vrM5HBSysIAmgE4tdliChL xN1HJ5nxxYg0+ZhpcvQpHeQ/BG3DonR3J3g0qLT/Dij8azjT6rLtPE7NDhKfXNRJD+Bp 6zVxtJ/Ew5t9eO9kHLiC7pmoEyt8Jp7eRZmkK1rey3nIo55O1IiT6K7bH7bl3gLG3quO cmssbBeyvjAJaQIsper/QwThzo7/htZWvQqIa9wqVDto6q0edjKOdQ5eA6xRyUJeR6Qx 9wtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=OGZ2h0bYEkKLAAI47CZVdSqBou71xk/HAQM6xphmlJ4=; fh=hoe06aprcDnk5P3d0vwgQt6uC5al0E2l9mfTIGTxZjA=; b=YCali3457P2+f7aazTRp3ViX3JSQPuHSYY+69gvZ85Er3ySXbJac9IhVnuzvCLke6z R6ULeSS3X1iGXZtXDNG7xd/vW0bG2G5MEam+PMffm6PN66dzXuAteMLiMl+FGH+eb8+E wv1P5rFa6gTRV28gsmD9NU//tCb9WC4Bmy6B0/gEjlswdXSWyK1P8G1Nubl+h5s6I6B6 I3Od97Pv+oS3UNZbNMUNqC0uvLXVIlQpo+ewhE0T3PtaIncYI5CXKi76uG+BKSoJOda5 QVbRw5NBdcBBq33gY3RQ+SjQ3CfMAxrmfAZQu6hfEKRnlayT51pW156/DwPTu+y19OtN Wrug==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FwmkcGDd; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7cad2433b24si121120185a.435.2025.05.01.11.40.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 11:40:58 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FwmkcGDd; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uAYno-0002PQ-20; Thu, 01 May 2025 14:38:33 -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 1uAYnP-0000QD-0q for qemu-devel@nongnu.org; Thu, 01 May 2025 14:38:07 -0400 Received: from mail-il1-x130.google.com ([2607:f8b0:4864:20::130]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAYnN-0008BQ-7H for qemu-devel@nongnu.org; Thu, 01 May 2025 14:38:06 -0400 Received: by mail-il1-x130.google.com with SMTP id e9e14a558f8ab-3d5e2606a1bso11381145ab.0 for ; Thu, 01 May 2025 11:38:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746124684; x=1746729484; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=OGZ2h0bYEkKLAAI47CZVdSqBou71xk/HAQM6xphmlJ4=; b=FwmkcGDd+e4oChMZjyc6hhXdyxOi9qT6Lf7DTt7CFPyu66zn9M7FI6iCCyJgakVvxZ uxisEFkmAmBTikjCzzr8K3QxWSb0Y+NA7Ug3H34FyI90h7QBC9e4yDHeGw4WileWn5fs 4DKJnxE85cgfyi+Fs3828S1DIP4pEw7au/yOavwNvLNTUFSBtsjIn+s1aEBGRPPxLxsD GI49wk1+z0xhHgvz5ghW07dDfY3iBLawqTZOkEQ7bhIq0W0sOwH41ny1a9j6r9LbJEiF pSAnuKIy2XWElkMSU9uGtO5I0rlj0f7j/SmEcpqTTSQSkouYB2Pmx9JGOE1rHr2ANzFr c3dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746124684; x=1746729484; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OGZ2h0bYEkKLAAI47CZVdSqBou71xk/HAQM6xphmlJ4=; b=CfdVnop9nrR+NPZ3vSl4lpqG5FsJ9lDBRQ2O1DEyEeLcfAw8GFObO5CjqU+X92ynGJ IdIaY1e2Wb56O+w9rWjHQuyknBNQ7oW+N6zBSq1Y36aANC+W4WGwQgprbMMbusE7ci/e eWaYoGq19nAnhOKWRAj0qBPaUqvwJFgJocd3kdNS8XK2KwUGEsd9ppRxI4PdmHBYuU9C vV0VJh6e4Dgpxkz61tupz0GEi1miF4D75qxLJSxpx+lTwNmGx+4LbIv5ymjndjpNlieP I79JdAdh5SMRl3be53OFQZjMX161raEtQkeeO/xuHwyAqUM9v61yw5Xp3zI9lxV6tejw D1ng== X-Gm-Message-State: AOJu0YwmzZRIcx7ys7ONph5mHDYZPLAEqx7XM1bVd1bFY/2dZW4sAMHw ApB+tGRqe7zbIEsW8HkahxJ+MRg1bg5pY5Ff/FYeUPqJf2OHYCLKYSaOOwmM2P+MXhX8+IjpSG8 q X-Gm-Gg: ASbGncsiBG6Hr+h+h2uX+flm77egllwaTq/yodevp6FTh6O3wUshbJhOlg8g+YWt5GQ UDo1rs3uVydEAc4wqJAgrW575+jMvNtbwvL29j8zGtZkMIeQTRRIcNWewofCPF8PDS8GTHa1fzT K9Bi5zVnoFvoY/G8xoGmqrEr0d0pPvBnWpSJsu5NikTfHmx1JST9SHMVFiOhFBTTfm64Kw4QPuf WEpPWIOMX96DYt5Gozn3upQd+SjMMjVdT5vX3k9U4WFqPG8GNM4E0699F08pxPxe0Wg5sa2v+iF YYXq+Ca5gzfY7dXlIcYYr00YoIGivS2zF+nj5lpr2suivUcFAfpAsj1LhGAXmnumhEnmlGnQMDV H4Pjz+4Net3ra5B96PPG6 X-Received: by 2002:a05:6e02:2511:b0:3a7:88f2:cfa9 with SMTP id e9e14a558f8ab-3d97022692cmr43020525ab.11.1746124683890; Thu, 01 May 2025 11:38:03 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4f882f06d40sm306171173.72.2025.05.01.11.38.00 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 11:38:03 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Igor Mammedov , Gerd Hoffmann , =?utf-8?q?Cl=C3=A9ment_Mathieu--Drif?= , Yi Liu , Paolo Bonzini , Amit Shah , Zhao Liu , "Michael S. Tsirkin" , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Richard Henderson , Sergio Lopez , Laurent Vivier , Jason Wang , Eduardo Habkost , Yanan Wang , Marcel Apfelbaum , Ani Sinha , Thomas Huth Subject: [PATCH v2 10/16] hw/audio/pcspk: Remove PCSpkState::migrate field Date: Thu, 1 May 2025 20:36:22 +0200 Message-ID: <20250501183628.87479-11-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250501183628.87479-1-philmd@linaro.org> References: <20250501183628.87479-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::130; envelope-from=philmd@linaro.org; helo=mail-il1-x130.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The PCSpkState::migrate boolean was only set in the pc_compat_2_7[] array, via the 'migrate=off' property. We removed all machines using that array, lets remove that property, simplifying vmstate_spk[]. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Mark Cave-Ayland Reviewed-by: Thomas Huth --- hw/audio/pcspk.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/hw/audio/pcspk.c b/hw/audio/pcspk.c index a419161b5b1..0e83ba0bf73 100644 --- a/hw/audio/pcspk.c +++ b/hw/audio/pcspk.c @@ -56,7 +56,6 @@ struct PCSpkState { unsigned int play_pos; uint8_t data_on; uint8_t dummy_refresh_clock; - bool migrate; }; static const char *s_spk = "pcspk"; @@ -196,18 +195,10 @@ static void pcspk_realizefn(DeviceState *dev, Error **errp) pcspk_state = s; } -static bool migrate_needed(void *opaque) -{ - PCSpkState *s = opaque; - - return s->migrate; -} - static const VMStateDescription vmstate_spk = { .name = "pcspk", .version_id = 1, .minimum_version_id = 1, - .needed = migrate_needed, .fields = (const VMStateField[]) { VMSTATE_UINT8(data_on, PCSpkState), VMSTATE_UINT8(dummy_refresh_clock, PCSpkState), @@ -218,7 +209,6 @@ static const VMStateDescription vmstate_spk = { static const Property pcspk_properties[] = { DEFINE_AUDIO_PROPERTIES(PCSpkState, card), DEFINE_PROP_UINT32("iobase", PCSpkState, iobase, 0x61), - DEFINE_PROP_BOOL("migrate", PCSpkState, migrate, true), }; static void pcspk_class_initfn(ObjectClass *klass, const void *data) From patchwork Thu May 1 18:36:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 886358 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp464211wrq; Thu, 1 May 2025 11:40:28 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXv7pmqEUFDCSNjjbqghXz1gR6tx7RtVbXX/4fYa9H7OlygDB+snMsF5hKg4qCQ9EzKZTWNFg==@linaro.org X-Google-Smtp-Source: AGHT+IF3UPb5oXHOTU9drn89Ywcon4Q4W0R/xU7pQfa6SOvoJBfVLDof+m5RVx0JwiNbb7C2MXc/ X-Received: by 2002:a05:6214:20cc:b0:6f2:d45c:4a1d with SMTP id 6a1803df08f44-6f515613f50mr5707966d6.38.1746124828166; Thu, 01 May 2025 11:40:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746124828; cv=none; d=google.com; s=arc-20240605; b=SZ4UMODV0TmuFZWgZtf1YSzdlbatWj18WHVB4HjT4QnJ5c58iwqC8gkgCvngiKM96U 86wE8DRB7C7Q3FTxrZ7nKRlFfcRiJEKr4ZKb9y4PEJoK5qZO+D3dyB9NbdXoW16n+3oe Lu/3YUtwiL79WFGbkAJxs2MpqY4oxFZV9L9Bvj5U9If1ImTW4Lf7FaOhoI7M2CWXL7Mk 8I4gqA1lWH48d0kK8iE3GhWYFEkyByhGMUNknlEr56e9wVuyIZk0dPyUT1CncHJ7bC6z ym8FPt1OJPi+mS6jL0z4PCxBQuyk2KArr45rLp6LUi6LaQ0HbQmpGyUFE8eCL/38UFpT MXhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ZeBP6SMx5HnWyi7uG5Jn5cSUUcBtF9s2f1+jGOqbmJs=; fh=hoe06aprcDnk5P3d0vwgQt6uC5al0E2l9mfTIGTxZjA=; b=aSo47wUkaYuOnq4EIwzsVR52dbV0t5ZYdCNt1+uyttqIVh92hw/fMPPmRGqscfU5Dc IOZqaU3DEYfFbDWbEg6kIuJEGI1c2bziP6Mz1KuScdlarJqyUAygtTcXb3bdIw7xAmk9 Xu/ou9vpkcnFKRGVn5OWzMfEawBRLyI+xzg3KpXA8RnBZTaCmwZdvDDxHavaUTbonB04 UjMoQvuolSNlvAPVZ2EZ/76v/8R0x2I154q4lbRHGV//Dm9SKsNEzHoBIXOXVRv/pACZ 208eAoaOrtVZ2qgiVn0hDFr+zdT4z1OP4qR7uAfwNUOOmPmjGFh2f67QW80MsGiYMJd1 Vp1Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Ba+PDTxD; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6f50f476f96si12573426d6.205.2025.05.01.11.40.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 11:40:28 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Ba+PDTxD; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uAYok-0003EB-NS; Thu, 01 May 2025 14:39:31 -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 1uAYnX-0001B5-Qz for qemu-devel@nongnu.org; Thu, 01 May 2025 14:38:15 -0400 Received: from mail-io1-xd29.google.com ([2607:f8b0:4864:20::d29]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAYnW-0008Fw-2O for qemu-devel@nongnu.org; Thu, 01 May 2025 14:38:15 -0400 Received: by mail-io1-xd29.google.com with SMTP id ca18e2360f4ac-85de3e8d0adso31612839f.1 for ; Thu, 01 May 2025 11:38:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746124692; x=1746729492; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZeBP6SMx5HnWyi7uG5Jn5cSUUcBtF9s2f1+jGOqbmJs=; b=Ba+PDTxDjB5Pf1sFZBTI2oJqVxnYTTTXDXmewb8BqJFT9RvYvizs4xjKzIrVm6xCs8 kPG34otRFOlDfYX6D/ft69djf4RTRJA+WBWAxHgGR0rXPXMvbRhuyrtmLL2vQ0gL+Erl yQP4czC/kh0klie7h27XNNIIEL0BWNfAxjr2TbqOoddlbzC9j7JoXm61nTk+vNPcGe+o EjhwJ8T+7h6lC0+jyTb4jPD6sqPsl4540BvhWrvalY/H6l1t6ZzkXjIsFHihQIWTTDcM g/ORgPMm/uxf3OpRZcw/Z8dFhJNVezQPHY2nKS27XjzB3p7dPGFCUsvtovLb0eCCPV2E Y0rA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746124692; x=1746729492; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZeBP6SMx5HnWyi7uG5Jn5cSUUcBtF9s2f1+jGOqbmJs=; b=Czp/GQeBsDuE8a5AxupVZKXbio/lZ1vC+HibXnBPDjhd8VKDnbWFHGCczPPyVyVJlY fyOS46Hr21BYfVnzaKGA23HGqOT5ZLQgeIOQ0H5NpwdSrYyBsMLkwAtsOL04PUEtGYKb 1nS2duywM/DtBkcC0g/vncU9ol21EXQrmOcMXQfgw+A7PwtwZ/nFAObtYQ0AulRACCGP jgyvuZQZFVNtmtSld+jhAAg/o0IA4wowL1ghd7EUrveQn+PIyPg8qKaZZdQr2QWKNLN/ LSGZWdkuZSALaXPHOfKAFqVR/nhvvl9wgxLpIwo+JkAXX/zIpIlgoGyY3KKXNISkv8wg 0cpw== X-Gm-Message-State: AOJu0YzU6VKjGp4sdwMjJYmRrk8JwOUyak0gy1pdEJtQGRV5h3IQ6uDp ZkVB+u6Pb6TUMndxamb51XXSuWNronq/VpZfYPKZL9LGSoCU7iN56RgnoaCYWfV4PXtin6zOnLd a X-Gm-Gg: ASbGncuzZa8qtyPi4ITFGyOyTctB9nAqPTQ6WgZWIIXpZkA9CJ1+wG0be6ewm/Fl1Yv WaPIcFvkD4D0aNyfWSyC15MLx98GmBUFtvI1dZSOyyVb82dx72YpNeOxXhWzWpEk2xUHsvETcK6 W8NO5vhsTP65s2hRzzY45JxsUZePomx3iqCEZ2daqD4OqIEfgMyjT2cU3K5AMtZGkQNs12gaVCK Jlpe88Waj2OY3K7RwbdcBUEkoZ5D2AqMiTMC345ZOG8syZjWbd001KmN7EbOXYD8FSCZVhVq6+B J0hySzeGger1x6xZUT62vLAiCdfiplUNync3CbCm8vjc+vh8Vj5tMol+LhM3TYuHtheX/t+GCpi hGx9yBiX2AsAkfVH7LD03wT7Z6vkO1Qo= X-Received: by 2002:a05:6602:401b:b0:864:68b0:60b3 with SMTP id ca18e2360f4ac-866b42504e4mr37684339f.12.1746124692487; Thu, 01 May 2025 11:38:12 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4f882eaee47sm306869173.2.2025.05.01.11.38.08 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 11:38:12 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Igor Mammedov , Gerd Hoffmann , =?utf-8?q?Cl=C3=A9ment_Mathieu--Drif?= , Yi Liu , Paolo Bonzini , Amit Shah , Zhao Liu , "Michael S. Tsirkin" , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Richard Henderson , Sergio Lopez , Laurent Vivier , Jason Wang , Eduardo Habkost , Yanan Wang , Marcel Apfelbaum , Ani Sinha , Thomas Huth Subject: [PATCH v2 11/16] hw/core/machine: Remove hw_compat_2_7[] array Date: Thu, 1 May 2025 20:36:23 +0200 Message-ID: <20250501183628.87479-12-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250501183628.87479-1-philmd@linaro.org> References: <20250501183628.87479-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::d29; envelope-from=philmd@linaro.org; helo=mail-io1-xd29.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The hw_compat_2_7[] array was only used by the pc-q35-2.7 and pc-i440fx-2.7 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Mark Cave-Ayland --- include/hw/boards.h | 3 --- hw/core/machine.c | 9 --------- 2 files changed, 12 deletions(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index a881db8e7d6..77707c4376a 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -838,7 +838,4 @@ extern const size_t hw_compat_2_9_len; extern GlobalProperty hw_compat_2_8[]; extern const size_t hw_compat_2_8_len; -extern GlobalProperty hw_compat_2_7[]; -extern const size_t hw_compat_2_7_len; - #endif diff --git a/hw/core/machine.c b/hw/core/machine.c index ce98820f277..bde19a2ff67 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -266,15 +266,6 @@ GlobalProperty hw_compat_2_8[] = { }; const size_t hw_compat_2_8_len = G_N_ELEMENTS(hw_compat_2_8); -GlobalProperty hw_compat_2_7[] = { - { "virtio-pci", "page-per-vq", "on" }, - { "virtio-serial-device", "emergency-write", "off" }, - { "ioapic", "version", "0x11" }, - { "intel-iommu", "x-buggy-eim", "true" }, - { "virtio-pci", "x-ignore-backend-features", "on" }, -}; -const size_t hw_compat_2_7_len = G_N_ELEMENTS(hw_compat_2_7); - MachineState *current_machine; static char *machine_get_kernel(Object *obj, Error **errp) From patchwork Thu May 1 18:36:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 886364 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp464438wrq; Thu, 1 May 2025 11:41:04 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWLaQniljlXpSRpX7uabrgcWdYrSFufSRg3euT1/e/e/zBkIxjeW3PwpLZ3BNWXmbJ378Mdhg==@linaro.org X-Google-Smtp-Source: AGHT+IGZaoyWkEFi9xH0mfnn/GmKbNjKis2jcRsY96tPuBqiZkylgS2yX/NRjroyohyBq1VOQ6rO X-Received: by 2002:ad4:5bc9:0:b0:6f4:5dbd:2761 with SMTP id 6a1803df08f44-6f5157f3aaamr3913496d6.32.1746124863985; Thu, 01 May 2025 11:41:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746124863; cv=none; d=google.com; s=arc-20240605; b=JUZ2kLbCkRAUIKXXUbjJN0+BMwLTGEc1S7TEdW9UCaUF4gAjsiKPxrw7MtEwT96eUt rmqwqYF5biW9h///nZeiVSdsRIFfssaipvz8z/Eb2aQGFdcnJphX3jL0sBJ3Uc9qiRMB NuV360NK4RhRUjkvxtppLXKDCGKxIqBpVUsTbE689HvclFHh6F2pmdgN1/Tvvb0xztzy 2yn8UGZYXEPOISKvzDKVy8B9/4aSmlLfnRrlxKJvRytXYaRA3UCiZ8gT/L07i7gTSjE+ +tm5YliuQsuYNfSyq33b/HZaX00v7BZvzWeCFeLqhNU4RuTuPpSCs2tQeZo1p+osCIr6 SYLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=NpvMgcrpSQGafRLyw/ZNHAX6/bjj0J9IvQrfqDaCmhA=; fh=hoe06aprcDnk5P3d0vwgQt6uC5al0E2l9mfTIGTxZjA=; b=czM8a9COB78h77IWp++MO11TvseO+jxIgqX0veyfDMGXiRCD2L16NBHJSQXQJIaEFE um1OlI0onAR4iz3W12cL7nQ3QVzQsdZ8Ku0fp1HhOndWBiXivkALUfulWInCENEY6/Jz 0P3ns5H8DTD/A6YIa4MVnrEdY26qwm0t9qakPOILfysxAc3awmC/bD9SezwZB4YDW0ll 7ugVT1KcHjexXpSp9+B13ofUntMD2zU6le6f3HI+4vcw7p6GP+I7v5OCgAjH3rNqXWS6 Gq0E0GNOi8n7k83wcIGssJo2gc77fA4icXurBpIyo9nUQ+cCK5+dniIhsGEgL96vJ5TL kzkg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=u+E130Cv; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7cad2448089si117801985a.555.2025.05.01.11.41.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 11:41:03 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=u+E130Cv; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uAYpH-0003aw-Iv; Thu, 01 May 2025 14:40:04 -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 1uAYng-00028j-ME for qemu-devel@nongnu.org; Thu, 01 May 2025 14:38:25 -0400 Received: from mail-il1-x12a.google.com ([2607:f8b0:4864:20::12a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAYne-0008IW-N1 for qemu-devel@nongnu.org; Thu, 01 May 2025 14:38:24 -0400 Received: by mail-il1-x12a.google.com with SMTP id e9e14a558f8ab-3d46ef71b6cso12280375ab.3 for ; Thu, 01 May 2025 11:38:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746124701; x=1746729501; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NpvMgcrpSQGafRLyw/ZNHAX6/bjj0J9IvQrfqDaCmhA=; b=u+E130CvTa2buvbr6Z0GgwjxlAu2d2tHI/wP6ELU0gpT2VAi1GoVKVX+bkQezysorn lpIIu6GgfyJoiwDF8amKoqASH72Mq1Fa8YsuphLK+BPG8uUDfVNotVVclNyaLyNO+3ye OL3PriK61/juatXKX0KeUhcoaRaICp31VyaQj2GUuSZKojxN5ryD/IDcBkipBkWujQLz UpUX4TIAT3uHXJq4UQ8ua7HpZBxyUt7+Q3TXeMjcgDUzeGH+p5mapnUMJ48LERRHEUX5 j/IEKUKZGwL722/srH08yO16dZJlZUO7XgVIsiO1VZo014jAaB5mKdDkfc6ChQ/8wsYy /u+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746124701; x=1746729501; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NpvMgcrpSQGafRLyw/ZNHAX6/bjj0J9IvQrfqDaCmhA=; b=VkECxNS5kKmO1y2C6I4FaZVvaQ2Th04p4EzErTpQ4Ymkt3IpPX/aVGG7MNiNIAja5O EzL4J5virQP15uwmtPmu3vv/vFaQrzWLtcyYV31hAW31jKQ363fLlqRMCs8D+YMGrlTB kE2F5T79RIcTbmepktPGoBrmAKeDHWHhPRCgG8AUqcG17JGSEwPtyCUMIAvmRpDm17PN DrFNmaFdMf9ASZ8Ygw6Y85o6VAOg6zo3LcIlVI1dJhVtuRP9L3zCMedkMN2ohP0rFsHX ryJh1P7BvdsSt7J6ouI0z6Mj2f3KrXxOsC/jCnokrUVB2ZyNHTStUxpF1gc/r2hzBJ9Z i21A== X-Gm-Message-State: AOJu0Yyj4avJnzrHII5YHAaRgzNoyHT3Il6gzGCvWOozLWuZIHkXodaE bTb+KVpQgEbQRcvGXh3poGxH+8vihfhvXgFSwOFvnTwPcwMPNZnbbzKUWDDFNB/bNZMFWdMc/af 3 X-Gm-Gg: ASbGncuvBkce+3bdZy+DVpw/+LHCSRLQ68AMQyq94zmzjG2AgaJoACkUHI+vds1fX0F 8OzM6vbr3ivFBCFvKmPkiItpE6ZKsMaNH2/QnkkjuDH1KXB6JfMjeT7vDGky05fYXssESNYNQ59 piwRyBJrYuX0JD2pnylitjrrx0ET1nHjaa6VCz83foDR+u6dtB4Wd9zKAbRu9UZKbhbSxGYI6Jf phCvnq1FKOBgg4DfJQYOviwYhntDLJwtALdkchk9NcESnOezsVh4o/uCaQpFMVu4scksh0Zih6u qHeDk4zdLRzFJfaGv92aAeLmY7R1l1bSVGJp46wocdxQgZXVDuTTEJWH+6OpnXI1XMRzZMqUmLx 7Lkzk6OcJujTV3RJu5bHjWhfjrofd/ME= X-Received: by 2002:a92:d84e:0:b0:3d4:70ab:f96f with SMTP id e9e14a558f8ab-3d9701fc1f1mr38617615ab.8.1746124701176; Thu, 01 May 2025 11:38:21 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id e9e14a558f8ab-3d975f6cce5sm2532555ab.59.2025.05.01.11.38.17 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 11:38:20 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Igor Mammedov , Gerd Hoffmann , =?utf-8?q?Cl=C3=A9ment_Mathieu--Drif?= , Yi Liu , Paolo Bonzini , Amit Shah , Zhao Liu , "Michael S. Tsirkin" , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Richard Henderson , Sergio Lopez , Laurent Vivier , Jason Wang , Eduardo Habkost , Yanan Wang , Marcel Apfelbaum , Ani Sinha , Thomas Huth Subject: [PATCH v2 12/16] hw/i386/intel_iommu: Remove IntelIOMMUState::buggy_eim field Date: Thu, 1 May 2025 20:36:24 +0200 Message-ID: <20250501183628.87479-13-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250501183628.87479-1-philmd@linaro.org> References: <20250501183628.87479-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::12a; envelope-from=philmd@linaro.org; helo=mail-il1-x12a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The IntelIOMMUState::buggy_eim boolean was only set in the hw_compat_2_7[] array, via the 'x-buggy-eim=true' property. We removed all machines using that array, lets remove that property, simplifying vtd_decide_config(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Mark Cave-Ayland --- include/hw/i386/intel_iommu.h | 1 - hw/i386/intel_iommu.c | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/hw/i386/intel_iommu.h b/include/hw/i386/intel_iommu.h index e95477e8554..29304329d05 100644 --- a/include/hw/i386/intel_iommu.h +++ b/include/hw/i386/intel_iommu.h @@ -303,7 +303,6 @@ struct IntelIOMMUState { uint32_t intr_size; /* Number of IR table entries */ bool intr_eime; /* Extended interrupt mode enabled */ OnOffAuto intr_eim; /* Toggle for EIM cabability */ - bool buggy_eim; /* Force buggy EIM unless eim=off */ uint8_t aw_bits; /* Host/IOVA address width (in bits) */ bool dma_drain; /* Whether DMA r/w draining enabled */ bool dma_translation; /* Whether DMA translation supported */ diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index 5f8ed1243d1..c980cecb4ee 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -3823,7 +3823,6 @@ static const Property vtd_properties[] = { DEFINE_PROP_UINT32("version", IntelIOMMUState, version, 0), DEFINE_PROP_ON_OFF_AUTO("eim", IntelIOMMUState, intr_eim, ON_OFF_AUTO_AUTO), - DEFINE_PROP_BOOL("x-buggy-eim", IntelIOMMUState, buggy_eim, false), DEFINE_PROP_UINT8("aw-bits", IntelIOMMUState, aw_bits, VTD_HOST_ADDRESS_WIDTH), DEFINE_PROP_BOOL("caching-mode", IntelIOMMUState, caching_mode, FALSE), @@ -4731,11 +4730,11 @@ static bool vtd_decide_config(IntelIOMMUState *s, Error **errp) } if (s->intr_eim == ON_OFF_AUTO_AUTO) { - s->intr_eim = (kvm_irqchip_in_kernel() || s->buggy_eim) + s->intr_eim = kvm_irqchip_in_kernel() && x86_iommu_ir_supported(x86_iommu) ? ON_OFF_AUTO_ON : ON_OFF_AUTO_OFF; } - if (s->intr_eim == ON_OFF_AUTO_ON && !s->buggy_eim) { + if (s->intr_eim == ON_OFF_AUTO_ON) { if (kvm_irqchip_is_split() && !kvm_enable_x2apic()) { error_setg(errp, "eim=on requires support on the KVM side" "(X2APIC_API, first shipped in v4.7)"); From patchwork Thu May 1 18:36:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 886361 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp464382wrq; Thu, 1 May 2025 11:40:56 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVcMAw0fexzCX0pvO93XRlGDaZIawE3Ab+hu/7fTUTJWizTrtpTmRKD4LU6FJYInBGu0Kl9vQ==@linaro.org X-Google-Smtp-Source: AGHT+IHdO6m875gsQt0lNztch3eCXCzO+SV5mWIM3QVvfgab7EeLLb9kuYAWCr1eaXlK/ZRNfQkX X-Received: by 2002:a05:620a:4587:b0:7c5:4caa:21b6 with SMTP id af79cd13be357-7cad5bb8ad2mr16385885a.57.1746124856413; Thu, 01 May 2025 11:40:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746124856; cv=none; d=google.com; s=arc-20240605; b=ECN5dvUGUhzVUNtN9OrJSfiyWW/G0DATICw4V8Jifc1bvLeN4xccRTVfaW/14E0GXA Mm3l8NOuyt8eFm0cImzqC/ylnyM71BgHhLYiUCP2KT7SYvjAPCM+z7lTjNPBFX5/VOXY QrZKUuMNioBucReXWqKWaOuuEASm33ncYWm0jDmOJrPLAmmsKI/nT2f6FGiWipCnWueF cfX2McltRouZcY/R0MofBeQKDWLUTaAKCg5KR+7wofqt/kBHLb0Oeou9sNbfNruW27QW 0Srh933/BqeLGEavm0d18QQ7gAYDt9tGidCEZD3czseEL/OHf9kUwU1+AdscpZy9S5W/ an2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=3wudwU0Mjh7FMfb66kwc7bqI37P6PrLMFSD6vy2kDJU=; fh=hoe06aprcDnk5P3d0vwgQt6uC5al0E2l9mfTIGTxZjA=; b=J4dgkUzWU+mjCEFSH14gixj67CbaV2gPen2SX0gCUmFV9e7qG9ebjT1yr5nbXpMWSa zNhUJ4o5Wx56Oy3dkYIwvUraUHd7Tt/HZA0MrLyrRLwzIUJ62KcwADUoJCGEiFMDmK+d Xgp1mblCaSXlA7VKnH+Qzh4dreqXf068PExIqq0w41gRoMshgHp56RQlOtHUHuTqm09L WQgbuK9HL+f0Ossk4r+xahBc4Y5X3pmlcFKibfc4OSAA7my9jntoJ9rxukfkDQqJK+f4 CEil2aAvVSdoqtnuL5IBRTkvEpSlRjENN1mh0/kzP4xpaNKjK93/buiQlGrwtPu8lJIh jeuQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=zN1hRrga; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7cad2430b2asi117118885a.346.2025.05.01.11.40.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 11:40:56 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=zN1hRrga; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uAYpQ-0004GB-6g; Thu, 01 May 2025 14:40:12 -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 1uAYnp-0002Tj-1s for qemu-devel@nongnu.org; Thu, 01 May 2025 14:38:35 -0400 Received: from mail-io1-xd32.google.com ([2607:f8b0:4864:20::d32]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAYnn-0008JI-9D for qemu-devel@nongnu.org; Thu, 01 May 2025 14:38:32 -0400 Received: by mail-io1-xd32.google.com with SMTP id ca18e2360f4ac-85b41281b50so43766939f.3 for ; Thu, 01 May 2025 11:38:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746124710; x=1746729510; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=3wudwU0Mjh7FMfb66kwc7bqI37P6PrLMFSD6vy2kDJU=; b=zN1hRrga4n7cOC7r+LfFj01SA7Tq0gcFX4Owf/sUUkP/ADH77nXb5A1zxjb8YnPCmh wkNzKyDjvYs9nfaHB70fZ9O9D0NvSxrT2pngvMk6vBxUmXtN5ljpIl+sVmEux/XUEFWo wRm1MzPXRfAoYimq6hNbAyus3WP5ywDV5V+2IUbdtSf/62fbVlhaAqYC88UppgBR8BPH GKHfQbugjBlg0VUhqtyc8b+oFcN3tR130quohQcBEhlTUXAPt7U6iDQUjDw1iSU62UqH Wqe58tr41wyP6RYeGmeRsYJ5JuLd1R+6rEtBO29Sq6JhND4rea8cvcr+m0FvmoiPbtaJ yZNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746124710; x=1746729510; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3wudwU0Mjh7FMfb66kwc7bqI37P6PrLMFSD6vy2kDJU=; b=PVpOrOHad5n6x+yUECZEAQAD3q+8cnPqLQIkYatU6pEHvHDuPRPUJWBUkpvPbfVLQu a8WuK/gX6Zu71QdUTiVDxWlwzmEEWfS6jOr279Fd1hxva2dOnvMs4Iu6nn9Ui9lKELMd sCY4d0GkX4sBm4kMY+LnAshzQEbKS/Z+JSZwcIF8WXpDtgSimY5fjcewWxqqkAr5Astu lEyBTWdOjk2GXJ3od0ISDQ33Slzj/ISCP6yZzB2iEk6Yr0nZAveXukYOXboE0h3E1GzN hpNcauaXGNSx/Ic5Lkl9GtunRiUAPwxwMu/lmkzD0pCh8p/cEIihKZCDwVNsUSYRZsD1 x50A== X-Gm-Message-State: AOJu0Yz3s2AwWku7XhUeKWGtHJQL85PnxFzraLqpFdUjXR0wHJpwQMi8 TEIh601c/2Q7Ek3SzD4N7tJCMt+5RRJWAY6mDvOafMtIiJ1UI/cKXb9p/TB+EZ8Ul/BGbEvF/uR j X-Gm-Gg: ASbGncvVcY5E+eec1/FRFI0ZvA070eFOsRs28b94ueSYw6RJik7DfHUY7eDDO6RPyAN WARb5ETWE9GPqrvwN2rrU5vFw+VgHGrMNLGB7Fw32N/7xGUB/LdXgyDdzn9etlb/dqjPLfxQPdE Iyx7zCPqy5RlsxbQ9Ggasp2xT5wN8OIRfABrhs1onU/+/DYj9oegnEelml4WJ266h66kBrPhsEg vwLIVUv0r+Np8nvFcrDsJP12IoLLATJ65SOLCxJcWG3xu0In2roPswCeKM3PZ4VDHn8QT2eiMcY AbM6KYpENwS/xd/CNFdynSGVfvnOsLkHnc4yf2H4Pr2mk1dn8GoRDmO3T9BzOlslPJroSbgGj/F iDOhulxcpAn82J6HvaQJL X-Received: by 2002:a05:6602:2748:b0:855:5e3a:e56b with SMTP id ca18e2360f4ac-866b466c79cmr34962939f.12.1746124709895; Thu, 01 May 2025 11:38:29 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ca18e2360f4ac-864aa43a9f1sm21350039f.35.2025.05.01.11.38.26 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 11:38:29 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Igor Mammedov , Gerd Hoffmann , =?utf-8?q?Cl=C3=A9ment_Mathieu--Drif?= , Yi Liu , Paolo Bonzini , Amit Shah , Zhao Liu , "Michael S. Tsirkin" , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Richard Henderson , Sergio Lopez , Laurent Vivier , Jason Wang , Eduardo Habkost , Yanan Wang , Marcel Apfelbaum , Ani Sinha , Thomas Huth Subject: [PATCH v2 13/16] hw/intc/ioapic: Remove IOAPICCommonState::version field Date: Thu, 1 May 2025 20:36:25 +0200 Message-ID: <20250501183628.87479-14-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250501183628.87479-1-philmd@linaro.org> References: <20250501183628.87479-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::d32; envelope-from=philmd@linaro.org; helo=mail-io1-xd32.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The IOAPICCommonState::version integer was only set in the hw_compat_2_7[] array, via the 'version=0x11' property. We removed all machines using that array, lets remove that property, simplify by only using the default version (defined as IOAPIC_VER_DEF). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Mark Cave-Ayland --- hw/intc/ioapic_internal.h | 3 +-- hw/intc/ioapic.c | 18 ++---------------- hw/intc/ioapic_common.c | 2 +- 3 files changed, 4 insertions(+), 19 deletions(-) diff --git a/hw/intc/ioapic_internal.h b/hw/intc/ioapic_internal.h index 51205767f44..330ce195222 100644 --- a/hw/intc/ioapic_internal.h +++ b/hw/intc/ioapic_internal.h @@ -82,7 +82,7 @@ #define IOAPIC_ID_MASK 0xf #define IOAPIC_VER_ENTRIES_SHIFT 16 - +#define IOAPIC_VER_DEF 0x20 #define TYPE_IOAPIC_COMMON "ioapic-common" OBJECT_DECLARE_TYPE(IOAPICCommonState, IOAPICCommonClass, IOAPIC_COMMON) @@ -104,7 +104,6 @@ struct IOAPICCommonState { uint32_t irr; uint64_t ioredtbl[IOAPIC_NUM_PINS]; Notifier machine_done; - uint8_t version; uint64_t irq_count[IOAPIC_NUM_PINS]; int irq_level[IOAPIC_NUM_PINS]; int irq_eoi[IOAPIC_NUM_PINS]; diff --git a/hw/intc/ioapic.c b/hw/intc/ioapic.c index 133bef852d1..5cc97767d9d 100644 --- a/hw/intc/ioapic.c +++ b/hw/intc/ioapic.c @@ -315,7 +315,7 @@ ioapic_mem_read(void *opaque, hwaddr addr, unsigned int size) val = s->id << IOAPIC_ID_SHIFT; break; case IOAPIC_REG_VER: - val = s->version | + val = IOAPIC_VER_DEF | ((IOAPIC_NUM_PINS - 1) << IOAPIC_VER_ENTRIES_SHIFT); break; default: @@ -411,8 +411,7 @@ ioapic_mem_write(void *opaque, hwaddr addr, uint64_t val, } break; case IOAPIC_EOI: - /* Explicit EOI is only supported for IOAPIC version 0x20 */ - if (size != 4 || s->version != 0x20) { + if (size != 4) { break; } ioapic_eoi_broadcast(val); @@ -444,18 +443,10 @@ static void ioapic_machine_done_notify(Notifier *notifier, void *data) #endif } -#define IOAPIC_VER_DEF 0x20 - static void ioapic_realize(DeviceState *dev, Error **errp) { IOAPICCommonState *s = IOAPIC_COMMON(dev); - if (s->version != 0x11 && s->version != 0x20) { - error_setg(errp, "IOAPIC only supports version 0x11 or 0x20 " - "(default: 0x%x).", IOAPIC_VER_DEF); - return; - } - memory_region_init_io(&s->io_memory, OBJECT(s), &ioapic_io_ops, s, "ioapic", 0x1000); @@ -476,10 +467,6 @@ static void ioapic_unrealize(DeviceState *dev) timer_free(s->delayed_ioapic_service_timer); } -static const Property ioapic_properties[] = { - DEFINE_PROP_UINT8("version", IOAPICCommonState, version, IOAPIC_VER_DEF), -}; - static void ioapic_class_init(ObjectClass *klass, const void *data) { IOAPICCommonClass *k = IOAPIC_COMMON_CLASS(klass); @@ -493,7 +480,6 @@ static void ioapic_class_init(ObjectClass *klass, const void *data) */ k->post_load = ioapic_update_kvm_routes; device_class_set_legacy_reset(dc, ioapic_reset_common); - device_class_set_props(dc, ioapic_properties); } static const TypeInfo ioapic_info = { diff --git a/hw/intc/ioapic_common.c b/hw/intc/ioapic_common.c index fce3486e519..8b3e2ba9384 100644 --- a/hw/intc/ioapic_common.c +++ b/hw/intc/ioapic_common.c @@ -83,7 +83,7 @@ static void ioapic_print_redtbl(GString *buf, IOAPICCommonState *s) int i; g_string_append_printf(buf, "ioapic0: ver=0x%x id=0x%02x sel=0x%02x", - s->version, s->id, s->ioregsel); + IOAPIC_VER_DEF, s->id, s->ioregsel); if (s->ioregsel) { g_string_append_printf(buf, " (redir[%u])\n", (s->ioregsel - IOAPIC_REG_REDTBL_BASE) >> 1); From patchwork Thu May 1 18:36:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 886360 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp464280wrq; Thu, 1 May 2025 11:40:40 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUkgMnqJFZQtlpGWCIA//jz5kX5hAyJV5RxWU2GTUWshQOOYXFzd+kEG2gCRCaoOM90RNu9hg==@linaro.org X-Google-Smtp-Source: AGHT+IGO+YtBUyWAwgibVhCwnV6evqXr294cNb+Kz1HYD5ifgI2AFhGuQXoStP9IqiNoe7bb/xUU X-Received: by 2002:a05:622a:2445:b0:48a:97dd:6594 with SMTP id d75a77b69052e-48c2e473afamr172051cf.0.1746124840083; Thu, 01 May 2025 11:40:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746124840; cv=none; d=google.com; s=arc-20240605; b=c9fLfc1e8c+ay8qAF3Ez4Nvw6DcPRzeHWItEqmusQt2hUUIkrtALLp95n9/aB8qVEQ eIM4ZCj0fdzxJjw8dr7GYBn/jwBzdPhNoJDucWpvn9OLgaJphzXTfpN+37TSmE30Pb43 pz1f6fYx6FedVNj8JY1L9EyObeWQmm1PxbwJvR3TfpdXeLk2PuAy3NWs7i8uhFwfV0n1 QFnJI/9QdwmygK2pkin0xp9IUaNs2NPYDeYz/AA79/Jg1RA/cUOFA7tpJdJC7eEdBQ1G QS62mB15rBiOxdKcsAmrlfXBsyHnhFW2C8kba9jVxpJzFeEC+LoLiNN8GFWNtRYuU2Ez Fdvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=YNiEylsO3oY9vgtqAxWvkDME/V5ix0NbPvey475+kvI=; fh=hoe06aprcDnk5P3d0vwgQt6uC5al0E2l9mfTIGTxZjA=; b=kTOT1TSOT43BPb5Y0MqKDb8Cr0GEJpldHdx7igIa1z6R4mvwKe6Nt5OjMCbS5yweYJ vSnfcjaQ5DVNy+F3YGXdT0BWNmZaFBTbPZk2BvMsnZ5H0mcATRd7xqsd5VsSYFAC74Vl 2Bvto4EU1Iyb2zNOXS5TBO+bAQU1Rxumoc3yKU36zPSNSKHXCijUyaR6vokdLqCc/oHj NBiZs4F4kWYKYbNozzgZs8eDKwK8EnFgTV+9H8Vl9QLYs4sW5GjTtGSYi+DErCNmwBlx 1532f48ydYGtuLb1ZIjXE2CMlx6pkI5Yyxe4PszwQWbdw0eYzZQuCNpImgr1kgXHNx9v aeaQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="rn/iI7UD"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-48b990fbe7csi11954271cf.635.2025.05.01.11.40.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 11:40:40 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="rn/iI7UD"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uAYpX-0004bG-I5; Thu, 01 May 2025 14:40:19 -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 1uAYnx-0002hk-Mp for qemu-devel@nongnu.org; Thu, 01 May 2025 14:38:46 -0400 Received: from mail-io1-xd35.google.com ([2607:f8b0:4864:20::d35]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAYnv-0008KF-Sj for qemu-devel@nongnu.org; Thu, 01 May 2025 14:38:41 -0400 Received: by mail-io1-xd35.google.com with SMTP id ca18e2360f4ac-861d7a09c88so40192639f.2 for ; Thu, 01 May 2025 11:38:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746124718; x=1746729518; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YNiEylsO3oY9vgtqAxWvkDME/V5ix0NbPvey475+kvI=; b=rn/iI7UDZbYMHSCkBCKjbT4jk6oqEdBsaU50nfTY3rbgWen7eNfJ+R7WqbG34NctRm cN7YrgO3bZvppPoLu2a3pxIomMajXRfnkc7TaEwlSaPqQ2QC2PK07Gk1jZ82c/G8ZbIt tCwi2WO2OJdWRM7o+dvQVD8ORglorp+hq4D1gg6sBiLwNX/tNdtcASv9YG81ZdxvFIOf UZ3WyQXIA2NsUGuDMNt4k22gRutDaox0mCw2JJp7BkN9Ak0KQza9nT/ZdxfIjuPYhQpt traKkRp+t40iWprr+M8kq/ffLGS+8na3/QAaN/98q2WEGZ90+smTrEmyZ5EFOSsdAKOD nb1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746124718; x=1746729518; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YNiEylsO3oY9vgtqAxWvkDME/V5ix0NbPvey475+kvI=; b=eB15i9Ggl2ewCQfgJKXr9o/xJjZqGJD/Fre6ss8rBnUITJ4qrBUrfhmbXAacXSn1+L P5RBrBJVydu6FtajSOfGkBTw1GAtS0aPfVmOj7w5sv2k/83WOQ+95ug8rWjl+34U3yPV uvIumYt3wQWvCNYPfvgmflyQ8WF21V5BOtBL+T4lekjzzgfW2iVebQXUh6g0orZ9iWnd LWnbA1sKT4r/SY/b7Hz1nYnLYZoBL4shzBNoEP4UEx4Nu7ogqzT6fn2RSaykdxoxJCIk jITEixK2MA0u0I6R2MiQISIlAP9nLECkyQgayFE8kg8DPbfiM+t33sA9wdqNf4uAPjFU AEvg== X-Gm-Message-State: AOJu0YyktAF/+30igTEYBn7nXdfJjDvTa3KDJ7WK6h1RojR4LrKPbB7g ejwqZDwLpl9WvTWtirGS+W60qMD8VtsC5Z3IutpxlxlNqpx1O5jms4AZdiuFnU15hnXoYQWu6gU O X-Gm-Gg: ASbGncvIrXo9GNPKQz6grv8rsgvDoUJXhozef4JPxo7Ni1V0SqBLY+hMhxEsx9Cj+AW FEF5LgCsr/gKPPLI7bY5xPSMRuT0J5jlOd32a6JbGMGxvQ5T0cM5xP/q5N8SRSo5LYsQHVW6wRG Oqwsbzbe5Tg+FNaCl2Ddep5pHMgEPUo/pOVM+bv1duRHULZUdzD+ILlR93GMSUyUs0vWa+oH9hZ wc0ZGCvLSIOUx3qQ8xfoccXhs+Rb9WrK8zIivcmwaXoIAXlAw6aQaiSE830YSn9rfuoOFTAIBs2 w/qPPVLsxA+IM1DcReaRnYieY2xaLMqj7p8t/wAVUcBS7v/QnuW/5T1fyvB5Wwb3pkqatnNcjdD EmV7LAb5qE6hXpHiA65SF X-Received: by 2002:a05:6602:720e:b0:864:4911:f463 with SMTP id ca18e2360f4ac-866b348c723mr29008939f.10.1746124718559; Thu, 01 May 2025 11:38:38 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4f882ee3c6dsm309761173.44.2025.05.01.11.38.35 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 11:38:38 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Igor Mammedov , Gerd Hoffmann , =?utf-8?q?Cl=C3=A9ment_Mathieu--Drif?= , Yi Liu , Paolo Bonzini , Amit Shah , Zhao Liu , "Michael S. Tsirkin" , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Richard Henderson , Sergio Lopez , Laurent Vivier , Jason Wang , Eduardo Habkost , Yanan Wang , Marcel Apfelbaum , Ani Sinha , Thomas Huth Subject: [PATCH v2 14/16] hw/virtio/virtio-pci: Remove VirtIOPCIProxy::ignore_backend_features field Date: Thu, 1 May 2025 20:36:26 +0200 Message-ID: <20250501183628.87479-15-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250501183628.87479-1-philmd@linaro.org> References: <20250501183628.87479-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::d35; envelope-from=philmd@linaro.org; helo=mail-io1-xd35.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The VirtIOPCIProxy::ignore_backend_features boolean was only set in the hw_compat_2_7[] array, via the 'x-ignore-backend-features=on' property. We removed all machines using that array, lets remove that property, simplify by only using the default version. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Mark Cave-Ayland --- include/hw/virtio/virtio-pci.h | 1 - hw/virtio/virtio-pci.c | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/include/hw/virtio/virtio-pci.h b/include/hw/virtio/virtio-pci.h index f962c9116c1..9838e8650a6 100644 --- a/include/hw/virtio/virtio-pci.h +++ b/include/hw/virtio/virtio-pci.h @@ -149,7 +149,6 @@ struct VirtIOPCIProxy { int config_cap; uint32_t flags; bool disable_modern; - bool ignore_backend_features; OnOffAuto disable_legacy; /* Transitional device id */ uint16_t trans_devid; diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 8d68e56641a..7c965771907 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -1965,8 +1965,7 @@ static void virtio_pci_device_plugged(DeviceState *d, Error **errp) * Virtio capabilities present without * VIRTIO_F_VERSION_1 confuses guests */ - if (!proxy->ignore_backend_features && - !virtio_has_feature(vdev->host_features, VIRTIO_F_VERSION_1)) { + if (!virtio_has_feature(vdev->host_features, VIRTIO_F_VERSION_1)) { virtio_pci_disable_modern(proxy); if (!legacy) { @@ -2351,8 +2350,6 @@ static const Property virtio_pci_properties[] = { VIRTIO_PCI_FLAG_MODERN_PIO_NOTIFY_BIT, false), DEFINE_PROP_BIT("page-per-vq", VirtIOPCIProxy, flags, VIRTIO_PCI_FLAG_PAGE_PER_VQ_BIT, false), - DEFINE_PROP_BOOL("x-ignore-backend-features", VirtIOPCIProxy, - ignore_backend_features, false), DEFINE_PROP_BIT("ats", VirtIOPCIProxy, flags, VIRTIO_PCI_FLAG_ATS_BIT, false), DEFINE_PROP_BIT("x-ats-page-aligned", VirtIOPCIProxy, flags, From patchwork Thu May 1 18:36:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 886359 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp464212wrq; Thu, 1 May 2025 11:40:28 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX9d0vAKy3V5jai5B0aflcs/N1W8f4FHHQBzEW84xe/BWMqI8DWdF0B7HsoaEcT3YhLBoy/Hw==@linaro.org X-Google-Smtp-Source: AGHT+IHHMHf/n3P+xAaYKJoN1yjhXP3Q1AH8VVmxZPIQrOtZP3zsFQwBmLyBNq8d/I9NnTSRyoJS X-Received: by 2002:a05:622a:5a95:b0:476:9847:7c6e with SMTP id d75a77b69052e-489e4991324mr141477071cf.19.1746124828413; Thu, 01 May 2025 11:40:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746124828; cv=none; d=google.com; s=arc-20240605; b=CMeo/uvbc/EQI36VmhGxo9fQ2pMFNPbLIB8WUkvHsqEZbhL3yXBwrbrQ4yd/GiV+dP iPRRb3H6arxbxaIIeN2GbFWyp+lyTNKJvwzk3Ix3TLydM0Fx513+A63qgWvwUAiAqjQs r79jV+IwWHfq8pwihoAlNzkTjQ14hwY3ZQNdcJaZvUTvCD/SJ/gAz+2aws50kYTcv1mc s7B186PZJCxam7QMKezqWSQZ/0praKpSwHYs+gPartsqJby5RfIv5n+sj4AUpbt4uvsA P4uWxzi2sSiwCaZma4yXOK6HJraix3K5QVODkDkqQvTtJ0wjTtBnfZvFdKOZk8hZfYYI iC1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=/F9wfO6J1RL2avC/Q42x6BrmpISj7RT0yS78rOyo2P0=; fh=hoe06aprcDnk5P3d0vwgQt6uC5al0E2l9mfTIGTxZjA=; b=YZDAAkPu2o+qWVd+4N0kB1+lIwRRkb36CdMBGgSKLj77uHjSlE24r9QcgXAdveCvFp SZTXevzH7hnUaecb3t8Ij/DAdH5U4ok75002rFm/RWVEDcmbnyKePV4Ir3D4Do0NApVq kT7pw25YS1TEbHzLaALJ7qzJwKxgZZ1bYVhfIlaooSvFxxNogDq3N9TQD37Tz5HCkM3B lixp1IP5VabboLv4XoNS3NSxjgfQZco8Ty6dh124bpScpcHmkoINqig0PBy5x4TsM2Rv RYSGp01yoDULlSfXmXtr5iPkUKcuO7lxtQoZIHdCT7MHBoyw/6kxEsAIzFHtvS8Hoq7d xz5g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=uMye31R1; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-48b960cdc9csi12038211cf.117.2025.05.01.11.40.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 11:40:28 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=uMye31R1; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uAYpA-0003S4-V9; Thu, 01 May 2025 14:39:58 -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 1uAYo6-0002pw-H7 for qemu-devel@nongnu.org; Thu, 01 May 2025 14:38:52 -0400 Received: from mail-il1-x12c.google.com ([2607:f8b0:4864:20::12c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAYo4-0008LM-Ri for qemu-devel@nongnu.org; Thu, 01 May 2025 14:38:50 -0400 Received: by mail-il1-x12c.google.com with SMTP id e9e14a558f8ab-3d4436ba324so10399275ab.2 for ; Thu, 01 May 2025 11:38:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746124727; x=1746729527; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/F9wfO6J1RL2avC/Q42x6BrmpISj7RT0yS78rOyo2P0=; b=uMye31R1iLvvLbO4tsNih+pI50YAluPlYoUOi9kBeBrU9w0/rgwZlSSpFWdudGY4Jw UDjq29lCQd5ZhjIYC6jWyuGq3lcYpZZECi4jea38fym29nrXXJiGFSjMo7b/0SdpAJnc ZxEIWmraZkdzQ6Vq273ICnrTZ3NLxR2w5mNQuI1l1Kj8DmM3Ns8rBqWU9YYiO+98eb29 Ae8S8ARCGbXibryOtIHGr2wyRmjSr8UaqzI6LbW4stgmp9+5Wwuh8KcbSJywN65M23iM 340bfhayr9vZe7uJC7UuY9jaMua47UH5m4c5BwOIrVjpcd/xywvz0oJu5/hjqPtVePFV vtJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746124727; x=1746729527; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/F9wfO6J1RL2avC/Q42x6BrmpISj7RT0yS78rOyo2P0=; b=QGkQ2GOp6m1o+dR+HLSMvZlgCkFaMQNkX3PC6DUOCe2r4zG5J1uLAQdihiWVlonfaj xLsE6NHhXKYgdjKBF6tw9UUGG3oXpVzsqgzOJzEF70AQrhfdtsUQQI0lHUrof8Iq1jhG epHvPD1Fk3TsCfzLLyCALInWc2NUstSBBcXB2/9+4KZGDhKA0A5g52gbSTVhaXCXYZDB Ob0ccZmRW6ww9uz2xID+Yj0XXaxWZDYU2wyWeVKKtAk7aZsbzyetqpzDgu9hTMs9fWRy lN0UC4hCjqbDzSJqptDzr3GgRtzIjVcBvHOE2elV0obHc1thp9NR1h4UIxa+Wk+LcUYq Fq8Q== X-Gm-Message-State: AOJu0Yyf0WbGDC/wZf+9NtWZO0dwURsGctnA+Dffz+Cpj69yNzUPoFTQ BLFwW+AEA6f219Rd8pAbPudx9p0UDSCVOJpw96f26venh6ekWY+sfqrL4ihd/QYsLhCqay5dT/+ v X-Gm-Gg: ASbGncs2XZ89pNXnS4uNssH5QZ863lz9+6UdW66NuJPVX2RCvkU/16Au0VkUOIumBV4 FEebjUUZYjHpKa+2VuGjbybDUSD4RsAJn0aNpbukeqmNJzulRE7ea4d6S2BWXCDdUNV7nv9023y 7qbELp+0kzOkuzin99F6nfxKeMO3uakSa0Z48rTesi5NDUjOOp7CzRR/ZGTjrlcmDDB7deo9E7x 8xMoUwVgbxzYnBUkq8jrJwKHI7vVTmvXhN8n/0/yj2OqhhZNlViGTX6zMnrFT36WkU9z2sm7ikC a6ORhShS5me4pGSgyoa+g3JDLeKJo6qZFCFObIFFL2+OkKX/hk2jwFRuFzrCCQNCq9nrU4HpPDw Iw22K4Ne/LasBK2ESJonp X-Received: by 2002:a05:6e02:1fe8:b0:3d9:66ba:1ad2 with SMTP id e9e14a558f8ab-3d97be3aee1mr38235ab.0.1746124727244; Thu, 01 May 2025 11:38:47 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4f882ee3f65sm307854173.52.2025.05.01.11.38.43 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 11:38:46 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Igor Mammedov , Gerd Hoffmann , =?utf-8?q?Cl=C3=A9ment_Mathieu--Drif?= , Yi Liu , Paolo Bonzini , Amit Shah , Zhao Liu , "Michael S. Tsirkin" , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Richard Henderson , Sergio Lopez , Laurent Vivier , Jason Wang , Eduardo Habkost , Yanan Wang , Marcel Apfelbaum , Ani Sinha , Thomas Huth Subject: [PATCH v2 15/16] hw/char/virtio-serial: Do not expose the 'emergency-write' property Date: Thu, 1 May 2025 20:36:27 +0200 Message-ID: <20250501183628.87479-16-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250501183628.87479-1-philmd@linaro.org> References: <20250501183628.87479-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::12c; envelope-from=philmd@linaro.org; helo=mail-il1-x12c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The VIRTIO_CONSOLE_F_EMERG_WRITE feature bit was only set in the hw_compat_2_7[] array, via the 'emergency-write=off' property. We removed all machines using that array, lets remove that property. All instances have this feature bit set and it can not be disabled. Signed-off-by: Philippe Mathieu-Daudé --- hw/char/virtio-serial-bus.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c index eb79f5258b6..31bd1b7535d 100644 --- a/hw/char/virtio-serial-bus.c +++ b/hw/char/virtio-serial-bus.c @@ -1019,6 +1019,13 @@ static void virtser_port_device_unrealize(DeviceState *dev) } } +static void virtio_serial_instance_init(Object *obj) +{ + VirtIOSerial *vser = VIRTIO_SERIAL(obj); + + vser->host_features |= BIT_ULL(VIRTIO_CONSOLE_F_EMERG_WRITE); +} + static void virtio_serial_device_realize(DeviceState *dev, Error **errp) { VirtIODevice *vdev = VIRTIO_DEVICE(dev); @@ -1155,8 +1162,6 @@ static const VMStateDescription vmstate_virtio_console = { static const Property virtio_serial_properties[] = { DEFINE_PROP_UINT32("max_ports", VirtIOSerial, serial.max_virtserial_ports, 31), - DEFINE_PROP_BIT64("emergency-write", VirtIOSerial, host_features, - VIRTIO_CONSOLE_F_EMERG_WRITE, true), }; static void virtio_serial_class_init(ObjectClass *klass, const void *data) @@ -1186,6 +1191,7 @@ static void virtio_serial_class_init(ObjectClass *klass, const void *data) static const TypeInfo virtio_device_info = { .name = TYPE_VIRTIO_SERIAL, .parent = TYPE_VIRTIO_DEVICE, + .instance_init = virtio_serial_instance_init, .instance_size = sizeof(VirtIOSerial), .class_init = virtio_serial_class_init, .interfaces = (const InterfaceInfo[]) { From patchwork Thu May 1 18:36:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 886366 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp464687wrq; Thu, 1 May 2025 11:41:47 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXyQ3/YGBECzVpPiyyp3F/EhVUbGJaFIXU2LGFKJ7pgsq8V3QgbhgDfmlmz5uLXAlClMO+V+w==@linaro.org X-Google-Smtp-Source: AGHT+IEwOU0WwWP+gDtQvC0n/avfoktxJNFsnzyNyjz9509qKtewZCOcadIz+Jg/IyfR0GPgm7UC X-Received: by 2002:a05:6214:2a8b:b0:6e8:ddf6:d136 with SMTP id 6a1803df08f44-6f51564b5f2mr4916696d6.45.1746124907340; Thu, 01 May 2025 11:41:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746124907; cv=none; d=google.com; s=arc-20240605; b=dCk66mc+XmfNAn/VqwR8CpeUyZomWfLwOc9dyl0tuvyHwdf7Y1sHcHhdUvM77fOUHb vuI0TH6tZLjmCvBdwQU0jomhbdS6ebnRdDarTA6QUgRAAxY6Egv70GIl0VqUwluSOenw 9nDvGboFTTkTO03KMcc8mSHNuPNfKA7uAcSjGQJIUkaBIat163arWS4l+A8psYv4BSYq Z3Sz84ZRVeZBXMC2lY1lZzO6ZiSrV4QuzyCY3DqyjU8eC7/ae6cMSwRfNUHXzAaDcXVP mFxrxUd2Fw2vJOGl+3S7MEVl1ziuw2QonLANnJpcxZLzQlvNfyDllmGi7bRk9GiSgwPg P+iw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=BWzzyY58ZMdH5v7Oa0GKNWiemzjm5i3yFvWM3N4y4TI=; fh=hoe06aprcDnk5P3d0vwgQt6uC5al0E2l9mfTIGTxZjA=; b=VhPrtBB0uXdLD/icLTk973yEeCjNt6qMBPG9pxk0Hss2puO7cvCDEj3/yhPM+Ca9ml YQiDBueB2LyiOt6RhXiG/K1ri6/lFTK+NA2xSu8tbvXzYDTObdv+NXL2bcFUVoh/KRaM uSlBO3LrqVFCCyA1NpFbN4lMvLD372lAt5TWIkQzGQ+Ux2MbknnzPRxDzI7gmBOMYXOX phzLsq4ObleEBO38HoGRa4xUZJF6HiHl4kLSOYt4c4lZn6AboqheGCtv8JSZPdHKQuvR njW31bc45lwJuetwv5jlh/RUbqsxfTUQ0NAYBd+SuN/j2C53Wxj2lq2SZmdRuPpxZ1YO 0l9g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mtfQU7fO; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6f50f4abd0csi13203296d6.401.2025.05.01.11.41.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 11:41:47 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mtfQU7fO; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uAYpN-00049v-RG; Thu, 01 May 2025 14:40:10 -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 1uAYoG-0003Cp-W1 for qemu-devel@nongnu.org; Thu, 01 May 2025 14:39:01 -0400 Received: from mail-io1-xd33.google.com ([2607:f8b0:4864:20::d33]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAYoD-0008M8-Ow for qemu-devel@nongnu.org; Thu, 01 May 2025 14:38:59 -0400 Received: by mail-io1-xd33.google.com with SMTP id ca18e2360f4ac-86135af1045so129719639f.1 for ; Thu, 01 May 2025 11:38:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746124736; x=1746729536; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BWzzyY58ZMdH5v7Oa0GKNWiemzjm5i3yFvWM3N4y4TI=; b=mtfQU7fOY+O838h6rpvgaw4qbRdlu9EzvpVcMpP8F2Gu/0FeeaGUam1OAfCRM6alAS nSNcexiqkaEMzGD0mdPRY3313RQiAdoS4AOSzc0XKi7syNJxuX+2gwJhD0d25rHesi47 zew5z9TH2XS2Tl5z8m1zXlKhiObfTVHitFpVgpjGaREwH1/yCOy53dWlfSQdR51skXk0 Fkp6WEntI5UtLa9a+yFdQKfger3F6J9z+usHcaxfD1KOmwX7z9HbHAFseawKC2Oig7zl kX50TFkTigNHawYCQhlH5xmbbJhDra+1W8KZwmEQf/5mTQOt46JBDkmH+2oKUAUPAVGL 9adQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746124736; x=1746729536; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BWzzyY58ZMdH5v7Oa0GKNWiemzjm5i3yFvWM3N4y4TI=; b=tvam02YAZaB5DXfc3Xt9PSers3MbAHyBHt8qiZGajuNGPu6/uAQOF7mlU4Jtvzc8t9 257ywNx/WFPP8gsBUBckbv8FbjKuHPE3ZbtT6fqgYoLRPMEhBWrwmxl5s3dNoDIvb78H TjZhqMUdVCcF2A9jeAKU+/PwRnU9BBmT9hR8HmDYNZmo1wklQRQp0/Opr7aHOzTeGfji R7UxgMKGK8mb15kfKsCA81ejJMMpHqY/lnLRQbwsyjdxR2ixb9yX0j7a2AIb/qkMA17A cmilaNLWSuxNiAXeO3dTHn98Nt6K00wjcBu5YLvi61MPcBxQzhyxo7B6TNkGIFFdcj+E hbQw== X-Gm-Message-State: AOJu0Yx+YJaNy6i9/KltdHI/x5YGbYa2VnsiQb27uVptwOCIxuywRi73 cHCJo3KS0iEsudstlMnx27ldjEheOcScN2YmV+6Wxkeu5B8CnaSwPLQR76/6DyNPoW6xc+QWVN8 8 X-Gm-Gg: ASbGncuQbPY85pynnFFYMKUaMRCeZADoFy8XS67FLa1IYadV9CjwUwsbZ/CFpXXreAK eyE9rVl6/8eITS7Kf4qQWEUWDonTM9O6nyBvwC634ADZQO7lxtIG7z0LiGUqEpbNaNGfZjsIIEc 9HbZKyxcnQqVoaR/FTcsZ0uPDD4nPL39VuXwKtlmSYtYMEregImYaNzO/XsfxfsbDbisMtmkNxQ 3bc4+TTQwwQ2iMCHvnPcWJX1qScm/VIjK6fhn3wBklTHN3VyyVY+epB2Lx5TVZ9rEWkR13xJLB7 EeX+72fWkoXh2OuHKqHUw1wi9jKW5PYhNZKBqbrZ/SNwd0JcCjl8Qu14WOhngiadJNWSu35RUwr jbYMK0rlLxDGkm1joPbEjLWTI0H+HkLY= X-Received: by 2002:a05:6602:398b:b0:864:4a82:15ec with SMTP id ca18e2360f4ac-8669fad4facmr46468239f.6.1746124735919; Thu, 01 May 2025 11:38:55 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4f882ee0bd8sm303406173.39.2025.05.01.11.38.52 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 11:38:55 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Igor Mammedov , Gerd Hoffmann , =?utf-8?q?Cl=C3=A9ment_Mathieu--Drif?= , Yi Liu , Paolo Bonzini , Amit Shah , Zhao Liu , "Michael S. Tsirkin" , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Richard Henderson , Sergio Lopez , Laurent Vivier , Jason Wang , Eduardo Habkost , Yanan Wang , Marcel Apfelbaum , Ani Sinha , Thomas Huth Subject: [PATCH v2 16/16] hw/virtio/virtio-pci: Remove VIRTIO_PCI_FLAG_PAGE_PER_VQ definition Date: Thu, 1 May 2025 20:36:28 +0200 Message-ID: <20250501183628.87479-17-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250501183628.87479-1-philmd@linaro.org> References: <20250501183628.87479-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::d33; envelope-from=philmd@linaro.org; helo=mail-io1-xd33.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org VIRTIO_PCI_FLAG_PAGE_PER_VQ was only used by the hw_compat_2_7[] array, via the 'page-per-vq=on' property. We removed all machines using that array, lets remove all the code around VIRTIO_PCI_FLAG_PAGE_PER_VQ (see commit 9a4c0e220d8 for similar VIRTIO_PCI_FLAG_* enum removal). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Mark Cave-Ayland --- include/hw/virtio/virtio-pci.h | 1 - hw/display/virtio-vga.c | 10 ---------- hw/virtio/virtio-pci.c | 7 +------ 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/include/hw/virtio/virtio-pci.h b/include/hw/virtio/virtio-pci.h index 9838e8650a6..8abc5f8f20d 100644 --- a/include/hw/virtio/virtio-pci.h +++ b/include/hw/virtio/virtio-pci.h @@ -33,7 +33,6 @@ enum { VIRTIO_PCI_FLAG_BUS_MASTER_BUG_MIGRATION_BIT, VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, VIRTIO_PCI_FLAG_MODERN_PIO_NOTIFY_BIT, - VIRTIO_PCI_FLAG_PAGE_PER_VQ_BIT, VIRTIO_PCI_FLAG_ATS_BIT, VIRTIO_PCI_FLAG_INIT_DEVERR_BIT, VIRTIO_PCI_FLAG_INIT_LNKCTL_BIT, diff --git a/hw/display/virtio-vga.c b/hw/display/virtio-vga.c index 40e60f70fcd..83d01f089b5 100644 --- a/hw/display/virtio-vga.c +++ b/hw/display/virtio-vga.c @@ -141,16 +141,6 @@ static void virtio_vga_base_realize(VirtIOPCIProxy *vpci_dev, Error **errp) VIRTIO_GPU_SHM_ID_HOST_VISIBLE); } - if (!(vpci_dev->flags & VIRTIO_PCI_FLAG_PAGE_PER_VQ)) { - /* - * with page-per-vq=off there is no padding space we can use - * for the stdvga registers. Make the common and isr regions - * smaller then. - */ - vpci_dev->common.size /= 2; - vpci_dev->isr.size /= 2; - } - offset = memory_region_size(&vpci_dev->modern_bar); offset -= vpci_dev->notify.size; vpci_dev->notify.offset = offset; diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 7c965771907..4e0d4bda6ed 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -314,12 +314,9 @@ static bool virtio_pci_ioeventfd_enabled(DeviceState *d) return (proxy->flags & VIRTIO_PCI_FLAG_USE_IOEVENTFD) != 0; } -#define QEMU_VIRTIO_PCI_QUEUE_MEM_MULT 0x1000 - static inline int virtio_pci_queue_mem_mult(struct VirtIOPCIProxy *proxy) { - return (proxy->flags & VIRTIO_PCI_FLAG_PAGE_PER_VQ) ? - QEMU_VIRTIO_PCI_QUEUE_MEM_MULT : 4; + return 4; } static int virtio_pci_ioeventfd_assign(DeviceState *d, EventNotifier *notifier, @@ -2348,8 +2345,6 @@ static const Property virtio_pci_properties[] = { VIRTIO_PCI_FLAG_BUS_MASTER_BUG_MIGRATION_BIT, false), DEFINE_PROP_BIT("modern-pio-notify", VirtIOPCIProxy, flags, VIRTIO_PCI_FLAG_MODERN_PIO_NOTIFY_BIT, false), - DEFINE_PROP_BIT("page-per-vq", VirtIOPCIProxy, flags, - VIRTIO_PCI_FLAG_PAGE_PER_VQ_BIT, false), DEFINE_PROP_BIT("ats", VirtIOPCIProxy, flags, VIRTIO_PCI_FLAG_ATS_BIT, false), DEFINE_PROP_BIT("x-ats-page-aligned", VirtIOPCIProxy, flags,