From patchwork Wed Oct 10 14:02:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 190645 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 04E6C2C0087 for ; Thu, 11 Oct 2012 01:04:02 +1100 (EST) Received: from localhost ([::1]:35750 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TLwtE-0001pc-2g for incoming@patchwork.ozlabs.org; Wed, 10 Oct 2012 10:04:00 -0400 Received: from eggs.gnu.org ([208.118.235.92]:48405) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TLwsk-0001Sk-UP for qemu-devel@nongnu.org; Wed, 10 Oct 2012 10:03:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TLwsf-00028y-1M for qemu-devel@nongnu.org; Wed, 10 Oct 2012 10:03:30 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:48668) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TLwse-00028a-RB for qemu-devel@nongnu.org; Wed, 10 Oct 2012 10:03:24 -0400 Received: by mail-pb0-f45.google.com with SMTP id rp2so726564pbb.4 for ; Wed, 10 Oct 2012 07:03:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=8W+ctGMTfoMgQj+QOXiDmWWF0gftheRcBvBOjOHpYns=; b=0xCw9DDznTFw8CpFg7z+WVIvVgP2UrOybhR5OCE0SciKBOmOG6WDd/O1NAfkrpN0qy e3vkmHT7l7sDaTVZoIMnOuKgBpPJI/1LMuhRxIbGQWUQeJOfcpE0En21B7T2yoJ07nNE RuZU2LtY6epKPafu1mHYB1mo/D9wstVm922f3GnH24WQwWbP35F80SoSnNE2Kk1CkEAI EI9yO7VWdoEI4lVK8AD4tafRrGHHJM4vmFQDIoDR36PI2jGhs+Ud/vP/8SLVfmPpD7b8 ysxXbWS+MJOpWHwVG/wIPmZa/UXuGTy/j64xcFcHZJYsF375AhIboc1SKmkTvdHA3Lrn /Lnw== Received: by 10.68.232.195 with SMTP id tq3mr72121654pbc.70.1349877804434; Wed, 10 Oct 2012 07:03:24 -0700 (PDT) Received: from yakj.usersys.redhat.com (93-34-169-1.ip50.fastwebnet.it. [93.34.169.1]) by mx.google.com with ESMTPS id n7sm905723pav.26.2012.10.10.07.03.22 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 10 Oct 2012 07:03:23 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 10 Oct 2012 16:02:44 +0200 Message-Id: <1349877786-23514-4-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.12.1 In-Reply-To: <1349877786-23514-1-git-send-email-pbonzini@redhat.com> References: <1349877786-23514-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 Cc: lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH 03/25] qemu-sockets: unix_listen and unix_connect are portable 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 They are just wrappers and do not need a Win32-specific version. Reviewed-by: Luiz Capitulino Signed-off-by: Paolo Bonzini --- qemu-sockets.c | 49 +++++++++++++++++-------------------------------- 1 file modificato, 17 inserzioni(+), 32 rimozioni(-) diff --git a/qemu-sockets.c b/qemu-sockets.c index ed062d3..f7e67b6 100644 --- a/qemu-sockets.c +++ b/qemu-sockets.c @@ -730,6 +730,23 @@ int unix_connect_opts(QemuOpts *opts, Error **errp) return sock; } +#else + +int unix_listen_opts(QemuOpts *opts, Error **errp) +{ + error_setg(errp, "unix sockets are not available on windows"); + errno = ENOTSUP; + return -1; +} + +int unix_connect_opts(QemuOpts *opts, Error **errp) +{ + error_setg(errp, "unix sockets are not available on windows"); + errno = ENOTSUP; + return -1; +} +#endif + /* compatibility wrapper */ int unix_listen(const char *str, char *ostr, int olen, Error **errp) { @@ -772,38 +789,6 @@ int unix_connect(const char *path, Error **errp) return sock; } -#else - -int unix_listen_opts(QemuOpts *opts, Error **errp) -{ - error_setg(errp, "unix sockets are not available on windows"); - errno = ENOTSUP; - return -1; -} - -int unix_connect_opts(QemuOpts *opts, Error **errp) -{ - error_setg(errp, "unix sockets are not available on windows"); - errno = ENOTSUP; - return -1; -} - -int unix_listen(const char *path, char *ostr, int olen, Error **errp) -{ - error_setg(errp, "unix sockets are not available on windows"); - errno = ENOTSUP; - return -1; -} - -int unix_connect(const char *path, Error **errp) -{ - error_setg(errp, "unix sockets are not available on windows"); - errno = ENOTSUP; - return -1; -} - -#endif - #ifdef _WIN32 static void socket_cleanup(void) {