* [Qemu-devel] [PATCH] pc: Remove PC_COMPAT_2_12 from 3.0 machine-types
@ 2018-06-08 19:29 Eduardo Habkost
2018-06-10 12:27 ` Marcel Apfelbaum
2018-06-11 2:51 ` Xiao Guangrong
0 siblings, 2 replies; 3+ messages in thread
From: Eduardo Habkost @ 2018-06-08 19:29 UTC (permalink / raw)
To: qemu-devel
Cc: Paolo Bonzini, Babu Moger, Eduardo Habkost, Marcel Apfelbaum,
Richard Henderson, Michael S. Tsirkin, Xiao Guangrong,
Juan Quintela
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: f548222c24342ca74689de7794f9006b43f86a54
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
hw/i386/pc_piix.c | 1 -
hw/i386/pc_q35.c | 1 -
2 files changed, 2 deletions(-)
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 3d81136065..b4c5b03274 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -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,
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index b60cbb9266..83d6d75efa 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -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,
--
2.18.0.rc1.1.g3f1ff2140
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH] pc: Remove PC_COMPAT_2_12 from 3.0 machine-types
2018-06-08 19:29 [Qemu-devel] [PATCH] pc: Remove PC_COMPAT_2_12 from 3.0 machine-types Eduardo Habkost
@ 2018-06-10 12:27 ` Marcel Apfelbaum
2018-06-11 2:51 ` Xiao Guangrong
1 sibling, 0 replies; 3+ messages in thread
From: Marcel Apfelbaum @ 2018-06-10 12:27 UTC (permalink / raw)
To: Eduardo Habkost, qemu-devel
Cc: Paolo Bonzini, Babu Moger, Richard Henderson, Michael S. Tsirkin,
Xiao Guangrong, Juan Quintela
On 06/08/2018 10:29 PM, Eduardo Habkost wrote:
> 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: f548222c24342ca74689de7794f9006b43f86a54
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> ---
> hw/i386/pc_piix.c | 1 -
> hw/i386/pc_q35.c | 1 -
> 2 files changed, 2 deletions(-)
>
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index 3d81136065..b4c5b03274 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -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,
> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
> index b60cbb9266..83d6d75efa 100644
> --- a/hw/i386/pc_q35.c
> +++ b/hw/i386/pc_q35.c
> @@ -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,
Reviewed-by: Marcel Apfelbaum<marcel.apfelbaum@gmail.com>
Thanks,
Marcel
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH] pc: Remove PC_COMPAT_2_12 from 3.0 machine-types
2018-06-08 19:29 [Qemu-devel] [PATCH] pc: Remove PC_COMPAT_2_12 from 3.0 machine-types Eduardo Habkost
2018-06-10 12:27 ` Marcel Apfelbaum
@ 2018-06-11 2:51 ` Xiao Guangrong
1 sibling, 0 replies; 3+ messages in thread
From: Xiao Guangrong @ 2018-06-11 2:51 UTC (permalink / raw)
To: Eduardo Habkost, qemu-devel
Cc: Michael S. Tsirkin, Juan Quintela, Xiao Guangrong, Babu Moger,
Paolo Bonzini, Richard Henderson
On 06/09/2018 03:29 AM, Eduardo Habkost wrote:
> 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.
>
Indeed!
Reviewed-by: Xiao Guangrong <xiaoguangrong@tencent.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-06-11 2:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-06-08 19:29 [Qemu-devel] [PATCH] pc: Remove PC_COMPAT_2_12 from 3.0 machine-types Eduardo Habkost
2018-06-10 12:27 ` Marcel Apfelbaum
2018-06-11 2:51 ` Xiao Guangrong
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).