From patchwork Sat Oct 26 21:25:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Garcia X-Patchwork-Id: 11213909 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C3B0B14ED for ; Sat, 26 Oct 2019 22:14:29 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 97DF52084C for ; Sat, 26 Oct 2019 22:14:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=igalia.com header.i=@igalia.com header.b="Ynv/NO/b" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 97DF52084C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=igalia.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:43018 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iOUKK-0005Fr-Lg for patchwork-qemu-devel@patchwork.kernel.org; Sat, 26 Oct 2019 18:14:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60290) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iOTZw-0000Vf-AF for qemu-devel@nongnu.org; Sat, 26 Oct 2019 17:26:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iOTZv-0005Qz-8m for qemu-devel@nongnu.org; Sat, 26 Oct 2019 17:26:32 -0400 Received: from fanzine.igalia.com ([178.60.130.6]:42504) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iOTZu-0005Ew-UY; Sat, 26 Oct 2019 17:26:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=q//BQvH+ej6Gl1Fi6fEopfSlEKcCs1jmZCmU1j0FoFk=; b=Ynv/NO/bpoqX+emSleICMrUJ9dVQ0lJweyvh4RmBkJXgW+v4j/4s5L4tt47wfNJWb8CXmxi0N6AjSjAQEdIHaUeaLugCT8W3gYW+7I/YROPxjbLJvNZVChCeizdbZzdVAR5z3tgecv0k6urcvIznWYGVH4xICEDQkeB1BRM/15pHFOg89rXsAAj5bb00Rs7b/d0v7HtIpcNjrNjwvy9UxpjKYfpHhzZps+6+nqZaRcHdNkgfwtRNe+iEdXjBXOzN/PBB/w1lFPYfKI+30oDBcOryPDDJsOaU8ocZx+rMkWjgrhgSmZ5/RcdIgsDhnR1WtNARXyDhDJF7OSbTsEUKRg==; Received: from 87-100-137-117.bb.dnainternet.fi ([87.100.137.117] helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1iOTZI-000464-W7; Sat, 26 Oct 2019 23:25:53 +0200 Received: from berto by perseus.local with local (Exim 4.92) (envelope-from ) id 1iOTZ0-0001Pb-RW; Sun, 27 Oct 2019 00:25:34 +0300 From: Alberto Garcia To: qemu-devel@nongnu.org Subject: [RFC PATCH v2 18/26] qcow2: Add subcluster support to expand_zero_clusters_in_l1() Date: Sun, 27 Oct 2019 00:25:20 +0300 Message-Id: X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Received-From: 178.60.130.6 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Anton Nefedov , Alberto Garcia , qemu-block@nongnu.org, Max Reitz , Vladimir Sementsov-Ogievskiy , "Denis V . Lunev" Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Two changes are needed in order to add subcluster support to this function: deallocated clusters must have their bitmaps cleared, and expanded clusters must have all the "subcluster allocated" bits set. Signed-off-by: Alberto Garcia --- block/qcow2-cluster.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index aa3eb727a5..62f2a9fcc0 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -2036,6 +2036,7 @@ static int expand_zero_clusters_in_l1(BlockDriverState *bs, uint64_t *l1_table, /* not backed; therefore we can simply deallocate the * cluster */ set_l2_entry(s, l2_slice, j, 0); + set_l2_bitmap(s, l2_slice, j, 0); l2_dirty = true; continue; } @@ -2102,6 +2103,7 @@ static int expand_zero_clusters_in_l1(BlockDriverState *bs, uint64_t *l1_table, } else { set_l2_entry(s, l2_slice, j, offset); } + set_l2_bitmap(s, l2_slice, j, QCOW_L2_BITMAP_ALL_ALLOC); l2_dirty = true; }