From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:40443) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RkFFJ-0001QL-DD for qemu-devel@nongnu.org; Mon, 09 Jan 2012 08:26:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RkFFD-00007e-KN for qemu-devel@nongnu.org; Mon, 09 Jan 2012 08:26:41 -0500 Received: from mx1.redhat.com ([209.132.183.28]:15767) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RkFFD-00007a-BI for qemu-devel@nongnu.org; Mon, 09 Jan 2012 08:26:35 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q09DQY2l014795 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 9 Jan 2012 08:26:34 -0500 Date: Mon, 9 Jan 2012 15:28:42 +0200 From: "Michael S. Tsirkin" Message-ID: <20120109132841.GC23401@redhat.com> References: <1326110694-5196-1-git-send-email-avi@redhat.com> <1326110694-5196-4-git-send-email-avi@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1326110694-5196-4-git-send-email-avi@redhat.com> Subject: Re: [Qemu-devel] [PATCH 3/3] vhost: improve region filtering List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Avi Kivity Cc: qemu-devel@nongnu.org On Mon, Jan 09, 2012 at 02:04:54PM +0200, Avi Kivity wrote: > vhost memory management doesn't care about non-memory (e.g. PIO) or non-RAM > regions. Adjust the filtering to reflect that, and move it earlier so it > applies to mem_sections too. > > Signed-off-by: Avi Kivity Acked-by: Michael S. Tsirkin > --- > hw/vhost.c | 19 +++++++++++++++---- > 1 files changed, 15 insertions(+), 4 deletions(-) > > diff --git a/hw/vhost.c b/hw/vhost.c > index d924fb0..19a7b5c 100644 > --- a/hw/vhost.c > +++ b/hw/vhost.c > @@ -15,6 +15,7 @@ > #include "hw/hw.h" > #include "range.h" > #include > +#include "exec-memory.h" > > static void vhost_dev_sync_region(struct vhost_dev *dev, > MemoryRegionSection *section, > @@ -365,10 +366,6 @@ static void vhost_set_memory(MemoryListener *listener, > int r; > void *ram; > > - if (!memory_region_is_ram(section->mr)) { > - return; > - } > - > dev->mem = g_realloc(dev->mem, s); > > if (log_dirty) { > @@ -430,12 +427,22 @@ static void vhost_set_memory(MemoryListener *listener, > } > } > > +static bool vhost_section(MemoryRegionSection *section) > +{ > + return section->address_space == get_system_memory() > + && memory_region_is_ram(section->mr); > +} > + > static void vhost_region_add(MemoryListener *listener, > MemoryRegionSection *section) > { > struct vhost_dev *dev = container_of(listener, struct vhost_dev, > memory_listener); > > + if (!vhost_section(section)) { > + return; > + } > + > ++dev->n_mem_sections; > dev->mem_sections = g_renew(MemoryRegionSection, dev->mem_sections, > dev->n_mem_sections); > @@ -450,6 +457,10 @@ static void vhost_region_del(MemoryListener *listener, > memory_listener); > int i; > > + if (!vhost_section(section)) { > + return; > + } > + > vhost_set_memory(listener, section, false); > for (i = 0; i < dev->n_mem_sections; ++i) { > if (dev->mem_sections[i].offset_within_address_space > -- > 1.7.7.1 >