From patchwork Thu May 1 23:01:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 886457 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp548149wrq; Thu, 1 May 2025 16:02:56 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXwVWwY7lEp+LlCamNS0T9swbdsIBBEvUayGH2X967cwfjuv943P6XmAy4TMF0K7GuS9UZI8A==@linaro.org X-Google-Smtp-Source: AGHT+IHxGwOoq96U0HUceyKex7lqdmbVKZQUty1ASaQhlnuvCOGktR7MHBhycfQ4gO3Zh6C7Ob12 X-Received: by 2002:a05:620a:1725:b0:7c5:5296:55be with SMTP id af79cd13be357-7cad5b4e109mr161608085a.27.1746140576273; Thu, 01 May 2025 16:02:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746140576; cv=none; d=google.com; s=arc-20240605; b=IS5o92sl61oihWBbjHzEZ5EtAbtzsA0ejilGTgR1tNxQcWwT/Z1BFoGcBc4+VKDX7K rYv3mAaMIms7jOy8RNTF5kj/NjFi3PamvBqy9S1mB8AF3KEQjAvDQYpTHOQ9qrYm8QC2 76/D0zjrKCgbR/dfgVKAwN/s3b7of29c/cF/osYDKXRX+2nqlDsS+vi6nT5m099ea/rH QYccq1XUOu/J+5mojHBt2U8j4RodxGbtFINAyeD6ERo2jgjwlOXPQR+S7mpacUUNctP6 qE5jZA3Jb4TFnFJyl5CZVj4y4bouzu64rlnCEZs5wgEZC2t7xYgrA76LbPYV25BTLUR9 toiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=UogoyiXW138ZEeb+2tt0PHdIw32Ugidt6sz27K9+AA8=; fh=Je0Fu6WOva9CO7x05EmtzN8739OQv5Rr57VCUmCpFeg=; b=ISpuMx+DTWJmNxm5kRmTY0d/oTBmJePA2ul7nrZz8ELHyD+I0Ox/od3cDphIAKSqGk O0dOtb4usIWH/02THRbhLrqyz/fcvnx7Eu2TB/zM7XwU8EU8eMsY7EjtfuIu6FXxH6hb viPGtqt42OYqW8GqS4OUpMS55EJ/mzjffm0o+fEi5cILjhSf9666PWLJ5VD3ua6oFg4g QKiD+0iNcaacqvkaun1yCnRwFtX8//aFj17fJpMCCjXgWcPlht1JAkgFM+Olp7sWKv7o NLLzWfqmEcGsYtcRJKL3wlQg/yf57XgvPD/5kFLIIVx08IaUofeTVnXcF2OdYF3zQkRR 715g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Lf09V9GT; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7cad23b9e49si165384385a.44.2025.05.01.16.02.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 16:02:56 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Lf09V9GT; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uAcue-0008NT-KH; Thu, 01 May 2025 19:01:52 -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 1uAcua-0008MG-4X for qemu-devel@nongnu.org; Thu, 01 May 2025 19:01:48 -0400 Received: from mail-il1-x12b.google.com ([2607:f8b0:4864:20::12b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAcuX-0002B6-6t for qemu-devel@nongnu.org; Thu, 01 May 2025 19:01:47 -0400 Received: by mail-il1-x12b.google.com with SMTP id e9e14a558f8ab-3d9189e9a06so5436685ab.2 for ; Thu, 01 May 2025 16:01:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746140503; x=1746745303; 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=UogoyiXW138ZEeb+2tt0PHdIw32Ugidt6sz27K9+AA8=; b=Lf09V9GTaMp9gDdB7CZonsOL/2HQ1O3tQk4uzf9vnau/9Af3UWL4nxXd657KjYqmIk UpKXam7XmY4YJkwq2cGFOaOOeg75ShWgfS6iX1uYPUp50ajQcfk8lnsWD0w2waXDz/WO 9p0dpZ2dbnD2vo0lQ6rIJpe5lMHhWFeLJl+GY8sIjkDYWYGDY0gJi5fYIstGx//gqksP 0m7G8A0mPga2U6+uA5tinZk33PBr5lo8PxYNQR78U6LpiDHAjZfZic3P2t2OkzV5F/QW KriToO6YYIyoIEb3DPQUSjRHq8qux3K75pLp6eGZOReEcc2ShOg5MapNDwij0mXuw8sd W6vA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746140503; x=1746745303; 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=UogoyiXW138ZEeb+2tt0PHdIw32Ugidt6sz27K9+AA8=; b=AxTXmQOZO7CH3k7vzPTz56mpHhGqGx+8PLJ1JPYVDS/7hg2aP5gXtYlkB6V3G1kO9A fWdXfxsrIwwmh5xlT7ByZLpnzuilvmAC7Iul1iNBxYNZXm2onw55oto+G18YXFyAWrMf +NAV55E+d43WPaYiTy8x15aKJTLOM341oY6uP6jSWEqYsvEW7R3xXkr4dAjbTS/rwF7P amED4FAu7XwCj2WAQCL6ppuANAhqFgpthrH2UHMta+NgxMti3dr12zHwuGdLQztRo5sF FDF2WcTMjLgUUGcHAfWOv7lM9y9Q/rhhoILtUJgrs1V0BgD2hGqa7HxE97tbDQbGtopf s45A== X-Gm-Message-State: AOJu0YxaNa2ezzFeorAPgb7ZTDslE+JA3xm+DQoJ/ijuO45l8bCsJwN3 4wd+zVU+7+yBN1U2hAhybgQSmbKRJ2SmcC/+XJzfGO+c6HesI4WteEarvVjlnZCm4RiKTPoMMrq v X-Gm-Gg: ASbGncvlkWPELpTGJbV6ym9Q/DbLwitW9MB7KYkv85OH2NAEKPesUCFFm5f8LFLs7gq NVzn2P75XSoml+wx1fvY2AhbLXipYG25/i1SDHVegy/0FW3InVtm0fdcJSgJJ/RMLhsdT4vY7cs g8kOVmM1odCD2aUNNRHh6GNXpWW9VgML1JAH5XP6NSzi6OZna2CPSJ2gFEFctx0GqUz1HITS3j5 pwYYCCYKqF8hq6Iz6X10i+0sWtXTMmyoyZrrSwiawEEm1/MeaMWRxyVvhDtT4yQQXTnJmIicqk7 L4fv8Jw/ap2eBMpbdqsDcQVeRSo+NrocHQ/YPgC4uEVadILyoepGBF+A7S3k1JK7io3WFoPhb5g nw1SZv02alpK0EDm/IiE1 X-Received: by 2002:a05:6e02:18c8:b0:3d6:cd54:ba53 with SMTP id e9e14a558f8ab-3d97c26091bmr10181675ab.22.1746140503334; Thu, 01 May 2025 16:01:43 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4f88aac7e1asm86910173.135.2025.05.01.16.01.39 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 16:01:42 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Yanan Wang , Paolo Bonzini , Gerd Hoffmann , Thomas Huth , Halil Pasic , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Marcel Apfelbaum , qemu-rust@nongnu.org, Zhao Liu , Eric Farman , Ilya Leoshkevich , Eduardo Habkost , Jason Wang , David Hildenbrand , Dmitry Fleytman , Richard Henderson , "Michael S. Tsirkin" , qemu-s390x@nongnu.org, Christian Borntraeger Subject: [PATCH 01/10] hw/s390x/s390-virtio-ccw: Remove the deprecated 2.10 and 2.11 machine types Date: Fri, 2 May 2025 01:01:19 +0200 Message-ID: <20250501230129.2596-2-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250501230129.2596-1-philmd@linaro.org> References: <20250501230129.2596-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::12b; envelope-from=philmd@linaro.org; helo=mail-il1-x12b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Thomas Huth They are older than 6 years, so according to our machine support policy, they can be removed now. There was not anything special in the 2.10 machine type, so just remove it together with the 2.11 machine type. The 2.11 machine type switched some configuration that needs additional cleanups in the following patches. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Message-ID: <20250115073819.15452-6-thuth@redhat.com> Signed-off-by: Philippe Mathieu-Daudé --- hw/s390x/s390-virtio-ccw.c | 37 ------------------------------------- 1 file changed, 37 deletions(-) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 94edd42dd25..2c90702d834 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -1250,43 +1250,6 @@ static void ccw_machine_2_12_class_options(MachineClass *mc) } DEFINE_CCW_MACHINE(2, 12); -#ifdef CONFIG_S390X_LEGACY_CPUS - -static void ccw_machine_2_11_instance_options(MachineState *machine) -{ - static const S390FeatInit qemu_cpu_feat = { S390_FEAT_LIST_QEMU_V2_11 }; - ccw_machine_2_12_instance_options(machine); - - /* before 2.12 we emulated the very first z900 */ - s390_set_qemu_cpu_model(0x2064, 7, 1, qemu_cpu_feat); -} - -static void ccw_machine_2_11_class_options(MachineClass *mc) -{ - static GlobalProperty compat[] = { - { TYPE_SCLP_EVENT_FACILITY, "allow_all_mask_sizes", "off", }, - }; - - ccw_machine_2_12_class_options(mc); - compat_props_add(mc->compat_props, hw_compat_2_11, hw_compat_2_11_len); - compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat)); -} -DEFINE_CCW_MACHINE(2, 11); - -static void ccw_machine_2_10_instance_options(MachineState *machine) -{ - ccw_machine_2_11_instance_options(machine); -} - -static void ccw_machine_2_10_class_options(MachineClass *mc) -{ - ccw_machine_2_11_class_options(mc); - compat_props_add(mc->compat_props, hw_compat_2_10, hw_compat_2_10_len); -} -DEFINE_CCW_MACHINE(2, 10); - -#endif - static void ccw_machine_register_types(void) { type_register_static(&ccw_machine_info);