From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49558) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yx90p-0002xE-BN for qemu-devel@nongnu.org; Tue, 26 May 2015 03:10:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yx90k-0001Kz-11 for qemu-devel@nongnu.org; Tue, 26 May 2015 03:10:55 -0400 Date: Tue, 26 May 2015 09:10:40 +0200 From: Thomas Huth Message-ID: <20150526091040.66f50f50@thh440s> In-Reply-To: <1432606979-28556-2-git-send-email-david@gibson.dropbear.id.au> References: <1432606979-28556-1-git-send-email-david@gibson.dropbear.id.au> <1432606979-28556-2-git-send-email-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCHv2 1/4] spapr: Merge sPAPREnvironment into sPAPRMachineState List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: David Gibson Cc: lvivier@redhat.com, qemu-devel@nongnu.org, mdroth@linux.vnet.ibm.com, agraf@suse.de, qemu-ppc@nongnu.org, bharata@linux.vnet.ibm.com, afaerber@suse.de On Tue, 26 May 2015 12:22:56 +1000 David Gibson wrote: > The code for -machine pseries maintains a global sPAPREnvironment structure > 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. > > Now that we have the generic MachineState, fold sPAPREnvironment into > sPAPRMachineState, the pseries specific subclass of MachineState. > > This is mostly a matter of search and replace, although a few places which > relied on the global spapr variable are changed to find the structure via > qdev_get_machine(). > > Signed-off-by: David Gibson > --- > hw/char/spapr_vty.c | 6 ++-- > hw/intc/xics.c | 20 ++++++------- > hw/intc/xics_kvm.c | 2 +- > hw/net/spapr_llan.c | 12 ++++---- > hw/nvram/spapr_nvram.c | 4 +-- > hw/ppc/spapr.c | 73 +++++++++++++++++++-------------------------- > hw/ppc/spapr_events.c | 13 +++++--- > hw/ppc/spapr_hcall.c | 36 +++++++++++----------- > hw/ppc/spapr_iommu.c | 8 ++--- > hw/ppc/spapr_pci.c | 37 ++++++++++++----------- > hw/ppc/spapr_rtas.c | 38 +++++++++++------------ > hw/ppc/spapr_rtc.c | 4 +-- > hw/ppc/spapr_vio.c | 15 +++++----- > include/hw/pci-host/spapr.h | 10 ++++--- > include/hw/ppc/spapr.h | 33 ++++++++++++++------ > include/hw/ppc/spapr_vio.h | 4 ++- > 16 files changed, 167 insertions(+), 148 deletions(-) [...] > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index f069609..0016f25 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c [...] > @@ -1756,17 +1743,17 @@ static char *spapr_get_fw_dev_path(FWPathProvider *p, BusState *bus, > > static char *spapr_get_kvm_type(Object *obj, Error **errp) > { > - sPAPRMachineState *sm = SPAPR_MACHINE(obj); > + sPAPRMachineState *spapr = SPAPR_MACHINE(obj); > > - return g_strdup(sm->kvm_type); > + return g_strdup(spapr->kvm_type); > } > > static void spapr_set_kvm_type(Object *obj, const char *value, Error **errp) > { > - sPAPRMachineState *sm = SPAPR_MACHINE(obj); > + sPAPRMachineState *spapr = SPAPR_MACHINE(obj); > > - g_free(sm->kvm_type); > - sm->kvm_type = g_strdup(value); > + g_free(spapr->kvm_type); > + spapr->kvm_type = g_strdup(value); > } I think you could keep the "sm" variable name in these two functions. Anyway, patch looks good to me now, so: Reviewed-by: Thomas Huth