From patchwork Tue Mar 27 14:56:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amos Kong X-Patchwork-Id: 148963 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 09A6AB6F9D for ; Wed, 28 Mar 2012 01:57:07 +1100 (EST) Received: from localhost ([::1]:47718 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SCXpZ-0007ao-7q for incoming@patchwork.ozlabs.org; Tue, 27 Mar 2012 10:57:05 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57681) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SCXpO-0007ZI-0c for qemu-devel@nongnu.org; Tue, 27 Mar 2012 10:56:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SCXpH-0005zq-0Y for qemu-devel@nongnu.org; Tue, 27 Mar 2012 10:56:53 -0400 Received: from mx3-phx2.redhat.com ([209.132.183.24]:52058) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SCXpG-0005z5-Oo for qemu-devel@nongnu.org; Tue, 27 Mar 2012 10:56:46 -0400 Received: from zmail13.collab.prod.int.phx2.redhat.com (zmail13.collab.prod.int.phx2.redhat.com [10.5.83.15]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q2REug85001628; Tue, 27 Mar 2012 10:56:42 -0400 Date: Tue, 27 Mar 2012 10:56:42 -0400 (EDT) From: Amos Kong To: Orit Wasserman Message-ID: <47ec5537-6df7-4471-b4d7-851de8777ca8@zmail13.collab.prod.int.phx2.redhat.com> In-Reply-To: <4F71BA07.9040007@redhat.com> MIME-Version: 1.0 X-Originating-IP: [10.66.114.145] X-Mailer: Zimbra 7.1.2_GA_3268 (ZimbraWebClient - SAF3 (Linux)/7.1.2_GA_3268) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 209.132.183.24 Cc: aliguori@us.ibm.com, kvm@vger.kernel.org, quintela@redhat.com, jasowang@redhat.com, qemu-devel@nongnu.org, mdroth@linux.vnet.ibm.com, laine@redhat.com Subject: [Qemu-devel] [PATCH v6 1/4] sockets: introduce set_socket_error() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Introduce set_socket_error() to set the errno, use WSASetLastError() for win32. Sometimes, clean work would rewrite errno in error path, we can use this function to restore real errno. Changes from V5: - create a function to set errno Signed-off-by: Amos Kong diff --git a/qemu-sockets.c b/qemu-sockets.c index 6bcb8e3..f822187 100644 --- a/qemu-sockets.c +++ b/qemu-sockets.c @@ -56,6 +56,11 @@ static QemuOptsList dummy_opts = { }, }; +void set_errno(int e) +{ + errno = e; +} + static int inet_getport(struct addrinfo *e) { struct sockaddr_in *i4; diff --git a/qemu_socket.h b/qemu_socket.h index fe4cf6c..62c1921 100644 --- a/qemu_socket.h +++ b/qemu_socket.h @@ -8,6 +8,7 @@ #include #define socket_error() WSAGetLastError() +#define set_socket_error(e) WSASetLastError(e) #undef EINTR #define EWOULDBLOCK WSAEWOULDBLOCK #define EINTR WSAEINTR @@ -25,7 +26,10 @@ int inet_aton(const char *cp, struct in_addr *ia); #include #include +void set_errno(int e); + #define socket_error() errno +#define set_socket_error(e) set_errno(e) #define closesocket(s) close(s) #endif /* !_WIN32 */