From nobody Sat Nov 23 22:21:38 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1730679844; cv=none; d=zohomail.com; s=zohoarc; b=aUJ+/kmOGIu0wkN3xjj7mv+a2GlGEHm6FfB1e3WO6ST5I2cMu1lCKMuvLKDECBs6fgP4sxea7sHUCQBXE/1fRBl3SEkdGSx92rqva+4jM4MJgLMhWxbIAfrZaABWaVXLhn1qqliy0W4GIcOC8f27o4Z1smpp4t1VUy37DdvJutI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1730679844; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=j+nbBw6IEzhuLF9byaPUKaUWorh3MYy1TUvwqOA4xVw=; b=ZERy4a+oJkefQJevi7uvjWjo0SaxMHHPBNRrRZxTTIYq2rrrtdun2960iznl+7zQRpkPuYqwahlW95AUUEqekxyPg1fDBMT/Dii8yc8u37Uswaxvau8KB1p8W7aXtdP8K6hYpKn2g66R5syVbIPqtHsGbDB4GvCAljQcNXkKueA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1730679844504490.3491498614118; Sun, 3 Nov 2024 16:24:04 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t7kps-00009i-Jj; Sun, 03 Nov 2024 19:20:48 -0500 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 1t7kpg-0007zs-Le; Sun, 03 Nov 2024 19:20:38 -0500 Received: from mail-pf1-x42e.google.com ([2607:f8b0:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t7kpf-0002cJ-3V; Sun, 03 Nov 2024 19:20:36 -0500 Received: by mail-pf1-x42e.google.com with SMTP id d2e1a72fcca58-71e49ad46b1so3058862b3a.1; Sun, 03 Nov 2024 16:20:33 -0800 (PST) Received: from wheely.local0.net (124-171-217-17.tpgi.com.au. [124.171.217.17]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-7ee45a0081esm5900648a12.59.2024.11.03.16.20.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Nov 2024 16:20:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730679631; x=1731284431; 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=j+nbBw6IEzhuLF9byaPUKaUWorh3MYy1TUvwqOA4xVw=; b=mWmVoARdy4Bd+nC491ymaRJfPZ8u5chMFO3x8F4QdaQkkvnL+/uGSsopKyOMxKVT6v hn9OL1LTCphNOHlygocfhNI3gAzjfE8cWSkUcdWHZOmAkkviAc7dLwAinkM8GM6eArt6 U5AATe7xlWQstLjvDFnQHpcN/CkvBFYlb0Dyoi74SYEQoPBsBq0E7UypwWBmTiQdgRGd Ox6GjxKHbvZjFqog/H84EOxfgd7W/PayCPrt4tVTIfmDm+kes2cF1qfbUlq/JlltEk2o deVAyoG8tHUf9XtxZxD3rVSPO6Cl1eGaq2/Y7Pn7lUGsSa6aZAFzV/f80NSVlGDvctPH nJ0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730679631; x=1731284431; 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=j+nbBw6IEzhuLF9byaPUKaUWorh3MYy1TUvwqOA4xVw=; b=UgrxyVUauFeivyJU1aCn6CuTkMOqFxLLMWghdWpZ0lvDMAXc5YjQnm2Q/jWpjC1QOu tzuFgdleE8oOPN/c7A+MVbfpmnryO2ZoZJHXvdu6T7GFC6vLpGGKwF10XPZx/T9GUAlO uhYOxiv8DJtrZs18H85o1/KMgi4QsIpA/D8eHtWEK2UmbObE0Qb4U6Ofz+XWQLNhWrWJ wFQhzxfuO1LjD0uc0GLODaRqo3wZquUZkfX09TTnENNwyTfz7BJo5eHcU53ETGPD88wO 6sA+TqK6L0PKdNc7BuxEbMhA+222u95fA35vVQ2K6WFeqOfw9js1fCVP5YXvTbIBSU+k j7pg== X-Forwarded-Encrypted: i=1; AJvYcCVd25/oO66QQuFWGB2HR3/rNO1hcGAtALelnhOwVLU47Zbnc8/BIoA+7uxwAVYJKgqCnueysDorNw==@nongnu.org X-Gm-Message-State: AOJu0YzX3nTvIY0+sceXFR4VRsbKFUgULVG3gVgtILXELPz4sm+WDq3p 4FeaHxTsPtR3CI8F5zv+OiUrDn/5aWCnU46/3vF6KidRPCBHrwjpz+Z1kg== X-Google-Smtp-Source: AGHT+IF0IrfYEcc7C9u1QyVrx5rZaetztgbR9RuhEa/FNrBK2JiMEuehaZlu2xK8t9xuzfrOLG67MA== X-Received: by 2002:a05:6a20:d98:b0:1cf:44bb:1cc4 with SMTP id adf61e73a8af0-1d9a851d257mr43219843637.40.1730679631496; Sun, 03 Nov 2024 16:20:31 -0800 (PST) From: Nicholas Piggin To: qemu-devel@nongnu.org Cc: Nicholas Piggin , qemu-ppc@nongnu.org, Harsh Prateek Bora , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Subject: [PULL 22/67] ppc/spapr: remove deprecated machine pseries-2.6 Date: Mon, 4 Nov 2024 10:18:11 +1000 Message-ID: <20241104001900.682660-23-npiggin@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241104001900.682660-1-npiggin@gmail.com> References: <20241104001900.682660-1-npiggin@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::42e; envelope-from=npiggin@gmail.com; helo=mail-pf1-x42e.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, FREEMAIL_FROM=0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1730679845690116600 From: Harsh Prateek Bora Commit 1392617d3576 intended to tag pseries-2.1 - 2.11 machines as deprecated with reasons mentioned in its commit log. Removing pseries-2.6 specific code with this patch for now. Suggested-by: C=C3=A9dric Le Goater Reviewed-by: C=C3=A9dric Le Goater Signed-off-by: Harsh Prateek Bora Signed-off-by: Nicholas Piggin --- hw/ppc/spapr.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index f63843d107..a9c988b8f6 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -5278,24 +5278,6 @@ static void spapr_machine_2_7_class_options(MachineC= lass *mc) =20 DEFINE_SPAPR_MACHINE(2, 7); =20 -/* - * pseries-2.6 - */ - -static void spapr_machine_2_6_class_options(MachineClass *mc) -{ - static GlobalProperty compat[] =3D { - { TYPE_SPAPR_PCI_HOST_BRIDGE, "ddw", "off" }, - }; - - spapr_machine_2_7_class_options(mc); - mc->has_hotpluggable_cpus =3D false; - compat_props_add(mc->compat_props, hw_compat_2_6, hw_compat_2_6_len); - compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat)); -} - -DEFINE_SPAPR_MACHINE(2, 6); - static void spapr_machine_register_types(void) { type_register_static(&spapr_machine_info); --=20 2.45.2