From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:60961) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UHZqe-0003tQ-9I for qemu-devel@nongnu.org; Mon, 18 Mar 2013 09:11:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UHZqW-0000ko-Ta for qemu-devel@nongnu.org; Mon, 18 Mar 2013 09:11:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:28060) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UHZqW-0000kX-KW for qemu-devel@nongnu.org; Mon, 18 Mar 2013 09:11:24 -0400 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 r2IDBOgH029070 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 18 Mar 2013 09:11:24 -0400 From: Alon Levy Date: Mon, 18 Mar 2013 15:10:52 +0200 Message-Id: <1363612272-13713-7-git-send-email-alevy@redhat.com> In-Reply-To: <1363612272-13713-1-git-send-email-alevy@redhat.com> References: <1363612272-13713-1-git-send-email-alevy@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 06/26] util: move socket_init() to osdep.c List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mlureau@redhat.com From: Marc-Andr=C3=A9 Lureau vscclient needs to call socket_init() for portability. Moving to osdep.c since it has no internal dependency. Signed-off-by: Marc-Andr=C3=A9 Lureau --- util/osdep.c | 23 +++++++++++++++++++++++ util/qemu-sockets.c | 24 ------------------------ 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/util/osdep.c b/util/osdep.c index bd59ac9..6ae5aaf 100644 --- a/util/osdep.c +++ b/util/osdep.c @@ -406,3 +406,26 @@ bool fips_get_state(void) return fips_enabled; } =20 +#ifdef _WIN32 +static void socket_cleanup(void) +{ + WSACleanup(); +} +#endif + +int socket_init(void) +{ +#ifdef _WIN32 + WSADATA Data; + int ret, err; + + ret =3D WSAStartup(MAKEWORD(2, 2), &Data); + if (ret !=3D 0) { + err =3D WSAGetLastError(); + fprintf(stderr, "WSAStartup: %d\n", err); + return -1; + } + atexit(socket_cleanup); +#endif + return 0; +} diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index 83e4e08..f42f0b7 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -973,27 +973,3 @@ int socket_dgram(SocketAddress *remote, SocketAddres= s *local, Error **errp) qemu_opts_del(opts); return fd; } - -#ifdef _WIN32 -static void socket_cleanup(void) -{ - WSACleanup(); -} -#endif - -int socket_init(void) -{ -#ifdef _WIN32 - WSADATA Data; - int ret, err; - - ret =3D WSAStartup(MAKEWORD(2,2), &Data); - if (ret !=3D 0) { - err =3D WSAGetLastError(); - fprintf(stderr, "WSAStartup: %d\n", err); - return -1; - } - atexit(socket_cleanup); -#endif - return 0; -} --=20 1.8.1.4