From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:47355)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1bXVap-0000Ai-Hw
	for qemu-devel@nongnu.org; Wed, 10 Aug 2016 11:38:56 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1bXVak-0002Tx-K0
	for qemu-devel@nongnu.org; Wed, 10 Aug 2016 11:38:54 -0400
Received: from mx1.redhat.com ([209.132.183.28]:57512)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1bXVak-0002T7-Ej
	for qemu-devel@nongnu.org; Wed, 10 Aug 2016 11:38:50 -0400
Date: Wed, 10 Aug 2016 18:38:44 +0300
From: "Michael S. Tsirkin" <mst@redhat.com>
Message-ID: <20160810183802-mutt-send-email-mst@kernel.org>
References: <1470702642-24580-1-git-send-email-liang.z.li@intel.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1470702642-24580-1-git-send-email-liang.z.li@intel.com>
Subject: Re: [Qemu-devel] [PATCH repost] virtio-balloon: Remove needless
 precompiled directive
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Liang Li <liang.z.li@intel.com>
Cc: qemu-devel@nongnu.org, thuth@redhat.com, dgilbert@redhat.com

On Tue, Aug 09, 2016 at 08:30:42AM +0800, Liang Li wrote:
> Since there in wrapper around madvise(), the virtio-balloon
> code is able to work without the precompiled directive, the
> directive can be removed.
> 
> Signed-off-by: Liang Li <liang.z.li@intel.com>
> Suggested-by: Thomas Huth <thuth@redhat.com>
> Reviewd-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

Sorry about missing this earlier.
I'm inclined to merge this past 2.7 now.
Sorry about the delay.
Can you pls repost after 2.7 is out?

Thanks!

> ---
>  hw/virtio/virtio-balloon.c | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c
> index 5af429a..61325f2 100644
> --- a/hw/virtio/virtio-balloon.c
> +++ b/hw/virtio/virtio-balloon.c
> @@ -34,13 +34,11 @@
>  
>  static void balloon_page(void *addr, int deflate)
>  {
> -#if defined(__linux__)
>      if (!qemu_balloon_is_inhibited() && (!kvm_enabled() ||
>                                           kvm_has_sync_mmu())) {
>          qemu_madvise(addr, BALLOON_PAGE_SIZE,
>                  deflate ? QEMU_MADV_WILLNEED : QEMU_MADV_DONTNEED);
>      }
> -#endif
>  }
>  
>  static const char *balloon_stat_names[] = {
> -- 
> 1.9.1