X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=libvirt%2Fgenerator.pl;fp=libvirt%2Fgenerator.pl;h=4fd07b8e00e7cfbe4f301da2cb8852e1a6bbf49e;hb=b6098f4c7419486227cbe2112904cbc9d58ed787;hp=b389a1b7d07bf254a1591a0d53a7b94bcff4a323;hpb=8a8008134e997330d61e0b9736e9067b5689b531;p=virt-top.git

diff --git a/libvirt/generator.pl b/libvirt/generator.pl
index b389a1b..4fd07b8 100755
--- a/libvirt/generator.pl
+++ b/libvirt/generator.pl
@@ -56,6 +56,8 @@ my @functions = (
     { name => "virDomainGetName", sig => "dom : static string" },
     { name => "virDomainGetOSType", sig => "dom : string" },
     { name => "virDomainGetXMLDesc", sig => "dom, 0 : string" },
+    { name => "virDomainGetUUID", sig => "dom : uuid" },
+    { name => "virDomainGetUUIDString", sig => "dom : uuid string" },
     { name => "virDomainSuspend", sig => "dom : unit" },
     { name => "virDomainResume", sig => "dom : unit" },
     { name => "virDomainShutdown", sig => "dom : unit" },
@@ -70,6 +72,8 @@ my @functions = (
     { name => "virNetworkGetName", sig => "net : static string" },
     { name => "virNetworkGetXMLDesc", sig => "net, 0 : string" },
     { name => "virNetworkGetBridgeName", sig => "net : string" },
+    { name => "virNetworkGetUUID", sig => "net : uuid" },
+    { name => "virNetworkGetUUIDString", sig => "net : uuid string" },
     { name => "virNetworkUndefine", sig => "net : unit" },
     { name => "virNetworkCreate", sig => "net : unit" },
     { name => "virNetworkGetAutostart", sig => "net : bool" },
@@ -83,6 +87,10 @@ my @functions = (
       sig => "pool : static string", weak => 1 },
     { name => "virStoragePoolGetXMLDesc",
       sig => "pool, 0 : string", weak => 1 },
+    { name => "virStoragePoolGetUUID",
+      sig => "pool : uuid", weak => 1 },
+    { name => "virStoragePoolGetUUIDString",
+      sig => "pool : uuid string", weak => 1 },
     { name => "virStoragePoolUndefine",
       sig => "pool : unit", weak => 1 },
     { name => "virStoragePoolCreate",
@@ -126,8 +134,6 @@ my @unimplemented = (
     "ocaml_libvirt_network_create_job",
     "ocaml_libvirt_network_create_xml_job",
     "ocaml_libvirt_storage_pool_get_info",
-    "ocaml_libvirt_storage_pool_get_uuid_string", #?
-    "ocaml_libvirt_storage_pool_get_uuid", #?
     "ocaml_libvirt_storage_pool_free", #?
     "ocaml_libvirt_storage_pool_destroy", #?
     "ocaml_libvirt_storage_pool_define_xml",
@@ -248,6 +254,12 @@ sub gen_c_signature
     } elsif ($sig =~ /^(\w+) : int$/) {
 	my $c_type = short_name_to_c_type ($1);
 	"int $c_name ($c_type $1)"
+    } elsif ($sig =~ /^(\w+) : uuid$/) {
+	my $c_type = short_name_to_c_type ($1);
+	"int $c_name ($c_type $1, unsigned char *)"
+    } elsif ($sig =~ /^(\w+) : uuid string$/) {
+	my $c_type = short_name_to_c_type ($1);
+	"int $c_name ($c_type $1, char *)"
     } elsif ($sig =~ /^(\w+) : bool$/) {
 	my $c_type = short_name_to_c_type ($1);
 	"int $c_name ($c_type $1, int *r)"
@@ -288,6 +300,10 @@ sub gen_arg_names
 	( "$1v" )
     } elsif ($sig =~ /^(\w+) : int$/) {
 	( "$1v" )
+    } elsif ($sig =~ /^(\w+) : uuid$/) {
+	( "$1v" )
+    } elsif ($sig =~ /^(\w+) : uuid string$/) {
+	( "$1v" )
     } elsif ($sig =~ /^(\w+) : bool$/) {
 	( "$1v" )
     } elsif ($sig =~ /^(\w+), bool : unit$/) {
@@ -387,6 +403,32 @@ sub gen_c_code
 
   CAMLreturn (Val_int (r));
 "
+    } elsif ($sig =~ /^(\w+) : uuid$/) {
+	"\
+  CAMLlocal1 (rv);
+  " . gen_unpack_args ($1) . "
+  unsigned char uuid[VIR_UUID_BUFLEN];
+  int r;
+
+  NONBLOCKING (r = $c_name ($1, uuid));
+  CHECK_ERROR (r == -1, conn, \"$c_name\");
+
+  rv = caml_copy_string ((char *) uuid);
+  CAMLreturn (rv);
+"
+    } elsif ($sig =~ /^(\w+) : uuid string$/) {
+	"\
+  CAMLlocal1 (rv);
+  " . gen_unpack_args ($1) . "
+  char uuid[VIR_UUID_STRING_BUFLEN];
+  int r;
+
+  NONBLOCKING (r = $c_name ($1, uuid));
+  CHECK_ERROR (r == -1, conn, \"$c_name\");
+
+  rv = caml_copy_string (uuid);
+  CAMLreturn (rv);
+"
     } elsif ($sig =~ /^(\w+) : bool$/) {
 	"\
   " . gen_unpack_args ($1) . "