From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52346) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eR1nX-000674-Dk for qemu-devel@nongnu.org; Mon, 18 Dec 2017 15:14:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eR1nU-0003La-FF for qemu-devel@nongnu.org; Mon, 18 Dec 2017 15:14:03 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37672) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eR1nU-0003LH-6z for qemu-devel@nongnu.org; Mon, 18 Dec 2017 15:14:00 -0500 From: "Dr. David Alan Gilbert (git)" Date: Mon, 18 Dec 2017 20:13:40 +0000 Message-Id: <20171218201340.27583-8-dgilbert@redhat.com> In-Reply-To: <20171218201340.27583-1-dgilbert@redhat.com> References: <20171218201340.27583-1-dgilbert@redhat.com> Subject: [Qemu-devel] [PATCH v5 7/7] vhost: Merge and delete unused callbacks List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, pbonzini@redhat.com, imammedo@redhat.com Cc: maxime.coquelin@redhat.com, mst@redhat.com, groug@kaod.org From: "Dr. David Alan Gilbert" Now that the olf vhost_set_memory code is gone, the _nop and _add callbacks are identical and can be merged. The _del callback is no longer needed. Signed-off-by: Dr. David Alan Gilbert --- hw/virtio/vhost.c | 31 ++++--------------------------- 1 file changed, 4 insertions(+), 27 deletions(-) diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index 358ceb3033..4eaa4f889f 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -555,7 +555,8 @@ static void vhost_region_add_section(struct vhost_dev *dev, } } -static void vhost_region_add(MemoryListener *listener, +/* Used for both add and nop callbacks */ +static void vhost_region_addnop(MemoryListener *listener, MemoryRegionSection *section) { struct vhost_dev *dev = container_of(listener, struct vhost_dev, @@ -567,29 +568,6 @@ static void vhost_region_add(MemoryListener *listener, vhost_region_add_section(dev, section); } -/* Called on regions that have not changed */ -static void vhost_region_nop(MemoryListener *listener, - MemoryRegionSection *section) -{ - struct vhost_dev *dev = container_of(listener, struct vhost_dev, - memory_listener); - - if (!vhost_section(section)) { - return; - } - - vhost_region_add_section(dev, section); -} - -static void vhost_region_del(MemoryListener *listener, - MemoryRegionSection *section) -{ - if (!vhost_section(section)) { - return; - } - -} - static void vhost_iommu_unmap_notify(IOMMUNotifier *n, IOMMUTLBEntry *iotlb) { struct vhost_iommu *iommu = container_of(n, struct vhost_iommu, n); @@ -1158,9 +1136,8 @@ int vhost_dev_init(struct vhost_dev *hdev, void *opaque, hdev->memory_listener = (MemoryListener) { .begin = vhost_begin, .commit = vhost_commit, - .region_add = vhost_region_add, - .region_del = vhost_region_del, - .region_nop = vhost_region_nop, + .region_add = vhost_region_addnop, + .region_nop = vhost_region_addnop, .log_start = vhost_log_start, .log_stop = vhost_log_stop, .log_sync = vhost_log_sync, -- 2.14.3