Commit 1fb6752e authored Jun 08, 2018 by Eduardo Habkost

pc: Remove PC_COMPAT_2_12 from 3.0 machine-types

commit f548222c added PC_COMPAT_2_12 to the 3.0 PC machine-types.
I believe this happened during manual conflict resolution when
applying the patch.

Cc: Xiao Guangrong <xiaoguangrong@tencent.com>
Cc: Juan Quintela <quintela@redhat.com>
Fixes: f548222c
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20180608192940.19548-1-ehabkost@redhat.com>
Reviewed-by: Marcel <Apfelbaum&lt;marcel.apfelbaum@gmail.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>

parent 8f4202fb

hw/i386/pc_piix.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -430,7 +430,6 @@ static void pc_i440fx_3_0_machine_options(MachineClass *m)
		pc_i440fx_machine_options(m);
		m->alias = "pc";
		m->is_default = 1;
		SET_MACHINE_COMPAT(m, PC_COMPAT_2_12);
		}

		DEFINE_I440FX_MACHINE(v3_0, "pc-i440fx-3.0", NULL,

hw/i386/pc_q35.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -312,7 +312,6 @@ static void pc_q35_3_0_machine_options(MachineClass *m)
		{
		pc_q35_machine_options(m);
		m->alias = "q35";
		SET_MACHINE_COMPAT(m, PC_COMPAT_2_12);
		}

		DEFINE_Q35_MACHINE(v3_0, "pc-q35-3.0", NULL,