From patchwork Tue Jun 18 15:59:24 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: 805218 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:144:b0:362:4979:7f74 with SMTP id r4csp271627wrx; Tue, 18 Jun 2024 09:04:06 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXsBqjNvdxWpMkkOQvNFraIQN9YlgWtaLP+Y3mZveW3DevxvICDNaW4FD3j83lHA8MYGtxIAUQi7PtjNI/0fGZ5 X-Google-Smtp-Source: AGHT+IFFN5Qlh9dg+aAHZZh3mLG1BFJB/HO99ckwjLvZVDe2u+L5Q0AQ6ml+tYVGV8XGooXZgF7d X-Received: by 2002:a67:f988:0:b0:48c:42ec:594e with SMTP id ada2fe7eead31-48f129f3a4dmr344263137.16.1718726645848; Tue, 18 Jun 2024 09:04:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718726645; cv=none; d=google.com; s=arc-20160816; b=hcj3HUqLJlYXzDkmjAS29YKJCf6MNfCNFLiTcO1cUhWhOjJLAtq8/qLSrGXE4yYFsN RL2NWEOCSyehGXPr7gG+NVmSH8+ng826Reupp1xw1bQi7B4YkZeEJThGHzY5ZygVR/qR 7pxh3Z4ED/a+OuZeWIMQ4NG6Ng7rxMHCqjXGKEL8Akce5LPBxIzyoYyY4/O9wa4H2FFv uOL3j29l0on2RfAPYGu3PRjsGzoKYBOpNBBU1YGMM1Ow6FY5br8G5K1+a4B5KAzcx51s 1E3mcbQGZIyCw4i5QvTSIMVy/9rOE13/CDI8l1UxQt4YhVnoSV5wfKa22JL2XZa13Gdz W8Fw== 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=b1NBIEWPGGFfeQf1+Y56Aq/tCcRuvL4FEsYlvleZBzo=; fh=QeIS5kb1Uh2g1z6dWJxoYMIPD1Pl4adL6YUWYeE5yJk=; b=Il+SGE2wrAOxI38a86dq3NfhRDOKjxaTqeXFH3FC9nhU2GaeP0IAZyGoaerPalYnpX wlZfy/7XtLZTxk8blEZUb8qgqFP8Ypfb0fXNjqP9SP4an6fXE7MqWOoNNjbRrmqsqwjX DCZjz/I6j8IFqe6+28lNN7zOIphHhu4zcBs/LUwyB4DWvCsbGbKcprxnijXfvlP3e48K hpo2W+eigoBhRH6f07rQVJ3UTSiVgeaC1MtmiRe9r8fPBxbXik8GkXhcEzGiAoo58qlH u7w/y9DZIz88U3k8AMLSzSX98QQvfPduS4efPxirmXKVXh/5uFLaXZaemSdnHXWp294S zWqA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qPvWL+Rl; 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 ada2fe7eead31-48da44a78a4si1911199137.560.2024.06.18.09.04.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 18 Jun 2024 09:04:05 -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=qPvWL+Rl; 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 1sJbGV-0003JF-DQ; Tue, 18 Jun 2024 12:00: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 1sJbGT-0003Io-NK for qemu-devel@nongnu.org; Tue, 18 Jun 2024 12:00:57 -0400 Received: from mail-ej1-x62e.google.com ([2a00:1450:4864:20::62e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sJbGR-0006jz-M2 for qemu-devel@nongnu.org; Tue, 18 Jun 2024 12:00:57 -0400 Received: by mail-ej1-x62e.google.com with SMTP id a640c23a62f3a-a6f0dc80ab9so868697966b.2 for ; Tue, 18 Jun 2024 09:00:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1718726454; x=1719331254; 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=b1NBIEWPGGFfeQf1+Y56Aq/tCcRuvL4FEsYlvleZBzo=; b=qPvWL+Rlez6PLk2jDuklMVFAc3TZ5Fyoey+QX5ueDMRyJ71lspAjFYeB1ei/KPz+ZU w6HL+02gMoqJqm4vFxgXzGlMcKk/xUS/G20oAoflmRdFzaNaMPax+EkQ3sK9v1y3EcdU 8YLOkp8FLX2Nl+M84mdKREcP8ozclHO1FiN7NyOOlzUBMGT2cwp3slygR/dscueRv2L3 RqHGztfDV6BR7kv8PNAsJpjVWzXn2F3R5pEVGiFqqxbtCosnZc2xSrkdpcrYN/giTRWs qw/N8+1hVwpphDtYhoX7yGymb9qkjoi3EyTSypDLjtRe3Jtc6tuIs6Vva/U8DiyxwozX 0BMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718726454; x=1719331254; 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=b1NBIEWPGGFfeQf1+Y56Aq/tCcRuvL4FEsYlvleZBzo=; b=jIDO/r0rNNA+IOh9P6YDEGMYmurFh4kT9vJ/p5uH7IQoRblfgbfivFCvD+xYJA8RSV 2UWK187CrJNLKOJ1zSBpPFSjX1n+bPlYAj0W9J2tfFQUR693S7q23xqWKsCyJ/oiHczo Cccp6rv4dr5myB4hwWLouGhD2Ayjr8p+eRwPO0Biw0jMJ4PsgECO+TEBNP58X8gcZKzP S4S6HDgHcHvatAnUNUhE7rCdhYTBpyRzv00QkLDwLwzx89aG8axOD9VQhb3BwTNZLcA3 KM7O1NDU//qdPoFii4XoU+tAV+COLJ9YNZLduEv6P8VB50kwwsRIrIvVwmXjuDDlXSw9 QiKg== X-Gm-Message-State: AOJu0YzUD5t0c6RdgiB9jUaC+j877RZRmK92iupCnjcInDl8Rjwh0MUH ifhr5UM2A9egjUc+wNhYqCs05M9nlZgmfiMRTzDJU8jdmhNyBX4jekQYfQ2Ex1/nh7SOZ12EoFp v X-Received: by 2002:a17:906:6889:b0:a6c:8b01:3f78 with SMTP id a640c23a62f3a-a6f60cf3871mr808114866b.9.1718726453561; Tue, 18 Jun 2024 09:00:53 -0700 (PDT) Received: from m1x-phil.lan ([176.187.212.55]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a6f56db61ebsm625236366b.56.2024.06.18.09.00.52 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 18 Jun 2024 09:00:53 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Thomas Huth , Zhao Liu , Igor Mammedov Subject: [PULL 02/76] hw/i386/pc: Remove deprecated pc-i440fx-2.0 machine Date: Tue, 18 Jun 2024 17:59:24 +0200 Message-ID: <20240618160039.36108-3-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240618160039.36108-1-philmd@linaro.org> References: <20240618160039.36108-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62e; envelope-from=philmd@linaro.org; helo=mail-ej1-x62e.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 Message-Id: <20240617071118.60464-3-philmd@linaro.org> --- 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 66a5f43626..e12eab1f72 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -212,7 +212,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 eaae82b8a5..f84bfaf2b6 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -948,7 +948,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 ca7904ac2c..3e606949fb 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -318,9 +318,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 0469af00a7..d0f2628d46 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -320,21 +320,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) {