From 6e3d3578d7734d4a80d2d0342e588b23245d7253 Mon Sep 17 00:00:00 2001 From: Harsh Prateek Bora Date: Mon, 14 Oct 2024 17:57:18 +0530 Subject: [PATCH] ppc/spapr: remove deprecated machine pseries-2.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit 1392617d3576 intended to tag pseries-2.1 - 2.11 machines as deprecated with reasons mentioned in its commit log. Removing pseries-2.2 specific code with this patch for now. Suggested-by: Cédric Le Goater Reviewed-by: Cédric Le Goater Signed-off-by: Harsh Prateek Bora Signed-off-by: Nicholas Piggin --- hw/core/machine.c | 3 --- hw/ppc/spapr.c | 17 ----------------- include/hw/boards.h | 3 --- 3 files changed, 23 deletions(-) diff --git a/hw/core/machine.c b/hw/core/machine.c index a41d1dbe26..2bbfcd1ede 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -294,9 +294,6 @@ GlobalProperty hw_compat_2_3[] = { }; const size_t hw_compat_2_3_len = G_N_ELEMENTS(hw_compat_2_3); -GlobalProperty hw_compat_2_2[] = {}; -const size_t hw_compat_2_2_len = G_N_ELEMENTS(hw_compat_2_2); - MachineState *current_machine; static char *machine_get_kernel(Object *obj, Error **errp) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index e9518ff8b3..34d655d0b3 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -5364,23 +5364,6 @@ static void spapr_machine_2_3_class_options(MachineClass *mc) } DEFINE_SPAPR_MACHINE(2, 3); -/* - * pseries-2.2 - */ - -static void spapr_machine_2_2_class_options(MachineClass *mc) -{ - static GlobalProperty compat[] = { - { TYPE_SPAPR_PCI_HOST_BRIDGE, "mem_win_size", "0x20000000" }, - }; - - spapr_machine_2_3_class_options(mc); - compat_props_add(mc->compat_props, hw_compat_2_2, hw_compat_2_2_len); - compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat)); - mc->default_machine_opts = "modern-hotplug-events=off,suppress-vmdesc=on"; -} -DEFINE_SPAPR_MACHINE(2, 2); - static void spapr_machine_register_types(void) { type_register_static(&spapr_machine_info); diff --git a/include/hw/boards.h b/include/hw/boards.h index 44d19e1ffc..7e849bb30d 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -825,7 +825,4 @@ extern const size_t hw_compat_2_4_len; extern GlobalProperty hw_compat_2_3[]; extern const size_t hw_compat_2_3_len; -extern GlobalProperty hw_compat_2_2[]; -extern const size_t hw_compat_2_2_len; - #endif