* [Qemu-devel] [for-2.6 PATCH v2 0/2] pc: Add pc-*-2.6 machine classes @ 2015-11-27 18:01 Eduardo Habkost 2015-11-27 18:01 ` [Qemu-devel] [for-2.6 PATCH v2 1/2] pc: Remove redundant code from pc-*-2.3 " Eduardo Habkost 2015-11-27 18:01 ` [Qemu-devel] [for-2.6 PATCH v2 2/2] pc: Add pc-*-2.6 " Eduardo Habkost 0 siblings, 2 replies; 6+ messages in thread From: Eduardo Habkost @ 2015-11-27 18:01 UTC (permalink / raw) To: qemu-devel, Michael S. Tsirkin; +Cc: Haozhong Zhang I am sending this earlier so it can be queued and used as base for patches that need to add compat code to the pc-2.5 machine types. Changes v1 -> v2: * Typo fix that I forgot to commit before submitting v1 Eduardo Habkost (2): pc: Remove redundant code from pc-*-2.3 machine classes pc: Add pc-*-2.6 machine classes hw/i386/pc_piix.c | 18 +++++++++++++----- hw/i386/pc_q35.c | 14 +++++++++++--- include/hw/compat.h | 3 +++ include/hw/i386/pc.h | 4 ++++ 4 files changed, 31 insertions(+), 8 deletions(-) -- 2.1.0 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [Qemu-devel] [for-2.6 PATCH v2 1/2] pc: Remove redundant code from pc-*-2.3 machine classes 2015-11-27 18:01 [Qemu-devel] [for-2.6 PATCH v2 0/2] pc: Add pc-*-2.6 machine classes Eduardo Habkost @ 2015-11-27 18:01 ` Eduardo Habkost 2015-11-29 16:47 ` Marcel Apfelbaum 2015-11-27 18:01 ` [Qemu-devel] [for-2.6 PATCH v2 2/2] pc: Add pc-*-2.6 " Eduardo Habkost 1 sibling, 1 reply; 6+ messages in thread From: Eduardo Habkost @ 2015-11-27 18:01 UTC (permalink / raw) To: qemu-devel, Michael S. Tsirkin; +Cc: Haozhong Zhang Remove the redundant 'alias = NULL' and 'is_default = 0' lines from older machine-types. pc_*_2_4_machine_options() already clear those fields, so they don't need to be cleared by pc_*_2_3_machine_options(). Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> --- hw/i386/pc_piix.c | 2 -- hw/i386/pc_q35.c | 1 - 2 files changed, 3 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 2e41efe..1a4ff01 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -499,8 +499,6 @@ static void pc_i440fx_2_3_machine_options(MachineClass *m) { pc_i440fx_2_4_machine_options(m); m->hw_version = "2.3.0"; - m->alias = NULL; - m->is_default = 0; SET_MACHINE_COMPAT(m, PC_COMPAT_2_3); } diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 133bc68..f17acca 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -399,7 +399,6 @@ static void pc_q35_2_3_machine_options(MachineClass *m) m->hw_version = "2.3.0"; m->no_floppy = 0; m->no_tco = 1; - m->alias = NULL; SET_MACHINE_COMPAT(m, PC_COMPAT_2_3); } -- 2.1.0 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [for-2.6 PATCH v2 1/2] pc: Remove redundant code from pc-*-2.3 machine classes 2015-11-27 18:01 ` [Qemu-devel] [for-2.6 PATCH v2 1/2] pc: Remove redundant code from pc-*-2.3 " Eduardo Habkost @ 2015-11-29 16:47 ` Marcel Apfelbaum 0 siblings, 0 replies; 6+ messages in thread From: Marcel Apfelbaum @ 2015-11-29 16:47 UTC (permalink / raw) To: Eduardo Habkost, qemu-devel, Michael S. Tsirkin; +Cc: Haozhong Zhang On 11/27/2015 08:01 PM, Eduardo Habkost wrote: > Remove the redundant 'alias = NULL' and 'is_default = 0' lines > from older machine-types. pc_*_2_4_machine_options() already > clear those fields, so they don't need to be cleared by > pc_*_2_3_machine_options(). > > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> > --- > hw/i386/pc_piix.c | 2 -- > hw/i386/pc_q35.c | 1 - > 2 files changed, 3 deletions(-) > > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index 2e41efe..1a4ff01 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -499,8 +499,6 @@ static void pc_i440fx_2_3_machine_options(MachineClass *m) > { > pc_i440fx_2_4_machine_options(m); > m->hw_version = "2.3.0"; > - m->alias = NULL; > - m->is_default = 0; > SET_MACHINE_COMPAT(m, PC_COMPAT_2_3); > } > > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index 133bc68..f17acca 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -399,7 +399,6 @@ static void pc_q35_2_3_machine_options(MachineClass *m) > m->hw_version = "2.3.0"; > m->no_floppy = 0; > m->no_tco = 1; > - m->alias = NULL; > SET_MACHINE_COMPAT(m, PC_COMPAT_2_3); > } > > Reviewed-by: Marcel Apfelbaum <marcel@redhat.com> ^ permalink raw reply [flat|nested] 6+ messages in thread
* [Qemu-devel] [for-2.6 PATCH v2 2/2] pc: Add pc-*-2.6 machine classes 2015-11-27 18:01 [Qemu-devel] [for-2.6 PATCH v2 0/2] pc: Add pc-*-2.6 machine classes Eduardo Habkost 2015-11-27 18:01 ` [Qemu-devel] [for-2.6 PATCH v2 1/2] pc: Remove redundant code from pc-*-2.3 " Eduardo Habkost @ 2015-11-27 18:01 ` Eduardo Habkost 2015-11-29 16:44 ` Marcel Apfelbaum 1 sibling, 1 reply; 6+ messages in thread From: Eduardo Habkost @ 2015-11-27 18:01 UTC (permalink / raw) To: qemu-devel, Michael S. Tsirkin; +Cc: Haozhong Zhang Add pc-i440fx-2.6 and pc-q35-2.6 machine classes. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> --- Changes v1 -> v2: * Add missing backslash to PC_COMPAT_2_4 --- hw/i386/pc_piix.c | 16 +++++++++++++--- hw/i386/pc_q35.c | 13 +++++++++++-- include/hw/compat.h | 3 +++ include/hw/i386/pc.h | 4 ++++ 4 files changed, 31 insertions(+), 5 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 1a4ff01..299c07f 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -469,13 +469,25 @@ static void pc_i440fx_machine_options(MachineClass *m) m->default_display = "std"; } -static void pc_i440fx_2_5_machine_options(MachineClass *m) +static void pc_i440fx_2_6_machine_options(MachineClass *m) { pc_i440fx_machine_options(m); m->alias = "pc"; m->is_default = 1; } +DEFINE_I440FX_MACHINE(v2_6, "pc-i440fx-2.6", NULL, + pc_i440fx_2_6_machine_options); + + +static void pc_i440fx_2_5_machine_options(MachineClass *m) +{ + pc_i440fx_2_6_machine_options(m); + m->alias = NULL; + m->is_default = 0; + SET_MACHINE_COMPAT(m, PC_COMPAT_2_5); +} + DEFINE_I440FX_MACHINE(v2_5, "pc-i440fx-2.5", NULL, pc_i440fx_2_5_machine_options); @@ -485,8 +497,6 @@ static void pc_i440fx_2_4_machine_options(MachineClass *m) PCMachineClass *pcmc = PC_MACHINE_CLASS(m); pc_i440fx_2_5_machine_options(m); m->hw_version = "2.4.0"; - m->alias = NULL; - m->is_default = 0; pcmc->broken_reserved_end = true; SET_MACHINE_COMPAT(m, PC_COMPAT_2_4); } diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index f17acca..0086546 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -370,12 +370,22 @@ static void pc_q35_machine_options(MachineClass *m) m->no_tco = 0; } -static void pc_q35_2_5_machine_options(MachineClass *m) +static void pc_q35_2_6_machine_options(MachineClass *m) { pc_q35_machine_options(m); m->alias = "q35"; } +DEFINE_Q35_MACHINE(v2_6, "pc-q35-2.6", NULL, + pc_q35_2_6_machine_options); + +static void pc_q35_2_5_machine_options(MachineClass *m) +{ + pc_q35_2_6_machine_options(m); + m->alias = NULL; + SET_MACHINE_COMPAT(m, PC_COMPAT_2_5); +} + DEFINE_Q35_MACHINE(v2_5, "pc-q35-2.5", NULL, pc_q35_2_5_machine_options); @@ -384,7 +394,6 @@ static void pc_q35_2_4_machine_options(MachineClass *m) PCMachineClass *pcmc = PC_MACHINE_CLASS(m); pc_q35_2_5_machine_options(m); m->hw_version = "2.4.0"; - m->alias = NULL; pcmc->broken_reserved_end = true; SET_MACHINE_COMPAT(m, PC_COMPAT_2_4); } diff --git a/include/hw/compat.h b/include/hw/compat.h index d0b1c4f..fae0d8e 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_5 \ + /* empty */ + #define HW_COMPAT_2_4 \ {\ .driver = "virtio-blk-device",\ diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 854c330..040d1f2 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -296,7 +296,11 @@ 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_5 \ + /* empty */ + #define PC_COMPAT_2_4 \ + PC_COMPAT_2_5 \ HW_COMPAT_2_4 \ {\ .driver = "Haswell-" TYPE_X86_CPU,\ -- 2.1.0 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [for-2.6 PATCH v2 2/2] pc: Add pc-*-2.6 machine classes 2015-11-27 18:01 ` [Qemu-devel] [for-2.6 PATCH v2 2/2] pc: Add pc-*-2.6 " Eduardo Habkost @ 2015-11-29 16:44 ` Marcel Apfelbaum 2015-11-30 13:59 ` Eduardo Habkost 0 siblings, 1 reply; 6+ messages in thread From: Marcel Apfelbaum @ 2015-11-29 16:44 UTC (permalink / raw) To: Eduardo Habkost, qemu-devel, Michael S. Tsirkin; +Cc: Haozhong Zhang On 11/27/2015 08:01 PM, Eduardo Habkost wrote: > Add pc-i440fx-2.6 and pc-q35-2.6 machine classes. > > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> > --- > Changes v1 -> v2: > * Add missing backslash to PC_COMPAT_2_4 > --- > hw/i386/pc_piix.c | 16 +++++++++++++--- > hw/i386/pc_q35.c | 13 +++++++++++-- > include/hw/compat.h | 3 +++ > include/hw/i386/pc.h | 4 ++++ > 4 files changed, 31 insertions(+), 5 deletions(-) > > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index 1a4ff01..299c07f 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -469,13 +469,25 @@ static void pc_i440fx_machine_options(MachineClass *m) > m->default_display = "std"; > } > > -static void pc_i440fx_2_5_machine_options(MachineClass *m) > +static void pc_i440fx_2_6_machine_options(MachineClass *m) > { > pc_i440fx_machine_options(m); > m->alias = "pc"; > m->is_default = 1; > } > > +DEFINE_I440FX_MACHINE(v2_6, "pc-i440fx-2.6", NULL, > + pc_i440fx_2_6_machine_options); > + > + > +static void pc_i440fx_2_5_machine_options(MachineClass *m) > +{ > + pc_i440fx_2_6_machine_options(m); > + m->alias = NULL; > + m->is_default = 0; > + SET_MACHINE_COMPAT(m, PC_COMPAT_2_5); > +} > + > DEFINE_I440FX_MACHINE(v2_5, "pc-i440fx-2.5", NULL, > pc_i440fx_2_5_machine_options); > > @@ -485,8 +497,6 @@ static void pc_i440fx_2_4_machine_options(MachineClass *m) > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > pc_i440fx_2_5_machine_options(m); > m->hw_version = "2.4.0"; > - m->alias = NULL; > - m->is_default = 0; > pcmc->broken_reserved_end = true; > SET_MACHINE_COMPAT(m, PC_COMPAT_2_4); > } > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index f17acca..0086546 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -370,12 +370,22 @@ static void pc_q35_machine_options(MachineClass *m) > m->no_tco = 0; > } > > -static void pc_q35_2_5_machine_options(MachineClass *m) > +static void pc_q35_2_6_machine_options(MachineClass *m) > { > pc_q35_machine_options(m); > m->alias = "q35"; > } > > +DEFINE_Q35_MACHINE(v2_6, "pc-q35-2.6", NULL, > + pc_q35_2_6_machine_options); > + > +static void pc_q35_2_5_machine_options(MachineClass *m) > +{ > + pc_q35_2_6_machine_options(m); > + m->alias = NULL; > + SET_MACHINE_COMPAT(m, PC_COMPAT_2_5); > +} > + > DEFINE_Q35_MACHINE(v2_5, "pc-q35-2.5", NULL, > pc_q35_2_5_machine_options); > > @@ -384,7 +394,6 @@ static void pc_q35_2_4_machine_options(MachineClass *m) > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > pc_q35_2_5_machine_options(m); > m->hw_version = "2.4.0"; > - m->alias = NULL; > pcmc->broken_reserved_end = true; > SET_MACHINE_COMPAT(m, PC_COMPAT_2_4); > } > diff --git a/include/hw/compat.h b/include/hw/compat.h > index d0b1c4f..fae0d8e 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_5 \ > + /* empty */ > + > #define HW_COMPAT_2_4 \ > {\ > .driver = "virtio-blk-device",\ > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index 854c330..040d1f2 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -296,7 +296,11 @@ 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_5 \ > + /* empty */ Hi, Should PC_COMPAT_2_5 have automatically HW_COMPAT_2_5 ? Thanks, Marcel > + > #define PC_COMPAT_2_4 \ > + PC_COMPAT_2_5 \ > HW_COMPAT_2_4 \ > {\ > .driver = "Haswell-" TYPE_X86_CPU,\ > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [for-2.6 PATCH v2 2/2] pc: Add pc-*-2.6 machine classes 2015-11-29 16:44 ` Marcel Apfelbaum @ 2015-11-30 13:59 ` Eduardo Habkost 0 siblings, 0 replies; 6+ messages in thread From: Eduardo Habkost @ 2015-11-30 13:59 UTC (permalink / raw) To: marcel; +Cc: Haozhong Zhang, qemu-devel, Michael S. Tsirkin On Sun, Nov 29, 2015 at 06:44:58PM +0200, Marcel Apfelbaum wrote: [...] > >diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > >index 854c330..040d1f2 100644 > >--- a/include/hw/i386/pc.h > >+++ b/include/hw/i386/pc.h > >@@ -296,7 +296,11 @@ 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_5 \ > >+ /* empty */ > > Hi, > > Should PC_COMPAT_2_5 have automatically HW_COMPAT_2_5 ? Yes, it should! Thanks for noting. -- Eduardo ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-11-30 13:59 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-11-27 18:01 [Qemu-devel] [for-2.6 PATCH v2 0/2] pc: Add pc-*-2.6 machine classes Eduardo Habkost 2015-11-27 18:01 ` [Qemu-devel] [for-2.6 PATCH v2 1/2] pc: Remove redundant code from pc-*-2.3 " Eduardo Habkost 2015-11-29 16:47 ` Marcel Apfelbaum 2015-11-27 18:01 ` [Qemu-devel] [for-2.6 PATCH v2 2/2] pc: Add pc-*-2.6 " Eduardo Habkost 2015-11-29 16:44 ` Marcel Apfelbaum 2015-11-30 13:59 ` Eduardo Habkost
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).