| Message ID | 1450899215-19311-1-git-send-email-shmulik.ladkani@ravellosystems.com |
|---|---|
| State | New |
| Headers | show |
On Wed, Dec 23, 2015 at 09:33:35PM +0200, Shmulik Ladkani wrote: > In 240240d5 'pc: Add pc-*-2.6 machine classes' HW_COMPAT_2_5 and > PC_COMPAT_2_5 were introduced. > > Accordingly, introduce SPAPR_COMPAT_2_5 that uses HW_COMPAT_2_5. > > Signed-off-by: Shmulik Ladkani <shmulik.ladkani@ravellosystems.com> Sorry, this needs to be reworked for the changes I have queued to the spapr machine types. If you have time, look at git://github.com/dgibson/qemu.git, branch 'ppc-for-2.6'. Otherwise I'll get to it at some point. > --- > hw/ppc/spapr.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 6bfb908..6a0bfd7 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -2298,7 +2298,11 @@ static const TypeInfo spapr_machine_info = { > }, > }; > > +#define SPAPR_COMPAT_2_5 \ > + HW_COMPAT_2_5 > + > #define SPAPR_COMPAT_2_4 \ > + SPAPR_COMPAT_2_5 \ > HW_COMPAT_2_4 > > #define SPAPR_COMPAT_2_3 \ > @@ -2434,6 +2438,10 @@ static const TypeInfo spapr_machine_2_4_info = { > > static void spapr_machine_2_5_class_init(ObjectClass *oc, void *data) > { > + static GlobalProperty compat_props[] = { > + SPAPR_COMPAT_2_5 > + { /* end of list */ } > + }; > MachineClass *mc = MACHINE_CLASS(oc); > sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(oc); > > @@ -2442,6 +2450,7 @@ static void spapr_machine_2_5_class_init(ObjectClass *oc, void *data) > mc->alias = "pseries"; > mc->is_default = 1; > smc->dr_lmb_enabled = true; > + mc->compat_props = compat_props; > } > > static const TypeInfo spapr_machine_2_5_info = {
Hi, On Thu, 24 Dec 2015 19:25:27 +1100, david@gibson.dropbear.id.au wrote: > On Wed, Dec 23, 2015 at 09:33:35PM +0200, Shmulik Ladkani wrote: > > In 240240d5 'pc: Add pc-*-2.6 machine classes' HW_COMPAT_2_5 and > > PC_COMPAT_2_5 were introduced. > > > > Accordingly, introduce SPAPR_COMPAT_2_5 that uses HW_COMPAT_2_5. > > > > Signed-off-by: Shmulik Ladkani <shmulik.ladkani@ravellosystems.com> > > Sorry, this needs to be reworked for the changes I have queued to the > spapr machine types. If you have time, look at > git://github.com/dgibson/qemu.git, branch 'ppc-for-2.6'. Otherwise > I'll get to it at some point. Sure, I assume you eventually add a SPAPR_COMPAT_2_5 prior 2.6, so there's no rush to push this in its current form - it was for sake of completeness as HW_COMPAT_2_5 starts getting populated. Thanks Shmulik
On Thu, Dec 24, 2015 at 12:44:59PM +0200, Shmulik Ladkani wrote: > Hi, > > On Thu, 24 Dec 2015 19:25:27 +1100, david@gibson.dropbear.id.au wrote: > > On Wed, Dec 23, 2015 at 09:33:35PM +0200, Shmulik Ladkani wrote: > > > In 240240d5 'pc: Add pc-*-2.6 machine classes' HW_COMPAT_2_5 and > > > PC_COMPAT_2_5 were introduced. > > > > > > Accordingly, introduce SPAPR_COMPAT_2_5 that uses HW_COMPAT_2_5. > > > > > > Signed-off-by: Shmulik Ladkani <shmulik.ladkani@ravellosystems.com> > > > > Sorry, this needs to be reworked for the changes I have queued to the > > spapr machine types. If you have time, look at > > git://github.com/dgibson/qemu.git, branch 'ppc-for-2.6'. Otherwise > > I'll get to it at some point. > > Sure, I assume you eventually add a SPAPR_COMPAT_2_5 prior 2.6, so > there's no rush to push this in its current form - it was for sake of > completeness as HW_COMPAT_2_5 starts getting populated. Ok, thanks. I've now folded this into my patch adding the pseries-2.6 machine type, which is in my patch queue for 2.6.
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 6bfb908..6a0bfd7 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2298,7 +2298,11 @@ static const TypeInfo spapr_machine_info = { }, }; +#define SPAPR_COMPAT_2_5 \ + HW_COMPAT_2_5 + #define SPAPR_COMPAT_2_4 \ + SPAPR_COMPAT_2_5 \ HW_COMPAT_2_4 #define SPAPR_COMPAT_2_3 \ @@ -2434,6 +2438,10 @@ static const TypeInfo spapr_machine_2_4_info = { static void spapr_machine_2_5_class_init(ObjectClass *oc, void *data) { + static GlobalProperty compat_props[] = { + SPAPR_COMPAT_2_5 + { /* end of list */ } + }; MachineClass *mc = MACHINE_CLASS(oc); sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(oc); @@ -2442,6 +2450,7 @@ static void spapr_machine_2_5_class_init(ObjectClass *oc, void *data) mc->alias = "pseries"; mc->is_default = 1; smc->dr_lmb_enabled = true; + mc->compat_props = compat_props; } static const TypeInfo spapr_machine_2_5_info = {
In 240240d5 'pc: Add pc-*-2.6 machine classes' HW_COMPAT_2_5 and PC_COMPAT_2_5 were introduced. Accordingly, introduce SPAPR_COMPAT_2_5 that uses HW_COMPAT_2_5. Signed-off-by: Shmulik Ladkani <shmulik.ladkani@ravellosystems.com> --- hw/ppc/spapr.c | 9 +++++++++ 1 file changed, 9 insertions(+)