| Message ID | 1502841979-6233-1-git-send-email-tianyu.lan@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Aug 15, 2017 at 08:06:18PM -0400, Lan Tianyu wrote: > Signed-off-by: Lan Tianyu <tianyu.lan@intel.com> > --- > 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.
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; } @@ -450,8 +460,6 @@ DEFINE_I440FX_MACHINE(v2_10, "pc-i440fx-2.10", NULL, static void pc_i440fx_2_9_machine_options(MachineClass *m) { pc_i440fx_2_10_machine_options(m); - m->is_default = 0; - m->alias = NULL; SET_MACHINE_COMPAT(m, PC_COMPAT_2_9); } diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 169a214..b469d05 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -302,11 +302,20 @@ static void pc_q35_machine_options(MachineClass *m) m->max_cpus = 288; } +static void pc_q35_2_11_machine_options(MachineClass *m) +{ + pc_q35_machine_options(m); + m->alias = "q35"; +} +DEFINE_Q35_MACHINE(v2_11, "pc-q35-2.11", NULL, + pc_q35_2_11_machine_options); + static void pc_q35_2_10_machine_options(MachineClass *m) { - pc_q35_machine_options(m); - m->alias = "q35"; + pc_q35_2_11_machine_options(m); + m->alias = NULL; m->numa_auto_assign_ram = numa_legacy_auto_assign_ram; + SET_MACHINE_COMPAT(m, PC_COMPAT_2_10); } DEFINE_Q35_MACHINE(v2_10, "pc-q35-2.10", NULL, @@ -315,7 +324,6 @@ DEFINE_Q35_MACHINE(v2_10, "pc-q35-2.10", NULL, static void pc_q35_2_9_machine_options(MachineClass *m) { pc_q35_2_10_machine_options(m); - m->alias = NULL; SET_MACHINE_COMPAT(m, PC_COMPAT_2_9); } diff --git a/include/hw/compat.h b/include/hw/compat.h index 08f3600..3e101f8 100644 --- a/include/hw/compat.h +++ b/include/hw/compat.h @@ -1,6 +1,9 @@ #ifndef HW_COMPAT_H #define HW_COMPAT_H +#define HW_COMPAT_2_10 \ + /* empty */ + #define HW_COMPAT_2_9 \ {\ .driver = "pci-bridge",\ diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index d80859b..8226904 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -369,6 +369,9 @@ int e820_add_entry(uint64_t, uint64_t, uint32_t); int e820_get_num_entries(void); bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); +#define PC_COMPAT_2_10 \ + HW_COMPAT_2_10 \ + #define PC_COMPAT_2_9 \ HW_COMPAT_2_9 \ {\
Signed-off-by: Lan Tianyu <tianyu.lan@intel.com> --- 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(-)