From patchwork Tue Aug 9 07:46:45 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frediano Ziglio X-Patchwork-Id: 109152 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 2E509B6F89 for ; Tue, 9 Aug 2011 17:48:12 +1000 (EST) Received: from localhost ([::1]:53382 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qqh2l-0006oE-UQ for incoming@patchwork.ozlabs.org; Tue, 09 Aug 2011 03:48:07 -0400 Received: from eggs.gnu.org ([140.186.70.92]:40213) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qqh1y-0005C8-W2 for qemu-devel@nongnu.org; Tue, 09 Aug 2011 03:47:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qqh1u-0006zH-J8 for qemu-devel@nongnu.org; Tue, 09 Aug 2011 03:47:15 -0400 Received: from mail-ew0-f45.google.com ([209.85.215.45]:37438) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qqh1u-0006lw-Bz for qemu-devel@nongnu.org; Tue, 09 Aug 2011 03:47:14 -0400 Received: by mail-ew0-f45.google.com with SMTP id 24so2618658ewy.4 for ; Tue, 09 Aug 2011 00:47:14 -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=JDkqBzAIK4+zyqBOwPWgOz1+KvJKvNL6IZoRZAfwz4g=; b=BPo678maC5YAGuhVdz3J9ZqJVVXL5et8x+nI0bXmcHZ/Jd26GKbMLCJAK69yd6DTUj e2DjA5pQMG3T+XGRLzwwENdZ1RrxVkSoUf074g4FXdZI056Kz4Lv8Fc2Ym/kknb2nZRr AOT+TwNORMbJv3v1/aU+KQEP49gfw36x0vBr0= Received: by 10.213.3.201 with SMTP id 9mr1346641ebo.11.1312876033897; Tue, 09 Aug 2011 00:47:13 -0700 (PDT) Received: from obol602.omnitel.it ([206.217.137.183]) by mx.google.com with ESMTPS id p49sm2857459eef.58.2011.08.09.00.47.10 (version=SSLv3 cipher=OTHER); Tue, 09 Aug 2011 00:47:13 -0700 (PDT) From: Frediano Ziglio To: kwolf@redhat.com Date: Tue, 9 Aug 2011 09:46:45 +0200 Message-Id: <1312876010-15361-11-git-send-email-freddy77@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1312876010-15361-1-git-send-email-freddy77@gmail.com> References: <1312876010-15361-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.215.45 Cc: qemu-devel@nongnu.org, Frediano Ziglio Subject: [Qemu-devel] [PATCH v2 10/15] qcow2: remove common from QCowAIOCB 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 | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 446946e..c7445cc 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -373,7 +373,7 @@ int qcow2_backing_read1(BlockDriverState *bs, QEMUIOVector *qiov, } typedef struct QCowAIOCB { - BlockDriverAIOCB common; + BlockDriverState *bs; int64_t sector_num; QEMUIOVector *qiov; int remaining_sectors; @@ -388,7 +388,7 @@ typedef struct QCowAIOCB { */ static int qcow2_aio_read_cb(QCowAIOCB *acb) { - BlockDriverState *bs = acb->common.bs; + BlockDriverState *bs = acb->bs; BDRVQcowState *s = bs->opaque; int index_in_cluster, n1; int ret; @@ -504,7 +504,7 @@ static QCowAIOCB *qcow2_aio_setup(BlockDriverState *bs, int64_t sector_num, void *opaque, QCowAIOCB *acb) { memset(acb, 0, sizeof(*acb)); - acb->common.bs = bs; + acb->bs = bs; acb->sector_num = sector_num; acb->qiov = qiov; @@ -556,7 +556,7 @@ static void run_dependent_requests(BDRVQcowState *s, QCowL2Meta *m) */ static int qcow2_aio_write_cb(QCowAIOCB *acb) { - BlockDriverState *bs = acb->common.bs; + BlockDriverState *bs = acb->bs; BDRVQcowState *s = bs->opaque; int index_in_cluster; int n_end;