Support qcow2 format in VDI export/import

Makefile

@@ -173,7 +173,7 @@ DUNE_IU_PACKAGES3=-j $(JOBS) --destdir=$(DESTDIR) --prefix=$(OPTDIR) --libdir=$(
 install-dune3:
 	dune install $(DUNE_IU_PACKAGES3)
 
-DUNE_IU_PACKAGES4=-j $(JOBS) --destdir=$(DESTDIR) --prefix=$(PREFIX) --libdir=$(LIBDIR) --libexecdir=/usr/libexec --mandir=$(MANDIR) vhd-tool forkexec
+DUNE_IU_PACKAGES4=-j $(JOBS) --destdir=$(DESTDIR) --prefix=$(PREFIX) --libdir=$(LIBDIR) --libexecdir=/usr/libexec --mandir=$(MANDIR) vhd-tool qcow-tool forkexec
 
 install-dune4:
 	dune install $(DUNE_IU_PACKAGES4)

dune-project

@@ -420,6 +420,34 @@
   )
 )
 
+(package
+  (name qcow-tool)
+  (synopsis "Manipulate .qcow files")
+  (tags ("org.mirage" "org:xapi-project"))
+  (depends
+    asetmap
+    astring
+    cmdliner
+    cstruct
+    ezjsonm
+    fmt
+    io-page
+    logs
+    lwt
+    mirage-block
+    mirage-block-combinators
+    mirage-block-unix
+    mirage-time
+    mirage-types-lwt
+    ounit
+    prometheus
+    result
+    sexplib
+    sha
+    unix-type-representations
+  )
+)
+
 (package
   (name vhd-tool)
   (synopsis "Manipulate .vhd files")

ocaml/qcow-tool/cli/dune

@@ -1,8 +1,31 @@
 (executable
- (name main)
- (public_name qcow-tool)
- (package qcow-tool)
- (libraries qcow io-page logs logs.fmt sha unix-type-representations
-   cmdliner sexplib mirage-block-combinators)
- (preprocess
-  (pps ppx_sexp_conv)))
+  (name main)
+  (libraries
+    astring
+    cmdliner
+    cstruct
+    cstruct-lwt
+    fmt
+    io-page logs
+    logs.fmt
+    lwt
+    lwt.unix
+    mirage-block
+    mirage-block-unix
+    mirage-block-combinators
+    mirage-time
+    qcow
+    sexplib
+    sha
+    unix-type-representations
+    )
+  (preprocess
+    (pps ppx_sexp_conv)
+  )
+)
+
+(install
+  (package qcow-tool)
+  (section bin)
+  (files (main.exe as qcow-tool))
+)

ocaml/qcow-tool/lib/dune

@@ -1,12 +1,24 @@
 (library
- (name qcow)
- (public_name qcow)
- (libraries astring cstruct logs lwt mirage-block mirage-block-unix
-   mirage-types.lwt prometheus io-page sexplib stdlib-shims
-   mirage-time)
- (wrapped false)
- (preprocess
-  (pps ppx_sexp_conv)))
+  (name qcow)
+  (libraries
+    astring
+    cstruct
+    logs
+    lwt
+    mirage-block
+    mirage-block-unix
+    mirage-types.lwt
+    prometheus
+    io-page
+    sexplib
+    stdlib-shims
+    mirage-time fmt
+    )
+  (wrapped false)
+  (preprocess
+    (pps ppx_sexp_conv)
+  )
+)
 
 (rule
  (targets qcow_word_size.ml)

qcow-tool.opam

@@ -0,0 +1,48 @@
+# This file is generated by dune, edit dune-project instead
+opam-version: "2.0"
+synopsis: "Manipulate .qcow files"
+maintainer: ["Xapi project maintainers"]
+authors: ["xen-api@lists.xen.org"]
+license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
+tags: ["org.mirage" "org:xapi-project"]
+homepage: "https://xapi-project.github.io/"
+bug-reports: "https://github.com/xapi-project/xen-api/issues"
+depends: [
+  "dune" {>= "3.15"}
+  "asetmap"
+  "astring"
+  "cmdliner"
+  "cstruct"
+  "ezjsonm"
+  "fmt"
+  "io-page"
+  "logs"
+  "lwt"
+  "mirage-block"
+  "mirage-block-combinators"
+  "mirage-block-unix"
+  "mirage-time"
+  "mirage-types-lwt"
+  "ounit"
+  "prometheus"
+  "result"
+  "sexplib"
+  "sha"
+  "unix-type-representations"
+  "odoc" {with-doc}
+]
+build: [
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+]
+dev-repo: "git+https://github.com/xapi-project/xen-api.git"