From 169f4ce5aaf46e3cfed4ee2467cd87ca687a27a7 Mon Sep 17 00:00:00 2001
From: Roel de Jong <12800443+twiggler@users.noreply.github.com>
Date: Mon, 11 Nov 2024 14:43:11 +0100
Subject: [PATCH 1/2] fix: update backup  class references

---
 docs/source/projects/dissect.hypervisor/index.rst | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/source/projects/dissect.hypervisor/index.rst b/docs/source/projects/dissect.hypervisor/index.rst
index 710c283..bebbe49 100644
--- a/docs/source/projects/dissect.hypervisor/index.rst
+++ b/docs/source/projects/dissect.hypervisor/index.rst
@@ -11,8 +11,9 @@ A Dissect module implementing parsers for various hypervisor disk, backup and co
 
 * Backup formats
 
-  * VMA (:class:`~dissect.hypervisor.backup.vma.VMA`)
-  * XVA (:class:`~dissect.hypervisor.backup.xva.XVA`)
+  * VMA (:class:`~dissect.archive.vma.VMA`)
+  * XVA (:class:`~dissect.archive.xva.XVA`)
+  * VBK (:class:`~dissect.archive.vbk.VBK`)
 
 * Metadata descriptors
 

From 00d189b06641302b07c3731a3461530daf95faa3 Mon Sep 17 00:00:00 2001
From: Roel de Jong <12800443+twiggler@users.noreply.github.com>
Date: Wed, 13 Nov 2024 09:46:26 +0100
Subject: [PATCH 2/2] Reflect move of vma,vbk  and xva support from hypervisor
 to archive

---
 .../source/projects/dissect.archive/index.rst | 28 ++++++++++++++++++-
 .../projects/dissect.hypervisor/index.rst     | 15 +---------
 submodules/dissect.archive                    |  2 +-
 submodules/dissect.hypervisor                 |  2 +-
 4 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/docs/source/projects/dissect.archive/index.rst b/docs/source/projects/dissect.archive/index.rst
index a95479e..ce60343 100644
--- a/docs/source/projects/dissect.archive/index.rst
+++ b/docs/source/projects/dissect.archive/index.rst
@@ -8,7 +8,11 @@ dissect.archive
     :octicon:`mark-github` View on GitHub
 
 A Dissect module implementing parsers for various archive and backup formats. Currently has support for:
-- WIM (Windows Imaging Format)
+
+* WIM (Windows Imaging Format, :class:`~dissect.archive.wim.WIM`)
+* VMA (:class:`~dissect.archive.vma.VMA`)
+* XVA (:class:`~dissect.archive.xva.XVA`)
+* VBK (:class:`~dissect.archive.vbk.VBK`)
 
 
 Installation
@@ -41,6 +45,28 @@ listing of the root directory and read a file from a WIM archive:
         file_fh = image.get("/file.txt").open()  # This is just another file-like object
         print(file_fh.read())
 
+Tools
+-----
+
+.. sphinx_argparse_cli::
+    :module: dissect.archive.tools.backup
+    :func: main
+    :prog: vma-extract
+    :description: Utility to extract all files contained in a VMA backup.
+    :hook:
+.. sphinx_argparse_cli::
+    :module: dissect.archive.tools.backup
+    :func: main
+    :prog: vbk-extract
+    :description: Utility to extract all files contained in a VBK backup.
+    :hook:
+.. sphinx_argparse_cli::
+    :module: dissect.archive.tools.backup
+    :func: main
+    :prog: backup-extract
+    :description: Utility to extract all files from supported backup formats.
+    :hook:
+
 Reference
 ---------
 
diff --git a/docs/source/projects/dissect.hypervisor/index.rst b/docs/source/projects/dissect.hypervisor/index.rst
index bebbe49..4c248cc 100644
--- a/docs/source/projects/dissect.hypervisor/index.rst
+++ b/docs/source/projects/dissect.hypervisor/index.rst
@@ -7,13 +7,7 @@ dissect.hypervisor
 
     :octicon:`mark-github` View on GitHub
 
-A Dissect module implementing parsers for various hypervisor disk, backup and configuration files.
-
-* Backup formats
-
-  * VMA (:class:`~dissect.archive.vma.VMA`)
-  * XVA (:class:`~dissect.archive.xva.XVA`)
-  * VBK (:class:`~dissect.archive.vbk.VBK`)
+A Dissect module implementing parsers for various hypervisor disk and configuration files.
 
 * Metadata descriptors
 
@@ -66,13 +60,6 @@ parser you need.
 Tools
 -----
 
-.. sphinx_argparse_cli::
-    :module: dissect.hypervisor.tools.vma
-    :func: main
-    :prog: vma-extract
-    :description: Utility to extract all files contained in a VMA backup.
-    :hook:
-
 .. sphinx_argparse_cli::
     :module: dissect.hypervisor.tools.envelope
     :func: main
diff --git a/submodules/dissect.archive b/submodules/dissect.archive
index 4fe8392..5dfad11 160000
--- a/submodules/dissect.archive
+++ b/submodules/dissect.archive
@@ -1 +1 @@
-Subproject commit 4fe839291a2f935da2183f7399a2e99fe7ddbf74
+Subproject commit 5dfad11997b4c0ff88364cf032b9f75e0e5b8f68
diff --git a/submodules/dissect.hypervisor b/submodules/dissect.hypervisor
index 98a9a66..c3c2bb1 160000
--- a/submodules/dissect.hypervisor
+++ b/submodules/dissect.hypervisor
@@ -1 +1 @@
-Subproject commit 98a9a660cc886ccf5ecd21f575e47401ed199d26
+Subproject commit c3c2bb1ac47f06b7d4a840e79121b223cb506d0c