From patchwork Thu May 1 18:36:16 2025 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: 886352 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp463412wrq; Thu, 1 May 2025 11:38:15 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX5ybRvGcCj6+EG9mijnuv1E5QFJTWnymlnD+Sw1EOPJXezPOTQFDf9NUqSShtpg+NSijYHng==@linaro.org X-Google-Smtp-Source: AGHT+IEP94SkiRSLncbWw7OdRDPuFKWjDJJnZ4oRQZpQSD76GQKRsL6xiyVEorMiAzdjBGu97zpk X-Received: by 2002:a05:622a:302:b0:477:7007:7055 with SMTP id d75a77b69052e-48b20781035mr45103681cf.12.1746124694877; Thu, 01 May 2025 11:38:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746124694; cv=none; d=google.com; s=arc-20240605; b=PYNiLKU0GFrDQGYoydn6igfsUm1Hl3trwzqDA17EfcAgg1Llo0BjKABSU7XJQIWibb 2TEZmHCDsyhdUrBYKcp1iCDt44+PqB6/pNv7nKgBIG59f+UV5hf2jXnw+LDAItZU7R8t 79RcJAXlztLMpufJQqMuKggDBK5jNQjr40o+S+81x57VcsQYF/ukzADI4Dhe3KU4+wnh 6ffgnAgocLgR1CXPjwO/5LMmyyBY1g+r3AdplnA4Efs9+WV1S1G02OYSmeBh2F4WxO/B ldoevyPrlQoAQHhhCsdPhlBi415gyuapjieLoqO2uTsPwdxm8lENO4pz4nnJ1ljs/jZs FHGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=zXADTJwgYK4rQDoTBJwmSMh4WIgzI1vWgP1J7gzagsQ=; fh=hoe06aprcDnk5P3d0vwgQt6uC5al0E2l9mfTIGTxZjA=; b=iePbUImWXPZXzo8Ey35/Sr48hi+lFkJWFEvpo7tgYrTchBzGwmuDxjWxZmAYys6bTN tUtKRJqizvIEuBGLA/iz8MYjzugiHZqFUQLqbbe5oTYtO064zgAvQFDglXBGTafRKiQF KmNxm3gqsbm9Cv8jp3faCzAZmeRNoFUEcomPDzi1qBedOySHNu12OwQOHA1R0ZCkImzG GJVIW+JXcxLxfJHd7FMfLAHGc/Mh5lQrgkL/dlQBwuLMDbYXPNiA0PUWL/K7hKw2DAiI bpI+Unr2y/b5s7cFXUiWzdMv6DpwPQAq5kCs27ein8U2opkuLEE6Se8G+Hi007Q/Xu8B IsmA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=KdltTTsn; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-48b98d0fe43si11687911cf.480.2025.05.01.11.38.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 11:38:14 -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=KdltTTsn; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uAYnP-0000LF-Jh; Thu, 01 May 2025 14:38:08 -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 1uAYmY-0007Ug-9d for qemu-devel@nongnu.org; Thu, 01 May 2025 14:37:16 -0400 Received: from mail-il1-x12f.google.com ([2607:f8b0:4864:20::12f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAYmW-00082F-Ja for qemu-devel@nongnu.org; Thu, 01 May 2025 14:37:14 -0400 Received: by mail-il1-x12f.google.com with SMTP id e9e14a558f8ab-3d450154245so10673655ab.2 for ; Thu, 01 May 2025 11:37:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746124630; x=1746729430; 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=zXADTJwgYK4rQDoTBJwmSMh4WIgzI1vWgP1J7gzagsQ=; b=KdltTTsn3Ni/h/oQJaeelw3ESJW7W7A2+G9lR0c0TeVqnLBx6Uzj2CeqoXCI63kGmR /ha07fqZ6oxT9KwEruLWaQeoqJ8K1upqrbTCbAMosdgsU06BhCYJnDN0/0ZSxQOVD98t fkf0g7dyIzSaJ522vquZHoCJ579Vu2xCAKKJ+PEXXA2rzenzaaXaZnchap5E47x1wtyl lqa27/9ikY9XT4lgFNdWrKNnLQrCNtYBgioWmTtQOrZG4WDp9oTpChprpkg1kYvS0dLM P+4BqF3i/bd3+nDGyE66m+xyrLSM1y5n8ER9SzJksM0uaTGcdFLn9Px4bT+sWyA2pNbK 1n3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746124630; x=1746729430; 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=zXADTJwgYK4rQDoTBJwmSMh4WIgzI1vWgP1J7gzagsQ=; b=ZLRiZuLSC6eGSoXrGBfGR9YjA/u+/tJNRubgy9cx5/hPxN/1G6Mm733lQxhLEgkVuR 8RvPpwqFuyNIzXmQXIM2d4bLIu2uHvXv0BR+LixBRidXsgwcOHmSmJyf9aO0yAHUvFkH 2Y/qHgh1krvqHT5/oIDAh+IoMCSz2JH1cwniW4huo8SiaNsTsEzgkm8hkxaIx8EGzYAT bOZkwHRoP9Ji1u2sItXyOcaJIq9FfyVbm+K4R+vAoREMQrAfnzt392nhlGVlL9evR4Nw gl4DNFdrwottvLP0ER2uQXkHgRrjX2Flg+gRd1eAnF4AI2Kr/3Bm1qePbPDA2jC2DX2r +oiA== X-Gm-Message-State: AOJu0Yya2iA2/bAU+U+MBKszSfVI1iudPjz1Fh+/ewy/4oe+lT+fXqrg 0HvMbJisBnVd2PJuJtQvX2eUDG1d9uO/fIDiOC4xaM7fYG+twmbsCgSqVomq/Euau0U3KuDcZ7b 6 X-Gm-Gg: ASbGncuFt6/inla/p8QsBlnZzlvcOegjWaIg6GJXH6GaNrRsYkljPa+AHcJLM2yF5OF 6q0LQiUUGz82vM/0OhEDsz1EZjT3WOlKkldDNouG3BQEUvJG1PpjKPeSBuPsolJtT8MQ92OVG9h v9fwq2+kaAufXzlcEpi/KTwxT3lfxY+k2ccooN0cyp9WBbIRuimuF9cvxyQtoATajSTl2Ttq0Kb xd7Eu6OayDkN6x4XCGC9StVgzw3IWmGUq2PHt31ZI05xY7sESi8p5GU+7d/Y/5+H7cKDtg7410a llPZdP00MKpq3hSIrXMnhqoxUJkUdspWM4i/17GY+HeyUzLf4IWDIY0pVfyhFefE6f/I6VmFkCn CPBstnoJYnv1XiLEPZN3v X-Received: by 2002:a05:6e02:1f05:b0:3d8:1cba:1854 with SMTP id e9e14a558f8ab-3d970198c59mr55748625ab.1.1746124630482; Thu, 01 May 2025 11:37:10 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id e9e14a558f8ab-3d975e7808esm2526775ab.25.2025.05.01.11.37.06 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 11:37:10 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Igor Mammedov , Gerd Hoffmann , =?utf-8?q?Cl=C3=A9ment_Mathieu--Drif?= , Yi Liu , Paolo Bonzini , Amit Shah , Zhao Liu , "Michael S. Tsirkin" , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Richard Henderson , Sergio Lopez , Laurent Vivier , Jason Wang , Eduardo Habkost , Yanan Wang , Marcel Apfelbaum , Ani Sinha , Thomas Huth Subject: [PATCH v2 04/16] hw/i386/pc: Remove pc_compat_2_6[] array Date: Thu, 1 May 2025 20:36:16 +0200 Message-ID: <20250501183628.87479-5-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250501183628.87479-1-philmd@linaro.org> References: <20250501183628.87479-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::12f; envelope-from=philmd@linaro.org; helo=mail-il1-x12f.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=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_compat_2_6[] array was only used by the pc-q35-2.6 and pc-i440fx-2.6 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Mark Cave-Ayland Reviewed-by: Thomas Huth --- include/hw/i386/pc.h | 3 --- hw/i386/pc.c | 8 -------- 2 files changed, 11 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index a3de3e9560d..4fb2033bc54 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -292,9 +292,6 @@ extern const size_t pc_compat_2_8_len; extern GlobalProperty pc_compat_2_7[]; extern const size_t pc_compat_2_7_len; -extern GlobalProperty pc_compat_2_6[]; -extern const size_t pc_compat_2_6_len; - #define DEFINE_PC_MACHINE(suffix, namestr, initfn, optsfn) \ static void pc_machine_##suffix##_class_init(ObjectClass *oc, \ const void *data) \ diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 49632b69d29..7573b880905 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -251,14 +251,6 @@ GlobalProperty pc_compat_2_7[] = { }; const size_t pc_compat_2_7_len = G_N_ELEMENTS(pc_compat_2_7); -GlobalProperty pc_compat_2_6[] = { - { TYPE_X86_CPU, "cpuid-0xb", "off" }, - { "vmxnet3", "romfile", "" }, - { TYPE_X86_CPU, "fill-mtrr-mask", "off" }, - { "apic-common", "legacy-instance-id", "on", } -}; -const size_t pc_compat_2_6_len = G_N_ELEMENTS(pc_compat_2_6); - /* * @PC_FW_DATA: * Size of the chunk of memory at the top of RAM for the BIOS ACPI tables