From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54241) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yx3pl-0006yP-Q8 for qemu-devel@nongnu.org; Mon, 25 May 2015 21:39:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yx3pk-0000Di-LO for qemu-devel@nongnu.org; Mon, 25 May 2015 21:39:09 -0400 Date: Tue, 26 May 2015 11:14:51 +1000 From: David Gibson Message-ID: <20150526011451.GL6255@voom.redhat.com> References: <1430971024-27899-1-git-send-email-david@gibson.dropbear.id.au> <1430971024-27899-2-git-send-email-david@gibson.dropbear.id.au> <20150507101343.5d9198f8@thh440s> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="dfmC41YZQlborXoK" Content-Disposition: inline In-Reply-To: <20150507101343.5d9198f8@thh440s> Subject: Re: [Qemu-devel] [PATCH 1/4] spapr: Merge sPAPREnvironment into sPAPRMachineState List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Thomas Huth Cc: lvivier@redhat.com, mdroth@linux.vnet.ibm.com, aik@ozlabs.ru, qemu-devel@nongnu.org, agraf@suse.de, qemu-ppc@nongnu.org, bharata@linux.vnet.ibm.com, afaerber@suse.de --dfmC41YZQlborXoK Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, May 07, 2015 at 10:13:43AM +0200, Thomas Huth wrote: > On Thu, 7 May 2015 13:57:01 +1000 > David Gibson wrote: >=20 > > The code for -machine pseries maintains a global sPAPREnvironment struc= ture > > which keeps track of general state information about the guest platform. > > This predates the existence of the MachineState structure, but performs > > basically the same function. > >=20 > > Now that we have the generic MachineState, fold sPAPREnvironment into > > sPAPRMachineState, the pseries specific subclass of MachineState. > >=20 > > This is mostly a matter of search and replace, although a few places wh= ich > > relied on the global spapr variable are changed to find the structure v= ia > > qdev_get_machine(). > >=20 > > Signed-off-by: David Gibson > > --- > > hw/char/spapr_vty.c | 14 +- > > hw/intc/xics.c | 42 +++--- > > hw/intc/xics_kvm.c | 2 +- > > hw/net/spapr_llan.c | 20 +-- > > hw/nvram/spapr_nvram.c | 8 +- > > hw/ppc/spapr.c | 339 +++++++++++++++++++++---------------= -------- > > hw/ppc/spapr_events.c | 37 ++--- > > hw/ppc/spapr_hcall.c | 44 +++--- > > hw/ppc/spapr_iommu.c | 8 +- > > hw/ppc/spapr_pci.c | 91 ++++++------ > > hw/ppc/spapr_rtas.c | 66 ++++----- > > hw/ppc/spapr_rtc.c | 12 +- > > hw/ppc/spapr_vio.c | 31 ++-- > > include/hw/pci-host/spapr.h | 12 +- > > include/hw/ppc/spapr.h | 33 +++-- > > include/hw/ppc/spapr_vio.h | 6 +- > > 16 files changed, 391 insertions(+), 374 deletions(-) > >=20 > > diff --git a/hw/char/spapr_vty.c b/hw/char/spapr_vty.c > > index 4e464bd..5a27740 100644 > > --- a/hw/char/spapr_vty.c > > +++ b/hw/char/spapr_vty.c > > @@ -74,7 +74,7 @@ static void spapr_vty_realize(VIOsPAPRDevice *sdev, E= rror **errp) > > } > > =20 > > /* Forward declaration */ > > -static target_ulong h_put_term_char(PowerPCCPU *cpu, sPAPREnvironment = *spapr, > > +static target_ulong h_put_term_char(PowerPCCPU *cpu, sPAPRMachineState= *sm, > > target_ulong opcode, target_ulong = *args) >=20 > Phew, this patch is really hugh, ... mainly just because of the > renaming. Could you maybe keep the "spapr" as parameter name everywhere > instead of "sm"? (i.e. use "sPAPRMachineState *spapr" as parameter?) > That should IMHO be fine, too, and it would decrease the size of the > patch drastically. (And it likely does not break other patches so badly > which are currently pending) Good call. I'll respin without the extraneous renames. --=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 --dfmC41YZQlborXoK Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJVY8kLAAoJEGw4ysog2bOSVwQQAIDr4thVWiwNzqGU8zCaD3PO UZl/PXnqnrPpBv/78u3IQYhdEw45aVEO4VVxVuTEUNnFkKl5TF8KmhOcaAEVyO2i tSNJY4BprOK4nz3m/hhH64lpqSGcYtAjt+le0xc7Azhkq9xkEKhVY623GC39tI4q xNAp1ILqUgYnwa8D4INw2/PAM3JNph1Ecxd9VoTrJVAfNFg+308NrzVF6uSsZfUJ 3emGaVE/fN7A307sd3SgSlQKfdSYkcu9GCp0C3CctEmF5eZPFyKR234Lt4sv4up7 CLZRYIgEeg184r7wFqCniZXYrV+ZRvcrG55rxLl6EVKXi0Owjb1wK99B4043EvRn /Wx1c38n3WOvRStVtOk84o5+QoFaRgHWWKm1tjrN91IINujI7IbHY6yzD9VOik70 dTRvpDNf7WgpfpFV9TvyYlXRFZm6waJyU4mnazLrrp7GMOm4Ef4m7cpjS9DnrdSC LqgYHKXx5BHYecFFN/XFDHfA056+pudZQOM2NGh8XzBELHiVfNIUGVlCuIajFdOX v4X5wSkQXsG5XoxBEs0e7RShnstEmnaDYr8XLqubY5FOt30PIiqjjSW4gRnMA9+r TiUJ82KfnREsb2LNDcnehmHcxwDGCiICW0bmgTDOXRV1Afr6JkMdBASqplQXnBsZ Lw73PYHa1tIaccp1n6FN =T3lp -----END PGP SIGNATURE----- --dfmC41YZQlborXoK--