From patchwork Tue Jun 22 14:09:22 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 56508 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 D99ADB6F0E for ; Wed, 23 Jun 2010 00:16:11 +1000 (EST) Received: from localhost ([127.0.0.1]:36694 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OR4Gm-0008VI-4i for incoming@patchwork.ozlabs.org; Tue, 22 Jun 2010 10:16:08 -0400 Received: from [140.186.70.92] (port=43246 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OR4Ag-0005dz-TU for qemu-devel@nongnu.org; Tue, 22 Jun 2010 10:09:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OR4Af-0007aI-0t for qemu-devel@nongnu.org; Tue, 22 Jun 2010 10:09:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:12588) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OR4Ae-0007a5-QR for qemu-devel@nongnu.org; Tue, 22 Jun 2010 10:09:48 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5ME9k4U008596 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 22 Jun 2010 10:09:46 -0400 Received: from localhost.localdomain (dhcp-5-217.str.redhat.com [10.32.5.217]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o5ME9fjn024621; Tue, 22 Jun 2010 10:09:45 -0400 From: Kevin Wolf To: anthony@codemonkey.ws Date: Tue, 22 Jun 2010 16:09:22 +0200 Message-Id: <1277215773-27357-4-git-send-email-kwolf@redhat.com> In-Reply-To: <1277215773-27357-1-git-send-email-kwolf@redhat.com> References: <1277215773-27357-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 03/14] block: fix physical_block_size calculation 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 From: Christoph Hellwig Both SCSI and virtio expect the physical block size relative to the logical block size. So get the factor first before calculating the log2. Reported-by: Mike Cao Signed-off-by: Christoph Hellwig Signed-off-by: Kevin Wolf --- block_int.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/block_int.h b/block_int.h index e3bfd19..b64a009 100644 --- a/block_int.h +++ b/block_int.h @@ -224,7 +224,9 @@ static inline unsigned int get_physical_block_exp(BlockConf *conf) { unsigned int exp = 0, size; - for (size = conf->physical_block_size; size > 512; size >>= 1) { + for (size = conf->physical_block_size; + size > conf->logical_block_size; + size >>= 1) { exp++; }