On Thu, Apr 30, 2015 at 04:04:49PM -0500, Michael Roth wrote: > Quoting David Gibson (2015-04-29 23:13:04) > > On Wed, Apr 22, 2015 at 01:28:04AM -0500, Michael Roth wrote: > > > These patches are based on spapr-next, and can also be obtained > > > from: > > > > Thanks Michael. > > > > I've made a few small conflict fixes and merged this into spapr-next. > > Great, thanks! > > > > > Could you please: > > > > a) Pull the new spapr-next and test that your code still works > > I've run it through all my basic testing and things look good. I did > need one change though regarding the 2.4 machine type intro though: > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index a8116d0..8fbcaf5 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -1919,6 +1919,7 @@ static void spapr_machine_register_types(void) > type_register_static(&spapr_machine_2_1_info); > type_register_static(&spapr_machine_2_2_info); > type_register_static(&spapr_machine_2_3_info); > + type_register_static(&spapr_machine_2_4_info); > } > > type_init(spapr_machine_register_types) > > Just needs to get squashed into "pseries: Add pseries-2.4 machine type" > I'd imagine.
Oops, that's an embarrasing omission. Fixed now.
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
pgpTQRssOZNUQ.pgp
Description: PGP signature
