mirror of
https://github.com/qemu/qemu.git
synced 2024-11-30 15:23:34 +08:00
ppc/spapr: remove deprecated machine pseries-2.1
Commit 1392617d35
intended to tag pseries-2.1 - 2.11 machines as
deprecated with reasons mentioned in its commit log.
Removing pseries-2.1 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:
parent
f10827a845
commit
a6b7325305
@ -297,17 +297,6 @@ 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);
|
||||
|
||||
GlobalProperty hw_compat_2_1[] = {
|
||||
{ "intel-hda", "old_msi_addr", "on" },
|
||||
{ "VGA", "qemu-extended-regs", "off" },
|
||||
{ "secondary-vga", "qemu-extended-regs", "off" },
|
||||
{ "virtio-scsi-pci", "any_layout", "off" },
|
||||
{ "usb-mouse", "usb_version", "1" },
|
||||
{ "usb-kbd", "usb_version", "1" },
|
||||
{ "virtio-pci", "virtio-pci-bus-master-bug-migration", "on" },
|
||||
};
|
||||
const size_t hw_compat_2_1_len = G_N_ELEMENTS(hw_compat_2_1);
|
||||
|
||||
MachineState *current_machine;
|
||||
|
||||
static char *machine_get_kernel(Object *obj, Error **errp)
|
||||
|
@ -5381,17 +5381,6 @@ static void spapr_machine_2_2_class_options(MachineClass *mc)
|
||||
}
|
||||
DEFINE_SPAPR_MACHINE(2, 2);
|
||||
|
||||
/*
|
||||
* pseries-2.1
|
||||
*/
|
||||
|
||||
static void spapr_machine_2_1_class_options(MachineClass *mc)
|
||||
{
|
||||
spapr_machine_2_2_class_options(mc);
|
||||
compat_props_add(mc->compat_props, hw_compat_2_1, hw_compat_2_1_len);
|
||||
}
|
||||
DEFINE_SPAPR_MACHINE(2, 1);
|
||||
|
||||
static void spapr_machine_register_types(void)
|
||||
{
|
||||
type_register_static(&spapr_machine_info);
|
||||
|
@ -828,7 +828,4 @@ extern const size_t hw_compat_2_3_len;
|
||||
extern GlobalProperty hw_compat_2_2[];
|
||||
extern const size_t hw_compat_2_2_len;
|
||||
|
||||
extern GlobalProperty hw_compat_2_1[];
|
||||
extern const size_t hw_compat_2_1_len;
|
||||
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user