From patchwork Mon Feb 25 22:31:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 223059 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 AA7AC2C0087 for ; Tue, 26 Feb 2013 09:31:43 +1100 (EST) Received: from localhost ([::1]:39202 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UA6aB-00019R-GX for incoming@patchwork.ozlabs.org; Mon, 25 Feb 2013 17:31:39 -0500 Received: from eggs.gnu.org ([208.118.235.92]:52758) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UA6a2-00019H-Rf for qemu-devel@nongnu.org; Mon, 25 Feb 2013 17:31:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UA6a1-0002lf-8q for qemu-devel@nongnu.org; Mon, 25 Feb 2013 17:31:30 -0500 Received: from mail-pb0-f52.google.com ([209.85.160.52]:65170) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UA6a1-0002lZ-2k for qemu-devel@nongnu.org; Mon, 25 Feb 2013 17:31:29 -0500 Received: by mail-pb0-f52.google.com with SMTP id ma3so1941608pbc.39 for ; Mon, 25 Feb 2013 14:31:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:mime-version :content-type:content-transfer-encoding; bh=zIK0Z3gzDjqPe/qp7rEOI6tUULlKNyF8J/dvfPJykzE=; b=B2tACAUxLqqJLmRLaivQ1AjGhZTaZKEjuc+vWnoF5bJGb/01UpohnCeernRTmXmo1r RdHjmUSL/C6TwNFf01JBuzodOc3LELXMt9dG/D8/1bYX1641pvhps+GEaTf0xGLs0+H0 1pibsa24y19laMR/pb0QKfe110/1vrYz7edJ7khpCDkyjrezsZRDQ4AoTn3tYGghOp5E mc7dio+cq9E1yojS4fhs1iz3zeT29jlKZmT+/hswF6yuFucRly5fBq4DdT7i8aFds7Ra 2dATExFkQjH/xhALuNq9YsEimy4lcoIdzsC42UKm0E7P9GQqlWUK6rbfeEIhpCuiAivA 0etg== X-Received: by 10.68.0.170 with SMTP id 10mr20535340pbf.59.1361831488069; Mon, 25 Feb 2013 14:31:28 -0800 (PST) Received: from localhost (142.Red-88-13-163.dynamicIP.rima-tde.net. [88.13.163.142]) by mx.google.com with ESMTPS id d8sm15065400pax.23.2013.02.25.14.31.24 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 25 Feb 2013 14:31:27 -0800 (PST) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Mon, 25 Feb 2013 23:31:11 +0100 Message-Id: <1361831476-5908-1-git-send-email-marcandre.lureau@gmail.com> X-Mailer: git-send-email 1.8.1.1.439.g50a6b54 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.160.52 Cc: pbonzini@redhat.com, alevy@redhat.com, kraxel@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [Qemu-devel] [PATCH v2 1/6] util: move socket_init() to osdep.c 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 From: Marc-André Lureau vscclient needs to call socket_init() for portability. Moving to osdep.c since it has no internal dependency. Signed-off-by: Marc-André 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 5b51a03..3c1a0a3 100644 --- a/util/osdep.c +++ b/util/osdep.c @@ -400,3 +400,26 @@ bool fips_get_state(void) return fips_enabled; } +#ifdef _WIN32 +static void socket_cleanup(void) +{ + WSACleanup(); +} +#endif + +int socket_init(void) +{ +#ifdef _WIN32 + WSADATA Data; + int ret, err; + + ret = WSAStartup(MAKEWORD(2, 2), &Data); + if (ret != 0) { + err = 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 1350ccc..d8994c1 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -944,27 +944,3 @@ int socket_listen(SocketAddress *addr, 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 = WSAStartup(MAKEWORD(2,2), &Data); - if (ret != 0) { - err = WSAGetLastError(); - fprintf(stderr, "WSAStartup: %d\n", err); - return -1; - } - atexit(socket_cleanup); -#endif - return 0; -}