From patchwork Wed May 29 05:15:18 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: 799823 Delivered-To: patch@linaro.org Received: by 2002:adf:e110:0:b0:35b:5a80:51b4 with SMTP id t16csp567530wrz; Tue, 28 May 2024 22:19:39 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUde7Uc5pezjdtNh8gP795VGXdQnHHrU8GuYOe5KZWTDdMm0cJWFguSjzKQsDRh98HVF4F/ffiYo+IWwgJu1kTN X-Google-Smtp-Source: AGHT+IEaFV3vZd/yJ4EP9AeCFOT+q20Pq3EJUq/YW/wxRcMeWJ9Fxp3rryRxrgrjF/HeKuLgkxv0 X-Received: by 2002:ae9:e317:0:b0:794:c63e:385f with SMTP id af79cd13be357-794c63e3a04mr657543585a.12.1716959979471; Tue, 28 May 2024 22:19:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716959979; cv=none; d=google.com; s=arc-20160816; b=fh2PiW/UCph19KI6sRZNJLp78dnUkIZxQJCAudCTeXLTt54cDX/hnPiQ+OxSTjhpfY 4RVK1mwNBPUCqneWqWrT6SH0hknMwsOC5epD1BWwwky/uyPGUCzvB7v2llOaHtgXXkho CDLgMqdiaDaB4+9eEX2yZI5cm/D5H+hbYAZkHW4unP6jpR6AqrHHYZETv2SLr/cjDzpJ 3WO+81l8Q07z3WVlK6+z3EPlSaxB3/UjgSrwVgcV93e0m0c+r4huZtz0SHdqUqyJwP68 2rbFrppSFsO85mjydIpw/J08KQ83IYHJm36SHQHaNSjzfm4QZE3whoKV4I4Y2IJw1ioW MXsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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=G/SJFBZre/GEfWkNyTOjC9/qM0jdeQJ921Sth1mwl3A=; fh=oSujGHGU6kAtfrTPSJ+sLUg/jC0/xSWRKBD061WPWBw=; b=SD52TtOhdBZD4cPRr7SJhKQLEb1kgHPzg0t3WtA8AwgRnIDVk9g05KNEvWKp3T7P9l HiINdPgQ5eUkcFh2vhfnETcbZv2zVRghlEQ42Babtagl822pYB/aq5Fmy+PjxtTHz4JM tu88qYB9JfuzHKPPAAmVtCrcSr8SPkTpB+m0MCQUoTAhdGa2xcbKTc2FinqS+/bxZ7QP RNHjvrnRS0/Dik8a6I3UMMc0CT+gDndLdSyb0ohuTf4YS0w9pwgNeAIyJswGncukwryY rV7q/sJckGtgnBNhI1OJvr4x2qiToF3rm2fvDP5Md7jEcAT/HHDIU/6VQ0OVot0F7Wcr F+NA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=B9NkxfHM; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-794abd0b067si1169684585a.298.2024.05.28.22.19.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 May 2024 22:19:39 -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=B9NkxfHM; 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 Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sCBfM-0000JH-1O; Wed, 29 May 2024 01:16: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 1sCBfI-0000Ih-Qi for qemu-devel@nongnu.org; Wed, 29 May 2024 01:15:57 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sCBfG-0005P3-LQ for qemu-devel@nongnu.org; Wed, 29 May 2024 01:15:56 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-42108856c33so2343325e9.1 for ; Tue, 28 May 2024 22:15:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1716959753; x=1717564553; 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=G/SJFBZre/GEfWkNyTOjC9/qM0jdeQJ921Sth1mwl3A=; b=B9NkxfHMz3C/WGB5MvsriJmtn8NJLkLpUT/aK1UySyB6iV5SKeju60eoFp5N/yjUs0 ADgCQQK2leSV7jzgVuKiDHDSdCEDwyULjogsopGcJKF+gqntT68AFqtZrDMsxXOEOVbd cahUUDFinVVahJmZp9s7kn26tmCrnDsQ3S919qj9NBQHKXU1qGhhRWkP90m+QQ7M47od G9EXVK3lV+6SYgw1oYUY96pMT9AvSXrfnk6t5SA/tdq7DHnfov93S42CXLXB5Gav2Kmv Go1r6InABg5e4fFSGLgXFp5H/+rgMhYm5/3sndsjEamEl9uRLctoL2cDS7d1GcgV1ahk 98ag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716959753; x=1717564553; 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=G/SJFBZre/GEfWkNyTOjC9/qM0jdeQJ921Sth1mwl3A=; b=GwtkG88hP3GBsoh9KxA1rHotvXUfufiasoGDBtFD/1keVIoTukFDuiMJFbtmeSklSE vnSZ0m84gv9Y+KE8/aiyx8K1R9ozn/pF5p6JACqKAqWHVNqfnTiS51YXqNNSVVmc6+43 Z62ewa0hcaclTblXxKyqf1X0j1Mn/J7lnFi0mvk0215rp5+3mIufRkQbJM5+G0AxEppj pjfDE0bLjMxRyODeeL9OuMby8JVSDmReCJuwijQnGWCYpgCcIpkw92xaU7/ALeCN0P39 uWQKgVF0RL+EXRv9LgdITrIg+Qgs2iS1eC0BLWIlw/G6ojZkxVf2AgLai1Gn83ZLSOtW QrzA== X-Gm-Message-State: AOJu0YxBIG0aB4y91pNb+kMv4OrLp1AHU6885XPWqglWnvpA4IQNNPyc 5oPNTaChx7D9xTUxr3YYOwRxz3ggFSd93RVBGYTnKKdI34e7RzoVpbgDmAJvaeK2fhA6wvI9EVX Z X-Received: by 2002:adf:f6cd:0:b0:354:fce5:4cc3 with SMTP id ffacd0b85a97d-35c7a8477f9mr669026f8f.19.1716959752806; Tue, 28 May 2024 22:15:52 -0700 (PDT) Received: from m1x-phil.lan ([176.187.204.141]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3557a08aba8sm13590837f8f.42.2024.05.28.22.15.51 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 28 May 2024 22:15:52 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Paolo Bonzini , "Michael S. Tsirkin" , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , =?utf-8?q?Phi?= =?utf-8?q?lippe_Mathieu-Daud=C3=A9?= , Zhao Liu Subject: [PATCH v5 02/23] hw/i386/pc: Remove deprecated pc-i440fx-2.0 machine Date: Wed, 29 May 2024 07:15:18 +0200 Message-ID: <20240529051539.71210-3-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240529051539.71210-1-philmd@linaro.org> References: <20240529051539.71210-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.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, T_SCC_BODY_TEXT_LINE=-0.01 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 pc-i440fx-2.0 machine was deprecated for the 8.2 release (see commit c7437f0ddb "docs/about: Mark the old pc-i440fx-2.0 - 2.3 machine types as deprecated"), time to remove it. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Reviewed-by: Zhao Liu Reviewed-by: Igor Mammedov --- docs/about/deprecated.rst | 2 +- docs/about/removed-features.rst | 2 +- include/hw/i386/pc.h | 3 --- hw/i386/pc.c | 15 ------------- hw/i386/pc_piix.c | 37 --------------------------------- 5 files changed, 2 insertions(+), 57 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 7ff52bdd8e..629f6a1566 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -228,7 +228,7 @@ 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) and ``pc-i440fx-2.4`` up to ``pc-i440fx-2.12`` (since 9.1) +``pc-i440fx-2.1`` up to ``pc-i440fx-2.3`` (since 8.2) and ``pc-i440fx-2.4`` up to ``pc-i440fx-2.12`` (since 9.1) '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' These old machine types are quite neglected nowadays and thus might have diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst index fba0cfb0b0..5f0c2d8ec2 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -925,7 +925,7 @@ mips ``fulong2e`` machine alias (removed in 6.0) This machine has been renamed ``fuloong2e``. -``pc-0.10`` up to ``pc-i440fx-1.7`` (removed in 4.0 up to 8.2) +``pc-0.10`` up to ``pc-i440fx-2.0`` (removed in 4.0 up to 9.0) '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' These machine types were very old and likely could not be used for live diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index ad9c3d9ba8..7347636d47 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -290,9 +290,6 @@ extern const size_t pc_compat_2_2_len; extern GlobalProperty pc_compat_2_1[]; extern const size_t pc_compat_2_1_len; -extern GlobalProperty pc_compat_2_0[]; -extern const size_t pc_compat_2_0_len; - #define DEFINE_PC_MACHINE(suffix, namestr, initfn, optsfn) \ static void pc_machine_##suffix##_class_init(ObjectClass *oc, void *data) \ { \ diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 7b638da7aa..11182e09ce 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -319,21 +319,6 @@ GlobalProperty pc_compat_2_1[] = { }; const size_t pc_compat_2_1_len = G_N_ELEMENTS(pc_compat_2_1); -GlobalProperty pc_compat_2_0[] = { - PC_CPU_MODEL_IDS("2.0.0") - { "virtio-scsi-pci", "any_layout", "off" }, - { "PIIX4_PM", "memory-hotplug-support", "off" }, - { "apic", "version", "0x11" }, - { "nec-usb-xhci", "superspeed-ports-first", "off" }, - { "nec-usb-xhci", "force-pcie-endcap", "on" }, - { "pci-serial", "prog_if", "0" }, - { "pci-serial-2x", "prog_if", "0" }, - { "pci-serial-4x", "prog_if", "0" }, - { "virtio-net-pci", "guest_announce", "off" }, - { "ICH9-LPC", "memory-hotplug-support", "off" }, -}; -const size_t pc_compat_2_0_len = G_N_ELEMENTS(pc_compat_2_0); - GSIState *pc_gsi_create(qemu_irq **irqs, bool pci_enabled) { GSIState *s; diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 02878060d0..a750a0e6ab 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -441,11 +441,6 @@ static void pc_compat_2_1_fn(MachineState *machine) x86_cpu_change_kvm_default("svm", NULL); } -static void pc_compat_2_0_fn(MachineState *machine) -{ - pc_compat_2_1_fn(machine); -} - #ifdef CONFIG_ISAPC static void pc_init_isa(MachineState *machine) { @@ -887,38 +882,6 @@ static void pc_i440fx_2_1_machine_options(MachineClass *m) DEFINE_I440FX_MACHINE(v2_1, "pc-i440fx-2.1", pc_compat_2_1_fn, pc_i440fx_2_1_machine_options); -static void pc_i440fx_2_0_machine_options(MachineClass *m) -{ - PCMachineClass *pcmc = PC_MACHINE_CLASS(m); - - pc_i440fx_2_1_machine_options(m); - m->hw_version = "2.0.0"; - compat_props_add(m->compat_props, pc_compat_2_0, pc_compat_2_0_len); - pcmc->smbios_legacy_mode = true; - pcmc->has_reserved_memory = false; - /* This value depends on the actual DSDT and SSDT compiled into - * the source QEMU; unfortunately it depends on the binary and - * not on the machine type, so we cannot make pc-i440fx-1.7 work on - * both QEMU 1.7 and QEMU 2.0. - * - * Large variations cause migration to fail for more than one - * consecutive value of the "-smp" maxcpus option. - * - * For small variations of the kind caused by different iasl versions, - * the 4k rounding usually leaves slack. However, there could be still - * one or two values that break. For QEMU 1.7 and QEMU 2.0 the - * slack is only ~10 bytes before one "-smp maxcpus" value breaks! - * - * 6652 is valid for QEMU 2.0, the right value for pc-i440fx-1.7 on - * QEMU 1.7 it is 6414. For RHEL/CentOS 7.0 it is 6418. - */ - pcmc->legacy_acpi_table_size = 6652; - pcmc->acpi_data_size = 0x10000; -} - -DEFINE_I440FX_MACHINE(v2_0, "pc-i440fx-2.0", pc_compat_2_0_fn, - pc_i440fx_2_0_machine_options); - #ifdef CONFIG_ISAPC static void isapc_machine_options(MachineClass *m) {