motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-04 00:03:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

ppc/spapr: remove deprecated machine pseries-2.2

Browse source 
Commit 1392617d35 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 <clg@kaod.org>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Signed-off-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
This commit is contained in:
Harsh Prateek Bora 2024-10-14 17:57:18 +05:30 • committed by Nicholas Piggin
parent a6b7325305
commit 6e3d3578d7
3 changed files with 0 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

3
hw/core/machine.c
View file

@ -294,9 +294,6 @@ GlobalProperty hw_compat_2_3[] = {
}; };
const size_t hw_compat_2_3_len = G_N_ELEMENTS(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; MachineState *current_machine;
static char *machine_get_kernel(Object *obj, Error **errp) static char *machine_get_kernel(Object *obj, Error **errp)

17
hw/ppc/spapr.c
View file

@ -5364,23 +5364,6 @@ static void spapr_machine_2_3_class_options(MachineClass *mc)
} }
DEFINE_SPAPR_MACHINE(2, 3); 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) static void spapr_machine_register_types(void)
{ {
type_register_static(&spapr_machine_info); type_register_static(&spapr_machine_info);

3
include/hw/boards.h
View file

@ -825,7 +825,4 @@ extern const size_t hw_compat_2_4_len;
extern GlobalProperty hw_compat_2_3[]; extern GlobalProperty hw_compat_2_3[];
extern const size_t hw_compat_2_3_len; 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 #endif