Don't use the client-side shortcut for get_uuid calls -- we need to keep

handles and UUIDs conceptually separate.

Signed-off-by: Ewan Mellor <ewan@xensource.com>

20 files changed, 201 insertions, 21 deletions

diff --git a/tools/libxen/src/xen_console.c b/tools/libxen/src/xen_console.c
index a5a5ad2bb2..9d0764a2d6 100644
--- a/tools/libxen/src/xen_console.c
+++ b/tools/libxen/src/xen_console.c
@@ -284,6 +284,15 @@ xen_console_get_all(xen_session *session, struct xen_console_set **result)
 bool
 xen_console_get_uuid(xen_session *session, char **result, xen_console console)
 {
-    *result = session->ok ? xen_strdup_((char *)console) : NULL;
+    abstract_value param_values[] =
+        {
+            { .type = &abstract_type_string,
+              .u.string_val = console }
+        };
+
+    abstract_type result_type = abstract_type_string;
+
+    *result = NULL;
+    XEN_CALL_("console.get_uuid");
     return session->ok;
 }
diff --git a/tools/libxen/src/xen_crashdump.c b/tools/libxen/src/xen_crashdump.c
index 2d3840896e..5d8f70a2ea 100644
--- a/tools/libxen/src/xen_crashdump.c
+++ b/tools/libxen/src/xen_crashdump.c
@@ -177,6 +177,15 @@ xen_crashdump_get_all(xen_session *session, struct xen_crashdump_set **result)
 bool
 xen_crashdump_get_uuid(xen_session *session, char **result, xen_crashdump crashdump)
 {
-    *result = session->ok ? xen_strdup_((char *)crashdump) : NULL;
+    abstract_value param_values[] =
+        {
+            { .type = &abstract_type_string,
+              .u.string_val = crashdump }
+        };
+
+    abstract_type result_type = abstract_type_string;
+
+    *result = NULL;
+    XEN_CALL_("crashdump.get_uuid");
     return session->ok;
 }
diff --git a/tools/libxen/src/xen_host.c b/tools/libxen/src/xen_host.c
index 204664ae3c..64badac031 100644
--- a/tools/libxen/src/xen_host.c
+++ b/tools/libxen/src/xen_host.c
@@ -754,6 +754,15 @@ xen_host_get_all(xen_session *session, struct xen_host_set **result)
 bool
 xen_host_get_uuid(xen_session *session, char **result, xen_host host)
 {
-    *result = session->ok ? xen_strdup_((char *)host) : NULL;
+    abstract_value param_values[] =
+        {
+            { .type = &abstract_type_string,
+              .u.string_val = host }
+        };
+
+    abstract_type result_type = abstract_type_string;
+
+    *result = NULL;
+    XEN_CALL_("host.get_uuid");
     return session->ok;
 }
diff --git a/tools/libxen/src/xen_host_cpu.c b/tools/libxen/src/xen_host_cpu.c
index 1494c10191..c03241dc84 100644
--- a/tools/libxen/src/xen_host_cpu.c
+++ b/tools/libxen/src/xen_host_cpu.c
@@ -282,6 +282,15 @@ xen_host_cpu_get_all(xen_session *session, struct xen_host_cpu_set **result)
 bool
 xen_host_cpu_get_uuid(xen_session *session, char **result, xen_host_cpu host_cpu)
 {
-    *result = session->ok ? xen_strdup_((char *)host_cpu) : NULL;
+    abstract_value param_values[] =
+        {
+            { .type = &abstract_type_string,
+              .u.string_val = host_cpu }
+        };
+
+    abstract_type result_type = abstract_type_string;
+
+    *result = NULL;
+    XEN_CALL_("host_cpu.get_uuid");
     return session->ok;
 }
diff --git a/tools/libxen/src/xen_host_metrics.c b/tools/libxen/src/xen_host_metrics.c
index bc621fbaae..203f25ed0a 100644
--- a/tools/libxen/src/xen_host_metrics.c
+++ b/tools/libxen/src/xen_host_metrics.c
@@ -176,6 +176,15 @@ xen_host_metrics_get_all(xen_session *session, struct xen_host_metrics_set **res
 bool
 xen_host_metrics_get_uuid(xen_session *session, char **result, xen_host_metrics host_metrics)
 {
-    *result = session->ok ? xen_strdup_((char *)host_metrics) : NULL;
+    abstract_value param_values[] =
+        {
+            { .type = &abstract_type_string,
+              .u.string_val = host_metrics }
+        };
+
+    abstract_type result_type = abstract_type_string;
+
+    *result = NULL;
+    XEN_CALL_("host_metrics.get_uuid");
     return session->ok;
 }
diff --git a/tools/libxen/src/xen_network.c b/tools/libxen/src/xen_network.c
index 2351404705..723616204c 100644
--- a/tools/libxen/src/xen_network.c
+++ b/tools/libxen/src/xen_network.c
@@ -285,6 +285,15 @@ xen_network_get_all(xen_session *session, struct xen_network_set **result)
 bool
 xen_network_get_uuid(xen_session *session, char **result, xen_network network)
 {
-    *result = session->ok ? xen_strdup_((char *)network) : NULL;
+    abstract_value param_values[] =
+        {
+            { .type = &abstract_type_string,
+              .u.string_val = network }
+        };
+
+    abstract_type result_type = abstract_type_string;
+
+    *result = NULL;
+    XEN_CALL_("network.get_uuid");
     return session->ok;
 }
diff --git a/tools/libxen/src/xen_pbd.c b/tools/libxen/src/xen_pbd.c
index 1bdcd785fa..2b8bbd5b44 100644
--- a/tools/libxen/src/xen_pbd.c
+++ b/tools/libxen/src/xen_pbd.c
@@ -235,6 +235,15 @@ xen_pbd_get_all(xen_session *session, struct xen_pbd_set **result)
 bool
 xen_pbd_get_uuid(xen_session *session, char **result, xen_pbd pbd)
 {
-    *result = session->ok ? xen_strdup_((char *)pbd) : NULL;
+    abstract_value param_values[] =
+        {
+            { .type = &abstract_type_string,
+              .u.string_val = pbd }
+        };
+
+    abstract_type result_type = abstract_type_string;
+
+    *result = NULL;
+    XEN_CALL_("PBD.get_uuid");
     return session->ok;
 }
diff --git a/tools/libxen/src/xen_pif.c b/tools/libxen/src/xen_pif.c
index f710acef4b..9dfaec7b51 100644
--- a/tools/libxen/src/xen_pif.c
+++ b/tools/libxen/src/xen_pif.c
@@ -366,6 +366,15 @@ xen_pif_get_all(xen_session *session, struct xen_pif_set **result)
 bool
 xen_pif_get_uuid(xen_session *session, char **result, xen_pif pif)
 {
-    *result = session->ok ? xen_strdup_((char *)pif) : NULL;
+    abstract_value param_values[] =
+        {
+            { .type = &abstract_type_string,
+              .u.string_val = pif }
+        };
+
+    abstract_type result_type = abstract_type_string;
+
+    *result = NULL;
+    XEN_CALL_("PIF.get_uuid");
     return session->ok;
 }
diff --git a/tools/libxen/src/xen_pif_metrics.c b/tools/libxen/src/xen_pif_metrics.c
index 5826001731..c1413442ca 100644
--- a/tools/libxen/src/xen_pif_metrics.c
+++ b/tools/libxen/src/xen_pif_metrics.c
@@ -176,6 +176,15 @@ xen_pif_metrics_get_all(xen_session *session, struct xen_pif_metrics_set **resul
 bool
 xen_pif_metrics_get_uuid(xen_session *session, char **result, xen_pif_metrics pif_metrics)
 {
-    *result = session->ok ? xen_strdup_((char *)pif_metrics) : NULL;
+    abstract_value param_values[] =
+        {
+            { .type = &abstract_type_string,
+              .u.string_val = pif_metrics }
+        };
+
+    abstract_type result_type = abstract_type_string;
+
+    *result = NULL;
+    XEN_CALL_("PIF_metrics.get_uuid");
     return session->ok;
 }
diff --git a/tools/libxen/src/xen_sr.c b/tools/libxen/src/xen_sr.c
index c3650f26a0..86538241a1 100644
--- a/tools/libxen/src/xen_sr.c
+++ b/tools/libxen/src/xen_sr.c
@@ -388,6 +388,15 @@ xen_sr_get_all(xen_session *session, struct xen_sr_set **result)
 bool
 xen_sr_get_uuid(xen_session *session, char **result, xen_sr sr)
 {
-    *result = session->ok ? xen_strdup_((char *)sr) : NULL;
+    abstract_value param_values[] =
+        {
+            { .type = &abstract_type_string,
+              .u.string_val = sr }
+        };
+
+    abstract_type result_type = abstract_type_string;
+
+    *result = NULL;
+    XEN_CALL_("SR.get_uuid");
     return session->ok;
 }
diff --git a/tools/libxen/src/xen_user.c b/tools/libxen/src/xen_user.c
index 35b80e2f66..b4dde9d74e 100644
--- a/tools/libxen/src/xen_user.c
+++ b/tools/libxen/src/xen_user.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, XenSource Inc.
+ * Copyright (c) 2006-2007, XenSource Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -196,6 +196,15 @@ xen_user_set_fullname(xen_session *session, xen_user user, char *fullname)
 bool
 xen_user_get_uuid(xen_session *session, char **result, xen_user user)
 {
-    *result = session->ok ? xen_strdup_((char *)user) : NULL;
+    abstract_value param_values[] =
+        {
+            { .type = &abstract_type_string,
+              .u.string_val = user }
+        };
+
+    abstract_type result_type = abstract_type_string;
+
+    *result = NULL;
+    XEN_CALL_("user.get_uuid");
     return session->ok;
 }
diff --git a/tools/libxen/src/xen_vbd.c b/tools/libxen/src/xen_vbd.c
index 893bf70958..cd63a4b52e 100644
--- a/tools/libxen/src/xen_vbd.c
+++ b/tools/libxen/src/xen_vbd.c
@@ -591,6 +591,15 @@ xen_vbd_get_all(xen_session *session, struct xen_vbd_set **result)
 bool
 xen_vbd_get_uuid(xen_session *session, char **result, xen_vbd vbd)
 {
-    *result = session->ok ? xen_strdup_((char *)vbd) : NULL;
+    abstract_value param_values[] =
+        {
+            { .type = &abstract_type_string,
+              .u.string_val = vbd }
+        };
+
+    abstract_type result_type = abstract_type_string;
+
+    *result = NULL;
+    XEN_CALL_("VBD.get_uuid");
     return session->ok;
 }
diff --git a/tools/libxen/src/xen_vbd_metrics.c b/tools/libxen/src/xen_vbd_metrics.c
index f0b221f65e..fb5395d309 100644
--- a/tools/libxen/src/xen_vbd_metrics.c
+++ b/tools/libxen/src/xen_vbd_metrics.c
@@ -176,6 +176,15 @@ xen_vbd_metrics_get_all(xen_session *session, struct xen_vbd_metrics_set **resul
 bool
 xen_vbd_metrics_get_uuid(xen_session *session, char **result, xen_vbd_metrics vbd_metrics)
 {
-    *result = session->ok ? xen_strdup_((char *)vbd_metrics) : NULL;
+    abstract_value param_values[] =
+        {
+            { .type = &abstract_type_string,
+              .u.string_val = vbd_metrics }
+        };
+
+    abstract_type result_type = abstract_type_string;
+
+    *result = NULL;
+    XEN_CALL_("VBD_metrics.get_uuid");
     return session->ok;
 }
diff --git a/tools/libxen/src/xen_vdi.c b/tools/libxen/src/xen_vdi.c
index 10f3fc4066..91cc306021 100644
--- a/tools/libxen/src/xen_vdi.c
+++ b/tools/libxen/src/xen_vdi.c
@@ -555,6 +555,15 @@ xen_vdi_get_all(xen_session *session, struct xen_vdi_set **result)
 bool
 xen_vdi_get_uuid(xen_session *session, char **result, xen_vdi vdi)
 {
-    *result = session->ok ? xen_strdup_((char *)vdi) : NULL;
+    abstract_value param_values[] =
+        {
+            { .type = &abstract_type_string,
+              .u.string_val = vdi }
+        };
+
+    abstract_type result_type = abstract_type_string;
+
+    *result = NULL;
+    XEN_CALL_("VDI.get_uuid");
     return session->ok;
 }
diff --git a/tools/libxen/src/xen_vif.c b/tools/libxen/src/xen_vif.c
index a139a83bc3..9a44129e4f 100644
--- a/tools/libxen/src/xen_vif.c
+++ b/tools/libxen/src/xen_vif.c
@@ -542,6 +542,15 @@ xen_vif_get_all(xen_session *session, struct xen_vif_set **result)
 bool
 xen_vif_get_uuid(xen_session *session, char **result, xen_vif vif)
 {
-    *result = session->ok ? xen_strdup_((char *)vif) : NULL;
+    abstract_value param_values[] =
+        {
+            { .type = &abstract_type_string,
+              .u.string_val = vif }
+        };
+
+    abstract_type result_type = abstract_type_string;
+
+    *result = NULL;
+    XEN_CALL_("VIF.get_uuid");
     return session->ok;
 }
diff --git a/tools/libxen/src/xen_vif_metrics.c b/tools/libxen/src/xen_vif_metrics.c
index b3b2a79f59..7c101f8933 100644
--- a/tools/libxen/src/xen_vif_metrics.c
+++ b/tools/libxen/src/xen_vif_metrics.c
@@ -176,6 +176,15 @@ xen_vif_metrics_get_all(xen_session *session, struct xen_vif_metrics_set **resul
 bool
 xen_vif_metrics_get_uuid(xen_session *session, char **result, xen_vif_metrics vif_metrics)
 {
-    *result = session->ok ? xen_strdup_((char *)vif_metrics) : NULL;
+    abstract_value param_values[] =
+        {
+            { .type = &abstract_type_string,
+              .u.string_val = vif_metrics }
+        };
+
+    abstract_type result_type = abstract_type_string;
+
+    *result = NULL;
+    XEN_CALL_("VIF_metrics.get_uuid");
     return session->ok;
 }
diff --git a/tools/libxen/src/xen_vm.c b/tools/libxen/src/xen_vm.c
index f80916188e..f29d34f7eb 100644
--- a/tools/libxen/src/xen_vm.c
+++ b/tools/libxen/src/xen_vm.c
@@ -1608,6 +1608,15 @@ xen_vm_get_all(xen_session *session, struct xen_vm_set **result)
 bool
 xen_vm_get_uuid(xen_session *session, char **result, xen_vm vm)
 {
-    *result = session->ok ? xen_strdup_((char *)vm) : NULL;
+    abstract_value param_values[] =
+        {
+            { .type = &abstract_type_string,
+              .u.string_val = vm }
+        };
+
+    abstract_type result_type = abstract_type_string;
+
+    *result = NULL;
+    XEN_CALL_("VM.get_uuid");
     return session->ok;
 }
diff --git a/tools/libxen/src/xen_vm_guest_metrics.c b/tools/libxen/src/xen_vm_guest_metrics.c
index f18966c46a..0e60926bab 100644
--- a/tools/libxen/src/xen_vm_guest_metrics.c
+++ b/tools/libxen/src/xen_vm_guest_metrics.c
@@ -265,6 +265,15 @@ xen_vm_guest_metrics_get_all(xen_session *session, struct xen_vm_guest_metrics_s
 bool
 xen_vm_guest_metrics_get_uuid(xen_session *session, char **result, xen_vm_guest_metrics vm_guest_metrics)
 {
-    *result = session->ok ? xen_strdup_((char *)vm_guest_metrics) : NULL;
+    abstract_value param_values[] =
+        {
+            { .type = &abstract_type_string,
+              .u.string_val = vm_guest_metrics }
+        };
+
+    abstract_type result_type = abstract_type_string;
+
+    *result = NULL;
+    XEN_CALL_("VM_guest_metrics.get_uuid");
     return session->ok;
 }
diff --git a/tools/libxen/src/xen_vm_metrics.c b/tools/libxen/src/xen_vm_metrics.c
index ae20899e06..11e421282b 100644
--- a/tools/libxen/src/xen_vm_metrics.c
+++ b/tools/libxen/src/xen_vm_metrics.c
@@ -198,6 +198,15 @@ xen_vm_metrics_get_all(xen_session *session, struct xen_vm_metrics_set **result)
 bool
 xen_vm_metrics_get_uuid(xen_session *session, char **result, xen_vm_metrics vm_metrics)
 {
-    *result = session->ok ? xen_strdup_((char *)vm_metrics) : NULL;
+    abstract_value param_values[] =
+        {
+            { .type = &abstract_type_string,
+              .u.string_val = vm_metrics }
+        };
+
+    abstract_type result_type = abstract_type_string;
+
+    *result = NULL;
+    XEN_CALL_("VM_metrics.get_uuid");
     return session->ok;
 }
diff --git a/tools/libxen/src/xen_vtpm.c b/tools/libxen/src/xen_vtpm.c
index 2b695f6ee2..28d849ae1c 100644
--- a/tools/libxen/src/xen_vtpm.c
+++ b/tools/libxen/src/xen_vtpm.c
@@ -182,6 +182,15 @@ xen_vtpm_get_backend(xen_session *session, xen_vm *result, xen_vtpm vtpm)
 bool
 xen_vtpm_get_uuid(xen_session *session, char **result, xen_vtpm vtpm)
 {
-    *result = session->ok ? xen_strdup_((char *)vtpm) : NULL;
+    abstract_value param_values[] =
+        {
+            { .type = &abstract_type_string,
+              .u.string_val = vtpm }
+        };
+
+    abstract_type result_type = abstract_type_string;
+
+    *result = NULL;
+    XEN_CALL_("VTPM.get_uuid");
     return session->ok;
 }