Message ID | efcf7386010bac903f2ac2b8a9570105165989e5.1507813391.git.berto@igalia.com |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=igalia.com header.i=@igalia.com header.b="GklAHMMX"; dkim-atps=neutral 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 3yCWbG4352z9t2m for <incoming@patchwork.ozlabs.org>; Fri, 13 Oct 2017 00:16:57 +1100 (AEDT) Received: from localhost ([::1]:45454 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1e2dM6-0005TR-Lq for incoming@patchwork.ozlabs.org; Thu, 12 Oct 2017 09:16:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43087) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <berto@igalia.com>) id 1e2dGS-0001Gg-Ef for qemu-devel@nongnu.org; Thu, 12 Oct 2017 09:11:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <berto@igalia.com>) id 1e2dGO-0001cC-FB for qemu-devel@nongnu.org; Thu, 12 Oct 2017 09:11:04 -0400 Received: from fanzine.igalia.com ([91.117.99.155]:52452) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <berto@igalia.com>) id 1e2dGO-0001YY-5c; Thu, 12 Oct 2017 09:11:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=References:In-Reply-To:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=uFDeYvxX2OIPpz0ZHBdw24rUur+df7Ywo60hNeGBmyE=; b=GklAHMMXe/rLrMnD8ge/k1mbYCBfBbYLqoueUVRY650H7g9ueRgs0YJcypQxqq/ovafi6mMxmit+qR7wV0Z+1K+0Re//ptgGw994rCIcTqfTAcuNCbokE2PqDdL3NZx020sePcYONqMxVHq68/akFCug21fgO9SwyZyuTv8rmN+g/S95Opai/d0vYeZgJesicyDi0u9GS4pN3FdpLL7YnUmPNMcFDIpJ/2shR5iGEs4IYR36XA+lS5xFKeMHv2zReG4KQB8PdAcDw4gvQiIJLYRTxsuhQG+71TkfkAds+wfeBpFQ0J3WAvByASUcjbtgEeTM32S32GlFjudzVyi5pg==; Received: from a88-114-101-76.elisa-laajakaista.fi ([88.114.101.76] helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1e2dGM-0006MO-RS; Thu, 12 Oct 2017 15:10:58 +0200 Received: from berto by perseus.local with local (Exim 4.89) (envelope-from <berto@igalia.com>) id 1e2dCz-0003ab-9I; Thu, 12 Oct 2017 16:07:29 +0300 From: Alberto Garcia <berto@igalia.com> To: qemu-devel@nongnu.org Date: Thu, 12 Oct 2017 16:05:40 +0300 Message-Id: <efcf7386010bac903f2ac2b8a9570105165989e5.1507813391.git.berto@igalia.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <cover.1507813391.git.berto@igalia.com> References: <cover.1507813391.git.berto@igalia.com> In-Reply-To: <cover.1507813391.git.berto@igalia.com> References: <cover.1507813391.git.berto@igalia.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Received-From: 91.117.99.155 Subject: [Qemu-devel] [PATCH 26/31] qcow2: Update qcow2_truncate() to support L2 slices X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: Kevin Wolf <kwolf@redhat.com>, "Denis V . Lunev" <den@openvz.org>, Alberto Garcia <berto@igalia.com>, qemu-block@nongnu.org, Max Reitz <mreitz@redhat.com> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
Allow configuring the qcow2 L2 cache entry size
|
expand
|
diff --git a/block/qcow2.c b/block/qcow2.c index e5458fcffd..63e88a1d6e 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -3252,8 +3252,9 @@ static int qcow2_truncate(BlockDriverState *bs, int64_t offset, guest_offset = old_length; while (nb_new_data_clusters) { int64_t guest_cluster = guest_offset >> s->cluster_bits; - int64_t nb_clusters = MIN(nb_new_data_clusters, - s->l2_size - guest_cluster % s->l2_size); + int64_t nb_clusters = MIN( + nb_new_data_clusters, + s->l2_slice_size - guest_cluster % s->l2_slice_size); QCowL2Meta allocation = { .offset = guest_offset, .alloc_offset = host_offset,
The qcow2_truncate() code is mostly independent from whether we're using L2 slices or full L2 tables, but in full and falloc preallocation modes new L2 tables are allocated using qcow2_alloc_cluster_link_l2(). Therefore the code needs to be modified to ensure that all nb_clusters that are processed in each call can be allocated with just one L2 slice. Signed-off-by: Alberto Garcia <berto@igalia.com> --- block/qcow2.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)