From patchwork Sat Dec 25 20:52:10 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Riteau X-Patchwork-Id: 76701 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 45BC0B70E4 for ; Sun, 26 Dec 2010 07:54:09 +1100 (EST) Received: from localhost ([127.0.0.1]:38349 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PWb7u-00020G-9d for incoming@patchwork.ozlabs.org; Sat, 25 Dec 2010 15:54:06 -0500 Received: from [140.186.70.92] (port=42536 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PWb7Q-000201-Su for qemu-devel@nongnu.org; Sat, 25 Dec 2010 15:53:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PWb7P-00025n-9O for qemu-devel@nongnu.org; Sat, 25 Dec 2010 15:53:36 -0500 Received: from mail3-relais-sop.national.inria.fr ([192.134.164.104]:2202) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PWb7O-00025f-UL for qemu-devel@nongnu.org; Sat, 25 Dec 2010 15:53:35 -0500 X-IronPort-AV: E=Sophos;i="4.60,229,1291590000"; d="scan'208";a="71377029" Received: from lns-bzn-57-82-249-50-211.adsl.proxad.net (HELO localhost.localdomain) ([82.249.50.211]) by mail3-relais-sop.national.inria.fr with ESMTP/TLS/DHE-RSA-AES256-SHA; 25 Dec 2010 21:53:32 +0100 From: Pierre Riteau To: qemu-devel@nongnu.org Date: Sat, 25 Dec 2010 21:52:10 +0100 Message-Id: <1293310330-12067-1-git-send-email-Pierre.Riteau@irisa.fr> X-Mailer: git-send-email 1.7.3.4 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Pierre Riteau Subject: [Qemu-devel] [PATCH] Avoid divide by zero when there is no block device to migrate X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org When block migration is requested and no read-write block device is present, a divide by zero exception is triggered because total_sector_sum equals zero. Signed-off-by: Pierre Riteau --- block-migration.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/block-migration.c b/block-migration.c index 1475325..d62d63e 100644 --- a/block-migration.c +++ b/block-migration.c @@ -350,7 +350,11 @@ static int blk_mig_save_bulked_block(Monitor *mon, QEMUFile *f) } } - progress = completed_sector_sum * 100 / block_mig_state.total_sector_sum; + if (block_mig_state.total_sector_sum != 0) { + progress = completed_sector_sum * 100 / block_mig_state.total_sector_sum; + } else { + progress = 100; + } if (progress != block_mig_state.prev_progress) { block_mig_state.prev_progress = progress; qemu_put_be64(f, (progress << BDRV_SECTOR_BITS)