From patchwork Fri Feb 22 16:36:22 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 222568 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C85902C0299 for ; Sat, 23 Feb 2013 04:05:25 +1100 (EST) Received: from localhost ([::1]:56167 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U8vdW-0005s0-UG for incoming@patchwork.ozlabs.org; Fri, 22 Feb 2013 11:38:14 -0500 Received: from eggs.gnu.org ([208.118.235.92]:58811) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U8vcw-0004vM-HK for qemu-devel@nongnu.org; Fri, 22 Feb 2013 11:37:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U8vcu-0006lL-1n for qemu-devel@nongnu.org; Fri, 22 Feb 2013 11:37:38 -0500 Received: from mail-ve0-f169.google.com ([209.85.128.169]:52701) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U8vct-0006lD-U0 for qemu-devel@nongnu.org; Fri, 22 Feb 2013 11:37:35 -0500 Received: by mail-ve0-f169.google.com with SMTP id 15so731425vea.0 for ; Fri, 22 Feb 2013 08:37:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=fQCg+EnDFlA1ABaURe+kBYnaUx+P22fCTj7oEkMyXMQ=; b=S/GmZyBiisSfUqxmOaHNYElk6Y4+MskG56fWnCAYTX6I+rdWUVrIZVYto4offmPZkB bJuZdFkaUqjFi570crFa7vEZzLzg/SWchgQn2M2H9Otwhji9axlX6CakKbu3GlqhQa0l Er0n3cBiTmubhMHDzvAabOitH5fySAGv+XZer/ydekN74obMYSg9uEdIMth9/cpYkBFV dpfhtIBtb7WeN2JJTMS2nJ/QCX9ZgmiCAMZVn25Ova6UogtLCE/Wt3uC3eDrWi+Yj1Ge YQ78/5fUs1gvxrzPRYUbYnePhTgBSPVdQOLIUv5Scg/MxPYsYX0lXSuBflh+4Wv5nyt6 P/KA== X-Received: by 10.220.8.75 with SMTP id g11mr3314585vcg.60.1361551055518; Fri, 22 Feb 2013 08:37:35 -0800 (PST) Received: from yakj.usersys.redhat.com (93-34-179-137.ip50.fastwebnet.it. [93.34.179.137]) by mx.google.com with ESMTPS id tp10sm4291733vec.1.2013.02.22.08.37.33 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 22 Feb 2013 08:37:34 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 22 Feb 2013 17:36:22 +0100 Message-Id: <1361551008-12430-17-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1361551008-12430-1-git-send-email-pbonzini@redhat.com> References: <1361551008-12430-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.128.169 Cc: owasserm@redhat.com, quintela@redhat.com Subject: [Qemu-devel] [PATCH 16/42] block-migration: remove variables that are never read 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 Reviewed-by: Orit Wasserman Reviewed-by: Juan Quintela Signed-off-by: Paolo Bonzini --- block-migration.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/block-migration.c b/block-migration.c index e6c917d..e72f322 100644 --- a/block-migration.c +++ b/block-migration.c @@ -50,7 +50,6 @@ typedef struct BlkMigDevState { int64_t cur_dirty; int64_t completed_sectors; int64_t total_sectors; - int64_t dirty; QSIMPLEQ_ENTRY(BlkMigDevState) entry; unsigned long *aio_bitmap; } BlkMigDevState; @@ -78,7 +77,6 @@ typedef struct BlkMigState { int64_t total_sector_sum; int prev_progress; int bulk_completed; - long double prev_time_offset; } BlkMigState; static BlkMigState block_mig_state; @@ -179,13 +177,10 @@ static void alloc_aio_bitmap(BlkMigDevState *bmds) static void blk_mig_read_cb(void *opaque, int ret) { - long double curr_time = qemu_get_clock_ns(rt_clock); BlkMigBlock *blk = opaque; blk->ret = ret; - block_mig_state.prev_time_offset = curr_time; - QSIMPLEQ_INSERT_TAIL(&block_mig_state.blk_list, blk, entry); bmds_set_aio_inflight(blk->bmds, blk->sector, blk->nr_sectors, 0); @@ -236,10 +231,6 @@ static int mig_save_device_bulk(QEMUFile *f, BlkMigDevState *bmds) blk->iov.iov_len = nr_sectors * BDRV_SECTOR_SIZE; qemu_iovec_init_external(&blk->qiov, &blk->iov, 1); - if (block_mig_state.submitted == 0) { - block_mig_state.prev_time_offset = qemu_get_clock_ns(rt_clock); - } - blk->aiocb = bdrv_aio_readv(bs, cur_sector, &blk->qiov, nr_sectors, blk_mig_read_cb, blk); block_mig_state.submitted++; @@ -382,10 +373,6 @@ static int mig_save_device_dirty(QEMUFile *f, BlkMigDevState *bmds, blk->iov.iov_len = nr_sectors * BDRV_SECTOR_SIZE; qemu_iovec_init_external(&blk->qiov, &blk->iov, 1); - if (block_mig_state.submitted == 0) { - block_mig_state.prev_time_offset = qemu_get_clock_ns(rt_clock); - } - blk->aiocb = bdrv_aio_readv(bmds->bs, sector, &blk->qiov, nr_sectors, blk_mig_read_cb, blk); block_mig_state.submitted++;