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); From patchwork Thu May 1 23:01:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 886464 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp548736wrq; Thu, 1 May 2025 16:04:22 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVRVni9gvWlT8mto9RCUetG/xTdvomM2cC7XImshLg0+NkIEdxNSdRw2+iNujEPdqLPTrug6Q==@linaro.org X-Google-Smtp-Source: AGHT+IHJsWJ9FkmjEyxx89atw7dUMhnTyRnxREg9WwA+Xm9pBWPeqE+kZRnKoARTygqZh8ETGupW X-Received: by 2002:ad4:4ea5:0:b0:6d8:a8e1:b57b with SMTP id 6a1803df08f44-6f5155f737dmr19100726d6.36.1746140661944; Thu, 01 May 2025 16:04:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746140661; cv=none; d=google.com; s=arc-20240605; b=SX3QiGqEqO0i7qfR5KsgLs6dLEy5C8ns8MKGRaKVm4udTfksSmCjE70rVlmnt2m6sz kSrp9siwyBk08o/a0Da+zOtf7Virr8E79QCzimuaZn40bfJPtKF15TRrYymt1zKlYs+D pk40oZhOGfx3vPURjGd4Fi1J9F1zqowwTIMgU9MS5FCGZbwpI3w1ognu+U7n+ubfK8Fr tQbD543ZgubKq/vKOWESYfT5OFw9uiBFZIjiH/WeuxKiDl0w9lcOb0RNiwbA0cXLNHkL kYIK4/gBA39MKnKAM+KSzyeHvymtKgpgBSrhm6oGMK21YVzkmmLHfY1rdLSzjp9jw5YF bIFg== 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=HR3XLRk6SAEmUPB+v+pYNKb/eOwBOPxJBouKIIv+88o=; fh=Je0Fu6WOva9CO7x05EmtzN8739OQv5Rr57VCUmCpFeg=; b=KXZ7/HdcgF0UsmPxkoAsnn3Id5xeRjW86+GyTKLnJEhPiiPH1IeP6/4MN+WJT46del iQ/2QgSw8aVs7tudDkWb4KPcVsg6DgGM7VT52fiKe32Ep8o4/dFCOSvne/UwmpUMKSCY XIckOT0GKwiVeuHNSSIu5j+mTIh/rulIe0F49muPX81TjY5LwyUVDMs5hX25a4Fag0jr eWJJI0OcZ32v5G1zj7OTerqrRrF7Rk0Ic5AQ2TkOgJsglCSvGUorM3oo2zYW1LJM2QTL vDtkod+S+XN/EuVtwLZxmVxNHkGfVo6dIUuxmjMKxg4u+wW852wl1CiDGj2pDEECt36i symg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dKFHl5fZ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6f50f3c1c57si17052716d6.138.2025.05.01.16.04.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 16:04:21 -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=dKFHl5fZ; 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 1uAcum-0008Rv-CQ; Thu, 01 May 2025 19:02:00 -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 1uAcuh-0008OV-4d for qemu-devel@nongnu.org; Thu, 01 May 2025 19:01:56 -0400 Received: from mail-il1-x135.google.com ([2607:f8b0:4864:20::135]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAcuf-0002Cy-Hl for qemu-devel@nongnu.org; Thu, 01 May 2025 19:01:54 -0400 Received: by mail-il1-x135.google.com with SMTP id e9e14a558f8ab-3d589ed2b47so4894795ab.2 for ; Thu, 01 May 2025 16:01:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746140512; x=1746745312; 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=HR3XLRk6SAEmUPB+v+pYNKb/eOwBOPxJBouKIIv+88o=; b=dKFHl5fZVh8PUkVmGSU7gsYPDFVRAe3s+UqUmQUwjIUTrQkG3c49nqWYpBlVFNzUIZ wg+Yx8ro2r7pBnTsosmN5gbjlJFAozabZWKvrDU0zhZW1CcYERyLwwAZwMOvt4mCXP3d aVzOijbbPpuKNa1jET+2/Cu9FHTGVSrrKhknQbeofdaK0vdCfZ+afFRNKfJPKoCC6ekA ratST2HusuqE2ihfVFnx950oAbjwiJIXcobpZOV1IppTXZdwYf+u1n+p6BKzoTVT9baN vYrUx0MmnjhnJM8W7UJSJePd6PxQ74Bxi+h+W26QXRQpi8ehM61DMPDe+ZOYzPs50qiJ FP+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746140512; x=1746745312; 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=HR3XLRk6SAEmUPB+v+pYNKb/eOwBOPxJBouKIIv+88o=; b=q+O8uxbUhJepZ5y9aCFnpOa1D13R4eINFFa4ska++sznf8G1eyYQ4HFfafOh9lt+zZ KPbriArja8tddbYiarUD+waOpV65FWrPCFfxvHBLtMQP77/q2LY+R6RRPSSP33HIsf67 rvdquggqkRQubUaK/z9ynUYoCqSHCSLdRZvDSwJ8SPJwnDStMhtg9hWKqd66xEubbLFR KkVh94m/AAstJK/760qMyKnqvERTTjl+UsqZJwpJ4UuxtcQ84ckIjFS2M9a0o7elF+w9 YsmrCA6Q2FNn8s3JsA93IgetdR83jnd3AuFMwkc2z4X+SVVefGPfso8175+vU8nJOeKt Hfyg== X-Gm-Message-State: AOJu0YwQtZwOE8AlzH++3hITgsCAOP7RWE/mNY7orMs8VnbdXeSrSQtL yOz7lG6UUVmAzc0GJyQeQk2/zy2WspYhmuEL2afA/gr7gmiTlrAYrvsaJcpqz4tDSJCvqxtw9+V c X-Gm-Gg: ASbGnctich/pRHmTpcv4ZpKp3V9PtFZl4L8ULH0r/Ziy0H9hlwxezM4eTNALDPV/lnS VVcyPIeWs9LGznFpIRlCQWUCr/fyYI58fNoVBKv0IO4cDcm4sFhtfMkw7z/Sj9UdaPbev2Bq1Ib MwMrsk5doxzPdWrgMNmQ9UL8xmLWWyKE5CusZvHhQ+QdkjIqxVvnF5b4/lBZqYDypesrDhCPji7 UOCQL7EesoUH1KMZVjBIMU3+/9hqwzeYgr+jhIkAS8LcxZ/Mi+HGGc533pOmKl7Q5nM35r0g6DJ v390ufEHrK4w78pyr4VOnTD6IWpmtOG0Phee8BWB6sF3y4Tp61T0Cirg1FVQWUOMdBZn/vLEA1X RDsPjZUjuBP0AdN4WVphy X-Received: by 2002:a05:6e02:2167:b0:3d3:db70:b585 with SMTP id e9e14a558f8ab-3d97c2d3097mr10148415ab.21.1746140512111; Thu, 01 May 2025 16:01:52 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id e9e14a558f8ab-3d975f5885bsm3404135ab.56.2025.05.01.16.01.48 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 16:01:51 -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 02/10] hw/core/machine: Remove hw_compat_2_10[] array Date: Fri, 2 May 2025 01:01:20 +0200 Message-ID: <20250501230129.2596-3-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::135; envelope-from=philmd@linaro.org; helo=mail-il1-x135.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The hw_compat_2_10[] array was only used by the pc-q35-2.10, pc-i440fx-2.10 and s390-ccw-virtio-2.10 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daudé --- include/hw/boards.h | 3 --- hw/core/machine.c | 6 ------ 2 files changed, 9 deletions(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index 513eb2a54fd..f2f58ec4ed8 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -829,7 +829,4 @@ extern const size_t hw_compat_2_12_len; extern GlobalProperty hw_compat_2_11[]; extern const size_t hw_compat_2_11_len; -extern GlobalProperty hw_compat_2_10[]; -extern const size_t hw_compat_2_10_len; - #endif diff --git a/hw/core/machine.c b/hw/core/machine.c index 486d1adb4b9..816d503b2a1 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -238,12 +238,6 @@ GlobalProperty hw_compat_2_11[] = { }; const size_t hw_compat_2_11_len = G_N_ELEMENTS(hw_compat_2_11); -GlobalProperty hw_compat_2_10[] = { - { "virtio-mouse-device", "wheel-axis", "false" }, - { "virtio-tablet-device", "wheel-axis", "false" }, -}; -const size_t hw_compat_2_10_len = G_N_ELEMENTS(hw_compat_2_10); - MachineState *current_machine; static char *machine_get_kernel(Object *obj, Error **errp) From patchwork Thu May 1 23:01:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 886455 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp547903wrq; Thu, 1 May 2025 16:02:22 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW6ScdarYPk1W3kCQhs36Q1K7Lt819zQNLfQmlDBBpL6Zu0Rv2KwNjFGLpzej5vJrgpltWE2w==@linaro.org X-Google-Smtp-Source: AGHT+IGg6LiRcWhhABNA7lF/LZZgUIHudOU2E1Y8o98+0dcJvXJf8PfydzFd51IaRautzr/155WW X-Received: by 2002:a05:620a:410c:b0:7c5:467f:d131 with SMTP id af79cd13be357-7cad5b8ce80mr145809385a.36.1746140542126; Thu, 01 May 2025 16:02:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746140542; cv=none; d=google.com; s=arc-20240605; b=I2mPPlWDgih6I2s559zHOmOHsNRDQF+r8k3DrW5RRyLC75ZbtGfklFdoU3EQ09ioA4 EC9Vgl+J8FY5Y7y46fYHJLufG8dZe1tu8VM4zCU6LzK6mZy9PYQ2ddFQBdojbiAWdmwV PiSgdV6B3maLQ03HGLJ5GGQicKXPeC5FYdbhiNC1GnkWmbj0xY/n5zWC8FYip6nv9aSY 30KISldYtMPLH212LRIbQY2QLyTFkp1ANRpdfxmDJoBFZe7oQqpoPkI87Yv7bbLUXf17 IhSbfZR/YUWywCP4gwq1AnhzdildRW1khzxRTOcD6PawkLjzf0Mk2T6pzRPj87yWMOtl t9wQ== 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=F6iyIP6KaylLefLyBXHs1NcGKwBb7ZXW8SZqY1Ujxgs=; fh=Je0Fu6WOva9CO7x05EmtzN8739OQv5Rr57VCUmCpFeg=; b=GcNvWQNFoB5TAb3UfB093K506Fp83Ad0bz7JDk/8GXp+vg7HVKji5nNaJCMWAZu/8j PQ+XcZEHmkiiPL/aSTAQ2xei6t6qAtIsPlmO7/jrdL9hSp4qVpWImeNmRePG9t1TScDI ZgZjlRnfGQd5GPKpz/2ZmWJiEyyB73zWkymqjQZSCE/KBuO9RFi7gmG/suJ9ia0JlWtd twntz8JEDUOByZTUglpQ0sYrKbMSngSpyNxzr5t6ebEcPkN3f9+iiv+tvdFqNTv/uYH5 JZcWP/Xt4wGIBkgYtXcom3y36DmRJzYulCmbKZBmSMXlUXEK9JX0BLlNSbYTQwWlaSrw TWsQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=NqJtI6WP; 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-7cad241bd3dsi171833485a.244.2025.05.01.16.02.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 16:02:22 -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=NqJtI6WP; 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 1uAcut-0008UQ-UY; Thu, 01 May 2025 19:02:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uAcuq-0008TI-J8 for qemu-devel@nongnu.org; Thu, 01 May 2025 19:02:04 -0400 Received: from mail-il1-x131.google.com ([2607:f8b0:4864:20::131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAcuo-0002En-Du for qemu-devel@nongnu.org; Thu, 01 May 2025 19:02:04 -0400 Received: by mail-il1-x131.google.com with SMTP id e9e14a558f8ab-3d8020ba858so16405765ab.0 for ; Thu, 01 May 2025 16:02:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746140521; x=1746745321; 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=F6iyIP6KaylLefLyBXHs1NcGKwBb7ZXW8SZqY1Ujxgs=; b=NqJtI6WPG61O0gHWSJlB+iHHyqUvyVR1ZkW25/cY/hnNLjfXnHD7N/6j8anyiSuaFU YuZZ8n0SewUFinmyUu2MZIny4hcJoy0YeKiUBeRMLv1f1JZOjhfED1l9GC+qzP1mY0Jn IlYvoqtsCI4u6akvV1jgyqXxKZUOZ7Xn2jjxqkuVilfMZu693BPsai1G3BgMNhS7iT+q KUqQ+sXvqGtwo7/IS4cQP4LtPQ+3zLGAS+WzziMFjSC3RIRubiYA1PEm++fyp7pH3DXf O48JkvK9N26G73d1ngQQsNXNGeyN588B7ne0MD6eGHpGHPi8vzUt0+o+7Bn9c2cK9fKO Ef9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746140521; x=1746745321; 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=F6iyIP6KaylLefLyBXHs1NcGKwBb7ZXW8SZqY1Ujxgs=; b=AXVvJws6G/jrNXwq/pOkKPG9PrDThN/ckG8Ega85Rc5SOBUwpg55TE2XXglaZ75wKd Qw83O7ZMu3xLC5tGBt//lTZbxn0ywoiQi3rb0jfR0NCR3wh76iGXjPrbHXitozKJpypk TG7mVEGB8EsLrGaALb6jTM4YaGp+Uxm18U9fEMNADzz0s4cOBif5aplHYqfzSz/76zMZ LjH4g4nbWpQ46oucjtLMuyDkNqn8k555BTjkQg4pR2dV5HlEszG4+4xwHgQFojromzyl zNaVnZ3nkgTGxNDSN0dT+9+3OczQZQU2HUVJPfU0ZkCmPpaI4Pg4xhrkFY126J7I42f5 f3Lg== X-Gm-Message-State: AOJu0Yym4kcqd3pUzA01dj035KOd4TkxhY8N1eBvTf8CxBJvxywnzpQX 35In0Wuthe+9n3liUrFs/hLkWuSGClmc2uW+RG8//kHyWIIWOfgQ2u6pngbIv/QuzE/cJkjrYOt P X-Gm-Gg: ASbGncvMRM+B5J8VtTPlshn6gyQrxxal16PkbKG612m0/N12lEW84Aa8gxhpbkqm8VB 3yBbcFavKWgGiG1HzdUS2WiLkKWAi3kjHD/0ywwxg+qVM/WXMczJ9mhDmUsFeWnhzpm6glbK/H+ NHzu88Adf7L0uvvkbbK7a+D0L73LwvHk4AdZN7sprCk4TiFnHdLnDfhRX8hDH7we0CESDnj28p+ /Yxh6b992Cw+SOWx3T9NL9BIpTvyIbsijLhxdRGmcWAenyYNng2fclv9djrf+0qCJdfhNAkB0W8 J4QV/hxAYcYVUxmbo7HJeNDbT6JphVBF44E8wMn6OpmUhlCmCNFir++2uKcbyuVzoeywfc+b2uC onidy8BAqwzfYcV38/Wqo X-Received: by 2002:a05:6e02:1a8f:b0:3d8:1d7c:e192 with SMTP id e9e14a558f8ab-3d97c196082mr10106525ab.7.1746140520957; Thu, 01 May 2025 16:02:00 -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-4f88aac7e1asm87042173.135.2025.05.01.16.01.57 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 16:02:00 -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 03/10] hw/input/virtio-input: Remove VirtIOInputHID::wheel_axis field Date: Fri, 2 May 2025 01:01:21 +0200 Message-ID: <20250501230129.2596-4-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::131; envelope-from=philmd@linaro.org; helo=mail-il1-x131.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The VirtIOInputHID::wheel_axis boolean was only set in the hw_compat_2_10[] array, via the 'wheel-axis=false' property. We removed all machines using that array, lets remove that property and all the code around it. There is only one virtio_input_config[] version for each device, rename it removing the '_v2' suffix. Signed-off-by: Philippe Mathieu-Daudé --- include/hw/virtio/virtio-input.h | 1 - hw/input/virtio-input-hid.c | 102 ++----------------------------- 2 files changed, 5 insertions(+), 98 deletions(-) diff --git a/include/hw/virtio/virtio-input.h b/include/hw/virtio/virtio-input.h index e097b0b5217..1e94f8a03db 100644 --- a/include/hw/virtio/virtio-input.h +++ b/include/hw/virtio/virtio-input.h @@ -89,7 +89,6 @@ struct VirtIOInputHID { const QemuInputHandler *handler; QemuInputHandlerState *hs; int ledstate; - bool wheel_axis; }; struct VirtIOInputHost { diff --git a/hw/input/virtio-input-hid.c b/hw/input/virtio-input-hid.c index d986c3c16e3..a89a5b10c63 100644 --- a/hw/input/virtio-input-hid.c +++ b/hw/input/virtio-input-hid.c @@ -81,7 +81,6 @@ static void virtio_input_extend_config(VirtIOInput *vinput, static void virtio_input_handle_event(DeviceState *dev, QemuConsole *src, InputEvent *evt) { - VirtIOInputHID *vhid = VIRTIO_INPUT_HID(dev); VirtIOInput *vinput = VIRTIO_INPUT(dev); virtio_input_event event; int qcode; @@ -109,8 +108,7 @@ static void virtio_input_handle_event(DeviceState *dev, QemuConsole *src, break; case INPUT_EVENT_KIND_BTN: btn = evt->u.btn.data; - if (vhid->wheel_axis && - (btn->button == INPUT_BUTTON_WHEEL_UP || + if ((btn->button == INPUT_BUTTON_WHEEL_UP || btn->button == INPUT_BUTTON_WHEEL_DOWN) && btn->down) { event.type = cpu_to_le16(EV_REL); @@ -328,32 +326,7 @@ static const QemuInputHandler virtio_mouse_handler = { .sync = virtio_input_handle_sync, }; -static struct virtio_input_config virtio_mouse_config_v1[] = { - { - .select = VIRTIO_INPUT_CFG_ID_NAME, - .size = sizeof(VIRTIO_ID_NAME_MOUSE), - .u.string = VIRTIO_ID_NAME_MOUSE, - },{ - .select = VIRTIO_INPUT_CFG_ID_DEVIDS, - .size = sizeof(struct virtio_input_devids), - .u.ids = { - .bustype = const_le16(BUS_VIRTUAL), - .vendor = const_le16(0x0627), /* same we use for usb hid devices */ - .product = const_le16(0x0002), - .version = const_le16(0x0001), - }, - },{ - .select = VIRTIO_INPUT_CFG_EV_BITS, - .subsel = EV_REL, - .size = 1, - .u.bitmap = { - (1 << REL_X) | (1 << REL_Y), - }, - }, - { /* end of list */ }, -}; - -static struct virtio_input_config virtio_mouse_config_v2[] = { +static struct virtio_input_config virtio_mouse_config[] = { { .select = VIRTIO_INPUT_CFG_ID_NAME, .size = sizeof(VIRTIO_ID_NAME_MOUSE), @@ -379,26 +352,13 @@ static struct virtio_input_config virtio_mouse_config_v2[] = { { /* end of list */ }, }; -static const Property virtio_mouse_properties[] = { - DEFINE_PROP_BOOL("wheel-axis", VirtIOInputHID, wheel_axis, true), -}; - -static void virtio_mouse_class_init(ObjectClass *klass, const void *data) -{ - DeviceClass *dc = DEVICE_CLASS(klass); - - device_class_set_props(dc, virtio_mouse_properties); -} - static void virtio_mouse_init(Object *obj) { VirtIOInputHID *vhid = VIRTIO_INPUT_HID(obj); VirtIOInput *vinput = VIRTIO_INPUT(obj); vhid->handler = &virtio_mouse_handler; - virtio_input_init_config(vinput, vhid->wheel_axis - ? virtio_mouse_config_v2 - : virtio_mouse_config_v1); + virtio_input_init_config(vinput, virtio_mouse_config); virtio_input_extend_config(vinput, keymap_button, ARRAY_SIZE(keymap_button), VIRTIO_INPUT_CFG_EV_BITS, EV_KEY); @@ -409,7 +369,6 @@ static const TypeInfo virtio_mouse_info = { .parent = TYPE_VIRTIO_INPUT_HID, .instance_size = sizeof(VirtIOInputHID), .instance_init = virtio_mouse_init, - .class_init = virtio_mouse_class_init, }; /* ----------------------------------------------------------------- */ @@ -421,44 +380,7 @@ static const QemuInputHandler virtio_tablet_handler = { .sync = virtio_input_handle_sync, }; -static struct virtio_input_config virtio_tablet_config_v1[] = { - { - .select = VIRTIO_INPUT_CFG_ID_NAME, - .size = sizeof(VIRTIO_ID_NAME_TABLET), - .u.string = VIRTIO_ID_NAME_TABLET, - },{ - .select = VIRTIO_INPUT_CFG_ID_DEVIDS, - .size = sizeof(struct virtio_input_devids), - .u.ids = { - .bustype = const_le16(BUS_VIRTUAL), - .vendor = const_le16(0x0627), /* same we use for usb hid devices */ - .product = const_le16(0x0003), - .version = const_le16(0x0001), - }, - },{ - .select = VIRTIO_INPUT_CFG_EV_BITS, - .subsel = EV_ABS, - .size = 1, - .u.bitmap = { - (1 << ABS_X) | (1 << ABS_Y), - }, - },{ - .select = VIRTIO_INPUT_CFG_ABS_INFO, - .subsel = ABS_X, - .size = sizeof(virtio_input_absinfo), - .u.abs.min = const_le32(INPUT_EVENT_ABS_MIN), - .u.abs.max = const_le32(INPUT_EVENT_ABS_MAX), - },{ - .select = VIRTIO_INPUT_CFG_ABS_INFO, - .subsel = ABS_Y, - .size = sizeof(virtio_input_absinfo), - .u.abs.min = const_le32(INPUT_EVENT_ABS_MIN), - .u.abs.max = const_le32(INPUT_EVENT_ABS_MAX), - }, - { /* end of list */ }, -}; - -static struct virtio_input_config virtio_tablet_config_v2[] = { +static struct virtio_input_config virtio_tablet_config[] = { { .select = VIRTIO_INPUT_CFG_ID_NAME, .size = sizeof(VIRTIO_ID_NAME_TABLET), @@ -503,26 +425,13 @@ static struct virtio_input_config virtio_tablet_config_v2[] = { { /* end of list */ }, }; -static const Property virtio_tablet_properties[] = { - DEFINE_PROP_BOOL("wheel-axis", VirtIOInputHID, wheel_axis, true), -}; - -static void virtio_tablet_class_init(ObjectClass *klass, const void *data) -{ - DeviceClass *dc = DEVICE_CLASS(klass); - - device_class_set_props(dc, virtio_tablet_properties); -} - static void virtio_tablet_init(Object *obj) { VirtIOInputHID *vhid = VIRTIO_INPUT_HID(obj); VirtIOInput *vinput = VIRTIO_INPUT(obj); vhid->handler = &virtio_tablet_handler; - virtio_input_init_config(vinput, vhid->wheel_axis - ? virtio_tablet_config_v2 - : virtio_tablet_config_v1); + virtio_input_init_config(vinput, virtio_tablet_config); virtio_input_extend_config(vinput, keymap_button, ARRAY_SIZE(keymap_button), VIRTIO_INPUT_CFG_EV_BITS, EV_KEY); @@ -533,7 +442,6 @@ static const TypeInfo virtio_tablet_info = { .parent = TYPE_VIRTIO_INPUT_HID, .instance_size = sizeof(VirtIOInputHID), .instance_init = virtio_tablet_init, - .class_init = virtio_tablet_class_init, }; /* ----------------------------------------------------------------- */ From patchwork Thu May 1 23:01:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 886460 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp548503wrq; Thu, 1 May 2025 16:03:51 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVu11Locn88rTSQc99Lp9EeHzyU9vvzHVVYItqQEFWYLPIQtLJ/Rxr77BiDAB/pBETjtA/uFg==@linaro.org X-Google-Smtp-Source: AGHT+IFDKWAnjKz3aUWny/qYgQlSouI+NGCb2Agvk0zsJpvsVEPCduInIsGE3kBAyP9zokQrl/tj X-Received: by 2002:a05:620a:4311:b0:7c5:96b4:f5e5 with SMTP id af79cd13be357-7cad5b40532mr106879785a.13.1746140631287; Thu, 01 May 2025 16:03:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746140631; cv=none; d=google.com; s=arc-20240605; b=W+uzrS8M9rDH6nFaJeNHfiZUDeRwghDczX0pvV5+qhzquNEG4vqnOeVVOql2yxe4aK nfJm5YE6c6uhMTgnt/oEL/md63SFvrr2F2Fe0s+0pIgleyvKQGVC5uicaWZAJdyKSa9k /aTw4ZHE72SC1sXeWSNq/9+4cv1c+kl8QB9oVnCMb44Cj7nwVWy2Ub7H5SUf2XCvMdhg XeU/Zqigq7PxOqJC9+rxt/zDd0vj2uLb4Ro1/pP75xSmqBH3BNp2jX47lq+DbGxXw1Uf dwqm+rlVf9I7vvgLxS5JF3UuKl/ZbIZpy7W0dnyInFc3UbJgZfeR9+SeT1XjhUfIQYov 0NuA== 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=71cRgUxX/xvkQOIndCsIbPhvcAM9aTUzOonse2qZKrA=; fh=Je0Fu6WOva9CO7x05EmtzN8739OQv5Rr57VCUmCpFeg=; b=UnpEYMCKRO7lLC/31AbaiV8i6+ITAasYa5RaxUh3Nip8hv2pZgpkJNQ+Merv1dwsK5 qpGZyzHGZ/oFTLd/ygYl9htjvU3oVQVX2WMf6WcvedRvI2s8eq2zanoJ4NVpwQIzksdy vDQuGaVXevcx0j2luUNsj01SklQD4d+WpNbycz6aE0ybeWIRGzYk00uU8cORDE5gqM8B bwd/XeJUPefE+pOity97k64k8Lr3HkTvRsA84rbw9DQVF+5hYwIw9VlDTEwMt5ahSJ8I 5ySPY2CR21JVgo6vA1LCoUpHF04wCUnQs+if+RaX+lkSwS5olZPsjqFiT3T2MM0Cp0bV wXnA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mgkIZE04; 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-7cad2436a58si178496785a.416.2025.05.01.16.03.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 16:03:51 -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=mgkIZE04; 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 1uAcv2-00007u-0z; Thu, 01 May 2025 19:02:16 -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 1uAcuz-00005z-VE for qemu-devel@nongnu.org; Thu, 01 May 2025 19:02:14 -0400 Received: from mail-il1-x12e.google.com ([2607:f8b0:4864:20::12e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAcux-0002HV-73 for qemu-devel@nongnu.org; Thu, 01 May 2025 19:02:13 -0400 Received: by mail-il1-x12e.google.com with SMTP id e9e14a558f8ab-3d5e43e4725so4068335ab.1 for ; Thu, 01 May 2025 16:02:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746140530; x=1746745330; 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=71cRgUxX/xvkQOIndCsIbPhvcAM9aTUzOonse2qZKrA=; b=mgkIZE04GSyocR6PPP6lza7MAKZy3C8ca4U0N5nT6kmMw/gxTeCtv5W1CyyidWGEgJ 4bkFS5MByHX2qHVjKy3Li8d9GYkg3ZR/sB/DZAbfBjmAU5X9cvB21p4jZcnq9gwJWYvn rhDYutjZLaNdN8D/1wL40kI5JqDIcHT/cP5pEEKGUDsMROW8IOLL5W+dpFOkRgQG1Ovh tqALGoJZkFEmikt8k4kUJShDrg9+ZlVBFd3EfA/LzWyI82QN81p4LgFUUH4aQGnTsfdb oCI5fuxkAzkFKM5aOCfo64Qcbv4tBTC0pjCv9ionsNYOf9wgY1V4aeb4JxNfZ+g4ABMT 6dlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746140530; x=1746745330; 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=71cRgUxX/xvkQOIndCsIbPhvcAM9aTUzOonse2qZKrA=; b=afRYOLnD5a45z0dlug9xjkYZ6TDP6rIbfZNcFIxWU49SEQmVhwmpK9Epk+EwqIP40c UR/ccXWHa91s6bl2x3XE8JLqLCEXWZeWpAVUsBax3UMPK6QUwdqVqvP+A7GGn7q/e/63 BVgU95/w8uGtmPEqt9ileNbHp9nEkL80UaD5HGgHmNLw5Nl7sR+DyfkZXIPIQJdKj01P 1RhdxoJ8aNiZM+knlNO0WPkrMYixsOaKTEs3+ZdczZkJ2aFJbzOv7OQyPZA0418skY6t zOsnfVQUTqrKetyx/FPkf/3TzmZb/c+5V0u8q5TPfAq5dk0lnKWhmobBlaJ/30BMFrgK DeaA== X-Gm-Message-State: AOJu0Yxi2LURW3Q/A8Di/6rk6tE0irAnHS0+fAH9kf/NGCaVTKJ/CtUP vOSisnK2t7oCUXivrFzpzdetRE0EN7l6foSgB9x/2DwXmvKlWMsCi09F0PY1LKYHjETQ7jXKJDk Y X-Gm-Gg: ASbGncsDF4n/HsY/onlwZIQItW2bIxTYueVp9mz76RuKgzJE5NhwVwyOZ6dYqbvfJb0 EjUE46qTRRuB8D0lRvfDAzlthd+eGhf17P5IqnRE/J4/Da1Maf1liyI47XYis/4UmaUgb++ESSO NBnsRXRBUeucFXPFHnV2ZT63AOwv49/4DGTiM8RSwFv0/m6d6P4/SVVRpRHW3pSqfItuQHmMp/b E0XBX5dLRTmbhNRvzVixuMxhB1lZjbdxXXctlunUXTQ6KLxp8ZLF/WaGHycEeOVOL/osx84whe7 0HuaYxyLQ6gqi3qOQWe9wn+hgxxSUu0ExLWcC+XtaBwls1oxgmr56jRh8SMSNWnKT7mWFgNTI+D 76s5JPJVeV7XFa4QPXY6B X-Received: by 2002:a05:6e02:1f82:b0:3d9:6756:14b4 with SMTP id e9e14a558f8ab-3d97c288232mr9587435ab.18.1746140529786; Thu, 01 May 2025 16:02:09 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id e9e14a558f8ab-3d975e7d0c6sm3679665ab.27.2025.05.01.16.02.06 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 16:02:09 -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 04/10] hw/core/machine: Remove hw_compat_2_11[] array Date: Fri, 2 May 2025 01:01:22 +0200 Message-ID: <20250501230129.2596-5-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::12e; envelope-from=philmd@linaro.org; helo=mail-il1-x12e.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The hw_compat_2_11[] array was only used by the pc-q35-2.11, pc-i440fx-2.11 and s390-ccw-virtio-2.11 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daudé --- include/hw/boards.h | 3 --- hw/core/machine.c | 8 -------- 2 files changed, 11 deletions(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index f2f58ec4ed8..16cef33beae 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -826,7 +826,4 @@ extern const size_t hw_compat_3_0_len; extern GlobalProperty hw_compat_2_12[]; extern const size_t hw_compat_2_12_len; -extern GlobalProperty hw_compat_2_11[]; -extern const size_t hw_compat_2_11_len; - #endif diff --git a/hw/core/machine.c b/hw/core/machine.c index 816d503b2a1..8f1b44b70f7 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -230,14 +230,6 @@ GlobalProperty hw_compat_2_12[] = { }; const size_t hw_compat_2_12_len = G_N_ELEMENTS(hw_compat_2_12); -GlobalProperty hw_compat_2_11[] = { - { "hpet", "hpet-offset-saved", "false" }, - { "virtio-blk-pci", "vectors", "2" }, - { "vhost-user-blk-pci", "vectors", "2" }, - { "e1000", "migrate_tso_props", "off" }, -}; -const size_t hw_compat_2_11_len = G_N_ELEMENTS(hw_compat_2_11); - MachineState *current_machine; static char *machine_get_kernel(Object *obj, Error **errp) From patchwork Thu May 1 23:01:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 886458 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp548256wrq; Thu, 1 May 2025 16:03:14 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV6PtJXS7d2zXgm/LGK9FRwG+n4Q4688LWX7cfULdGfGQueq/JtewrKHHtXpFQbio248uljaA==@linaro.org X-Google-Smtp-Source: AGHT+IEjArhHNMbVfR0IHmNeFbP60HEVZwk54AoKIeP1Ccr1vZqxamQXVzW1Nzo0OuoXM6OpNqlZ X-Received: by 2002:a05:6214:21c9:b0:6e6:646e:a0f0 with SMTP id 6a1803df08f44-6f515278e6fmr14981556d6.12.1746140593800; Thu, 01 May 2025 16:03:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746140593; cv=none; d=google.com; s=arc-20240605; b=bO2ngUSpv3h+43bCURCfws6hmnz0X0rjibZKACXwPdjTrzvvC2SWsbc8CBoQAyVPGJ JZBzIv8e89rsarvz+fVzI+elwvccnglwHDcAy1nb6NGtdTHo6yg0BQLjJc32C5B+cETx 8LvxXG6JyhIIvk95y76Z+opqBx38n0yIofWHaFSFbsRkh8qNkECwqnPq3NE0zSJAFkCb UNm063Rg6jiMYU2BieYlvOZiEqrv9gWnBsbfsZENsxpVHwwdssrRtxDjoStroBW5j0gc 19LgJrzq9CHJORYoZqGxn/8KGzyiP9Tqim0kSQBosPPy1ElPKG6yLoiZ07ucD8MZJ49L SM0A== 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=zUjb2KvGlUZUFz83Ds0AOUfQl+OnRqVo67ED0F/0NGk=; fh=Je0Fu6WOva9CO7x05EmtzN8739OQv5Rr57VCUmCpFeg=; b=XK2Vc7gk+79dlqUPKtIm0b7/fCdOSANVtSm4BXfeMwh0k4f18l3UOPrBN34cqn/+cl fzh2wf20H+9Xwp0N5vlSzUrLtND3aNXVgHASAaQJtELmRQV2eAhwt8Pm82BzGB6JXC7L NumjSRHB3Iu8kmqv6lhmcUH02+vofHvbESEnHRaKNM0pBoOdjT++4ltcORJOUvtloZFD MII3pGGWR9IOVQqQrytGUW8cl4apc5VAvwCv55smFIZUsDJ04iwCgYRWB2xJ6kS2+uu3 DRvUdOT2HA4tig0b+nhBcHhaJySnmCIM5Asq9zJaK4gf2z8DJHyCFB7DFu/54fJPrOPm yR7w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DunsNhTo; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-48b9872457dsi15655181cf.387.2025.05.01.16.03.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 16:03:13 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DunsNhTo; 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 1uAcvL-0000Ra-SU; Thu, 01 May 2025 19:02:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uAcv9-0000E9-5d for qemu-devel@nongnu.org; Thu, 01 May 2025 19:02:27 -0400 Received: from mail-il1-x12e.google.com ([2607:f8b0:4864:20::12e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAcv6-0002KJ-SN for qemu-devel@nongnu.org; Thu, 01 May 2025 19:02:22 -0400 Received: by mail-il1-x12e.google.com with SMTP id e9e14a558f8ab-3d589ed2b47so4896055ab.2 for ; Thu, 01 May 2025 16:02:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746140539; x=1746745339; 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=zUjb2KvGlUZUFz83Ds0AOUfQl+OnRqVo67ED0F/0NGk=; b=DunsNhTouczSu6gQSlPVCZk/sGA54IGhDfwrSBIdZojE6RwAdRN3yrKgl0/NhHi3PF 8SrN514lWzjzr7U7F5yEAwjktuNfTS24iBdxyIYdEW0fxdNuKLve1KANx6+1gDT0MGH+ 9TcTdCl4qZyJIyoTPx5mH8E/CniBSKQO1B++FJ8AzwU02aPmMu+CCKgWQDXJI95RrQ+I TUw4DTBk2ehrnqarYXV5Se1Kcq84yvjnABm4HOqQfgQ9o4VfCl2IkXHy1ZoEl3FUveXF 511dSWhk7QVdHLO7fiaapmuHX3lHOZCdBaNgzxzb7PQ02ChSVbE+d17svJm2gtfLx7FK SbIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746140539; x=1746745339; 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=zUjb2KvGlUZUFz83Ds0AOUfQl+OnRqVo67ED0F/0NGk=; b=OUXh4jJ/63WOf6GW//IvlGkSHiXoHOAuEIYLkFZ094Cy7fqxuVyWAuDvH1OvKmR5ev lc7+temhKcrItYA7pA5ZjazXai0ruVKszgCaSbmfpTbW+exiJrQrRR2Hv4roV7ZD/aTC EnS3Tew+zAvn3LBJSwYbhWvHgGeotIhbWppyfNcUNgfR9/EO8IPgpdAndsvw7nprH59f PZ1oTxQU0eDVNQyWddqauy5NDdafMmsDLhi9lmdaT8lK9PZE7/sbjz0kRLksFeNzSB4h YMw+y3q/lRX9cICmmtD2xvmRDMqk74ZeJEUhuxYRoCOMvYi0CR9KticbwXwSavQIrLxb DxGQ== X-Gm-Message-State: AOJu0YzaNmliy7MS/aMuFxs/vo79/s4L3ryYzzgpRJh+J3PL5FH7+t93 uA7QvHAAR3GrCrg4mNZtPXf4cc19+KKpUVWOTXBYuYB9DunDDbqUn21z0CUy6OyHOtslLixbfmo Y X-Gm-Gg: ASbGncsg35N2TF6/V7o8UA+axmt97maRZ9j+Iq3S00yBbSIvw2EhdeMfjOIRx99ofGC fGPDBIfgllLdwWONteEE9qyhrGtosmB7t7ncNHKL+FyTmhpq7qE+Ys20BZDii39WX7x+N051VQP pHscpu4ob8KJydvKcmHTCLFDVP7zbkXLTuHpH/VmTB8C7B5tmBevngX99iwELxiVfwquPxup9aw 7qLAx1IvQXfpVtu2uxNDLBdOgDKlhzzz/d7V/rAwrO92Ck+XrU8zJqFSUEqr5V2WnMjAPXn3RdG UxK3FBH1qz4gXEVQjyLVa6+s/TAqXtdLzzOFWePCvBjqQW56Qb4pYvMkxkI+D6GbDd9e2+A5Qkd fd/21HZAfjC0SobiemMwk X-Received: by 2002:a05:6e02:1522:b0:3d9:6cb6:fa52 with SMTP id e9e14a558f8ab-3d97c1cba74mr10472685ab.12.1746140538619; Thu, 01 May 2025 16:02:18 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id e9e14a558f8ab-3d975e6fbbdsm3386655ab.16.2025.05.01.16.02.15 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 16:02:18 -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 05/10] hw/timer/hpet: Remove HPETState::hpet_offset_saved field Date: Fri, 2 May 2025 01:01:23 +0200 Message-ID: <20250501230129.2596-6-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::12e; envelope-from=philmd@linaro.org; helo=mail-il1-x12e.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The HPETState::hpet_offset_saved boolean was only set in the hw_compat_2_11[] array, via the 'hpet-offset-saved=false' property. We removed all machines using that array, lets remove that property and all the code around it. Signed-off-by: Philippe Mathieu-Daudé --- hw/timer/hpet.c | 9 +-------- rust/hw/timer/hpet/src/hpet.rs | 9 --------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c index d1b7bc52b7b..47b8fc0d880 100644 --- a/hw/timer/hpet.c +++ b/hw/timer/hpet.c @@ -71,7 +71,6 @@ struct HPETState { MemoryRegion iomem; uint64_t hpet_offset; - bool hpet_offset_saved; qemu_irq irqs[HPET_NUM_IRQ_ROUTES]; uint32_t flags; uint8_t rtc_irq_level; @@ -264,11 +263,6 @@ static int hpet_post_load(void *opaque, int version_id) t->cmp64 = hpet_calculate_cmp64(t, s->hpet_counter, t->cmp); t->last = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) - NANOSECONDS_PER_SECOND; } - /* Recalculate the offset between the main counter and guest time */ - if (!s->hpet_offset_saved) { - s->hpet_offset = ticks_to_ns(s->hpet_counter) - - qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); - } return 0; } @@ -277,7 +271,7 @@ static bool hpet_offset_needed(void *opaque) { HPETState *s = opaque; - return hpet_enabled(s) && s->hpet_offset_saved; + return hpet_enabled(s); } static bool hpet_rtc_irq_level_needed(void *opaque) @@ -733,7 +727,6 @@ static const Property hpet_device_properties[] = { DEFINE_PROP_UINT8("timers", HPETState, num_timers, HPET_MIN_TIMERS), DEFINE_PROP_BIT("msi", HPETState, flags, HPET_MSI_SUPPORT, false), DEFINE_PROP_UINT32(HPET_INTCAP, HPETState, intcap, 0), - DEFINE_PROP_BOOL("hpet-offset-saved", HPETState, hpet_offset_saved, true), }; static void hpet_device_class_init(ObjectClass *klass, const void *data) diff --git a/rust/hw/timer/hpet/src/hpet.rs b/rust/hw/timer/hpet/src/hpet.rs index cbd2ed4f6bf..9e681391176 100644 --- a/rust/hw/timer/hpet/src/hpet.rs +++ b/rust/hw/timer/hpet/src/hpet.rs @@ -544,7 +544,6 @@ pub struct HPETState { /// Offset of main counter relative to qemu clock. hpet_offset: BqlCell, - hpet_offset_saved: bool, irqs: [InterruptSource; HPET_NUM_IRQ_ROUTES], rtc_irq_level: BqlCell, @@ -885,14 +884,6 @@ impl ObjectImpl for HPETState { u32, default = 0 ), - qemu_api::define_property!( - c_str!("hpet-offset-saved"), - HPETState, - hpet_offset_saved, - unsafe { &qdev_prop_bool }, - bool, - default = true - ), } impl DeviceImpl for HPETState { From patchwork Thu May 1 23:01:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 886459 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp548258wrq; Thu, 1 May 2025 16:03:14 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXxk1g6E4Sy9Y9I4ZagaWWzkhimjUuMqBF6CMBjZU/rS5asr9A5AYvRMY61m4QhS2dHr4xWiw==@linaro.org X-Google-Smtp-Source: AGHT+IHAEu6SBQ4alk308Kmzv1J4JKIdrI6ISOvSDqp/4qVuJPePuiesxaIQN7J4bMLW+jd2OFeD X-Received: by 2002:a05:6214:500c:b0:6f4:b265:261 with SMTP id 6a1803df08f44-6f51524f4b9mr20912726d6.8.1746140594066; Thu, 01 May 2025 16:03:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746140594; cv=none; d=google.com; s=arc-20240605; b=LL5bP87QSoER8VTWU2O5e5ywiIxydB7OdvS0Ie1pEeG7Uq8dDCQA/bETkg+w69C+3t PM03KWevVSk5iLt5RY6GN4bukyJnOmIpwiPHSfVU/zhbr8mfiSWSGI6a+kNrZXJx1Ytj IKHmKYQFnThY3UbrCyFqECMabesTIqMgAEdDVfoMSsn8XqiRVe84Eu+25CAZWXmHcivj wKSBQFOM7Y5SpnPE9T4KZ0Cj+8XM3IULnk4H2hXlw1fB5+BdVU0DHD0HtGtK7mqrXugp AKvNRgK2qaYEF7XPTomSvuWViaut1cky9k3vJELW2SwrlO4diKWuWrojWqEhkOfh8dlW BUXQ== 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=MKlAvP/b7bRS8YoXdECBwma4F9omGf4fESvbK1cfcEc=; fh=Je0Fu6WOva9CO7x05EmtzN8739OQv5Rr57VCUmCpFeg=; b=EQAaFnwIH61GANt7hzQOdPdwrJqiWDxZTNR0d68SR1K26kvGIPRUJkd2AExHiGLmF8 TeSCm0GZyiD3VwvwYsvrEVI5HuZOB7apjdOlnXmCYt+kSex1w/DS+0p5c3RRwRTblCsm o3/PecrnMMWm42RFelbxP6hWZsv7DvGCHXT/OD7SCjve7EqleI3h1FfcbkiwFg6Ua+KA 3OCoV7Vt3SoEATgfrVFIXr/L2KGJj81Ok+SxIZdLo+Y4YATQExlwUvRZtX86hWFTjXiC 0bQUWwqP/cZC06QfUhDyON2BDOGLC0ih0kBtDtPjKwkjDAgj4JT07jd2NcmVW1gTzn4y LBGA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=P7r0+NFB; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6f50f4acd11si16715846d6.459.2025.05.01.16.03.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 16:03:14 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=P7r0+NFB; 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 1uAcvM-0000Sz-Hv; Thu, 01 May 2025 19:02:36 -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 1uAcvH-0000LC-Pb for qemu-devel@nongnu.org; Thu, 01 May 2025 19:02:33 -0400 Received: from mail-il1-x129.google.com ([2607:f8b0:4864:20::129]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAcvF-0002M7-Lg for qemu-devel@nongnu.org; Thu, 01 May 2025 19:02:31 -0400 Received: by mail-il1-x129.google.com with SMTP id e9e14a558f8ab-3d5e68418b5so13896405ab.2 for ; Thu, 01 May 2025 16:02:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746140547; x=1746745347; 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=MKlAvP/b7bRS8YoXdECBwma4F9omGf4fESvbK1cfcEc=; b=P7r0+NFBdixDD9pJAWHbaEE7RkA5/vScdf4hTS3Vxm8bIpUeAIx1Dks6KTYejWmXwJ 7UkfS4SX9hdSBzEWb9ucddbFbP3UUoqBfXvDHdqLtWWqet2OdsIlRa0yLOxJUZWKW6o/ eC4c0+J+kSF/wnHnI09bsyC/DvYWCT1opLM3KbuIOprka6e1bWH9ciFiJ+QxE1ndiP4C Z3Gcb1c4LIPA3TVZFTompAC6rZhgu9xoP0nRP09BizHOH8aHy47rgEAjF3D3npYE0gKh FELKA0f9O53TWit5dd2rPob/ceomgaywGszGwD5XdjAPB1lhvFdgZ9RJNI+j5m/9u8CP XjMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746140547; x=1746745347; 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=MKlAvP/b7bRS8YoXdECBwma4F9omGf4fESvbK1cfcEc=; b=kXA2odY0h743erM4YpIBSDRaMHzAC7AbNcPemMqz+bZD644+JMql4BAGlXKRu4GqMB 8bQ65BsMC8lisEd+Dh2rCwYqFVEp7aGiwjCi0Jzlck3JGN1Re6ZszFazTpw6F93r5tc5 IH3SeVB12Y2n0USm/dQgqFaKMwLp39l/ORkua5UxWrIfCyZ0Ut4MZE9WosrcIuR20tuw f6PMmVyzxUZY94RmZcSiZDvrTSZ6TwYTY1T26pOpNFFQ3NYF+kvfsGFdJmuOMqwykdSr yCkLUnbEJNQh2iT1RQby+VASiFKxmKquS8NIjnTRV7qwBY2HQU2va8wdqmsJnHAwfISA v6KA== X-Gm-Message-State: AOJu0YzVObudXZmcgGlz4ffwh5mJZuV0XML688mD5D2v2AAUVgcIZcqT fOKy8XAsLeIHRuSTDVWeZIVrWMNRsYxmO3tbIXOgRCtOxRuuMjZf8k7hUMj5QGNHeWiMLJVALEa J X-Gm-Gg: ASbGnctUXEN81jKEh00zj74hoFkDqfEnxw1zfxWPMoXCdsEQ3ZAdE42WppnbrB+qiDg 3YL9k2iy6mgIWlr0bQaWlU33JwTIlfTgrynO7aujTlsE8A0YXphr1n3HdoolIlRfn2D1k8w5GiH Rkp1v5OnVxTcoYgMAyyOf9/wm5ZSFJqXDGCX8M+HyUd/defOoOxVMMsb1rV4J8dN/3DT2Cq/1FK 5dOL0e+Ub7NbXSAQOiuR2A+fS3AX76YFZE4YOo/leTm4qgktxA8wNF8HqIVk5BE8oAUTofsbGTB rY1ztEio6yOY15uHFNHuRr4KDrqohVsssRPad9ize7d2VP+gFe4PAT+tqnxiOMUltieEo4uKUs7 94Q5O4RNaMMm7XGxWa9YdPzCISmx7bro= X-Received: by 2002:a05:6e02:168d:b0:3d3:f6ee:cc4c with SMTP id e9e14a558f8ab-3d97be919c5mr8853545ab.0.1746140547164; Thu, 01 May 2025 16:02: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 8926c6da1cb9f-4f88a8d0e77sm91354173.24.2025.05.01.16.02.23 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 16:02:26 -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 06/10] hw/net/e1000: Remove unused E1000_FLAG_TSO flag Date: Fri, 2 May 2025 01:01:24 +0200 Message-ID: <20250501230129.2596-7-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::129; envelope-from=philmd@linaro.org; helo=mail-il1-x129.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org E1000_FLAG_TSO was only used by the hw_compat_2_11[] array, via the 'migrate_tso_props=off' property. We removed all machines using that array, lets remove all the code around E1000_FLAG_TSO, including the vmstate_e1000_tx_tso_state subsection. Signed-off-by: Philippe Mathieu-Daudé --- Is it OK to remove migration subsection like that? --- hw/net/e1000.c | 58 +++++++------------------------------------------- 1 file changed, 8 insertions(+), 50 deletions(-) diff --git a/hw/net/e1000.c b/hw/net/e1000.c index e0310aef872..c68645684b6 100644 --- a/hw/net/e1000.c +++ b/hw/net/e1000.c @@ -127,13 +127,10 @@ struct E1000State_st { QEMUTimer *flush_queue_timer; /* Compatibility flags for migration to/from qemu 1.3.0 and older */ -#define E1000_FLAG_TSO_BIT 3 #define E1000_FLAG_VET_BIT 4 -#define E1000_FLAG_TSO (1 << E1000_FLAG_TSO_BIT) #define E1000_FLAG_VET (1 << E1000_FLAG_VET_BIT) uint32_t compat_flags; - bool received_tx_tso; bool use_tso_for_migration; e1000x_txd_props mig_props; }; @@ -1331,7 +1328,7 @@ static int e1000_pre_save(void *opaque) } /* Decide which set of props to migrate in the main structure */ - if (chkflag(TSO) || !s->use_tso_for_migration) { + if (!s->use_tso_for_migration) { /* Either we're migrating with the extra subsection, in which * case the mig_props is always 'props' OR * we've not got the subsection, but 'props' was the last @@ -1368,30 +1365,16 @@ static int e1000_post_load(void *opaque, int version_id) } s->tx.props = s->mig_props; - if (!s->received_tx_tso) { - /* We received only one set of offload data (tx.props) - * and haven't got tx.tso_props. The best we can do - * is dupe the data. - */ - s->tx.tso_props = s->mig_props; - } + + /* We received only one set of offload data (tx.props) + * and haven't got tx.tso_props. The best we can do + * is dupe the data. + */ + s->tx.tso_props = s->mig_props; + return 0; } -static int e1000_tx_tso_post_load(void *opaque, int version_id) -{ - E1000State *s = opaque; - s->received_tx_tso = true; - return 0; -} - -static bool e1000_tso_state_needed(void *opaque) -{ - E1000State *s = opaque; - - return chkflag(TSO); -} - static const VMStateDescription vmstate_e1000_mit_state = { .name = "e1000/mit_state", .version_id = 1, @@ -1416,28 +1399,6 @@ static const VMStateDescription vmstate_e1000_full_mac_state = { } }; -static const VMStateDescription vmstate_e1000_tx_tso_state = { - .name = "e1000/tx_tso_state", - .version_id = 1, - .minimum_version_id = 1, - .needed = e1000_tso_state_needed, - .post_load = e1000_tx_tso_post_load, - .fields = (const VMStateField[]) { - VMSTATE_UINT8(tx.tso_props.ipcss, E1000State), - VMSTATE_UINT8(tx.tso_props.ipcso, E1000State), - VMSTATE_UINT16(tx.tso_props.ipcse, E1000State), - VMSTATE_UINT8(tx.tso_props.tucss, E1000State), - VMSTATE_UINT8(tx.tso_props.tucso, E1000State), - VMSTATE_UINT16(tx.tso_props.tucse, E1000State), - VMSTATE_UINT32(tx.tso_props.paylen, E1000State), - VMSTATE_UINT8(tx.tso_props.hdr_len, E1000State), - VMSTATE_UINT16(tx.tso_props.mss, E1000State), - VMSTATE_INT8(tx.tso_props.ip, E1000State), - VMSTATE_INT8(tx.tso_props.tcp, E1000State), - VMSTATE_END_OF_LIST() - } -}; - static const VMStateDescription vmstate_e1000 = { .name = "e1000", .version_id = 2, @@ -1519,7 +1480,6 @@ static const VMStateDescription vmstate_e1000 = { .subsections = (const VMStateDescription * const []) { &vmstate_e1000_mit_state, &vmstate_e1000_full_mac_state, - &vmstate_e1000_tx_tso_state, NULL } }; @@ -1637,8 +1597,6 @@ static void pci_e1000_realize(PCIDevice *pci_dev, Error **errp) static const Property e1000_properties[] = { DEFINE_NIC_PROPERTIES(E1000State, conf), - DEFINE_PROP_BIT("migrate_tso_props", E1000State, - compat_flags, E1000_FLAG_TSO_BIT, true), DEFINE_PROP_BIT("init-vet", E1000State, compat_flags, E1000_FLAG_VET_BIT, true), }; From patchwork Thu May 1 23:01:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 886463 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp548731wrq; Thu, 1 May 2025 16:04:21 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWSloze932Lsafial6jjyff9Ks/vsZd102nDI3B2IhnKNqPVc6m4xBzOWqAzoMTFpeIQQ6QEQ==@linaro.org X-Google-Smtp-Source: AGHT+IEN7n8UbMlKiRycuovlfF3LV40AxbcUsPbNTLjnGmq59QFiRyHshrzCo4D7b4VWAXhrVV05 X-Received: by 2002:a05:6214:248c:b0:6f2:a537:f47e with SMTP id 6a1803df08f44-6f515647388mr19309606d6.42.1746140661113; Thu, 01 May 2025 16:04:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746140661; cv=none; d=google.com; s=arc-20240605; b=jbtw1HWmKZxjYuXzHFCtpWenGjpYRRB9Kvd5c1vnPN8Rf9nM6HGLKfYeKJbJaILNTO VelR15Sjt9EFvYoa9aR5LRJaoGJqFJywWDWe3qKqHcqJ4YUiRXWm7C7C5E4B2yUoTTQS mcxSKoLbB7/vl2UjubohAUfFHVkslHhkC0gATs2vcMWUzV8+0SaTlz/sfPmrSZWl4H2r whBGw8ZIbGVwkUAGswCDIWz2qCMjS4ozaTTYAPvv8BN31u/UXYGKU32FOO3z2e0BNovu B3DWBasZMhGJitMwUO8oTndxXKyymlJQ1vn3GVW9+kQ5kxT8N+RcuneF5ZH8b2JuBO+N TSdQ== 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=1dlMcx3WGtPJYiCrgyeoxnRKpVNt5eyt1XvaZehs/1U=; fh=Je0Fu6WOva9CO7x05EmtzN8739OQv5Rr57VCUmCpFeg=; b=kUC994zOMIZykumcqGzJoyGXjANRKpH0K52Wik81NGtWNZml3SNexvxmStZZavsdO5 ebo5UhNwwY2KJqXzGpESnKIC2yzLSiKZNv6mgE2ryZYjqpCLFe4nVVGBsaPDX4gDNu7X neYsX9CZExKt03ki4fiidRJ0cBlPY2VgZr97/2rJd7RroIqw8wWaLsz7/Xb4u9DqhECT Gr6v/Hrkwu0Or4FaVBHFvaa3hr5WWXg2zcC1Fqi7x2w6kns9VkH0dkPEEEU+vnkuJzT4 WUQQTJNHW8LvdBuqZyKYdoMAHHIkkse9dCQ5V7drbsOeW2ywma5mWYbz6WAV3mRbfRB8 QhcA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gsemxs7N; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6f50f48fd3fsi17106806d6.318.2025.05.01.16.04.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 16:04:21 -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=gsemxs7N; 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 1uAcvg-0000Yy-Pi; Thu, 01 May 2025 19:02:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uAcvW-0000Uz-N8 for qemu-devel@nongnu.org; Thu, 01 May 2025 19:02:47 -0400 Received: from mail-il1-x12f.google.com ([2607:f8b0:4864:20::12f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAcvU-0002Nz-Ut for qemu-devel@nongnu.org; Thu, 01 May 2025 19:02:46 -0400 Received: by mail-il1-x12f.google.com with SMTP id e9e14a558f8ab-3d6d6d82633so4996225ab.0 for ; Thu, 01 May 2025 16:02:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746140556; x=1746745356; 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=1dlMcx3WGtPJYiCrgyeoxnRKpVNt5eyt1XvaZehs/1U=; b=gsemxs7N9iAG6j8aEhfg3NtMsyc3G2GOGjVbvsX1DBgih+f+NQQjg6cULWydJHruzk eUwmrhqn1ln2JjrZFwY5KdM2TJFxYiLiNw4HMw7ozaZVj15oSxeOZFc7WJ58FoiraDks xq2ltZ5XwYYCLjHDQIfFseQFRqHh2bEQzhwXxAxyzJNPsfVB/7QkpuB/KCiru1ZMBoEB wmfVSpCK/+uWAhgFqYLFMZXmr9A4xt+PJHM4roXcf1FZUC15JOKtMFOxYC9zJx6PcmyD gA+U2L9zftobJVSPd2zUHbltQxHySRxFNZJWl76MpwFplS+p24vPSiglmo1D9iKoNv8c bxhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746140556; x=1746745356; 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=1dlMcx3WGtPJYiCrgyeoxnRKpVNt5eyt1XvaZehs/1U=; b=JhvxxbMi7CH711wNt+DBG+osCYK43DqfQFTmPV/FhgF0iGOKALZ8MSE+t2cYuRxmB+ jHc+YS/hu2Cxe7BzVIFxR4EO2GYxVd9UAqixHn40Ds4Ty4Mh/XyrKPjJQDIvT4WQrBWy Xu6NILe/z9ZpqEq8iEHDb2JMiOi/fVtCMRdHGwgsm3XKDOhAzufRjr6WKiFuxN5X31Ck EO0XwylhZ+oRGCg4SzBlJAjpuhvQnw0hE6TEp8d20Jle4BL64xL56jv9MaJV3WKtQqeB bB0CtyPS53ZuVlvzGBMDwXn8RB9WrBjXeiTDtFayv11l/ionE9QQcRfYyzzfxjr2uBPb LhYg== X-Gm-Message-State: AOJu0YyZSD6po2Xl/AOhGBsgEd5WFOsfQcSZ9H7bVSTf6PnlKdIjlk35 D87b2pVbHdhJwuHoHEp2P5xlraq+aMq9nDtaEAlsv1XsVwsv7J1A/M7eJgrYTsWRfo2Brkgdza/ J X-Gm-Gg: ASbGncvD9xvTmcXgqNAwOfSfoiLPy7a0xrMrb6C5Gyd1MU1RHNNvT09Gjm3orROssBP UH9m7SUzep5kBYkBTXQipR6ZzU9bcodqetFQ95zZdFnJTFtuVHpRCScABTqmeBe5lfr1HPQlepK V9jnGPdi1tu8nwoORH/aACVZ2z36Re+mWzjCt5lJDPlKvOqImvzII/IuuBs6UFWqqZAvtmntW8f r8dwKM4KPDqrqenuErnoUs6+Bjkdlpj+d8Tj1GEiPgOPkihjv0GDAUnm+Wm/iaot6FrJRHies+2 mUz6u/w7o8l5qO4+3GTtRHgp8rdPPGB8zrn7wi3k9IK4AEHfhYJkQ9qUmMJX08FHlsRzVgV4Ggz dQBI+9ax4YKSOIC/1y0up X-Received: by 2002:a05:6e02:3702:b0:3d3:fbae:3978 with SMTP id e9e14a558f8ab-3d97c1a4cb9mr9373195ab.9.1746140555981; Thu, 01 May 2025 16:02:35 -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-4f88aac7e27sm87432173.138.2025.05.01.16.02.32 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 16:02:35 -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 07/10] hw/s390x/s390-virtio-ccw: Remove the deprecated 2.12 machine type Date: Fri, 2 May 2025 01:01:25 +0200 Message-ID: <20250501230129.2596-8-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::12f; envelope-from=philmd@linaro.org; helo=mail-il1-x12f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Thomas Huth The s390-ccw-virtio-2.12 machine is older than 6 years, so according to our machine support policy, it can be removed now. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Message-ID: <20250115073819.15452-9-thuth@redhat.com> Signed-off-by: Philippe Mathieu-Daudé --- hw/s390x/s390-virtio-ccw.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 2c90702d834..e612030bc18 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -1236,20 +1236,6 @@ static void ccw_machine_3_0_class_options(MachineClass *mc) } DEFINE_CCW_MACHINE(3, 0); -static void ccw_machine_2_12_instance_options(MachineState *machine) -{ - ccw_machine_3_0_instance_options(machine); - s390_cpudef_featoff_greater(11, 1, S390_FEAT_PPA15); - s390_cpudef_featoff_greater(11, 1, S390_FEAT_BPB); -} - -static void ccw_machine_2_12_class_options(MachineClass *mc) -{ - ccw_machine_3_0_class_options(mc); - compat_props_add(mc->compat_props, hw_compat_2_12, hw_compat_2_12_len); -} -DEFINE_CCW_MACHINE(2, 12); - static void ccw_machine_register_types(void) { type_register_static(&ccw_machine_info); From patchwork Thu May 1 23:01:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 886462 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp548675wrq; Thu, 1 May 2025 16:04:15 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXXHYgx7jyZsWfNgCEny5GQy6pK0pg7ekbhvx7t5nS3X/kOy09zm4k0O0zOzpfwo1kZ3/tCTQ==@linaro.org X-Google-Smtp-Source: AGHT+IHRp1Fc1d7wpeHMZQVrrDTkNrcDenZqleB0nrHug5TT8B0Hz05wXn3FnjJi8xEEJ9rsCJca X-Received: by 2002:ac8:690f:0:b0:476:95dd:520e with SMTP id d75a77b69052e-48c31354610mr12169061cf.16.1746140654990; Thu, 01 May 2025 16:04:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746140654; cv=none; d=google.com; s=arc-20240605; b=V9PsYDYL7GnlPJqnYtie6aBmgwjiHoLt9lhefwySZoFWLJM77gRLVl0SvupUb5/90v LWAOECvnFkUSnpXjfMItgb2IxzpLkfCMhAI0qk9xUDkgXc+JnL3wJIpOrZ/8TOyKKxQt vDgiWM9cmH99/1bkWhvKGf8Qn2uD+0eKtB3UV1JCw5f//68dgPgLJtxOectWl2jB32DA BZNyrMTDLad4Kt5F9XCgVgzB9I8jTwoNBjO7PeZ8T/yheSrYe36LUDyVI1yZoKaK+kAg STsrweRcd0YqwoUi/Zu22O95PtOEDHr3f/eA1g+uC2ZkdtljklZHfmzF8gQfn1DU1Ccj nV4A== 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=gLFAH/NqarXgrsQtC/1/f6gfkvP7AQL3VQJbCki7bDU=; fh=Je0Fu6WOva9CO7x05EmtzN8739OQv5Rr57VCUmCpFeg=; b=knRSBzcHCYGq4Hh4388wllF8SDsxvD3jG+VaZ/gl487+XbziLnIWPWXfba4ut47lso rTvtDWIuqne2SpAfXa34SOGEfKnOmtjZ+pPDZ3R3qpKObs7HhddAN++eYGKFgbesj37Z yFTYVG8mkhBf++yIgM/gabXaAf6BS9VhKGcctKSz8jZUVmevVfg499W52K0gR7YfCw04 2aeaX215OcNgnlMw0c4Zn2okZ5hseT05M6Kydh5e92313sLlKfylQrzgVhxsmpSSutAl g2FvRlf1LNjziVn2l2k2/pdEqHEfzU3L/5VTV04Yoz/O+wSVRfHL2HPgPCNwbk7oTFEk ag7A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=sU1J6FoO; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-48b990071d0si15722121cf.613.2025.05.01.16.04.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 16:04:14 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=sU1J6FoO; 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 1uAcvt-0000np-Ma; Thu, 01 May 2025 19:03:09 -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 1uAcvZ-0000VW-6a for qemu-devel@nongnu.org; Thu, 01 May 2025 19:02:51 -0400 Received: from mail-io1-xd30.google.com ([2607:f8b0:4864:20::d30]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAcvX-0002Of-7s for qemu-devel@nongnu.org; Thu, 01 May 2025 19:02:48 -0400 Received: by mail-io1-xd30.google.com with SMTP id ca18e2360f4ac-8616987c261so49680039f.3 for ; Thu, 01 May 2025 16:02:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746140565; x=1746745365; 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=gLFAH/NqarXgrsQtC/1/f6gfkvP7AQL3VQJbCki7bDU=; b=sU1J6FoOAdwpyd7OLhODtuj+ddzkCojbru6gQF1X/qgCuiGV/lJGvJOef+AT5xQaEd tnxfR1p6LGfu+WBRnnYy7Q9MgShkqyi5Q4gDtOmwmBL8M6WO0m2yK9/EQ+uy45eUg5Eu zgSPROfW4AmxLfh/HoQ+3Jj4FlG7gvF9Iu63pmBis3L5ygAnr0lx68DhvMwgtuXip8Ba rE2IM9Ov0KStJnFCFb8QLffLQNGOwuUl4TwOgx9Y1/oztA16TOWl3JygkHO2tQOvhbZj OCC+2sIElkAG8a6UKaD9lh3TyqLx+RDmhHdv1pjipnx811w5uFGocZx3ZFT9xKXWwbhJ cXTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746140565; x=1746745365; 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=gLFAH/NqarXgrsQtC/1/f6gfkvP7AQL3VQJbCki7bDU=; b=IYCCJjgWn5a0XFUUsNvbQ0eiT9nCSYESfGfmpK95tCLdXJWOU9mDxV93ZehZDJyW79 xbWg/UDp01su6RLhkor3eURtCp0LQjG90SBJdIMe4XUK3pTDjAIhTju4SngK02YUbGO4 GiQnTItPVseu+UuUw0VrSTgV7841FcDKY81W9Bv1QmuYg1JNGPykoNqooIRYGK9Icham +IZNu0BKO+qpI+xAFmnAyguXzVKNd5ORZ99xuH4hAbXu1wnYYbHQlcnav0+2rHJVJuNH XR7lXN7vwksaQgsJP6TOqeaGwEfmvMpLjrCrjRW4zDzSuk4DtQ5vZzO/vsxd75OiWpae WUKQ== X-Gm-Message-State: AOJu0YxG/K1hIgc6+0pGN8dyj53vLnvBIZ0iUk3DNN4LDZ1QCL/yfPXY cZX9tseYvuICZa4GdjUOcgNxqri4gIyOOSAqSEqB3znyXM3z+gmwMmE6Bfc6pbpMUNBukw2vaGF U X-Gm-Gg: ASbGncuyL2cWPjuVgK7CpJEeYOPPfmdRpeHlvbYDt2+veVXo2WwJ8VKqnXxbay20Zg5 AvZ+TJzBdEXIfzUX0UqkwSLHzZ8YNmSwgybgrhrQWiIok50DP5PAtIIhusL08WY5iVKL/X9kv8u L0Lv8M6e9Dh3goD+AWfLYhMo8AOTpmCj8a+X9oR1Kny3pPHG0dwkF4rY6RSWo2BZLWJV7HUWZyV CloRYRnfgseTJ+YKw2GUG0de6IgspZ9JzzK5hIBmgGSBzRkQw/f+gOqRRt4Me5bQrWJb/eFnQFi aZ/7JpLbFha7sxtEK37Gik0zuMsqO7BN3+PiOkv6XjaenvQtl/yKRfwQzIgTzZXU1OfiRTYj/5p vVWmFlzKlFyA12dTZoMLi X-Received: by 2002:a05:6602:750a:b0:85d:a235:e90e with SMTP id ca18e2360f4ac-866b43fb92dmr104507039f.13.1746140565268; Thu, 01 May 2025 16:02:45 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ca18e2360f4ac-864aa584729sm28140539f.45.2025.05.01.16.02.41 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 16:02:44 -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 08/10] hw/core/machine: Remove hw_compat_2_12[] array Date: Fri, 2 May 2025 01:01:26 +0200 Message-ID: <20250501230129.2596-9-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::d30; envelope-from=philmd@linaro.org; helo=mail-io1-xd30.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The hw_compat_2_12[] array was only used by the pc-q35-2.12, pc-i440fx-2.12 and s390-ccw-virtio-2.12 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daudé --- include/hw/boards.h | 3 --- hw/core/machine.c | 9 --------- 2 files changed, 12 deletions(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index 16cef33beae..7b3f7878625 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -823,7 +823,4 @@ extern const size_t hw_compat_3_1_len; extern GlobalProperty hw_compat_3_0[]; extern const size_t hw_compat_3_0_len; -extern GlobalProperty hw_compat_2_12[]; -extern const size_t hw_compat_2_12_len; - #endif diff --git a/hw/core/machine.c b/hw/core/machine.c index 8f1b44b70f7..4ebefaab819 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -221,15 +221,6 @@ const size_t hw_compat_3_1_len = G_N_ELEMENTS(hw_compat_3_1); GlobalProperty hw_compat_3_0[] = {}; const size_t hw_compat_3_0_len = G_N_ELEMENTS(hw_compat_3_0); -GlobalProperty hw_compat_2_12[] = { - { "hda-audio", "use-timer", "false" }, - { "cirrus-vga", "global-vmstate", "true" }, - { "VGA", "global-vmstate", "true" }, - { "vmware-svga", "global-vmstate", "true" }, - { "qxl-vga", "global-vmstate", "true" }, -}; -const size_t hw_compat_2_12_len = G_N_ELEMENTS(hw_compat_2_12); - MachineState *current_machine; static char *machine_get_kernel(Object *obj, Error **errp) From patchwork Thu May 1 23:01:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 886465 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp548873wrq; Thu, 1 May 2025 16:04:39 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUdO1DzCv1P0BOnRykgbBiKFkled1eVarEJnD0W2NhS8P+S0OI3ZOsdNTiCdy9IoPIzCbCvxQ==@linaro.org X-Google-Smtp-Source: AGHT+IE6viJcr8vF41QrJ/lScOVXlYhNvDmY2XLcj0bqQMSPDRi7yiV74NNPT1mt5fzwJWxKiIFs X-Received: by 2002:a05:620a:4707:b0:7c5:99f9:6ada with SMTP id af79cd13be357-7cad5ba3f1bmr123674885a.50.1746140678751; Thu, 01 May 2025 16:04:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746140678; cv=none; d=google.com; s=arc-20240605; b=V316z8Y8/eZlPlBajFJNrOfTOFk7iyv8coUpb3ELhDW13rkGMNmKGNrcwcyUAiyNXh RcoGsv6d3n0J4wZmSRE1ZEPbaufQja1uXZkiP4MT/4MjhHpRmBNayysYD8gq7+4uK3ZA rIvqehzLBYlR7C6kHAQFgjyuDFh17bc9gIiiAZFafmi5wP0khjl4nCpXSNcsqwh5mUsu jWW27gfeCeRGAKwxsCF7ddvRsdxhNBwj/XFdoJNsoT0k+nLwot7q3S5emyx7+POFFmpP J/UNRWZ9rgz/zGhGPL9VxFcYvfCMkLPgh5E0DuiDYJ0geqhAYnPAW0hr8RCOA4Y4YHOG j2vQ== 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=WnkKvB1b+3d0EeHxFwXj6FOWV545S5FRjaJFzkqSlRY=; fh=Je0Fu6WOva9CO7x05EmtzN8739OQv5Rr57VCUmCpFeg=; b=d1/+JpXVnA1VZgkCtP6l8z6XYE9J0yGZmI+VnHqKvPh2Ya59R2MDm6iiHWVWBLe2cy MeFMH7V1vjndeCyrgWJRU3SyRfd5G1ovGg6ditBPrjcFJGoufU+XIkk4qyPsdgUwYr3u RxpT059nLEaaWe5dV3tfrC3z6pQF2KMKTSF8Pqk/3Agf8DYzy98ppU2Y0oGNIsPdZo// +Ou9IuiAC13ECg472lECs/jfsnszGFopNBAI7WyDhBqwAvIt2gC2ax/1TAs/bdmZeeOM ZT1AwUxIkSA+rJa3REhxsUv6Yj5bFiv/fcFrMS+buIkXVdShzO4GkbDgr6oOICwrAAmr NfZg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mEZAGoZU; 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-7cad23cafeesi175453885a.183.2025.05.01.16.04.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 16:04:38 -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=mEZAGoZU; 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 1uAcvr-0000ix-PH; Thu, 01 May 2025 19:03:07 -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 1uAcvi-0000bd-DB for qemu-devel@nongnu.org; Thu, 01 May 2025 19:02:59 -0400 Received: from mail-io1-xd30.google.com ([2607:f8b0:4864:20::d30]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAcvg-0002QO-J3 for qemu-devel@nongnu.org; Thu, 01 May 2025 19:02:58 -0400 Received: by mail-io1-xd30.google.com with SMTP id ca18e2360f4ac-85df99da233so145625339f.3 for ; Thu, 01 May 2025 16:02:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746140574; x=1746745374; 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=WnkKvB1b+3d0EeHxFwXj6FOWV545S5FRjaJFzkqSlRY=; b=mEZAGoZUUGqPYxFrVPteuGgEvOXAt0gAmyMuMmGK58ymTxJEvDrQd+OLXxHcSoOws9 6kI2uG9mZpYWbSHcxOtrr8OMbquJ+Smoph4A0mTGhhle6BPRXFlh4cILU7q1b6FrDqOH w4ktgZ9ulEi/kbQG50/m/UuhgU69OEJpRJPPCDxuGtmYPpBNLS6weC5rPrg3k8s5oBth 3Y2l45LLMeZqA4C5cffyXPbX5XhZkPIKJmmzxO96x38pZEgvj6W9KDsHsI85h8DGWO5+ 7jeYvF3fi+ipJRtMnjGmcy1fCqfQbTS3vPB0EghwTPNt+CLqb7XD7xbv16eBea0aUB6I mdtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746140574; x=1746745374; 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=WnkKvB1b+3d0EeHxFwXj6FOWV545S5FRjaJFzkqSlRY=; b=MPVcIA6gVeJdxTL+cFuifI/5HCxn1Fs5Vg5ugGiJm2UYysulcfCIjIlOXST/5ih7Tw 6HoXBC0xPVcZ0uHMyK1ufEp8gXeN/XvYoKOYxjkH5r7i4RZv4mWZw43DCpfV8yZq6D8f 6IWgLTtmgTnslv1DtTvg2lClCpBtJrzqfTbk05ubI531ezmZM1dRmuYjmbGWkyfLstnP 9uSciH9hTMOzGIT1TBcW3C+iYGdrpXt9czAod1a6Bx68l1kQJYNNld3FCSBABH6k8LvJ 6iN5jJO/y7yHE4R3AB7a44cUtqxQOamfv08yCuIGsSIn6So6Hles7Yg/BUzjJTwilCLT iS2w== X-Gm-Message-State: AOJu0YxSXZcmHBepMQ8CuBr0+h+C/u0AR0NNemtvf6HWmTyj2EkW0xZt XgsIdSmf/irzMSuqQ6+jCKdqi8WFTH8UL13E2Cng5SLoDGMvCfciOiMlcY8fp5w8Uxr2vwHa08+ E X-Gm-Gg: ASbGncv90XXyOgoWJcpSKC3CZWWk6yvGGXw/262s0nqgOtRtxjkQFVT9myTeZkKlutK 4bC2/og6TcAl4MNfS555zC0xz9mvNLj4fLCzBLL5A8B4UgvPWfHbR9/l+licEfw79oCGuPjr0Ll /ZReUHOXueVgI/158YDY57rCzjedhBWoNgc1sJRfSBn5149z+GL9RuuHia04IHOb+SVwAHBskCx TD49HZ8js0+1/KWffQO3nlfy6U5C/w1PVtmK5lZzVNh4TpLgF4UPM8pXEqNS8A92DJdeCQVNVxd zAC1CSGru958AkHGJWva8GVpELGaKZaprzJ+QSUdonpsyjFGXw0g/gW4Y0AZQvBRg/AFEn82U7Q XaTE1wwIDREnwLx742An18U6dvGvxC1I= X-Received: by 2002:a05:6602:4743:b0:864:6a74:b56d with SMTP id ca18e2360f4ac-8669f9b6da2mr136803839f.5.1746140574195; Thu, 01 May 2025 16:02:54 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ca18e2360f4ac-864aa2f45adsm29354639f.18.2025.05.01.16.02.50 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 16:02:53 -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 09/10] hw/audio/hda-codec: Remove HDAAudioState::use_timer field Date: Fri, 2 May 2025 01:01:27 +0200 Message-ID: <20250501230129.2596-10-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::d30; envelope-from=philmd@linaro.org; helo=mail-io1-xd30.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The HDAAudioState::use_timer boolean was only set in the hw_compat_2_12[] array, via the 'use-timer=false' property. We removed all machines using that array, lets remove that property and all the code around it, like the compatibility callbacks. Signed-off-by: Philippe Mathieu-Daudé --- hw/audio/hda-codec.c | 91 +++++++------------------------------------- 1 file changed, 13 insertions(+), 78 deletions(-) diff --git a/hw/audio/hda-codec.c b/hw/audio/hda-codec.c index 66edad280f2..92e1fe65827 100644 --- a/hw/audio/hda-codec.c +++ b/hw/audio/hda-codec.c @@ -187,7 +187,6 @@ struct HDAAudioState { /* properties */ uint32_t debug; bool mixer; - bool use_timer; }; static inline uint32_t hda_bytes_per_second(HDAAudioStream *st) @@ -366,58 +365,6 @@ static void hda_audio_output_cb(void *opaque, int avail) hda_timer_sync_adjust(st, (wpos - rpos) - (B_SIZE >> 1)); } -static void hda_audio_compat_input_cb(void *opaque, int avail) -{ - HDAAudioStream *st = opaque; - int recv = 0; - int len; - bool rc; - - while (avail - recv >= sizeof(st->compat_buf)) { - if (st->compat_bpos != sizeof(st->compat_buf)) { - len = AUD_read(st->voice.in, st->compat_buf + st->compat_bpos, - sizeof(st->compat_buf) - st->compat_bpos); - st->compat_bpos += len; - recv += len; - if (st->compat_bpos != sizeof(st->compat_buf)) { - break; - } - } - rc = hda_codec_xfer(&st->state->hda, st->stream, false, - st->compat_buf, sizeof(st->compat_buf)); - if (!rc) { - break; - } - st->compat_bpos = 0; - } -} - -static void hda_audio_compat_output_cb(void *opaque, int avail) -{ - HDAAudioStream *st = opaque; - int sent = 0; - int len; - bool rc; - - while (avail - sent >= sizeof(st->compat_buf)) { - if (st->compat_bpos == sizeof(st->compat_buf)) { - rc = hda_codec_xfer(&st->state->hda, st->stream, true, - st->compat_buf, sizeof(st->compat_buf)); - if (!rc) { - break; - } - st->compat_bpos = 0; - } - len = AUD_write(st->voice.out, st->compat_buf + st->compat_bpos, - sizeof(st->compat_buf) - st->compat_bpos); - st->compat_bpos += len; - sent += len; - if (st->compat_bpos != sizeof(st->compat_buf)) { - break; - } - } -} - static void hda_audio_set_running(HDAAudioStream *st, bool running) { if (st->node == NULL) { @@ -428,16 +375,14 @@ static void hda_audio_set_running(HDAAudioStream *st, bool running) } st->running = running; trace_hda_audio_running(st->node->name, st->stream, st->running); - if (st->state->use_timer) { - if (running) { - int64_t now = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); - st->rpos = 0; - st->wpos = 0; - st->buft_start = now; - timer_mod_anticipate_ns(st->buft, now + HDA_TIMER_TICKS); - } else { - timer_del(st->buft); - } + if (running) { + int64_t now = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); + st->rpos = 0; + st->wpos = 0; + st->buft_start = now; + timer_mod_anticipate_ns(st->buft, now + HDA_TIMER_TICKS); + } else { + timer_del(st->buft); } if (st->output) { AUD_set_active_out(st->voice.out, st->running); @@ -474,7 +419,6 @@ static void hda_audio_set_amp(HDAAudioStream *st) static void hda_audio_setup(HDAAudioStream *st) { - bool use_timer = st->state->use_timer; audio_callback_fn cb; if (st->node == NULL) { @@ -485,21 +429,13 @@ static void hda_audio_setup(HDAAudioStream *st) fmt2name[st->as.fmt], st->as.freq); if (st->output) { - if (use_timer) { - cb = hda_audio_output_cb; - timer_del(st->buft); - } else { - cb = hda_audio_compat_output_cb; - } + cb = hda_audio_output_cb; + timer_del(st->buft); st->voice.out = AUD_open_out(&st->state->card, st->voice.out, st->node->name, st, cb, &st->as); } else { - if (use_timer) { - cb = hda_audio_input_cb; - timer_del(st->buft); - } else { - cb = hda_audio_compat_input_cb; - } + cb = hda_audio_input_cb; + timer_del(st->buft); st->voice.in = AUD_open_in(&st->state->card, st->voice.in, st->node->name, st, cb, &st->as); } @@ -805,7 +741,7 @@ static void hda_audio_reset(DeviceState *dev) static bool vmstate_hda_audio_stream_buf_needed(void *opaque) { HDAAudioStream *st = opaque; - return st->state && st->state->use_timer; + return st->state; } static const VMStateDescription vmstate_hda_audio_stream_buf = { @@ -861,7 +797,6 @@ static const Property hda_audio_properties[] = { DEFINE_AUDIO_PROPERTIES(HDAAudioState, card), DEFINE_PROP_UINT32("debug", HDAAudioState, debug, 0), DEFINE_PROP_BOOL("mixer", HDAAudioState, mixer, true), - DEFINE_PROP_BOOL("use-timer", HDAAudioState, use_timer, true), }; static void hda_audio_init_output(HDACodecDevice *hda, Error **errp) From patchwork Thu May 1 23:01:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 886461 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp548514wrq; Thu, 1 May 2025 16:03:52 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUwcgbEukYLwj7HZd6xFA5J75g8gul8AWGceWTeRMrDjYAMziqFDJT59u1uKh3loleI+0lo3Q==@linaro.org X-Google-Smtp-Source: AGHT+IHuvb7fAkkzmWouQU/K2Z8YM9/2twgx8ow3t6HTXe6w+EZD4zwAzQrEfzeH1Xzux3vr8Ha9 X-Received: by 2002:a05:622a:4119:b0:476:b33f:6694 with SMTP id d75a77b69052e-48c31b1bf4cmr11665651cf.28.1746140632088; Thu, 01 May 2025 16:03:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746140632; cv=none; d=google.com; s=arc-20240605; b=ExHVtdGMyPtTnRrTmZ/r21oxwXvnUUNSBBbddtIfKgfKi/vPu1fYsWLxD21qdzGA7Q qCp7xsL5sTf1Lfr0O6at32fRrLIGkgvoZ4f94xUnoTfZHh266F+fcGcgD8/djXztqc0G ksCoMyaca1h898DEE6Q/Wq5PUOEbk3Y+Y9QN2E6mF8ibhilTuBYSuYEo87ruat8Q+DOW NPizBaDuh2yCx+52kQaYx6H09muUupXFB/vg+WrH+A7bqi+ILoLsTEaeFI2YFTV//nEU wmb9dzLHDATBkU2ysgsxU6dOehhiA91V9pUZDXxtuy0dXPVt+Iinu6NiAZ/Rz27IK++8 wAAw== 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=bxbj7/6jpfy/qwZ4ED6zTk/j6/a5zMwR5eVDDNTE+Aw=; fh=Je0Fu6WOva9CO7x05EmtzN8739OQv5Rr57VCUmCpFeg=; b=clduX9yNrP35Lz34g/BbaAqHaFQxMsK+NaoeuirJl4KyL5AQ7ivVXwKvcXPhvyOGs7 JwILlA2piZ8VBBUGifvx0IplTESfYoJYRf/a6S2vR9QRqUYADjga0AB3NJBHX46SgF4K YR8VYYU6NQuwlGuhgCCg6rbof/FEecQKx0REszpkCIqoKVakzRu6YmYkBPVpcc7mYiVq FepjB56Mpmlw3gTKe9Af7CDUnORnVnYGwebVHlZQRn2zb7vrAVGA6+EowQ5tIz+Oc6aK +ERDhuxEhZYVoNuXMf8PcGKEAt7XUPuW8hL5gZBD1Ws90r+SqblNSY7LhProwDlsXqJ/ dX9g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Lsp1AG9l; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-48b960cf8d7si16473621cf.128.2025.05.01.16.03.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 16:03:52 -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=Lsp1AG9l; 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 1uAcvz-0000yM-I9; Thu, 01 May 2025 19:03:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uAcvs-0000lQ-3a for qemu-devel@nongnu.org; Thu, 01 May 2025 19:03:08 -0400 Received: from mail-il1-x12e.google.com ([2607:f8b0:4864:20::12e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAcvo-0002SA-Ky for qemu-devel@nongnu.org; Thu, 01 May 2025 19:03:07 -0400 Received: by mail-il1-x12e.google.com with SMTP id e9e14a558f8ab-3d81768268dso12735185ab.3 for ; Thu, 01 May 2025 16:03:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746140583; x=1746745383; 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=bxbj7/6jpfy/qwZ4ED6zTk/j6/a5zMwR5eVDDNTE+Aw=; b=Lsp1AG9lDLZgHf6eAETrKJR0UGj/z18y6zKyRKj0S6rlJz/WA4zGXLeAOJswN0/Ml5 eL5vv2sLoK365D7od33wWYGCfmMc0XqLOLU26/z5tf4zrjW8LZAHHFv4g5XGheTujwjT BDBRtzkXkJqG1Vq2BYo0J0TrlULxSj7re/2JLuafklDdf5gIEfa52PSxP7EcXGPK5YjT atYo9nAM7wwXmrZTWWgp3cvaOEs6t8FLQ23xx79IOnzRNcnsaRGcAEPPdj2Y9pAryZqj 68VqAyXS72CDXURIapSpFj/ZKVTsawGhhS8K7qcSwoyft1YCbOWya4TiX7RFV8UISRBe L1Lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746140583; x=1746745383; 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=bxbj7/6jpfy/qwZ4ED6zTk/j6/a5zMwR5eVDDNTE+Aw=; b=Gkfkhu8ZdNoaIRWziogxkvqetX2bJI0+NptJH308Puj6zxm7B+XGok6CtNyhH5sBvP qNVLVP9HppL6a02iDT4IZ2cjFYWd2yQzsr2uDkqOb2A7Hw+39wgKu802mfib6U+IV7Dr CbF2vDsllchjXG+EZURe9VnakrrHJhAYaSPPAL3pIgFzyj7bzq4j7qEbNxUiAacd/8Am iqiL4ugLDd9l4DyhdRqLDex+XTxbsdKJDxUwUhPQILbhBvZngxaiL2QlQbUUiBFDVOZN 91C4V+QDAXOiSVz0OElkJu4WmnISsgi6g344ngJOe/qeA24oyILPCwMgkE49W3XvcX54 g6Ng== X-Gm-Message-State: AOJu0Yy+fL2nU5P6Ec+K1BuEPlsKz5Wh01V5WsHfyruTIJ95ggvpPHhM 7Me1+Dewf4AtmbfxfmwapJcR3tK0lLX2xx0Mul1fZhGuK+4JZRrwvvLATiT7vTssgWF8KPCgdZu p X-Gm-Gg: ASbGnctdQk9p+Mg3q1IaDebxF0KIzH3rDLHJLdlVZcbvZ63JHhEyALRlOwORU76t6fn 4R/OERvCzIYpDqTh9av+rfI1F6XseqlpDpNW2Eehb6GNwpaiUXC+uc5FUm4sgHH40KvKGqtfjzY ZyHSLR5AFZSwR5akpyUsE6WuSemETMW5o3sDq3e2iVePxI7xRNJVMte7K4+zwsQTcRRrWl3kyJ/ aBHFGIbyi4J7Xc6tu8XmM2RKfY0Hhz2OJgfb4zUyImSm7ft6sm+vfUu+N+3629q7yLkSIi1x9Ft KyWmRiS9Ga/ARg0+DHYZgRxiL7bWo6MAVc6348E6O9bZpC23WB14+ny2B2sTKvC8o1aBKqhUtnv X/t5ZNizw7lnv1Qn/dy5dMI1MtobUdww= X-Received: by 2002:a05:6e02:16ca:b0:3d6:d145:2ffb with SMTP id e9e14a558f8ab-3d97c2579fbmr10256185ab.21.1746140582938; Thu, 01 May 2025 16:03:02 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id e9e14a558f8ab-3d975e7d0d3sm3507565ab.28.2025.05.01.16.02.59 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 16:03:02 -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 10/10] hw/display/vga-pci: Do not expose the 'global-vmstate' property Date: Fri, 2 May 2025 01:01:28 +0200 Message-ID: <20250501230129.2596-11-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::12e; envelope-from=philmd@linaro.org; helo=mail-il1-x12e.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The "global-vmstate" property is 'false' by default, and was only set to 'true' in the hw_compat_2_12[] array. We removed all machines using that array. Stop exposing that property on the PCI devices. Signed-off-by: Philippe Mathieu-Daudé --- hw/display/cirrus_vga.c | 2 -- hw/display/qxl.c | 1 - hw/display/vga-pci.c | 1 - hw/display/vmware_vga.c | 2 -- 4 files changed, 6 deletions(-) diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c index ef08694626d..f9f704ab440 100644 --- a/hw/display/cirrus_vga.c +++ b/hw/display/cirrus_vga.c @@ -2987,8 +2987,6 @@ static const Property pci_vga_cirrus_properties[] = { cirrus_vga.vga.vram_size_mb, 4), DEFINE_PROP_BOOL("blitter", struct PCICirrusVGAState, cirrus_vga.enable_blitter, true), - DEFINE_PROP_BOOL("global-vmstate", struct PCICirrusVGAState, - cirrus_vga.vga.global_vmstate, false), }; static void cirrus_vga_class_init(ObjectClass *klass, const void *data) diff --git a/hw/display/qxl.c b/hw/display/qxl.c index 18f482ca7f7..32329a499d7 100644 --- a/hw/display/qxl.c +++ b/hw/display/qxl.c @@ -2495,7 +2495,6 @@ static const Property qxl_properties[] = { DEFINE_PROP_UINT16("max_outputs", PCIQXLDevice, max_outputs, 0), DEFINE_PROP_UINT32("xres", PCIQXLDevice, xres, 0), DEFINE_PROP_UINT32("yres", PCIQXLDevice, yres, 0), - DEFINE_PROP_BOOL("global-vmstate", PCIQXLDevice, vga.global_vmstate, false), }; static void qxl_pci_class_init(ObjectClass *klass, const void *data) diff --git a/hw/display/vga-pci.c b/hw/display/vga-pci.c index b81f7fd2d0f..562cf526db4 100644 --- a/hw/display/vga-pci.c +++ b/hw/display/vga-pci.c @@ -338,7 +338,6 @@ static const Property vga_pci_properties[] = { DEFINE_PROP_BIT("edid", PCIVGAState, flags, PCI_VGA_FLAG_ENABLE_EDID, true), DEFINE_EDID_PROPERTIES(PCIVGAState, edid_info), - DEFINE_PROP_BOOL("global-vmstate", PCIVGAState, vga.global_vmstate, false), }; static const Property secondary_pci_properties[] = { diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c index 544bb65320b..c43026bd9c5 100644 --- a/hw/display/vmware_vga.c +++ b/hw/display/vmware_vga.c @@ -1335,8 +1335,6 @@ static void pci_vmsvga_realize(PCIDevice *dev, Error **errp) static const Property vga_vmware_properties[] = { DEFINE_PROP_UINT32("vgamem_mb", struct pci_vmsvga_state_s, chip.vga.vram_size_mb, 16), - DEFINE_PROP_BOOL("global-vmstate", struct pci_vmsvga_state_s, - chip.vga.global_vmstate, false), }; static void vmsvga_class_init(ObjectClass *klass, const void *data)