From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3B070C3ABC3 for ; Tue, 13 May 2025 08:54:19 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uElOE-0003Pd-1z; Tue, 13 May 2025 04:53:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uElOC-0003Ow-Ir for qemu-devel@nongnu.org; Tue, 13 May 2025 04:53:28 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uElO9-00087Y-NQ for qemu-devel@nongnu.org; Tue, 13 May 2025 04:53:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1747126404; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1c399StXOuA/U3cRc3qzs9RfJEJILu72MXX9iqzRvVo=; b=Y89BE2m80EVNer7QwZH4/fKvGWkxVuJa5by4JycGhEPU7kOLMxg9Ypxx8pxf/FbtwOJPt3 JEfcxpf9qeAvGt5nqUslby8aLCugkpEOMKGwSW97c2vjZe/qPkYqeGTyCjggWSSGstJ8CI Dat/zbb2wlaN+Q/4CGiceyYnE3nWzhA= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-635-bspn2_CDO72a_67kriuvqQ-1; Tue, 13 May 2025 04:53:22 -0400 X-MC-Unique: bspn2_CDO72a_67kriuvqQ-1 X-Mimecast-MFC-AGG-ID: bspn2_CDO72a_67kriuvqQ_1747126402 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-43e9b0fd00cso26085545e9.0 for ; Tue, 13 May 2025 01:53:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747126401; x=1747731201; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1c399StXOuA/U3cRc3qzs9RfJEJILu72MXX9iqzRvVo=; b=faDAII6qLATo8yXFhf44+yqW6G/2BvUShiYZ/an9pRhi7ZBlEUDwznEU7Ye9gILQhC gCTohrjGv08wOP8SMFD001FN9RfnnCGiUvpqgL2nrNthx12ejMMATMrG/v4oen1aK1XF 2qGr3/uRY0VK521yJNW795Hih+0QdwBJXiN30weorwgr7FcEOPx9FBH+57ezHZqX0UsF xJIaclZHKPwkY45J5gHZSopzkZsKpb97EJUeSQlu6TQhSzhCSv7y0NHhBuMe5Yu0SmQs V0cC0Ly1VzjW+ZvU6Kxo4AA71R1KUew8q8wL1rtishQQtyEzj4A0yvxIFQ01/bEIFgzX BPfw== X-Gm-Message-State: AOJu0YwsWGLOYtTk54hGz+wNZTEFn9ETyTOg2PxIllA+4i/mvbZl+La9 HhafGZFY2ql9WvW2e1FZJNh7KPff1PY2XMV/KevZNLrugR5zhax1ZP6BBuGEQ8/yvVdEwzlZc5K Xc0pFFwS4h64OVn5PRlyoivZb5gZOtdYGxDcdbV0I/n/8vDyCASXc X-Gm-Gg: ASbGncsWeKPgDoVJZYeuYWWeVZb/y3ZJrubwGbRhsqrrOnG0Jcmo2WE7V2SX1uSdiDn /XWvulvdW0GmEmANSoo09ROR88gnx6Iz4Z/mDIP5LKco5dtnks5hw67Dk/LTrJJeKkk6VBuHmqA vxtyWkh27ubtcb17NEIUMJwPGY2julsl+cRNF8uwhBsnQfnIlG1m+FSswFOCjLrOir/yUNXFj5U LRpdFroioQEziKreATz5FatW5LaxQKuUa1SMv3ySuAATDansmgzoSdt9GqshAtKcCBiV0T/pq0Y nyzcW5T6OPwIlkGn1ZWS1DQOMIR33Q52 X-Received: by 2002:a05:600c:3148:b0:440:6a68:826a with SMTP id 5b1f17b1804b1-442eace91cemr25179575e9.13.1747126401653; Tue, 13 May 2025 01:53:21 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF549ifJeYTkxz/mvc+aA9gSenujAFnJKqtWZXl8rGu2VGPfZkDo5Kuof3IaWJiNGT8MFf/cQ== X-Received: by 2002:a05:600c:3148:b0:440:6a68:826a with SMTP id 5b1f17b1804b1-442eace91cemr25179245e9.13.1747126401294; Tue, 13 May 2025 01:53:21 -0700 (PDT) Received: from imammedo.users.ipa.redhat.com ([85.93.96.130]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442cd3aeccdsm198387905e9.32.2025.05.13.01.53.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 May 2025 01:53:20 -0700 (PDT) Date: Tue, 13 May 2025 10:53:17 +0200 From: Igor Mammedov To: Philippe =?UTF-8?B?TWF0aGlldS1EYXVkw6k=?= Cc: qemu-devel@nongnu.org, Richard Henderson , kvm@vger.kernel.org, Sergio Lopez , Gerd Hoffmann , Peter Maydell , Laurent Vivier , Jiaxun Yang , Yi Liu , "Michael S. Tsirkin" , Eduardo Habkost , Marcel Apfelbaum , Alistair Francis , Daniel Henrique Barboza , Marcelo Tosatti , qemu-riscv@nongnu.org, Weiwei Li , Amit Shah , Zhao Liu , Yanan Wang , Helge Deller , Palmer Dabbelt , Ani Sinha , Fabiano Rosas , Paolo Bonzini , Liu Zhiwei , =?UTF-8?B?Q2zDqW1lbnQ=?= Mathieu--Drif , qemu-arm@nongnu.org, =?UTF-8?B?TWFyYy1BbmRyw6k=?= Lureau , Huacai Chen , Jason Wang , Mark Cave-Ayland , Thomas Huth Subject: Re: [PATCH v4 17/27] hw/i386/pc: Remove deprecated pc-q35-2.7 and pc-i440fx-2.7 machines Message-ID: <20250513105317.0185bf3b@imammedo.users.ipa.redhat.com> In-Reply-To: <20250508133550.81391-18-philmd@linaro.org> References: <20250508133550.81391-1-philmd@linaro.org> <20250508133550.81391-18-philmd@linaro.org> X-Mailer: Claws Mail 4.3.1 (GTK 3.24.43; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=170.10.129.124; envelope-from=imammedo@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.551, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On Thu, 8 May 2025 15:35:40 +0200 Philippe Mathieu-Daud=C3=A9 wrote: > These machines has been supported for a period of more than 6 years. > According to our versioned machine support policy (see commit > ce80c4fa6ff "docs: document special exception for machine type > deprecation & removal") they can now be removed. Remove the qtest > in test-x86-cpuid-compat.c file. same comment as 1/27, I'd squash pc|hw_compat_2_7 removal in here other than that loos good to me, with above Reviewed-by: Igor Mammedov > Signed-off-by: Philippe Mathieu-Daud=C3=A9 > Reviewed-by: Mark Cave-Ayland > Reviewed-by: Thomas Huth > --- > hw/i386/pc_piix.c | 9 --------- > hw/i386/pc_q35.c | 10 ---------- > tests/qtest/test-x86-cpuid-compat.c | 11 ----------- > 3 files changed, 30 deletions(-) >=20 > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index 98a118fd4a0..98bd8d0e67b 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -755,15 +755,6 @@ static void pc_i440fx_machine_2_8_options(MachineCla= ss *m) > =20 > DEFINE_I440FX_MACHINE(2, 8); > =20 > -static void pc_i440fx_machine_2_7_options(MachineClass *m) > -{ > - pc_i440fx_machine_2_8_options(m); > - compat_props_add(m->compat_props, hw_compat_2_7, hw_compat_2_7_len); > - compat_props_add(m->compat_props, pc_compat_2_7, pc_compat_2_7_len); > -} > - > -DEFINE_I440FX_MACHINE(2, 7); > - > #ifdef CONFIG_ISAPC > static void isapc_machine_options(MachineClass *m) > { > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index b7ffb5f1216..a1f46cd8f03 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -648,13 +648,3 @@ static void pc_q35_machine_2_8_options(MachineClass = *m) > } > =20 > DEFINE_Q35_MACHINE(2, 8); > - > -static void pc_q35_machine_2_7_options(MachineClass *m) > -{ > - pc_q35_machine_2_8_options(m); > - m->max_cpus =3D 255; > - compat_props_add(m->compat_props, hw_compat_2_7, hw_compat_2_7_len); > - compat_props_add(m->compat_props, pc_compat_2_7, pc_compat_2_7_len); > -} > - > -DEFINE_Q35_MACHINE(2, 7); > diff --git a/tests/qtest/test-x86-cpuid-compat.c b/tests/qtest/test-x86-c= puid-compat.c > index 456e2af6657..5e0547e81b7 100644 > --- a/tests/qtest/test-x86-cpuid-compat.c > +++ b/tests/qtest/test-x86-cpuid-compat.c > @@ -345,17 +345,6 @@ int main(int argc, char **argv) > =20 > /* Check compatibility of old machine-types that didn't > * auto-increase level/xlevel/xlevel2: */ > - if (qtest_has_machine("pc-i440fx-2.7")) { > - add_cpuid_test("x86/cpuid/auto-level/pc-2.7", > - "486", "arat=3Don,avx512vbmi=3Don,xsaveopt=3Don", > - "pc-i440fx-2.7", "level", 1); > - add_cpuid_test("x86/cpuid/auto-xlevel/pc-2.7", > - "486", "3dnow=3Don,sse4a=3Don,invtsc=3Don,npt=3Do= n,svm=3Don", > - "pc-i440fx-2.7", "xlevel", 0); > - add_cpuid_test("x86/cpuid/auto-xlevel2/pc-2.7", > - "486", "xstore=3Don", "pc-i440fx-2.7", > - "xlevel2", 0); > - } > if (qtest_has_machine("pc-i440fx-2.9")) { > add_cpuid_test("x86/cpuid/auto-level7/pc-i440fx-2.9/off", > "Conroe", NULL, "pc-i440fx-2.9",