[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v3 1/2] pc: add 2.11 machine type
From: |
Eduardo Habkost |
Subject: |
Re: [Qemu-devel] [PATCH v3 1/2] pc: add 2.11 machine type |
Date: |
Fri, 18 Aug 2017 16:01:26 -0300 |
User-agent: |
Mutt/1.8.0 (2017-02-23) |
On Tue, Aug 15, 2017 at 08:06:18PM -0400, Lan Tianyu wrote:
> Signed-off-by: Lan Tianyu <address@hidden>
> ---
> hw/i386/pc_piix.c | 14 +++++++++++---
> hw/i386/pc_q35.c | 14 +++++++++++---
> include/hw/compat.h | 3 +++
> include/hw/i386/pc.h | 3 +++
> 4 files changed, 28 insertions(+), 6 deletions(-)
>
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index 11b4336..e99ec8c 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -436,11 +436,21 @@ static void pc_i440fx_machine_options(MachineClass *m)
> m->default_display = "std";
> }
>
> -static void pc_i440fx_2_10_machine_options(MachineClass *m)
> +static void pc_i440fx_2_11_machine_options(MachineClass *m)
> {
> pc_i440fx_machine_options(m);
> m->alias = "pc";
> m->is_default = 1;
> +}
> +
> +DEFINE_I440FX_MACHINE(v2_11, "pc-i440fx-2.11", NULL,
> + pc_i440fx_2_11_machine_options);
> +
> +static void pc_i440fx_2_10_machine_options(MachineClass *m)
> +{
> + pc_i440fx_machine_options(m);
> + m->is_default = 0;
> + m->alias = NULL;
> m->numa_auto_assign_ram = numa_legacy_auto_assign_ram;
Interesting, this was supposed to be in
pc_i440fx_2_9_machine_options() (see commit 3bfe5716 "numa:
equally distribute memory on nodes"), but the merge commit
adb354dd ("Merge remote-tracking branch 'mst/tags/for_upstream'
into staging") moved it to the pc_i440fx_2_10_machine_options().
I will submit a fix for -rc4 ASAP.
--
Eduardo