From nobody Fri Apr 17 09:26:01 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1772898163; cv=none; d=zohomail.com; s=zohoarc; b=Kt75HWSnauNBy/ol44M5E9IdvhUI09v+OOope+9ayo6Po46E9/j6ZJldbmjCS8qrHXS4QIC8cjYYPFiwpi190tt1OOJei7qlLBXY32ozDBFoH6MvojMzldL4xk6Wvo1KZy7aEdsiEsGMz1J2MFG157/0k9cneFL1PqJjgh3/XA0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772898163; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=m7Kk6MjDuDA1LkvACL+1FQnoFQPtC5qLEf0h4BItBFs=; b=IUYKgu6eGvXtDA3zjYvO+6vcr+Qqz0YhtbLOZ2EEoC+7emE7LYuvJCv23HZVAtPA9Y56BKXN6FnGFSfc4CHunVUUqSHxIbyQiUu6Sue4pfabikI+JzFJk/kFV2zdCqSccI1Ogz/cIw0YG27vX7p/fy9FFUxkEn7oo6ezPRbaPLU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772898163620278.75651799771674; Sat, 7 Mar 2026 07:42:43 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vytnF-0001zQ-1s; Sat, 07 Mar 2026 10:42:17 -0500 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 1vytnD-0001qn-7u for qemu-devel@nongnu.org; Sat, 07 Mar 2026 10:42:15 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vytnB-0002Yr-Fv for qemu-devel@nongnu.org; Sat, 07 Mar 2026 10:42:14 -0500 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-48370174e18so62462085e9.2 for ; Sat, 07 Mar 2026 07:42:13 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dad8d968sm11429826f8f.6.2026.03.07.07.42.10 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 07 Mar 2026 07:42:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1772898131; x=1773502931; 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=m7Kk6MjDuDA1LkvACL+1FQnoFQPtC5qLEf0h4BItBFs=; b=gcXpG42bM4goxxjn1EMEWBbtHHt+RtYbJxNNvYvEeDG1oZfir7TC9olqujORTZWMvg Hdo5RzG2Fv33oqMLC53HVJViFxDkqh4hP5VaKeigAwuG7NmFHM0QdOQy+or8bloC18/b Q0ubw3BZlLsjEgpYUsk1A4KJbj9dK8xX4VgihwPAw/OmXf5P2zfol7/EB+VZBmUzLXUH VrRZricGMmTSpED906pBSCaL/iGMK28fPnFaCusiYoenip0X3BqzLwx1W0jeCRhDhltj 3wLCUhcg15RGAjuG+ya8cQRUiw05j07YwygaTMjwKSUkeoReYMg/zO2bGr7j46Dj5ksS fiHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772898131; x=1773502931; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=m7Kk6MjDuDA1LkvACL+1FQnoFQPtC5qLEf0h4BItBFs=; b=r/YWlqsnIMVQ7KMEnMxl74pnZJeshkfUFRm8kmGoOj4OpODVN3NQWTNnKLpfcw0GJw wWMGIzutomMemgyE+Pfqi7MAsn1tkRrYH951c7g9DoP1DXhb17YRL+d/Y9E37bYYwbeC tVUc1a2zZAkOfkI+HazgDHdx8/Fxb2w83Qqaf5q2jVzetHS94M3kM8QLdtKEZ25fWzXc yEGwAe/lpjF6qzW0UyELVv8nC79MpImAEXarVUKibIIXcFAhKPZxPkw/SgTp8flVvZpJ ICXC2is2ok1jOSc8ZvReQK8jPiNVxAkGAMZlyWWgVxqdlYNdgoQZqkKjO7bPDoTCJApv G0eg== X-Gm-Message-State: AOJu0YxN0Q7S3uZrVJcnBP/T7AwhSJCZXMZkcMG1emo6rO7iQROaf+IG 85rGQaLc7RoJEEHDR/00o1eud1NbW6UzfwewNyqMf3UGOmHSLzqFsByynfLsG1LPAhdLOEOjJcC FIByLeLs= X-Gm-Gg: ATEYQzxi0pF/Ci34x8TrL04lDighGVlNNmyyShYnlXE7vwfQtHm7ACObpHsnTQFtUet K8yYv8olm2LAWfkYtkyGhuiT63yryrwQHBqdQ+PgdxiMRW8o4OSUMebFjh4ZygqnBcoyGwElscC 1lLMQ2bY2b8pKAv/qapCZ87eouWdRxJ9k9FV/9OkYvJToNmGmU8FPi+glamJw7hVIZmto2NqbEy mEXjQQQAd4WYG5WD0R8EW+xVaQOGMhI5kGW9FRQuo0U0bXHYxTaamKcYgCXc342vrVu4DSMHO3l oj02S/KNLG/0kHbZlPYmMhgsxNcsaiD+H5/19DVKGnOZL3I5juDQb4F3MBkNQTCwaTHVIu/UX0D O/jdLvyUTyRYxTCPyUpdcvTmOKQIDQ3UGCueRbktoXqFv01Eo4fSc9QBZ+FpFg8WKxQm9MRI5FK ub7LwoNzXUZdqvTw2V8Jr6AxZ7lL4773AT3jAGppC/vIhJS0yZOtEvCaCC/HnbZwhkNtBI4I6X X-Received: by 2002:a05:600c:3b04:b0:483:71f7:2796 with SMTP id 5b1f17b1804b1-48526923e1amr96087595e9.10.1772898131129; Sat, 07 Mar 2026 07:42:11 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Igor Mammedov , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" , Yanan Wang , Thomas Huth , Paolo Bonzini , Zhao Liu , Eduardo Habkost , Marcel Apfelbaum Subject: [PATCH 1/6] hw/i386/pc: Remove deprecated pc-q35-4.0[.1] and pc-i440fx-4.0 machines Date: Sat, 7 Mar 2026 16:41:57 +0100 Message-ID: <20260307154202.86309-2-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260307154202.86309-1-philmd@linaro.org> References: <20260307154202.86309-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1772898164522158500 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=C3=A9 Reviewed-by: Thomas Huth --- hw/i386/pc_piix.c | 11 ----------- hw/i386/pc_q35.c | 25 ------------------------- 2 files changed, 36 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 13981fb3aba..f087579694c 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -644,17 +644,6 @@ static void pc_i440fx_machine_4_1_options(MachineClass= *m) =20 DEFINE_I440FX_MACHINE(4, 1); =20 -static void pc_i440fx_machine_4_0_options(MachineClass *m) -{ - PCMachineClass *pcmc =3D PC_MACHINE_CLASS(m); - pc_i440fx_machine_4_1_options(m); - pcmc->default_cpu_version =3D CPU_VERSION_LEGACY; - compat_props_add(m->compat_props, hw_compat_4_0, hw_compat_4_0_len); - compat_props_add(m->compat_props, pc_compat_4_0, pc_compat_4_0_len); -} - -DEFINE_I440FX_MACHINE(4, 0); - #ifdef CONFIG_XEN static void xenfv_machine_4_2_options(MachineClass *m) { diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 52b8064b4d2..cb23322f5a4 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -575,28 +575,3 @@ static void pc_q35_machine_4_1_options(MachineClass *m) } =20 DEFINE_Q35_MACHINE(4, 1); - -static void pc_q35_machine_4_0_1_options(MachineClass *m) -{ - PCMachineClass *pcmc =3D PC_MACHINE_CLASS(m); - pc_q35_machine_4_1_options(m); - pcmc->default_cpu_version =3D CPU_VERSION_LEGACY; - /* - * This is the default machine for the 4.0-stable branch. It is basica= lly - * a 4.0 that doesn't use split irqchip by default. It MUST hence appl= y the - * 4.0 compat props. - */ - compat_props_add(m->compat_props, hw_compat_4_0, hw_compat_4_0_len); - compat_props_add(m->compat_props, pc_compat_4_0, pc_compat_4_0_len); -} - -DEFINE_Q35_MACHINE_BUGFIX(4, 0, 1); - -static void pc_q35_machine_4_0_options(MachineClass *m) -{ - pc_q35_machine_4_0_1_options(m); - m->default_kernel_irqchip_split =3D true; - /* Compat props are applied by the 4.0.1 machine */ -} - -DEFINE_Q35_MACHINE(4, 0); --=20 2.52.0 From nobody Fri Apr 17 09:26:01 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1772898174; cv=none; d=zohomail.com; s=zohoarc; b=c1dAg8F+oraGILv0NeCqKVdJ8lbh1CXH/KnzHgXPHF5pM0OTJHm86vtXBk4QSyxNxgU8SUgzegGSykO5Qn4d7wdFAE3Q9Lc3s/HkR2rprmlzU2RHwgOoGca/RKWLwGHYkbrYWR23vF/e892KOU9OOsGGVFaNAIgp36ldOvjI9QE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772898174; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=9QMzd5YEWPj9Xk6Qsl6F51AjQBHHbgm82IdFibYrq5I=; b=Iks2W1WQr9rFH4XRso2qTKduMdtVpPYs6orvglS+WpfhsK5kCSki57StfYkP4syJKqkP6j/F+GNOnrjRRhrfLu9I2UM87omnwGiJHxQDuvx/Cr7xogOAvtWKrsifYCkuKlrP91DGoAtpbT6Ipz0C5xCqz65RDIWU/Vz3ZuWI2tg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772898174395861.3538390958101; Sat, 7 Mar 2026 07:42:54 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vytnP-0002LG-G0; Sat, 07 Mar 2026 10:42:27 -0500 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 1vytnM-0002II-LK for qemu-devel@nongnu.org; Sat, 07 Mar 2026 10:42:24 -0500 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 1vytnJ-0002an-KP for qemu-devel@nongnu.org; Sat, 07 Mar 2026 10:42:23 -0500 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-483a233819aso101063835e9.3 for ; Sat, 07 Mar 2026 07:42:21 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4852e38c013sm110315295e9.8.2026.03.07.07.42.17 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 07 Mar 2026 07:42:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1772898139; x=1773502939; 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=9QMzd5YEWPj9Xk6Qsl6F51AjQBHHbgm82IdFibYrq5I=; b=uJHILmkzmP3gQ8oppduaBpM6UUutsq+jFpiuh+7s562t9ANNXfHZCVAISU8jtu/Wg9 cD275ODc25VzIxufnDCtv+DS7JBP2Fu51rJ9HZr0r4rPp7WJ0U3nl52p0r3LaYJXVDES 4KpwZo9fQ/o7m3K9VsJ68memv1tQcFCTMsU5OpoIZbxuTyh6YbkElVZYlSHHOEh46c84 p7iJi2wbNmpBSgYbwI6YQgrVbuMUuIlZpzQOFw5Hw1f937fys2N4TK5hg+P1wGlDXHkF hK8anmm2GZ9ROkwYToFYopyblfPA+voCfIPRnaV/d1fP7nkfBjR3nvzuh0XYUkFh2IGi /cdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772898139; x=1773502939; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=9QMzd5YEWPj9Xk6Qsl6F51AjQBHHbgm82IdFibYrq5I=; b=a5yQ5gocMIEwLjZcEMDQ2ehyXkeHBpxiKbOWzZwWTW31Lf0cszQnE3zsmgSIsDHzSU y9ln+AQmpQmSvubJxOrSZHEgtzvStWZNgTvN2kidqnzUcTrIPAdp4+3wSkwEIHxcHJVA 2kYk7dgz6dU7Yi470P3iqIZEs8pCzvKCcXSafo+ZOeT17iePD/twbUvAOwOK1HW+7nlu chTCzBUyDyAeYgFd6xMHWdbHM9iiYHKSPGopHNqrAcNqy6PgqQRQqx4+F+tcoDCmrTXl 5xc1ZxmeXmwrKrZKOK8+MIr3xM/CgOlfOGIAqAapipKdxAc1pulVSruwoJHy4EiNPlBT UzLQ== X-Gm-Message-State: AOJu0Yy/XT7dM5pqyUibDFhVZ+OLtSVbzDEoBR6SaFZf0KNE0B74vUZm 2LTK2lJG4IYt2KPMRnp94+1i7g2sAWaFVtlPi+k7K28NKpx9aikxTYaUZ/U2fqRGwJ0RP9FsHxk ZT4HBR+g= X-Gm-Gg: ATEYQzwL+YddNe/9f3U46ZBTURh/2kGGDxsR0sUiXej+py2VXT4QOEIKymrCjDS3rwh etpomgSvrQxvx0tcbsCeLn32BIuJYbKSkL9CdXs4yCnkXM2IlDUjq1DXA+VTuGMH6ITsGJ8GAmt ZPcT43XG8nUcYAI6Nyqg9Il7kcEPXHBhWCtffeiGuMKHH4OCUahi6ThBP28IriuNpQLmp4SGp1u 9bd9ZTPs9hyE5MB+Z6V3IZt700DaJTRHy3ZI68ic4Ev802PVtoEPhebsCpmkJ8RtsMKusf2cXNe qOrAd/nqwqa1UWh2ZMmpihqMEoxrnxytMbxomO0DnNUgohdp/MO9wx11Z6P0Rv5Kg1hhnXxw6kg QSJosgZ1Io5bckLNare3r8rvfleVyQ8w6i1YQ+HYFrrfX7YbqhAfzVCBINh3BeZL7sOEsn5QDbk 9T07XaicCvIAZmshAO2zFGW3L/ofPiNN6B7RJpVRGAum9/3uYgo6bAqCbAQ7ygFAEb1VW7zmjN X-Received: by 2002:a05:600c:45c6:b0:483:c35d:3662 with SMTP id 5b1f17b1804b1-48526957c37mr92738305e9.18.1772898138847; Sat, 07 Mar 2026 07:42:18 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Igor Mammedov , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" , Yanan Wang , Thomas Huth , Paolo Bonzini , Zhao Liu , David Hildenbrand , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , Eric Blake , Markus Armbruster Subject: [PATCH 2/6] system/hostmem: Remove HostMemoryBackend::use_canonical_path field Date: Sat, 7 Mar 2026 16:41:58 +0100 Message-ID: <20260307154202.86309-3-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260307154202.86309-1-philmd@linaro.org> References: <20260307154202.86309-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1772898175622154100 The HostMemoryBackend::use_canonical_path boolean was only set in the hw_compat_3_1[] array, via the 'x-use-canonical-path-for-ramblock-id=3Dtrue' property. We removed all machines using that array, but the comment added in commit 8db0b20415c ("machine: add missing doc for memory-backend option") requested to not remove this property "as long as 4.0 and older machine types exists". Previous commit removed the last machines in this range, we can now remove that property and all the code around it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- qapi/qom.json | 8 +------- include/system/hostmem.h | 2 +- backends/hostmem.c | 34 ---------------------------------- qemu-options.hx | 10 ---------- 4 files changed, 2 insertions(+), 52 deletions(-) diff --git a/qapi/qom.json b/qapi/qom.json index c653248f85d..3e13e3fd25c 100644 --- a/qapi/qom.json +++ b/qapi/qom.json @@ -660,11 +660,6 @@ # # @size: size of the memory region in bytes # -# @x-use-canonical-path-for-ramblock-id: if true, the canonical path -# is used for ramblock-id. Disable this for 4.0 machine types or -# older to allow migration with newer QEMU versions. -# (default: false generally, but true for machine types <=3D 4.0) -# # .. note:: prealloc=3Dtrue and reserve=3Dfalse cannot be set at the same # time. With reserve=3Dtrue, the behavior depends on the operating # system: for example, Linux will not reserve swap space for shared @@ -683,8 +678,7 @@ '*prealloc-context': 'str', '*share': 'bool', '*reserve': 'bool', - 'size': 'size', - '*x-use-canonical-path-for-ramblock-id': 'bool' } } + 'size': 'size' } } =20 ## # @MemoryBackendFileProperties: diff --git a/include/system/hostmem.h b/include/system/hostmem.h index 88fa791ac78..cafcf9c9c74 100644 --- a/include/system/hostmem.h +++ b/include/system/hostmem.h @@ -74,7 +74,7 @@ struct HostMemoryBackend { =20 /* protected */ uint64_t size; - bool merge, dump, use_canonical_path; + bool merge, dump; bool prealloc, is_mapped, share, reserve; bool guest_memfd, aligned; uint32_t prealloc_threads; diff --git a/backends/hostmem.c b/backends/hostmem.c index 15d4365b697..7da7cd54e05 100644 --- a/backends/hostmem.c +++ b/backends/hostmem.c @@ -40,10 +40,6 @@ QEMU_BUILD_BUG_ON(HOST_MEM_POLICY_INTERLEAVE !=3D MPOL_I= NTERLEAVE); char * host_memory_backend_get_name(HostMemoryBackend *backend) { - if (!backend->use_canonical_path) { - return g_strdup(object_get_canonical_path_component(OBJECT(backend= ))); - } - return object_get_canonical_path(OBJECT(backend)); } =20 @@ -484,23 +480,6 @@ static void host_memory_backend_set_reserve(Object *o,= bool value, Error **errp) } #endif /* CONFIG_LINUX */ =20 -static bool -host_memory_backend_get_use_canonical_path(Object *obj, Error **errp) -{ - HostMemoryBackend *backend =3D MEMORY_BACKEND(obj); - - return backend->use_canonical_path; -} - -static void -host_memory_backend_set_use_canonical_path(Object *obj, bool value, - Error **errp) -{ - HostMemoryBackend *backend =3D MEMORY_BACKEND(obj); - - backend->use_canonical_path =3D value; -} - static void host_memory_backend_class_init(ObjectClass *oc, const void *data) { @@ -563,19 +542,6 @@ host_memory_backend_class_init(ObjectClass *oc, const = void *data) object_class_property_set_description(oc, "reserve", "Reserve swap space (or huge pages) if applicable"); #endif /* CONFIG_LINUX */ - /* - * Do not delete/rename option. This option must be considered stable - * (as if it didn't have the 'x-' prefix including deprecation period)= as - * long as 4.0 and older machine types exists. - * Option will be used by upper layers to override (disable) canonical= path - * for ramblock-id set by compat properties on old machine types ( <= =3D 4.0), - * to keep migration working when backend is used for main RAM with - * -machine memory-backend=3D option (main RAM historically used prefi= x-less - * ramblock-id). - */ - object_class_property_add_bool(oc, "x-use-canonical-path-for-ramblock-= id", - host_memory_backend_get_use_canonical_path, - host_memory_backend_set_use_canonical_path); } =20 static const TypeInfo host_memory_backend_info =3D { diff --git a/qemu-options.hx b/qemu-options.hx index 890c4f1d230..dce5d8cd5d2 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -137,16 +137,6 @@ SRST * as backend id one shall use value of 'default-ram-id', advertise= d by machine type (available via ``query-machines`` QMP command), if = migration to/from old QEMU (<5.0) is expected. - * for machine types 4.0 and older, user shall - use ``x-use-canonical-path-for-ramblock-id=3Doff`` backend option - if migration to/from old QEMU (<5.0) is expected. - - For example: - :: - - -object memory-backend-ram,id=3Dpc.ram,size=3D512M,x-use-canon= ical-path-for-ramblock-id=3Doff - -machine memory-backend=3Dpc.ram - -m 512M =20 ``cxl-fmw.0.targets.0=3Dfirsttarget,cxl-fmw.0.targets.1=3Dsecondtarget= ,cxl-fmw.0.size=3Dsize[,cxl-fmw.0.interleave-granularity=3Dgranularity]`` Define a CXL Fixed Memory Window (CFMW). --=20 2.52.0 From nobody Fri Apr 17 09:26:01 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1772898172; cv=none; d=zohomail.com; s=zohoarc; b=htIWvTQEAbd9eVSaqW4Gwm0OdKiXi+Og+zUXjdZg0HU+FfT3oNwyi/bSdGHqZ3nikk01zjA/0YEl2ArVv8l8tIu12e+6BA9V8wp+60OnX/aSLfvY38vzOVi9hVLxKpbh1jLkH5JfpRLwiOQGkUaRScEDErLA5yw+gWJq1QQiZ74= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772898172; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=fwnhbTdZtHuK4Wlr++WMbiNe7zENSv7DVDb8dSk7bZA=; b=IqOgoza+t/QRq6sjuj9ZWx0WKfXzEdSoeHSOYpWDoRxOdLv67T4/+M5BKk3Mi76sSnXAKYCbFOWUMVKB7DGEbS4qUWzmTKrZ3Pele8oW1NBCXxqnIcsT7zReIH73roSHMAb8QGXT+nQYCJXOVXOgR97HSP5BwLCNRlFwc1R1Rn4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772898172126793.956096116506; Sat, 7 Mar 2026 07:42:52 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vytnV-0002lK-S0; Sat, 07 Mar 2026 10:42:34 -0500 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 1vytnR-0002ZV-NU for qemu-devel@nongnu.org; Sat, 07 Mar 2026 10:42:29 -0500 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 1vytnP-0002b7-MR for qemu-devel@nongnu.org; Sat, 07 Mar 2026 10:42:29 -0500 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-439b9b1900bso4906661f8f.1 for ; Sat, 07 Mar 2026 07:42:27 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dadac2a7sm12191251f8f.15.2026.03.07.07.42.24 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 07 Mar 2026 07:42:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1772898146; x=1773502946; 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=fwnhbTdZtHuK4Wlr++WMbiNe7zENSv7DVDb8dSk7bZA=; b=PM4ck9XZGwseMc4s/HZ/gOzsog78xdKJUBn5rjy0+tiYSbX+0mMHxH80k2734Z2ITa 7VPAN0d+PRi+eMGah41jTtWOpTIw/g+1T6G8JkLR0eDYApA1PSoW0XzzZSkxtCfE8BdG eWxsGhsHeISiXO6eIJ43038T/lkQQ+SKDcQPowJUa1WauVPcHxlCkABZxbHgFU9KfuPF IvYokTfeTEq1HWJBgAcORie6E+AsCG0tbCNHaBkz4mpUNVgRfixLfYDuCA+h0XRXdLIm kjWBo+VFK3W5jZiOaC57vkPfN8kR4XiTbnPcHj088/4aDD1ugJ1J5vVgSpiyEyiEqq/T ezOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772898146; x=1773502946; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=fwnhbTdZtHuK4Wlr++WMbiNe7zENSv7DVDb8dSk7bZA=; b=Eh4OLaqljTL6CFelSVnm+eCsMp7htEw/d+xLzaHhMP4riKPq0UK/UhhYJFjfTWFnfu D5rfcE0EsobxTK8vHUkPhh4o8tyNwaVXMAoFB6+1F1o5lgvr45DT/qc6J7f7Rn6AmNvi J+YxbnZfMC7kV/aotuz6tSRX2JWNu/tk/EqjTQHCuMqP4W/0Hspbs43PZkivZ0rnrpy+ PrMBtKOw/Zw2o6JyxKNLzVkp37Nud0HE+ulv9ovFgfRPQ7+c8IstFSVzkG4W+V3p09FI WgFjVJZ60UB8MyyaCUlSXZBd3cfcGIUdcf8IArgn9QNHTHgem0cupaIBC4gzykywMAft szOA== X-Gm-Message-State: AOJu0YzPVRWhgdtZuR6AcJCILynlwDPnPgvjE2FK+OboDCHsYqVbL0dD 05iG/L8CFqIKDlzYOaJQtOi3iTm5Q//u1SQqcAkGVVyL8Yq+fqFdai3H9quj1CLF1cdB+waQMgv 57/oAe1o= X-Gm-Gg: ATEYQzz+XL1n4KuYdqa/mOSVy9e7vjhx5x9CLe96R3oPpsKvTPlocGftFFFq3XUI6AB 2GVXU2eJKFpb/NNQw+0mjOTz3OFkPjDozYHoj4nglHsM+CEbE8Ln+AR4W4U/YoURSIiF/Wn/5tq cZMM3qWTn9BGUSzU4+mohkO2nSlhWAJqy4Rm7vPDjrC0eOWQ9AXKKNTEUmdxZW+xxHO0j1l0BOl TmYovIY3kxtZLuke8dM9gQnTqOW+HKOEbSBspJnaAKVEdCwE6W3aygyvSRhZ0SMigAL2UEtm98f KMz9TNe8xlqWCMAxyHp5HDIRWj5oOYtwaJmAPngvPGfXV8eso1JItUJ2xBp2SVWpk0Zut3m5VTh 6Dp8sb3i/wJ+Mrhbt/0l9BKwO1/fj+mjCcE+aEFnG2dHNMVb7N9J5P1pNBffHX5VEkVOjA7yRPf QeC07BTfkO8QeFKZb7iyfOfsN5779I7gfdMbPTRuZINuvvXtPoEexiOMUfkVCpc8eE+JB08kVv X-Received: by 2002:a05:6000:144b:b0:439:ac33:5082 with SMTP id ffacd0b85a97d-439da66b72cmr10456241f8f.26.1772898145660; Sat, 07 Mar 2026 07:42:25 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Igor Mammedov , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" , Yanan Wang , Thomas Huth , Paolo Bonzini , Zhao Liu , Marcel Apfelbaum , Eduardo Habkost Subject: [PATCH 3/6] hw/i386/pc: Remove pc_compat_4_0[] array Date: Sat, 7 Mar 2026 16:41:59 +0100 Message-ID: <20260307154202.86309-4-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260307154202.86309-1-philmd@linaro.org> References: <20260307154202.86309-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=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=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1772898173539154100 The pc_compat_4_0[] array was only used by the pc-q35-4.0, pc-q35-4.0.1 and pc-i440fx-4.0 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- include/hw/i386/pc.h | 3 --- hw/i386/pc.c | 3 --- 2 files changed, 6 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 4e1dd436ab7..22325324d09 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -268,9 +268,6 @@ extern const size_t pc_compat_4_2_len; extern GlobalProperty pc_compat_4_1[]; extern const size_t pc_compat_4_1_len; =20 -extern GlobalProperty pc_compat_4_0[]; -extern const size_t pc_compat_4_0_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 93d1a52d712..d8fd63bfe17 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -186,9 +186,6 @@ const size_t pc_compat_4_2_len =3D G_N_ELEMENTS(pc_comp= at_4_2); GlobalProperty pc_compat_4_1[] =3D {}; const size_t pc_compat_4_1_len =3D G_N_ELEMENTS(pc_compat_4_1); =20 -GlobalProperty pc_compat_4_0[] =3D {}; -const size_t pc_compat_4_0_len =3D G_N_ELEMENTS(pc_compat_4_0); - /* * @PC_FW_DATA: * Size of the chunk of memory at the top of RAM for the BIOS ACPI tables --=20 2.52.0 From nobody Fri Apr 17 09:26:01 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1772898168; cv=none; d=zohomail.com; s=zohoarc; b=Qbwr9oBuDRKHv2z2X0LYtVLQqlB1yPi8j6t2kqJZjIdNwRIsNeAwI/IChSpgX2bLn3RAPLTznsWF67HGRAYWzotiPdPkqkF0FfvsGO2nXnOtop8C8L/bmUhTAY3BXnymGzMyoSVDHLZG8SJtrhPkbJzFk2OkQEMQzZ3FNY/usRg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772898168; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=19Jh4cxb/4s8fkFA1FRyjet0D0g0yjU6dnxuKdjK/IA=; b=c1vP8is+JobuMjxDL4g95+6mXP9EEBumsmy178WxBuJjr02IK3BSITzskQNYYRicgWCuxKz4PpfF3vZiI958dfkFrO9GzuswhU5eltqCvUJvGUEKM/joF6BDMfynnwQgLQzPyeeMQ0Kn3KPrZQ6bC7OVWygarHfzo225JHo5PRw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772898168263951.3757610053823; Sat, 7 Mar 2026 07:42:48 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vytnb-000308-Iq; Sat, 07 Mar 2026 10:42:39 -0500 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 1vytnY-0002t3-2U for qemu-devel@nongnu.org; Sat, 07 Mar 2026 10:42:36 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vytnW-0002bk-F2 for qemu-devel@nongnu.org; Sat, 07 Mar 2026 10:42:35 -0500 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-4836e3288cdso69635755e9.0 for ; Sat, 07 Mar 2026 07:42:34 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4852767d8e4sm110786735e9.2.2026.03.07.07.42.31 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 07 Mar 2026 07:42:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1772898152; x=1773502952; 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=19Jh4cxb/4s8fkFA1FRyjet0D0g0yjU6dnxuKdjK/IA=; b=PwXYWHQgG3qRv5eJ2/LM9NEz5QKBg8QSl7QLqKa1ex3ZnqTeywJqKpW9eUAT9QMU4P bO8H0euACid2sb5OWqfUV8M2Uu9MnXf4yag/jjfOgvie9HNZmgoqDqJR4gOFPAXtxwyW DRQOVyX2/Y5ZCGabqVmbhw5gtrPaob/xGRuUM70V3IccY8EbfAe3FqyhbwWonpGH1erE iwhPYCt/5KqA5BCfngG6pikwElx5oRmDqhr+WlW8DehnR3wN2hVEDMVORjD5nmzipz29 4qlhEBa2StwlrsVdZhPdlNdhVxGkffWO3MBJH0+JcCHrT4TBskDQpMquUq1LGaDIbK2z ghTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772898152; x=1773502952; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=19Jh4cxb/4s8fkFA1FRyjet0D0g0yjU6dnxuKdjK/IA=; b=J4m36aM2v0wWDvUYw4fLqcarEOt/RgYA8FIf7ofXXFLmwqYrX53xCeuTAVROrnGL7T hHtqfSSqdyR9U76eKEbpebbY+q0ndjr8bGz6k4C0zt4H/bhS/LQpagZ0z+s5hYf7v8pM tw2bhrgjOBwF+KmBuGgYk2isaSuA/8oczChmk5s086Dch+/I1bkTKhRLjDQ54G9GVTY4 ayKi9iCTyKizfyAuT4UFMCkIjSpOe1qKdbdDdjvmceNe5tEDpokxQrOzlM/+qJS/JXyy eI6/SnPyuCe28jE694K9nDKXE1Nq9sLHP5HvS1fjiLS+9lhbt3xpv65Qk1P18nEBJjpR aMhw== X-Gm-Message-State: AOJu0YzT4dH//D+UB8IcMTKBHvz6brBbirBcEFrriHXSphBvgJ19TT/x b04XTg2TojqU67nkp2g6ViyV1FUSuAb+b761lYcfSks/53Qs4/e0QrPL549RBzEaUpViY3qgJAi RIxlxJY4= X-Gm-Gg: ATEYQzx3X/lVNaCmpBh53dQZ5fxTIgwSxjciG1cjgLK9XO6B75o0C4i4OQ+VNxM4gOP IRqt0pX5FP2567Tz9DysNyT3icAnuJMaq6PJFp8SVg7SixGdi/+Dl/fVtU2Nlr2cI/B0tLH1sPM qRoz/lLVhvmPZtj3hvC9o6Z5mf9B7xKDCVovKoIZvBLeJTC9a9gwmN6+VChsljyYLDzX75F96zN zEtHO+uMo550mriKWOskn1Zxpg9Owy91n4ehqecckWWld9HNPrJv+mdB4nEp4O8WvcGai7hZ7ZL 5jS9i5ilwj62/kACpvlh0Xf5Am0S4131SoV0egbATbRbWHqyFcXHTTZuHiklqCIuwRsL4HwPsQG GqD4VDgOvgN9p1+ouEj9FyrnGyJwmIoEalGbXLI4OQ2elgZnIFVFXK2Zn3ilQLlx85BnKDUyCpv b2vcodOj99pR2OiA54IqjnvQEGLEaiH01iZ/NjbkdvMYvVROvO5O9Qm2rsKPoSwFWvkfh6bLP6 X-Received: by 2002:a05:600c:45d1:b0:483:7b99:131d with SMTP id 5b1f17b1804b1-4852675e55cmr97394835e9.16.1772898152441; Sat, 07 Mar 2026 07:42:32 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Igor Mammedov , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" , Yanan Wang , Thomas Huth , Paolo Bonzini , Zhao Liu , Eduardo Habkost , Marcel Apfelbaum Subject: [PATCH 4/6] hw/core/machine: Remove the hw_compat_4_0[] array Date: Sat, 7 Mar 2026 16:42:00 +0100 Message-ID: <20260307154202.86309-5-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260307154202.86309-1-philmd@linaro.org> References: <20260307154202.86309-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1772898170573158500 The hw_compat_4_0[] array was only used by the pc-q35-4.0 and pc-i440fx-4.0 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- include/hw/core/boards.h | 3 --- hw/core/machine.c | 12 ------------ 2 files changed, 15 deletions(-) diff --git a/include/hw/core/boards.h b/include/hw/core/boards.h index 9155e0cc9ed..f85f31bd90d 100644 --- a/include/hw/core/boards.h +++ b/include/hw/core/boards.h @@ -864,7 +864,4 @@ extern const size_t hw_compat_4_2_len; extern GlobalProperty hw_compat_4_1[]; extern const size_t hw_compat_4_1_len; =20 -extern GlobalProperty hw_compat_4_0[]; -extern const size_t hw_compat_4_0_len; - #endif diff --git a/hw/core/machine.c b/hw/core/machine.c index 9a3d826c3cb..a14ad05b9a6 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -209,18 +209,6 @@ GlobalProperty hw_compat_4_1[] =3D { }; const size_t hw_compat_4_1_len =3D G_N_ELEMENTS(hw_compat_4_1); =20 -GlobalProperty hw_compat_4_0[] =3D { - { "VGA", "edid", "false" }, - { "secondary-vga", "edid", "false" }, - { "bochs-display", "edid", "false" }, - { "virtio-vga", "edid", "false" }, - { "virtio-gpu-device", "edid", "false" }, - { "virtio-device", "use-started", "false" }, - { "virtio-balloon-device", "qemu-4-0-config-size", "true" }, - { "pl031", "migrate-tick-offset", "false" }, -}; -const size_t hw_compat_4_0_len =3D G_N_ELEMENTS(hw_compat_4_0); - MachineState *current_machine; =20 static char *machine_get_kernel(Object *obj, Error **errp) --=20 2.52.0 From nobody Fri Apr 17 09:26:01 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1772898172; cv=none; d=zohomail.com; s=zohoarc; b=WkvD/DXB4RyHQlPc6VL/edsM+sW+TE6A/mbz37NmWc5SIkLbaSQ4c3r42DFOkgTgKiNra5VBo2zNlSsyrK6UrwjfU8zGw7WrxVfs2vrq9Siqsi/mUrj7QjaSRjQajFgaoMiA09Qz6zw55iYc5/l4H41L9BuOnKwPta46wQiFo8k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772898172; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Og9IPGiSN9L03BPKj7huycvO2v5oSung0TvI7JHvuuE=; b=oLiN6PMuuN6hDLKU7rMJ3X9c/gRHxw7KxqRhKM6PlTwUU20QR7Puw8GiZ82CXYEBrrEsl1knz+VPz7jTcf3u/EUusyBtRhMjZygAJ94L3D+HiZZ4Je2VkFH3zPEPgRxNEqoGIO5hh+QAhp5UhJHk9c5kDiAUFSJ5qPhlBaPFXc8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772898172907959.2332277044244; Sat, 7 Mar 2026 07:42:52 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vytnf-0003Uq-RH; Sat, 07 Mar 2026 10:42:43 -0500 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 1vytne-0003P1-R2 for qemu-devel@nongnu.org; Sat, 07 Mar 2026 10:42:42 -0500 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 1vytnd-0002cI-68 for qemu-devel@nongnu.org; Sat, 07 Mar 2026 10:42:42 -0500 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-4806cc07ce7so118064265e9.1 for ; Sat, 07 Mar 2026 07:42:40 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dadb85b8sm12050264f8f.17.2026.03.07.07.42.38 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 07 Mar 2026 07:42:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1772898159; x=1773502959; 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=Og9IPGiSN9L03BPKj7huycvO2v5oSung0TvI7JHvuuE=; b=bhGkD+/l8MY1ke9sVRgN/44dFFDVB2N4ti0k3jw6/VmiRR1CANy+Z8Hi7t6dilP3eu xy34aVROaoR5m1NYPfbwn+rZOm3+JfQP/OjJWF5+BMwiMEFTHkovhnkhXEgrTtCRTD64 Bwu4G3zkKgeZYIxlds45q0tqawAwZUGhQXOg4P8mmK1XvDgG2Dabj/7DAwBdKhHnZp3+ EI2Lmjzp32bOPAmigo/Qbs2P/kXjUN1p5x9zWbtmmEsAzK009WG8Qkgx9I61iwvNd7IT fFgVbSNUkVho1th4fIF2fJ4Q6Rg93p30VxijaXaQPVWpNuMVYkQE0Ve4ZhRvVdbiNDdS 1mrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772898159; x=1773502959; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Og9IPGiSN9L03BPKj7huycvO2v5oSung0TvI7JHvuuE=; b=d8WbXuKvTP5zWCzIdaFHpzvNatPBCu1uPCZSo2OdPq/FidrkviiGa5qQRnT6MdwE16 sfb91HxdIrL0xjIJzzLy4Ap8SttKplyBeB4win7MI5AUZUmoBG7/FrTRcmgA3Miy5YBE XQObPXLCwDX0B2wD+dXCpPnq0X8UdoJ0svLluZZ+3+Nig+eqdxXjIwIjKwQG6HtKkSnb dqmwmIkD9/MJawzM/guZKdBCvvgRls9989JCQEDSGta3uWxbS/mY/jejFZSSAuwMn9z/ FdMj0UGcEthourqb7IPl+aawferDtAIfbW/Fg61wg93pzdApiIIeZD2830N4n2B9pg8Y a56A== X-Gm-Message-State: AOJu0Yzu9wZelpOH736vyDQ8qrrDIITI/c6fzuHVOUyMdiez2KTKPCPH /IJj6CX512N6wlTU+zbqEHnuK0+FpvAkq/NyjziL3dxhx1ou0QD4UkuOGZv580R4AA11CKqvBm+ pAv03NZY= X-Gm-Gg: ATEYQzx3B3x6UKropZGq4ke/XkIpVepGrv4qn806P06Lq+fZ27y2zkEl0Rnq8Q55K6O GCUne2mMzHz4QXH/GSAEfwrfnUjYPpRcQQeEYsQWxp7nzTxs3F5vXeSmog48RNXBnjhdF3qQxPJ mzi9jy7ELj6HSQD4SSRyyEJ7pRh6QgUgfCjt9ELLTxinAWqQi4tExWAgip37JwjO2qGWlQEPNn2 fR1k+lFvctt+eNehb2+1om0wevGzQ40dpLltlhE59JhzPIzvry3THj7e95MWKHg/k9/gWjdyAEW eQ58eLE91D63L9jls89vtZj4jud1I6kmLub4KCqVWvCSQ8mA5BnlchVs/NTyh3emPlnPByIGYRD dWJQgvaywYeIhpjrVgGOWHiq25kLLjmDUtlT+i58buDjrzQj67l2ezZo95sVbyoZOVKHqgyd/lb FY3uXdG1ItIg9tY7xUwxU2Bg3v1ooezeGiPySvibW1zPMg/pm/BGm+h/nnKIDNWlfYWVr922Mz X-Received: by 2002:a05:600c:a013:b0:485:17a7:b9cc with SMTP id 5b1f17b1804b1-48526958835mr93584975e9.18.1772898159210; Sat, 07 Mar 2026 07:42:39 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Igor Mammedov , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" , Yanan Wang , Thomas Huth , Paolo Bonzini , Zhao Liu , David Hildenbrand Subject: [PATCH 5/6] hw/virtio: Remove VirtIOBalloon::qemu_4_0_config_size field Date: Sat, 7 Mar 2026 16:42:01 +0100 Message-ID: <20260307154202.86309-6-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260307154202.86309-1-philmd@linaro.org> References: <20260307154202.86309-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=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=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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1772898174576158500 The VirtIOBalloon::qemu_4_0_config_size boolean was only set in the hw_compat_4_0[] array, via the 'qemu-4-0-config-size=3Dtrue' property. We removed all machines using that array, lets remove that property. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- include/hw/virtio/virtio-balloon.h | 1 - hw/virtio/virtio-balloon.c | 5 ----- 2 files changed, 6 deletions(-) diff --git a/include/hw/virtio/virtio-balloon.h b/include/hw/virtio/virtio-= balloon.h index 79ac194ccec..abbf3397188 100644 --- a/include/hw/virtio/virtio-balloon.h +++ b/include/hw/virtio/virtio-balloon.h @@ -70,7 +70,6 @@ struct VirtIOBalloon { int64_t stats_poll_interval; uint32_t host_features; =20 - bool qemu_4_0_config_size; uint32_t poison_val; =20 /* State of the resettable container */ diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c index 38bf1e84a1d..4c5f486ba23 100644 --- a/hw/virtio/virtio-balloon.c +++ b/hw/virtio/virtio-balloon.c @@ -708,9 +708,6 @@ static size_t virtio_balloon_config_size(VirtIOBalloon = *s) { uint64_t features =3D s->host_features; =20 - if (s->qemu_4_0_config_size) { - return sizeof(struct virtio_balloon_config); - } if (virtio_has_feature(features, VIRTIO_BALLOON_F_PAGE_POISON)) { return sizeof(struct virtio_balloon_config); } @@ -1054,8 +1051,6 @@ static const Property virtio_balloon_properties[] =3D= { * is disabled, resulting in QEMU 3.1 migration incompatibility. This * property retains this quirk for QEMU 4.1 machine types. */ - DEFINE_PROP_BOOL("qemu-4-0-config-size", VirtIOBalloon, - qemu_4_0_config_size, false), DEFINE_PROP_LINK("iothread", VirtIOBalloon, iothread, TYPE_IOTHREAD, IOThread *), }; --=20 2.52.0 From nobody Fri Apr 17 09:26:01 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1772898182; cv=none; d=zohomail.com; s=zohoarc; b=C9HTQk0tJ2ITKcPDUfFdyJ/fXKq81jnbjpXZeTTk1fSyYRsRG1SoCPBZLkF97zS9LTcTlQcgPLAFCC3ue5qVCiUZo8oForI2BKrMqDLdk4QSTC6wtNuW173YBYlnPbboxjA7c9wr1n3j6mVTLQpIIllsQXpkSXm6RVZ2+ptdzCk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772898182; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=YxXcgTIjs3O9IFx8gABZ9Om88U+wQy7QKGtyc8xrz4s=; b=m6s9yfiU0C6mAXc1Q1/i/cnFpUKGSRw12R/Lom1X7s50VwSoYMbtuCye8xA0165x8uK8Pbb+5xXuP5cXb1T6w9l8mgMNcdQ5PbvbrS/KENytnvvZSkbCZiZ8ZL82L5giM3a2k/YiQ3mOqyEdqOugm7ZWpO++LkL35Gc6KxgEIUg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772898182825306.39994219860284; Sat, 7 Mar 2026 07:43:02 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vytnp-0004VU-Iy; Sat, 07 Mar 2026 10:42:53 -0500 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 1vytnn-0004JZ-Ja for qemu-devel@nongnu.org; Sat, 07 Mar 2026 10:42:51 -0500 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vytnk-0002cs-LN for qemu-devel@nongnu.org; Sat, 07 Mar 2026 10:42:51 -0500 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-483a233819aso101066455e9.3 for ; Sat, 07 Mar 2026 07:42:47 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-485237dd017sm44629195e9.2.2026.03.07.07.42.45 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 07 Mar 2026 07:42:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1772898166; x=1773502966; 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=YxXcgTIjs3O9IFx8gABZ9Om88U+wQy7QKGtyc8xrz4s=; b=bHSTXC41eCO1fZhYWiunqf0MfcjmtfNkedciVsxoZIShmvUefcZ/8GA0WR2ypnVsLw WlJzXQOUGasFz4f/ULCJX37cGeUb5pMxdMg3bJ4LUMcy+zqBSDA9Vc49gQ7zN91icIdU 5Px8vZZvhefXyaw8eRIMWfMaP81FuqtfBX8qYjaCcMbtNfXUv773jZhjid8zPZE3dWs/ hts4N3XH+UzGiQZT2HqInRPNuUuTdhCo3Qk73g3+j5oHICayAay2atM/PpVbeqw833sG 6QEKuXh+GZvvs/F4RfNbkZS8V18cm5bD9MH6VZL30X8Op+O6O5wuWcjEQPbSZFuBnbSz 6hGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772898166; x=1773502966; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=YxXcgTIjs3O9IFx8gABZ9Om88U+wQy7QKGtyc8xrz4s=; b=iS+rdei5OxoBXGbKSOAPvRZY3yl0/tnzmG1NJwvh2gptp+KcCK225BWP+jIoBccxad ZZag231SZobhgXYrtpf8GPO1X9YherbFs3EWHzHQEguVPyfAXK61F3dUBMO6gb/XTZpB mi8Y8ydr9VYN7uYwxjbLG/qUwDPzRLRNx5zHWNduCT9BysrAmyiZn3woaKdxFRFCNqvf t0aYOnoOs0g9nl2HprebQYSNql4FvGT0FYdNmqQDuICwUTVTWdP8nJ6xVBoOjzRdEpo7 E7HD+tNE4Q7TvaadNYVWoz4RUUDiBCmpre67t9KfVyTO5l7J5Ya2UJkpZJoX34bPxJjq JPGg== X-Gm-Message-State: AOJu0YwwU7IUSGuFv6MAJAwSLxZtn7Wwpp84gs7vxUV+cZ2SGyRJNvDj Pw33EFS2KXKoCuhac2CNXYIxIeh71VFdk3KHNcFFbpzFCOND8zsBxEIrC/pA6MUcGSW7zHLcFSg D5Jfrpc8= X-Gm-Gg: ATEYQzz15LHQ2IKryU9g+dIJTa1rGqcEF0vXp65ymvwAffPhCIk0QsGpCWciLvlp0cM /3QhnY77idl5iQ9yWHkkKz7esFwjeXqh1s/GZZcamY5imW+ECQ/0d+bTyVKNwgKWMaqPEMBUeAE O8Ftt/0LHAaBh2qk//SDprg34n/5+AC27Gz/YOQdgZ+6+lythOujL0gXMdZ4eqiGZN56u3zq9cr 0/ZXnIrsCJOIxWa24TZsQkd7N41315loR0UUbjrEZ1J2SgF79lS5DYhlnpFvmLIojsP+xRzmDaC /Znl+SrnCGnQ+MuVzQTpzylVsW+fXqwbwiFylDNCZmKlrrhy1Fvb4EWZhBYGhSVt9Y2OH17eN0Y GXqN+gHBRT8mobsjqhfsLuK9O1OhZ4SqNBm8QaZb3mz8v3srFryFFDROgxIIeBpSkMB33bmHdk6 RVqYcm2M+5Da1LFa/2n0qBohAApVSwDhocwjVm9Ze6aYeTbkSZC9Us5FIWsYCkPhLoMdP1WiLP X-Received: by 2002:a05:600c:3b9e:b0:483:498f:7953 with SMTP id 5b1f17b1804b1-48526966364mr100848005e9.28.1772898166167; Sat, 07 Mar 2026 07:42:46 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Igor Mammedov , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" , Yanan Wang , Thomas Huth , Paolo Bonzini , Zhao Liu , Peter Maydell , qemu-arm@nongnu.org Subject: [PATCH 6/6] hw/rtc/pl031: : Remove PL031State::migrate_tick_offset field Date: Sat, 7 Mar 2026 16:42:02 +0100 Message-ID: <20260307154202.86309-7-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260307154202.86309-1-philmd@linaro.org> References: <20260307154202.86309-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1772898184573158500 The PL031State::migrate_tick_offset boolean was only set in the hw_compat_4_0[] array, via the 'migrate-tick-offset=3Dfalse' property. We removed all machines using that array, lets remove that property, along with the pl031_properties[] array which is now empty. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- include/hw/rtc/pl031.h | 1 - hw/rtc/pl031.c | 22 ---------------------- 2 files changed, 23 deletions(-) diff --git a/include/hw/rtc/pl031.h b/include/hw/rtc/pl031.h index c8b26c2f00e..75779c63122 100644 --- a/include/hw/rtc/pl031.h +++ b/include/hw/rtc/pl031.h @@ -36,7 +36,6 @@ struct PL031State { uint32_t tick_offset_vmstate; uint32_t tick_offset; bool tick_offset_migrated; - bool migrate_tick_offset; =20 uint32_t mr; uint32_t lr; diff --git a/hw/rtc/pl031.c b/hw/rtc/pl031.c index b56877c3a20..09d1b15c779 100644 --- a/hw/rtc/pl031.c +++ b/hw/rtc/pl031.c @@ -278,18 +278,10 @@ static int pl031_tick_offset_post_load(void *opaque, = int version_id) return 0; } =20 -static bool pl031_tick_offset_needed(void *opaque) -{ - PL031State *s =3D opaque; - - return s->migrate_tick_offset; -} - static const VMStateDescription vmstate_pl031_tick_offset =3D { .name =3D "pl031/tick-offset", .version_id =3D 1, .minimum_version_id =3D 1, - .needed =3D pl031_tick_offset_needed, .post_load =3D pl031_tick_offset_post_load, .fields =3D (const VMStateField[]) { VMSTATE_UINT32(tick_offset, PL031State), @@ -319,25 +311,11 @@ static const VMStateDescription vmstate_pl031 =3D { } }; =20 -static const Property pl031_properties[] =3D { - /* - * True to correctly migrate the tick offset of the RTC. False to - * obtain backward migration compatibility with older QEMU versions, - * at the expense of the guest RTC going backwards compared with the - * host RTC when the VM is saved/restored if using -rtc host. - * (Even if set to 'true' older QEMU can migrate forward to newer QEMU; - * 'false' also permits newer QEMU to migrate to older QEMU.) - */ - DEFINE_PROP_BOOL("migrate-tick-offset", - PL031State, migrate_tick_offset, true), -}; - static void pl031_class_init(ObjectClass *klass, const void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); =20 dc->vmsd =3D &vmstate_pl031; - device_class_set_props(dc, pl031_properties); } =20 static const TypeInfo pl031_info =3D { --=20 2.52.0