From patchwork Thu Jul 28 07:40:38 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frediano Ziglio X-Patchwork-Id: 107195 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 83768B6F00 for ; Thu, 28 Jul 2011 17:41:33 +1000 (EST) Received: from localhost ([::1]:48370 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QmLDV-0004DW-Gn for incoming@patchwork.ozlabs.org; Thu, 28 Jul 2011 03:41:13 -0400 Received: from eggs.gnu.org ([140.186.70.92]:44502) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QmLDB-00042Y-Ry for qemu-devel@nongnu.org; Thu, 28 Jul 2011 03:40:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QmLDA-0004c3-SW for qemu-devel@nongnu.org; Thu, 28 Jul 2011 03:40:53 -0400 Received: from mail-fx0-f45.google.com ([209.85.161.45]:32869) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QmLDA-0004Z7-Lb for qemu-devel@nongnu.org; Thu, 28 Jul 2011 03:40:52 -0400 Received: by mail-fx0-f45.google.com with SMTP id b27so719180fxb.4 for ; Thu, 28 Jul 2011 00:40:52 -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=KeKGqzpeF2W1nHwwm6nbqkAaIRmxeldfxxVzQ47MPvg+xvYVy3uQYCdQZfd0kQaDpx yokUIiSoQwkpwqrht1fDZON/sq3DCorea84c0SwAjMJphkChBQMvU4A4HAopov/mNRKW KQkpnuNJA6Afp0lKseTyRNmNTmnaXk0GuMA74= Received: by 10.223.58.79 with SMTP id f15mr616480fah.53.1311838851570; Thu, 28 Jul 2011 00:40:51 -0700 (PDT) Received: from obol602.omnitel.it ([87.236.194.191]) by mx.google.com with ESMTPS id y15sm287187fah.35.2011.07.28.00.40.48 (version=SSLv3 cipher=OTHER); Thu, 28 Jul 2011 00:40:50 -0700 (PDT) From: Frediano Ziglio To: Kevin Wolf Date: Thu, 28 Jul 2011 09:40:38 +0200 Message-Id: <1311838841-4853-6-git-send-email-freddy77@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1311838841-4853-1-git-send-email-freddy77@gmail.com> References: <1311838841-4853-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.161.45 Cc: qemu-devel@nongnu.org, Frediano Ziglio Subject: [Qemu-devel] [PATCH 5/8] 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;