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 5568FC4345F for ; Thu, 2 May 2024 12:16:44 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s2VM7-0008UL-8O; Thu, 02 May 2024 08:16: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 1s2VM4-0008So-8u for qemu-devel@nongnu.org; Thu, 02 May 2024 08:16:04 -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 1s2VLu-0001RS-OM for qemu-devel@nongnu.org; Thu, 02 May 2024 08:16:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714652153; h=from:from:reply-to: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=dMYitP7Vq+BpFO1f6Ueqlnu4u7GGKKaZQULRhMdXP4o=; b=HUQd13iw7wtoxz/qv6NcLpW5/2Nv8svPgOw9U1roMq5wg3DGozB7m8+5xBfNavLyrEVQ03 LjDNYRisiCxUlvcqnAfUOd4zjBrYICHV4/VVwbWDO5nnZJOCLeD7gd71CxneecpoEpKu2+ 9GKXF80EW1FGpfGIBdttY+osNfsDn4U= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-43-JDDgPq6LMye7SwQfj6dGwA-1; Thu, 02 May 2024 08:15:50 -0400 X-MC-Unique: JDDgPq6LMye7SwQfj6dGwA-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A728B299E746; Thu, 2 May 2024 12:15:49 +0000 (UTC) Received: from redhat.com (unknown [10.42.28.138]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3F916492BC7; Thu, 2 May 2024 12:15:46 +0000 (UTC) Date: Thu, 2 May 2024 13:15:44 +0100 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: Thomas Huth Cc: qemu-devel@nongnu.org, Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Harsh Prateek Bora , Peter Maydell , Nicholas Piggin , Richard Henderson , Yanan Wang , =?utf-8?Q?C=C3=A9dric?= Le Goater , Halil Pasic , Laurent Vivier , qemu-arm@nongnu.org, Daniel Henrique Barboza , Eduardo Habkost , qemu-ppc@nongnu.org, David Gibson , Ilya Leoshkevich , Eric Farman , Christian Borntraeger , "Michael S. Tsirkin" , Paolo Bonzini , Marcel Apfelbaum , David Hildenbrand , qemu-s390x@nongnu.org Subject: Re: [PATCH 13/14] hw/i386: remove obsolete manual deprecation reason string of i440fx machines Message-ID: References: <20240501182759.2934195-1-berrange@redhat.com> <20240501182759.2934195-14-berrange@redhat.com> <500cec2c-a598-4185-b275-a1435a848c88@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <500cec2c-a598-4185-b275-a1435a848c88@redhat.com> User-Agent: Mutt/2.2.12 (2023-09-09) X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@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.476, 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_H4=0.001, RCVD_IN_MSPIKE_WL=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: , Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= 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, May 02, 2024 at 02:08:58PM +0200, Thomas Huth wrote: > On 01/05/2024 20.27, Daniel P. Berrangé wrote: > > The automatic deprecation mechanism introduced in the preceeding patches > > will mark every i440fx machine upto and including 2.12 as deprecated. As > > such we can revert the manually added deprecation which was a subset: > > > > commit c7437f0ddb8ee45bf96d949ddfcbb7697ae3d415 > > Author: Thomas Huth > > Date: Fri Oct 6 09:52:47 2023 +0200 > > > > docs/about: Mark the old pc-i440fx-2.0 - 2.3 machine types as deprecated > > > > Signed-off-by: Daniel P. Berrangé > > --- > > hw/i386/pc_piix.c | 1 - > > 1 file changed, 1 deletion(-) > > > > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > > index 9f92504cc4..4137e03f6f 100644 > > --- a/hw/i386/pc_piix.c > > +++ b/hw/i386/pc_piix.c > > @@ -812,7 +812,6 @@ static void pc_i440fx_machine_2_3_options(MachineClass *m) > > { > > pc_i440fx_machine_2_4_options(m); > > m->hw_version = "2.3.0"; > > - m->deprecation_reason = "old and unattended - use a newer version instead"; > > compat_props_add(m->compat_props, hw_compat_2_3, hw_compat_2_3_len); > > compat_props_add(m->compat_props, pc_compat_2_3, pc_compat_2_3_len); > > } > > This will conflict with Philippe's "hw/i386: Remove deprecated pc-i440fx-2.0 > -> 2.3 machines" patch series (which should easy to resolve, though). Yep, there are a few places in my series which will conflict with that. I've just looked at Philippe's code and everything has at least one R-b. I had a minor comment but I could address that in this series. IOW, ideally we could merge Philippe's series now, to reduce code in flight touching the same areas. > Anyway: > Reviewed-by: Thomas Huth > With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|