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

Use new marshaller in QEMU Copy-On-Write disk image.

Browse Source
This commit is contained in:
Natalia Portillo
2019-03-15 22:37:48 +00:00
parent 7e741bd9c1
commit c07bbe5137
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
DiscImageChef.DiscImages/QCOW/Read.cs
View File

@@ -33,13 +33,14 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Runtime.InteropServices;
using DiscImageChef.CommonTypes; using DiscImageChef.CommonTypes;
using DiscImageChef.CommonTypes.Enums; using DiscImageChef.CommonTypes.Enums;
using DiscImageChef.CommonTypes.Interfaces; using DiscImageChef.CommonTypes.Interfaces;
using DiscImageChef.Console; using DiscImageChef.Console;
using DiscImageChef.Helpers;
using SharpCompress.Compressors; using SharpCompress.Compressors;
using SharpCompress.Compressors.Deflate; using SharpCompress.Compressors.Deflate;
using Marshal = DiscImageChef.Helpers.Marshal;
namespace DiscImageChef.DiscImages namespace DiscImageChef.DiscImages
{ {
@@ -108,10 +109,9 @@ namespace DiscImageChef.DiscImages
byte[] l1TableB = new byte[l1Size * 8]; byte[] l1TableB = new byte[l1Size * 8];
stream.Seek((long)qHdr.l1_table_offset, SeekOrigin.Begin); stream.Seek((long)qHdr.l1_table_offset, SeekOrigin.Begin);
stream.Read(l1TableB, 0, (int)l1Size * 8); stream.Read(l1TableB, 0, (int)l1Size * 8);
l1Table = new ulong[l1Size]; l1Table = MemoryMarshal.Cast<byte, ulong>(l1TableB).ToArray();
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] = Swapping.Swap(l1Table[i]);
l1Table[i] = BigEndianBitConverter.ToUInt64(l1TableB, (int)(i * 8));
l1Mask = 0; l1Mask = 0;
int c = 0; int c = 0;
@@ -189,13 +189,12 @@ namespace DiscImageChef.DiscImages
if(!l2TableCache.TryGetValue(l1Off, out ulong[] l2Table)) if(!l2TableCache.TryGetValue(l1Off, out ulong[] l2Table))
{ {
l2Table = new ulong[l2Size];
imageStream.Seek((long)l1Table[l1Off], SeekOrigin.Begin); imageStream.Seek((long)l1Table[l1Off], SeekOrigin.Begin);
byte[] l2TableB = new byte[l2Size * 8]; byte[] l2TableB = new byte[l2Size * 8];
imageStream.Read(l2TableB, 0, l2Size * 8); imageStream.Read(l2TableB, 0, l2Size * 8);
DicConsole.DebugWriteLine("QCOW plugin", "Reading L2 table #{0}", l1Off); DicConsole.DebugWriteLine("QCOW plugin", "Reading L2 table #{0}", l1Off);
for(long i = 0; i < l2Table.LongLength; i++) l2Table = MemoryMarshal.Cast<byte, ulong>(l2TableB).ToArray();
l2Table[i] = BigEndianBitConverter.ToUInt64(l2TableB, (int)(i * 8)); for(long i = 0; i < l2Table.LongLength; i++) l2Table[i] = Swapping.Swap(l2Table[i]);
if(l2TableCache.Count >= maxL2TableCache) l2TableCache.Clear(); if(l2TableCache.Count >= maxL2TableCache) l2TableCache.Clear();

9
DiscImageChef.DiscImages/QCOW/Write.cs
View File

@@ -34,11 +34,12 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Runtime.InteropServices;
using DiscImageChef.CommonTypes; using DiscImageChef.CommonTypes;
using DiscImageChef.CommonTypes.Enums; using DiscImageChef.CommonTypes.Enums;
using DiscImageChef.CommonTypes.Structs; using DiscImageChef.CommonTypes.Structs;
using DiscImageChef.Helpers;
using Schemas; using Schemas;
using Marshal = DiscImageChef.Helpers.Marshal;
namespace DiscImageChef.DiscImages namespace DiscImageChef.DiscImages
{ {
@@ -271,8 +272,10 @@ namespace DiscImageChef.DiscImages
writingStream.Write(BigEndianBitConverter.GetBytes(qHdr.l1_table_offset), 0, 8); writingStream.Write(BigEndianBitConverter.GetBytes(qHdr.l1_table_offset), 0, 8);
writingStream.Seek((long)qHdr.l1_table_offset, SeekOrigin.Begin); writingStream.Seek((long)qHdr.l1_table_offset, SeekOrigin.Begin);
for(long i = 0; i < l1Table.LongLength; i++) for(long i = 0; i < l1Table.LongLength; i++) l1Table[i] = Swapping.Swap(l1Table[i]);
writingStream.Write(BigEndianBitConverter.GetBytes(l1Table[i]), 0, 8); byte[] l1TableB =
MemoryMarshal.Cast<ulong, byte>(l1Table).ToArray();
writingStream.Write(l1TableB, 0, l1TableB.Length);
writingStream.Flush(); writingStream.Flush();
writingStream.Close(); writingStream.Close();