From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36290) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aC3Gh-0001eA-DT for qemu-devel@nongnu.org; Thu, 24 Dec 2015 05:37:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aC3Gf-0003em-Vs for qemu-devel@nongnu.org; Thu, 24 Dec 2015 05:37:11 -0500 Date: Thu, 24 Dec 2015 19:25:27 +1100 From: David Gibson Message-ID: <20151224082527.GY3011@voom.redhat.com> References: <1450899215-19311-1-git-send-email-shmulik.ladkani@ravellosystems.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="2MC+DK0smzICZJ/6" Content-Disposition: inline In-Reply-To: <1450899215-19311-1-git-send-email-shmulik.ladkani@ravellosystems.com> Subject: Re: [Qemu-devel] [PATCH] spapr: Introduce SPAPR_COMPAT_2_5 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Shmulik Ladkani Cc: idan.brown@ravellosystems.com, qemu-ppc@nongnu.org, Alexander Graf , qemu-devel@nongnu.org --2MC+DK0smzICZJ/6 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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. >=20 > Accordingly, introduce SPAPR_COMPAT_2_5 that uses HW_COMPAT_2_5. >=20 > Signed-off-by: Shmulik Ladkani 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(+) >=20 > 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 =3D { > }, > }; > =20 > +#define SPAPR_COMPAT_2_5 \ > + HW_COMPAT_2_5 > + > #define SPAPR_COMPAT_2_4 \ > + SPAPR_COMPAT_2_5 \ > HW_COMPAT_2_4 > =20 > #define SPAPR_COMPAT_2_3 \ > @@ -2434,6 +2438,10 @@ static const TypeInfo spapr_machine_2_4_info =3D { > =20 > static void spapr_machine_2_5_class_init(ObjectClass *oc, void *data) > { > + static GlobalProperty compat_props[] =3D { > + SPAPR_COMPAT_2_5 > + { /* end of list */ } > + }; > MachineClass *mc =3D MACHINE_CLASS(oc); > sPAPRMachineClass *smc =3D SPAPR_MACHINE_CLASS(oc); > =20 > @@ -2442,6 +2450,7 @@ static void spapr_machine_2_5_class_init(ObjectClas= s *oc, void *data) > mc->alias =3D "pseries"; > mc->is_default =3D 1; > smc->dr_lmb_enabled =3D true; > + mc->compat_props =3D compat_props; > } > =20 > static const TypeInfo spapr_machine_2_5_info =3D { --=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 --2MC+DK0smzICZJ/6 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJWe6v3AAoJEGw4ysog2bOS7L4QAMfE47BnX2M3QgyOdpyyiC/x WMkVrFPO5grIZLUDRcwmeoBQ3fz4zulbE5/QLa/0IS1XHnZFpy2y6Ol0/L9cnmg8 LbsTaPxKe7ulzWjN4Xb4u2mmCxzK9L9qZP/BV+kSIskuPJ7lMTZmvimJsYmy6uj1 oyaDpkXlrwrvGAWknLKsO9EIX8JO7G2KzawJZ549d3c36ShWJhEd4zm90joWSPck gXbq5cBkpdWP/D6lbMAfVpeV2NoLsZzMd55IJCOeR587Yt5zzAsT5Wom25R/GYd1 a3Bm7reflyuX3f5XSQ+aa8y8O62kjIR8IH7GIB6ByGtKTI+I8uR1sQxWg65TsBSB LA8eW+1YISqTMkDZUk9O3BrXRawbc/NAh9SJxRQpZ/KCWjv3AjjOGtYiYIGIuh2i /6BsBugwz8BvYmrUmXNaFbwo9Q5Q0ktFr4mSMKN4ga0nxT8bfMWSaHkjVkFAFLFp dXDL+Y+4+vNhkXVdpBg9WvzN4fexcSSs5LgFeXUY5HurEiu+BMRYtz/2m29sgMD4 cddnEXZ8GEJX4PXra5fw5DvQwZsIOJgQ+vkYJtt/zBq8VbCiTNKVsz9fmIPnZiNQ OflbfMoeeEVY/YM7wOnkpmF1Lf3BfTw9dQJEXEoVe0GCXLic+Q2HdQtbIRl7oDdS 6C+SXl77gXBeBlI10qHr =GOew -----END PGP SIGNATURE----- --2MC+DK0smzICZJ/6--