From patchwork Tue Apr 29 14:08:07 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: 885744 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp349267wrq; Tue, 29 Apr 2025 07:15:13 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUqV2VHsbuIB5Jh0vZ2fs0HYeefZEZtMiMC7Mahlp6qBBSwJtJLYyMRq+KOul9zv4qfxDiJ1g==@linaro.org X-Google-Smtp-Source: AGHT+IF8vfbG//UVVkW4E1XcrLjKzrYivg6t2AE7Q3rFg+eY1XxvLGONmuFI+zJYVZZ9AupFRY7S X-Received: by 2002:a05:600c:1546:b0:43d:1bf6:15e1 with SMTP id 5b1f17b1804b1-441acadeaa5mr25876905e9.1.1745936113104; Tue, 29 Apr 2025 07:15:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745936113; cv=none; d=google.com; s=arc-20240605; b=AmZ5Y7ICqfQ8lLwJHiD8TxAtfo3uVb+qYNOzXIH8HQ/YQB4fksh6YQAvosKpa89pGh wIx3PXNcKNgnF2+4ak+ZNEAOMwuB3z3P8ywj1f1MTM5HU5Uv88uCMtVjNZbGyFSTmgym 08dJ8aEkr/mFRYtYjlEDORVf9iHRW5l7VA5vZDV8ntUm9rfo7GrWiT6FxNs79o24oo7y T0/+wawUwHTwg/+j5E98KVyfG7ca16sc6Mdznuu8M3eDzHdTwfSHw0wTUxBTBUz3YVQt yiyjmLgxMeG1RuG2nO5cLIPJ+1UGZPVMn5HdPCt9fpelFaRHgYtJyrQRcVDcS0D1WMgQ 3XOA== 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=nr7yCouV+uxMprE88tWLr3G085FcChByOcq/6H66h8U=; fh=g4s2jU8t/W1wGraKJcf4drMIpLYu/oWYTROkTdMMVGc=; b=M+78ZEEMnGiCNs/0j1QcuuBKrg6meb2AXjHm0eoewJthq31imi3G5/nsdv7p6+k8BA EbgXHaa+alr8dr1i1WYc5xPhL9vVMNbJi7FdEBUC1WyxUE6qi7eIcPWDLfELfONFdUaz Oep7YlMn74YTebk3GqojrZq0WOA7vnHy0dINUuqPI8XuZzHmM0ulpyZIM+3pMkYS6Hmj m6p/1dsAwkd9i+XHdPKZDhBRoiIPHLsvThKfsBoms+k3kTcjsQLs83TcDWcZpO2LjO2K qBTtYcT0BkT/rI5whzpe3oYv0NYalIQORV6CgJKiHCnbFYZVr0ujPDOe846WnVhI7cSM M0nA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Uk7DFXXc; 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 5b1f17b1804b1-4409d2a151csi90274085e9.78.2025.04.29.07.15.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 29 Apr 2025 07:15:13 -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=Uk7DFXXc; 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 1u9lda-0000XU-Gl; Tue, 29 Apr 2025 10:08:42 -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 1u9ldX-0000Ti-5M for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:08:39 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9ldT-0006Dd-IB for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:08:38 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-3912fdddf8fso4533615f8f.1 for ; Tue, 29 Apr 2025 07:08:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745935712; x=1746540512; 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=nr7yCouV+uxMprE88tWLr3G085FcChByOcq/6H66h8U=; b=Uk7DFXXc5PmobtU4sF1Dk9QMcVJ6cyESFGpYAXzWLEYMjWlhDsXelSDSibeqQU85u4 S4TANXGpBFXMONucS3/rXmRXhHS/MZ4pK6DLHvoW7L9Xnx06Unlf6Iix+Uh+E9v6Ot4j 2n4LXKorQAmkGz2/tESeI+XlE3bNQKYfuiMEPgIAkaJzwOFTXi8P3hG3JQOSxyaQPJ71 0qKASg5o5vKr36vsMQQ2Uqas+1JLaizT3Ns7m754NBh7oWU3iNPJFUApYF9Pea3HsAWV bqicqbNKMTaUM5eIdIN83tVOHo/WFy3ggC0+Np95dhNxgIcW5qAsM6HdcsH8MjxAJQEY CxJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745935712; x=1746540512; 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=nr7yCouV+uxMprE88tWLr3G085FcChByOcq/6H66h8U=; b=YPO/wYAOydWFP3y8W6O1Ixaj82IgqYnp0AllC6m+hHhgyFlZJUDhQE34jFozCrD0q0 q31BHxft2jw4vmR1XEMrRWQ+1e4Ia8O1sk4ge4F8AeRHe+JiJYYVo1O9SqWlgKM9S2Vr f3Ejzg24h3PMKn2AOLdOhggc9L9iw9fD6FY0T7maxohXKnVjaxCXaQ3ft/NZne835Nkt C7uIGyRxaevWGAIwhTdOwvKdXGsyLWdd1LjgivtTqF7GaRJsvXyg7zsEwvInSjBvHZVt Xk1Ec6EQhWqeTfmdRgHVCShWEEd9tHT76ScrlVjxtYaI0ghQcr+1L9m4O9SIxJchSvwr E1rw== X-Gm-Message-State: AOJu0YyMyzC8kZGtdILNfo5EwoNNkw0P49olz+YkKssdplWX1SmSxEI/ +LC2E9zPDpnSsVnmsq/mHbSq6BNHaRiQtlDDrAq7gmoIDxN9a4z+vD/O30V2cg2gIQSmeTdKTJ5 J X-Gm-Gg: ASbGncvOr3p/h+UvkL7F17dwdV7ONrS8LaGjWQuRvfUJ/iycjBqYpexrihyVxSslSKE 1ZDv6qhpPgIV9yr6rO6bsryoco5NSHAcduDpprGDVGpdax5mM/kKy2g3PcxdmtFb7TfySJpreYH yuaIUGLM/pzX2ZsNJdEMPMICn6myHpL+T81dGzeAgt9sKO0btf9/buROyKvdYCoBgfkz7oTrCsa NzCeh6CphAfpMtoJCjiwPmcVO9Z13B9x6itC7fNa65yTpFQoEGitrGWycybC62XjtBYitI1CnFR 49m5apM3umhM6VuCPCHRlwfVKaLlPz40IXcWg8iZiS666ore4yS2aoYtyJ09etxF/60kLvranPX vwVjNIg5xv+hPxIf8GOsQ X-Received: by 2002:a5d:59a7:0:b0:39c:30f7:b6ad with SMTP id ffacd0b85a97d-3a08a520647mr2915829f8f.18.1745935712417; Tue, 29 Apr 2025 07:08:32 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a073ca556bsm14155091f8f.37.2025.04.29.07.08.31 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 29 Apr 2025 07:08:31 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Hanna Reitz , Fam Zheng , Paolo Bonzini , Gerd Hoffmann , qemu-block@nongnu.org, John Snow , "Michael S. Tsirkin" , Zhao Liu , Eduardo Habkost , Jason Wang , Kevin Wolf , Yanan Wang , Marcel Apfelbaum , Dmitry Fleytman , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= Subject: [PATCH v2 01/19] hw/i386/pc: Remove deprecated pc-q35-2.4 and pc-i440fx-2.4 machines Date: Tue, 29 Apr 2025 16:08:07 +0200 Message-ID: <20250429140825.25964-2-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250429140825.25964-1-philmd@linaro.org> References: <20250429140825.25964-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=philmd@linaro.org; helo=mail-wr1-x42d.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: Daniel P. Berrangé Reviewed-by: Thomas Huth --- hw/i386/pc_piix.c | 13 ------------- hw/i386/pc_q35.c | 13 ------------- 2 files changed, 26 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 0dce512f184..04213b45b44 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -791,19 +791,6 @@ static void pc_i440fx_machine_2_5_options(MachineClass *m) DEFINE_I440FX_MACHINE(2, 5); -static void pc_i440fx_machine_2_4_options(MachineClass *m) -{ - PCMachineClass *pcmc = PC_MACHINE_CLASS(m); - - pc_i440fx_machine_2_5_options(m); - m->hw_version = "2.4.0"; - pcmc->broken_reserved_end = true; - compat_props_add(m->compat_props, hw_compat_2_4, hw_compat_2_4_len); - compat_props_add(m->compat_props, pc_compat_2_4, pc_compat_2_4_len); -} - -DEFINE_I440FX_MACHINE(2, 4); - #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 c538b3d05b4..47e12602413 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -685,16 +685,3 @@ static void pc_q35_machine_2_5_options(MachineClass *m) } DEFINE_Q35_MACHINE(2, 5); - -static void pc_q35_machine_2_4_options(MachineClass *m) -{ - PCMachineClass *pcmc = PC_MACHINE_CLASS(m); - - pc_q35_machine_2_5_options(m); - m->hw_version = "2.4.0"; - pcmc->broken_reserved_end = true; - compat_props_add(m->compat_props, hw_compat_2_4, hw_compat_2_4_len); - compat_props_add(m->compat_props, pc_compat_2_4, pc_compat_2_4_len); -} - -DEFINE_Q35_MACHINE(2, 4); From patchwork Tue Apr 29 14:08:08 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: 885732 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp345881wrq; Tue, 29 Apr 2025 07:10:01 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW1lhYfK5k9Ltad7FdzzorRPZ1yi7MXC1FjfZqGw2dOMXqSQA+uOu+m/JyLXjlcrPC8IguGZA==@linaro.org X-Google-Smtp-Source: AGHT+IHupqS2a2N7hl20Ux8zj7l2en0ILWB+qI8PijUA8KO4/VuJtox4dvN4fZM02tzqSCMeOm8X X-Received: by 2002:a17:907:c22:b0:acb:86f0:fed8 with SMTP id a640c23a62f3a-ace848c021dmr1328218466b.12.1745935801305; Tue, 29 Apr 2025 07:10:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745935801; cv=none; d=google.com; s=arc-20240605; b=jlNyOAzKTpyrDrLgZamF+9Y8vfehILYF1KVctU3CXczF3OsKwfxFj1LEueifIMM9OH myV4h2zACGGKI8iCtvvFpqqtqx+3EncRWk0p9TATW3BEiepMOdKHQO4EcTzCw7Eq+IOY q1zcVMr7ClMCk7/gHZrBsbUdQkIHcr9jISA8i5TwSwzrOkgxDXFMmm9pTlDeWXvIypfD YUXQ8W75nY/zmnai3+cycy6kaWOdsAbxf9OW6GFZ/RAx/iO5s1lhBCuiiwnSKTzMb3TF DtckoM9FlnK0ghH86Zf+PyYoCozG8M/2nSHItlLn0ZxeK6KYoqeWiAUFvsu9vXarDRpy APGg== 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=/fyCoBA0tWbab3gBiKQWh21M4Tnr1243A7o99XgmYbE=; fh=S6YL0dyAMbl4T7TfefFhbqa8nURDEApLVFSBl9ph+Ec=; b=cKSBD/sSO9iifOdoa/mpYHPOM87NGX+MKpTBZTGUBUl0Wgy5NKJdxIGuGWfIBKqVgG qJSFqZsXCmbCy5N8fmTIe0Kp/NOdfvetncdxluscvYCfiK8zCyUgoXItYYdGFa94FA8f 32nIfnvFhR6ywf29XZ+NYhOZ9QazYxmLIaV+cgizQVm1N55gZbzkSKCca0SspHZD2z2/ DHRqgeGiAxfXHYTbII84emMFQCErOMhGoj4b9nOk2QYklRztTiQnZgoGZOQWYRhDK1UD m8EtjJB7Yg0EEJ63wiz1iVzmWMONfkQeUGybaqfApuTCVdEGb20iY9zRP+bmGIiWUot7 f+Sw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Yl5L8NmC; 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 a640c23a62f3a-ace6eb9c7e7si641632566b.467.2025.04.29.07.10.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 29 Apr 2025 07:10:01 -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=Yl5L8NmC; 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 1u9ldc-0000ZN-Lj; Tue, 29 Apr 2025 10:08:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u9lda-0000Xn-PY for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:08:42 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9ldX-0006Ej-Jc for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:08:42 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-39c1ee0fd43so5527191f8f.0 for ; Tue, 29 Apr 2025 07:08:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745935717; x=1746540517; 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=/fyCoBA0tWbab3gBiKQWh21M4Tnr1243A7o99XgmYbE=; b=Yl5L8NmC4RYYfD3th7N483rNT0hYxpDnufDzJlwEkiADXpC+fRy2lYOunF77HO+ad4 wR/JNSLSDfMmvNlsLNFv8736cqdLV9JPnpes7xJtSw00K87ptaJCh05NDEBTPj0RJFZZ ZtlVn/uLaY3IUaZvPLa1u8OykcV+i7covs1z5UQN5wj3U2oMRvKQESJJ6dg00hKYaoED nNsQC1XPeXSgpt9zbuNgKf92cWnfTazmYXBeF6lypqvJRi7ZMlunmpaafGXDqdnrjiQf LpqjRhxXZsLipXyBMiNYQYZLPMU1+Qg6szM5tQN3mAQW9N4ojkOP+K+6sZ9SSVK/YjwP 20VA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745935717; x=1746540517; 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=/fyCoBA0tWbab3gBiKQWh21M4Tnr1243A7o99XgmYbE=; b=mR3shrfw3w/Rq2U0qhG93jyfGw3o0r4r22VOLKs66fQcNoiXT63ceZSeBofSVLuQVc gCtTUrCuy75Tt7CP+3i0vRmJpQ7Putu+fWrXWHQiM6sbK2sMHJNXTTO81tU5QfrWcLSF uWKJoMghEgGTjgFaZUqedQ2GzNdxlDz/lRhxlnGZII02GLvonP8eOhPcPgqPVBoUnRi/ fzGm+bnLDsSiTEntVQbGRJuVXM0khqW8XAA6rkjnqjXGU5pqqawCGTPKzoOBzc6pkv9O Xh+Zbv++XrSTNtVlt6pM2VTiOuWAC7iwJwU8Qhd28bYrr4+WQSSRwuXyowX1up+8LA4x iWTA== X-Gm-Message-State: AOJu0Ywn135uB32jWgcIjEZvz4I8blhAWCCRyuBSXTHUFsDc5+kW7lHa BR7+aDKh4HHxJ0lTdzWFiIAWv4kYiQxmsyjGVwPgPmvxiOV+7qh6k/lzvhejWnGwlpKAVkSANoH U X-Gm-Gg: ASbGncttMR42ITLSoPFw0Ex8gkpFG570wDL1OgG/c/vfCU8Nb8nbMJyEhx1zrVBJoIP 2/NZYNM36rMrQYRkk1aJmezj7Rbnb1wV5M2RHjhQWzwMMIWQigEMB1aWgkSYTn5xpV3GH+F7EsG qPd7X7nD7FFekov3QvrEGk+9jLd0oDVlhXCn920KsDFcjVPrkOBL48Nre53rvmAhi3OqbjI1xLL 1KOYgTt+ecPatu57tjmn8IqUhlaYpVL6fIsGzvips6ePJSO4B5EeyU6n+iBdO6fdc9WEFqx/WOf LETVsQDY1hbOiwUG7gV2hyLJa/2gAONGk0/KzI7LYDCD0kSKS9ZwN1hTa8fFppDGDsMtq6ZUMs1 KXiXSo/oaW+dI58PHLJqVKlzWLAURoKM= X-Received: by 2002:a05:6000:401e:b0:39c:e0e:bb46 with SMTP id ffacd0b85a97d-3a07aa5fd30mr8824514f8f.4.1745935717318; Tue, 29 Apr 2025 07:08: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 ffacd0b85a97d-3a073ca4f88sm13718668f8f.29.2025.04.29.07.08.36 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 29 Apr 2025 07:08:36 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Hanna Reitz , Fam Zheng , Paolo Bonzini , Gerd Hoffmann , qemu-block@nongnu.org, John Snow , "Michael S. Tsirkin" , Zhao Liu , Eduardo Habkost , Jason Wang , Kevin Wolf , Yanan Wang , Marcel Apfelbaum , Dmitry Fleytman , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , Thomas Huth Subject: [PATCH v2 02/19] hw/i386/pc: Remove PCMachineClass::broken_reserved_end field Date: Tue, 29 Apr 2025 16:08:08 +0200 Message-ID: <20250429140825.25964-3-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250429140825.25964-1-philmd@linaro.org> References: <20250429140825.25964-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=philmd@linaro.org; helo=mail-wr1-x436.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=unavailable 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::broken_reserved_end field was only used by the pc-q35-2.4 and pc-i440fx-2.4 machines, which got removed. Remove it and simplify pc_memory_init(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé Reviewed-by: Thomas Huth --- include/hw/i386/pc.h | 1 - hw/i386/pc.c | 13 +++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 9563674e2da..f4a874b17fc 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -107,7 +107,6 @@ struct PCMachineClass { /* RAM / address space compat: */ bool gigabyte_align; bool has_reserved_memory; - bool broken_reserved_end; bool enforce_amd_1tb_hole; bool isa_bios_alias; diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 70656157ca0..c8bb4a3ee47 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -999,14 +999,13 @@ void pc_memory_init(PCMachineState *pcms, if (machine->device_memory) { uint64_t *val = g_malloc(sizeof(*val)); - uint64_t res_mem_end = machine->device_memory->base; - - if (!pcmc->broken_reserved_end) { - res_mem_end += memory_region_size(&machine->device_memory->mr); - } + uint64_t res_mem_end; if (pcms->cxl_devices_state.is_enabled) { res_mem_end = cxl_resv_end; + } else { + res_mem_end = machine->device_memory->base + + memory_region_size(&machine->device_memory->mr); } *val = cpu_to_le64(ROUND_UP(res_mem_end, 1 * GiB)); fw_cfg_add_file(fw_cfg, "etc/reserved-memory-end", val, sizeof(*val)); @@ -1044,9 +1043,7 @@ uint64_t pc_pci_hole64_start(void) hole64_start = pc_get_cxl_range_end(pcms); } else if (pcmc->has_reserved_memory && (ms->ram_size < ms->maxram_size)) { pc_get_device_memory_range(pcms, &hole64_start, &size); - if (!pcmc->broken_reserved_end) { - hole64_start += size; - } + hole64_start += size; } else { hole64_start = pc_above_4g_end(pcms); } From patchwork Tue Apr 29 14:08:09 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: 885739 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp348132wrq; Tue, 29 Apr 2025 07:13:31 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXWnN895L42ihltWxZ7QoPF7MU4SMO28VLp8jC+kgNsMeIL7qexPBW8dGOORgcaEhcWxcEMJg==@linaro.org X-Google-Smtp-Source: AGHT+IEPZ/plwWwNdCUAPji2vlT2QmKqhxuFWZT2woFlTGNeLmejIjNotB6+fkUuib7Qc4Yx3pqM X-Received: by 2002:a05:600c:1908:b0:43c:f629:66f3 with SMTP id 5b1f17b1804b1-441ac85dfecmr33706205e9.18.1745936011199; Tue, 29 Apr 2025 07:13:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745936011; cv=none; d=google.com; s=arc-20240605; b=jqakENE1+h/uE4KHl9eRmPGYxPDXT5vchKHla+PaEB6lsx0/8e0r94nsnn4tMeF+jm PCIcVbTlYuYapjjwBOSguYHBMtneohhgkPyB0lw9I7h0qi9qK08tHMXblW3FEStyYvpz 52Lc+iE6aAfwLVS0WbmRN7m0mZfWqj6OoRhLHb1qfJYg5O+48pjxEIQ3cGVQNbHBRC0e SVEjdZCLOL1zGSexT/bzl9rGrUeBbbVrtTar/XNVVhiBtA+lfh5q/ae8xQsBoFHx6kRN /uUSzFTZsXNWu4FCgw1nzXLbne5LA1vxMdIgXlqtAFPz/JBC+VpVd0kCyKYCQDpfL5hq qTnA== 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=1rBTFzGlpmN0XM4Xhc9yiz4Q5nlS539l0QvdyVgqZAM=; fh=g4s2jU8t/W1wGraKJcf4drMIpLYu/oWYTROkTdMMVGc=; b=Bd9ydZ/XDMYmONQ76ftNDFvUicHIEGpmqD1DFuiRkYGWjoZKLr7VitJqBXMOW7n44Q DKByCF8exDWnDOa/6ofrjM1TR3e7XI5feUSpOL8SqdYyUiP9iAFlvJ/L2F8GhA7UFoWU DRo5BmKs2M5qMQ9cVbj7bxv8qDvWIjEMJMcT6mTVRCep7n798AVxHoYDR0Zthzfy81PO wyClgRFo/2I+CJoZV7RYlffzuubClYJB01/Sb2mJiawMpAwCt5tOeQSvRNKGDHLGt70A zklUIBoIEIkOEpZEjCoXU6ol7vM84NOUkbw03RZMfqXuER5wq1/Zw2UA+5wenyF3dTP2 hbBg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cQpUk0XR; 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 5b1f17b1804b1-440a53044a8si76130795e9.62.2025.04.29.07.13.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 29 Apr 2025 07:13:31 -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=cQpUk0XR; 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 1u9ldi-0000e4-N8; Tue, 29 Apr 2025 10:08:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u9ldh-0000dO-9a for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:08:49 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9ldc-0006G7-UW for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:08:48 -0400 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-39ee57c0b8cso6956006f8f.0 for ; Tue, 29 Apr 2025 07:08:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745935722; x=1746540522; 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=1rBTFzGlpmN0XM4Xhc9yiz4Q5nlS539l0QvdyVgqZAM=; b=cQpUk0XRCoVg0qk/yrI+21rLGJ5Mhc2s5Mg1MUBD+K4FtYrXRNWpfuPVrMQnRyj3iy EHOi+UUhcxbNp0mWKD02CQXR7MezCOXfChRy+zjCeCdNHcVLoRBFO/DAmSncmaSaV6mF TXHVMY2J0pqOU+pu4sLKFypztaR2FxsZLcG9XEAk8I7/39EmZlfw0VeTjsC5bd5Ueg2N YVo4aXdmf1MTojKReUa6rYan65KjPYdS6EnxzzpAj55kke2V02DWRDyNwQQqzhB7aQMz /KHmmNrV7k82doV29k1X2+5P1CuMVsev6sElsHdkc8dhidEk/1lkX+dUYqMF3sgPRLRm Te/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745935722; x=1746540522; 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=1rBTFzGlpmN0XM4Xhc9yiz4Q5nlS539l0QvdyVgqZAM=; b=qfJaGXuQRc96W8he6XeuDeFnBhJ6sjbRDRTU8l04t7HHa7xC+ZhalHXJ2HE/Bf7pkw OVvOy9m755qp2tQfLHsLjE48xLMcl5IcnALNHvaPslQW5bM7pgQPBwx+HljWXyTkjEh4 9YGHLBnK4h5yuaSMt0s1JmayGpISdpZLeGdFtPYOro80ocg6lDuugLZ9svt92Ba+8Gsw lMR45ePLkDFP/1HmvoNjdVXew/ArhDr1evMVuBsBr65Ib8BzbWrycjjof8R+r1l+kVAY 64ILfmVHM0swSbFjLW5D4L6WkBVH1SxZrDXAPpoqOMXIBRbbUECRsxZ1PoGLBTKQ9L58 zYxA== X-Gm-Message-State: AOJu0YxZ2zu5eL4EUux6pw6bmM+24JQn6iYYC9GAnXyFMALMnx+8UbR5 HDetiDn/zbM6QR6H4+KF/5V23Vv6m1rKxvr6lNjvG2thSgYrH0AIdlhMtMIoITupnQzzAsGH+fr 1 X-Gm-Gg: ASbGncuw2lxALLZMLrm8SMRzYbcU6cmLo2A/fwOk9bxIeVYR5Mi5n5trcZwS/30joJY rdWQ3oSf5jxP6XKJ1uh+cr10B7PeLcgL71M8qyT91CMmuE9pQFLSrH3PLJ9YIEUftgMD2etcY/h UfnufhFPJrtjE6Tfn6aWTOnfHl9NHBT8H2uvuvEAIIZxA+POai8CU/Cb2fHlmIFcueGhK3+w/Tu dXEy486ucjZGJU5B2vekSF4fCPy+nQolQhkXR/yFv6HUZAXFT1JFh/6xIoJeiGbA8ZYSM04t3RK GH+qUXXOBY2D8cuBE4mJfsjtWyVdubmveCl7s3aEmJMpdbMAuvFf4eFkukYowrjcy4hOZctHQ0T mEZ3jL+7kDzAH5Cy5IDrp X-Received: by 2002:adf:f7c5:0:b0:391:3406:b4e2 with SMTP id ffacd0b85a97d-3a0894a17f0mr2414426f8f.49.1745935722255; Tue, 29 Apr 2025 07:08:42 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a073cbedc4sm13721492f8f.47.2025.04.29.07.08.41 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 29 Apr 2025 07:08:41 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Hanna Reitz , Fam Zheng , Paolo Bonzini , Gerd Hoffmann , qemu-block@nongnu.org, John Snow , "Michael S. Tsirkin" , Zhao Liu , Eduardo Habkost , Jason Wang , Kevin Wolf , Yanan Wang , Marcel Apfelbaum , Dmitry Fleytman , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= Subject: [PATCH v2 03/19] hw/i386/pc: Remove pc_compat_2_4[] array Date: Tue, 29 Apr 2025 16:08:09 +0200 Message-ID: <20250429140825.25964-4-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250429140825.25964-1-philmd@linaro.org> References: <20250429140825.25964-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=philmd@linaro.org; helo=mail-wr1-x429.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_4[] array was only used by the pc-q35-2.4 and pc-i440fx-2.4 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé --- include/hw/i386/pc.h | 3 --- hw/i386/pc.c | 19 ------------------- 2 files changed, 22 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index f4a874b17fc..b34aa25fdce 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -301,9 +301,6 @@ extern const size_t pc_compat_2_6_len; extern GlobalProperty pc_compat_2_5[]; extern const size_t pc_compat_2_5_len; -extern GlobalProperty pc_compat_2_4[]; -extern const size_t pc_compat_2_4_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 c8bb4a3ee47..2b46714a5ac 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -262,25 +262,6 @@ const size_t pc_compat_2_6_len = G_N_ELEMENTS(pc_compat_2_6); GlobalProperty pc_compat_2_5[] = {}; const size_t pc_compat_2_5_len = G_N_ELEMENTS(pc_compat_2_5); -GlobalProperty pc_compat_2_4[] = { - PC_CPU_MODEL_IDS("2.4.0") - { "Haswell-" TYPE_X86_CPU, "abm", "off" }, - { "Haswell-noTSX-" TYPE_X86_CPU, "abm", "off" }, - { "Broadwell-" TYPE_X86_CPU, "abm", "off" }, - { "Broadwell-noTSX-" TYPE_X86_CPU, "abm", "off" }, - { "host" "-" TYPE_X86_CPU, "host-cache-info", "on" }, - { TYPE_X86_CPU, "check", "off" }, - { "qemu64" "-" TYPE_X86_CPU, "sse4a", "on" }, - { "qemu64" "-" TYPE_X86_CPU, "abm", "on" }, - { "qemu64" "-" TYPE_X86_CPU, "popcnt", "on" }, - { "qemu32" "-" TYPE_X86_CPU, "popcnt", "on" }, - { "Opteron_G2" "-" TYPE_X86_CPU, "rdtscp", "on" }, - { "Opteron_G3" "-" TYPE_X86_CPU, "rdtscp", "on" }, - { "Opteron_G4" "-" TYPE_X86_CPU, "rdtscp", "on" }, - { "Opteron_G5" "-" TYPE_X86_CPU, "rdtscp", "on", } -}; -const size_t pc_compat_2_4_len = G_N_ELEMENTS(pc_compat_2_4); - /* * @PC_FW_DATA: * Size of the chunk of memory at the top of RAM for the BIOS ACPI tables From patchwork Tue Apr 29 14:08:10 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: 885729 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp345629wrq; Tue, 29 Apr 2025 07:09:39 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVpk2l53feFD5uc8MaCWIH34574a92VEHFKJKVKbEWUrwY20C0B7GOs2XI5gNYUdFCwSHhUoA==@linaro.org X-Google-Smtp-Source: AGHT+IEuXtwJsTl2uf6PBPwLZKClcaKdmCbApq7V6gA7EbI9mf9hk8Fl2/wJvvAEwVex6vTFS819 X-Received: by 2002:a17:907:1ca7:b0:ac2:4db0:1d22 with SMTP id a640c23a62f3a-acec6ab3ac1mr333894266b.42.1745935779302; Tue, 29 Apr 2025 07:09:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745935779; cv=none; d=google.com; s=arc-20240605; b=bYYRsxZkfq1cso3JX8Xc/YqdRzMoCeAWFxhy+g/GrPF6uA869rWWhoqrycawWdUahJ e2vLFMIOwrzjtGfO/iOVLIDcSrxEsgjydXouXlQ7XBp7HJsTLlhqEtqyKyRt4E/rFZEM Zf4d+IGDhBQlh5cp6JPZRdM8BRh3O7T5lIj0jZq13/6E2mWKrJI6VWJK6Vtde3gyPIrF OABaro5oqcvnTkiX/coGQVshQJkCffPdi2itfhrr860xQWUexdPkWYpJcdO13ZkxjL91 e7XKcjG2hYpAGAa4sK/VmZoFbCy1NY8HB9+PSSpp2uuDtBM1hWKIL2fuTyAOxMX0/6mA j7uA== 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=2TdK0KknkLOYwI+XSWuaAcvX7rG//eSaXjO5J4+I7ro=; fh=g4s2jU8t/W1wGraKJcf4drMIpLYu/oWYTROkTdMMVGc=; b=eh3Uf2yY2gzxbS8MMTXGkT3CxCGkIgj3LMcYlMAu9sYkMSaCc9bYl5XVTSXH+9OpWR PNMLpRzKGgPwI3ldnnXPv8iD9zk8zVcd+jFnjPJhCj/uZwFQFu3NGa13O/222dJFT+EC nJyK0/g7xIqGmEZ+Nyo6vq/d8tMSd12MjZoA5CwI910lTfeFbf6GeGf0Q2BrnSYrNbGQ O47zlmvW1kg9trfUS3XefsImPZvheJF+ErOFj1+ncXXbqmS6mx4oUauHRjVyWaHL7Wbt tpwfqT+ZoJ2YVX4N3aUeRJnzulpdTy/r/KLJR/SDDBEz0WOIZXdreAuRRY7QaCWTscg7 74Tg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lPpH27jm; 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 a640c23a62f3a-ace6eb3102fsi617473766b.329.2025.04.29.07.09.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 29 Apr 2025 07:09:39 -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=lPpH27jm; 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 1u9ldm-0000iv-S4; Tue, 29 Apr 2025 10:08:54 -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 1u9ldj-0000f1-QY for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:08:51 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9ldh-0006HM-Ox for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:08:51 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-43cf58eea0fso26814245e9.0 for ; Tue, 29 Apr 2025 07:08:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745935727; x=1746540527; 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=2TdK0KknkLOYwI+XSWuaAcvX7rG//eSaXjO5J4+I7ro=; b=lPpH27jmnDxa6xJSXYh8p1T8Wr9xu+jVXwmjrU0fVqibE7XM6Zcu1/niDd48a0nDDz u9dBbR/CB+4ehkPFEhAMTolZsmWZumTrNr/UTc+KDVszL/U12R24TAgrVO0vthhtHqto A5Xp3TFbAmSXxrTjJ4Sfrf/+gVVxXUxQMBIZucA8NaqFCgWT2eXpk9ezWli5D1XcWcow lzW3KwZLcFJAJ9W0ZwpD15Y5WQIF4sCFE+9c9Loj4F53sRRW90ktpOZa1lQfLqIstVka KXQqbGLCjbea5jw0YHimEYQQqZfFOrelA/wCbZBoLCFjw2pm0DBBoUFOCJ1ejuHGM/Me aUxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745935727; x=1746540527; 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=2TdK0KknkLOYwI+XSWuaAcvX7rG//eSaXjO5J4+I7ro=; b=tyAK5mDiAszKjcC9djNtfVi7lk4SJ2FAMA5ezaATl7VGlsiZm16Ez+NBvsspfR5Z35 gHZDIaVNpORQp34qR4X5oeDBUiH6/AzlTGLjAveWOd1UqOuBYJJhcZduYp7P0zwIr8Py rbteR/LyeUZq689Gf6gpB+PytYW4447+AD6LRXcQxYHBOwVOabICwe5oOqyJY9fXxpjo Zw0GHua2uIVWVq62TzAHm6y8uOnXV/1HCJlxTajP9Pvei2BzroSSSB/k8BY5inkJcVHZ bM4TmH/3gtfbL7qiAlGZfCRPYPvQOj684+yfzRDuKPumyu8oP6t1HAMljaQxfkSPcaON 4JKw== X-Gm-Message-State: AOJu0YxLSEEOi2XVE6nFl6K+2/a4S0jJxk+mwpfOSUP9r+Vow1zHmYlf pA3CTq5TFOjARDfRl7DHOSnzeYICF7s82KWQ9mBQWn4ppEuZeN3gqF/CdVWnjtxe73vcz0pP8s9 Q X-Gm-Gg: ASbGncutY3KK8VC8XBnBRQwU6qXPUw07orG0N9FOfTx9LqMTxZy+Z6wh4ryn6CF1XL8 vitRL9NVODhrijkfGBxHkaekGsKxzCf7rl1OyWebSALf9gAfC/XcBuzcJdAUgKnlq9NLeKj78xC fl7n/EndzBjJsh54yIZ9Svvmdywm9/y9Raayd6UYaKQaFKhQc5PZvhUsFyYyCPSP7pYXnrieaon b3lIFuVd9wdAgPP+mTJmF3WZn5aA49+/H7ES62GL6XFyv2mdmkiRSrxsFOixCiNvXf8An1V8jFE soRmnPmYPshVKON91QJG7Js/BTMaX/G/ggAB9gPggWAMS7PRZ4r+eWfbL/sANJPmFqVRri4gra3 OlIgeujFbXfst5Cm7o6hq X-Received: by 2002:a05:600c:5491:b0:43c:fe15:41e1 with SMTP id 5b1f17b1804b1-441ac8ce2f9mr24719525e9.4.1745935727158; Tue, 29 Apr 2025 07:08: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 5b1f17b1804b1-440a5311403sm157348955e9.23.2025.04.29.07.08.46 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 29 Apr 2025 07:08:46 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Hanna Reitz , Fam Zheng , Paolo Bonzini , Gerd Hoffmann , qemu-block@nongnu.org, John Snow , "Michael S. Tsirkin" , Zhao Liu , Eduardo Habkost , Jason Wang , Kevin Wolf , Yanan Wang , Marcel Apfelbaum , Dmitry Fleytman , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= Subject: [PATCH v2 04/19] target/i386/cpu: Remove X86CPU::check_cpuid field Date: Tue, 29 Apr 2025 16:08:10 +0200 Message-ID: <20250429140825.25964-5-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250429140825.25964-1-philmd@linaro.org> References: <20250429140825.25964-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.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=unavailable 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 X86CPU::check_cpuid boolean was only set in the pc_compat_2_4[] array, via the 'check=off' property. We removed all machines using that array, lets remove that CPU property and simplify x86_cpu_realizefn(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé --- target/i386/cpu.h | 1 - target/i386/cpu.c | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 54bf9639f19..3a5e17e0741 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -2168,7 +2168,6 @@ struct ArchCPU { uint8_t hyperv_ver_id_sb; uint32_t hyperv_ver_id_sn; - bool check_cpuid; bool enforce_cpuid; /* * Force features to be enabled even if the host doesn't support them. diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 6f21d5ed222..49179f35812 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -8169,7 +8169,7 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp) } } - if (x86_cpu_filter_features(cpu, cpu->check_cpuid || cpu->enforce_cpuid)) { + if (x86_cpu_filter_features(cpu, cpu->enforce_cpuid)) { if (cpu->enforce_cpuid) { error_setg(&local_err, accel_uses_host_cpuid() ? @@ -8808,7 +8808,6 @@ static const Property x86_cpu_properties[] = { DEFINE_PROP_UINT8("hv-version-id-sbranch", X86CPU, hyperv_ver_id_sb, 0), DEFINE_PROP_UINT32("hv-version-id-snumber", X86CPU, hyperv_ver_id_sn, 0), - DEFINE_PROP_BOOL("check", X86CPU, check_cpuid, true), DEFINE_PROP_BOOL("enforce", X86CPU, enforce_cpuid, false), DEFINE_PROP_BOOL("x-force-features", X86CPU, force_features, false), DEFINE_PROP_BOOL("kvm", X86CPU, expose_kvm, true), From patchwork Tue Apr 29 14:08:11 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: 885727 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp345578wrq; Tue, 29 Apr 2025 07:09:35 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVXKenFTd9CcWCTW6oausRZBsQlrtH8bIPUcbXhoVqOU3W8d71GnzjgH2+4fwg3t7GM3S9RLA==@linaro.org X-Google-Smtp-Source: AGHT+IEOAgVdFSlRod/qH1DIsNQcrphuCS0zOZ9kZkioCx0wdhSycFhAjAhQJUmDZ9ylwAUA+Ha3 X-Received: by 2002:a17:907:9617:b0:aca:a1c9:d155 with SMTP id a640c23a62f3a-ace848c0247mr1081592966b.11.1745935774686; Tue, 29 Apr 2025 07:09:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745935774; cv=none; d=google.com; s=arc-20240605; b=Sgzx2j8OSncao+0mWr35g2ynigZ/8AfevaCr5XQH7a4YtWP8wMY9jOOBFqESp5cesM nXWh2u/uoOeLTdHyIo/Vmp+EpmGG4n2EdC1kxPEWFIthJqVIpslKW0Rd3QXGZLP/ekKy KnW3r5FsypXXD5BHNOqK4xCZv6iVVlXSug0qYpvy7P0+d+Qi63SxPmBCJOIGWCC6aQsK g/8C6glMwVKKzyfKzmIEoLiKP13vY1HzMmu9JMq48+KDgJwna9cKxSQdgaNOmsyGyEKN m8RwVbdxSUIykC8uQuTV/lLF6Qct+06xeRuNkGHIWugCymExaW87idAeF84g5ZQgts6B UrJg== 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=Y41oplbkU9wFEHQN9IFbTeGkihP8bHFwwIYrwg5eFCU=; fh=g4s2jU8t/W1wGraKJcf4drMIpLYu/oWYTROkTdMMVGc=; b=AbDHP750eQjShW1FJk7AkuWgBe0+CfaLesVABxMOoOmMHjbr+isUvCRl5KXWOUQ5g9 KGT4ukwAdTgsuDHhqeZFAOzrB9ld1F6OLAc1nwvhxr8eoxanBbdnjjjQ9mlyuIN4kDbR xi8JzaVDG3HriR1IwFTuTUT7Kl44aHFofhb/1PwZ67RNJcXlxKAO8BfCLcI/jy2qyvj6 TDYiFyqEQmlYjLpqgW49v2KJ+v+G+tIX1oJqA+Xo71GvYFhvc/WFufsDFKVRkRtcctrK IuwfOeKs+bWTjyMEzpfIogGSIWMj+xPYc3ApKMPYw+vQIQnzH1xUvodxIvquRf6Qs1uj iqtw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EYYe0DQ6; 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 a640c23a62f3a-acec8055b67si124694566b.39.2025.04.29.07.09.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 29 Apr 2025 07:09:34 -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=EYYe0DQ6; 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 1u9ldq-0000ol-VU; Tue, 29 Apr 2025 10:08:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u9ldo-0000lL-Mq for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:08:56 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9ldm-0006IT-0y for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:08:56 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-39c30d9085aso4447634f8f.1 for ; Tue, 29 Apr 2025 07:08:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745935732; x=1746540532; 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=Y41oplbkU9wFEHQN9IFbTeGkihP8bHFwwIYrwg5eFCU=; b=EYYe0DQ6Z2PJ3Wse7CLLsldjIbap0voSi6u6xk9zwq9jZmQ7kwN/Lqg+4dUq6JRvYN o7ueJ39lXmXbqtkchPrAan48Ont4A+rprmgnxF+rDfgHxezUIlk1ILmtxdTWavG9TSNS JfWT2WXdVfen4hTP/2uVTvXPP+eux4IXRPK8MqTg5W0X3evgZzBglOwPR4cSHH7m9DsR 0/gTWn5NDz8qLb6z2KT7pOh+oiFE/EbkNXJNPw37M5OkGRbPS+d9OQPf6LklvDFMVcL0 JmSIIFpGQSXQu40BbQhJk2Ohh0s6Z04DkOGcE6Dr4BpfFpZp3GCTyifIbgA0L7JC7owz xLCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745935732; x=1746540532; 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=Y41oplbkU9wFEHQN9IFbTeGkihP8bHFwwIYrwg5eFCU=; b=ELOtlI/3UEfuUqqoc0Ogwbhuivo4MBPaY4SneLRDC7nWvSxDNOmjlgp+JVdCzujfKs woQbO0nGO3+SflmgIXi25Bgp46CdfLF2rnGzlW6oHWZOeks+adNQOVtF/VgjOIAWf8rs 3i3AoLSCNYlEVEPjrYl5abS8a4DKbi7mVvYaJ93EP1MTx77uNbHDjLHYScaYjBHmAeO2 2GAlxfchwIHmha3qA3rtBwzZnFIeHJ0jB7BuYWQsAoL00E7GART6WYLl+qEGHeBbma5E ri/jLInPfDYARV4v3Aw8mGE+g6lHLZyU0NFxKh+HcUrCFbd7+LsLnDv49gY+Ked4u1ew PYyg== X-Gm-Message-State: AOJu0YzVtJ1tH7tT2z2Q+7WSk+QL5AqbccL5kcgNoF5hassAuPE1gAfA gLqOYXuRiMLbN944MxdQdgNk1P/Oh9H04rjTgoxhgYjAUe2tZ7ICoM/pC4KgYiOsXiymPBq8GwD T X-Gm-Gg: ASbGncvLXOvqqaz/mITIL1JlPgooBjFfFc4SPeSAaPsARZJMMmuWnOZxtTgn/Wf4FBO 1J+D3BnCyyxRc/nIdA2e+1vjNdbAo9F+F1z3i+XXPna2ylZWEufT9nUeKEdzBWHY1Xmd1mUMQWO tQKsY94gm4sgcyHfWPrtOuGBhWp3h+4aEi9Uuj9Bwsy9c304IxhGQYYieNPvY/p86bbeOrpQwoA J1flze/aMneZMeDWObp7h79B9ARwUFyDVAbM20/2YOhUpGGjJ9RSxAiDpiSOHPeeD+XNad7/jEr K8WI/xMgZ8ZXCeMsy1dgDLbCSNOUWOo5QL7u21JR26RrBrFY7PXd2h87b92fqpLIqHka2XvDbLS ksaxoI6RHWioXdSbAsBca X-Received: by 2002:a05:6000:1f03:b0:3a0:7a8f:db22 with SMTP id ffacd0b85a97d-3a07aa6b57emr7712782f8f.24.1745935732109; Tue, 29 Apr 2025 07:08: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 ffacd0b85a97d-3a073ca4742sm13810098f8f.23.2025.04.29.07.08.50 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 29 Apr 2025 07:08:51 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Hanna Reitz , Fam Zheng , Paolo Bonzini , Gerd Hoffmann , qemu-block@nongnu.org, John Snow , "Michael S. Tsirkin" , Zhao Liu , Eduardo Habkost , Jason Wang , Kevin Wolf , Yanan Wang , Marcel Apfelbaum , Dmitry Fleytman , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= Subject: [PATCH v2 05/19] hw/core/machine: Remove hw_compat_2_4[] array Date: Tue, 29 Apr 2025 16:08:11 +0200 Message-ID: <20250429140825.25964-6-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250429140825.25964-1-philmd@linaro.org> References: <20250429140825.25964-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=philmd@linaro.org; helo=mail-wr1-x42d.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_4[] array was only used by the pc-q35-2.4 and pc-i440fx-2.4 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé --- 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 765dc8dd35e..5c4e3d2a2cd 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -848,7 +848,4 @@ extern const size_t hw_compat_2_6_len; extern GlobalProperty hw_compat_2_5[]; extern const size_t hw_compat_2_5_len; -extern GlobalProperty hw_compat_2_4[]; -extern const size_t hw_compat_2_4_len; - #endif diff --git a/hw/core/machine.c b/hw/core/machine.c index ed01798d37c..d66b02b564c 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -292,15 +292,6 @@ GlobalProperty hw_compat_2_5[] = { }; const size_t hw_compat_2_5_len = G_N_ELEMENTS(hw_compat_2_5); -GlobalProperty hw_compat_2_4[] = { - { "e1000", "extra_mac_registers", "off" }, - { "virtio-pci", "x-disable-pcie", "on" }, - { "virtio-pci", "migrate-extra", "off" }, - { "fw_cfg_mem", "dma_enabled", "off" }, - { "fw_cfg_io", "dma_enabled", "off" } -}; -const size_t hw_compat_2_4_len = G_N_ELEMENTS(hw_compat_2_4); - MachineState *current_machine; static char *machine_get_kernel(Object *obj, Error **errp) From patchwork Tue Apr 29 14:08:12 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: 885735 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp346632wrq; Tue, 29 Apr 2025 07:11:08 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUHH7xur/dPU1CbeZ7ESV3qM/2vCJGJTAAl7/Jz1zHpXb2zxMMHnzlB4wFRGAEVRw0U+ANoDQ==@linaro.org X-Google-Smtp-Source: AGHT+IFpco6FnVx0KrNj4/op0DDO/14edJZUlWPKKExKsstBXMDiigfaIeIV475bahZVIwT2FYM6 X-Received: by 2002:a05:600c:1d1a:b0:43c:fa0e:4713 with SMTP id 5b1f17b1804b1-441ac8ce2eemr33169405e9.2.1745935868190; Tue, 29 Apr 2025 07:11:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745935868; cv=none; d=google.com; s=arc-20240605; b=jleBO+6RnTMrWuu6X3q+A1cb5EyBFiw1OSFyvZ/P9xC8ZLiBVPC79si7JeFe7zQH6x LL2JSE1aQCiWGQh7TQRuabFVvbWt+uYeKRJRzQLy32APJ0Qscte6JFmFB+gdmQxYzGdd c/DZnoFxfIjsxv5Ar4tQVx/3aHuahHUdWUYNuHXzLtj/aplsD30AfZeESvzoxqhTa6eJ 6vgZzVzMl9pGSG1+jK12u7NXO8JT/OBGqR6g4yXZg9f2+m/Dti48Nalu3gXPnqWKW30z KAebPe5gffyHg/Gu3F3hOFjhXGDSK7ULf5dkBRNeNCD3YRdk+UvLRDCpcF6p50RXgIbF 7dtg== 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=D7M6Tutx3exMAOrtlWY2rOEtIIwc+eHcrkvSbvRNBy0=; fh=g4s2jU8t/W1wGraKJcf4drMIpLYu/oWYTROkTdMMVGc=; b=J48LFwvHRKrQs+WpUYSD56S01lIuygkxO88jK+yVWBy5yg57Lyzpo60aQz/t7O47TC 2Hg/wHH024nrfpcDJlOhRtvfRy93zeUmh2LfKBrSOnlqbk8DHX7N98pyVxwDl75M24K5 zBoDDcuVnrb22exzkYeD1obuKXsw1h2dbXkHQnhBAoPT6dJM2uF3SkjtRLlBnppDF1GC evdojir8clL2Q8vYqpokfoBTMP22EnZXWTWJqnSjRJ6uCcmdLmPylg1ILwg4au/koIP1 p8KXR5OZ9Z/714hSNimmRj+DzChc3wsMfMRJ1A6i+9bAOblECKJ61jAVSQZVUkat2Gck FBeQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=KykhTJl4; 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 5b1f17b1804b1-4409d2e5211si90755675e9.171.2025.04.29.07.11.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 29 Apr 2025 07:11:08 -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=KykhTJl4; 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 1u9ldu-00018V-Vv; Tue, 29 Apr 2025 10:09:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u9ldt-00011g-Kw for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:09:01 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9ldr-0006JU-9r for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:09:01 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-43cfe574976so42268365e9.1 for ; Tue, 29 Apr 2025 07:08:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745935737; x=1746540537; 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=D7M6Tutx3exMAOrtlWY2rOEtIIwc+eHcrkvSbvRNBy0=; b=KykhTJl4Xws9JBBG3bXZJk1mi0PGCMGBmyA/uNraDXH+B5TLulq+XEWv1W43Usr5V7 q1eCfPhTZqFeykIi1jtpNP/bNNBJi6q2/bWFL9Q60v6GPfR2rTlgSq7VnoMaWi87pw6R Epe9sRDPS6h4qAEvFYXmLToolL3IoAYd4kTSdKM26AObU7syEaLAwjrEm4vrDepYvuSn 749kNRhU/9U/JY1WivZiTo4WBNIxCct/TZTSv/Dq0mR6ixYXxhB2O0dIidHhmAuo6oaX tTYrrtb89sk7+YMk6m2gNCF3mpPaqkjMHBHkLKQAj3WCl1cA8jm5P/nKECYKTE+5B9u8 Yhdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745935737; x=1746540537; 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=D7M6Tutx3exMAOrtlWY2rOEtIIwc+eHcrkvSbvRNBy0=; b=WUDP1ZhnC1edzWAEhm5faCSndLUsV65jW5HCifBSoWWtbsHLAUPPqoEYAHkmM+DX5s 2cuPFVw2yb+BcFPF6FG3WR8UF6J/N1Ke/4f7jYWZdBBfcIlhqwq9m0UjtXFW8FPxItre dthYFdeHOqHJFdWu2KEoIbNk1nsyklt8u5Nf2mNRRy8MzN305i08Ei5tzam2ogaCpnv4 S9yj0IiZM2bdSIZacgFQzz3rGqDxVGMFOz5nRm90GPuycyBu7Nhk9igP1ZfKk9hxLEB+ wNHwqlZ2jMBkI6oKGr+++HEjb3FAyDa00Wohb/gY10FlL0xUJNyr4w6mlH3F+Rd4PPs8 L9/w== X-Gm-Message-State: AOJu0Yy+nV0+TfB+DOI5APQwdaYoOLEOImEDZPSWp3j/498cg711q6Dg nkxMuNi24w3pQtGK5qWCn5WIc0eJDL0tw6s8deJ1gbWaIP12x4WcnZAWb6TjeNRsK1bxRCiBxOs R X-Gm-Gg: ASbGncsYsZmqP+GV7RiJBqEBVLpZrl5cAvlRi8ePd0ujFXBfa2dYNFYhXTBC9vPMzez FkzR1k2ysqrQi36fdcdc6x4tCfSpg810Dcki4Rmv/t2f7VFuZoFgDLskVaUKAt9Zea8T6dMT8A1 1ZAkrqJiuZ0AwZs6z0dcj5C3l6Idrfs0+sqEti67uiQqyu8PdJhKG6JKMPXq8YbGOD7fwvLKm1j lXwfbDC+YVczSBaJMMIgXtNubZJxZtGXfTCAyWEouU+sqa9rvtB3C0U31+jqYajjnBhJ/AGOb6i Cjd+bAEpkvu5JA48ALT16Ki3kqPdXUE43ASjtIu+HABU2Gbdd7/uLOsY32qqe3kMQLXOYeisDFP lEkNzYxkfDnXEK7jKv8Cw X-Received: by 2002:a05:600c:3ca5:b0:43b:c0fa:f9dd with SMTP id 5b1f17b1804b1-441ac918133mr25754115e9.25.1745935737168; Tue, 29 Apr 2025 07:08:57 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4409d2ac26dsm191298615e9.21.2025.04.29.07.08.55 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 29 Apr 2025 07:08:56 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Hanna Reitz , Fam Zheng , Paolo Bonzini , Gerd Hoffmann , qemu-block@nongnu.org, John Snow , "Michael S. Tsirkin" , Zhao Liu , Eduardo Habkost , Jason Wang , Kevin Wolf , Yanan Wang , Marcel Apfelbaum , Dmitry Fleytman , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= Subject: [PATCH v2 06/19] hw/net/e1000: Remove unused E1000_FLAG_MAC flag Date: Tue, 29 Apr 2025 16:08:12 +0200 Message-ID: <20250429140825.25964-7-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250429140825.25964-1-philmd@linaro.org> References: <20250429140825.25964-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=philmd@linaro.org; helo=mail-wm1-x335.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=unavailable 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 E1000_FLAG_MAC was only used by the hw_compat_2_4[] array, via the 'extra_mac_registers=off' property. We removed all machines using that array, lets remove all the code around E1000_FLAG_MAC, including the MAC_ACCESS_FLAG_NEEDED enum, similarly to commit fa4ec9ffda7 ("e1000: remove old compatibility code"). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé --- hw/net/e1000.c | 72 ++++++++++---------------------------------------- 1 file changed, 14 insertions(+), 58 deletions(-) diff --git a/hw/net/e1000.c b/hw/net/e1000.c index cba4999e6d0..e0310aef872 100644 --- a/hw/net/e1000.c +++ b/hw/net/e1000.c @@ -127,10 +127,8 @@ struct E1000State_st { QEMUTimer *flush_queue_timer; /* Compatibility flags for migration to/from qemu 1.3.0 and older */ -#define E1000_FLAG_MAC_BIT 2 #define E1000_FLAG_TSO_BIT 3 #define E1000_FLAG_VET_BIT 4 -#define E1000_FLAG_MAC (1 << E1000_FLAG_MAC_BIT) #define E1000_FLAG_TSO (1 << E1000_FLAG_TSO_BIT) #define E1000_FLAG_VET (1 << E1000_FLAG_VET_BIT) @@ -1210,54 +1208,24 @@ static const writeops macreg_writeops[] = { enum { NWRITEOPS = ARRAY_SIZE(macreg_writeops) }; -enum { MAC_ACCESS_PARTIAL = 1, MAC_ACCESS_FLAG_NEEDED = 2 }; +enum { MAC_ACCESS_PARTIAL = 1 }; -#define markflag(x) ((E1000_FLAG_##x << 2) | MAC_ACCESS_FLAG_NEEDED) /* In the array below the meaning of the bits is: [f|f|f|f|f|f|n|p] * f - flag bits (up to 6 possible flags) * n - flag needed * p - partially implenented */ static const uint8_t mac_reg_access[0x8000] = { - [IPAV] = markflag(MAC), [WUC] = markflag(MAC), - [IP6AT] = markflag(MAC), [IP4AT] = markflag(MAC), - [FFVT] = markflag(MAC), [WUPM] = markflag(MAC), - [ECOL] = markflag(MAC), [MCC] = markflag(MAC), - [DC] = markflag(MAC), [TNCRS] = markflag(MAC), - [RLEC] = markflag(MAC), [XONRXC] = markflag(MAC), - [XOFFTXC] = markflag(MAC), [RFC] = markflag(MAC), - [TSCTFC] = markflag(MAC), [MGTPRC] = markflag(MAC), - [WUS] = markflag(MAC), [AIT] = markflag(MAC), - [FFLT] = markflag(MAC), [FFMT] = markflag(MAC), - [SCC] = markflag(MAC), [FCRUC] = markflag(MAC), - [LATECOL] = markflag(MAC), [COLC] = markflag(MAC), - [SEQEC] = markflag(MAC), [CEXTERR] = markflag(MAC), - [XONTXC] = markflag(MAC), [XOFFRXC] = markflag(MAC), - [RJC] = markflag(MAC), [RNBC] = markflag(MAC), - [MGTPDC] = markflag(MAC), [MGTPTC] = markflag(MAC), - [RUC] = markflag(MAC), [ROC] = markflag(MAC), - [GORCL] = markflag(MAC), [GORCH] = markflag(MAC), - [GOTCL] = markflag(MAC), [GOTCH] = markflag(MAC), - [BPRC] = markflag(MAC), [MPRC] = markflag(MAC), - [TSCTC] = markflag(MAC), [PRC64] = markflag(MAC), - [PRC127] = markflag(MAC), [PRC255] = markflag(MAC), - [PRC511] = markflag(MAC), [PRC1023] = markflag(MAC), - [PRC1522] = markflag(MAC), [PTC64] = markflag(MAC), - [PTC127] = markflag(MAC), [PTC255] = markflag(MAC), - [PTC511] = markflag(MAC), [PTC1023] = markflag(MAC), - [PTC1522] = markflag(MAC), [MPTC] = markflag(MAC), - [BPTC] = markflag(MAC), - - [TDFH] = markflag(MAC) | MAC_ACCESS_PARTIAL, - [TDFT] = markflag(MAC) | MAC_ACCESS_PARTIAL, - [TDFHS] = markflag(MAC) | MAC_ACCESS_PARTIAL, - [TDFTS] = markflag(MAC) | MAC_ACCESS_PARTIAL, - [TDFPC] = markflag(MAC) | MAC_ACCESS_PARTIAL, - [RDFH] = markflag(MAC) | MAC_ACCESS_PARTIAL, - [RDFT] = markflag(MAC) | MAC_ACCESS_PARTIAL, - [RDFHS] = markflag(MAC) | MAC_ACCESS_PARTIAL, - [RDFTS] = markflag(MAC) | MAC_ACCESS_PARTIAL, - [RDFPC] = markflag(MAC) | MAC_ACCESS_PARTIAL, - [PBM] = markflag(MAC) | MAC_ACCESS_PARTIAL, + [TDFH] = MAC_ACCESS_PARTIAL, + [TDFT] = MAC_ACCESS_PARTIAL, + [TDFHS] = MAC_ACCESS_PARTIAL, + [TDFTS] = MAC_ACCESS_PARTIAL, + [TDFPC] = MAC_ACCESS_PARTIAL, + [RDFH] = MAC_ACCESS_PARTIAL, + [RDFT] = MAC_ACCESS_PARTIAL, + [RDFHS] = MAC_ACCESS_PARTIAL, + [RDFTS] = MAC_ACCESS_PARTIAL, + [RDFPC] = MAC_ACCESS_PARTIAL, + [PBM] = MAC_ACCESS_PARTIAL, }; static void @@ -1268,8 +1236,7 @@ e1000_mmio_write(void *opaque, hwaddr addr, uint64_t val, unsigned int index = (addr & 0x1ffff) >> 2; if (index < NWRITEOPS && macreg_writeops[index]) { - if (!(mac_reg_access[index] & MAC_ACCESS_FLAG_NEEDED) - || (s->compat_flags & (mac_reg_access[index] >> 2))) { + if (s->compat_flags & (mac_reg_access[index] >> 2)) { if (mac_reg_access[index] & MAC_ACCESS_PARTIAL) { DBGOUT(GENERAL, "Writing to register at offset: 0x%08x. " "It is not fully implemented.\n", index<<2); @@ -1295,8 +1262,7 @@ e1000_mmio_read(void *opaque, hwaddr addr, unsigned size) unsigned int index = (addr & 0x1ffff) >> 2; if (index < NREADOPS && macreg_readops[index]) { - if (!(mac_reg_access[index] & MAC_ACCESS_FLAG_NEEDED) - || (s->compat_flags & (mac_reg_access[index] >> 2))) { + if (s->compat_flags & (mac_reg_access[index] >> 2)) { if (mac_reg_access[index] & MAC_ACCESS_PARTIAL) { DBGOUT(GENERAL, "Reading register at offset: 0x%08x. " "It is not fully implemented.\n", index<<2); @@ -1419,13 +1385,6 @@ static int e1000_tx_tso_post_load(void *opaque, int version_id) return 0; } -static bool e1000_full_mac_needed(void *opaque) -{ - E1000State *s = opaque; - - return chkflag(MAC); -} - static bool e1000_tso_state_needed(void *opaque) { E1000State *s = opaque; @@ -1451,7 +1410,6 @@ static const VMStateDescription vmstate_e1000_full_mac_state = { .name = "e1000/full_mac_state", .version_id = 1, .minimum_version_id = 1, - .needed = e1000_full_mac_needed, .fields = (const VMStateField[]) { VMSTATE_UINT32_ARRAY(mac_reg, E1000State, 0x8000), VMSTATE_END_OF_LIST() @@ -1679,8 +1637,6 @@ static void pci_e1000_realize(PCIDevice *pci_dev, Error **errp) static const Property e1000_properties[] = { DEFINE_NIC_PROPERTIES(E1000State, conf), - DEFINE_PROP_BIT("extra_mac_registers", E1000State, - compat_flags, E1000_FLAG_MAC_BIT, true), DEFINE_PROP_BIT("migrate_tso_props", E1000State, compat_flags, E1000_FLAG_TSO_BIT, true), DEFINE_PROP_BIT("init-vet", E1000State, From patchwork Tue Apr 29 14:08: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: 885746 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp350411wrq; Tue, 29 Apr 2025 07:17:06 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXmgd4YV7xi03tSrRlgDe4pjyvgAoO/0BoAlxXPldxs2wxbNl4WrHbCDmMCFWStOnKoc/E/cQ==@linaro.org X-Google-Smtp-Source: AGHT+IGMMkJPxQgU+7u1Bqe17zFQpkcEWIb9XWilIZGdXaRx78XNVxWN7qPnrmwffX6s6eOB634+ X-Received: by 2002:a17:907:1005:b0:ace:cbe0:2d67 with SMTP id a640c23a62f3a-acecbe03050mr221251766b.55.1745936226199; Tue, 29 Apr 2025 07:17:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745936226; cv=none; d=google.com; s=arc-20240605; b=ivWsfpvUx70A/SW7PEz7K+9YvT40Y7omXKQ5pZ1bI/7uhxMIZ7xk75s+P4ydq3SIhb NC5X6Us9IAw++swaB1PxeMi8Odb0ssM0jp5Viin1YXNZiu1kCPkVd5+9O0S+daPlZF8K v04n5yDDLOe8sBLCHYDo4kMToKBAC4lunhDutf+9DGY5EoHMSjltfaTRIuz1zMo1pgBD gZnSTpjd/l2Fpoaut3VVfdfcTU+KuScK7qH46GFb7mHGRylkKuXrfHqxipLawEpwwSrI AtlWs4dwS4xxKjX9amBXjMINBictzE2bi3aliROF4Ie0ZWdvYzSOl/jhPcpISjcgNCyO Wpcw== 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=xJvF5VVqWRoBuruHMFkUoRv70wTkjLmBdIDnHMXKE5w=; fh=g4s2jU8t/W1wGraKJcf4drMIpLYu/oWYTROkTdMMVGc=; b=D6vK/BW/M2yntXcasyOxH1itnC9TGscoJBg5gtrHk4yiFXuJ+PvoCscFv4UL83iBLz f2Ud4We3yJQc4d+eP6h8K4mRv0atOEGLIRCnt+W7DYIXBz2Z2HMYMpvrA+bRR2H5Y4kN mg7wezoIPfCBCzxXomObueNBhOoWXp1suORH3iyz1F0kEsoTJh1NCFO9dekAR4lBzDpD sSWjHxCnKVzC/mwJFRh0prkNUbD4t9zAc+LsnMiIZxOlWaGfb+Nk0FrOnhed85EgAIL/ GhgNGn/ccrzD41EWWfPFyYMDM/xUTDJEfa77AlrvuKMhb5IivguiftTgHLZPyJ9RpYBy MaCA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EFil7s1U; 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 a640c23a62f3a-ace6ec08affsi649298866b.763.2025.04.29.07.17.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 29 Apr 2025 07:17:06 -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=EFil7s1U; 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 1u9le0-0001Yx-Fd; Tue, 29 Apr 2025 10:09: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 1u9ldy-0001NX-0B for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:09:06 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9ldw-0006Kh-5A for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:09:05 -0400 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-39ee651e419so3152528f8f.3 for ; Tue, 29 Apr 2025 07:09:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745935742; x=1746540542; 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=xJvF5VVqWRoBuruHMFkUoRv70wTkjLmBdIDnHMXKE5w=; b=EFil7s1UHwWd5OWtuX3OP5lQ+aJACrJJM20E5KYBj1VEWhaZWGL7icZoSYZtVzamTT sz5K67Jb8dLq4Ibs6M4urgley4+lUJZFRfVeYWRySrEaVRH1wFrAHAq6we/tMXci9QFn A5r5oQdsfSfMnlwdU2PBUxZkfDYvdevv3RmIellcgNz49K3EXHgWlsRJvYreOHbEGios asLa3x3Q+J6GBN6/1NGHzeWJ7wANRsquL+tWPyNpFHYvEcxG04uDLuCilgy2sTRjAZrx 8vMkcNMaHTq732+l+cl76sGSLKNuXhbhe8Q/5CsktGNjjOC1VMbEjLVokuvEhfIFmqC1 ZJgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745935742; x=1746540542; 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=xJvF5VVqWRoBuruHMFkUoRv70wTkjLmBdIDnHMXKE5w=; b=bzyMXHLKnJBfI8cLOfAh0xrwzOc+Gttu96n9RymWOlYtqxGh2YOd1pfiSJgf8GzwWp jmHVL0l1Fo5a8oy7HIpBHVMb9ENk8NdTQyikv9gMybqbx0J9AuTFsrnH9iQzlrv4eCDQ 6IwXBIA9VWCIWy5kJT+sAjHnUYsRvdNhNL1zi31yb9m+jHAOeSxUezNB7rV3mxx5kP2O 07K3cOcFpoFKa9LPinerLPk3PbGB2sr8ineWzJJR2nov/sHaCHPfYSjymAL2CPyzot+U cp5OdkMu4A3RPcNoLG+RW8EU+FjNZBEtbsc7+0P710AeTt+k4TzGFM6lo4sB4l1LIhOh 8I1Q== X-Gm-Message-State: AOJu0YwmxWcL/+b1isUdNdsIEchJVOBCz6BeFAxOvMUKmevHnXGhG2Mp mV7aXOWxhEBuml9PXkAul/ohnZeEjHjJ/46kqpdzHE1LAIJ9JMxdjGwD+cYDSCETJiLSod3NH9r S X-Gm-Gg: ASbGncssU8p41L7HIHs+u3LjTiKkGxjaUVYkSt0egXJW9FoL4ttp6Tx6QVRgNrU/L2k xxczzfCGzQBnTAezPabsUvVZfjqq++kgePpsqXuSuWHr6UdhaadNatkw42i5Oo+f8+9eymoglRm v3wDRuFB0sYUwuICeZdGycWHtIBqB4oRprQq/25nYJv1tDTYvwvairxH3IinydcHmoNf5jo9xwh QBKPiplwymFTLseW0FXPq89CeGuakuLqeKXqUyr8fWD20/pkwEijTBzouscxQ+LAKly5uFwH5G6 BrkFOSmbVDmzhKsYkUDBNWHafvXNuQ4sCo3q+j9X4cvcqEJ9he9qP4qsVR4qlYlrCH8aD1QPr92 XJKgQTZwJvYoAq5kpz7wB X-Received: by 2002:a05:6000:400e:b0:3a0:6ae3:a1a with SMTP id ffacd0b85a97d-3a08a3517damr2748285f8f.23.1745935742143; Tue, 29 Apr 2025 07:09:02 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a073c8ca72sm13769517f8f.4.2025.04.29.07.09.01 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 29 Apr 2025 07:09:01 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Hanna Reitz , Fam Zheng , Paolo Bonzini , Gerd Hoffmann , qemu-block@nongnu.org, John Snow , "Michael S. Tsirkin" , Zhao Liu , Eduardo Habkost , Jason Wang , Kevin Wolf , Yanan Wang , Marcel Apfelbaum , Dmitry Fleytman , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= Subject: [PATCH v2 07/19] hw/virtio/virtio-pci: Remove VIRTIO_PCI_FLAG_MIGRATE_EXTRA definition Date: Tue, 29 Apr 2025 16:08:13 +0200 Message-ID: <20250429140825.25964-8-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250429140825.25964-1-philmd@linaro.org> References: <20250429140825.25964-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=philmd@linaro.org; helo=mail-wr1-x435.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=unavailable 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_MIGRATE_EXTRA was only used by the hw_compat_2_4[] array, via the 'migrate-extra=true' property. We removed all machines using that array, lets remove all the code around VIRTIO_PCI_FLAG_MIGRATE_EXTRA. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé Reviewed-by: Thomas Huth --- include/hw/virtio/virtio-pci.h | 4 ---- hw/virtio/virtio-pci.c | 6 +----- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/include/hw/virtio/virtio-pci.h b/include/hw/virtio/virtio-pci.h index 31ec144509f..d39161766e0 100644 --- a/include/hw/virtio/virtio-pci.h +++ b/include/hw/virtio/virtio-pci.h @@ -32,7 +32,6 @@ DECLARE_OBJ_CHECKERS(VirtioPCIBusState, VirtioPCIBusClass, enum { VIRTIO_PCI_FLAG_BUS_MASTER_BUG_MIGRATION_BIT, VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, - VIRTIO_PCI_FLAG_MIGRATE_EXTRA_BIT, VIRTIO_PCI_FLAG_MODERN_PIO_NOTIFY_BIT, VIRTIO_PCI_FLAG_DISABLE_PCIE_BIT, VIRTIO_PCI_FLAG_PAGE_PER_VQ_BIT, @@ -57,9 +56,6 @@ enum { /* virtio version flags */ #define VIRTIO_PCI_FLAG_DISABLE_PCIE (1 << VIRTIO_PCI_FLAG_DISABLE_PCIE_BIT) -/* migrate extra state */ -#define VIRTIO_PCI_FLAG_MIGRATE_EXTRA (1 << VIRTIO_PCI_FLAG_MIGRATE_EXTRA_BIT) - /* have pio notification for modern device ? */ #define VIRTIO_PCI_FLAG_MODERN_PIO_NOTIFY \ (1 << VIRTIO_PCI_FLAG_MODERN_PIO_NOTIFY_BIT) diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 0fa8fe49556..a3e2e007d6c 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -146,9 +146,7 @@ static const VMStateDescription vmstate_virtio_pci = { static bool virtio_pci_has_extra_state(DeviceState *d) { - VirtIOPCIProxy *proxy = to_virtio_pci_proxy(d); - - return proxy->flags & VIRTIO_PCI_FLAG_MIGRATE_EXTRA; + return true; } static void virtio_pci_save_extra_state(DeviceState *d, QEMUFile *f) @@ -2349,8 +2347,6 @@ static void virtio_pci_bus_reset_hold(Object *obj, ResetType type) static const Property virtio_pci_properties[] = { DEFINE_PROP_BIT("virtio-pci-bus-master-bug-migration", VirtIOPCIProxy, flags, VIRTIO_PCI_FLAG_BUS_MASTER_BUG_MIGRATION_BIT, false), - DEFINE_PROP_BIT("migrate-extra", VirtIOPCIProxy, flags, - VIRTIO_PCI_FLAG_MIGRATE_EXTRA_BIT, true), DEFINE_PROP_BIT("modern-pio-notify", VirtIOPCIProxy, flags, VIRTIO_PCI_FLAG_MODERN_PIO_NOTIFY_BIT, false), DEFINE_PROP_BIT("x-disable-pcie", VirtIOPCIProxy, flags, From patchwork Tue Apr 29 14:08: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: 885742 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp349147wrq; Tue, 29 Apr 2025 07:15:04 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVrdcR0L8Jnyiw2r+HWt43HG1cxJd6PYDy+lDwTIXwpXUNcNQ61V5XKSYRVPe8bD+HY3LxrHg==@linaro.org X-Google-Smtp-Source: AGHT+IH8dA+GA+QW7sPGPdNhbzK7j6IoaM01SCGCWlU/Z9A0azDpm+O2NFOy7+tI2HSBVhOQkuNB X-Received: by 2002:a05:6000:2483:b0:391:31c8:ba59 with SMTP id ffacd0b85a97d-3a08ad2b7bbmr2065360f8f.4.1745936104014; Tue, 29 Apr 2025 07:15:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745936104; cv=none; d=google.com; s=arc-20240605; b=lPIJyjF5yTgHilob6pR6alKryvfLY36e84bjS2wJqbUEBPfVK9S2eoqyVRQYUPX8Sm wYPrzLJbR2G/ABJ+19xb5RjGG5jrXs4FjxDnrQETHr1kg4ZTgfkNI1Oy+Kr9QrIMi5S7 tHs0DY0HMFQR84GMfif6FQHrgMX3x50SB2vRf2ha2sijsYKcaU0uwhIMOuNf2uIzzryr X5BJuoTxdJ1cpxfdMC0fgfzsEiSsDa2TW51pts0gIiQuhlevkadnrWsz9L246QtYBZfu haLDV5jOx1+WInuDeK+dpPn8b/JSvcVaYLmmYUWU3fh2pFF3gmfJ68b9g2x6/5t7l5To 23Yg== 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=0BkDThoIzdV48soT64XeZ7dLWYwQOfmi2dWyVwZ8yvw=; fh=S6YL0dyAMbl4T7TfefFhbqa8nURDEApLVFSBl9ph+Ec=; b=DQSDjEfBDvvZNcak50p625m42W+AiG5S8HsGTqva2XqaYEVrJhlimQZLxrX9+me9YI 49qVMT54W+wbP5bfSTmIkQhvl+RQG9ANUmtU3Ek+BbArxVFDRTMRdqAkXHxHsxZ72f7O N15e6IhtCkZFIpD/Z8NPWKgfi4vUNUX04bmQublDRKWjiigMypBf3l8ZCgOZAFCX94GA yKj6+VBnDTmF1lp9V/Gh5DkrGjFkas4/fu8tbGtrm1mhd8caCL/L0CMrM3JoTwoUFBhU NUAkvKPqIYXxeG42iE046jPg1KM2sUPEaOKT0Xk1m4/YRQtIsSk/0XDNUrPOt3OlXPQL FUPg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Yak1JtEY; 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 5b1f17b1804b1-440a5304347si75543885e9.72.2025.04.29.07.15.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 29 Apr 2025 07:15: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=Yak1JtEY; 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 1u9le6-0001oG-7E; Tue, 29 Apr 2025 10:09: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 1u9le3-0001il-Vl for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:09:12 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9le2-0006Mt-6p for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:09:11 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-4394a823036so59777555e9.0 for ; Tue, 29 Apr 2025 07:09:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745935748; x=1746540548; 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=0BkDThoIzdV48soT64XeZ7dLWYwQOfmi2dWyVwZ8yvw=; b=Yak1JtEYB7/rU6ct+aGcG7Tk4IRDAmsZREb2xKrC+G64CMQYDAUB49PLQfmxo4RPqg HfYCTyAvkbkMyvYw0zH4Uh6FJy1L/F+9TXkLIeyTrmxtVXDQtGSbxGnfzrDzPv/ZnoQM hIe84wuK6Ez41+gTq7pfRrk2EPU4TOaCb1oaIsV9dQdjJ6/a5x+NrU+inqk7QntVGMi+ jkY8q53ISnoVjc1BWXObdRd2R2aiCznsksSVTtCNKoV3BDoQfayJ4VX2K6iCgyuoOKSS DUN8+qXRYc+SRSQ6NMlXrIZg+ymvSDCAQ1CTswmXUE9oASB/6cI7tDClLFoFPLQAksCg /ZoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745935748; x=1746540548; 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=0BkDThoIzdV48soT64XeZ7dLWYwQOfmi2dWyVwZ8yvw=; b=jNehzPmRxAWBeVu1bAwau+rjm0ALI7afdaOrUSORBpAIzxZmk0FmDPrX4o5wlzwBra 6FC6rFPl4H0B8v3GjkAcoqjZ4pM7xrThS6OmxEmwqJCh1+yBd4XAkQ6SzCkRND4LfGHO FKYLtko1mMcZqBPpcX+h+mR+srBbvAOp+vNDbKwhJuMcfMQYGhQdZB31/ECmwQsCnhfY TjUUZA0MlzLKAO/WJ2wLLKpl4jIiTRi16Vr9UiDrcEpuk2ziBTivKlO1IO2ibzZFl7XV L9CNzHkzj/KxfTcFRmVAsF9PCk0WDreLi4rCtI/yZP0wMp3oqfUCYvugaCMIdVu3DDPr pfjw== X-Gm-Message-State: AOJu0YwfmxW7ZRB+pzHHuy4wK8E5HXGjsLsPI8UCVChmNgo54zpv74nI vO29rx0ABG7Cayh5+Lcjr/H+ocb4OB7Y5nTHJzNK0FO3eoXwCBsjlVl2goaoiIZMkEJNgVr/9mG t X-Gm-Gg: ASbGnctNVvhxN1OpyzmrD+Mn6nNw9RoQ8fqLT38BbJZqfXU7h/te4Pxt8LyD2ESUZ0j cVLM+iAuHTs7+nVepQWWCJedfkvfF1Epq7CE30VvVpV/qj8IrFB4o0wEXZ92+zblYfKpMmeabF1 a3wHL5u8Lm5SeE1nIH+YYawXbItRole5ueQFOc2MFfyQcJvMj2JgTaBezmiQsHoKSxKHJaZyVSX fqa2hSWp79N7fRz6vbuNqFw17hKlyWDP8+4JF6EBpzFQWyvg915wDqz+N+JwSSvmYuVIcjynSsC +WTm5GcY9TbxrJpjJykAR0gBXxv/uuWyh1noy6cRG1ovx7F6ykuutqCKsvHE7SJutbtd4mTSBwW Fj+YEjzdEXa8v0gmOn8Sx X-Received: by 2002:a05:600c:1e19:b0:43d:fa59:af98 with SMTP id 5b1f17b1804b1-441ad500331mr25384995e9.33.1745935748163; Tue, 29 Apr 2025 07:09:08 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4409d2e0241sm191035395e9.37.2025.04.29.07.09.06 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 29 Apr 2025 07:09:07 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Hanna Reitz , Fam Zheng , Paolo Bonzini , Gerd Hoffmann , qemu-block@nongnu.org, John Snow , "Michael S. Tsirkin" , Zhao Liu , Eduardo Habkost , Jason Wang , Kevin Wolf , Yanan Wang , Marcel Apfelbaum , Dmitry Fleytman , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , Thomas Huth Subject: [PATCH v2 08/19] hw/virtio/virtio-pci: Remove VIRTIO_PCI_FLAG_DISABLE_PCIE definition Date: Tue, 29 Apr 2025 16:08:14 +0200 Message-ID: <20250429140825.25964-9-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250429140825.25964-1-philmd@linaro.org> References: <20250429140825.25964-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.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_DISABLE_PCIE was only used by the hw_compat_2_4[] array, via the 'x-disable-pcie=false' property. We removed all machines using that array, lets remove all the code around VIRTIO_PCI_FLAG_DISABLE_PCIE (see commit 9a4c0e220d8 for similar VIRTIO_PCI_FLAG_* enum removal). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé Reviewed-by: Thomas Huth --- include/hw/virtio/virtio-pci.h | 4 ---- hw/virtio/virtio-pci.c | 5 +---- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/include/hw/virtio/virtio-pci.h b/include/hw/virtio/virtio-pci.h index d39161766e0..f962c9116c1 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_DISABLE_PCIE_BIT, VIRTIO_PCI_FLAG_PAGE_PER_VQ_BIT, VIRTIO_PCI_FLAG_ATS_BIT, VIRTIO_PCI_FLAG_INIT_DEVERR_BIT, @@ -53,9 +52,6 @@ enum { * vcpu thread using ioeventfd for some devices. */ #define VIRTIO_PCI_FLAG_USE_IOEVENTFD (1 << VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT) -/* virtio version flags */ -#define VIRTIO_PCI_FLAG_DISABLE_PCIE (1 << VIRTIO_PCI_FLAG_DISABLE_PCIE_BIT) - /* have pio notification for modern device ? */ #define VIRTIO_PCI_FLAG_MODERN_PIO_NOTIFY \ (1 << VIRTIO_PCI_FLAG_MODERN_PIO_NOTIFY_BIT) diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index a3e2e007d6c..8d68e56641a 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -2349,8 +2349,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("x-disable-pcie", VirtIOPCIProxy, flags, - VIRTIO_PCI_FLAG_DISABLE_PCIE_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, @@ -2379,8 +2377,7 @@ static void virtio_pci_dc_realize(DeviceState *qdev, Error **errp) VirtIOPCIProxy *proxy = VIRTIO_PCI(qdev); PCIDevice *pci_dev = &proxy->pci_dev; - if (!(proxy->flags & VIRTIO_PCI_FLAG_DISABLE_PCIE) && - virtio_pci_modern(proxy)) { + if (virtio_pci_modern(proxy)) { pci_dev->cap_present |= QEMU_PCI_CAP_EXPRESS; } From patchwork Tue Apr 29 14:08: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: 885734 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp346406wrq; Tue, 29 Apr 2025 07:10:49 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUHh1/Yi59MkSfhJl9alzPgFGVsxdJ3wG/KKUaVx2NLQFqAyjy1G6zuTwW8IRv8djj9+WzW7g==@linaro.org X-Google-Smtp-Source: AGHT+IGhNkk0InL6sEKcRB9PFnI5BkBhTqT9RLwWtEw3FmoklJ6R4RcvvfZq9zNZ9hLGGbAxzlWs X-Received: by 2002:a05:6402:254b:b0:5f6:20c4:3b0e with SMTP id 4fb4d7f45d1cf-5f7395ebbc4mr10739199a12.8.1745935849609; Tue, 29 Apr 2025 07:10:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745935849; cv=none; d=google.com; s=arc-20240605; b=P32KmNBr7eW/S4N1I+dscaE88+BnDn0aywpkri0K4nm3uTpb5i6378aXWEZdp3fil3 BShNGU20RiC1CM2T/rse6eMPq+fbVGNqdliw71mh8Zp8X1/QfD/HdDqokj7Qi83hVHJP /3lKgJuPfmH+3Ki0aAl2VuxEMi4/dQUgXnNbWZf2VOmup5kGgruA0G6Mp/kZza1yWZto ioVzoZCxJalius2DBRg8mk6OEJlXQrVJ0yOcgHI7/cadnFsrLoj9bu574e8Z8PO1zf9Y 4yN5uWsI8+eBqWZEvAFJoT4H90KSBIIoNO2nQZp7J/EV94m5/pR2j5q971LOJ0d+noxz vUgg== 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=0i+gB4qGYdD+t3Cj9VGzIhWK4paiq4kBCZvxw2YhKv4=; fh=g4s2jU8t/W1wGraKJcf4drMIpLYu/oWYTROkTdMMVGc=; b=CjaBMpFt67i0e6Yp7SMimRUZ5T4BLESpt73nJ1ws0+haHEnnkPFTDNMRfHTSs8okZm +To3AvCo45Vb2dgHzfZqb0gHCuM/3bi9TNv21V0c5TGayqIxnt8VGsqwGYI4T1JmuVTY Ojtab6jxpwYa62qa52NfrbXfFKBv/T54Hs6hq9MWnPtRIb8imfxEwG2ptZoughCx0g8i pidupz6y9lFixERNY4n6cKAWkR6gMl4+5fFWNBxAsQsZb/YhNyeIN93TxMvtzLPClOOx sLhG9bQdLISzDlbjatR1rdItO0Hl2MRSCTK3c32YANHh+VRMzXQZ9CeNwJJLgapVLkHN e/Wg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=AWamMWce; 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 4fb4d7f45d1cf-5f85d00a1c1si563704a12.413.2025.04.29.07.10.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 29 Apr 2025 07:10:49 -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=AWamMWce; 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 1u9leA-0001wC-2v; Tue, 29 Apr 2025 10:09:18 -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 1u9le9-0001uk-5o for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:09:17 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9le7-0006Ny-9x for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:09:16 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-43cfba466b2so57378335e9.3 for ; Tue, 29 Apr 2025 07:09:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745935753; x=1746540553; 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=0i+gB4qGYdD+t3Cj9VGzIhWK4paiq4kBCZvxw2YhKv4=; b=AWamMWcetZW6oWOSg6f+eiFcrLXxTQS65YvJ7uudA9xkmVl94sHeuYBP9jUae1NkeO 9/26/1mesyVITacWPthZts7lqmjH+Hjqqs+/H/VTmQ1jHf3DPv4mpJZzEtb1OwumSP9Q CxdiCprJL/EZ8HMduF56aK/4MqIc5y4oXEs/eWPKHy8taM0K4KSMeLIIQh6iAPlmnRKY mI1KpNjZo83dyRl51a7LZeXuu/pniypxk9fjDCeBhzlSmUV3oYfsiPCRmNMqpV03oSu5 f/w9Uh+uvIzyPs5N3MMohfKs6Tq5tDtj9zTpsztqW3Ydi4a+11G7VCHEFhQJOtS3Jtk/ wgsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745935753; x=1746540553; 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=0i+gB4qGYdD+t3Cj9VGzIhWK4paiq4kBCZvxw2YhKv4=; b=wVbeoT7XaOz1h9BWwfINe45ur8qj77dZeGHVFC9nBDxVcfH0iEWE4amaoVN+z+ngQa 77yV0ZZJqrjvInf+2yfz7Cx4TRFyBPjKajmxR6ipHBuKLUUyGs4cHA55pvvZQqFFckuO JPtBonSIK8vHb/V/nW2FtO0BBxtTpA+Dv6RQr8WyP1G+/ss6qaKXdZQyB9cwHO6CZ38b ODk8fuvG3GlezQcfYllZvqRSYit9my3KLPYGqKr3JBamQmIWdNU7lUefPXQLo0IV0t06 FBm0relHSrK6itKX5+wF+A5wsBu2PAwKpIf8F0NV4GWmhXSh6aGv92Nt45xbSCqCmKEN zd2Q== X-Gm-Message-State: AOJu0Yy/EiYcTdhcbqyO6OSAxGtxQL9siPBov1Hpbb3C/9iWPcOVwGG2 mk8PMyanzgPBCi4R7199O3Ly/K21/Ejd5NVkazGIFsddoN/cLrxOtwxl0+DjmCx2iGEv891T/mg s X-Gm-Gg: ASbGncuZO+JZ1Vct+P1zpSzCQoduV31Xr9YGZKnJ6Wb9gWafkrfVw+ILELdjaXlVYc+ Gq0jIym7M/P9eJe3a5b53qpfefj3+ZXwFVAp65SU8XJ/m8QTR9vofbgrsCm1uhKHMBraBBsCBg6 DESGnieFQEzGOTZpKtJKMY2PSoHvEI6PTO1Sxe+CuHIdes/KwjYLeyDwaGtLic4zVQffCH4NnfK xgHrBh5s/NHp7gaCdHkLtiXGeyJIrP+ZQqRlzRnvctS+VfZUlKGeYrGEZEvXBPP/YPWQrRNccAl TaRR+WuVuRzetbdTfOW3cCkcCVY8WwVK9fwtZeA5bqnBAh8RpiNfodCwxezJ3OSOE0PB41lFKI7 7AnTq4PBPSFLIhJUwLqnWpIrf4/AkVDo= X-Received: by 2002:a05:6000:400c:b0:3a0:88e4:3d2f with SMTP id ffacd0b85a97d-3a088e43d58mr3313540f8f.5.1745935753110; Tue, 29 Apr 2025 07:09:13 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a073ca4742sm13810924f8f.23.2025.04.29.07.09.11 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 29 Apr 2025 07:09:12 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Hanna Reitz , Fam Zheng , Paolo Bonzini , Gerd Hoffmann , qemu-block@nongnu.org, John Snow , "Michael S. Tsirkin" , Zhao Liu , Eduardo Habkost , Jason Wang , Kevin Wolf , Yanan Wang , Marcel Apfelbaum , Dmitry Fleytman , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= Subject: [PATCH v2 09/19] hw/i386/pc: Remove deprecated pc-q35-2.5 and pc-i440fx-2.5 machines Date: Tue, 29 Apr 2025 16:08:15 +0200 Message-ID: <20250429140825.25964-10-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250429140825.25964-1-philmd@linaro.org> References: <20250429140825.25964-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.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. Remove the now unused empty pc_compat_2_5[] array. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé --- include/hw/i386/pc.h | 3 --- hw/i386/pc.c | 3 --- hw/i386/pc_piix.c | 13 ------------- hw/i386/pc_q35.c | 13 ------------- 4 files changed, 32 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index b34aa25fdce..79b72c54dd3 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -298,9 +298,6 @@ extern const size_t pc_compat_2_7_len; extern GlobalProperty pc_compat_2_6[]; extern const size_t pc_compat_2_6_len; -extern GlobalProperty pc_compat_2_5[]; -extern const size_t pc_compat_2_5_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 2b46714a5ac..cb375aabdc5 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -259,9 +259,6 @@ GlobalProperty pc_compat_2_6[] = { }; const size_t pc_compat_2_6_len = G_N_ELEMENTS(pc_compat_2_6); -GlobalProperty pc_compat_2_5[] = {}; -const size_t pc_compat_2_5_len = G_N_ELEMENTS(pc_compat_2_5); - /* * @PC_FW_DATA: * Size of the chunk of memory at the top of RAM for the BIOS ACPI tables diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 04213b45b44..7a62bb06500 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -778,19 +778,6 @@ static void pc_i440fx_machine_2_6_options(MachineClass *m) DEFINE_I440FX_MACHINE(2, 6); -static void pc_i440fx_machine_2_5_options(MachineClass *m) -{ - X86MachineClass *x86mc = X86_MACHINE_CLASS(m); - - pc_i440fx_machine_2_6_options(m); - x86mc->save_tsc_khz = false; - m->legacy_fw_cfg_order = 1; - compat_props_add(m->compat_props, hw_compat_2_5, hw_compat_2_5_len); - compat_props_add(m->compat_props, pc_compat_2_5, pc_compat_2_5_len); -} - -DEFINE_I440FX_MACHINE(2, 5); - #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 47e12602413..33211b1876f 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -672,16 +672,3 @@ static void pc_q35_machine_2_6_options(MachineClass *m) } DEFINE_Q35_MACHINE(2, 6); - -static void pc_q35_machine_2_5_options(MachineClass *m) -{ - X86MachineClass *x86mc = X86_MACHINE_CLASS(m); - - pc_q35_machine_2_6_options(m); - x86mc->save_tsc_khz = false; - m->legacy_fw_cfg_order = 1; - compat_props_add(m->compat_props, hw_compat_2_5, hw_compat_2_5_len); - compat_props_add(m->compat_props, pc_compat_2_5, pc_compat_2_5_len); -} - -DEFINE_Q35_MACHINE(2, 5); From patchwork Tue Apr 29 14:08: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: 885730 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp345680wrq; Tue, 29 Apr 2025 07:09:45 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVytwgh9uLsi0G+3ERwyEnMH+nq7DzESiY7SzL1unZH0Rpglu6nx3+wo/Szw2p5XmaaD5yQ7g==@linaro.org X-Google-Smtp-Source: AGHT+IFRzVHJO7SIb+kVId47L8sT1zqVVUg0WH3xyNMNGLUFVGt6F+9eH30Pjyam1IPGKfaV/IiL X-Received: by 2002:a17:907:9803:b0:ace:4fcf:702b with SMTP id a640c23a62f3a-ace8493cc4emr1171708566b.28.1745935785428; Tue, 29 Apr 2025 07:09:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745935785; cv=none; d=google.com; s=arc-20240605; b=Krz7kSb3pcVaI7+k+5FRdkewgKEKwfeAIADvEWumwIq0nHNaqDEqzZtIptKmN9PC09 uG3zJggqMIegHPYOpOOu9YhOGOfiX2w70tLRY0c7oE3txUAXokXJxZ3C+jfzdXKj9Gqy 4GSFAbny6e/XbHvvVGIi+clmjpt3mhapX5NlbOO2iQkbb9MxWppqDrFUJgBL8P/AGq1b Xt6l3uaa2RigfD0ZzGrMtjgqvSXWs8o8BQYe5/yncGUj1W153CKCLs1y/0JtlQuk1h+v 4tUwNQNOZLeyjMcRYwwmLXvnp6UfHVfxcXSAyWe+70OSYYSiYCsVaqhaLz3Qwr806vWS +qYg== 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=Q1RXK9TNZCyuKZFLBANjjuVrJLcCqvX//mQ8ZqVm0L0=; fh=S6YL0dyAMbl4T7TfefFhbqa8nURDEApLVFSBl9ph+Ec=; b=hxtnne7XrsAJQcaYX8uVveJfhFjNnA6ihdEXX77Wwm1Kys8oBWZXTVeFCjicGtyS1B If6zw7hdGHcfsnM+Hfqxhbel+PnVrJqUtN8Ur+PclxigfXJkOyMHbCmxvEjtAE5m0hun dNpgteDjAuwNhExdypNeI/ZsqnAmEIQtLcqUFOhl1PMNmK2U5lbW9gqNaqo3XKtvQLjF kDU05C7kqzS/6VSNxEZeOtpziyMKwm1vbpGDF2FyIwgmUqveDyy1sfuwD7Eaw7fOeGOv GU4VmL5s59gwpyz7rKvO5rsQQ++nFd8Ah0pAJeLeEYwoTebcxhWMuYz09fLHYpn7cVma W0kw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dydThUFY; 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 a640c23a62f3a-ace6ec60619si660178166b.824.2025.04.29.07.09.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 29 Apr 2025 07:09:45 -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=dydThUFY; 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 1u9leG-0002QF-5I; Tue, 29 Apr 2025 10:09: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 1u9leD-0002CF-Nb for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:09:21 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9leB-0006P0-U2 for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:09:21 -0400 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-39c13fa05ebso4003758f8f.0 for ; Tue, 29 Apr 2025 07:09:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745935758; x=1746540558; 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=Q1RXK9TNZCyuKZFLBANjjuVrJLcCqvX//mQ8ZqVm0L0=; b=dydThUFYkRoJ5BnwDxTmJW4NgYqNaZ9RvtGaNLVIjXKKKzmunDf6ykEwfk+nYRlYTF pF6CtjahKPspfE07J9Y1cpY445J3ks9KIY3z4vA70HtBkHB/9QpobzAC+pQmZQz7/TaB mtqAHiE8M1SQtn95xpUxObvDQ4+75ILaQMOEdBXMSR4W0AwacPFGefBSmGLTvRJ/xICa fiC06jOrD+xqsioV1s6vNHaP6b8TSeyjDjHgBVxHSCiC3xteRSVco3NGVf1nN8P84wx7 VPpLwwRPc6NjevlYj1/zcemHrpk1BSBv1hQZCrYT7zD1KwcfV38dOmQji1aTASkT13jJ O/rA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745935758; x=1746540558; 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=Q1RXK9TNZCyuKZFLBANjjuVrJLcCqvX//mQ8ZqVm0L0=; b=O0OVAS1DFXWPHqW2dbjTbIGHRDWqKnQxjmpJp/KF6gsbIscKItyxLfRaWNBHghbtTV t8SZYexXdB6/OXkT2XQf5W4X22UbI/xm/yJCGDr4/Ws6eK60tSFuqleSM0REFogx5szv E7A6ifzDE2kd6gflmWKNzGOtLE/Q9wCXn3AV/oVOnU0/AcoMKBAh1h2IKoCSrR9XSM8x GOYbp/hD3T1iFPQp5oMgPyotClWFv1Zhj11qYZOm0N7feiBLmlPBWTvTuS2c6ViPY7mB ielH3S/nvWNlSEIPbkdb9jiRVWFrW/e1SRiQgC43EOPTMpQvq+SZ+cDV1II86P4GjY3+ XX4Q== X-Gm-Message-State: AOJu0Yxiy0zwHQtVyFJd9YVVv5QiqFX3/jMfDUiN88XfGfToO+i7IOQL HTkuud62so5B084AM+PJNupjmqE1oa6vTWfbXqVCVVFc77mujmeuFGQx/nnSFFb4SASerCH3de7 B X-Gm-Gg: ASbGncv2jpDES0VggDf0SHnCqf0thkjUYXth7+fEaITxkFzlkjZ85fuoKonl0C5bgsB z6VcT2JkEshrWKROlN6EWXhymLWU6gLcI9NXipAM7lhF4+VZsenZlHKhabXHIZAMoE5MaJZSCfS LCfXBvbKPBlGfuWHGOEoHQSb3hHLAKZ7BhvAka6d9XcQrFk7rucDADTQhDyDrW7NlbOsMs1MKlf IwBB7AMVmv/QxDGfwNiCv6ifCZ78EQ0AIJB82tbdTVScf+WtX1rYV24+gVbBUHVbF/fo3YxJl8R jFMB5Ix/qlji0mPr8ZxTTrs8sDu6mcaTSCwBmn/S2BEBcDi03Twkb/4OcEJ+J5fou8pp+LrS1WR O5VAeW/+wGMLcZNJCNili X-Received: by 2002:a5d:64c6:0:b0:3a0:80dd:16d5 with SMTP id ffacd0b85a97d-3a080dd1760mr8316018f8f.55.1745935758033; Tue, 29 Apr 2025 07:09:18 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a073e4698csm14136643f8f.62.2025.04.29.07.09.16 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 29 Apr 2025 07:09:17 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Hanna Reitz , Fam Zheng , Paolo Bonzini , Gerd Hoffmann , qemu-block@nongnu.org, John Snow , "Michael S. Tsirkin" , Zhao Liu , Eduardo Habkost , Jason Wang , Kevin Wolf , Yanan Wang , Marcel Apfelbaum , Dmitry Fleytman , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , Thomas Huth Subject: [PATCH v2 10/19] hw/i386/x86: Remove X86MachineClass::save_tsc_khz field Date: Tue, 29 Apr 2025 16:08:16 +0200 Message-ID: <20250429140825.25964-11-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250429140825.25964-1-philmd@linaro.org> References: <20250429140825.25964-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=philmd@linaro.org; helo=mail-wr1-x429.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=unavailable 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::save_tsc_khz boolean was only used by the pc-q35-2.5 and pc-i440fx-2.5 machines, which got removed. Remove it and simplify tsc_khz_needed(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé Reviewed-by: Thomas Huth --- include/hw/i386/x86.h | 5 ----- hw/i386/x86.c | 1 - target/i386/machine.c | 5 ++--- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/include/hw/i386/x86.h b/include/hw/i386/x86.h index 258b1343a16..fc460b82f82 100644 --- a/include/hw/i386/x86.h +++ b/include/hw/i386/x86.h @@ -27,13 +27,8 @@ #include "qom/object.h" struct X86MachineClass { - /*< private >*/ MachineClass parent; - /*< public >*/ - - /* TSC rate migration: */ - bool save_tsc_khz; /* use DMA capable linuxboot option rom */ bool fwcfg_dma_enabled; /* CPU and apic information: */ diff --git a/hw/i386/x86.c b/hw/i386/x86.c index e2d04092992..f80533df1c5 100644 --- a/hw/i386/x86.c +++ b/hw/i386/x86.c @@ -382,7 +382,6 @@ static void x86_machine_class_init(ObjectClass *oc, const void *data) 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->save_tsc_khz = true; x86mc->fwcfg_dma_enabled = true; nc->nmi_monitor_handler = x86_nmi; diff --git a/target/i386/machine.c b/target/i386/machine.c index 6cb561c6322..dd2dac1d443 100644 --- a/target/i386/machine.c +++ b/target/i386/machine.c @@ -1060,9 +1060,8 @@ static bool tsc_khz_needed(void *opaque) { X86CPU *cpu = opaque; CPUX86State *env = &cpu->env; - MachineClass *mc = MACHINE_GET_CLASS(qdev_get_machine()); - X86MachineClass *x86mc = X86_MACHINE_CLASS(mc); - return env->tsc_khz && x86mc->save_tsc_khz; + + return env->tsc_khz; } static const VMStateDescription vmstate_tsc_khz = { From patchwork Tue Apr 29 14:08: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: 885743 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp349221wrq; Tue, 29 Apr 2025 07:15:10 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX4K/KIVWboBRUfUYr7dSfO59B7cKKuvI94gPJkKhCjqBnW7g0N8fJATN9LyxeDmblD+3goXw==@linaro.org X-Google-Smtp-Source: AGHT+IFveOkikySZl1SLbv0toh2RRCuQeHo1DoQ7lOwNs7LnAFCmZmJh7fM+ENQ+xuAkphuhqw+F X-Received: by 2002:a05:600c:4f45:b0:43c:fffc:7855 with SMTP id 5b1f17b1804b1-440ab7d291bmr141163785e9.15.1745936110129; Tue, 29 Apr 2025 07:15:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745936110; cv=none; d=google.com; s=arc-20240605; b=EzwuOX3q3G1u2nbvYz7fWGms8nsqbLuR1YSkCPvjv2o/NqBXQsfT9B+QCLxHwg3P5x gm+JmX9Tpm5igFOJ+SmTNrd9lP2pht3/SjhvCF+zFuC/RQ9JVALf6cGoEvGhRCxt+1v3 dUvekxCcqkfSTODqvGYa97jH9kru1sQOuJcFlzqTHbzcgD0CuuzIns8c5cNOksMVgd+M dXzJs+AzMuJT7gZnAqx61bHK05m8+c7f/zvpB1cOPAteRYZYouWo00EzUziDFgfLcUK9 NzPpFz+JXLBC9bfaxQs0Ub5YtcFqjoia2ksVNU42UD+N0ZNwh7zrX5QhvmN+NPdrOW8c di1g== 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=lOi5amPs94CRFUHcijuRRBsiadMoOd81cUGdXDypUyk=; fh=g4s2jU8t/W1wGraKJcf4drMIpLYu/oWYTROkTdMMVGc=; b=hf7aUuvIsToP12h0Ij0Jd5TsGNpQ0JtvplGh9TgIBdQwf3jVPXFbVCtCtH88Hj8yEH nn/cl7wSom/uTQ778HxpO4xhCJtWUjmFjEPcf7+CpXqX7U1cseDz2VvXpI+H9TGPucd2 KRSvO04QxhaiSWPEB3PFWh03K+khU8yUTLJFzpktCAMLszlVlKzeg/qVqrOYbB9on0XS jb3/Y0F1sc3wt6evT+G3ksrRknQGq174HMK5Tv3JcfnA5acuy/sS3tD0ixNFK9WGrUCT bcCYzFp9TZbAlGUivDg66KF4CQlo9NBkNXYgOUWd5++eiDpYhzEOMwSN7QQWhRA7JYMv gaXg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=K1K9VUE1; 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 5b1f17b1804b1-440a52f8b74si76488675e9.8.2025.04.29.07.15.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 29 Apr 2025 07:15:10 -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=K1K9VUE1; 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 1u9leM-0002qy-F5; Tue, 29 Apr 2025 10:09:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u9leK-0002l1-FU for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:09:28 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9leH-0006Q0-7z for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:09:28 -0400 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-39c0e0bc733so5546191f8f.1 for ; Tue, 29 Apr 2025 07:09:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745935763; x=1746540563; 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=lOi5amPs94CRFUHcijuRRBsiadMoOd81cUGdXDypUyk=; b=K1K9VUE1bcmhTtLU1HmEnnbRXvg/32oENTtmOFcjzhpukx79kM0NwLR8kf9ZHZGO4r PBVXFfd4oPbuaAmSKWrWijtSUGAv+FLC5A1Eyiow8MsOs9JapA2RdDg8019H4iaJGbIo SNpG85wCT2gIGuNhGYx+2s8MW4VWGGOMfm/h/OWzQ1Bmmv1nrYoxEXxEMV9gc9O/AWbI nMY/F2MKVoIlaIyF1ZUptZTlHZy2DBkPkGaHVl4ujfqVWp0KlL8JNN/5ZFNggQofUQsr G4G9SHRbLe9Z+pOQ5g4saOjUpEYi78OAbcCnJB5fp06LuwA0mKbxXbrGYx7qngoiA49o rmyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745935763; x=1746540563; 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=lOi5amPs94CRFUHcijuRRBsiadMoOd81cUGdXDypUyk=; b=okEdtwDf+j5hg3FRdh7aYE4NppXhG8K3ZsHz4DzowiNP1USSl4bxML0abcd+ZAEq1I L7e9nN4HGWxkEOihCqdmUricZbaLeb7tOIrdhxkiEsx7s19zxnFlH0z48NQt2KTlib3Y QevacYLvV+QlSlrt4Tb9gze/M79FeK4A6wu87HsjeqBH/S76IDxzgmjjm8Nx/JcT9Iwe 3cUkZiqxVJPROInVoXkVWpYfo549rPSKiMxkwA9nME6dtH2HWEs1XBady4mfve5O4IvZ Twz1Ai43ZghSsbMvmeRsN8xqaVGvQ0aCKLgG5M7KCgVzGCvAAa/YJgkYZ6mpPrHwA9zA hutw== X-Gm-Message-State: AOJu0YyBBqALLFVaR+bZbharYnBd57GeGtUdXpVX8jWQTEn9uBqBqT+L bJ9CURdcX5em729iHLueYzN0YxJMS4x50HzJ4ppgT4/4Mnt0pFKyvBWVtyGoHWVc8r7+ZDeAhlD O X-Gm-Gg: ASbGnctWc8BLUEsdPQZzNC4Iigxwmi4euMqR8gVPSgg3Xw8rUq/Wml5kru0BPDsTVQG DXfdFRJnZ9rldseN5vFmhif2BJ4vXamC24G1zcSBDgNAS+Cguxcrx+bz3TjFz/zc74dh7prlfwC rxrl5CFGz7hxoZefTjkfktLUf/CUepMFdGndwh/QLgnFO3vOsuzzx1gjpWF5DbTWR6elR2dd3Hs Zre4oIcgab8jaFHDJev/zToa866E3d1cW2d6z9s9Uz6gYSRhawpnJ8ugZf5d1kz+/qzY1zLxjAp l9uU6/+KqUZjyUGGeCwWi8s2tIdD3/kJREaV+yQbn+h7jPYut4VWTrtFgmjif4x8OyADiz/Ycsg FnQQ7cQKGD7NvFknQDlLy X-Received: by 2002:a05:6000:250f:b0:399:6dd9:9f40 with SMTP id ffacd0b85a97d-3a07aa5feedmr12956485f8f.9.1745935763112; Tue, 29 Apr 2025 07:09:23 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a073cbede5sm13908310f8f.49.2025.04.29.07.09.21 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 29 Apr 2025 07:09:22 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Hanna Reitz , Fam Zheng , Paolo Bonzini , Gerd Hoffmann , qemu-block@nongnu.org, John Snow , "Michael S. Tsirkin" , Zhao Liu , Eduardo Habkost , Jason Wang , Kevin Wolf , Yanan Wang , Marcel Apfelbaum , Dmitry Fleytman , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= Subject: [PATCH v2 11/19] hw/nvram/fw_cfg: Remove legacy FW_CFG_ORDER_OVERRIDE Date: Tue, 29 Apr 2025 16:08:17 +0200 Message-ID: <20250429140825.25964-12-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250429140825.25964-1-philmd@linaro.org> References: <20250429140825.25964-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=philmd@linaro.org; helo=mail-wr1-x42c.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=unavailable 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 MachineClass::legacy_fw_cfg_order boolean was only used by the pc-q35-2.5 and pc-i440fx-2.5 machines, which got removed. Remove it along with: - FW_CFG_ORDER_OVERRIDE_* definitions - fw_cfg_set_order_override() - fw_cfg_reset_order_override() - fw_cfg_order[] - rom_set_order_override() - rom_reset_order_override() Simplify CLI and pc_vga_init() / pc_nic_init(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé --- include/hw/boards.h | 3 +- include/hw/loader.h | 2 - include/hw/nvram/fw_cfg.h | 10 ---- hw/core/loader.c | 14 ----- hw/i386/pc.c | 7 +-- hw/nvram/fw_cfg.c | 109 +++----------------------------------- system/vl.c | 5 -- 7 files changed, 9 insertions(+), 141 deletions(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index 5c4e3d2a2cd..5dc5e3b547d 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -286,8 +286,7 @@ struct MachineClass { no_parallel:1, no_floppy:1, no_cdrom:1, - pci_allow_0_address:1, - legacy_fw_cfg_order:1; + pci_allow_0_address:1; bool auto_create_sdcard; bool is_default; const char *default_machine_opts; diff --git a/include/hw/loader.h b/include/hw/loader.h index d280dc33e96..c96b5e141c6 100644 --- a/include/hw/loader.h +++ b/include/hw/loader.h @@ -270,8 +270,6 @@ int rom_add_elf_program(const char *name, GMappedFile *mapped_file, void *data, AddressSpace *as); int rom_check_and_register_reset(void); void rom_set_fw(FWCfgState *f); -void rom_set_order_override(int order); -void rom_reset_order_override(void); /** * rom_transaction_begin: diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h index 47578ccc7f2..d41b9328fd1 100644 --- a/include/hw/nvram/fw_cfg.h +++ b/include/hw/nvram/fw_cfg.h @@ -42,14 +42,6 @@ struct FWCfgDataGeneratorClass { typedef struct fw_cfg_file FWCfgFile; -#define FW_CFG_ORDER_OVERRIDE_VGA 70 -#define FW_CFG_ORDER_OVERRIDE_NIC 80 -#define FW_CFG_ORDER_OVERRIDE_USER 100 -#define FW_CFG_ORDER_OVERRIDE_DEVICE 110 - -void fw_cfg_set_order_override(FWCfgState *fw_cfg, int order); -void fw_cfg_reset_order_override(FWCfgState *fw_cfg); - typedef struct FWCfgFiles { uint32_t count; FWCfgFile f[]; @@ -75,8 +67,6 @@ struct FWCfgState { uint32_t cur_offset; Notifier machine_ready; - int fw_cfg_order_override; - bool dma_enabled; dma_addr_t dma_addr; AddressSpace *dma_as; diff --git a/hw/core/loader.c b/hw/core/loader.c index b792a54bb02..e7056ba4bd3 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -1333,20 +1333,6 @@ void rom_set_fw(FWCfgState *f) fw_cfg = f; } -void rom_set_order_override(int order) -{ - if (!fw_cfg) - return; - fw_cfg_set_order_override(fw_cfg, order); -} - -void rom_reset_order_override(void) -{ - if (!fw_cfg) - return; - fw_cfg_reset_order_override(fw_cfg); -} - void rom_transaction_begin(void) { Rom *rom; diff --git a/hw/i386/pc.c b/hw/i386/pc.c index cb375aabdc5..49632b69d29 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1033,7 +1033,6 @@ DeviceState *pc_vga_init(ISABus *isa_bus, PCIBus *pci_bus) { DeviceState *dev = NULL; - rom_set_order_override(FW_CFG_ORDER_OVERRIDE_VGA); if (pci_bus) { PCIDevice *pcidev = pci_vga_init(pci_bus); dev = pcidev ? &pcidev->qdev : NULL; @@ -1041,7 +1040,7 @@ DeviceState *pc_vga_init(ISABus *isa_bus, PCIBus *pci_bus) ISADevice *isadev = isa_vga_init(isa_bus); dev = isadev ? DEVICE(isadev) : NULL; } - rom_reset_order_override(); + return dev; } @@ -1231,8 +1230,6 @@ void pc_nic_init(PCMachineClass *pcmc, ISABus *isa_bus, PCIBus *pci_bus) bool default_is_ne2k = g_str_equal(mc->default_nic, TYPE_ISA_NE2000); NICInfo *nd; - rom_set_order_override(FW_CFG_ORDER_OVERRIDE_NIC); - while ((nd = qemu_find_nic_info(TYPE_ISA_NE2000, default_is_ne2k, NULL))) { pc_init_ne2k_isa(isa_bus, nd, &error_fatal); } @@ -1241,8 +1238,6 @@ void pc_nic_init(PCMachineClass *pcmc, ISABus *isa_bus, PCIBus *pci_bus) if (pci_bus) { pci_init_nic_devices(pci_bus, mc->default_nic); } - - rom_reset_order_override(); } void pc_i8259_create(ISABus *isa_bus, qemu_irq *i8259_irqs) diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 237b9f7d1fe..54cfa07d3f5 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -817,62 +817,6 @@ void fw_cfg_modify_i64(FWCfgState *s, uint16_t key, uint64_t value) g_free(old); } -void fw_cfg_set_order_override(FWCfgState *s, int order) -{ - assert(s->fw_cfg_order_override == 0); - s->fw_cfg_order_override = order; -} - -void fw_cfg_reset_order_override(FWCfgState *s) -{ - assert(s->fw_cfg_order_override != 0); - s->fw_cfg_order_override = 0; -} - -/* - * This is the legacy order list. For legacy systems, files are in - * the fw_cfg in the order defined below, by the "order" value. Note - * that some entries (VGA ROMs, NIC option ROMS, etc.) go into a - * specific area, but there may be more than one and they occur in the - * order that the user specifies them on the command line. Those are - * handled in a special manner, using the order override above. - * - * For non-legacy, the files are sorted by filename to avoid this kind - * of complexity in the future. - * - * This is only for x86, other arches don't implement versioning so - * they won't set legacy mode. - */ -static struct { - const char *name; - int order; -} fw_cfg_order[] = { - { "etc/boot-menu-wait", 10 }, - { "bootsplash.jpg", 11 }, - { "bootsplash.bmp", 12 }, - { "etc/boot-fail-wait", 15 }, - { "etc/smbios/smbios-tables", 20 }, - { "etc/smbios/smbios-anchor", 30 }, - { "etc/e820", 40 }, - { "etc/reserved-memory-end", 50 }, - { "genroms/kvmvapic.bin", 55 }, - { "genroms/linuxboot.bin", 60 }, - { }, /* VGA ROMs from pc_vga_init come here, 70. */ - { }, /* NIC option ROMs from pc_nic_init come here, 80. */ - { "etc/system-states", 90 }, - { }, /* User ROMs come here, 100. */ - { }, /* Device FW comes here, 110. */ - { "etc/extra-pci-roots", 120 }, - { "etc/acpi/tables", 130 }, - { "etc/table-loader", 140 }, - { "etc/tpm/log", 150 }, - { "etc/acpi/rsdp", 160 }, - { "bootorder", 170 }, - { "etc/msr_feature_control", 180 }, - -#define FW_CFG_ORDER_OVERRIDE_LAST 200 -}; - /* * Any sub-page size update to these table MRs will be lost during migration, * as we use aligned size in ram_load_precopy() -> qemu_ram_resize() path. @@ -890,29 +834,6 @@ static void fw_cfg_acpi_mr_save(FWCfgState *s, const char *filename, size_t len) } } -static int get_fw_cfg_order(FWCfgState *s, const char *name) -{ - int i; - - if (s->fw_cfg_order_override > 0) { - return s->fw_cfg_order_override; - } - - for (i = 0; i < ARRAY_SIZE(fw_cfg_order); i++) { - if (fw_cfg_order[i].name == NULL) { - continue; - } - - if (strcmp(name, fw_cfg_order[i].name) == 0) { - return fw_cfg_order[i].order; - } - } - - /* Stick unknown stuff at the end. */ - warn_report("Unknown firmware file in legacy mode: %s", name); - return FW_CFG_ORDER_OVERRIDE_LAST; -} - void fw_cfg_add_file_callback(FWCfgState *s, const char *filename, FWCfgCallback select_cb, FWCfgWriteCallback write_cb, @@ -921,7 +842,6 @@ void fw_cfg_add_file_callback(FWCfgState *s, const char *filename, { int i, index, count; size_t dsize; - MachineClass *mc = MACHINE_GET_CLASS(qdev_get_machine()); int order = 0; if (!s->files) { @@ -933,22 +853,10 @@ void fw_cfg_add_file_callback(FWCfgState *s, const char *filename, count = be32_to_cpu(s->files->count); assert(count < fw_cfg_file_slots(s)); - /* Find the insertion point. */ - if (mc->legacy_fw_cfg_order) { - /* - * Sort by order. For files with the same order, we keep them - * in the sequence in which they were added. - */ - order = get_fw_cfg_order(s, filename); - for (index = count; - index > 0 && order < s->entry_order[index - 1]; - index--); - } else { - /* Sort by file name. */ - for (index = count; - index > 0 && strcmp(filename, s->files->f[index - 1].name) < 0; - index--); - } + /* Find the insertion point, sorting by file name. */ + for (index = count; + index > 0 && strcmp(filename, s->files->f[index - 1].name) < 0; + index--); /* * Move all the entries from the index point and after down one @@ -1058,7 +966,6 @@ bool fw_cfg_add_file_from_generator(FWCfgState *s, static void fw_cfg_machine_reset(void *opaque) { - MachineClass *mc = MACHINE_GET_CLASS(qdev_get_machine()); FWCfgState *s = opaque; void *ptr; size_t len; @@ -1068,11 +975,9 @@ static void fw_cfg_machine_reset(void *opaque) ptr = fw_cfg_modify_file(s, "bootorder", (uint8_t *)buf, len); g_free(ptr); - if (!mc->legacy_fw_cfg_order) { - buf = get_boot_devices_lchs_list(&len); - ptr = fw_cfg_modify_file(s, "bios-geometry", (uint8_t *)buf, len); - g_free(ptr); - } + buf = get_boot_devices_lchs_list(&len); + ptr = fw_cfg_modify_file(s, "bios-geometry", (uint8_t *)buf, len); + g_free(ptr); } static void fw_cfg_machine_ready(struct Notifier *n, void *data) diff --git a/system/vl.c b/system/vl.c index 520956f4a19..dedd555eb87 100644 --- a/system/vl.c +++ b/system/vl.c @@ -1191,10 +1191,7 @@ static int parse_fw_cfg(void *opaque, QemuOpts *opts, Error **errp) return -1; } } - /* For legacy, keep user files in a specific global order. */ - fw_cfg_set_order_override(fw_cfg, FW_CFG_ORDER_OVERRIDE_USER); fw_cfg_add_file(fw_cfg, name, buf, size); - fw_cfg_reset_order_override(fw_cfg); return 0; } @@ -2744,7 +2741,6 @@ static void qemu_create_cli_devices(void) } /* init generic devices */ - rom_set_order_override(FW_CFG_ORDER_OVERRIDE_DEVICE); qemu_opts_foreach(qemu_find_opts("device"), device_init_func, NULL, &error_fatal); QTAILQ_FOREACH(opt, &device_opts, next) { @@ -2755,7 +2751,6 @@ static void qemu_create_cli_devices(void) assert(ret_data == NULL); /* error_fatal aborts */ loc_pop(&opt->loc); } - rom_reset_order_override(); } static bool qemu_machine_creation_done(Error **errp) From patchwork Tue Apr 29 14:08: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: 885731 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp345695wrq; Tue, 29 Apr 2025 07:09:46 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUwMxKda4u4tTgEhhcUCGQ+d9rpPQXKdeOjRXMksO1J9RB1pPNoLXKJ/93h8PENaqU5FMgxuA==@linaro.org X-Google-Smtp-Source: AGHT+IEWpjaO1lc+08cd4vtC30/N2dXUYSZwwRXOI/7M09hCf5Of56WEp46ihjRfykRyx3kzs90Q X-Received: by 2002:a05:6000:4312:b0:39c:268b:8b66 with SMTP id ffacd0b85a97d-3a08ad77c26mr2531101f8f.43.1745935786329; Tue, 29 Apr 2025 07:09:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745935786; cv=none; d=google.com; s=arc-20240605; b=gHv48ASRPIHso6+Cr/sNd+8XRDr5DJssYmVojw72DHEY4alDwoVUvrVR5pZpoHKdBE syfT65NDadjoxRBfOimSh8x74U6T3CFH+YNVqSKmI9Ll3J6TLLUhBo4gL6B3QWaYPMEt 1Agm4ModX+PnoDI+VZll1I0lXKi1oG6XIBvRgvfhd+9SZY1AOU+ahyS3szBnjLu/ymKM 59rZ7whCwFFO4iyVV1uroXcTcQruNgG7RqFvoNmgIwTNz6sEf0xBwTXIV4XPx4rB4HgR bXQgFomuGisBIHt0dV6i1kNLACbsxlMv5DVUHv7xIpgVGeZ8B0rd+V8xxIkc95dCe+1t MXKg== 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=eXL4/W2KCy0v23MfOskz73x1LQjRcBzqdAtJsMYaNnI=; fh=g4s2jU8t/W1wGraKJcf4drMIpLYu/oWYTROkTdMMVGc=; b=b0bVO0ifbBY0p6TbbF/25bZlR09+nc1j2fVzSEllznHOoPlKGMVTNz7QybJ3nqRZjY 2oHUqxz8adhxvuOY5a65aXqDh98gv4NRvNgkS0PxaR5UoF4YhDQOqG2Wlw6d3c4PXPHO K3uWD+Co9EjiRIhPQmW+eGUfZPmhiN79nuC8moAB2QNYjaJDNQFCLsQnr79lUeWSMfyT FkFZCkl6TjX+Y0OsldP4p2xnT4HUSE5DHFfLDk2zzChic2dKKJOQ/UEl69yNwAffl33e Rp4qElVZirzBteLJj3YS+iRAloAKGaemzqWWyFTAxHMskpE5BVKDSACorJHFFEc76g5g c0vQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dFJvsBed; 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 ffacd0b85a97d-3a073e78ba1si6840769f8f.899.2025.04.29.07.09.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 29 Apr 2025 07:09:46 -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=dFJvsBed; 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 1u9leP-0002yD-Oy; Tue, 29 Apr 2025 10:09: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 1u9leO-0002wL-1Y for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:09:32 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9leM-0006RA-G3 for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:09:31 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-4394a823036so59785255e9.0 for ; Tue, 29 Apr 2025 07:09:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745935768; x=1746540568; 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=eXL4/W2KCy0v23MfOskz73x1LQjRcBzqdAtJsMYaNnI=; b=dFJvsBeddabeDJNS/UfMG0oWdNTae/dStcosvLYI0MoXwB9+Vd3YOjxMJwqAWLDW24 UOg4tAUYPSU/Bhb9TKlxsSXBFF4M5W5Af71Vqa5hwhTFH3A1cx1DXInMdeaK5G0HAzd7 IadIrgS1PIwIa7T5DXdv7FZqT6eT6IboWY5T/rjCgL7HaXyS83Z/kGf4Oxry+dQbXmns 7PlWNd5OTlMizhesNY1t4NIzC445W6mAWqHslZVLCPRg1NkJC/32uqQvY1H/XA8G0HQa mAsTSg8tPAGhOlKzdtmrFhEsFB8+i+UFH1t6fQ0SY2A13pS2wOul6QD16AZzmb/s6tyJ +P7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745935768; x=1746540568; 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=eXL4/W2KCy0v23MfOskz73x1LQjRcBzqdAtJsMYaNnI=; b=u4OxjKSV4aBAiteeDdlbXy4aWW55W+1hSfKr8VW1XkH/uNLi0jVbGiM3+sPb96RMbj CQziqU4rSnb13wKRhvBrTIs1m+pSKKr2fP+nC2jJQRd4r1wXfkK2s7Fje5aJm/uNaPE8 0K5bTyi66aUSs4UAJ9YkehRujHDxtkaOtopeSvX6nidK5ia+YLK4jQw7J6fgzvyk+LxW ZytUXoQMYSmDNwpZOYoaXWCHaBipLVfkFNb6y0eLEj3T0IBlkWRvhDTIN1yuXDbVTYjg wQWPlzKj3CXOvUq1eoawanjbcmCIWsNAlvRKa2W4NiskFzwUCEb/w2Uoe3ULCnvxC6wY PoSw== X-Gm-Message-State: AOJu0YyIPQr3E+rQcE/5z4ixGWrX73wUMbq15y1cpHhSkWM7c6XcEjRg rzUzGG8Zw0XQFcO2lslN4ipUhcpKzP9hnWZ74pNHmzvYhebpZJYyJ4khDRWCzlbFlH11aMWxoLi h X-Gm-Gg: ASbGncvnfAjCjV0DQI4wV/oVIqKhxlKUUUrPFbOyr/85h+GoNsYCH4fTpXke2l9UZVi IWR6BOtv1Hi3JRtchnDjtpcAy+sk+sWZhaGYidYjvByX+btESB+sma/fBUZC2YEEpWmvk7rPpj3 bV1S9adHXjHu6rIsGYKOyxnW6siX1EQewb1q4YEZBuwrFhvnbWGBGy9CKjgT2VCaTKmAWysIyVE Uwmd0+i712k9R39aqLR8TlmZ0XFmriebHMcRj2BpKhx6UQ+0TfbiE/O/0FrWZdm3z5/F/PaVfWD Mr83wmFZZH+7siiVWgBQHx61/HpAvj1UIWS9UiODDA0gtwlSOlopYTJX9cgnu+WJJx4ZH5MIKzn YIgK/867mCcJVb5dSV+rs X-Received: by 2002:a05:600c:1c24:b0:440:6a37:be09 with SMTP id 5b1f17b1804b1-441ad3d6bfbmr28873985e9.16.1745935768081; Tue, 29 Apr 2025 07:09: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 5b1f17b1804b1-4409d2ac26dsm191313335e9.21.2025.04.29.07.09.26 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 29 Apr 2025 07:09:27 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Hanna Reitz , Fam Zheng , Paolo Bonzini , Gerd Hoffmann , qemu-block@nongnu.org, John Snow , "Michael S. Tsirkin" , Zhao Liu , Eduardo Habkost , Jason Wang , Kevin Wolf , Yanan Wang , Marcel Apfelbaum , Dmitry Fleytman , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= Subject: [PATCH v2 12/19] hw/core/machine: Remove hw_compat_2_5[] array Date: Tue, 29 Apr 2025 16:08:18 +0200 Message-ID: <20250429140825.25964-13-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250429140825.25964-1-philmd@linaro.org> References: <20250429140825.25964-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=philmd@linaro.org; helo=mail-wm1-x32a.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=unavailable 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_5[] array was only used by the pc-q35-2.5 and pc-i440fx-2.5 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé --- 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 5dc5e3b547d..5f1a0fb7e28 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -844,7 +844,4 @@ extern const size_t hw_compat_2_7_len; extern GlobalProperty hw_compat_2_6[]; extern const size_t hw_compat_2_6_len; -extern GlobalProperty hw_compat_2_5[]; -extern const size_t hw_compat_2_5_len; - #endif diff --git a/hw/core/machine.c b/hw/core/machine.c index d66b02b564c..e7001bf92cd 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -283,15 +283,6 @@ GlobalProperty hw_compat_2_6[] = { }; const size_t hw_compat_2_6_len = G_N_ELEMENTS(hw_compat_2_6); -GlobalProperty hw_compat_2_5[] = { - { "isa-fdc", "fallback", "144" }, - { "pvscsi", "x-old-pci-configuration", "on" }, - { "pvscsi", "x-disable-pcie", "on" }, - { "vmxnet3", "x-old-msi-offsets", "on" }, - { "vmxnet3", "x-disable-pcie", "on" }, -}; -const size_t hw_compat_2_5_len = G_N_ELEMENTS(hw_compat_2_5); - MachineState *current_machine; static char *machine_get_kernel(Object *obj, Error **errp) From patchwork Tue Apr 29 14:08: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: 885733 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp346238wrq; Tue, 29 Apr 2025 07:10:33 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVvmfy1kPS2weWtwMtDlC1PU+Ds5Y7u2rDU2mVrBRqDAB5tq19z/QzDfSkWnZIXWT5poKw78A==@linaro.org X-Google-Smtp-Source: AGHT+IFd5IbquodAu7Shv6qQg+AhcdEfQ8CBHQdi+JMRcpiFChcLL7S9LOh6Mvs6ge+7iDZQexsN X-Received: by 2002:a17:907:803:b0:aca:e2d6:508c with SMTP id a640c23a62f3a-acec4edb4c5mr402732066b.56.1745935833238; Tue, 29 Apr 2025 07:10:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745935833; cv=none; d=google.com; s=arc-20240605; b=QEBYgzPfGU3h5RPf30YH6zbEu1hCHZudTMz+yzZicg6Cxp/psxyXtkThawpS1kumtR ER7F6BIiNb7Bn86j0mDow+AJsGpxLfRRYezPVXdKgP5hPdPewuR2Nx6AckukwJM1nvXX Du6lc6Ru6kp+LlJ1FIAsveKJlDd9SlZHbHjzTPzLw57UNSr5QZnbhDCubRfMkOQEZTFW XCDHgmW6KDMeOQyAlFdvyMeXjmniAzI/UHvZlLgIPUqqhhsG7j5ZuLNuUYVVXpxObfOH oJnI8UVtcDSIQ0M5OG3aV1t1YumUUQ0qKXJQ1yDTeHXkbpchGxAY14Hync5X2hwW3ow+ rMvA== 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=gjm2NV3MsVuXzERs7qPetKCBg7pCwU7Ow/3BPmE8MOo=; fh=g4s2jU8t/W1wGraKJcf4drMIpLYu/oWYTROkTdMMVGc=; b=kEydCqbxrI8Xxp7H4WADaSL7eaPI7rw7IyOOk6Y/ohPePvwN7q9uN7C0hz+IkTk2YK yOiHywXzCbraj/VpuaPvTra1CJRaB9T+17vEuDyStFdGkov8AioHOrkIGGlH568UrkFu mjtGmj9JdCtG6AjmyfP65cdlL3rseZKFQ/qvVRWAg6ZsGvPPC1rwa8cdig/TCg5xUcKL wwYdUEg8QWskjMXkp8dVhUrMMmQxAq67cgQYFha/5i+JaVJExpC1GvNcSjTUdGv6Rpsc fHEqaKgHLULAXePeY+OC0YkdCsHhMumc+OqHStJ5CDZiq4LnvWHyUsTAlY9jubkkGARZ DX7w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=s8tELiNf; 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 a640c23a62f3a-ace6e4f8400si657350766b.227.2025.04.29.07.10.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 29 Apr 2025 07:10:33 -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=s8tELiNf; 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 1u9leY-00039G-0Z; Tue, 29 Apr 2025 10:09:43 -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 1u9leT-00035S-5C for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:09:37 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9leR-0006ST-Hv for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:09:36 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-39ac9aea656so7012002f8f.3 for ; Tue, 29 Apr 2025 07:09:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745935773; x=1746540573; 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=gjm2NV3MsVuXzERs7qPetKCBg7pCwU7Ow/3BPmE8MOo=; b=s8tELiNfdWUMK/re0nnttFyDPyg2LCNNmhEUpPibsumqSYnO40Zt8XpMUjb1lkNvCB NP+PF+gIgDd2b7r/qUWLh1ymJuOZy9NPGXhyUTIOef7XoxUzZP/kll1KvzngCti0P/kM 6zx1E1wporjSQD1NStIOr2Qm2lMTdZWEcSYVlxW3TekCh833Yv6ZkXpHp7ZfCHZ/IK9a Hqx6Hfouz8Se47CzoLTjBdN27QtaNsxFvmT2lIbmjHvPIb7osieqdTTNw5oBDkpflhrI 3tXIbv4rbuUVVktpSyoCSkLlkZl7+rl04iQ7hfi2uhnFjWD4nB+6Mmh/KCXZPdtO4Y7I x5gQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745935773; x=1746540573; 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=gjm2NV3MsVuXzERs7qPetKCBg7pCwU7Ow/3BPmE8MOo=; b=IbfTBdTg8dpJ78wQq4HHj3x2DWzMMy3NlE4dXqQS8FcMP01cDV6hP8or7omsrEx333 B2PuerXaTaVMOOAJtn1sdBZovKxtr8lyoDP/zGXHSQ393V25JLnDOnXLwDNnedUNNz03 i433P7xmUgzWUfaiH0dYe3U/E45duXd0jELZNypiIThEirKSTz6JUvEf0F9b6dITCGpX CR47Btc8gCOn5B2EkiqBJic/DqHpel7ZRv6AQSbhc/ytDrXunJ1JpyvDd5G6BQggwlSt 4tUSUzVxYcnQEwY+s7yjQltEB6wKwVpdUsjwVEDA66O4YJ69k3qgXk4eEQsemGpbvDW4 8zeQ== X-Gm-Message-State: AOJu0YxMBIt4UUN5z8ywTZMxsbErqqd8k0qYdm1isPJ2767ixUlkX6B6 ueAFixKNWXYyFy2SPLRZ4GnyM7Bb3yiq0nh0ujIQ0dGQsimVtUoFvSiXTvc6r0/+aHAFtNNDTxH Q X-Gm-Gg: ASbGncul+K9cfnY6kHSYJhg0zgoA2rebwqJ4eOXsaCxlWlJA2TTD9VlGVsi7UoMaBqw Ag04PX6/QpViRxW/H41bgsT9MQi4YZnwnLM3Zw0yOReLszYYQPGE1NtR+G++/OkNfPGHcXaYUm6 0UGAmLEOF4MAqsSW/pdHgWZeQlI0JXX7khoLi6NBq+5woVqEBaYbWxKHj8Sq8N++9LJvRasfuno 7UH54lTeRwPlGIUPQkfexNW5esrst81jxLMp3vsdJqdiiM03JSwu4HWjGP3V8G5d5pHUo9jg0u2 Pkv/bY/BXPUqf/akavFLMsxmkr03NhYjIIpHNh2ZiePLsrWFqN6OTXSh98Ps7SIrIYPe9Y/w4bP TMFel+/0PBiLJHDgn+b71 X-Received: by 2002:a5d:59a7:0:b0:390:f0ff:2c11 with SMTP id ffacd0b85a97d-3a0890a516cmr3487498f8f.2.1745935773168; Tue, 29 Apr 2025 07:09:33 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a073c8cd7fsm14065276f8f.1.2025.04.29.07.09.31 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 29 Apr 2025 07:09:32 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Hanna Reitz , Fam Zheng , Paolo Bonzini , Gerd Hoffmann , qemu-block@nongnu.org, John Snow , "Michael S. Tsirkin" , Zhao Liu , Eduardo Habkost , Jason Wang , Kevin Wolf , Yanan Wang , Marcel Apfelbaum , Dmitry Fleytman , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= Subject: [PATCH v2 13/19] hw/block/fdc-isa: Remove 'fallback' property Date: Tue, 29 Apr 2025 16:08:19 +0200 Message-ID: <20250429140825.25964-14-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250429140825.25964-1-philmd@linaro.org> References: <20250429140825.25964-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=philmd@linaro.org; helo=mail-wr1-x431.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=unavailable 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 "fallback" property was only used by the hw_compat_2_5[] array, as 'fallback=144'. We removed all machines using that array, lets remove ISA floppy drive 'fallback' property, manually setting the default value in isabus_fdc_realize(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé --- hw/block/fdc-isa.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/block/fdc-isa.c b/hw/block/fdc-isa.c index 6d1790e0e61..090b91361cd 100644 --- a/hw/block/fdc-isa.c +++ b/hw/block/fdc-isa.c @@ -112,6 +112,7 @@ static void isabus_fdc_realize(DeviceState *dev, Error **errp) } qdev_set_legacy_instance_id(dev, isa->iobase, 2); + qdev_prop_set_enum(dev, "fallback", FLOPPY_DRIVE_TYPE_288); fdctrl_realize_common(dev, fdctrl, &err); if (err != NULL) { @@ -293,9 +294,6 @@ static const Property isa_fdc_properties[] = { DEFINE_PROP_SIGNED("fdtypeB", FDCtrlISABus, state.qdev_for_drives[1].type, FLOPPY_DRIVE_TYPE_AUTO, qdev_prop_fdc_drive_type, FloppyDriveType), - DEFINE_PROP_SIGNED("fallback", FDCtrlISABus, state.fallback, - FLOPPY_DRIVE_TYPE_288, qdev_prop_fdc_drive_type, - FloppyDriveType), }; static void isabus_fdc_class_init(ObjectClass *klass, const void *data) From patchwork Tue Apr 29 14:08: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: 885737 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp347207wrq; Tue, 29 Apr 2025 07:12:04 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX+GEGcr0ZrlUkh6pPJAiZLno49lyd/CszrbnKv2UhE6ijsw0gXW7TYeG2XoHU8+tucwh+zlw==@linaro.org X-Google-Smtp-Source: AGHT+IHn/okPzMPhPLQLq5DpPC6vz/4L+o0lAZRc4GSE2ei3tW9Spk0hDCnlTjDm9JuSOAvNuATx X-Received: by 2002:a05:600c:8411:b0:43d:fa58:8378 with SMTP id 5b1f17b1804b1-440ab873e30mr103038865e9.33.1745935924012; Tue, 29 Apr 2025 07:12:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745935923; cv=none; d=google.com; s=arc-20240605; b=ECNpdgm1LVsEWjJlebb8i6exYfQqC4EJULLNnncqTpQXaq1cAuGkoh/dMCKgh6NFiO C7RVBrv3X+wf78QFKylD+X4Pp4a1lArGCfTgmxITTDYFO1VjpYfRXno91t8Jk++G4jij TPN7XFdH3FyvP9QI8Lek++vdf5b+LFYt7JfxbZ7pUFL1mqO4XH6L8XGnJbsqeKqaXFf5 U0eb/U0q736RzsfpQXkOVPiLIDX2NsoTCgckm/mNvMpxTX1Qb+knBN5RUEoaGrNynpu2 G5VKMkZcFGnp4aBRnNrtm3ZMKnG19gS6mapTY+slIvlZDY80UsHeiZuQpM1v/jgtua7i Qa6g== 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=cgWjRtFl0Tqbcd4/+gPIcf2l4PP5xa+gpuaAj2NrLow=; fh=g4s2jU8t/W1wGraKJcf4drMIpLYu/oWYTROkTdMMVGc=; b=LoPXZjDHM1nviWxWtbFjL+x1mDE/c6Z5R+Gfu+HvpXeQh7tYRAs8axmgQWE5Hw/enH 8YEhiDu9dG3joFm0P4Nn6W9pshv/JZ14Tm5Q8UZrzWvAhgXfthQBEBifslCozpPFApV4 xQ94+3lZqqWOANexlel2MRsxca6k+w12LL8o+bXYiPXXTC/SO8bXerjEwKo/0jN06JbU 7g06+KLbDakrUdPMlth5soez2yehGas1bRYhDF9bQedQravdHGK7vHB1BRAce4gpixlr Ibs2/PGuLmknHw3K+kf1rMMJV7lWP1k+JIkWC+brw9mg9GO06eLAx1asTXqLlfPYnGLb uAOg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Y838GGm3; 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 5b1f17b1804b1-440a53ee524si76061415e9.171.2025.04.29.07.12.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 29 Apr 2025 07:12: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=Y838GGm3; 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 1u9lf2-0003TO-AL; Tue, 29 Apr 2025 10:10: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 1u9leZ-0003As-B9 for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:09:43 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9leX-0006TU-Nw for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:09:43 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-43d07ca6a80so23664365e9.1 for ; Tue, 29 Apr 2025 07:09:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745935780; x=1746540580; 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=cgWjRtFl0Tqbcd4/+gPIcf2l4PP5xa+gpuaAj2NrLow=; b=Y838GGm3mFEK6Q7WaC5H/eNdklCYSMjUbxJGxA41F4ELmmWUxbfkwnGBHsP/3ixJWH DThO5mMsn1L+eMJ+POVEFJXhgX1irvx5pXnZjsMNW093oIpAPMLSgStkV0/+doj9xUfp /aSxr9F+0f3pNGw2nWLfjZjAWglEsGWqosl+uLhbJat+VUX7ieMmqMNFSsnZYRL+yLfO pcNyqlU+TTUVXxjijbSK/YcZMEKpfUOKPvF4+0V/lXX9NdYly4QWFQ9vNQDRYXckslHk kM0L5ne1hgvSXyfLiaER6b8jmQy/tLwIpJJUAnY05zf9/QafC9aM2rx/5PtItCxTFru6 kr1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745935780; x=1746540580; 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=cgWjRtFl0Tqbcd4/+gPIcf2l4PP5xa+gpuaAj2NrLow=; b=wUfx8TDFNPyDRzyeTBkLT6bT51WcPsGfhMMVIxlgApVvtOGnKxq2wQ3Rhxjx6oGCDZ YT0PA1FS0/ItqmFI1kpqFya43eHxOw743NRQEsR5/WbLmJfmx7k27ESbC0ngG8b6j0P6 XKi3SdSoSvdS1bXSEdmpbX7L+0Pti0NHSqwnB4357vFKkXQroyVjPF+hrrDTlk2GEUXB 7E/K8YV5Y/+nnHORDZkd1yvNOt4QHqhkQtQszBq7vI23IBG4jXYkC/hFTgTrpZlM4g7s HdVwDJlWDstemoaHAaHtXggADDd1zOhGdjUlOSorgbKyA7X9/mqD9OGY7sbeEMMUIRTn Vs0g== X-Gm-Message-State: AOJu0YwFy29u/qZVoCUwAVP4szf1DSi9kKxkbO6MNjrA9yhMf0XrJ8KF 73uPOe4YuSEc9clqpHmh+Z/GUsZs5Gqxvkd+89E1Mr5iE4wXZUW7UzNOR2qt4b3W1H2HL1t8y+t P X-Gm-Gg: ASbGncsRGQd8J1D1TBckMt4gWwgv02t9MDhv68hW1S1LJUHZ/gt0OlcNjj2iyvSGoWt An4l4kKXL2LwazLGTJicey2PcYvXSs1TivhtJ64HDdQesxlRX4qJ3c45DlwTkfIL7QQ/fZBui3r P1R/Q5N3hlRWcJZCsaCA3hrpGlop/QI/qgCkKO5vpTHuAAejvMcpe1YbUTpBcOf8uld7Jtl9vK8 iOGDJoPf7Yu/maAJ8PBNXILkjVQByoyHK+JpmHyDTPFtcouFDc2x2bY1THkXLafdoiV75ayztno JvQQaFU4W3kOjDBJeO7/bvTTzJ7QJmtanKoHnis69wNyk63XdqKeSg5TBL1DNbZF2h5sexymwGr PDJS4Q8UuvaJyMru9LTgt X-Received: by 2002:a05:600c:b9b:b0:43b:ca39:6c7d with SMTP id 5b1f17b1804b1-440ab782a91mr132704845e9.3.1745935778149; Tue, 29 Apr 2025 07:09: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 ffacd0b85a97d-3a073bbeb5esm14012581f8f.0.2025.04.29.07.09.36 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 29 Apr 2025 07:09:37 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Hanna Reitz , Fam Zheng , Paolo Bonzini , Gerd Hoffmann , qemu-block@nongnu.org, John Snow , "Michael S. Tsirkin" , Zhao Liu , Eduardo Habkost , Jason Wang , Kevin Wolf , Yanan Wang , Marcel Apfelbaum , Dmitry Fleytman , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= Subject: [PATCH v2 14/19] hw/scsi/vmw_pvscsi: Remove PVSCSI_COMPAT_OLD_PCI_CONFIGURATION definition Date: Tue, 29 Apr 2025 16:08:20 +0200 Message-ID: <20250429140825.25964-15-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250429140825.25964-1-philmd@linaro.org> References: <20250429140825.25964-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.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=unavailable 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 PVSCSI_COMPAT_OLD_PCI_CONFIGURATION was only used by the hw_compat_2_5[] array, via the 'x-old-pci-configuration=on' property. We removed all machines using that array, lets remove all the code around PVSCSI_COMPAT_OLD_PCI_CONFIGURATION. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé Reviewed-by: Thomas Huth --- hw/scsi/vmw_pvscsi.c | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c index d5825b67868..34de59a7cf6 100644 --- a/hw/scsi/vmw_pvscsi.c +++ b/hw/scsi/vmw_pvscsi.c @@ -69,17 +69,11 @@ OBJECT_DECLARE_TYPE(PVSCSIState, PVSCSIClass, PVSCSI) /* Compatibility flags for migration */ -#define PVSCSI_COMPAT_OLD_PCI_CONFIGURATION_BIT 0 -#define PVSCSI_COMPAT_OLD_PCI_CONFIGURATION \ - (1 << PVSCSI_COMPAT_OLD_PCI_CONFIGURATION_BIT) #define PVSCSI_COMPAT_DISABLE_PCIE_BIT 1 #define PVSCSI_COMPAT_DISABLE_PCIE \ (1 << PVSCSI_COMPAT_DISABLE_PCIE_BIT) -#define PVSCSI_USE_OLD_PCI_CONFIGURATION(s) \ - ((s)->compat_flags & PVSCSI_COMPAT_OLD_PCI_CONFIGURATION) -#define PVSCSI_MSI_OFFSET(s) \ - (PVSCSI_USE_OLD_PCI_CONFIGURATION(s) ? 0x50 : 0x7c) +#define PVSCSI_MSI_OFFSET (0x7c) #define PVSCSI_EXP_EP_OFFSET (0x40) typedef struct PVSCSIRingInfo { @@ -1110,7 +1104,7 @@ pvscsi_init_msi(PVSCSIState *s) int res; PCIDevice *d = PCI_DEVICE(s); - res = msi_init(d, PVSCSI_MSI_OFFSET(s), PVSCSI_MSIX_NUM_VECTORS, + res = msi_init(d, PVSCSI_MSI_OFFSET, PVSCSI_MSIX_NUM_VECTORS, PVSCSI_USE_64BIT, PVSCSI_PER_VECTOR_MASK, NULL); if (res < 0) { trace_pvscsi_init_msi_fail(res); @@ -1158,15 +1152,11 @@ pvscsi_realizefn(PCIDevice *pci_dev, Error **errp) trace_pvscsi_state("init"); /* PCI subsystem ID, subsystem vendor ID, revision */ - if (PVSCSI_USE_OLD_PCI_CONFIGURATION(s)) { - pci_set_word(pci_dev->config + PCI_SUBSYSTEM_ID, 0x1000); - } else { - pci_set_word(pci_dev->config + PCI_SUBSYSTEM_VENDOR_ID, - PCI_VENDOR_ID_VMWARE); - pci_set_word(pci_dev->config + PCI_SUBSYSTEM_ID, - PCI_DEVICE_ID_VMWARE_PVSCSI); - pci_config_set_revision(pci_dev->config, 0x2); - } + pci_set_word(pci_dev->config + PCI_SUBSYSTEM_VENDOR_ID, + PCI_VENDOR_ID_VMWARE); + pci_set_word(pci_dev->config + PCI_SUBSYSTEM_ID, + PCI_DEVICE_ID_VMWARE_PVSCSI); + pci_config_set_revision(pci_dev->config, 0x2); /* PCI latency timer = 255 */ pci_dev->config[PCI_LATENCY_TIMER] = 0xff; @@ -1298,8 +1288,6 @@ static const VMStateDescription vmstate_pvscsi = { static const Property pvscsi_properties[] = { DEFINE_PROP_UINT8("use_msg", PVSCSIState, use_msg, 1), - DEFINE_PROP_BIT("x-old-pci-configuration", PVSCSIState, compat_flags, - PVSCSI_COMPAT_OLD_PCI_CONFIGURATION_BIT, false), DEFINE_PROP_BIT("x-disable-pcie", PVSCSIState, compat_flags, PVSCSI_COMPAT_DISABLE_PCIE_BIT, false), }; From patchwork Tue Apr 29 14:08: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: 885741 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp349106wrq; Tue, 29 Apr 2025 07:15:00 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUEFJl4OTYoG7kuaveyBJZ9gBUWEeNfVJngZgbliJ6jZ6dbK8YoKzdMCPHD2sQN39gdx2F01w==@linaro.org X-Google-Smtp-Source: AGHT+IE2MCYok3r0UsbIhtNPuwZovcPazLr8y+IrRz7oLUUVNxX+urOrtQtO+gmA+pSRprHtWa4n X-Received: by 2002:a05:600c:1c09:b0:43b:d0fe:b8ac with SMTP id 5b1f17b1804b1-440ab872047mr126324635e9.30.1745936100400; Tue, 29 Apr 2025 07:15:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745936100; cv=none; d=google.com; s=arc-20240605; b=dn5Qw9u5x0+HHapBMWnK6m0V8vcYniXS7QwPm1jALWRAZV6+BhzR5cO4HsB8QqXZ6Y zQfsc4sVhLUlc/ATNp9srRBNPsTyu1ATKh0Fo+Wus/yVv34gdlfSVEn7wNdhcffmZGQ0 2GMGc2vzuG9ZVGxtoqjAn+jXvcyNr9N5eQpPQ29xxYafoJYUCpWM6gz1U2co/S6pXz5R 0AyrZBgOgrclatL6deRwZenHC5ZRIyq4ZdsJE7wKe6VT043N5lDGaFNmV5BO4R6MZFE9 BU3ZfuvK+5GvboOHYeWHBw74Ng7ffDsQVRpuLY6wve+N/AN2R55eA9v7S447+Y8wSGN6 6SFw== 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=1t2rS7sMqGG0jQ3p7FyGRdjclg6gvnu3KRb1lwZ8q+A=; fh=g4s2jU8t/W1wGraKJcf4drMIpLYu/oWYTROkTdMMVGc=; b=bM18dcDYXcktyAs5VSQ2do+KQ0NkkvEPdJjx96Xwz9DX03ldsShrOFIvebgD23QcAQ gLhRNc/hPOL3fnez8BT13abovJtEKbfD9u+CQ5edGrtU/0X2DAaHFQPYcyXWOxPcCoJC Jp5fmwpL0pf/ZmD422GxqacIkjnsAdd6pQPNbD6D2WCvckI9+1R50i4slboy3NgTe0aT pANWL2cBhkguMFFUOACn98KMMFG/VB5hmq5K+vQChOv66cx0O8pVzQYTllPTC7mkau/g Sdm1dzgva5+NVDtEzeH4v8w3+cow9qkpis/71CpYRyvHEOCNoTUcz6C+zOUvpgXVATKu CV3g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VF6ETirT; 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 5b1f17b1804b1-4409d29ff6bsi92322105e9.41.2025.04.29.07.15.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 29 Apr 2025 07:15:00 -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=VF6ETirT; 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 1u9lfP-0004MK-Mr; Tue, 29 Apr 2025 10:10:35 -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 1u9lep-0003VJ-Q8 for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:10:05 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9lem-0006UP-IR for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:09:59 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-43edecbfb46so38649105e9.0 for ; Tue, 29 Apr 2025 07:09:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745935785; x=1746540585; 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=1t2rS7sMqGG0jQ3p7FyGRdjclg6gvnu3KRb1lwZ8q+A=; b=VF6ETirT9sv+EJE1mPItdBkgv8i2P4DHQq3gA1hAE/a5C48LzXEk03OobOhO8qqBQ/ E0HRL/gv4pYJApCg86Yrw+1jXQ9SuInlOlUAmiKl3J02Tk/pVumRaoti/0qn7HNwLf3u tYbYnGxUtOpnQyx+QmJ1akxGQ+gcWudj/0tJ891Mm+jONRTV6oUkeD7MVN6oZ0ONngep Qh5lUiy/09L+pcgAnb1L0+tebINs9jBOHj5oK38UJmacAGWCtqe5x9FrNEsudCPeBUMy RQOd9C2mAM7K0c8JOEf7hTuWSYt5i/lXZebWeIRfm6ZE0Oif+EKAvBlGRdRl5A1oFpx2 Uf6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745935785; x=1746540585; 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=1t2rS7sMqGG0jQ3p7FyGRdjclg6gvnu3KRb1lwZ8q+A=; b=rBP4uKtsbIrmz1cM/udX5tRCqolgf9lwyD5w6VIcGwSsf/5rRcNtWzzWZ6sNxkqIX4 b5Q/H99Ameuzpma7K/ieMkHYE+u4sATmItpLiCnEc3v4vJcm94UtbnOS0nEOnA2V7kra Mc3EMqXbfN0iTz9oV/vkxGtNkfo8Dqv99tiz+jjozyfD+Lz3I1vpusCQjFVuYqOvNLND v/fYTcZtzfvUWq8lofEwX6MoN39JCLYqLDr3S3UkH4DCPJPT3efkWmqg/f1w7JRqMQhY 4P/pliHVcLcgN6navAiPCQpQh1x2Z7F0GhlmtcpJK664qiJ8USNX9WPo4ERG94pZa0gH WpIg== X-Gm-Message-State: AOJu0YxYKhHD6/W6VhxCzBI7UB1UsmrrkoFibqC5qIGHDIZDMBMDC5xt SChNV4t9RzSkKQTLTd5mL+3AutQyANhvN2m6vtnouWog5KF7ygZJkvsiDa662sNPQZ2wZ3ipDgf x X-Gm-Gg: ASbGncuPdnCpAiNnT4ZI/ZYUUXI4y5AElbBmosFWkpMAqQCufPabqPWCORNfXFwoxgi f+r9dn9IHYOJEe+xYdrwitdiS+nKdA+3YX8qkhpx4MMIiJW2vTBUhKDAJX67WMCCE0gIxOCf+GB DuEcIWOPkvSwXVvTYehMC4Z8aXFrjm21zEBIc8pbvmCWGU76Zu29sCX1LPCaDoSywgOMEDVPpoo KG+aMwGNCnjWd73run3tdz4XLSWeiKoWXp7rFr4TJYazz+Jn6ZMS7YPiGJ6jgOeaz6ijUrV2C5w nAGiCpOA4KDcq4oJlw60v3Wh7M2JF47yQiWVQ9B47Ar1Sqqop81HQyK5fndX9zcgzuswbPD/FOG l7WhVkHbSU3QKGPEcOhHn X-Received: by 2002:a05:600c:384d:b0:43d:53c:1ad6 with SMTP id 5b1f17b1804b1-440ab848aa3mr108657535e9.26.1745935783582; Tue, 29 Apr 2025 07:09: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 5b1f17b1804b1-4409d2dfde6sm188177025e9.36.2025.04.29.07.09.42 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 29 Apr 2025 07:09:43 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Hanna Reitz , Fam Zheng , Paolo Bonzini , Gerd Hoffmann , qemu-block@nongnu.org, John Snow , "Michael S. Tsirkin" , Zhao Liu , Eduardo Habkost , Jason Wang , Kevin Wolf , Yanan Wang , Marcel Apfelbaum , Dmitry Fleytman , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= Subject: [PATCH v2 15/19] hw/scsi/vmw_pvscsi: Remove PVSCSI_COMPAT_DISABLE_PCIE_BIT definition Date: Tue, 29 Apr 2025 16:08:21 +0200 Message-ID: <20250429140825.25964-16-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250429140825.25964-1-philmd@linaro.org> References: <20250429140825.25964-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=philmd@linaro.org; helo=mail-wm1-x332.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=unavailable 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 PVSCSI_COMPAT_DISABLE_PCIE_BIT was only used by the hw_compat_2_5[] array, via the 'x-disable-pcie=on' property. We removed all machines using that array, lets remove all the code around PVSCSI_COMPAT_DISABLE_PCIE_BIT, including the now unused PVSCSIState::compat_flags field. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé Reviewed-by: Thomas Huth --- hw/scsi/vmw_pvscsi.c | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c index 34de59a7cf6..e163023d14c 100644 --- a/hw/scsi/vmw_pvscsi.c +++ b/hw/scsi/vmw_pvscsi.c @@ -68,11 +68,6 @@ struct PVSCSIClass { OBJECT_DECLARE_TYPE(PVSCSIState, PVSCSIClass, PVSCSI) -/* Compatibility flags for migration */ -#define PVSCSI_COMPAT_DISABLE_PCIE_BIT 1 -#define PVSCSI_COMPAT_DISABLE_PCIE \ - (1 << PVSCSI_COMPAT_DISABLE_PCIE_BIT) - #define PVSCSI_MSI_OFFSET (0x7c) #define PVSCSI_EXP_EP_OFFSET (0x40) @@ -123,8 +118,6 @@ struct PVSCSIState { uint8_t msi_used; /* For migration compatibility */ PVSCSIRingInfo rings; /* Data transfer rings manager */ uint32_t resetting; /* Reset in progress */ - - uint32_t compat_flags; }; typedef struct PVSCSIRequest { @@ -1224,21 +1217,8 @@ pvscsi_post_load(void *opaque, int version_id) return 0; } -static bool pvscsi_vmstate_need_pcie_device(void *opaque) -{ - PVSCSIState *s = PVSCSI(opaque); - - return !(s->compat_flags & PVSCSI_COMPAT_DISABLE_PCIE); -} - -static bool pvscsi_vmstate_test_pci_device(void *opaque, int version_id) -{ - return !pvscsi_vmstate_need_pcie_device(opaque); -} - static const VMStateDescription vmstate_pvscsi_pcie_device = { .name = "pvscsi/pcie", - .needed = pvscsi_vmstate_need_pcie_device, .fields = (const VMStateField[]) { VMSTATE_PCI_DEVICE(parent_obj, PVSCSIState), VMSTATE_END_OF_LIST() @@ -1252,9 +1232,6 @@ static const VMStateDescription vmstate_pvscsi = { .pre_save = pvscsi_pre_save, .post_load = pvscsi_post_load, .fields = (const VMStateField[]) { - VMSTATE_STRUCT_TEST(parent_obj, PVSCSIState, - pvscsi_vmstate_test_pci_device, 0, - vmstate_pci_device, PCIDevice), VMSTATE_UINT8(msi_used, PVSCSIState), VMSTATE_UINT32(resetting, PVSCSIState), VMSTATE_UINT64(reg_interrupt_status, PVSCSIState), @@ -1288,19 +1265,14 @@ static const VMStateDescription vmstate_pvscsi = { static const Property pvscsi_properties[] = { DEFINE_PROP_UINT8("use_msg", PVSCSIState, use_msg, 1), - DEFINE_PROP_BIT("x-disable-pcie", PVSCSIState, compat_flags, - PVSCSI_COMPAT_DISABLE_PCIE_BIT, false), }; static void pvscsi_realize(DeviceState *qdev, Error **errp) { PVSCSIClass *pvs_c = PVSCSI_GET_CLASS(qdev); PCIDevice *pci_dev = PCI_DEVICE(qdev); - PVSCSIState *s = PVSCSI(qdev); - if (!(s->compat_flags & PVSCSI_COMPAT_DISABLE_PCIE)) { - pci_dev->cap_present |= QEMU_PCI_CAP_EXPRESS; - } + pci_dev->cap_present |= QEMU_PCI_CAP_EXPRESS; pvs_c->parent_dc_realize(qdev, errp); } From patchwork Tue Apr 29 14:08: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: 885738 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp348129wrq; Tue, 29 Apr 2025 07:13:31 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVkW76yuTpHH8edceNLvzVMAZNsuh8dopLgrYfpE+mh6w+vIF8u0MBZsOVKc2BT+h0vaI9jEg==@linaro.org X-Google-Smtp-Source: AGHT+IHOr41A4Ct6qlyMok5YtrYAmJFGuRKNjlyEcoYYApcXYiYbEienn4YcbGKMf6WU3hddnPRj X-Received: by 2002:a05:6000:1f03:b0:3a0:7a8f:db22 with SMTP id ffacd0b85a97d-3a07aa6b57emr7730298f8f.24.1745936011013; Tue, 29 Apr 2025 07:13:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745936011; cv=none; d=google.com; s=arc-20240605; b=LqMukvmkqRtrMbXB4ErrEFRhEDnaWDc4lxxbfPRkcwXgS4bmhZ0i0YhX2ugnhJcqLO 0pM2YTzf/vd+ZCY1DPJY/TlR/sfvDxqp/+0woNf+9dcNarGxynGQZkfvVPNJNGFb71by 4xC3h3CbjChTaX3HPlxzf3xMLS2WFokietWTOIoGYbn4IWJaBRiJW/DjQDqe3WZ5MPJN vQXfF5de3pjaYu5D4fDwODQhoU8NjSqmIyHPdtm/2hs5IgRWSTICR86F57Mr9dYImfhS b/D+KfH9WNutr3/8KqswfVJMMIrQNRbT79lc6fazDacuvwyPmJW32Jd7AJEjaa3fjdRR 0KHg== 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=j41fV/T5fVwdY4VDR58WCPqJo5aDoWrBkyOMJ4Dwydk=; fh=g4s2jU8t/W1wGraKJcf4drMIpLYu/oWYTROkTdMMVGc=; b=MZ10c8e+Pas4hBZov1aUmahZ++0OFzuvHbKEt88bVaujSyQB3lgm8FKf2AVcU729UP DX7BZvemajIKkPFbSMPRdtqi1dFCxPUA39gIfQeoiyqAQdZIpp/iQzNsROW09ZMLGdl/ cK9iixQ1zjo8lZAB3Cb5z/AazuIICkCGv8sowWVjZIbrdimn/3xY83zaqUzI75HF3gFZ UV1LjfYo4dXb6T84s4who5Nlggw5Eh/xGkTzRfxz64bpoqj9wtD+l0IqvOyXStC3R7jM Nx43MSDssbH4iTD5/pIJ95d2Azi5xldbsJ8+oigIRhgmV40iTp+n/rIXyJ1ptn7RzVdI SL6Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=sSRybMXs; 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 ffacd0b85a97d-3a073e6a76fsi6599261f8f.780.2025.04.29.07.13.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 29 Apr 2025 07:13:30 -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=sSRybMXs; 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 1u9lfN-00045R-7m; Tue, 29 Apr 2025 10:10: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 1u9lep-0003V8-Om for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:10:05 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9lem-0006Uy-J6 for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:09:59 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-43cef035a3bso43260795e9.1 for ; Tue, 29 Apr 2025 07:09:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745935789; x=1746540589; 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=j41fV/T5fVwdY4VDR58WCPqJo5aDoWrBkyOMJ4Dwydk=; b=sSRybMXsNRHONHi260Dy9TnGh+3FDJfPzIKE7STPRsZdNgUpGb+aZ4YaK9pdOBZrxm DHtfy5zR0QGXCyQTUcbOj5vFAiLrLaPewqLWEzQWRQkNZlVDkQ1Ap0waox9PGSOU9tnf E+Yegwy9udbAAIExgEutNpnlBMMKrkFEqNiu4EPeq4/ZXYL+FxA0qH8gMrzVUpkhnqsC qAZqMlQDifVmGwYQ0ONFWkUSGcwhuujTkLjYhAIMLrY3E9Q99tXlIAwDLOIiZKIhqa3s 6uRHD+sFZhO1Q7QDSuOqee4NWASy8/NGn+pH11vKVne/qJOZikSb6gCRREYGFjxsUjv9 ri7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745935789; x=1746540589; 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=j41fV/T5fVwdY4VDR58WCPqJo5aDoWrBkyOMJ4Dwydk=; b=ITeaLDj7CQ7UkKmI1nwHD2+tiO8hsWkG9xyipjObGZkkF6TvrGIMJxPk8ZuyvdnZlT 9E2ukNstBRcK/cBnLaAcOgHXCiE4PUh6bg/NT1fWgwn5DqBNHfRKEMhYC76rhwTPL3G2 gcy8e1pOrwiDLs2N7fr/Gq53RJvdD2RfewdB/wE9qXu2iv99KkYDaKvkuyaiuMNRjJkt S5i7zvugNdXZTqMArqeLnp7FxUB+vvIp7QyGGIj8T/oYyl+hPfd0z+IBsZz3+xlmCyAO TZjJw42ZudMS5xEfD3eM7YdJPqW0ooKPgtLid/FmwmvncehCuZ83VrZx9G+XX8eRj8Aw wDPQ== X-Gm-Message-State: AOJu0Yxb/ltaWS5plLoj1lU6pSvqS+Ou7/7T5SPraaVEC7GW5nijl1ak ic12tJVug7Uj2EvAyaktJ015/AjGJdHwACJaESDMs+GJA4qJ7416i4oGNjwFiw/1J2IZ0mJPKC/ + X-Gm-Gg: ASbGncv/xxUAaRxycmryeenriu/c7e6pxsfjl+V7tBHl8F1XpzlWqU6uJnJgJe3tqSf aVd2Bak+LGKXQ9n0Rhw0ibrDIMNvOjhAEq6SA077RXCJv8sX4AN5r0Z5m4mjayRoE3l0ISzmc+U +PiqPH+QtucKNLU0PVW95fX70POqngzyJDlwNXdxmXYpQnFjMywD1AwxRgllg+fJTLu/gULdR8/ 6LGaY/ZHzqguLdeWWndyQWaXH01jJoKn+QPwwDuWmlwumGWMBtgGQ30c4O0YBb+ZVugofT22TXg 7nE2JLxJvDeOi25ERaAbL1kQsRQNLV+HJb3gZwhM3G8sQQX+Uy/K1c7t3DDMhB7kROqm8uRXV6q 75mX06iI3VjsYckeqNVoC X-Received: by 2002:a05:600c:1f91:b0:440:9b1a:cd78 with SMTP id 5b1f17b1804b1-440ab7b7969mr144090985e9.10.1745935789042; Tue, 29 Apr 2025 07:09:49 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a073e5c6a0sm13996273f8f.86.2025.04.29.07.09.47 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 29 Apr 2025 07:09:48 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Hanna Reitz , Fam Zheng , Paolo Bonzini , Gerd Hoffmann , qemu-block@nongnu.org, John Snow , "Michael S. Tsirkin" , Zhao Liu , Eduardo Habkost , Jason Wang , Kevin Wolf , Yanan Wang , Marcel Apfelbaum , Dmitry Fleytman , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= Subject: [PATCH v2 16/19] hw/scsi/vmw_pvscsi: Convert DeviceRealize -> InstanceInit Date: Tue, 29 Apr 2025 16:08:22 +0200 Message-ID: <20250429140825.25964-17-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250429140825.25964-1-philmd@linaro.org> References: <20250429140825.25964-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.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 Simplify replacing pvscsi_realize() by pvscsi_instance_init(), removing the need for device_class_set_parent_realize(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé --- hw/scsi/vmw_pvscsi.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c index e163023d14c..7c98b1b8ea6 100644 --- a/hw/scsi/vmw_pvscsi.c +++ b/hw/scsi/vmw_pvscsi.c @@ -1267,21 +1267,15 @@ static const Property pvscsi_properties[] = { DEFINE_PROP_UINT8("use_msg", PVSCSIState, use_msg, 1), }; -static void pvscsi_realize(DeviceState *qdev, Error **errp) +static void pvscsi_instance_init(Object *obj) { - PVSCSIClass *pvs_c = PVSCSI_GET_CLASS(qdev); - PCIDevice *pci_dev = PCI_DEVICE(qdev); - - pci_dev->cap_present |= QEMU_PCI_CAP_EXPRESS; - - pvs_c->parent_dc_realize(qdev, errp); + PCI_DEVICE(obj)->cap_present |= QEMU_PCI_CAP_EXPRESS; } static void pvscsi_class_init(ObjectClass *klass, const void *data) { DeviceClass *dc = DEVICE_CLASS(klass); PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); - PVSCSIClass *pvs_k = PVSCSI_CLASS(klass); HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(klass); k->realize = pvscsi_realizefn; @@ -1290,8 +1284,6 @@ static void pvscsi_class_init(ObjectClass *klass, const void *data) k->device_id = PCI_DEVICE_ID_VMWARE_PVSCSI; k->class_id = PCI_CLASS_STORAGE_SCSI; k->subsystem_id = 0x1000; - device_class_set_parent_realize(dc, pvscsi_realize, - &pvs_k->parent_dc_realize); device_class_set_legacy_reset(dc, pvscsi_reset); dc->vmsd = &vmstate_pvscsi; device_class_set_props(dc, pvscsi_properties); @@ -1306,6 +1298,7 @@ static const TypeInfo pvscsi_info = { .class_size = sizeof(PVSCSIClass), .instance_size = sizeof(PVSCSIState), .class_init = pvscsi_class_init, + .instance_init = pvscsi_instance_init, .interfaces = (const InterfaceInfo[]) { { TYPE_HOTPLUG_HANDLER }, { INTERFACE_PCIE_DEVICE }, From patchwork Tue Apr 29 14:08: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: 885736 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp347158wrq; Tue, 29 Apr 2025 07:11:59 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWHG7lQeC6YOzssHKi6vlThvcyQRHYIn0BsqF0rlurN3ceLbQroDS6Tcmoz2NqkUqYr/Tjzkw==@linaro.org X-Google-Smtp-Source: AGHT+IF30XiZfgtFd77v2Z/CJ1JVMNbEnlQCJ572CjWkYZs/3QF8Z49vr4ochGCgUfpWGN9D/kI2 X-Received: by 2002:a05:600c:3b86:b0:43c:f509:2bbf with SMTP id 5b1f17b1804b1-441ad79c55amr28153365e9.15.1745935919481; Tue, 29 Apr 2025 07:11:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745935919; cv=none; d=google.com; s=arc-20240605; b=L2bfnuTE45HT6jmFpmmw9Gs6h4ICB+QdDXpZBxFlHMgNh6yYiWkgijekDGpvqzSLby 9kR+EDR4BskcmLz76pPR6IGyC5VqzVUeIHewNVf9xAlyvfZGBhBxBJaPrd7HK327Q6s+ Nbb2aNNPk3jEcE17VxKUyg1/4/P21KRe/yt7Stqhof7o4+hdocQr/fCFAQKSBYDXzel7 AxqdDMw6cYWfmrwYdFZUcPCuKQ4A1jp3b3f/r6iS6MXQUud15ke6Vv6OLu9FUw6RoWc+ XDAFq8/ACDqdPMUxGzCmpMpRa7S/T1pXf3I9/GeBElJsrYMLBbWAFpyE8fBbyq6c2+ku x4HQ== 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=+H9UYlRmqVO8yptjvYMIoxPGGH/04VbttZQFCTzfSSI=; fh=g4s2jU8t/W1wGraKJcf4drMIpLYu/oWYTROkTdMMVGc=; b=UNpHbBqCGR5uQH5e7sL2oEN6mE9LVCIK5rbIZrwvJwL46TJ2DnmeIlp7NtxqUf6XdW ipSTm87DkfDwdeHlR4/9Vnc9/PZHEWBrqT8RChNRZAqtlRpd0gsca69uBlq5Sf+0dMab IJMXlMjnHAfsJpPeTBrPk/SnDkSBUUUQydIcrTeDj4nqba5XRntVuoK0X4lvZioeb3nP 2uzsvlDNdts/Agyn9ybH/Md+R8S3a/2hXqs0yd4X99Exyhgw5pSN/lVYYlHeX9ZykAnk pMa+BlRFUy/nCDVxn6+e2vqUwMHYEZlgHlDqJHqZuLtVJgYXxtyhj4EHosUVFIF+SewA LMRw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Sbk3vCA5; 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 5b1f17b1804b1-440a53b4483si76286565e9.164.2025.04.29.07.11.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 29 Apr 2025 07:11:59 -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=Sbk3vCA5; 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 1u9lfT-0004aG-U6; Tue, 29 Apr 2025 10:10:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u9ler-0003X3-NT for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:10:07 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9len-0006Vz-Es for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:10:00 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-3912fdddf8fso4535240f8f.1 for ; Tue, 29 Apr 2025 07:09:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745935795; x=1746540595; 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=+H9UYlRmqVO8yptjvYMIoxPGGH/04VbttZQFCTzfSSI=; b=Sbk3vCA5vCtt21Z/i7B8G5BcuAJbZiMleeb/lV4qPIb57mod6W6myT7tZhDpwmUMMm sgXPmtHm0SB2jt3a/UTv07RnIteRb7jKeEda2dwkM3xdj4eoYPvHfVk1nz+b1ZBFoUdw ZIxW9/BOe2ZRZ6d6woAKkDFp7XIBs2/6jL5SU9e603PkgkZ+7VDHoApHGdExFj24FiZ3 Qv7j/bB0RwG8mWE1VO3KFM1d9/E/CD0eYsJcP+MKSNqblon/S0+DhrGw+t6q24ZMVHr2 IxsaHZdIDJv4sFXTD/qUTIOWBrJUhlzdvFktAISik0G0+8nEpyBBWso299LPcIp/qBGq 8oHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745935795; x=1746540595; 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=+H9UYlRmqVO8yptjvYMIoxPGGH/04VbttZQFCTzfSSI=; b=cgmdf1qkDF4P23nIZujdirl6xCJQ26a64HSGYRqL0+S7t5BSNSe+J7m2LBzjQzRYti i8vgiD/tOMnPlgJXiITzjzw+/ieWmigOeFtjSoulsQOKng2DosiE6hElzRzCVdlJH8mN coaSsrXqd1eDOWihvvnKdrZ/+17kKj6XCLbctYLsFcy7k2mRpUUmlMgTapbNg3Q/T4Tf qbHMuIOEe1NkKXHIBSIX9ZROTU+OZ0CrcX1Mo4Wyyj9XqL57000hEiCyheLzYk01hSPa J/X3tIcPWtWrXe4B16csXaEsshUlzQEnNoICVq55y1JgJeIW/5c3+rKdEQETPG6fXmL6 DXag== X-Gm-Message-State: AOJu0YwxWVWBMuXGdo/D4YHO+WVRhK9KcuSLtKmqku/cGosPtd9BNkq0 WuYeWJ10fZUN4LIfpH9XHFVOiuysN7ITaRCmR7sJ32oCMGyRCuHJklYuCi64+kBQZvoxAwC7KTf r X-Gm-Gg: ASbGncsG6bElI2C9ZS5mxcurXdm2KCd8X+dJvjG61ZSPfR1uqC+c/q33xGS87WT0Ykr rMn5XL4eAMMqnkpwrLVWcd1I1BCl6jyOE9IDrB8xr6WelFzn8MxVF/3Q2PnKpJ2zs6snX4Pkh4j VMy0hFB5DclWa53NOzIDfA51tWpq1x0dXkRKQh9+wCJwuKo5VG8sisz832B7TTZ83Kf1+h8QLGc 3uPIe2ADVNaWI+cCx+sS8OQae1MK1J7/9tgo4VR7QoeDhaZGxrMMGWkDz5s4me0h4Pv1Nk0voJZ 38+bsjDyNC14HoajSnlCkZ3gL4oF3gQcI9CSP5sjm2xPWiLPAaE3EVAUzgMQuF7KzfRzLnG4+w3 H8dMR5yGvSCWIzDP5kg0w X-Received: by 2002:a05:6000:3112:b0:39f:bfa:7c90 with SMTP id ffacd0b85a97d-3a08a51cbe4mr2658356f8f.13.1745935795537; Tue, 29 Apr 2025 07:09: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 ffacd0b85a97d-3a073e5e351sm13788043f8f.100.2025.04.29.07.09.53 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 29 Apr 2025 07:09:54 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Hanna Reitz , Fam Zheng , Paolo Bonzini , Gerd Hoffmann , qemu-block@nongnu.org, John Snow , "Michael S. Tsirkin" , Zhao Liu , Eduardo Habkost , Jason Wang , Kevin Wolf , Yanan Wang , Marcel Apfelbaum , Dmitry Fleytman , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= Subject: [PATCH v2 17/19] hw/net/vmxnet3: Remove VMXNET3_COMPAT_FLAG_OLD_MSI_OFFSETS definition Date: Tue, 29 Apr 2025 16:08:23 +0200 Message-ID: <20250429140825.25964-18-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250429140825.25964-1-philmd@linaro.org> References: <20250429140825.25964-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=philmd@linaro.org; helo=mail-wr1-x436.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=unavailable 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 VMXNET3_COMPAT_FLAG_OLD_MSI_OFFSETS was only used by the hw_compat_2_5[] array, via the 'x-old-msi-offsets=on' property. We removed all machines using that array, lets remove all the code around VMXNET3_COMPAT_FLAG_OLD_MSI_OFFSETS. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé --- hw/net/vmxnet3.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c index 83d942af179..3cf5d71f478 100644 --- a/hw/net/vmxnet3.c +++ b/hw/net/vmxnet3.c @@ -42,18 +42,13 @@ #define VMXNET3_MSIX_BAR_SIZE 0x2000 /* Compatibility flags for migration */ -#define VMXNET3_COMPAT_FLAG_OLD_MSI_OFFSETS_BIT 0 -#define VMXNET3_COMPAT_FLAG_OLD_MSI_OFFSETS \ - (1 << VMXNET3_COMPAT_FLAG_OLD_MSI_OFFSETS_BIT) #define VMXNET3_COMPAT_FLAG_DISABLE_PCIE_BIT 1 #define VMXNET3_COMPAT_FLAG_DISABLE_PCIE \ (1 << VMXNET3_COMPAT_FLAG_DISABLE_PCIE_BIT) #define VMXNET3_EXP_EP_OFFSET (0x48) -#define VMXNET3_MSI_OFFSET(s) \ - ((s)->compat_flags & VMXNET3_COMPAT_FLAG_OLD_MSI_OFFSETS ? 0x50 : 0x84) -#define VMXNET3_MSIX_OFFSET(s) \ - ((s)->compat_flags & VMXNET3_COMPAT_FLAG_OLD_MSI_OFFSETS ? 0 : 0x9c) +#define VMXNET3_MSI_OFFSET (0x84) +#define VMXNET3_MSIX_OFFSET (0x9c) #define VMXNET3_DSN_OFFSET (0x100) #define VMXNET3_BAR0_IDX (0) @@ -61,8 +56,7 @@ #define VMXNET3_MSIX_BAR_IDX (2) #define VMXNET3_OFF_MSIX_TABLE (0x000) -#define VMXNET3_OFF_MSIX_PBA(s) \ - ((s)->compat_flags & VMXNET3_COMPAT_FLAG_OLD_MSI_OFFSETS ? 0x800 : 0x1000) +#define VMXNET3_OFF_MSIX_PBA (0x1000) /* Link speed in Mbps should be shifted by 16 */ #define VMXNET3_LINK_SPEED (1000 << 16) @@ -2122,8 +2116,8 @@ vmxnet3_init_msix(VMXNET3State *s) &s->msix_bar, VMXNET3_MSIX_BAR_IDX, VMXNET3_OFF_MSIX_TABLE, &s->msix_bar, - VMXNET3_MSIX_BAR_IDX, VMXNET3_OFF_MSIX_PBA(s), - VMXNET3_MSIX_OFFSET(s), NULL); + VMXNET3_MSIX_BAR_IDX, VMXNET3_OFF_MSIX_PBA, + VMXNET3_MSIX_OFFSET, NULL); if (0 > res) { VMW_WRPRN("Failed to initialize MSI-X, error %d", res); @@ -2221,7 +2215,7 @@ static void vmxnet3_pci_realize(PCIDevice *pci_dev, Error **errp) /* Interrupt pin A */ pci_dev->config[PCI_INTERRUPT_PIN] = 0x01; - ret = msi_init(pci_dev, VMXNET3_MSI_OFFSET(s), VMXNET3_MAX_NMSIX_INTRS, + ret = msi_init(pci_dev, VMXNET3_MSI_OFFSET, VMXNET3_MAX_NMSIX_INTRS, VMXNET3_USE_64BIT, VMXNET3_PER_VECTOR_MASK, NULL); /* Any error other than -ENOTSUP(board's MSI support is broken) * is a programming error. Fall back to INTx silently on -ENOTSUP */ @@ -2472,8 +2466,6 @@ static const VMStateDescription vmstate_vmxnet3 = { static const Property vmxnet3_properties[] = { DEFINE_NIC_PROPERTIES(VMXNET3State, conf), - DEFINE_PROP_BIT("x-old-msi-offsets", VMXNET3State, compat_flags, - VMXNET3_COMPAT_FLAG_OLD_MSI_OFFSETS_BIT, false), DEFINE_PROP_BIT("x-disable-pcie", VMXNET3State, compat_flags, VMXNET3_COMPAT_FLAG_DISABLE_PCIE_BIT, false), }; From patchwork Tue Apr 29 14:08: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: 885745 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp349609wrq; Tue, 29 Apr 2025 07:15:46 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUyDLe/j2koNwU+3sRtgZbhkAGFyQaDYgP23bRUCDQuNnZfgHb9zjUxzJ+nxQsAg7d8tr7jQQ==@linaro.org X-Google-Smtp-Source: AGHT+IE9Slm9YmAlKv3oqAEq0GOgGZAKotXOKqRGE8mXu9zm5UaaPL+IVr5iuND5Md1B0OVaDcmh X-Received: by 2002:a05:600c:4fd0:b0:43c:f597:d582 with SMTP id 5b1f17b1804b1-441ac84beddmr28200675e9.1.1745936145913; Tue, 29 Apr 2025 07:15:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745936145; cv=none; d=google.com; s=arc-20240605; b=eOmaXBPVvDI/C5dpElpKaXwvIurkgY/HyGw3q6sC11vOWPmdyt2bwmsWNUVDxhUFOm 5f65/0mTTJYv8hAJ4lHLb0DTPfrr5Ybj5veC1OQFxqUDrMnWrDvRg0MIOKrTjSYMilni op/EUelBLWBVvOEPJZNA41fFOJGURkeLwHVBxAb2BaYRlbxTXT9VQ8iWQlPldJEUBdBO iP1UUcAveIObcSYjRX4H2KBqe4HRY5TmwJ1va2PcPopIV8eGc+x+f5nd/7Jvvfg+6u+8 jXFqKDfgkPd5pnnx/HJ9RDNO77jIZHvwc+D2/xtfJvbQQCuXAjSgYxF84BE3VhdUUcH/ Ob/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=Pj+GFYlfc9iJo6yTyQ5Nz9Q5zJ67gCxIABOM4SRTAcA=; fh=g4s2jU8t/W1wGraKJcf4drMIpLYu/oWYTROkTdMMVGc=; b=Ma9Z9ruDcniACKgwYGCgXjog4eeqbzZKHGZFg+oz/jLEn9JPYJ4IRe8vEEuFHQnOGF fApwddfr4wvCfEM4QPZ24sZqUrMaIPlnCi06BTJfhHY1QdIUIcJ1hzYoBaKnWl83HOuH 8D08u0Q9Kn7JVibXoEXffsxsGFbukU9v/+ef39yv4BlpItZxpgN20H+fju+TxfSjj0s1 slK8Z/fZfEOHZt5qt6Hm9HXRnvRppepk3T7GYA0ofyyamBhqVGt5ktVgLltkLmKeiYG9 +jeRg74uOtx6LMOBlSV+1UpFVRcmrEJ8pAAkZdwDX7nD8+QCBUMK7iYDlO3ffnFlGU1v 2UWA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="gXh/bVlQ"; 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 5b1f17b1804b1-4409d2d7e88si90345995e9.96.2025.04.29.07.15.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 29 Apr 2025 07:15:45 -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="gXh/bVlQ"; 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 1u9lfR-0004Ta-Dy; Tue, 29 Apr 2025 10:10:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u9lex-0003Ys-JX for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:10:13 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9let-0006Y9-IQ for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:10:06 -0400 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-39c14016868so6138062f8f.1 for ; Tue, 29 Apr 2025 07:10:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745935801; x=1746540601; 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=Pj+GFYlfc9iJo6yTyQ5Nz9Q5zJ67gCxIABOM4SRTAcA=; b=gXh/bVlQdJQTMAVRSkqnIAWAV7I9YCDkmkcdrfeZk4cRDELaohkEJ4fvil/Pj+ClqL 9hMGN41Gkv8BYsBQcuhePMjskOeFOt1sEYadga3ZHJvU0j1PxpPLeP9K6s3UPURMWBPQ TMX9tZ/XCP8U+jOME8tT1MKiW1jFIBUjlbOpkhqhYK43Geu64w+GSb8Xp1T/u7PnbC9q pM0/fkCrU4Ni8X6RYUNOOO/78vLa+TiFFnKBkyz3SLTvQ4UX5ayOkxRI03DBBGWf7Yd4 65W/r3WO5WY6sSiufIAa9ovMddvtR5stOiuZhC0D8s6Fv7003ht/snQXMSFaXRVE/3Yo eFtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745935801; x=1746540601; 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=Pj+GFYlfc9iJo6yTyQ5Nz9Q5zJ67gCxIABOM4SRTAcA=; b=xHj040E04T8rnPOGqI4ECcaWXsau+dIkly+iG+72G8J5qgcGVGIqZqCVmPilYJsHjS OHFlM9fYlXMTfeSkg1xSC9yc9cClrS3e3H/pr1tKIexN49wWIpBxz61mvshHGkCf2r+Z W/kSIFLr8HmCm7gr3mgEe8WDUGddcfLDF+4ZRPEwRYa6tIwh2cj3vOFXbwFyNwlU9q10 pd2JBPbuhbnpSpr9R3T9eQle4GkCJOo3bj5wty5LTa2T+qsilrHRA+RHtGJS2nYwyVQ5 wD+C6apHsJifujYDPPxYnt2ZBDC5+McW0aPcozI6bpsZQDl/4P6YhbSbrU3kVwqEUnO1 E8JQ== X-Gm-Message-State: AOJu0YyfuQlOLUFPc8Gp5I2lcD96oDEF8gBQGOphmBCP6yuDbVBjORfH EL69MSKVqBSnU12qtnUC5phvPjNK8VhMS5rluSUr02jeRZGWviK3ltbglfk/BV0Lm/3TMcrt1ry b X-Gm-Gg: ASbGncvi7RkUE2xpS4IE2Z0ivCp/j0C7DeHOVj6IQez8GXCDXl46ZeeQFzInWoZCEkc 4XA/0pSlcgAb7BDJ7+qWkoLu53kAhgVVu7Ha/XEF8JPe1nUcSz7XZ2v4z+EwoLXMHCeIjkU4UEx J+ifaIxJPegRZyoVNJ2gpWbo/U+sVZGeKfREh9hW2j0EXqBxFpPspdxn3vc7DnNPj2Ac0ptnjIQ 2+yKnmNBt1lwveXrGGwupmyXjjLJAtt7tJHWo0H18PNBsWtecE8vdJGzoCumBunXN5etakSnjo5 NTfIQIPSgBGyZ+5/ybh16DBaN3yIF4LBA9luCtPOl33882ZMFQEtMuD1fwgC79EAbM8DlZqN+S4 KW3xbrwRgHbFPNfu6sfFU X-Received: by 2002:a05:6000:507:b0:3a0:8119:7ab3 with SMTP id ffacd0b85a97d-3a0890ab0a3mr2962571f8f.15.1745935801186; Tue, 29 Apr 2025 07:10: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 ffacd0b85a97d-3a073c8da58sm14202431f8f.15.2025.04.29.07.09.59 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 29 Apr 2025 07:10:00 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Hanna Reitz , Fam Zheng , Paolo Bonzini , Gerd Hoffmann , qemu-block@nongnu.org, John Snow , "Michael S. Tsirkin" , Zhao Liu , Eduardo Habkost , Jason Wang , Kevin Wolf , Yanan Wang , Marcel Apfelbaum , Dmitry Fleytman , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= Subject: [PATCH v2 18/19] hw/net/vmxnet3: Remove VMXNET3_COMPAT_FLAG_DISABLE_PCIE definition Date: Tue, 29 Apr 2025 16:08:24 +0200 Message-ID: <20250429140825.25964-19-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250429140825.25964-1-philmd@linaro.org> References: <20250429140825.25964-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=philmd@linaro.org; helo=mail-wr1-x434.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=unavailable 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 VMXNET3_COMPAT_FLAG_DISABLE_PCIE was only used by the hw_compat_2_5[] array, via the 'x-disable-pcie=on' property. We removed all machines using that array, lets remove all the code around VMXNET3_COMPAT_FLAG_DISABLE_PCIE. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé --- hw/net/vmxnet3.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c index 3cf5d71f478..d080fe9b38a 100644 --- a/hw/net/vmxnet3.c +++ b/hw/net/vmxnet3.c @@ -41,11 +41,6 @@ #define PCI_DEVICE_ID_VMWARE_VMXNET3_REVISION 0x1 #define VMXNET3_MSIX_BAR_SIZE 0x2000 -/* Compatibility flags for migration */ -#define VMXNET3_COMPAT_FLAG_DISABLE_PCIE_BIT 1 -#define VMXNET3_COMPAT_FLAG_DISABLE_PCIE \ - (1 << VMXNET3_COMPAT_FLAG_DISABLE_PCIE_BIT) - #define VMXNET3_EXP_EP_OFFSET (0x48) #define VMXNET3_MSI_OFFSET (0x84) #define VMXNET3_MSIX_OFFSET (0x9c) @@ -2466,8 +2461,6 @@ static const VMStateDescription vmstate_vmxnet3 = { static const Property vmxnet3_properties[] = { DEFINE_NIC_PROPERTIES(VMXNET3State, conf), - DEFINE_PROP_BIT("x-disable-pcie", VMXNET3State, compat_flags, - VMXNET3_COMPAT_FLAG_DISABLE_PCIE_BIT, false), }; static void vmxnet3_realize(DeviceState *qdev, Error **errp) @@ -2476,9 +2469,7 @@ static void vmxnet3_realize(DeviceState *qdev, Error **errp) PCIDevice *pci_dev = PCI_DEVICE(qdev); VMXNET3State *s = VMXNET3(qdev); - if (!(s->compat_flags & VMXNET3_COMPAT_FLAG_DISABLE_PCIE)) { - pci_dev->cap_present |= QEMU_PCI_CAP_EXPRESS; - } + pci_dev->cap_present |= QEMU_PCI_CAP_EXPRESS; vc->parent_dc_realize(qdev, errp); } From patchwork Tue Apr 29 14:08: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: 885740 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp348333wrq; Tue, 29 Apr 2025 07:13:49 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWfFF2gWa/mg+RJHjdOWPCovUzBtOv1Rs3cRu6X8+Bo6ILMTYzjFkqjs3vUSYHwkvYFP2htnw==@linaro.org X-Google-Smtp-Source: AGHT+IEX7e8/PzHLqidm34WtDJ+jyiDFefqQuNHhrRlvK/yRbI9CiDwwNmGwbw4pC0HDjzXuCDRB X-Received: by 2002:a05:6000:402b:b0:39c:266c:434 with SMTP id ffacd0b85a97d-3a08a558f5amr2782411f8f.27.1745936029302; Tue, 29 Apr 2025 07:13:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745936029; cv=none; d=google.com; s=arc-20240605; b=IO7vKZ4SVutd701vhAFtrpI6IB5R6nftU9TMrgqaNUa0rN2bCvZA/OXg6IL4TnlC8A 3k2MPLyzqs0nzt49fSD2X7KyYh0TAF4+QlGLNBSLex3zdjABqnm5H2eMDUtC5ROt1E9L 44lOshDgy483GDdMKC9NgDCd5BiO6lDwbqjeMvoeDELQCVNzeeKfr1AlxxsXu3Pt/1Ma MtnopNg+HjHdZJntJZ4yAyAXSs5pOnqzy+jNG7KmSoMXKLb4kmMBTBpGeeZ+Eoc6/OF7 MKFBDdkm3oyGAdHaGmFKEMUBSZE0v2sbZZRcgvc6vK1yKkLr0roDu2C2tZ8oPCaSwtvj B+8A== 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=kg1vT0Z/kKcz1VyaWx5HUe6zicIy/oQzxPnBZl9mXrw=; fh=g4s2jU8t/W1wGraKJcf4drMIpLYu/oWYTROkTdMMVGc=; b=TRVJ/gFnwApew0f7KONrhONchDGESdgg6AublfApxo3DQJX+z7SNP54TvkLQ8MSB4V opVGoB/AagCKnivd9XMZG6DaSWmRZKt2wu6/EvEq85+gh8Kf9GwDuKxoNqZtcIgQsQIK TawDTlS4rxkk4lo+E8hFffBppVbcwoq21Ka86Uge62+gBOvAD1xIONc76TCXl/DmIyEw 3ywKLmq4qY+IU7wJx9SUOi6F6Nqq5YIqAqQNI4mdar1rXHxbOIgJ4zhaPJgpq3gK7guL PAsTXB7DCp/36gLp40FcV/lJ0CKGcS928PdwmDXKSI45B8RJkpfs/d2fYg6sD4Yqesjp Bdfg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="H+5ob/45"; 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 ffacd0b85a97d-3a073e3b353si7053679f8f.329.2025.04.29.07.13.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 29 Apr 2025 07:13:49 -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="H+5ob/45"; 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 1u9lfP-0004Er-6g; Tue, 29 Apr 2025 10:10:35 -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 1u9lf5-0003mP-7u for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:10:21 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9lf1-0006b1-JW for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:10:13 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-43cfa7e7f54so40884395e9.1 for ; Tue, 29 Apr 2025 07:10:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745935807; x=1746540607; 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=kg1vT0Z/kKcz1VyaWx5HUe6zicIy/oQzxPnBZl9mXrw=; b=H+5ob/45GKczEEZW8o5PqgsVP6V58hb6IltywBddL3pA1/R7Z64Z+NVCfZHuM8pKjt YW1qv0tasaEmC3V3Pgt663r17Vt3kPiYlzlKTkBwFc6rlelJ9U5c3DgWosV3UAqQTV9b LMzsT9gL5+TnPiWqvdaxbOUyijVSP6RvGVyKEG4+p0TMMRIZrrMoS5SKE1ki441StXEA O1Llq6XHQHsntWGodM95kXkl0O+S+cJri+xYlMcmtrR5KuXTXrSW04FE81jDNUzyc16q OqNfAcikxSOsJk0TNqtB5IIpDe3bUQUdlHJ9JiN6bWwlxLDvQ3BGJuiLrJy5zBTtwajo 7ftw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745935807; x=1746540607; 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=kg1vT0Z/kKcz1VyaWx5HUe6zicIy/oQzxPnBZl9mXrw=; b=A/++nffezrxCfK0vCVYFSciGXu8l7FvTh0nmK/BdyFAjODwaWrkJRvXbZBwDmLVbXi bkOlj8KcKonU2NhQajjapJ3PEVXPHnSEYR823m7IpE+bSeZITeJK3+TkszIAYzpQAkFt IKZ+jwpF96lIfy0Nhj/6HvX3+pS4aPKsEM4j32Wrs26c7alJbOnOu5+9x2kWIt5Pz+m3 FEFxAM8aEe92WvWhJBCvOQYFttcYxKlzsPgFclMk84E2VdbxwZkAeZaAS7zDNxZzVKip iCL6NfRMlTVT4eZF1FADYsTARm4MT+Fqlpl6S+ajyD9E2jvdnVUVJmR3NDfyjmg+W0Yn kWog== X-Gm-Message-State: AOJu0YwSLvhTcUyox3CGj5ia3bDGng5PTUQeYwk7xvsQSzTbcOWnMPdH Ld/FMsIbNW4eGD9+79lMweDstdb1qEC+IJUvyBbMt1DRFcZcWCHz3iWjOV6rP62RmaRIzBTjzSu i X-Gm-Gg: ASbGnctS+Ut8wm6OJAKgIABPhrIAPIMFycnGiuNw6AR7WvEcASiwSVX3u8f2eNGf2vO xPWr4QiePEdJkAVm5bBCFpYMibLUB4QwaS7I9m4FERrChyoQR5zLZ/+wZd9xL0PxayIImX+Xqg9 2Cuxr4iE8O1LV4y23T4usIBchi1eBpzj66xHAwuCVAPvPvk2uS3G6uBLpkm7AjuqsrIXp5HlRbu pFAb+J4VyNm346bnxPFbvK4J94Q0LAGKUrPC5k+H/6Q4wCLkfYySaKTanwsN+8B7l0NM78BP52c p75cGR3ZjbFq/knyEAqeebnNnAztVBua5NEgl1ssZIUhqsKLeSxV07JcTi7rKI7VR94URTJmLLE olOwnRdo3Sveme4rNQa9X X-Received: by 2002:a05:600c:35cf:b0:439:4b23:9e8e with SMTP id 5b1f17b1804b1-441acadf4a7mr31220505e9.3.1745935806849; Tue, 29 Apr 2025 07:10:06 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4409d1e19e1sm188405515e9.0.2025.04.29.07.10.05 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 29 Apr 2025 07:10:06 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Hanna Reitz , Fam Zheng , Paolo Bonzini , Gerd Hoffmann , qemu-block@nongnu.org, John Snow , "Michael S. Tsirkin" , Zhao Liu , Eduardo Habkost , Jason Wang , Kevin Wolf , Yanan Wang , Marcel Apfelbaum , Dmitry Fleytman , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= Subject: [PATCH v2 19/19] hw/net/vmxnet3: Merge DeviceRealize in InstanceInit Date: Tue, 29 Apr 2025 16:08:25 +0200 Message-ID: <20250429140825.25964-20-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250429140825.25964-1-philmd@linaro.org> References: <20250429140825.25964-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=philmd@linaro.org; helo=mail-wm1-x333.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=unavailable 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 Simplify merging vmxnet3_realize() within vmxnet3_instance_init(), removing the need for device_class_set_parent_realize(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé --- hw/net/vmxnet3.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c index d080fe9b38a..7c0ca56b7c0 100644 --- a/hw/net/vmxnet3.c +++ b/hw/net/vmxnet3.c @@ -2238,6 +2238,7 @@ static void vmxnet3_instance_init(Object *obj) device_add_bootindex_property(obj, &s->conf.bootindex, "bootindex", "/ethernet-phy@0", DEVICE(obj)); + PCI_DEVICE(obj)->cap_present |= QEMU_PCI_CAP_EXPRESS; } static void vmxnet3_pci_uninit(PCIDevice *pci_dev) @@ -2463,22 +2464,10 @@ static const Property vmxnet3_properties[] = { DEFINE_NIC_PROPERTIES(VMXNET3State, conf), }; -static void vmxnet3_realize(DeviceState *qdev, Error **errp) -{ - VMXNET3Class *vc = VMXNET3_DEVICE_GET_CLASS(qdev); - PCIDevice *pci_dev = PCI_DEVICE(qdev); - VMXNET3State *s = VMXNET3(qdev); - - pci_dev->cap_present |= QEMU_PCI_CAP_EXPRESS; - - vc->parent_dc_realize(qdev, errp); -} - static void vmxnet3_class_init(ObjectClass *class, const void *data) { DeviceClass *dc = DEVICE_CLASS(class); PCIDeviceClass *c = PCI_DEVICE_CLASS(class); - VMXNET3Class *vc = VMXNET3_DEVICE_CLASS(class); c->realize = vmxnet3_pci_realize; c->exit = vmxnet3_pci_uninit; @@ -2489,8 +2478,6 @@ static void vmxnet3_class_init(ObjectClass *class, const void *data) c->class_id = PCI_CLASS_NETWORK_ETHERNET; c->subsystem_vendor_id = PCI_VENDOR_ID_VMWARE; c->subsystem_id = PCI_DEVICE_ID_VMWARE_VMXNET3; - device_class_set_parent_realize(dc, vmxnet3_realize, - &vc->parent_dc_realize); dc->desc = "VMWare Paravirtualized Ethernet v3"; device_class_set_legacy_reset(dc, vmxnet3_qdev_reset); dc->vmsd = &vmstate_vmxnet3;