Bindings to libvhd.

This allows ocaml programs to manipulate VHD files suitable for use
with XCP/XenServer.

Sample usage:
	Vhd.create filename virtual_size (Vhd.Ty_dynamic) (Vhdutil.max_size) [];
	let uid = Vhd.with_vhd filename false Vhd.get_uid

Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>
Acked-by: Dave Scott <dave.scott@eu.citrix.com>

diff --git a/Makefile.in b/Makefile.in
index 57f1259d5a147ba930505b9d8398c88848179cc7..8ff2534d22c02f214e824ea47a6d9c428c964265 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -44,6 +44,7 @@ ifeq ($(HAVE_XEN),1)
        $(MAKE) -C xsrpc
        $(MAKE) -C eventchn
        $(MAKE) -C cpuid
+       $(MAKE) -C vhd
 endif
 
 install:
@@ -82,6 +83,7 @@ ifeq ($(HAVE_XEN),1)
        $(MAKE) -C xsrpc install
        $(MAKE) -C eventchn install
        $(MAKE) -C cpuid install
+       $(MAKE) -C vhd install
 endif
 
 uninstall:
@@ -120,6 +122,7 @@ ifeq ($(HAVE_XEN),1)
        $(MAKE) -C xc uninstall
        $(MAKE) -C mmap uninstall
        $(MAKE) -C cpuid uninstall
+       $(MAKE) -C vhd uninstall
 endif
 
 bins:
@@ -169,6 +172,7 @@ doc:
        $(MAKE) -C forking_executioner doc
        $(MAKE) -C mlvm doc
        $(MAKE) -C cpuid doc
+       $(MAKE) -C vhd doc
        $(MAKE) -C xen-utils doc
 
 .PHONY: clean
@@ -190,6 +194,7 @@ clean:
        $(MAKE) -C forking_executioner clean
        $(MAKE) -C mlvm clean
        $(MAKE) -C cpuid clean
+       $(MAKE) -C vhd clean
        $(MAKE) -C xen-utils clean
 
 cleanxen:

diff --git a/xapi-libs.spec b/xapi-libs.spec
index a7cb12fb64e3987190ae03733ea7393df5422755..8b59d6574aebaefdb6f6002de25c092423e16bf4 100644 (file)
--- a/xapi-libs.spec
+++ b/xapi-libs.spec
@@ -267,6 +267,14 @@ rm -rf $RPM_BUILD_ROOT
    /usr/lib/ocaml/xml-light2/xml-light2.cmxa
    /usr/lib/ocaml/xml-light2/xml.cmi
    /usr/lib/ocaml/xml-light2/xml.cmx
+   /usr/lib/ocaml/vhd/META
+   /usr/lib/ocaml/vhd/dllvhd_stubs.so
+   /usr/lib/ocaml/vhd/libvhd_stubs.a
+   /usr/lib/ocaml/vhd/vhd.a
+   /usr/lib/ocaml/vhd/vhd.cma
+   /usr/lib/ocaml/vhd/vhd.cmi
+   /usr/lib/ocaml/vhd/vhd.cmx
+   /usr/lib/ocaml/vhd/vhd.cmxa
 
 %exclude /usr/lib/ocaml/close-and-exec/closeandexec_main.cmx
 %exclude /usr/lib/ocaml/pciutil/pciutil_main.cmx