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 <da...@gibson.dropbear.id.au> --- hw/spapr_iommu.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/hw/spapr_iommu.c b/hw/spapr_iommu.c index 38034c0..29e76eb 100644 --- a/hw/spapr_iommu.c +++ b/hw/spapr_iommu.c @@ -115,6 +115,26 @@ static int spapr_tce_translate(DMAContext *dma, return 0; } +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() + }, +}; + + DMAContext *spapr_tce_new_dma_context(uint32_t liobn, size_t window_size) { sPAPRTCETable *tcet; @@ -148,6 +168,8 @@ DMAContext *spapr_tce_new_dma_context(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->dma; } @@ -157,6 +179,8 @@ void spapr_tce_free(DMAContext *dma) if (dma) { sPAPRTCETable *tcet = DO_UPCAST(sPAPRTCETable, dma, dma); + vmstate_unregister(NULL, &vmstate_spapr_tce_table, tcet); + QLIST_REMOVE(tcet, list); if (!kvm_enabled() || -- 1.7.10.4