From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49071) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eK7RV-00011S-PT for qemu-devel@nongnu.org; Wed, 29 Nov 2017 13:50:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eK7RV-0001SD-1Q for qemu-devel@nongnu.org; Wed, 29 Nov 2017 13:50:45 -0500 Received: from mx1.redhat.com ([209.132.183.28]:62398) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eK7RU-0001Rt-Rg for qemu-devel@nongnu.org; Wed, 29 Nov 2017 13:50:44 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E5F4B85547 for ; Wed, 29 Nov 2017 18:50:43 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" Date: Wed, 29 Nov 2017 18:50:22 +0000 Message-Id: <20171129185026.23632-4-dgilbert@redhat.com> In-Reply-To: <20171129185026.23632-1-dgilbert@redhat.com> References: <20171129185026.23632-1-dgilbert@redhat.com> Subject: [Qemu-devel] [RFC 3/7] vhost: New memory update functions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, imammedo@redhat.com Cc: maxime.coquelin@redhat.com, mst@redhat.com From: "Dr. David Alan Gilbert" vhost_update_mem will replace the existing update mechanism. They make use of the Flatview we have now to make the update simpler. This commit just adds the basic structure. Signed-off-by: Dr. David Alan Gilbert --- hw/virtio/vhost.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index 938253d1e8..c959a59fb3 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -629,6 +629,43 @@ static void vhost_begin(MemoryListener *listener) dev->mem_changed_start_addr = -1; } +struct vhost_update_mem_tmp { + struct vhost_dev *dev; + uint32_t nregions; + struct vhost_memory_region *regions; +}; + +/* Called for each MRS from vhost_update_mem */ +static int vhost_update_mem_cb(MemoryRegionSection *mrs, void *opaque) +{ + if (!vhost_section(mrs)) { + return 0; + } + + /* TODO */ + return 0; +} + +static int vhost_update_mem(struct vhost_dev *dev) +{ + int res; + struct vhost_update_mem_tmp vtmp; + vtmp.regions = 0; + vtmp.nregions = 0; + vtmp.dev = dev; + + res = address_space_iterate(&address_space_memory, + vhost_update_mem_cb, &vtmp); + if (res) { + goto out; + } + + /* TODO */ +out: + g_free(vtmp.regions); + return res; +} + static void vhost_commit(MemoryListener *listener) { struct vhost_dev *dev = container_of(listener, struct vhost_dev, @@ -648,6 +685,10 @@ static void vhost_commit(MemoryListener *listener) return; } + if (vhost_update_mem(dev)) { + return; + } + if (dev->started) { start_addr = dev->mem_changed_start_addr; size = dev->mem_changed_end_addr - dev->mem_changed_start_addr + 1; @@ -1523,6 +1564,9 @@ int vhost_dev_start(struct vhost_dev *hdev, VirtIODevice *vdev) goto fail_features; } + if (vhost_update_mem(hdev)) { + goto fail_mem; + } if (vhost_dev_has_iommu(hdev)) { memory_listener_register(&hdev->iommu_listener, vdev->dma_as); } -- 2.14.3