From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57298) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UwGPX-0000xU-GX for qemu-devel@nongnu.org; Mon, 08 Jul 2013 14:43:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UwGPW-0004Ul-0G for qemu-devel@nongnu.org; Mon, 08 Jul 2013 14:43:43 -0400 Received: from e39.co.us.ibm.com ([32.97.110.160]:34103) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UwGPV-0004Ug-PF for qemu-devel@nongnu.org; Mon, 08 Jul 2013 14:43:41 -0400 Received: from /spool/local by e39.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 8 Jul 2013 12:43:13 -0600 From: Anthony Liguori In-Reply-To: <1372315560-5478-9-git-send-email-aik@ozlabs.ru> References: <1372315560-5478-1-git-send-email-aik@ozlabs.ru> <1372315560-5478-9-git-send-email-aik@ozlabs.ru> Date: Mon, 08 Jul 2013 13:39:26 -0500 Message-ID: <87sizozyjl.fsf@codemonkey.ws> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Subject: Re: [Qemu-devel] [PATCH 08/17] pseries: savevm support for PAPR TCE tables List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alexey Kardashevskiy , qemu-devel@nongnu.org Cc: Alexander Graf , qemu-ppc@nongnu.org, Paolo Bonzini , Paul Mackerras , David Gibson Alexey Kardashevskiy writes: > From: David Gibson > > This patch adds the necessary VMStateDescription information to save the > state of PAPR TCE tables (that is, the PAPR specified IOMMU). > > Signed-off-by: David Gibson > Signed-off-by: Alexey Kardashevskiy > --- > hw/ppc/spapr_iommu.c | 25 +++++++++++++++++++++++++ > 1 file changed, 25 insertions(+) > > diff --git a/hw/ppc/spapr_iommu.c b/hw/ppc/spapr_iommu.c > index 91bc8e4..ba1f7b6 100644 > --- a/hw/ppc/spapr_iommu.c > +++ b/hw/ppc/spapr_iommu.c > @@ -112,6 +112,25 @@ static IOMMUTLBEntry spapr_tce_translate_iommu(MemoryRegion *iommu, hwaddr addr) > }; > } > > +static const VMStateDescription vmstate_spapr_tce_table = { > + .name = "spapr_iommu", > + .version_id = 1, > + .minimum_version_id = 1, > + .minimum_version_id_old = 1, > + .fields = (VMStateField []) { > + /* Sanity check */ > + VMSTATE_UINT32_EQUAL(liobn, sPAPRTCETable), > + VMSTATE_UINT32_EQUAL(window_size, sPAPRTCETable), > + > + /* IOMMU state */ > + VMSTATE_BOOL(bypass, sPAPRTCETable), > + VMSTATE_VBUFFER_DIVIDE(table, sPAPRTCETable, 0, NULL, 0, window_size, > + SPAPR_TCE_PAGE_SIZE / > sizeof(sPAPRTCE)), Not endian safe. I really don't get the divide bit at all either. > + > + VMSTATE_END_OF_LIST() > + }, > +}; > + > static MemoryRegionIOMMUOps spapr_iommu_ops = { > .translate = spapr_tce_translate_iommu, > }; > @@ -156,6 +175,8 @@ sPAPRTCETable *spapr_tce_new_table(uint32_t liobn, size_t window_size) > > QLIST_INSERT_HEAD(&spapr_tce_tables, tcet, list); > > + vmstate_register(NULL, tcet->liobn, &vmstate_spapr_tce_table, tcet); > + If you need to add these, then you need to do more QOM conversion. Regards, Anthony Liguori > return tcet; > } > > @@ -163,6 +184,10 @@ void spapr_tce_free(sPAPRTCETable *tcet) > { > QLIST_REMOVE(tcet, list); > > + vmstate_unregister(NULL, &vmstate_spapr_tce_table, tcet); > + > + QLIST_REMOVE(tcet, list); > + > if (!kvm_enabled() || > (kvmppc_remove_spapr_tce(tcet->table, tcet->fd, > tcet->window_size) != 0)) { > -- > 1.7.10.4