From nobody Fri Nov 14 16:39:02 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760708085; cv=none; d=zohomail.com; s=zohoarc; b=daJtDg4KW7HB+NBdb8JXaMIPxo+VLK4Wihhp5gg65ok9j27SsRJ1qTTefkHtD+bKGK9mGs3FJ6IlTywRjNg25XoqFEfKKE0JW0pGAnLK9AZziYcswJ9Iq7EFPH+ONNoF8h/Up4z4n4AHhR9J2zOUGT74v0A4wegx3GaVTfPG+Ig= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760708085; 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=4HKXcyz/2clxRpS46l0Vexb09ZBfH6sW5WdctLeLR9Q=; b=dVjRvSDPtt+D+pDxSznZiWAy1y7CCx4Ki2NOUiG9QQtY2xr+mmUU0q++2PuE7dc+gzEKVVri4N/lDILyM0VLZaLaX83eLaQPoA43viKksDjmJBB8+j5EwPKvP2mV7Z+LeitJmjIuVFmws8rC+81XiHUDjD68fTTRmQfRC/ihWOw= 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 1760708084952806.3681602811921; Fri, 17 Oct 2025 06:34:44 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v9kXp-0008WT-SC; Fri, 17 Oct 2025 09:30:57 -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 1v9kXJ-0008Q8-SJ for qemu-devel@nongnu.org; Fri, 17 Oct 2025 09:30:31 -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 1v9kXC-0007uX-Mo for qemu-devel@nongnu.org; Fri, 17 Oct 2025 09:30:24 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-471131d6121so15214175e9.1 for ; Fri, 17 Oct 2025 06:30: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 5b1f17b1804b1-47114429679sm79540135e9.8.2025.10.17.06.30.08 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 17 Oct 2025 06:30:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760707810; x=1761312610; 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=4HKXcyz/2clxRpS46l0Vexb09ZBfH6sW5WdctLeLR9Q=; b=TM1HLQambANHm8tun/EDbl4cNmyC7N7uHwXIH56A0z+gD6zo/RYPBL55Ih+qwXzX5o arOorzPylkMjMg5vB2L/vWu12HuztiHXkTL3eZcMewtXLmyy4YGMOEL3VUlyf2tYWYcQ mmt0hDreE3qmp9psAoXHSe/mVd9W07NcB25maFl/iOvVgJvNxBsQorp9WSCDJcRW9dCt 6eGlSVd1puxzBX7xS7hi4UKDfNK0IIcyJpDF10jiZT9YX9Vu7grZkY3S5nbt1XkxymMM h/GgyyopCCHCf+LG2KIV2GRxYr+oTyEbJdRcQnD1u/+L0UxXCmfOLdVRBPtqLo/NohQ5 lMig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760707810; x=1761312610; 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=4HKXcyz/2clxRpS46l0Vexb09ZBfH6sW5WdctLeLR9Q=; b=CX1CjOgn2k3QZ+dnyDQxp6hoKg9jJZDp6L7ZeEs794O3uQbYtr+dliZSphJztPTHtD 7iTD+hYMMdy0JvJc6yHnChbMQ/jEFMSDG0/AQ73+R0tvKC76lAMruulEVzu3Zv616tgb dkIAvj69lVGNGQSsngup2Z7b3+Kr9dHBPFjTtt7aroD4GByiw9tzOjrJdJm0NwL5Gjcj xNrlxCXxXS5ho2Wm3Zuf92bpV/rbsabcM0kI17pQTumuZzO6oD1upaXKe0mmwwR6ePWl dYoSgMvVGYtT27a3PX5Y+DJXuYROSx6c+uK1SU16Mh4AU4WkBEFiliEtOEUBAoYkLnhZ w4og== X-Gm-Message-State: AOJu0YwdBY8Vc4MgECnNyyr7fSGblBXkRXlzqv6gbWQiuGjRvDmlJyEz ir+l+YJlRia08Bi1l1Zh7cUzpHKu5q8HBgfh0Kf8V5RmewKYxhjmR87EuyUTBB9h9R4VCCcJbyw U04KQ+hE= X-Gm-Gg: ASbGncvOYRq3rFbsgdmh3we3cgtFiMGZUjgHjrkkY/z4DTjJGeaXecJ44/maRVTHtDd D/HMcBz6eBPWWmMj5r6mG9UVdgQXtVD3GOB/M+8dkoN13l+LGGQFk6yFhRbSBeIthIBwAOFizHM E+pbkenhL05s5046EabIfivs7STzsFaf71PU2XLfoHwGbR1PoRyhof4VFbLPIZ8pn0uLWejcZ+f hWOeGLohrpEY+o/HgqROMI5g4WP/I81cHgmOEIfWuh6Qb/nI5+oNunCXej4q6Utm/rb/HVXDjvq BO9Z0kN6y1NkpHFd+D3DYj2khF1GJp6jpwyaT7F4/J9ymIKxw6mH6PQOWct4uqEDkpkKCHDt2WC UziWVv2Fsm5l3rFMDHMPp4bsxy/b048dkT+7md+SlxNqLc2JXupbDngW+y2JCHH97DEoRIfBhl9 uFpVqpmbqK2H3eJK1oauDcjA7QRnSJs7GNuwvlj6AzCXA8QI2IC/h6U+YM/8Jv X-Google-Smtp-Source: AGHT+IH7/sb/CTqOwFozAJIGzWAs6yn+Cyn7enFix7virXvNF1xQUDJ/t7Bjo3QErpfp83rQFX1SWg== X-Received: by 2002:a05:600c:5298:b0:471:734:53c3 with SMTP id 5b1f17b1804b1-47117901407mr22304335e9.24.1760707810155; Fri, 17 Oct 2025 06:30:10 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Thomas Huth , Eric Farman , Jason Herne , Christian Borntraeger , Matthew Rosato , Halil Pasic , qemu-s390x@nongnu.org, Ilya Leoshkevich , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 01/12] hw/s390x/ccw: Remove deprecated s390-ccw-virtio-4.2 machine Date: Fri, 17 Oct 2025 15:29:50 +0200 Message-ID: <20251017133002.61410-2-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251017133002.61410-1-philmd@linaro.org> References: <20251017133002.61410-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::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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760708091089158500 This machine 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") it can now be removed. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/s390x/s390-virtio-ccw.c | 33 --------------------------------- 1 file changed, 33 deletions(-) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index ad2c48188a8..64b81345f1e 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -715,26 +715,6 @@ static void s390_nmi(NMIState *n, int cpu_index, Error= **errp) s390_cpu_restart(S390_CPU(cs)); } =20 -static ram_addr_t s390_fixup_ram_size(ram_addr_t sz) -{ - /* same logic as in sclp.c */ - int increment_size =3D 20; - ram_addr_t newsz; - - while ((sz >> increment_size) > MAX_STORAGE_INCREMENTS) { - increment_size++; - } - newsz =3D sz >> increment_size << increment_size; - - if (sz !=3D newsz) { - qemu_printf("Ram size %" PRIu64 "MB was fixed up to %" PRIu64 - "MB to match machine restrictions. Consider updating " - "the guest definition.\n", (uint64_t) (sz / MiB), - (uint64_t) (newsz / MiB)); - } - return newsz; -} - static inline bool machine_get_aes_key_wrap(Object *obj, Error **errp) { S390CcwMachineState *ms =3D S390_CCW_MACHINE(obj); @@ -1165,19 +1145,6 @@ static void ccw_machine_5_0_class_options(MachineCla= ss *mc) } DEFINE_CCW_MACHINE(5, 0); =20 -static void ccw_machine_4_2_instance_options(MachineState *machine) -{ - ccw_machine_5_0_instance_options(machine); -} - -static void ccw_machine_4_2_class_options(MachineClass *mc) -{ - ccw_machine_5_0_class_options(mc); - mc->fixup_ram_size =3D s390_fixup_ram_size; - compat_props_add(mc->compat_props, hw_compat_4_2, hw_compat_4_2_len); -} -DEFINE_CCW_MACHINE(4, 2); - static void ccw_machine_register_types(void) { type_register_static(&ccw_machine_info); --=20 2.51.0 From nobody Fri Nov 14 16:39:02 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760707997; cv=none; d=zohomail.com; s=zohoarc; b=cSTgHzW9RK8ZijJiPUP1qf0orYd9r2VmtVDh3MaXhLNF4rKMCFTrqqbURqPIrY9K0nvkSA6xUcPHDSyWLmIrjGoRKEWNJTDz1D/q7Y+3hGzYSUYcwZzapaMEyQepTAloKl8TsZ5asw6lJOOysp7Wb5VqCmQIhkTBAWihNa+iXdM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760707997; 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=Q/UHGx6xpvisFhOS3RPFFYTa7tV8+Q6SbIOhNHRI88s=; b=Z7AzTERmHcRbbvEiN1zqLtHfLxTPRVC3gJNDrKfOppyWoEtnhBSKkJD3D/tkQTTf4pZTkcwcZuOUEzWPwQLQqS68rfHb4jntA31eoxD0P7tRXi5T2i3hxxiTNZnrdrOdm2Tc0SoQ0mauUwitcu+YZB5DeS+5pRlJVUNyMB4uQKU= 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 176070799792767.02406779083014; Fri, 17 Oct 2025 06:33:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v9kXg-0008Tu-RT; Fri, 17 Oct 2025 09:30:48 -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 1v9kXT-0008Rc-PW for qemu-devel@nongnu.org; Fri, 17 Oct 2025 09:30:39 -0400 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 1v9kXE-0007vF-K6 for qemu-devel@nongnu.org; Fri, 17 Oct 2025 09:30:33 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-47117f92e32so8507095e9.1 for ; Fri, 17 Oct 2025 06:30:17 -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-4710cb36e7csm50587645e9.2.2025.10.17.06.30.14 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 17 Oct 2025 06:30:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760707815; x=1761312615; 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=Q/UHGx6xpvisFhOS3RPFFYTa7tV8+Q6SbIOhNHRI88s=; b=Caf3dnm9QoU8XkftTu0goCRnwdRmnOzXGg5gKRa8ruv3QZi0Ra42XPkOKWsnwiQNyM lGnRdYGYpwcsbbedHkJo0PWCyu3YH+VF4AxEKPx/nOn/K7b669jGw6LT5D06niBfgAae z2eLJm3yiv5NNa7roGCAntVykIJcDEpti11aXrStysJoyAv3t/SCVYRGPnR6h6aiFRET E8CVQeOmQpe37mye1Z3QncQBp0/VGrzbAVHu+7/ahQn8H02eDThyFqF/J+fYefyiBeGI y39f9TBAij15+NWoZs8JPPjWqSlnjBGplQhfhFiu3WiGU+iGEmPHgT4DUxMxoiwFMMYQ gzbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760707815; x=1761312615; 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=Q/UHGx6xpvisFhOS3RPFFYTa7tV8+Q6SbIOhNHRI88s=; b=cmnoaAd/er40xTGB4ZbWkEUOa2BrXW3wqo6nLX5mgF9Gyb7Bf+N4O9Zd/7yvfV8rgN l7p9s21UsmFbuuQIkeJqQu2HXRX4IU27QV3VDikyQxjj+N/5tgjwkL9haa9KuFiTfwfR 1sSDDlG5am3c0WltgRiHkvKOawkNowNUDkLMa5ieiFiM0fxHcM6Kvid2//LX1W6xlhED w9PZqOmCQuRM2fnZCPAKXFKeZRcJBfNwmca9NiCuyDDOU2Waqd3qd2PJoF1jh7OCv4Pp juxc0tjrUz6StGuVGqcDTUXSYu5A57TSX2ai41OKZUPNzKnOdsmnxAmvJcHnF7OV50o0 4L+A== X-Gm-Message-State: AOJu0YyCAdAAzhUrmm9d5mn9iiImEePWDR9FArWALnMsb1Vdtxt0O0r6 TVjWNgACSUwdvqmaDdadJAQ0UHo4PtHw73c4zZMsLn+fYWb77neO+ST+VIFU4TujN+a9sDska5+ 2VoGHecU= X-Gm-Gg: ASbGncsKfqYC25neXGT8webYwqCzqIIWg/L+SXGJRMPsy4qbymTwKCCh1etGmiLG5Va Af5R9rIktXpUZCy1QFTMYz+6SzM+oJxO2tY2rTFbF/oQZsQYNO4FiTJChWABt0WfiFLoi1h8FhN NQ37dbU8moOAwtP5y6Oz32Uv/7QDcYBh26RnDyq4qmq6X40ZfSCmy2oHF6GIUU+LLlWFC8k/049 ctOqmKhHaqL6zIcOK/z8UCbx5Dnw03FNSyxLixRy8HmEdTMQhyp1NVWwTmLo+vQ+hYKtFjacodg lghqA5TYG57/U1P5T4FSmCJKSvh6XQADJROYcrLBfU8IYobEvJkF4m6xH7DfqQDmFeGKWyqgb0v QNfqM6vXx6tKlnqHtwVN3sdZ39IxFa9syV4Bf08dYtpHiZRQhrxNn5iGcRPEJkxb/zFcwNO+8Cj heEz7I9pFbSgOlW1vlHGpGnszF6grKjjaSdpgKiGltajIZMwalJ3bpxcRxPFsv X-Google-Smtp-Source: AGHT+IHkxBSOxBAvZBFxn5iEhmD7eZcAshmuqYRYtNGdYVubOvaegrhLSBRjaVLUidBAKEkUhr3/tQ== X-Received: by 2002:a05:600c:3f10:b0:46e:59f8:8546 with SMTP id 5b1f17b1804b1-471178afb7amr27078605e9.17.1760707815423; Fri, 17 Oct 2025 06:30:15 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Thomas Huth , Eric Farman , Jason Herne , Christian Borntraeger , Matthew Rosato , Halil Pasic , qemu-s390x@nongnu.org, Ilya Leoshkevich , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 02/12] hw/s390x/ccw: Remove SCLPDevice::increment_size field Date: Fri, 17 Oct 2025 15:29:51 +0200 Message-ID: <20251017133002.61410-3-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251017133002.61410-1-philmd@linaro.org> References: <20251017133002.61410-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: 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: 1760707999342154100 The SCLPDevice::increment_size field was only used by the s390-ccw-virtio-4.2 machine, which got removed. Remove it as now unused, along with the sclp_memory_init() method. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/s390x/sclp.h | 5 +---- hw/s390x/sclp.c | 34 +++------------------------------- 2 files changed, 4 insertions(+), 35 deletions(-) diff --git a/include/hw/s390x/sclp.h b/include/hw/s390x/sclp.h index d32f6180e0d..33f01f85bb1 100644 --- a/include/hw/s390x/sclp.h +++ b/include/hw/s390x/sclp.h @@ -197,12 +197,9 @@ OBJECT_DECLARE_TYPE(SCLPDevice, SCLPDeviceClass, struct SCLPEventFacility; =20 struct SCLPDevice { - /* private */ DeviceState parent_obj; - struct SCLPEventFacility *event_facility; - int increment_size; =20 - /* public */ + struct SCLPEventFacility *event_facility; }; =20 struct SCLPDeviceClass { diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c index 8602a566a49..c9a9c4bb375 100644 --- a/hw/s390x/sclp.c +++ b/hw/s390x/sclp.c @@ -110,7 +110,7 @@ static void read_SCP_info(SCLPDevice *sclp, SCCB *sccb) ReadInfo *read_info =3D (ReadInfo *) sccb; MachineState *machine =3D MACHINE(qdev_get_machine()); int cpu_count; - int rnsize, rnmax; + int rnmax; int required_len =3D SCCB_REQ_LEN(ReadInfo, machine->possible_cpus->le= n); int offset_cpu =3D s390_has_feat(S390_FEAT_EXTENDED_LENGTH_SCCB) ? offsetof(ReadInfo, entries) : @@ -153,21 +153,14 @@ static void read_SCP_info(SCLPDevice *sclp, SCCB *scc= b) =20 read_info->mha_pow =3D s390_get_mha_pow(); read_info->hmfai =3D cpu_to_be32(s390_get_hmfai()); - - rnsize =3D 1 << (sclp->increment_size - 20); - if (rnsize <=3D 128) { - read_info->rnsize =3D rnsize; - } else { - read_info->rnsize =3D 0; - read_info->rnsize2 =3D cpu_to_be32(rnsize); - } + read_info->rnsize =3D 1; =20 /* * We don't support standby memory. maxram_size is used for sizing the * memory device region, which is not exposed through SCLP but through * diag500. */ - rnmax =3D machine->ram_size >> sclp->increment_size; + rnmax =3D machine->ram_size >> 20; if (rnmax < 0x10000) { read_info->rnmax =3D cpu_to_be16(rnmax); } else { @@ -406,25 +399,6 @@ static void sclp_realize(DeviceState *dev, Error **err= p) } } =20 -static void sclp_memory_init(SCLPDevice *sclp) -{ - MachineState *machine =3D MACHINE(qdev_get_machine()); - MachineClass *machine_class =3D MACHINE_GET_CLASS(qdev_get_machine()); - ram_addr_t initial_mem =3D machine->ram_size; - int increment_size =3D 20; - - /* The storage increment size is a multiple of 1M and is a power of 2. - * For some machine types, the number of storage increments must be - * MAX_STORAGE_INCREMENTS or fewer. - * The variable 'increment_size' is an exponent of 2 that can be - * used to calculate the size (in bytes) of an increment. */ - while (machine_class->fixup_ram_size !=3D NULL && - (initial_mem >> increment_size) > MAX_STORAGE_INCREMENTS) { - increment_size++; - } - sclp->increment_size =3D increment_size; -} - static void sclp_init(Object *obj) { SCLPDevice *sclp =3D SCLP(obj); @@ -434,8 +408,6 @@ static void sclp_init(Object *obj) object_property_add_child(obj, TYPE_SCLP_EVENT_FACILITY, new); object_unref(new); sclp->event_facility =3D EVENT_FACILITY(new); - - sclp_memory_init(sclp); } =20 static void sclp_class_init(ObjectClass *oc, const void *data) --=20 2.51.0 From nobody Fri Nov 14 16:39:02 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760708081; cv=none; d=zohomail.com; s=zohoarc; b=iWVDWCK0GgG90bu+ONstidfUw6GvaidwUqebAo/h0wFXD4H/JABVUine+3k48aZ1cQoxSegjZH5nIEXJuidqyV8bupRXprU44BU4/X+uAiYVHt5eEMR7eXkTlM9mgoRhdakinOHxg0hT4PAwCa4hsaZLt14jXCwukZNdDrq99p0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760708081; 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=A78zNbnMmecNZ6Tf/K0Gio4uGTZm2OiwrEyaD1kmTEc=; b=HbwUfAJtW+z0dhev+GXsjCZ3BkrUazpl9ZUU/RAtJ/Ai2V30PPSGfs62FbHDxfxq3czSL3PUxj/FSCyQXYMBvuSFpd3Z2U3hE0yP5BbpmKouHtWhcx4/6izzhHjZd9c0DVg5TDM8QHZ3mIP2aMEAq4sKeAjK/DZTnfpuV6cFcXA= 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 1760708081630684.0683098944916; Fri, 17 Oct 2025 06:34:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v9kXp-0008UR-97; Fri, 17 Oct 2025 09:30:57 -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 1v9kXZ-0008Ry-Hd for qemu-devel@nongnu.org; Fri, 17 Oct 2025 09:30:42 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v9kXO-0007vy-QS for qemu-devel@nongnu.org; Fri, 17 Oct 2025 09:30:38 -0400 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-42701b29a7eso917752f8f.0 for ; Fri, 17 Oct 2025 06:30:24 -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-426ce5e1024sm40420867f8f.42.2025.10.17.06.30.19 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 17 Oct 2025 06:30:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760707820; x=1761312620; 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=A78zNbnMmecNZ6Tf/K0Gio4uGTZm2OiwrEyaD1kmTEc=; b=FppZNboQgEN3bEqc9q4b5jxE1pIQ31Trl3cwDt3ar1c8E4KkmGb0fRn8ZVJXEq8fLQ wn90sQIN8iYrVMpW1mOE5R/huv4EdRPi0q/iUGN3WDIWYZBXLGdA5Vb1lXofLu9VPfo/ 6Tf81MxoUYRVesceRU3aXT1bwwcpNQMcMiefYJFENrYTrJGlDbbjReaCJF2ykrh40/Xt ugRD7D8EIrOwqliYn3/fvQOpRnckigrWb26oeU4qR1QFkXTioQVF3WFo6CaptD3Fv2yu vxLP8nsv0cT4s5xSAUGmbAtftFwCPvRd79bc9NqUwWE4tOKLd3YprrsdhSYh0UklPQk9 I6zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760707820; x=1761312620; 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=A78zNbnMmecNZ6Tf/K0Gio4uGTZm2OiwrEyaD1kmTEc=; b=N4j2L+p0ir9N9Q+d3UNGtxs/14DfoI7B4HaQ/xAJlhu8IF3i1CVC5aMKbWdv8TcDbO MpTpvxW3wK5bLptd/DSFNvuizvCWRDUBD7JU+W0Z7+2SqH9E8d2zpM+N1pprDaSSRl+b jV6UpMMxU59BIvWQvw5Csg7I82rkPpJLGnWvvrHoPk4C1R/KA70ts98BGY+AGLbPeoc/ jbEvRAfOQ3EM8gV89OgleVoiN7FAvYU/zAzgUMtF6+9AGmv3FdsS2KC1Chqos89vjnOL +8RqFAXoQ+56JwyNdF4J0/bXliDY6xzIpeIy2GvC3XG1gO1e+SvR2kvC1EcDV0dGSGHp 2IUw== X-Gm-Message-State: AOJu0YzCw/dFmUqdhwvKebssrTP0WCsI7ZThqiEeHYiGHVYz9RuovoAI 4CQfhBbjfhtRpUy1gq1g13lUObMuMun2zbHDLND3rgBpY+NSSOxxOax7xO7eqdJ2OOWJd77daWa W9U1pmW4= X-Gm-Gg: ASbGncs0BdHh4e/wyGPojbE/3GGxWFoWRtEI8xhTA5ofuZd3DxEDi0Bsghhr0XMgAYu PnuLfS4oeR6Ae02F5GyWaVs835CAdZ+XgbVnOHiZ7c/Q/dadE5lLVMQEjUZMfFSkcQXdbC+CXM/ 2g/aKRedTcoU+d76Wu0TDuUoeXIh4pc698JajLn2es5ucLS6O0Le8m4Y1W/GnHr7N06L1W8Cocc JtJGEaL00/N2BxncCVqRoT+wiDww+C7XeVsu8nEuSjR2M1dV2vBXaYOu+VKpe6O5mJsQ1/7XDt/ 7pG+t3UdMB40CKEtJJkfNo1UK13QBG3UMLtcj4vbp+ouwas6m7wVesB0ycWQEm2t0gVsCY73J40 cE2/CE+x3ju2eJVBtqspjNpqjofWgOVtimSJyuMeCkQyNmtSxhly94G687vncD5eR+4/9FmKrmn h1Dv4fdQNCwWWcyCis8H1ildlX5zdXcyWLaR5a6uMt3SUIlm6OsWdoEIqujHly X-Google-Smtp-Source: AGHT+IH6NEb92+04ReM37pymEPXcRn/KBwk6INmqVbgmpoOtMmeZpdxMFKvLu9A1Q1OO7uW7F44Hug== X-Received: by 2002:a05:6000:3108:b0:3df:9ba8:21a3 with SMTP id ffacd0b85a97d-42704bc0d07mr3064974f8f.18.1760707820465; Fri, 17 Oct 2025 06:30:20 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Thomas Huth , Eric Farman , Jason Herne , Christian Borntraeger , Matthew Rosato , Halil Pasic , qemu-s390x@nongnu.org, Ilya Leoshkevich , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 03/12] hw/s390x/ccw: Remove deprecated s390-ccw-virtio-5.0 machine Date: Fri, 17 Oct 2025 15:29:52 +0200 Message-ID: <20251017133002.61410-4-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251017133002.61410-1-philmd@linaro.org> References: <20251017133002.61410-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::432; envelope-from=philmd@linaro.org; helo=mail-wr1-x432.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760708087058158500 This machine 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") it can now be removed. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/s390x/s390-virtio-ccw.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 64b81345f1e..e1868eb7cc8 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -1133,18 +1133,6 @@ static void ccw_machine_5_1_class_options(MachineCla= ss *mc) } DEFINE_CCW_MACHINE(5, 1); =20 -static void ccw_machine_5_0_instance_options(MachineState *machine) -{ - ccw_machine_5_1_instance_options(machine); -} - -static void ccw_machine_5_0_class_options(MachineClass *mc) -{ - ccw_machine_5_1_class_options(mc); - compat_props_add(mc->compat_props, hw_compat_5_0, hw_compat_5_0_len); -} -DEFINE_CCW_MACHINE(5, 0); - static void ccw_machine_register_types(void) { type_register_static(&ccw_machine_info); --=20 2.51.0 From nobody Fri Nov 14 16:39:02 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760707935; cv=none; d=zohomail.com; s=zohoarc; b=CPu2ccbxIs8JJO9iL+8PaFQrW2eZ2hybXDlOTHG/78C9kn2+sqpC4a8h5eYB2vRThaNAniDPjEqQj+p6aor1YUI7oDyC6VV5zwlmRIC4E3PGezDUa/PLTSMbyjgzI5A6WP/twGs0UcIX0AF2Cjqa+MxKBPZwqes8zextErcAJ/o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760707935; 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=uVdMxvU4zOm3LxJuUKvCUnGY81c6LCFhSfSScZbUVig=; b=HmAqiojiGs+lwjdLs6KQAKA9Yhl1I6X2+CtjNpL/wgdZcE1cEdw3lAjWauPYCzA+3K0fUhNFc/25+Yugg5YuH5/XBZUFGg+nIItvpgUdbbnoQGgciMrKtTf6yBjbarLFiMvOWNi2qQPHS+Vrdb8s+e9Pj+sT7y2OnkbsiQhOAa0= 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 1760707935623383.7950368383366; Fri, 17 Oct 2025 06:32:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v9kXh-0008VL-LD; Fri, 17 Oct 2025 09:30:49 -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 1v9kXY-0008Rz-FH for qemu-devel@nongnu.org; Fri, 17 Oct 2025 09:30:42 -0400 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 1v9kXR-0007ww-WB for qemu-devel@nongnu.org; Fri, 17 Oct 2025 09:30:37 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-46e42fa08e4so18008295e9.3 for ; Fri, 17 Oct 2025 06:30:27 -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-471144239f4sm83162505e9.2.2025.10.17.06.30.24 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 17 Oct 2025 06:30:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760707825; x=1761312625; 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=uVdMxvU4zOm3LxJuUKvCUnGY81c6LCFhSfSScZbUVig=; b=RNFukF4aXpmvNQ6uOphTmH0EMiRnuj80MQj5t7TaYgj1E7FdFgz8q810PcvCMy5uG6 XW45alamizlx9B4BW0SFsqG2X88ybh5YQnKG/sa3CwG/25K4YV/PwziQTS1BYXaBYK/2 pOo1iyQloXfsRhcgYgXfWmTE2whFvjs5c9EHoidv0j2ySOfj+mb4hej4q3hjabdikv2Y /s00MAwIgoNSJPYdmDvAuvULdakZ/1TzlThu7witM+/IYFTzkMzXeOoSLeNkeIrc5kkH IpDDJOQfs/EC/aIKRDVFUsKuAyi1EiRk+OmBPLgNmOmlFMMAQ82fDMRADaMFrIDU2K6m xfgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760707825; x=1761312625; 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=uVdMxvU4zOm3LxJuUKvCUnGY81c6LCFhSfSScZbUVig=; b=e6Uz/oDoXkM2k1TLYWESv7LdjTrA4lbIZmYXA977P2hOUEjcMxlnQafhFmRMLvZcai u4zcqhVmf/eDG0w4PDZkkXrm/dJToHnfPjybeDKTvDr+kOX0l3SL9yMhJ0hKc14nu9gU HGpz0Fgs5I7leLmH+OmifzSEIwSOwZqDG7QgOmWyOZ/zFQgrLocmG5bDCr3eur9ssYaP +zhbWIRz0M41WmdqE3Kdr39aJngDZO/1BKBRxibb0ygWSr5XLS4pdIfjgGl2RE55pJ6x HMiOl21f0c6cbMfco7fU9D2r+d2UcTgAomA+xEFaNFwzVZuXTPZA7Q7z+sW/S1W3SNqB 4QRA== X-Gm-Message-State: AOJu0YwVyZlfejiLWxexLDdXsSVUmJxXVVP0w3oB1Bmt7Galbga19iED /o7KvHKwU+tpvxRf/U+hI00PW/2p4/mgbWX28U5Err1uS6G8Jes1BLb8O452QukEPQcf7dDcjaU sGFoF17U= X-Gm-Gg: ASbGncvEXVawQxdyfsqW0a+WgaRkfXkhvfxcg8JNrxKtFw/hzHWuHf611J6iCYo7h3t KeKC1qHpG3xCC+KzUTg/hoyT8hlT9PzfpIGq1x1+Dlk6Jgnnu1mmulwAOfW7jH7vt4U3tVwVIuA oygSp42SofxayHzbCFnZIWxdr6y0mixDFeQ6r20mDIkb0OmD2L/7x68qoIgZMdRVEJHrWTBKNdN yrnMcO+htj2Ru8/agjTtFX+wZMgVya/Hfh0hPenDcEmyjUoSb2Je9Nt0sVWhTIFgsyUDpBz15iA omn7Qwd7A8X7TBS581W00ey3862kNDojzpY6DtBG0wdD0ZUmiJPx6sk60sWNa0vsNOc2mBNN11a vkmvy7CMFoTCMReyJ9AeChshbDFSxJkXJAuIUSX64hg127K2r2SNDRDzBdrJrW+p+nZx9aF0L+B Ges3Pjq9jPDGZB1TzrkRhdA2MPiKz7CKy/HTICoKRMLc7kVjupQQ== X-Google-Smtp-Source: AGHT+IEBkGeXv4i4nViSeHAshYqIqORZq/y1PuipgDzHDyX1qp/Ce9eQnUgMsiVo9VgKak4yGB0KlA== X-Received: by 2002:a05:600c:3b0c:b0:471:669:ec1f with SMTP id 5b1f17b1804b1-471178785e1mr30099525e9.8.1760707825475; Fri, 17 Oct 2025 06:30:25 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Thomas Huth , Eric Farman , Jason Herne , Christian Borntraeger , Matthew Rosato , Halil Pasic , qemu-s390x@nongnu.org, Ilya Leoshkevich , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 04/12] hw/s390x/ccw: Remove deprecated s390-ccw-virtio-5.1 machine Date: Fri, 17 Oct 2025 15:29:53 +0200 Message-ID: <20251017133002.61410-5-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251017133002.61410-1-philmd@linaro.org> References: <20251017133002.61410-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=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760707938646154100 This machine 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") it can now be removed. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/s390x/s390-virtio-ccw.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index e1868eb7cc8..7be998168e8 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -1121,18 +1121,6 @@ static void ccw_machine_5_2_class_options(MachineCla= ss *mc) } DEFINE_CCW_MACHINE(5, 2); =20 -static void ccw_machine_5_1_instance_options(MachineState *machine) -{ - ccw_machine_5_2_instance_options(machine); -} - -static void ccw_machine_5_1_class_options(MachineClass *mc) -{ - ccw_machine_5_2_class_options(mc); - compat_props_add(mc->compat_props, hw_compat_5_1, hw_compat_5_1_len); -} -DEFINE_CCW_MACHINE(5, 1); - static void ccw_machine_register_types(void) { type_register_static(&ccw_machine_info); --=20 2.51.0 From nobody Fri Nov 14 16:39:02 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760708138; cv=none; d=zohomail.com; s=zohoarc; b=U13CfFaukHwmfrNMeqxYQjB4lxb4LEGJyEL/TyumT/2yK+9d4nLl5pRoYe/c+5iLxLrTSL0+1hDpbyfKkXntakwg7WQyjLubTw4yt4Eh+mD/K4pippWIbqVqpiCbo4m5OrVLiJMAunLS3/fuGaRcFu9TEovmyNEzWQvQmJgt8lQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760708138; 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=NZrcPjLfHxaL48ZnDYfElgAgAzur4umLN5QD93IZQyk=; b=eDi8Y79f0E5QCuVJcCTeE12UqGf6EdrxnMTzPbkVK9jBRA0h2YQQf0OXakDWL33FUjXx0w7a/3Qrv2C/xae88JK46sLCBhB8v2KYUD0WbU5Yis6BFLbTCxSHiUmol1YwTGiJ7a1e6BMIoUNY+3yY9d2+xoNmByZ6PCoe/P77ZJA= 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 1760708138423213.3412051001319; Fri, 17 Oct 2025 06:35:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v9kXq-00004x-C5; Fri, 17 Oct 2025 09:30:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v9kXe-0008Sn-0b for qemu-devel@nongnu.org; Fri, 17 Oct 2025 09:30:47 -0400 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 1v9kXS-0007xX-Fi for qemu-devel@nongnu.org; Fri, 17 Oct 2025 09:30:45 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-47117e75258so7543085e9.2 for ; Fri, 17 Oct 2025 06:30: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 5b1f17b1804b1-4711442dbaesm84947425e9.8.2025.10.17.06.30.29 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 17 Oct 2025 06:30:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760707831; x=1761312631; 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=NZrcPjLfHxaL48ZnDYfElgAgAzur4umLN5QD93IZQyk=; b=WHRJ4qKCAca8m+qOstPXsGJyic8uy4eF1csVH2rv+vHzDlUcKm5dQQ7kjsoqDXsx6f tt9DclR79Q40qignxPebkou3pxEw2vHy7+RIIL0RoQm3l07HjjVJxBXRQRyywsoT7I1T H2WBny5obgGA7dFsvnvVp7exzppSf6YD9vYEGCudX71DbSA3afwTf9EUyj/zSPh2rSJC t8GVj0XOCFdxoMjMa4+JINDsMQIB1+JIXLSLfAXHH8Lq2Kh4PZnoiP80YDCD0gJ/Wndc yaLXfmocHSpfxR/bcjQEoan2Ww9Yw/2dXfQBUhoRY8nwqjNnr4utbwIP1iS2dNJmSWf4 B17Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760707831; x=1761312631; 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=NZrcPjLfHxaL48ZnDYfElgAgAzur4umLN5QD93IZQyk=; b=QGR6RZKrNpfIQ8b6LSmH0uDO5JY+ilNWF5GFADEaf1bWEd09Az/Ixs2/Ry+7Lq9DmK oIoBevlCCMNMZqsfM9nBJy7ovhLXzrPzE/GAJpy8WyX8rgxFWZz/qxSUE9WcZVoV+Fi+ /Us3V9mVvtidnyJNb0tjV+Ip3jSo4Ncc2h8LA1+6bsXVOmPifbIJGlgI3vPzx0Qye1jZ bAXI0pUH9Pkf/sYOVRLU49W2xjICZn7IsXnmWQS8O7BQZBnwSy1k4wh9pF+G2azan8wI 0tIodqcKJ5TgCkQRbendnPQmmnppNJBOJYXXdTw20Vlf45/l/BprCycHlMIYI0QmFVfM anmQ== X-Gm-Message-State: AOJu0YyUhSwk98EZZ3XxHIQVEU55z6dziOgJIMCJSI/PaLMXswECZGdZ q1FCunZqfhE0eypyuys/ryK9+9VWukeTybPNZwQIbISin5wRywe28uCxtQNfkwUPJYWZx/I34w2 hkXdaWTk= X-Gm-Gg: ASbGncvGxYbAh4j63lGoXchfTX3Lz4NJlh+CyrpFF/ncg4Myb5hKYnfTISPGh7M4hxn KhWzYzicPTrUifZLz66cOv2T7MaiCO7z1EgAwTa9DzI3cJFO0Ksjltxew9CPj3TwkD8G6DgWtHW WTtHB9hUOFNzIL7FdmfcprmQyujtKYLHSUi9/dS+FPy2dL8aWgYfN7OHNBvmnr6nyYV/RHqt1PK UxZIbtPFNXqVcdNp/CtLee5N7ElwzmEQwI8QAbo+rzgOi/V7DaFTJbEI+uPqo/uqS+FxO0vKD6r wPrlN1+R3hE9KPkxPi3kQfSiQbtX1WNzSaZ9xemjcY++kBOvSVXNZAvlsXHGoXYVOTx75Og0Ixk 5Dmtwn2SB7ScjVoZQSs8CyQYs7DRFV/vGKaQQlwmCjFbzaHue6vy1gRzzMZyXH3BBayMSblAGqt MYAL1HAMnCFL5Uab+4xy5nW/UJLmB135yLySTMZKeovcSLiLzVi4iVNhxGtj7N X-Google-Smtp-Source: AGHT+IEHXKCqSHJkQqTrkGXNC6LA92jnIENYehUqITe/TG9b65FUa3BgDb2ost7w/wUxRpjpLfCJYQ== X-Received: by 2002:a05:600c:8b0d:b0:46e:39e1:fc27 with SMTP id 5b1f17b1804b1-4711787442amr29143035e9.5.1760707830687; Fri, 17 Oct 2025 06:30:30 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Thomas Huth , Eric Farman , Jason Herne , Christian Borntraeger , Matthew Rosato , Halil Pasic , qemu-s390x@nongnu.org, Ilya Leoshkevich , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 05/12] hw/s390x/ccw: Remove deprecated s390-ccw-virtio-5.2 machine Date: Fri, 17 Oct 2025 15:29:54 +0200 Message-ID: <20251017133002.61410-6-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251017133002.61410-1-philmd@linaro.org> References: <20251017133002.61410-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, T_SPF_TEMPERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760708140879154100 This machine 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") it can now be removed. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/s390x/s390-virtio-ccw.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 7be998168e8..103b0c4d73f 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -1109,18 +1109,6 @@ static void ccw_machine_6_0_class_options(MachineCla= ss *mc) } DEFINE_CCW_MACHINE(6, 0); =20 -static void ccw_machine_5_2_instance_options(MachineState *machine) -{ - ccw_machine_6_0_instance_options(machine); -} - -static void ccw_machine_5_2_class_options(MachineClass *mc) -{ - ccw_machine_6_0_class_options(mc); - compat_props_add(mc->compat_props, hw_compat_5_2, hw_compat_5_2_len); -} -DEFINE_CCW_MACHINE(5, 2); - static void ccw_machine_register_types(void) { type_register_static(&ccw_machine_info); --=20 2.51.0 From nobody Fri Nov 14 16:39:02 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760708064; cv=none; d=zohomail.com; s=zohoarc; b=X0OrAiB5M5nsFLGIwDKnAPvtmQVEDEo8g6zvJ+2w7cheAGP0xcY1J1esByN89sNckiX3c7CjLFHAjZoTGo+mIHEk7T00KvFb27eu9JZ3NvSFZccmB585KfLAfx0V9GFZye3wKIpxAOe8N+iRMNDEjGsLONL9VHRX8O3/bu4y2jY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760708064; 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=4O2UPMw/YN3rHSOyP+4AX/2wuGvfW6yAoggPFM7dTXo=; b=HYl1WhdKmRwKILJqX4PclwbcA5TCzcbWj8mz1LD/yWhlchlTG1YpJlMm3JtCPQIH+9Gd+Flo9zsP0pMj7zHTG2MKorac2jPlJ59FgdAnIMqMHXZVHaSdCby3aUwuxFYoLXeSSVJSSovmKELL+bD8LvoZQa28SENx2hHl8tTkXZE= 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 1760708064387569.8387990271536; Fri, 17 Oct 2025 06:34:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v9kXt-00006f-OY; Fri, 17 Oct 2025 09:31:01 -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 1v9kXr-00005y-Tz for qemu-devel@nongnu.org; Fri, 17 Oct 2025 09:31:00 -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 1v9kXb-0007yV-QE for qemu-devel@nongnu.org; Fri, 17 Oct 2025 09:30:59 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-46fc5e54cceso14681715e9.0 for ; Fri, 17 Oct 2025 06:30:39 -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-42704141cdfsm7661994f8f.4.2025.10.17.06.30.34 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 17 Oct 2025 06:30:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760707836; x=1761312636; 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=4O2UPMw/YN3rHSOyP+4AX/2wuGvfW6yAoggPFM7dTXo=; b=P13NeCyvvoyzuGk2UYhpVhqz67+wuGbGJxDeyuc+/m4w1mQEovy792/SYX/d8PY0Tq 1z1AB0CmLqmpETOlIzLWDyPhoUsKHI8r5610RrXYfb9xqbPHSlTTH/c3YUKljyQ9B2Xw Jzi0mqDNOazGcMvq83T4YlfSu17EGe7e3dcUPco5x/wL+IksSrBN83salOE6d+cVRW9J ZQSyQrLFOLWMHHUvRJUSRSCPxa+YERsimSf+uCyngwphAe20nPgiW1s+SZ5e9fC7zXZG 9qRNZkkE07fM+AIpilz6IySLFrJa3Qql8oXFFYFA8xYfzYcaqeIZWM/nCmf31h3PLvr8 uwPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760707836; x=1761312636; 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=4O2UPMw/YN3rHSOyP+4AX/2wuGvfW6yAoggPFM7dTXo=; b=Drmo/QWYt2RYEnmon14JyJK/AgYnD4SwKi4Br3T7Xy7DDeKdn8uPWvLSLKZW83sZ45 K9EWFBLCo2P+QPAMwfAPKDp1xOPUMnM39KIoPkV0HpdZqcv/8rv0xtAFXNX9l0eGo1+l Bxy2/YQEW90cNVzZVOyT6reDfhpAhMqNvT0b9OnijpO2mIpZPsTdpDYQNhD/jX1eatj9 KX1RIuI+HjQBFfwkzuhn9az0ozsZyEy3uRRkNM6DKpLKdVo7Vz2Wag+Or56sxMFM792U tA/nI6dzc04fq4iscd5n6UemT9nGt4+4M+ZMSIrZtPQS5k6exQoWh1K+l5bvN+j7lnHS F6fQ== X-Gm-Message-State: AOJu0Yy6XyuyNEmNwQ3ocOjDm1lHLxuLN3kexeF3WPkINOciu5zxc0E+ pXaf7cqaGUwflm7YK+hyUeU2kMzNWwB/pAGNhMfUodDFu5c7/7UXd8E1EEiT/RLYVZCCuwbzOBB MKVGpL5w= X-Gm-Gg: ASbGncutqCqrrZwnMMfdhX7pfgB1o2ZuISQCFWoFApYvz93sZk2mwAFE0ofejuYpshB pj9VSXETSpORc8bZkZlu7bwOvIEB7KWeIdt3QQTpWXxPYSfd6zbAgNT5GkKZ0URAfdnYghuErvj DQzJfzTU1v6KLnq0DfElXz8WwTIYrLxHZ3HN3PPqRrvI8rq/WcO0G+GuyQJQxumOn9jIeHLHpBz RkprlsRaYejhqv3hQmffS0jTxCkg9+e4JTBwKnog+4VvWXmnUVM62QUpxoSYi4wbnwe9L+LHWBV 6qvE87stKDRwTPirzE+yHmJltuEB2QkqbGOHhOF6Rkov/4NnBepqpyXU+Ea3xnKvQgEwEotRWX6 fCXZ3MHucATnPx/HW3zXxxo2Ip3hu9X/XR9MWmmrudiqV3bQF9oS7++aJRUn4yjex34tOF/Godu fGErAoSXP4hAbtsA7q8/UjLwkDC1b0hKtufvH9yl7saR3+pgOvQwsCKJ+4tciF X-Google-Smtp-Source: AGHT+IFIi9zF9k2DTInlvNKnPaqDmAniERN3xGMs/Te5YfN/gfEV23TayKVAp7n2qEdq11t/OuI6hw== X-Received: by 2002:a05:600c:6291:b0:470:fcdf:418 with SMTP id 5b1f17b1804b1-47117911694mr29067855e9.27.1760707835679; Fri, 17 Oct 2025 06:30:35 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Thomas Huth , Eric Farman , Jason Herne , Christian Borntraeger , Matthew Rosato , Halil Pasic , qemu-s390x@nongnu.org, Ilya Leoshkevich , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 06/12] hw/s390x/ccw: Remove deprecated s390-ccw-virtio-6.0 machine Date: Fri, 17 Oct 2025 15:29:55 +0200 Message-ID: <20251017133002.61410-7-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251017133002.61410-1-philmd@linaro.org> References: <20251017133002.61410-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: 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: 1760708065987154100 This machine 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") it can now be removed. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/s390x/s390-virtio-ccw.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 103b0c4d73f..46dcabe6ad1 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -1094,21 +1094,6 @@ static void ccw_machine_6_1_class_options(MachineCla= ss *mc) } DEFINE_CCW_MACHINE(6, 1); =20 -static void ccw_machine_6_0_instance_options(MachineState *machine) -{ - static const S390FeatInit qemu_cpu_feat =3D { S390_FEAT_LIST_QEMU_V6_0= }; - - ccw_machine_6_1_instance_options(machine); - s390_set_qemu_cpu_model(0x2964, 13, 2, qemu_cpu_feat); -} - -static void ccw_machine_6_0_class_options(MachineClass *mc) -{ - ccw_machine_6_1_class_options(mc); - compat_props_add(mc->compat_props, hw_compat_6_0, hw_compat_6_0_len); -} -DEFINE_CCW_MACHINE(6, 0); - static void ccw_machine_register_types(void) { type_register_static(&ccw_machine_info); --=20 2.51.0 From nobody Fri Nov 14 16:39:02 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760708164; cv=none; d=zohomail.com; s=zohoarc; b=IDFR54Vkyzp493DGINfWV7QsOmjGPKPPEVlbBYBmlzb+Sp+v9BD0lv46zu8wNsAnynnSNQF14UaOO5obzqCeCK1VTMGi7cUamgHlxMz5fjcBGbHSABy1fmO1/SL6b5UvRNJH0oVIigQi1dxH0zqEVihuKOlTjANMV6ZlEkMeWvU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760708164; 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=7oSlSkkaci0cDEla6T9S3uxoHgo6il6hIdW4S6lyOEs=; b=IUPZSgNWpZU+LOYyEYq6dL3bbi1RacBRvP1xTQDkmwsvW8Lm8uOq/D04Wa1iRrNwgk4D1n2XbqJwSMNXARR39sMKTTZV8tZnIddIL67i7arskJQRoSn8ISphpGWpNcGOXoDznEpqN53xOVjC45pRcgMnMovEEd2V5BKSA/9iQpQ= 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 176070816456452.58768500702354; Fri, 17 Oct 2025 06:36:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v9kXq-000051-LL; Fri, 17 Oct 2025 09:30:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v9kXo-0008Vx-G8 for qemu-devel@nongnu.org; Fri, 17 Oct 2025 09:30:57 -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 1v9kXe-0007zF-So for qemu-devel@nongnu.org; Fri, 17 Oct 2025 09:30:53 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-46e6a689bd0so18336715e9.1 for ; Fri, 17 Oct 2025 06:30: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-4710ca243a3sm47748345e9.0.2025.10.17.06.30.39 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 17 Oct 2025 06:30:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760707841; x=1761312641; 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=7oSlSkkaci0cDEla6T9S3uxoHgo6il6hIdW4S6lyOEs=; b=yUDvqnbNPPSuJWLXKmYkBctDuyqFfzUmPei0fMXox55RsmQLW6VmYRpmkb4FhBGADY rl22FIAOZsinRikjQGwB3GzcTvpbhXtYyuqIAQ0qO8f2a5j6OnDdI3ur4PKtAvoKAJYU 8uj1hatoXx6aa9hgtJ5ubxfQPPhQLe+wP6DxgirsBMlzrq5J9GRnv8gzhFxqwBmyK51I BFR2wjyKBEcSwDdiV27llXRw7uHaBQ32PspZmriP3HS7S13HPVxEww/a0lSdq1rqpZMc UTePRyh+jcdmXoqNz/1wHF5/ncIQRPc5N/oETDetn4EdNHtdWnVYLw8VGVcGs4dxmAa4 zGpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760707841; x=1761312641; 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=7oSlSkkaci0cDEla6T9S3uxoHgo6il6hIdW4S6lyOEs=; b=cUHFrZpYAAcRR97f71S2iwbTSBzM+JENcROPp/9Vi+AIqeqbuvpDSK8HFXW1UBvyEA C9NsmH3BlJAAFVC0KTK9fPX5po1pFih2yfBUvfUt9K7ku3LZRDYvZ7ZRaYT32YtPRU4O 0A6NK5L1SsvZ5CfS+cTRWvlc+6Otxzkq1KOpytJDl1SH0nxUVmSIoefHK68gf8j1PChS lLK7kifLIJ4ul6ZdtznTTH3LUkyP7TDH2SnFIENNSQPnjqcOkcVCvh74lYENvnrhu3qQ tHbdkYB9Vz3JfoaIz2koK8CJ1CX3vO6IVpnRoTo1z548KrPajdoXQ3JsrgmVyks7fBt1 57RA== X-Gm-Message-State: AOJu0YwI4AcptH51D87ky7G3Zxc1CMPh4ZSJFa69RPx9XDHzlvrS3MMO aiXP8OGYRr0T8nHxzJnxtJXjLXZ1Emjtr1nl5YKQ/8GwWOChwN6++qas7SBSNVjsL3Z6lkjk7TV SF76az1I= X-Gm-Gg: ASbGncs6210psiQRcNZqsrehGpIpx7aRl/2ZNUxg01IG3thwmw52p2iO1xOuoCO1hsS yiDhcQHwk965cQKOhmaN21Pg/nOVZv1FecHFrP8ayu0yrcGhtXw25bMGi548phQCv6rkWy+1tPf 6XA7EO2lD3FnekebVASZTIEtJtUYa/ay3Z4UUxF2LIBFy3d841UCzNrvJv93hMy0kot2S/1ISg4 DBfHc6ooNl3ASQPISLOKmwZaP8OnyFovi9Bivlm/GSCP5T8zIUbAlm+vaf2NMzoeOwnELVCL6ou MrcC3RS0x455PvpPqZu9oA/gy1nsr3WEuKfgh4fiCr/B0e89URrk3MNN7nacT3MCyhT+F+S6Kuc ezqbqsLxHRJ+X6Rc768ou2k1nRqtdiF2lsmdpuJscMdK0qcCDt9PsBPpCLRuH8vYKqE0tc7pAuz H6Scm3MtfMGkLEYaduKPIs7Ns/SQBcKGG7jHfg0j6AuPGKG6R8aQ== X-Google-Smtp-Source: AGHT+IEkkLvAqtHe8qtdj1P5F3GrQWdzwWaeQ3zLRK605InUEYbfo9L7OHOpz0LUXmEvR1OyUM3VHg== X-Received: by 2002:a05:600c:8b66:b0:46e:428a:b4c7 with SMTP id 5b1f17b1804b1-471179120ccmr28337195e9.23.1760707841511; Fri, 17 Oct 2025 06:30:41 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Thomas Huth , Eric Farman , Jason Herne , Christian Borntraeger , Matthew Rosato , Halil Pasic , qemu-s390x@nongnu.org, Ilya Leoshkevich , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 07/12] hw/s390x/ccw: Remove deprecated s390-ccw-virtio-6.1 machine Date: Fri, 17 Oct 2025 15:29:56 +0200 Message-ID: <20251017133002.61410-8-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251017133002.61410-1-philmd@linaro.org> References: <20251017133002.61410-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::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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760708167064154100 This machine 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") it can now be removed. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/s390x/s390-virtio-ccw.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 46dcabe6ad1..a22d1fbef36 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -1076,24 +1076,6 @@ static void ccw_machine_6_2_class_options(MachineCla= ss *mc) } DEFINE_CCW_MACHINE(6, 2); =20 -static void ccw_machine_6_1_instance_options(MachineState *machine) -{ - ccw_machine_6_2_instance_options(machine); - s390_cpudef_featoff_greater(16, 1, S390_FEAT_NNPA); - s390_cpudef_featoff_greater(16, 1, S390_FEAT_VECTOR_PACKED_DECIMAL_ENH= 2); - s390_cpudef_featoff_greater(16, 1, S390_FEAT_BEAR_ENH); - s390_cpudef_featoff_greater(16, 1, S390_FEAT_RDP); - s390_cpudef_featoff_greater(16, 1, S390_FEAT_PAI); -} - -static void ccw_machine_6_1_class_options(MachineClass *mc) -{ - ccw_machine_6_2_class_options(mc); - compat_props_add(mc->compat_props, hw_compat_6_1, hw_compat_6_1_len); - mc->smp_props.prefer_sockets =3D true; -} -DEFINE_CCW_MACHINE(6, 1); - static void ccw_machine_register_types(void) { type_register_static(&ccw_machine_info); --=20 2.51.0 From nobody Fri Nov 14 16:39:02 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760708036; cv=none; d=zohomail.com; s=zohoarc; b=ZZbK4dHPkaOfH6T03OuvzZd7RsOW5gwId8Jj5LY9Am111r50rGkEhCsetfWk2Tu7WTmCUtSUhiS3vg9OOvcF60Codf520Lyxyy6l7XWUo92hfbnh5oB2PFVHpoeU5GsuCkc6y1tY4psw6eEGqsmNb+V99etpM9vfD2JWhdG+fjY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760708036; 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=lkTVJr9z+rZ8Ej16PgJskpCaibCQbwucKokBwl1LHIw=; b=f921kC710TpvtNdkcRYJUUhB4NHDiF1EG0XkuV3+3kDn70IXTByhzWzhD+WsYug4CgSZslKgxrSrRKBCOf9kfBKPy1aV7+LdWzvrlUcSoSb1i1pvVHFBiSb6AeTkCXsCOoMmyw86dSWi+l9BoaduaJxCNe45jxPKkIB3Wg32APU= 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 176070803624411.702957228330888; Fri, 17 Oct 2025 06:33:56 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v9kXv-00007Q-UC; Fri, 17 Oct 2025 09:31:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v9kXt-00006e-Mk for qemu-devel@nongnu.org; Fri, 17 Oct 2025 09:31:01 -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 1v9kXj-0007zn-IL for qemu-devel@nongnu.org; Fri, 17 Oct 2025 09:31:00 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-4712c6d9495so421875e9.2 for ; Fri, 17 Oct 2025 06:30: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-426ce5e1024sm40422758f8f.42.2025.10.17.06.30.45 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 17 Oct 2025 06:30:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760707846; x=1761312646; 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=lkTVJr9z+rZ8Ej16PgJskpCaibCQbwucKokBwl1LHIw=; b=rU+jEkFzI7qeyUvoYfi+HpwjnIIfEPp9HzJrPnas7coUTRy5WSqS0O2aQA3uvu87Qd BES1r19vPUKxxZCqIywGJmBxzmOAzfq9FgIux5jg3qfldCtR/YWxWJSNZTg5JwH1OVoV kkHaJja+JFhCCsDJL30jHaGhG4o5hK9hB0WkHYQV2uqQTqwnNtss6msFSXuBLUFs+F36 FDb0JfMEPBo0OqTBYUm45z6zA2xdloWTCZei9PHDxnHPa6MfF+O8Fj2OaLX81fVrfx/R IfYTrT/++DxcJKPZKwZmM5YS14mJfYLR44eY0OMQeqea7ULK65ckufflHkQyjHnwehG5 sf+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760707846; x=1761312646; 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=lkTVJr9z+rZ8Ej16PgJskpCaibCQbwucKokBwl1LHIw=; b=LbeifvpPsizA4rkJ0ijRcE087BUpkZmWwuooTbt7HydeViNT1DoljUF1/zZvpyfCNi kw/HnMtQUP45RpCOcL35+0O4vita1iBNYllKwiCHP1W0YZzJtbpHKqAMCt/IMlZL/7Z1 j0sXaqs/ZLMax6UoOrlspD8gIy6eDTwc9W90mxQnbTUNy0hZNP1qZgda7zPAt/Ccr1+s SHC/xN8YOPPfvc4Jk9oYbCwYZmuG8CAZn7alBSydjywkXvedejyd5o7U/EZQ1YHVfVbQ 91Ri6FH6e7Ntv2uW6DULSeVXMukU8tGMtko6Fj5pyE44YNlYlFf4bRVib10r+NxQCpwv rrwQ== X-Gm-Message-State: AOJu0Yxo3YEiQibxHp+UjBeqFhT3bnZCDd4rYFiRCyWowcTbgS13ZCxO 4qn7PeX7J7egigpBTXyIH9iRRcMvXF8El9U23d8U3OdrcQdsdcfxfTeHPcuSGVP+PrhtczGA9nr SgaqxNNU= X-Gm-Gg: ASbGnctLn0OdpzDx4f01aRgTiwRonoUvqw8czPlz2fLUa0yNTcKEOhuZ+R2oKtPTo2h i3/eyXjpJ7g6dudqojqHsQYPfrKoiMg2zTtfbxCRsHXXJjehmXglSlmz1sPQt8X0dABQ59a9VTN ZGJFUSAlw3JVY97/5LVzBCFFZOW6meAHZLANAvy5JNuywz86at6FvVUgyGuBUZ63g03Vgn9rRur wTautZE5P7sC7tU8cUEeV7ib6r54PDSniHkX63VGLlaomI37Q8Sr3oW/1LBIIR1oud1UHL8qlPq RtkPNbwnHsHZ43uvc3YIYOAoQGY0mmIs8HWbOK1VOyT3DVZ9SyIz3kV92dn3/lcPEToL+OM+tu1 FUZ8EYHUA4EWSmByuOrlLs2Jl0yM1gUqUbMUpJKzxfDDuFlomer86hnzBzKcLaiWLv48EzdioTo aZrSZ53tPou3mzyLDjrcTCw7z3g7Iyyb4ckha9oDmPsqJml2arsw== X-Google-Smtp-Source: AGHT+IEXCWNkuZjOsi72UpPYq6bjXmnWujQd/jZOVWoOv1YUc9u+hMx15V5Jf5TrcSqDNUY9ByJJJg== X-Received: by 2002:a05:600c:8b62:b0:45d:d97c:235e with SMTP id 5b1f17b1804b1-47117876bcdmr27022565e9.12.1760707846547; Fri, 17 Oct 2025 06:30:46 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Thomas Huth , Eric Farman , Jason Herne , Christian Borntraeger , Matthew Rosato , Halil Pasic , qemu-s390x@nongnu.org, Ilya Leoshkevich , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 08/12] hw/s390x/ccw: Remove deprecated s390-ccw-virtio-6.2 machine Date: Fri, 17 Oct 2025 15:29:57 +0200 Message-ID: <20251017133002.61410-9-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251017133002.61410-1-philmd@linaro.org> References: <20251017133002.61410-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: 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: 1760708038468158500 This machine 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") it can now be removed. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/s390x/s390-virtio-ccw.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index a22d1fbef36..319b597d12b 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -1061,21 +1061,6 @@ static void ccw_machine_7_0_class_options(MachineCla= ss *mc) } DEFINE_CCW_MACHINE(7, 0); =20 -static void ccw_machine_6_2_instance_options(MachineState *machine) -{ - static const S390FeatInit qemu_cpu_feat =3D { S390_FEAT_LIST_QEMU_V6_2= }; - - ccw_machine_7_0_instance_options(machine); - s390_set_qemu_cpu_model(0x3906, 14, 2, qemu_cpu_feat); -} - -static void ccw_machine_6_2_class_options(MachineClass *mc) -{ - ccw_machine_7_0_class_options(mc); - compat_props_add(mc->compat_props, hw_compat_6_2, hw_compat_6_2_len); -} -DEFINE_CCW_MACHINE(6, 2); - static void ccw_machine_register_types(void) { type_register_static(&ccw_machine_info); --=20 2.51.0 From nobody Fri Nov 14 16:39:02 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760707940; cv=none; d=zohomail.com; s=zohoarc; b=Dz6VcC++HPKlstcVeAT31b5RH8IfqTOI2UuJx+96krH2TnGwqTPaL6VnuovqU2QI3+8zuwTBRrlXuXH69hKhbRINWE0twC3OpCUx9AgxevTMybbrk6doTN2eR4BU45vyuAfBisGyJs/xFecmjRF1HnirnoLXt+Wzvz8kaGelz4U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760707940; 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=t7TOtOenWslncjhlwC5SIPbJSYnSgL1bmnbXeJ9sRy8=; b=SadTJ/QRa1nh0IioXsK05eD1XPPejd3Sq0H+BUOIJ2in+TcrSSxkv0GWdllR1ieqQHrFOQKheTOxmVO83u3fPweAnbKnbpGvfJTFdGXQh9d3afi3gMbCt+xIpD0feYXPS/r8z2J2llsYCstAnNk45nFwjlgGAjRbYtMZaDn0wec= 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 1760707940679717.0447516743385; Fri, 17 Oct 2025 06:32:20 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v9kY3-000096-Ql; Fri, 17 Oct 2025 09:31:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v9kY1-00008i-IE for qemu-devel@nongnu.org; Fri, 17 Oct 2025 09:31:09 -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 1v9kXs-00080O-FF for qemu-devel@nongnu.org; Fri, 17 Oct 2025 09:31:09 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-4711825a02bso7910715e9.2 for ; Fri, 17 Oct 2025 06:30:59 -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-471144b5c91sm81198735e9.11.2025.10.17.06.30.50 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 17 Oct 2025 06:30:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760707851; x=1761312651; 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=t7TOtOenWslncjhlwC5SIPbJSYnSgL1bmnbXeJ9sRy8=; b=iUzvfA8UeHysrt3xEQi78F2S9Rt66zUAtHdMkMMrY0kvW3sSbMmPwCWsnA57tPGAcW dn2TPU38cNLtf60O01I0i9UyA84aAnyDUEC8vBZXRTSeVE3HutcUgGmu3GD2xZRwtkU8 apJkY22jHM5Ctm86gWKxzTvbLZZ/MatzAQFQ2Mhq8ENwI5b05XOvyk4zo+ajuVkMiGwQ m1hHIdhMHCnTwk2NlRP5t2z2KYql+gMIYBx7+Y6QASUtVsuj50Ogm9yVGgEzAF4fW0IQ 5cygqJKfMvm1cODtftgHC1/45ddpJw7RGZAy83JUH/WkOR+s+/p7+fSFMnYxt8408Il+ xQqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760707851; x=1761312651; 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=t7TOtOenWslncjhlwC5SIPbJSYnSgL1bmnbXeJ9sRy8=; b=e1CO9V2yHXnpYjdDdE6qdVWfguZ0HmcmwKjaa9Ser5LJXKdTDC13PN731ZAXnTUiNQ HTUVjorgeUOGePFIKU9rXbwcwV3ggE4wLnq/zGXMWtl9/fSRyOTnhNyBzp40JVI6ZgSH MU88OIWPx13R6d8GA0Po47f0pnbmxkn8xWg3cW24hkZUNxxXQ9TIfKIH4NPdRLLS5gob cCQ2B34Anes3s+h0je+puIIdKca916wiHM0W0znAq13vHbWttBna4wjaC1ts7KEE/Xp8 xXHLBzMBA2PUGftTavhUNpBtsdH78mIolIrI95d2NxIY4Ef6H/7f+A+81Kl0m59ZsZsZ Ztwg== X-Gm-Message-State: AOJu0Yy974vBido66BjGwaRXtuxd98ht798JHiootmswd1ONnsgsVsFf AiQeSUrUrAiKLCXpg5yk3hfwj0NxdNyshzK2ZCpzYzGxDgnleqlAuKJrZtvYtPviflnE+aQEnGw a4HqloK0= X-Gm-Gg: ASbGnctimCl5ebYBjqEeCTgACJRVvng6eULBgos/o60i1M09whFhoMIhKZ3zoYrD7ZD JpKjmKI4dfP8C3PHoby/50Q37QD1HysVUgCrHhlZIq+C5bjPPllAfoKIArVPibft7FSRYt2unjM ZN8MN8ec0wz4lQp49TwzLS/Ch0w7msRBXN9IOl2q8hgoy6T+YuqJzyMgd6W/Ag6YUBZd51GfLIr bbp8Aa5d5oOoHRzTgh3+e/oWbrt/ARYsdP8o1I3o6RNYmnoQQLZFWKbZpDWgfJBoUsI5omzHrEr A9qxX+1/lFOS/jdwHAiy4Ec4Za9XdUBHv3pf9mK1SH+W/xx6BZVpbi3C43eSgTw+W3nIsSZCY5I cqgl67r6D9mHkGEW+uAcn6fctUXnzxRkmFigNyclDpvmoVzxQWrErOOK2GMZVU/icWABqLcQXAd RkturbAbNvdvJRgN7UQ4lsNbUJqWgtEAGGVRzgdgtB+k3XzvJZ4SHkLsWHR4G/C8uXxzOSDKY= X-Google-Smtp-Source: AGHT+IH2vIW7p3d5yHPBsbCzVJ3XlhtQm5ASTK/XXkyCxV7jIq9HeB24hCFecZ6Rz1Q70lHJlTMZEQ== X-Received: by 2002:a05:600c:450c:b0:46e:38cc:d3e2 with SMTP id 5b1f17b1804b1-47117906a23mr28302735e9.22.1760707851593; Fri, 17 Oct 2025 06:30:51 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Thomas Huth , Eric Farman , Jason Herne , Christian Borntraeger , Matthew Rosato , Halil Pasic , qemu-s390x@nongnu.org, Ilya Leoshkevich , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 09/12] hw/s390x/ccw: Remove deprecated s390-ccw-virtio-7.0 machine Date: Fri, 17 Oct 2025 15:29:58 +0200 Message-ID: <20251017133002.61410-10-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251017133002.61410-1-philmd@linaro.org> References: <20251017133002.61410-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::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=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760707947603158500 This machine 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") it can now be removed. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/s390x/s390-virtio-ccw.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 319b597d12b..942b1e5a932 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -1046,21 +1046,6 @@ static void ccw_machine_7_1_class_options(MachineCla= ss *mc) } DEFINE_CCW_MACHINE(7, 1); =20 -static void ccw_machine_7_0_instance_options(MachineState *machine) -{ - static const S390FeatInit qemu_cpu_feat =3D { S390_FEAT_LIST_QEMU_V7_0= }; - - ccw_machine_7_1_instance_options(machine); - s390_set_qemu_cpu_model(0x8561, 15, 1, qemu_cpu_feat); -} - -static void ccw_machine_7_0_class_options(MachineClass *mc) -{ - ccw_machine_7_1_class_options(mc); - compat_props_add(mc->compat_props, hw_compat_7_0, hw_compat_7_0_len); -} -DEFINE_CCW_MACHINE(7, 0); - static void ccw_machine_register_types(void) { type_register_static(&ccw_machine_info); --=20 2.51.0 From nobody Fri Nov 14 16:39:02 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760707960; cv=none; d=zohomail.com; s=zohoarc; b=MQ+zlZGqLls+yQ8Lg0rhjOgSohTBZijNWDyPNfPDVOejNuFgaY/H5UmHQLZHqsbkgJWLlxElrMfIFVtu6iBBSgz8ebYSHz7r8MGNSNItATEBwtyXf+oZVoTaOAJqgBv8FBvKc34yelL92Lp2+PqpGHbNF/qU/FPMfKCamxNqQXk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760707960; 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=cs6l+ulzm2Pu0rQ5n5f0X6bnVXlbvi27lz9IxqVVmKk=; b=ahbHHohIQOYJU4zqBAXR0o0D2caPLwaDxP3WyEb7MX6+8eozBklmp6qB73vYiqa6s7wDXhIjG2hAib4cd5bVUd97BP5J1jo4oNiIKYngpPoH0iZxP4K26LFV/tt9SQ2I4WGaR7y0hnSXYV1S2A2Hb3jNx7OlumLQkDkfamvfgFM= 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 1760707960559585.9436429237602; Fri, 17 Oct 2025 06:32:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v9kYF-0000BN-F8; Fri, 17 Oct 2025 09:31:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v9kYB-0000AD-9G for qemu-devel@nongnu.org; Fri, 17 Oct 2025 09:31:20 -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 1v9kXu-00080k-Pp for qemu-devel@nongnu.org; Fri, 17 Oct 2025 09:31:18 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-4710683a644so18241865e9.0 for ; Fri, 17 Oct 2025 06:30:58 -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-42708bcea1bsm2723796f8f.14.2025.10.17.06.30.55 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 17 Oct 2025 06:30:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760707857; x=1761312657; 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=cs6l+ulzm2Pu0rQ5n5f0X6bnVXlbvi27lz9IxqVVmKk=; b=RygvZboqbRhNvoSg7RxbSoSBbbXrkURirKGWsM0scFJTe42qGo8vTFSLx5KFAj0PV6 o3IugsIWDK865iFqjRabrq2r2Jgj0uKihz+yeteeE5LKhWmWMuWw0iMFWtt0VjNwfXK2 dfha3bsid6pskeHDq0fP/Gjd98Dod7JzBKDO+2/UMce3F6i0G7kttOC8SF60dTbqFhwf WpGf+24GKzFNTPDn2v7oiM3hzc7rX5SI0WRPTgZHsI0UHfnemlwzAPY22sf8nZ7YxjUC 6E8eiaV8c2twNDzy02f4tY77wOi5iwznYCTCTDQ3ZGq3EmNITsPqLudPxTF2Ibfea1hJ X1hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760707857; x=1761312657; 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=cs6l+ulzm2Pu0rQ5n5f0X6bnVXlbvi27lz9IxqVVmKk=; b=DB2HFNZEh+meSBvPH027Pjg1CfIcO+w29a+G7a8OZTJU2eLlgWSlbz0SMVxcl0kHv5 ukCziXZQew4KeDjekdis5mL2++SWOygRrVedcCOCjdcCq2sUkdcRaQRj3T3FjvyXqgHd UxU4OFLQwnVioCfx7ZS3YVfGNEIBAEi32CurZ4ehGvGOCUFyslePrT675k9yzwbWDaqY GIpvNaVEjgIeSJxC1aH++2y3EUM/Q6nY6IQUqFPqZmzb5vQkEASR3o0XBMHx5RecG/hm Y2ZlNsDD/OaCPRrLO2AeN9nJlbl70f9lhH2LxFT8DuCNJoqxZcvOAgwp8LoATo2IUQAv 1RNQ== X-Gm-Message-State: AOJu0YzjD6L9TddP/rCOeZIqe+PbOBYJYZigcRpBQbbiPvs3MO3qXu5F uwH2OUW33oNyGwrEyWaQmN0T0Jbev5W2SvgLgEYPaIVdL9JDoKW+fgdTBskpc/+qN9Xd4HjfaRF OdUsgs+0= X-Gm-Gg: ASbGncsZs2woUr38tL/F6HY1Wuf0pA4hMBgRKlMl9JjC4R343RXhFTmrj1YO4mlAH2Q QPM24hzkCmmC/qqX7PemkZ9HOwYZwOLCuNvbhosat/NApa7CZhZLMUfV7lNlVQ5wiMoVSMrRMUu 9rwTsz6ZxDwaJFThMFcPNgRVrdFzaqu62mBiogkeWah4tKbm4H48ivRrsGC4ZifExm3zoop7ZHX ardESdUsiGRQoMi4dLugeLnV5g3gbMbeSl1Syz1dGuMTzbdmRgYiYiJHed3eUHf+d6xeJQYK6j/ khoeS1edqJMKQBF8pSFaCvYqQsKeZShJpiReiE3IuZYLHRtqjXHYqfa4I/HJBAAAlqdrvrUPd0v l0u1jJ5A0SaZlcl3wQTIgQ/JIEWPTpujmfCF93tAwMklnMdFi63m81T1Y947JIDH4FjVbKXuUxR kLVDdR+lmG1RxT0x7IEH1DJVL+OLPoQwxO3MODrc1SxlHK7j3pS3M7RtUzxCtiKKG8aIlbbps= X-Google-Smtp-Source: AGHT+IFf3PiUKb2tRsGUrcWsD5ZYbeNsKnTJRdF9g/Wp99stbxGPlfjc/6aC5UzHaa0IUBm6nhP/sw== X-Received: by 2002:a05:600c:3586:b0:471:5c0:94fc with SMTP id 5b1f17b1804b1-47117249af2mr38195695e9.6.1760707856695; Fri, 17 Oct 2025 06:30:56 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Thomas Huth , Eric Farman , Jason Herne , Christian Borntraeger , Matthew Rosato , Halil Pasic , qemu-s390x@nongnu.org, Ilya Leoshkevich , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 10/12] hw/s390x/ccw: Remove deprecated s390-ccw-virtio-7.1 machine Date: Fri, 17 Oct 2025 15:29:59 +0200 Message-ID: <20251017133002.61410-11-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251017133002.61410-1-philmd@linaro.org> References: <20251017133002.61410-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::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, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760707963652158500 This machine 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") it can now be removed. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/s390x/s390-virtio-ccw.c | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 942b1e5a932..cf09b5c46e6 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -1022,30 +1022,6 @@ static void ccw_machine_7_2_class_options(MachineCla= ss *mc) } DEFINE_CCW_MACHINE(7, 2); =20 -static void ccw_machine_7_1_instance_options(MachineState *machine) -{ - static const S390FeatInit qemu_cpu_feat =3D { S390_FEAT_LIST_QEMU_V7_1= }; - - ccw_machine_7_2_instance_options(machine); - s390_cpudef_featoff_greater(16, 1, S390_FEAT_PAIE); - s390_set_qemu_cpu_model(0x8561, 15, 1, qemu_cpu_feat); -} - -static void ccw_machine_7_1_class_options(MachineClass *mc) -{ - S390CcwMachineClass *s390mc =3D S390_CCW_MACHINE_CLASS(mc); - static GlobalProperty compat[] =3D { - { TYPE_S390_PCI_DEVICE, "interpret", "off", }, - { TYPE_S390_PCI_DEVICE, "forwarding-assist", "off", }, - }; - - ccw_machine_7_2_class_options(mc); - compat_props_add(mc->compat_props, hw_compat_7_1, hw_compat_7_1_len); - compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat)); - s390mc->max_threads =3D S390_MAX_CPUS; -} -DEFINE_CCW_MACHINE(7, 1); - static void ccw_machine_register_types(void) { type_register_static(&ccw_machine_info); --=20 2.51.0 From nobody Fri Nov 14 16:39:02 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760707938; cv=none; d=zohomail.com; s=zohoarc; b=Y0xTFZ/p5/vxiiGn7zlunCo2qAGJFb14+P1NAND5j9JE+oH/txbWPjEqcCFer9c99L4bU06IEgiQEs+Qi/loz9O7pk4ewzf1VI/MPBhKqyaFlcXuso5JU0Ix7GdblvrP8J2LVJnBlr/Ft7G/ulGEAPoE+S3oO/HqKkTiRr/reI4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760707938; 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=bohEM9UlUebYg5TCW40RaN2S1kCYQfAGCU/82ulclMg=; b=FqUq96mZizVLNwc9SxGDHpmVLL+ojAnGYev+VhY/BUeQg8kznAN9p4aFTvKVERKP9vgvj4msslDHeVLre7hd8BXDJhGb5JxCWAbWQFrBKfYD0Vanbprl3Gub0lqtYNOATO5X5RlldO/Z4of5ZTrlNdpEONWBZdOdTrb1FUMI+X4= 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 1760707938447826.8427068014546; Fri, 17 Oct 2025 06:32:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v9kYF-0000BJ-Ep; Fri, 17 Oct 2025 09:31:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v9kYB-0000AV-QG for qemu-devel@nongnu.org; Fri, 17 Oct 2025 09:31:19 -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 1v9kXz-00081z-EF for qemu-devel@nongnu.org; Fri, 17 Oct 2025 09:31:19 -0400 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-3ee130237a8so1306146f8f.0 for ; Fri, 17 Oct 2025 06:31:04 -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-426feeb7441sm10192262f8f.43.2025.10.17.06.31.00 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 17 Oct 2025 06:31:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760707862; x=1761312662; 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=bohEM9UlUebYg5TCW40RaN2S1kCYQfAGCU/82ulclMg=; b=V1tsaBAvgZH2GkJeE068sq4NZzl1R2r24c5M0mlD66FABgbX8wSE1UFg6haM/mlcUC qNePtlIwKGB8NCLCA7/xiemB1sGgtfXFHU7zaXW5BnOW7hC0qgs4w4rt54aVqfYoYO9b PX7FJLD494U6itaVdg1syXHAcFJNPxahL/YhHc1/J5ECUaGiBZ9oj/hE8zzvsMDe+jPK F51OnK0ZiaDogwxBXAuREamWhBXTSRCWl95KnYIPvav7obJNcjFFxVKyuVQDKDyUStvM ZnV6o0RuoVtEaa4/2jjsU3H806VjQrVp+KdmcafelXF+0QCro5h8kanXH6uIHTdrMUBD A7Cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760707862; x=1761312662; 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=bohEM9UlUebYg5TCW40RaN2S1kCYQfAGCU/82ulclMg=; b=vjufJ0TDyJo1108ROeqpjgyk1s+3kwWhVA13A5vNQ63whMLTDEoT29nNhlDhIH6Yd6 PjgYzcbbV+VXMtB9sl8wC9lJAZUJthw2xV/XP/xIC3QlrWpIDuAMxbqN9TARA6Q4nSr/ +NC5FFj2DoO7CHtrDc25hAacfSRjkAyq61h9xZCQOaFfeVANcZ9ey6Ycvf6xeIh8gRVj gQA1iCXOWVSYEUlgEyT7AAuqadAYhaGAWgNsPtXwXKJq8u0PJ6eX1PBoRmbEYCc1d8x3 B2UbNlaXjnoAJx8VkRmwAgKGIEr9cMEbamOeL87yIqCWVbFTFyVjVYxSk2Y1lz4P7FcE cL/w== X-Gm-Message-State: AOJu0YyaTFmNI9/K0itk02qqOFly4Mfc9hwg+uqHPvjuZuYsBu6WcnJy A7uKhoCMZXr26SIhONHDOeGvHiJ4T2ZzKHXx487lixZULlsAatKsqezcBnl9ET5ONFxruABIba0 mFza4e9k= X-Gm-Gg: ASbGncud1+LrJg3ISGODG1J8TE0Sk13jfmoMI/ZNFwNuvGfTEaOWd3Ow1OKZM+qQsKU 0mktIfBYcyoAJs0d0UcTlXfPryQ/00v1ekGPYoNZLHEIHV/7DW6ON+e0ksEteFt0EX2lREqQnHR VLTi2tKWZQuBVrW1OMoas84bIP5nMn43jwIdPYNnqQ2R8vWb2ZveUYHTPQY0rKWLG9Vo+eau0H9 RM/yAlx0ls83k7xmvUMPZl3YBXVlc5jGzN5IQneEmWEWZn68iqyxEtB9Sjgz6twQXgbUn5hsslH wMqFN4WPFQZpl9uAaLU72LoPOsbRTcZ8plnSMU6Zhp4AiM4NEVGSA/VjG41yxY4sxvig+m8WwU6 fZ6MxV7Lv2x4qS2c3PCc/gk/wciSJJ2ZRLPB0olssQEF2tCqZgTXp8LhmPqJvkPpRwgFRQL1nAj kc24Hyt76bfdoTJBux/yUTpgu7wg9RuvkJS7Eh7t8NklxzF05bUA== X-Google-Smtp-Source: AGHT+IHqDWp1P+x3Ya1r/WBGm3tSkclNfCesfNtURh9TP9OjbvDwELKcx5DmmiaoMLNO5HdZV1dOUQ== X-Received: by 2002:a05:6000:2dc9:b0:3ec:e276:5f43 with SMTP id ffacd0b85a97d-42704da64e0mr2312332f8f.18.1760707861815; Fri, 17 Oct 2025 06:31:01 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Thomas Huth , Eric Farman , Jason Herne , Christian Borntraeger , Matthew Rosato , Halil Pasic , qemu-s390x@nongnu.org, Ilya Leoshkevich , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 11/12] hw/s390x/ccw: Remove S390CcwMachineClass::max_threads field Date: Fri, 17 Oct 2025 15:30:00 +0200 Message-ID: <20251017133002.61410-12-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251017133002.61410-1-philmd@linaro.org> References: <20251017133002.61410-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::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=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760707945567158500 The S390CcwMachineClass::max_threads field was only used by the s390-ccw-virtio-7.1 machine, which got removed. Remove it as now unused, simplifying the s390_init_cpus() method. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/s390x/s390-virtio-ccw.h | 3 --- hw/s390x/s390-virtio-ccw.c | 7 ++----- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/include/hw/s390x/s390-virtio-ccw.h b/include/hw/s390x/s390-vir= tio-ccw.h index 526078a4e2b..db804db33c3 100644 --- a/include/hw/s390x/s390-virtio-ccw.h +++ b/include/hw/s390x/s390-virtio-ccw.h @@ -49,11 +49,8 @@ static inline uint64_t s390_get_memory_limit(S390CcwMach= ineState *s390ms) void s390_handle_ptf(S390CPU *cpu, uint8_t r1, uintptr_t ra); =20 struct S390CcwMachineClass { - /*< private >*/ MachineClass parent_class; =20 - /*< public >*/ - int max_threads; bool use_cpi; }; =20 diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index cf09b5c46e6..390d427dc41 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -75,12 +75,10 @@ out: static void s390_init_cpus(MachineState *machine) { MachineClass *mc =3D MACHINE_GET_CLASS(machine); - S390CcwMachineClass *s390mc =3D S390_CCW_MACHINE_CLASS(mc); int i; =20 - if (machine->smp.threads > s390mc->max_threads) { - error_report("S390 does not support more than %d threads.", - s390mc->max_threads); + if (machine->smp.threads > 1) { + error_report("S390 does not support more than 1 thread."); exit(1); } =20 @@ -779,7 +777,6 @@ static void ccw_machine_class_init(ObjectClass *oc, con= st void *data) S390CcwMachineClass *s390mc =3D S390_CCW_MACHINE_CLASS(mc); DumpSKeysInterface *dsi =3D DUMP_SKEYS_INTERFACE_CLASS(oc); =20 - s390mc->max_threads =3D 1; s390mc->use_cpi =3D true; mc->reset =3D s390_machine_reset; mc->block_default_type =3D IF_VIRTIO; --=20 2.51.0 From nobody Fri Nov 14 16:39:02 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760708021; cv=none; d=zohomail.com; s=zohoarc; b=fQxgk7br46MXeRlBDCBvBgeAejgBU/3DslAYIcJKMgV6NeEy1Dim+FCTGfGERefh42lw5iSpp8OJ81UzLnoYeoiazSYavUUmGQi7daSGOgUkBmrEsNdRMHSXzViqP0TXviqFWpl7VgXHH6EaG3eKU1JBqujD4tKTJJ9HGXyktRc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760708021; 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=Lg9/iN3U42dGIjpzQABpfRLiLFnwtWVL68CvT+og75o=; b=Tj2T1+yKFJDkvgrQtKWE/EzXP3oOU8S+XAmBRFreZC+4757v5Lj0/gvQL1BGhOolOEngiHFvK6ttm/+XYgj01W9XEFjSu4JY11ZuNm/dv/stKTfS3lJAHx/pABYraTUYIM6OK84VsznGldhh3JBn8Juom59bYglaIYoirvuEoEI= 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 1760708021782194.2172291206016; Fri, 17 Oct 2025 06:33:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v9kYD-0000Aq-1X; Fri, 17 Oct 2025 09:31:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v9kYB-0000AB-05 for qemu-devel@nongnu.org; Fri, 17 Oct 2025 09:31:19 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v9kY7-00082b-2e for qemu-devel@nongnu.org; Fri, 17 Oct 2025 09:31:18 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-421851bca51so1520220f8f.1 for ; Fri, 17 Oct 2025 06:31:12 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4270665ef67sm4475230f8f.28.2025.10.17.06.31.05 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 17 Oct 2025 06:31:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760707867; x=1761312667; 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=Lg9/iN3U42dGIjpzQABpfRLiLFnwtWVL68CvT+og75o=; b=NYs/QSZiU/ZnU08xphuxVpBzsXWR9yESVxGSXkEoQLy8oGdZ60fyiM+b3fUhDNJPiY j/AE8LKXXqfAQjWTFyG09TDBb/9MUfue8EO2Kxl7cWG8nCAAMUY088XNkVkXE0Tlsae/ KRl3Uil1gBTaQu+CfpJsiZReskDwJpPR3D4EUFLgWsLJOpSxZGnMCiQX1qY2WBW/NWS4 zqSYUaYczYHwRmh3zYQ5EQ3erLpH2dBjcgBi6Mc+uqSYjFkx5Qr8HCq2BWyxLk2FW1uB u2ZnizAoTqIkXno74TobAIa+PpJopuHHw0VZIXgLwVtdeBoLFUO6rozle1p6oP4Aava7 tIZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760707867; x=1761312667; 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=Lg9/iN3U42dGIjpzQABpfRLiLFnwtWVL68CvT+og75o=; b=YB2vEz3Lbfgeh14utuU1tBW98UW3oqimRh0jlsv3ItfTEjGXrOd9nP4IqyUFkUYuoq srOzennULyhzEFcG4PdHNzgp5qAJmHXYPVQCyjv85S3xAulowQWCQCwquUz7+6vEQhIV rudlaZZkY6Dp5v/N2dGmB+i8EALALSRDJF6A1V9hElWjP4n2C1TmHIDbIXrqmTCGhXqj zD9S+Jhn/0dKW4uHxcETuxxWRphx4d/Jx67yMoxBWYFOmAIkfaJz1NHFTzYbJ+FCnJcF HSrenmay/bXV4arQsBlA2XiXQV/9tWTTIXeUIfO8eG+OIPd9fNauy5S1nNkwqKgwByl4 VTdA== X-Gm-Message-State: AOJu0YxgPJNSvid3oLQMP7IIjqfjyoXrWI+G7xjxNT9H6DZgq04qF4ve WhJBBL2A8L9r15UN5v5zSdDpeWilp/9nB/lC6TDyFR+4QjGzm3qN6LJUmEahoyYsd3G0vBo7D4q jOIx1ihI= X-Gm-Gg: ASbGncvyXCr8oen6oS2YNvt2B+10kYhvbY41oTsBi3EEY6ARyhYhqylTRPCZtGeEDd6 /dkhHS/9VFAlKeq41ykgBMAdhboqFk/b1FzvXArrJLXCh68nr7W8vIaSyEh5FtGwkzdPW9V8sUm Lfdh/37JHwXLVksBI2OVnFVv6L3UWmV+Eo5kmtSuea9GoyPpZU+4bikdTxbwcMCk145mD/7QqKA UM0Vyc2kUPB04KQUZZcqdi6cuDPNLSxSsJ9itWRHlrSe0hfb2ZtiLsZnajyxlyvgY0cPWoFP9d7 2PFUuaaXQTHN9DhJ/9raPi2/TVVofswdWIEQ43v9pDa5HqH0iXDMJDuocptW1pHobAem3LsNq8Q vW38Xxmetg1fYejz2m8MTz888L2W9AMJvMrfbiYnQDJ40KceiTViiHxRNWT2AAl9P4SogILHY3C nsSWrwT7huquu925TprmrFSQ4vIxukFcffThw3Gu0CJSZ5ww2PTuToEUbQS32K X-Google-Smtp-Source: AGHT+IFCK5e7LgLE0Mer+Jb7OyyOIFesW2b3vQifBr9tzBgz+s7LB2CWu/D4myxXrMDcDrX2fouseQ== X-Received: by 2002:a5d:64e4:0:b0:427:45f:ee21 with SMTP id ffacd0b85a97d-42704d90029mr2823118f8f.27.1760707866829; Fri, 17 Oct 2025 06:31:06 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Thomas Huth , Eric Farman , Jason Herne , Christian Borntraeger , Matthew Rosato , Halil Pasic , qemu-s390x@nongnu.org, Ilya Leoshkevich , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 12/12] hw/s390x/ccw: Remove deprecated s390-ccw-virtio-7.2 machine Date: Fri, 17 Oct 2025 15:30:01 +0200 Message-ID: <20251017133002.61410-13-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251017133002.61410-1-philmd@linaro.org> References: <20251017133002.61410-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::42f; envelope-from=philmd@linaro.org; helo=mail-wr1-x42f.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760708024425158500 This machine 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") it can now be removed. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/s390x/s390-virtio-ccw.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 390d427dc41..bc8e9f4c34b 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -1007,18 +1007,6 @@ static void ccw_machine_8_0_class_options(MachineCla= ss *mc) } DEFINE_CCW_MACHINE(8, 0); =20 -static void ccw_machine_7_2_instance_options(MachineState *machine) -{ - ccw_machine_8_0_instance_options(machine); -} - -static void ccw_machine_7_2_class_options(MachineClass *mc) -{ - ccw_machine_8_0_class_options(mc); - compat_props_add(mc->compat_props, hw_compat_7_2, hw_compat_7_2_len); -} -DEFINE_CCW_MACHINE(7, 2); - static void ccw_machine_register_types(void) { type_register_static(&ccw_machine_info); --=20 2.51.0