From patchwork Tue Apr 28 07:46:49 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Denis V. Lunev" X-Patchwork-Id: 465401 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 010EB14012C for ; Tue, 28 Apr 2015 17:50:06 +1000 (AEST) Received: from localhost ([::1]:59326 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yn0HL-0001rj-Vg for incoming@patchwork.ozlabs.org; Tue, 28 Apr 2015 03:50:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44812) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yn0Ek-0005Q0-TV for qemu-devel@nongnu.org; Tue, 28 Apr 2015 03:47:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yn0Eh-0004Fd-0Y for qemu-devel@nongnu.org; Tue, 28 Apr 2015 03:47:22 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:26787 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yn0Eg-0004FN-HU for qemu-devel@nongnu.org; Tue, 28 Apr 2015 03:47:18 -0400 Received: from hades.sw.ru ([10.30.8.132]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id t3S7ktln031473; Tue, 28 Apr 2015 10:47:16 +0300 (MSK) From: "Denis V. Lunev" To: Date: Tue, 28 Apr 2015 10:46:49 +0300 Message-Id: <1430207220-24458-17-git-send-email-den@openvz.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1430207220-24458-1-git-send-email-den@openvz.org> References: <1430207220-24458-1-git-send-email-den@openvz.org> X-detected-operating-system: by eggs.gnu.org: OpenBSD 3.x X-Received-From: 195.214.232.25 Cc: Kevin Wolf , "Denis V. Lunev" , qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 16/27] block/parallels: keep BAT bitmap data in little endian in memory 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 This will allow to use this data as buffer to BAT update directly without any intermediate buffers. Signed-off-by: Denis V. Lunev Reviewed-by: Roman Kagan Reviewed-by: Stefan Hajnoczi CC: Kevin Wolf --- block/parallels.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/block/parallels.c b/block/parallels.c index 1540c21..431adf1 100644 --- a/block/parallels.c +++ b/block/parallels.c @@ -90,7 +90,6 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags, Error **errp) { BDRVParallelsState *s = bs->opaque; - int i; ParallelsHeader ph; int ret; @@ -143,10 +142,6 @@ static int parallels_open(BlockDriverState *bs, QDict *options, int flags, goto fail; } - for (i = 0; i < s->bat_size; i++) { - le32_to_cpus(&s->bat_bitmap[i]); - } - s->has_truncate = bdrv_has_zero_init(bs->file) && bdrv_truncate(bs->file, bdrv_getlength(bs->file)) == 0; @@ -164,7 +159,7 @@ fail: static int64_t bat2sect(BDRVParallelsState *s, uint32_t idx) { - return (uint64_t)s->bat_bitmap[idx] * s->off_multiplier; + return (uint64_t)le32_to_cpu(s->bat_bitmap[idx]) * s->off_multiplier; } static int64_t seek_to_sector(BDRVParallelsState *s, int64_t sector_num) @@ -191,7 +186,7 @@ static int cluster_remainder(BDRVParallelsState *s, int64_t sector_num, static int64_t allocate_cluster(BlockDriverState *bs, int64_t sector_num) { BDRVParallelsState *s = bs->opaque; - uint32_t idx, offset, tmp; + uint32_t idx, offset; int64_t pos; int ret; @@ -215,12 +210,10 @@ static int64_t allocate_cluster(BlockDriverState *bs, int64_t sector_num) return ret; } - s->bat_bitmap[idx] = pos / s->off_multiplier; - - tmp = cpu_to_le32(s->bat_bitmap[idx]); - + s->bat_bitmap[idx] = cpu_to_le32(pos / s->off_multiplier); ret = bdrv_pwrite(bs->file, - sizeof(ParallelsHeader) + idx * sizeof(tmp), &tmp, sizeof(tmp)); + sizeof(ParallelsHeader) + idx * sizeof(s->bat_bitmap[idx]), + s->bat_bitmap + idx, sizeof(s->bat_bitmap[idx])); if (ret < 0) { s->bat_bitmap[idx] = 0; return ret;