From patchwork Tue Aug 23 13:21:17 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frediano Ziglio X-Patchwork-Id: 111113 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 CA92DB6F9B for ; Tue, 23 Aug 2011 23:57:36 +1000 (EST) Received: from localhost ([::1]:38103 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QvrTx-00046e-Dr for incoming@patchwork.ozlabs.org; Tue, 23 Aug 2011 09:57:33 -0400 Received: from eggs.gnu.org ([140.186.70.92]:58560) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qvqvr-0002y2-9h for qemu-devel@nongnu.org; Tue, 23 Aug 2011 09:22:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qvqvp-0007Dc-Uh for qemu-devel@nongnu.org; Tue, 23 Aug 2011 09:22:19 -0400 Received: from mail-yx0-f173.google.com ([209.85.213.173]:45294) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qvqvp-0007DE-S7 for qemu-devel@nongnu.org; Tue, 23 Aug 2011 09:22:17 -0400 Received: by yxt3 with SMTP id 3so86330yxt.4 for ; Tue, 23 Aug 2011 06:22:17 -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=HMvC3MITIJjupaDN4RKOqgdN7Il3xhHwxLBoIRsXVDA=; b=NMxzlGwI5FZ7JNuzM5YozANkrtAJBdExzG8zNal86n188DkRJIqCwAApZq0lnI2mav K0wtooQ25Halv0WKhyWoZ+x41l7SruP1l9/1ezOMcetIb/WyixHnhJyGGaig3DMFAfi+ HY6e2mRk7uNA6I3bichvNFcixuD9wRu6+eWl4= Received: by 10.236.175.131 with SMTP id z3mr16542305yhl.9.1314105737610; Tue, 23 Aug 2011 06:22:17 -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.22.10 (version=SSLv3 cipher=OTHER); Tue, 23 Aug 2011 06:22:17 -0700 (PDT) From: Frediano Ziglio To: kwolf@redhat.com Date: Tue, 23 Aug 2011 15:21:17 +0200 Message-Id: <1314105682-28396-11-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.213.173 Cc: qemu-devel@nongnu.org, Frediano Ziglio Subject: [Qemu-devel] [PATCH v3 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 7e13283..519fc8b 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;