From patchwork Mon Oct 10 09:37:45 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 118659 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 75DB1B70BB for ; Mon, 10 Oct 2011 20:38:27 +1100 (EST) Received: from localhost ([::1]:44040 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RDCJU-0001W0-Ms for incoming@patchwork.ozlabs.org; Mon, 10 Oct 2011 05:38:24 -0400 Received: from eggs.gnu.org ([140.186.70.92]:55805) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RDCJD-000172-Bt for qemu-devel@nongnu.org; Mon, 10 Oct 2011 05:38:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RDCJC-0000ve-50 for qemu-devel@nongnu.org; Mon, 10 Oct 2011 05:38:07 -0400 Received: from mail-bw0-f45.google.com ([209.85.214.45]:62527) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RDCJC-0000ux-01 for qemu-devel@nongnu.org; Mon, 10 Oct 2011 05:38:06 -0400 Received: by mail-bw0-f45.google.com with SMTP id zv15so8235464bkb.4 for ; Mon, 10 Oct 2011 02:38:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; bh=LW4CC0leUMqGMyN22rSDontTXicxADlodk9hZAkfiOk=; b=R3SdLGCzCz5csaWVZD/DF69esEsVYGPpx/G5OsLAr4BJ4BpQzd/dewxWiD8mOtnnzK f77dZ7vbR4ysRYEufisjik+SJ36e8nwUqT76+WJJLsA3uKU/yFmbv+OQKqtAIzX5nZ2S DxZX5la9h2mD4WX6fJh6S5LbB1k3wcikQw5qA= Received: by 10.204.131.217 with SMTP id y25mr5480802bks.98.1318239485585; Mon, 10 Oct 2011 02:38:05 -0700 (PDT) Received: from localhost.localdomain (93-34-218-143.ip51.fastwebnet.it. [93.34.218.143]) by mx.google.com with ESMTPS id e14sm17182122bka.0.2011.10.10.02.38.04 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 10 Oct 2011 02:38:05 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 10 Oct 2011 11:37:45 +0200 Message-Id: <1318239477-31451-4-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1318239477-31451-1-git-send-email-pbonzini@redhat.com> References: <1318239477-31451-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.214.45 Subject: [Qemu-devel] [PATCH 03/15] move corking functions 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 Signed-off-by: Paolo Bonzini --- block/sheepdog.c | 20 ++------------------ osdep.c | 9 +++++++++ qemu_socket.h | 1 + 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/block/sheepdog.c b/block/sheepdog.c index d168681..ddf7fa2 100644 --- a/block/sheepdog.c +++ b/block/sheepdog.c @@ -702,22 +702,6 @@ static int aio_flush_request(void *opaque) return !QLIST_EMPTY(&s->outstanding_aio_head); } -#if !defined(SOL_TCP) || !defined(TCP_CORK) - -static int set_cork(int fd, int v) -{ - return 0; -} - -#else - -static int set_cork(int fd, int v) -{ - return setsockopt(fd, SOL_TCP, TCP_CORK, &v, sizeof(v)); -} - -#endif - static int set_nodelay(int fd) { int ret, opt; @@ -923,7 +907,7 @@ static int coroutine_fn add_aio_request(BDRVSheepdogState *s, AIOReq *aio_req, s->co_send = qemu_coroutine_self(); qemu_aio_set_fd_handler(s->fd, co_read_response, co_write_request, aio_flush_request, NULL, s); - set_cork(s->fd, 1); + socket_set_cork(s->fd, 1); /* send a header */ ret = qemu_co_send(s->fd, &hdr, sizeof(hdr)); @@ -940,7 +924,7 @@ static int coroutine_fn add_aio_request(BDRVSheepdogState *s, AIOReq *aio_req, } } - set_cork(s->fd, 0); + socket_set_cork(s->fd, 0); qemu_aio_set_fd_handler(s->fd, co_read_response, NULL, aio_flush_request, NULL, s); qemu_co_mutex_unlock(&s->lock); diff --git a/osdep.c b/osdep.c index 70bad27..3e6bada 100644 --- a/osdep.c +++ b/osdep.c @@ -48,6 +48,15 @@ extern int madvise(caddr_t, size_t, int); #include "trace.h" #include "qemu_socket.h" +int socket_set_cork(int fd, int v) +{ +#if defined(SOL_TCP) && defined(TCP_CORK) + return setsockopt(fd, SOL_TCP, TCP_CORK, &v, sizeof(v)); +#else + return 0; +#endif +} + int qemu_madvise(void *addr, size_t len, int advice) { if (advice == QEMU_MADV_INVALID) { diff --git a/qemu_socket.h b/qemu_socket.h index 9e32fac..fe4cf6c 100644 --- a/qemu_socket.h +++ b/qemu_socket.h @@ -35,6 +35,7 @@ int inet_aton(const char *cp, struct in_addr *ia); /* misc helpers */ int qemu_socket(int domain, int type, int protocol); int qemu_accept(int s, struct sockaddr *addr, socklen_t *addrlen); +int socket_set_cork(int fd, int v); void socket_set_block(int fd); void socket_set_nonblock(int fd); int send_all(int fd, const void *buf, int len1);