From patchwork Tue Apr 16 13:52:30 2024 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: 1924170 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=o/IpkZpJ; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VJlwD2nLLz1yZ2 for ; Tue, 16 Apr 2024 23:57:16 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rwjFP-0001iM-7w; Tue, 16 Apr 2024 09:53:19 -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 1rwjFK-0001dd-DB for qemu-devel@nongnu.org; Tue, 16 Apr 2024 09:53:14 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rwjFC-0001Qo-E1 for qemu-devel@nongnu.org; Tue, 16 Apr 2024 09:53:10 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-4187981999fso10838945e9.1 for ; Tue, 16 Apr 2024 06:53:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1713275582; x=1713880382; 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=nlICCskRrlvRdkjV4msjzmW/coeNcYFuGhTikB5Lgzk=; b=o/IpkZpJqKB5oTYFYYEbkAeWjfYZ0Q6fN20552PfnQh7+1/a6Pp1XuNe2daYxzHphR ceBGs6LGXDexcMqSmSgcCADjX6ELovk8d7BFQHenImTfjBDGg789xPdGbK7exzdayK/k Z4D95DJ8ltTilihVVOEuXYe5uvQ+FHR3Y9RDu0XkTlyzkIrwkROG3KG3lzZpug1LSaEt FD3zTWV9Rw3Iy0VCRgIvjDuAV1BcHh0PSuL5qb5VN3KhL0Qb7Z7+m78f1ABj3TG2DdCj Fog2HDcIYhuSr1OMgR3QNt5Rw/EbY9TWCEAC+222vkgDQJ7GyCEgUNWq5l/gOPG7PYFL B++g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713275582; x=1713880382; 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=nlICCskRrlvRdkjV4msjzmW/coeNcYFuGhTikB5Lgzk=; b=SdxyjRQ/o6BsNtX/tRZ4rsNB2I5G2N30qAub3/b3FRYdc/S6Beuox6PBuM8uyKHN8u K3DB2/0BXJauHUkHiKvzEt45+avqwbiKouTLMWB3aFEO0XkIohfrKm1gHXgxhTCNNz2K UvUOn9Wm8Efk1iJse//nADf2KsGNYexxvBohukc7cT2kpSljC8QRLIlSncDXY3QIbg1F WdnvRulyYLb7CouK+PxbJiJXDUI5WbrW5nys3gcZ0Q7+ax9fwv3b33NHmLfwuY4WuFyL OHAw+hTuj//shSPGN2Xlp64fcXoKatU3jl59uSsQLNX/YeIU4pzP4vy7BIBLXifp2R2d BWWw== X-Gm-Message-State: AOJu0YxSTtnLvjlOgisDj/aAxnV+Q7vXZjgtEY99V4dey3zEjnupLPM3 PfqFHiuMv4aT/rabuz3do+dVoeVImKNpS9BmQvr3FPuDB3hQSf34l0SyGkXYJNgdU+zkaLNsDsf H X-Google-Smtp-Source: AGHT+IFLkAP+zDOnOOgoceMFenmSQbQE0pRL/TOiApOGPkF5clFU8nwmq7W/o1+WXm3e+kdzLTwyEA== X-Received: by 2002:a05:600c:3c87:b0:416:b91c:f310 with SMTP id bg7-20020a05600c3c8700b00416b91cf310mr9120012wmb.22.1713275581931; Tue, 16 Apr 2024 06:53:01 -0700 (PDT) Received: from m1x-phil.lan ([176.176.155.61]) by smtp.gmail.com with ESMTPSA id u24-20020a05600c00d800b004185be4baefsm1704968wmm.0.2024.04.16.06.53.00 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 16 Apr 2024 06:53:01 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Thomas Huth Cc: Ani Sinha , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, Zhao Liu , David Hildenbrand , Paolo Bonzini , Igor Mammedov , "Michael S. Tsirkin" , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , devel@lists.libvirt.org, Richard Henderson , Eduardo Habkost , Marcel Apfelbaum Subject: [PATCH v3 01/22] hw/i386/pc: Deprecate 2.4 to 2.7 pc-i440fx machines Date: Tue, 16 Apr 2024 15:52:30 +0200 Message-ID: <20240416135252.8384-2-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240416135252.8384-1-philmd@linaro.org> References: <20240416135252.8384-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=philmd@linaro.org; helo=mail-wm1-x335.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Similarly to the commit c7437f0ddb "docs/about: Mark the old pc-i440fx-2.0 - 2.3 machine types as deprecated", deprecate the 2.4 to 2.7 machines. Suggested-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Reviewed-by: Zhao Liu --- docs/about/deprecated.rst | 4 ++-- hw/i386/pc_piix.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 7b548519b5..967ee34267 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -219,8 +219,8 @@ deprecated; use the new name ``dtb-randomness`` instead. The new name better reflects the way this property affects all random data within the device tree blob, not just the ``kaslr-seed`` node. -``pc-i440fx-2.0`` up to ``pc-i440fx-2.3`` (since 8.2) -''''''''''''''''''''''''''''''''''''''''''''''''''''' +``pc-i440fx-2.0`` up to ``pc-i440fx-2.3`` (since 8.2) and ``pc-i440fx-2.4`` up to ``pc-i440fx-2.7`` (since 9.1) +''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' These old machine types are quite neglected nowadays and thus might have various pitfalls with regards to live migration. Use a newer machine type diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 18ba076609..ec9c299b06 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -778,6 +778,7 @@ DEFINE_I440FX_MACHINE(v2_8, "pc-i440fx-2.8", NULL, static void pc_i440fx_2_7_machine_options(MachineClass *m) { pc_i440fx_2_8_machine_options(m); + m->deprecation_reason = "old and unattended - use a newer version instead"; 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); } @@ -832,7 +833,6 @@ static void pc_i440fx_2_3_machine_options(MachineClass *m) { pc_i440fx_2_4_machine_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); }