From patchwork Tue Aug 23 13:21:13 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frediano Ziglio X-Patchwork-Id: 111114 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 1EBBFB6F7E for ; Tue, 23 Aug 2011 23:58:39 +1000 (EST) Received: from localhost ([::1]:47522 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qvqvr-0002wb-JD for incoming@patchwork.ozlabs.org; Tue, 23 Aug 2011 09:22:19 -0400 Received: from eggs.gnu.org ([140.186.70.92]:58457) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QvqvO-0001Sd-61 for qemu-devel@nongnu.org; Tue, 23 Aug 2011 09:21:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QvqvN-0006xG-Cl for qemu-devel@nongnu.org; Tue, 23 Aug 2011 09:21:50 -0400 Received: from mail-yi0-f45.google.com ([209.85.218.45]:60514) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QvqvN-0006x6-2K for qemu-devel@nongnu.org; Tue, 23 Aug 2011 09:21:49 -0400 Received: by yih10 with SMTP id 10so87464yih.4 for ; Tue, 23 Aug 2011 06:21:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=n9Y+9rz8epK0OAJ0gL1Hyto8R19frBlSXklShJLaB0g=; b=H5PUlUdFvnTNXauUyMlHUFmIBFivfS5JjnOglab6sctQE9dE1QfFSW78WZeyoqq7wU V17S7w7TxWrF+6pIteI7dgk+KlZYG9lKivQuHmqltsn0eSwePhWcvNwvY6xF1TE/auAL XNJ6JiBSfy2jgOFwI0pfrrPIHTQZs3ZPP4lVI= Received: by 10.236.37.230 with SMTP id y66mr22437598yha.10.1314105708554; Tue, 23 Aug 2011 06:21:48 -0700 (PDT) Received: from obol602.omnitel.it (tor-exit-router37-readme.formlessnetworking.net [199.48.147.37]) by mx.google.com with ESMTPS id a29sm227805yhj.3.2011.08.23.06.21.44 (version=SSLv3 cipher=OTHER); Tue, 23 Aug 2011 06:21:47 -0700 (PDT) From: Frediano Ziglio To: kwolf@redhat.com Date: Tue, 23 Aug 2011 15:21:13 +0200 Message-Id: <1314105682-28396-7-git-send-email-freddy77@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1314105682-28396-1-git-send-email-freddy77@gmail.com> References: <1314105682-28396-1-git-send-email-freddy77@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.218.45 Cc: qemu-devel@nongnu.org, Frediano Ziglio Subject: [Qemu-devel] [PATCH v3 06/15] qcow2: removed unused fields 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: Frediano Ziglio --- block/qcow2.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index bb6c75e..4171b47 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -381,11 +381,8 @@ typedef struct QCowAIOCB { uint64_t bytes_done; uint64_t cluster_offset; uint8_t *cluster_data; - bool is_write; QEMUIOVector hd_qiov; - QEMUBH *bh; QCowL2Meta l2meta; - QLIST_ENTRY(QCowAIOCB) next_depend; } QCowAIOCB; /* @@ -517,13 +514,12 @@ static int qcow2_aio_read_cb(QCowAIOCB *acb) static QCowAIOCB *qcow2_aio_setup(BlockDriverState *bs, int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, BlockDriverCompletionFunc *cb, - void *opaque, int is_write, QCowAIOCB *acb) + void *opaque, QCowAIOCB *acb) { memset(acb, 0, sizeof(*acb)); acb->common.bs = bs; acb->sector_num = sector_num; acb->qiov = qiov; - acb->is_write = is_write; qemu_iovec_init(&acb->hd_qiov, qiov->niov); @@ -543,7 +539,7 @@ static int qcow2_co_readv(BlockDriverState *bs, int64_t sector_num, QCowAIOCB acb; int ret; - qcow2_aio_setup(bs, sector_num, qiov, nb_sectors, NULL, NULL, 0, &acb); + qcow2_aio_setup(bs, sector_num, qiov, nb_sectors, NULL, NULL, &acb); qemu_co_mutex_lock(&s->lock); do { @@ -658,7 +654,7 @@ static int qcow2_co_writev(BlockDriverState *bs, QCowAIOCB acb; int ret; - qcow2_aio_setup(bs, sector_num, qiov, nb_sectors, NULL, NULL, 1, &acb); + qcow2_aio_setup(bs, sector_num, qiov, nb_sectors, NULL, NULL, &acb); s->cluster_cache_offset = -1; /* disable compressed cache */ qemu_co_mutex_lock(&s->lock);