[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 6/7] xz: move s->lzma.len = 0 initialization to lzma_reset()
- To: "xen-devel@xxxxxxxxxxxxxxxxxxxx" <xen-devel@xxxxxxxxxxxxxxxxxxxx>
- From: Jan Beulich <jbeulich@xxxxxxxx>
- Date: Fri, 19 Nov 2021 11:23:02 +0100
- Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none
- Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=SFdBl4oly+v5EDzv1v3dC+TsVpDheb1hphiY7sT/fCc=; b=mSL+a6A11WVESi64NgWk9HhsWhscKAoq2jIYgAmxGpR+hn2FF+faD31rWps0WStLSINnmnQ6P57G79xZSd/5GMEBB4K581LRIku8NfhtyQhG4OFVovRK5bQuWNWXpRc7ygCNWxArlVDm+xl++Ic5O3OT0znYOZ8ZgsmQ9zIE8AJ7lqLopUOLyAn8tUStXh1s94iPMur3BwSLJmb/pu07XgG2Q74ROM1Di7w4jDB+YHWsoU6RJrJkxB25naYSdKjsInt7on+JrEl8gH3b5vH3r9PayyisYIDAxOYErmRuqV1xgFT6g4YDAojMOGzs4w34mj3G2BZKphNgAzCDMHlkVw==
- Arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dNemgzmkMLSJ/oACIcUgMxygPlisTFMU7uqhl2l3UArf+sfT6JwQaSKkL/82ThjkcTQpNteLC0+6jVn31IVTzF+X/7hPClkYwkUX+Q3zDJqdi0Bfb9BthWftILihR8O8bApPYxbvHadr0v1lberaD0Rh5mzNshCF97EqffpQvr5927a5AmyF0OnZ6srGUmieZa4wvk1NGqWNuQXAjyRrsiNMxKAduPddFlDNS5vQBbDD1zNUFAKaNBixo6OqF/Hx3S4xu9oApvv8ZNpAD35zUgabcf3nohyBC9Dg0ojwdaBsbsFQ6UEI9Io+b/2szFlisF+1aLSuXei8WnYn92hmAw==
- Authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com;
- Cc: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>, George Dunlap <george.dunlap@xxxxxxxxxx>, Ian Jackson <iwj@xxxxxxxxxxxxxx>, Julien Grall <julien@xxxxxxx>, Stefano Stabellini <sstabellini@xxxxxxxxxx>, Wei Liu <wl@xxxxxxx>
- Delivery-date: Fri, 19 Nov 2021 10:23:07 +0000
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
From: Lasse Collin <lasse.collin@xxxxxxxxxxx>
It's a more logical place even if the resetting needs to be done
only once per LZMA2 stream (if lzma_reset() called in the middle
of an LZMA2 stream, .len will already be 0).
Link: https://lore.kernel.org/r/20211010213145.17462-4-xiang@xxxxxxxxxx
Signed-off-by: Lasse Collin <lasse.collin@xxxxxxxxxxx>
[Linux commit: a98a25408b0e9b0264abcc3dabfafd9ff2ea1046]
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
--- a/xen/common/xz/dec_lzma2.c
+++ b/xen/common/xz/dec_lzma2.c
@@ -791,6 +791,7 @@ static void __init lzma_reset(struct xz_
s->lzma.rep1 = 0;
s->lzma.rep2 = 0;
s->lzma.rep3 = 0;
+ s->lzma.len = 0;
/*
* All probabilities are initialized to the same value. This hack
@@ -1174,8 +1175,6 @@ XZ_EXTERN enum xz_ret __init xz_dec_lzma
}
}
- s->lzma.len = 0;
-
s->lzma2.sequence = SEQ_CONTROL;
s->lzma2.need_dict_reset = true;
|
