From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48957) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1buubw-0008Ul-Ca for qemu-devel@nongnu.org; Fri, 14 Oct 2016 01:00:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1buubt-00039Q-Ro for qemu-devel@nongnu.org; Fri, 14 Oct 2016 01:00:47 -0400 Date: Fri, 14 Oct 2016 15:34:27 +1100 From: David Gibson Message-ID: <20161014043427.GG28562@umbus> References: <1476314039-9520-1-git-send-email-mdroth@linux.vnet.ibm.com> <1476314039-9520-6-git-send-email-mdroth@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="Zrag5V6pnZGjLKiw" Content-Disposition: inline In-Reply-To: <1476314039-9520-6-git-send-email-mdroth@linux.vnet.ibm.com> Subject: Re: [Qemu-devel] [PATCH 05/11] spapr: fix inheritance chain for default machine options List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Michael Roth Cc: qemu-devel@nongnu.org, qemu-ppc@nongnu.org, bharata@linux.vnet.ibm.com, nfont@linux.vnet.ibm.com, jallen@linux.vnet.ibm.com --Zrag5V6pnZGjLKiw Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Oct 12, 2016 at 06:13:53PM -0500, Michael Roth wrote: > Rather than machine instances having backward-compatible option > defaults that need to be repeatedly re-enabled for every new machine > type we introduce, we set the defaults appropriate for newer machine > types, then add code to explicitly disable instance options as needed > to maintain compatibility with older machine types. >=20 > Currently pseries-2.5 does not inherit from pseries-2.6 in this > fashion, which is okay at the moment since we do not have any > instance compatibility options for pseries-2.6+ currently. >=20 > We will make use of this in future patches though, so fix it here. >=20 > Signed-off-by: Michael Roth This patch stands on its own, so I've applied it to ppc-for-2.8 (and also extended it to make 2_7 inherit from 2_8). > --- > hw/ppc/spapr.c | 2 ++ > 1 file changed, 2 insertions(+) >=20 > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 3b2a459..f8cde92 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -2544,6 +2544,7 @@ DEFINE_SPAPR_MACHINE(2_7, "2.7", false); > =20 > static void spapr_machine_2_6_instance_options(MachineState *machine) > { > + spapr_machine_2_7_instance_options(machine); > } > =20 > static void spapr_machine_2_6_class_options(MachineClass *mc) > @@ -2568,6 +2569,7 @@ DEFINE_SPAPR_MACHINE(2_6, "2.6", false); > =20 > static void spapr_machine_2_5_instance_options(MachineState *machine) > { > + spapr_machine_2_6_instance_options(machine); > } > =20 > static void spapr_machine_2_5_class_options(MachineClass *mc) --=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 --Zrag5V6pnZGjLKiw Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJYAGBOAAoJEGw4ysog2bOSKwAP/jJ78gAwDAaIVbHhwV7Rv/H1 p7CJzavcwq9h04PYLs8dC3UUu7B7k09vgYlLfN5Bls+17KxoRQFthgNyIvNM9P94 M6vd6og/QEMtW6a9RazUEtSgyZOghkK2EfDfxqNLJMvD1UzIE4y69xnHK1RDqho2 ylfg5+p0GI4JCXmrTIyeOhTkjfL+9WzfWl3ibiM/63XUQlBdQQ6NZ0E0XKTv4oY5 CxbpkafjlXJ6sZlcQC1nUQt45giEwc3wPmRfdPFL7UUQFbLFL5T7KX65863gFHtH HPwx8KNOGnF1FQISr/Ntl//fT1wxIK6ET23ZKai+lcU4mEECfNpSMztXaRN1yL8N Jd01zftvoMp7nbFl3cirgNZ9WQWDXuRfE6ULmYFN1eySSTyKImeZE/O2HXQrL0vE hfnmo/wVYLClkT90prJozvwcV7bZyT0OLT3Bu4xboUwuUF+qGqhcfcg09tl4GiBs mBy8kdqC7NzmeFd/RmniATKDVghV7iysJvJpoxvjn7/qVTm/ru5HiWxAK3ko0KG1 GAmgsC1sTtmPwcCHyuXPlooFGwG6jR3zizTupCPEDTeKFIO0wAF9dOjlnDhCspIe 0MDBwe7am9kQwQOa7gLQqHBKBoCax8nxEaRMd724rarEv8QYP9GDxnMRkvUQunxo D4TVAmGTtc/FSwRQ2LYK =htR5 -----END PGP SIGNATURE----- --Zrag5V6pnZGjLKiw--