From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50841) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b8jBi-0005dm-Qf for qemu-devel@nongnu.org; Fri, 03 Jun 2016 03:06:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b8jBe-0006sW-Hs for qemu-devel@nongnu.org; Fri, 03 Jun 2016 03:06:33 -0400 Date: Fri, 3 Jun 2016 16:59:49 +1000 From: David Gibson Message-ID: <20160603065949.GQ1087@voom.fritz.box> References: <1464932984-26623-1-git-send-email-bharata@linux.vnet.ibm.com> <201606030550.u535joke039889@mx0a-001b2d01.pphosted.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="qd/SZIFVu+MYwfCR" Content-Disposition: inline In-Reply-To: <201606030550.u535joke039889@mx0a-001b2d01.pphosted.com> Subject: Re: [Qemu-devel] [RFC PATCH v1 1/3] spapr: Introduce pseries-2.7 machine type List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Bharata B Rao Cc: qemu-devel@nongnu.org, mdroth@linux.vnet.ibm.com, nfont@linux.vnet.ibm.com, aik@au1.ibm.com, qemu-ppc@nongnu.org --qd/SZIFVu+MYwfCR Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Jun 03, 2016 at 11:19:42AM +0530, Bharata B Rao wrote: > Signed-off-by: Bharata B Rao Applied to ppc-for-2.7, we were always going to need this at some point. > --- > hw/ppc/spapr.c | 22 ++++++++++++++++++++-- > 1 file changed, 20 insertions(+), 2 deletions(-) >=20 > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 44e401a..30b9731 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -2344,18 +2344,36 @@ static const TypeInfo spapr_machine_info =3D { > type_init(spapr_machine_register_##suffix) > =20 > /* > + * pseries-2.7 > + */ > +static void spapr_machine_2_7_instance_options(MachineState *machine) > +{ > +} > + > +static void spapr_machine_2_7_class_options(MachineClass *mc) > +{ > + /* Defaults for the latest behaviour inherited from the base class */ > +} > + > +DEFINE_SPAPR_MACHINE(2_7, "2.7", true); > + > +/* > * pseries-2.6 > */ > +#define SPAPR_COMPAT_2_6 \ > + HW_COMPAT_2_6 > + > static void spapr_machine_2_6_instance_options(MachineState *machine) > { > } > =20 > static void spapr_machine_2_6_class_options(MachineClass *mc) > { > - /* Defaults for the latest behaviour inherited from the base class */ > + spapr_machine_2_7_class_options(mc); > + SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_6); > } > =20 > -DEFINE_SPAPR_MACHINE(2_6, "2.6", true); > +DEFINE_SPAPR_MACHINE(2_6, "2.6", false); > =20 > /* > * pseries-2.5 --=20 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 --qd/SZIFVu+MYwfCR Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJXUSrlAAoJEGw4ysog2bOSjnwP/2XqRJQQxJr94hqYTuzRU8u5 egnkvPUwMqqMcRHWbfEctIh1TspCRHEWw+VkBW9Y5k9tcb//NTygs9r3+8rGi292 gQi0opZqNhjrWIAFkc4VdM6ILol5Ko9G9yuj2APJKIKXo+u/HK6pyOln1LYP5iUH cwBfIU1HbEcF1iAr6iwcSxiEerrDXpnZDF/gw7IsKqs60JV5jPii2N1q8x3FQEzV 4iVo/Fb9xBClnHGVfcvTRnm6h+P2ZtGsZPJJIl4heo9DFSUkkotjseKmK7er5eGx g30jwR+3VlMSC3WHwqSFl/jnQ/xHRDGjvc+Fl76a3SNlw6ZBXSUk0+2RPGJEZavz A6HeifVkbJP+ExFDsKhAUOkyxRyI/2iFIlrO3Fq3h9VF0myMHgIuxLNn5hOVHC7y IlZTkeNusUx0FznumponrQGrYgJXhwkn8XC++g3c8KMDyKlsdb4a9v/LxDa4ZWF6 LyqHsAmdZGxjf87CcqCSHLQWM76bsapoIeH/Efcmwe4p7RJZM7DdOFOsnwxJfDeT aZsbzyVuEwLARtrsaC5uazk4RSpT74fWQnIQR0/fbKisCAW5pwNgw9TQk+4bJJxf H3fFmXTalMjVExTcUOHaOE4ssxTBJTOwn69bdl28yL1uX4VutDO470d+/FNn8MHn aGdN2kkI4zf6iJ6IaTRQ =oNeb -----END PGP SIGNATURE----- --qd/SZIFVu+MYwfCR--