From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34770) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UvSxB-0003Za-I9 for qemu-devel@nongnu.org; Sat, 06 Jul 2013 09:55:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UvSx9-0002EZ-Nz for qemu-devel@nongnu.org; Sat, 06 Jul 2013 09:55:09 -0400 Received: from mail-pb0-f54.google.com ([209.85.160.54]:49128) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UvSx9-0002Dk-IA for qemu-devel@nongnu.org; Sat, 06 Jul 2013 09:55:07 -0400 Received: by mail-pb0-f54.google.com with SMTP id ro2so2932354pbb.27 for ; Sat, 06 Jul 2013 06:55:06 -0700 (PDT) From: Alexey Kardashevskiy Date: Sat, 6 Jul 2013 23:54:06 +1000 Message-Id: <1373118856-30171-10-git-send-email-aik@ozlabs.ru> In-Reply-To: <1373118856-30171-1-git-send-email-aik@ozlabs.ru> References: <1373118856-30171-1-git-send-email-aik@ozlabs.ru> Subject: [Qemu-devel] [PATCH 09/19] pseries: savevm support for PAPR TCE tables List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , aik@ozlabs.ru, Alexander Graf , qemu-ppc@nongnu.org, Paul Mackerras , David Gibson 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)), + + 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); + 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.8.3.2