From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42306) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eYcOV-0001Cb-BI for qemu-devel@nongnu.org; Mon, 08 Jan 2018 13:43:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eYcOS-0006eX-4N for qemu-devel@nongnu.org; Mon, 08 Jan 2018 13:43:35 -0500 Received: from mx1.redhat.com ([209.132.183.28]:55454) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eYcOR-0006dZ-Nr for qemu-devel@nongnu.org; Mon, 08 Jan 2018 13:43:31 -0500 Date: Mon, 8 Jan 2018 18:43:21 +0000 From: "Dr. David Alan Gilbert" Message-ID: <20180108184320.GJ2462@work-vm> References: <20171218201340.27583-1-dgilbert@redhat.com> <20171218201340.27583-8-dgilbert@redhat.com> <20171227142707.50888166@igors-macbook-pro.local> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20171227142707.50888166@igors-macbook-pro.local> Subject: Re: [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: Igor Mammedov Cc: qemu-devel@nongnu.org, pbonzini@redhat.com, maxime.coquelin@redhat.com, mst@redhat.com, groug@kaod.org * Igor Mammedov (imammedo@redhat.com) wrote: > On Mon, 18 Dec 2017 20:13:40 +0000 > "Dr. David Alan Gilbert (git)" wrote: > > > 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 > With style nit fixed > > Reviewed-by: Igor Mammedov > > > --- > > 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) > argument alignment should on '(' Fixed, thanks. Dave > > { > > 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, > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK