aaru-dps/Aaru.Server
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.Server.git synced 2025-12-16 19:24:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adds support for compressed QCOW and QCOW2 images, closes #72.

Browse Source
This commit is contained in:
Natalia Portillo
2016-09-21 03:32:12 +01:00
parent 85fd3b5900
commit d95785eec1
3 changed files with 75 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
DiscImageChef.DiscImages/QCOW.cs
View File

@@ -37,6 +37,8 @@ using System.Runtime.InteropServices;
using DiscImageChef.CommonTypes; using DiscImageChef.CommonTypes;
using DiscImageChef.Console; using DiscImageChef.Console;
using DiscImageChef.Filters; using DiscImageChef.Filters;
using SharpCompress.Compressor;
using SharpCompress.Compressor.Deflate;
namespace DiscImageChef.ImagePlugins namespace DiscImageChef.ImagePlugins
{ {
@@ -342,15 +344,38 @@ namespace DiscImageChef.ImagePlugins
if(offset != 0) if(offset != 0)
{ {
if((offset & QCowCompressed) == QCowCompressed)
throw new NotImplementedException("Compressed images not yet supported.");
byte[] cluster; byte[] cluster;
if(!clusterCache.TryGetValue(offset, out cluster)) if(!clusterCache.TryGetValue(offset, out cluster))
{
if((offset & QCowCompressed) == QCowCompressed)
{
ulong compSizeMask = 0;
ulong offMask = 0;
compSizeMask = (ulong)(1 << qHdr.cluster_bits) - 1;
compSizeMask <<= 63 - qHdr.cluster_bits;
offMask = (~compSizeMask) ^ QCowCompressed;
ulong realOff = offset & offMask;
ulong compSize = (offset & compSizeMask) >> (63 - qHdr.cluster_bits);
byte[] zCluster = new byte[compSize];
imageStream.Seek((long)realOff, SeekOrigin.Begin);
imageStream.Read(zCluster, 0, (int)compSize);
DeflateStream zStream = new DeflateStream(new MemoryStream(zCluster), CompressionMode.Decompress);
cluster = new byte[clusterSize];
int read = zStream.Read(cluster, 0, clusterSize);
if(read != clusterSize)
throw new IOException(string.Format("Unable to decompress cluster, expected {0} bytes got {1}", clusterSize, read));
}
else
{ {
cluster = new byte[clusterSize]; cluster = new byte[clusterSize];
imageStream.Seek((long)offset, SeekOrigin.Begin); imageStream.Seek((long)offset, SeekOrigin.Begin);
imageStream.Read(cluster, 0, clusterSize); imageStream.Read(cluster, 0, clusterSize);
}
if(clusterCache.Count >= maxClusterCache) if(clusterCache.Count >= maxClusterCache)
clusterCache.Clear(); clusterCache.Clear();

34
DiscImageChef.DiscImages/QCOW2.cs
View File

@@ -37,6 +37,8 @@ using System.Runtime.InteropServices;
using DiscImageChef.CommonTypes; using DiscImageChef.CommonTypes;
using DiscImageChef.Console; using DiscImageChef.Console;
using DiscImageChef.Filters; using DiscImageChef.Filters;
using SharpCompress.Compressor;
using SharpCompress.Compressor.Deflate;
namespace DiscImageChef.ImagePlugins namespace DiscImageChef.ImagePlugins
{ {
@@ -281,6 +283,7 @@ namespace DiscImageChef.ImagePlugins
stream.Seek((long)qHdr.l1_table_offset, SeekOrigin.Begin); stream.Seek((long)qHdr.l1_table_offset, SeekOrigin.Begin);
stream.Read(l1Table_b, 0, (int)qHdr.l1_size * 8); stream.Read(l1Table_b, 0, (int)qHdr.l1_size * 8);
l1Table = new ulong[qHdr.l1_size]; l1Table = new ulong[qHdr.l1_size];
// TODO: Optimize this
DicConsole.DebugWriteLine("QCOW plugin", "Reading L1 table"); DicConsole.DebugWriteLine("QCOW plugin", "Reading L1 table");
for(long i = 0; i < l1Table.LongLength; i++) for(long i = 0; i < l1Table.LongLength; i++)
l1Table[i] = BigEndianBitConverter.ToUInt64(l1Table_b, (int)(i * 8)); l1Table[i] = BigEndianBitConverter.ToUInt64(l1Table_b, (int)(i * 8));
@@ -384,15 +387,40 @@ namespace DiscImageChef.ImagePlugins
if((offset & QCowFlagsMask) != 0) if((offset & QCowFlagsMask) != 0)
{ {
if((offset & QCowCompressed) == QCowCompressed)
throw new NotImplementedException("Compressed images not yet supported.");
byte[] cluster; byte[] cluster;
if(!clusterCache.TryGetValue(offset, out cluster)) if(!clusterCache.TryGetValue(offset, out cluster))
{
if((offset & QCowCompressed) == QCowCompressed)
{
ulong compSizeMask = 0;
ulong offMask = 0;
compSizeMask = (ulong)(1 << (int)(qHdr.cluster_bits - 8)) - 1;
byte countbits = (byte)(qHdr.cluster_bits - 8);
compSizeMask <<= (62 - countbits);
offMask = (~compSizeMask) & QCowFlagsMask;
ulong realOff = offset & offMask;
ulong compSize = (((offset & compSizeMask) >> (62 - countbits)) + 1) * 512;
byte[] zCluster = new byte[compSize];
imageStream.Seek((long)realOff, SeekOrigin.Begin);
imageStream.Read(zCluster, 0, (int)compSize);
DeflateStream zStream = new DeflateStream(new MemoryStream(zCluster), CompressionMode.Decompress);
cluster = new byte[clusterSize];
int read = zStream.Read(cluster, 0, clusterSize);
if(read != clusterSize)
throw new IOException(string.Format("Unable to decompress cluster, expected {0} bytes got {1}", clusterSize, read));
}
else
{ {
cluster = new byte[clusterSize]; cluster = new byte[clusterSize];
imageStream.Seek((long)(offset & QCowFlagsMask), SeekOrigin.Begin); imageStream.Seek((long)(offset & QCowFlagsMask), SeekOrigin.Begin);
imageStream.Read(cluster, 0, clusterSize); imageStream.Read(cluster, 0, clusterSize);
}
if(clusterCache.Count >= maxClusterCache) if(clusterCache.Count >= maxClusterCache)
clusterCache.Clear(); clusterCache.Clear();

1
TODO
View File

@@ -43,7 +43,6 @@ Device handling:
--- Support MMC feature codes FF33h --- Support MMC feature codes FF33h
QCOW plugin: QCOW plugin:
--- Add support for compressed images
--- Add support for encrypted images --- Add support for encrypted images
VMDK plugin: VMDK plugin: