From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:46078)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <flukshun@gmail.com>) id 1UNsyw-0002IB-HF
	for qemu-devel@nongnu.org; Thu, 04 Apr 2013 18:50:15 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <flukshun@gmail.com>) id 1UNsyr-0007Yc-Bw
	for qemu-devel@nongnu.org; Thu, 04 Apr 2013 18:50:10 -0400
Received: from mail-ob0-x22f.google.com ([2607:f8b0:4003:c01::22f]:36723)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <flukshun@gmail.com>) id 1UNsyr-0007YB-6E
	for qemu-devel@nongnu.org; Thu, 04 Apr 2013 18:50:05 -0400
Received: by mail-ob0-f175.google.com with SMTP id va7so3176067obc.34
	for <qemu-devel@nongnu.org>; Thu, 04 Apr 2013 15:50:04 -0700 (PDT)
Sender: fluxion <flukshun@gmail.com>
Date: Thu, 4 Apr 2013 17:48:27 -0500
From: mdroth <mdroth@linux.vnet.ibm.com>
Message-ID: <20130404224827.GA1929@vm>
References: <1365085111-17027-1-git-send-email-stefanha@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1365085111-17027-1-git-send-email-stefanha@redhat.com>
Subject: Re: [Qemu-devel] [PATCH stable-1.4 v2 0/4] monitor: do not rely on
 O_NONBLOCK for passed file descriptors
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: Stefan Hajnoczi <stefanha@redhat.com>
Cc: Markus Armbruster <armbru@redhat.com>, qemu-devel@nongnu.org, Luiz Capitulino <lcapitulino@redhat.com>

On Thu, Apr 04, 2013 at 04:18:27PM +0200, Stefan Hajnoczi wrote:
> Backported to QEMU 1.4 stable branch.
> 
> Original series:
> http://lists.nongnu.org/archive/html/qemu-devel/2013-03/msg04756.html
> 
> v2:
>  * Use git cherry-pick -x and give rationale for conflict resolutions.

Applied to the 1.4.1 staging tree:

https://github.com/mdroth/qemu/commits/stable-1.4-staging

Thanks for the backport!

> 
> Stefan Hajnoczi (4):
>   oslib-posix: rename socket_set_nonblock() to qemu_set_nonblock()
>   net: ensure "socket" backend uses non-blocking fds
>   qemu-socket: set passed fd non-blocking in socket_connect()
>   chardev: clear O_NONBLOCK on SCM_RIGHTS file descriptors
> 
>  block/nbd.c            |  2 +-
>  block/sheepdog.c       |  6 +++---
>  include/qemu/sockets.h |  4 ++--
>  migration-tcp.c        |  2 +-
>  migration-unix.c       |  2 +-
>  migration.c            |  2 +-
>  nbd.c                  |  8 ++++----
>  net/socket.c           | 13 +++++++++----
>  qemu-char.c            | 11 +++++++----
>  slirp/misc.c           |  2 +-
>  slirp/tcp_subr.c       |  4 ++--
>  ui/vnc.c               |  2 +-
>  util/oslib-posix.c     |  4 ++--
>  util/oslib-win32.c     |  4 ++--
>  util/qemu-sockets.c    |  5 +++--
>  15 files changed, 40 insertions(+), 31 deletions(-)
> 
> -- 
> 1.8.1.4
>