From patchwork Fri Dec 23 15:26:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 133086 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 53AF4B6FD6 for ; Sat, 24 Dec 2011 02:49:23 +1100 (EST) Received: from localhost ([::1]:57823 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Re7N1-0004vn-Rh for incoming@patchwork.ozlabs.org; Fri, 23 Dec 2011 10:49:19 -0500 Received: from eggs.gnu.org ([140.186.70.92]:50944) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Re731-0001n1-6N for qemu-devel@nongnu.org; Fri, 23 Dec 2011 10:28:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Re72x-0006cL-4o for qemu-devel@nongnu.org; Fri, 23 Dec 2011 10:28:39 -0500 Received: from mail-iy0-f173.google.com ([209.85.210.173]:65051) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Re72x-0006XR-0l for qemu-devel@nongnu.org; Fri, 23 Dec 2011 10:28:35 -0500 Received: by mail-iy0-f173.google.com with SMTP id j37so17392251iag.4 for ; Fri, 23 Dec 2011 07:28:34 -0800 (PST) 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=orZldl4c5ZhzINiFO2eCLqWbhlX8Aw0WbqUA0XxE/YE=; b=PhQBjV82MNOmdjY4xbwDzmXMLB+VNZjNjXyTrCZQWWGzAOMD/o2xYunpnkodhahKr1 ldWA8AqVWXagHsvImRhfZTK73OBvLVdtfVswh0Ibk87mEi6u4Lpb3giov77TrirtnEyg XAOuQPaj5S7Y3FIhMdr5eZUfmctVRsxPqjho4= Received: by 10.50.51.168 with SMTP id l8mr14175444igo.5.1324654114668; Fri, 23 Dec 2011 07:28:34 -0800 (PST) Received: from localhost.localdomain (93-34-178-147.ip50.fastwebnet.it. [93.34.178.147]) by mx.google.com with ESMTPS id aq5sm42055557igc.5.2011.12.23.07.28.28 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 23 Dec 2011 07:28:33 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 23 Dec 2011 16:26:15 +0100 Message-Id: <1324653990-20074-12-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.7.1 In-Reply-To: <1324653990-20074-1-git-send-email-pbonzini@redhat.com> References: <1324653990-20074-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.210.173 Subject: [Qemu-devel] [PATCH 11/26] qemu-nbd: remove offset argument to nbd_trip 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 The argument is write-only. Signed-off-by: Paolo Bonzini --- nbd.c | 8 +++----- nbd.h | 2 +- qemu-nbd.c | 3 +-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/nbd.c b/nbd.c index 73fedeb..1df2b91 100644 --- a/nbd.c +++ b/nbd.c @@ -583,8 +583,9 @@ static int nbd_send_reply(int csock, struct nbd_reply *reply) return 0; } -int nbd_trip(BlockDriverState *bs, int csock, off_t size, uint64_t dev_offset, - off_t *offset, uint32_t nbdflags, uint8_t *data, int data_size) +int nbd_trip(BlockDriverState *bs, int csock, off_t size, + uint64_t dev_offset, uint32_t nbdflags, + uint8_t *data, int data_size) { struct nbd_request request; struct nbd_reply reply; @@ -635,7 +636,6 @@ int nbd_trip(BlockDriverState *bs, int csock, off_t size, uint64_t dev_offset, reply.error = -ret; request.len = 0; } - *offset += request.len; TRACE("Read %u byte(s)", request.len); @@ -684,8 +684,6 @@ int nbd_trip(BlockDriverState *bs, int csock, off_t size, uint64_t dev_offset, request.len = 0; } - *offset += request.len; - if (request.type & NBD_CMD_FLAG_FUA) { ret = bdrv_flush(bs); if (ret < 0) { diff --git a/nbd.h b/nbd.h index 61553f4..ebdb2db 100644 --- a/nbd.h +++ b/nbd.h @@ -72,7 +72,7 @@ int nbd_init(int fd, int csock, uint32_t flags, off_t size, size_t blocksize); int nbd_send_request(int csock, struct nbd_request *request); int nbd_receive_reply(int csock, struct nbd_reply *reply); int nbd_trip(BlockDriverState *bs, int csock, off_t size, uint64_t dev_offset, - off_t *offset, uint32_t nbdflags, uint8_t *data, int data_size); + uint32_t nbdflags, uint8_t *data, int data_size); int nbd_client(int fd); int nbd_disconnect(int fd); diff --git a/qemu-nbd.c b/qemu-nbd.c index 291cba2..f9ee9c5 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -248,7 +248,6 @@ int main(int argc, char **argv) { BlockDriverState *bs; off_t dev_offset = 0; - off_t offset = 0; uint32_t nbdflags = 0; bool disconnect = false; const char *bindto = "0.0.0.0"; @@ -542,7 +541,7 @@ int main(int argc, char **argv) for (i = 1; i < nb_fds && ret; i++) { if (FD_ISSET(sharing_fds[i], &fds)) { if (nbd_trip(bs, sharing_fds[i], fd_size, dev_offset, - &offset, nbdflags, data, NBD_BUFFER_SIZE) != 0) { + nbdflags, data, NBD_BUFFER_SIZE) != 0) { close(sharing_fds[i]); nb_fds--; sharing_fds[i] = sharing_fds[nb_fds];