Replace VM.tools_version with a richer VM_guest_metrics class.

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

2 files changed, 281 insertions, 19 deletions

diff --git a/tools/libxen/src/xen_vm.c b/tools/libxen/src/xen_vm.c
index 1d93e6a840..910c9f8b31 100644
--- a/tools/libxen/src/xen_vm.c
+++ b/tools/libxen/src/xen_vm.c
@@ -32,6 +32,7 @@
 #include "xen_vdi.h"
 #include "xen_vif.h"
 #include "xen_vm.h"
+#include "xen_vm_guest_metrics.h"
 #include "xen_vm_metrics.h"
 #include "xen_vm_power_state_internal.h"
 #include "xen_vtpm.h"
@@ -162,9 +163,6 @@ static const struct_member xen_vm_record_struct_members[] =
         { .key = "PCI_bus",
           .type = &abstract_type_string,
           .offset = offsetof(xen_vm_record, pci_bus) },
-        { .key = "tools_version",
-          .type = &abstract_type_string_string_map,
-          .offset = offsetof(xen_vm_record, tools_version) },
         { .key = "other_config",
           .type = &abstract_type_string_string_map,
           .offset = offsetof(xen_vm_record, other_config) },
@@ -176,7 +174,10 @@ static const struct_member xen_vm_record_struct_members[] =
           .offset = offsetof(xen_vm_record, is_control_domain) },
         { .key = "metrics",
           .type = &abstract_type_ref,
-          .offset = offsetof(xen_vm_record, metrics) }
+          .offset = offsetof(xen_vm_record, metrics) },
+        { .key = "guest_metrics",
+          .type = &abstract_type_ref,
+          .offset = offsetof(xen_vm_record, guest_metrics) }
     };
 
 const abstract_type xen_vm_record_abstract_type_ =
@@ -218,9 +219,9 @@ xen_vm_record_free(xen_vm_record *record)
     xen_string_string_map_free(record->hvm_boot_params);
     free(record->platform_serial);
     free(record->pci_bus);
-    xen_string_string_map_free(record->tools_version);
     xen_string_string_map_free(record->other_config);
     xen_vm_metrics_record_opt_free(record->metrics);
+    xen_vm_guest_metrics_record_opt_free(record->guest_metrics);
     free(record);
 }
 
@@ -922,7 +923,7 @@ xen_vm_get_pci_bus(xen_session *session, char **result, xen_vm vm)
 
 
 bool
-xen_vm_get_tools_version(xen_session *session, xen_string_string_map **result, xen_vm vm)
+xen_vm_get_other_config(xen_session *session, xen_string_string_map **result, xen_vm vm)
 {
     abstract_value param_values[] =
         {
@@ -933,13 +934,13 @@ xen_vm_get_tools_version(xen_session *session, xen_string_string_map **result, x
     abstract_type result_type = abstract_type_string_string_map;
 
     *result = NULL;
-    XEN_CALL_("VM.get_tools_version");
+    XEN_CALL_("VM.get_other_config");
     return session->ok;
 }
 
 
 bool
-xen_vm_get_other_config(xen_session *session, xen_string_string_map **result, xen_vm vm)
+xen_vm_get_domid(xen_session *session, int64_t *result, xen_vm vm)
 {
     abstract_value param_values[] =
         {
@@ -947,16 +948,15 @@ xen_vm_get_other_config(xen_session *session, xen_string_string_map **result, xe
               .u.string_val = vm }
         };
 
-    abstract_type result_type = abstract_type_string_string_map;
+    abstract_type result_type = abstract_type_int;
 
-    *result = NULL;
-    XEN_CALL_("VM.get_other_config");
+    XEN_CALL_("VM.get_domid");
     return session->ok;
 }
 
 
 bool
-xen_vm_get_domid(xen_session *session, int64_t *result, xen_vm vm)
+xen_vm_get_is_control_domain(xen_session *session, bool *result, xen_vm vm)
 {
     abstract_value param_values[] =
         {
@@ -964,15 +964,15 @@ xen_vm_get_domid(xen_session *session, int64_t *result, xen_vm vm)
               .u.string_val = vm }
         };
 
-    abstract_type result_type = abstract_type_int;
+    abstract_type result_type = abstract_type_bool;
 
-    XEN_CALL_("VM.get_domid");
+    XEN_CALL_("VM.get_is_control_domain");
     return session->ok;
 }
 
 
 bool
-xen_vm_get_is_control_domain(xen_session *session, bool *result, xen_vm vm)
+xen_vm_get_metrics(xen_session *session, xen_vm_metrics *result, xen_vm vm)
 {
     abstract_value param_values[] =
         {
@@ -980,15 +980,16 @@ xen_vm_get_is_control_domain(xen_session *session, bool *result, xen_vm vm)
               .u.string_val = vm }
         };
 
-    abstract_type result_type = abstract_type_bool;
+    abstract_type result_type = abstract_type_string;
 
-    XEN_CALL_("VM.get_is_control_domain");
+    *result = NULL;
+    XEN_CALL_("VM.get_metrics");
     return session->ok;
 }
 
 
 bool
-xen_vm_get_metrics(xen_session *session, xen_vm_metrics *result, xen_vm vm)
+xen_vm_get_guest_metrics(xen_session *session, xen_vm_guest_metrics *result, xen_vm vm)
 {
     abstract_value param_values[] =
         {
@@ -999,7 +1000,7 @@ xen_vm_get_metrics(xen_session *session, xen_vm_metrics *result, xen_vm vm)
     abstract_type result_type = abstract_type_string;
 
     *result = NULL;
-    XEN_CALL_("VM.get_metrics");
+    XEN_CALL_("VM.get_guest_metrics");
     return session->ok;
 }
 
diff --git a/tools/libxen/src/xen_vm_guest_metrics.c b/tools/libxen/src/xen_vm_guest_metrics.c
new file mode 100644
index 0000000000..44c9fabe97
--- /dev/null
+++ b/tools/libxen/src/xen_vm_guest_metrics.c
@@ -0,0 +1,261 @@
+/*
+ * 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
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+ */
+
+
+#include <stddef.h>
+#include <stdlib.h>
+
+#include "xen_common.h"
+#include "xen_internal.h"
+#include "xen_string_string_map.h"
+#include "xen_vm.h"
+#include "xen_vm_guest_metrics.h"
+
+
+XEN_FREE(xen_vm_guest_metrics)
+XEN_SET_ALLOC_FREE(xen_vm_guest_metrics)
+XEN_ALLOC(xen_vm_guest_metrics_record)
+XEN_SET_ALLOC_FREE(xen_vm_guest_metrics_record)
+XEN_ALLOC(xen_vm_guest_metrics_record_opt)
+XEN_RECORD_OPT_FREE(xen_vm_guest_metrics)
+XEN_SET_ALLOC_FREE(xen_vm_guest_metrics_record_opt)
+
+
+static const struct_member xen_vm_guest_metrics_record_struct_members[] =
+    {
+        { .key = "uuid",
+          .type = &abstract_type_string,
+          .offset = offsetof(xen_vm_guest_metrics_record, uuid) },
+        { .key = "VM",
+          .type = &abstract_type_ref,
+          .offset = offsetof(xen_vm_guest_metrics_record, vm) },
+        { .key = "os_version",
+          .type = &abstract_type_string_string_map,
+          .offset = offsetof(xen_vm_guest_metrics_record, os_version) },
+        { .key = "PV_drivers_version",
+          .type = &abstract_type_string_string_map,
+          .offset = offsetof(xen_vm_guest_metrics_record, pv_drivers_version) },
+        { .key = "memory",
+          .type = &abstract_type_string_string_map,
+          .offset = offsetof(xen_vm_guest_metrics_record, memory) },
+        { .key = "disks",
+          .type = &abstract_type_string_string_map,
+          .offset = offsetof(xen_vm_guest_metrics_record, disks) },
+        { .key = "networks",
+          .type = &abstract_type_string_string_map,
+          .offset = offsetof(xen_vm_guest_metrics_record, networks) },
+        { .key = "other",
+          .type = &abstract_type_string_string_map,
+          .offset = offsetof(xen_vm_guest_metrics_record, other) }
+    };
+
+const abstract_type xen_vm_guest_metrics_record_abstract_type_ =
+    {
+       .typename = STRUCT,
+       .struct_size = sizeof(xen_vm_guest_metrics_record),
+       .member_count =
+           sizeof(xen_vm_guest_metrics_record_struct_members) / sizeof(struct_member),
+       .members = xen_vm_guest_metrics_record_struct_members
+    };
+
+
+void
+xen_vm_guest_metrics_record_free(xen_vm_guest_metrics_record *record)
+{
+    if (record == NULL)
+    {
+        return;
+    }
+    free(record->handle);
+    free(record->uuid);
+    xen_vm_record_opt_free(record->vm);
+    xen_string_string_map_free(record->os_version);
+    xen_string_string_map_free(record->pv_drivers_version);
+    xen_string_string_map_free(record->memory);
+    xen_string_string_map_free(record->disks);
+    xen_string_string_map_free(record->networks);
+    xen_string_string_map_free(record->other);
+    free(record);
+}
+
+
+bool
+xen_vm_guest_metrics_get_record(xen_session *session, xen_vm_guest_metrics_record **result, xen_vm_guest_metrics vm_guest_metrics)
+{
+    abstract_value param_values[] =
+        {
+            { .type = &abstract_type_string,
+              .u.string_val = vm_guest_metrics }
+        };
+
+    abstract_type result_type = xen_vm_guest_metrics_record_abstract_type_;
+
+    *result = NULL;
+    XEN_CALL_("VM_guest_metrics.get_record");
+
+    if (session->ok)
+    {
+       (*result)->handle = xen_strdup_((*result)->uuid);
+    }
+
+    return session->ok;
+}
+
+
+bool
+xen_vm_guest_metrics_get_by_uuid(xen_session *session, xen_vm_guest_metrics *result, char *uuid)
+{
+    abstract_value param_values[] =
+        {
+            { .type = &abstract_type_string,
+              .u.string_val = uuid }
+        };
+
+    abstract_type result_type = abstract_type_string;
+
+    *result = NULL;
+    XEN_CALL_("VM_guest_metrics.get_by_uuid");
+    return session->ok;
+}
+
+
+bool
+xen_vm_guest_metrics_get_vm(xen_session *session, xen_vm *result, xen_vm_guest_metrics vm_guest_metrics)
+{
+    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_VM");
+    return session->ok;
+}
+
+
+bool
+xen_vm_guest_metrics_get_os_version(xen_session *session, xen_string_string_map **result, xen_vm_guest_metrics vm_guest_metrics)
+{
+    abstract_value param_values[] =
+        {
+            { .type = &abstract_type_string,
+              .u.string_val = vm_guest_metrics }
+        };
+
+    abstract_type result_type = abstract_type_string_string_map;
+
+    *result = NULL;
+    XEN_CALL_("VM_guest_metrics.get_os_version");
+    return session->ok;
+}
+
+
+bool
+xen_vm_guest_metrics_get_pv_drivers_version(xen_session *session, xen_string_string_map **result, xen_vm_guest_metrics vm_guest_metrics)
+{
+    abstract_value param_values[] =
+        {
+            { .type = &abstract_type_string,
+              .u.string_val = vm_guest_metrics }
+        };
+
+    abstract_type result_type = abstract_type_string_string_map;
+
+    *result = NULL;
+    XEN_CALL_("VM_guest_metrics.get_PV_drivers_version");
+    return session->ok;
+}
+
+
+bool
+xen_vm_guest_metrics_get_memory(xen_session *session, xen_string_string_map **result, xen_vm_guest_metrics vm_guest_metrics)
+{
+    abstract_value param_values[] =
+        {
+            { .type = &abstract_type_string,
+              .u.string_val = vm_guest_metrics }
+        };
+
+    abstract_type result_type = abstract_type_string_string_map;
+
+    *result = NULL;
+    XEN_CALL_("VM_guest_metrics.get_memory");
+    return session->ok;
+}
+
+
+bool
+xen_vm_guest_metrics_get_disks(xen_session *session, xen_string_string_map **result, xen_vm_guest_metrics vm_guest_metrics)
+{
+    abstract_value param_values[] =
+        {
+            { .type = &abstract_type_string,
+              .u.string_val = vm_guest_metrics }
+        };
+
+    abstract_type result_type = abstract_type_string_string_map;
+
+    *result = NULL;
+    XEN_CALL_("VM_guest_metrics.get_disks");
+    return session->ok;
+}
+
+
+bool
+xen_vm_guest_metrics_get_networks(xen_session *session, xen_string_string_map **result, xen_vm_guest_metrics vm_guest_metrics)
+{
+    abstract_value param_values[] =
+        {
+            { .type = &abstract_type_string,
+              .u.string_val = vm_guest_metrics }
+        };
+
+    abstract_type result_type = abstract_type_string_string_map;
+
+    *result = NULL;
+    XEN_CALL_("VM_guest_metrics.get_networks");
+    return session->ok;
+}
+
+
+bool
+xen_vm_guest_metrics_get_other(xen_session *session, xen_string_string_map **result, xen_vm_guest_metrics vm_guest_metrics)
+{
+    abstract_value param_values[] =
+        {
+            { .type = &abstract_type_string,
+              .u.string_val = vm_guest_metrics }
+        };
+
+    abstract_type result_type = abstract_type_string_string_map;
+
+    *result = NULL;
+    XEN_CALL_("VM_guest_metrics.get_other");
+    return session->ok;
+}
+
+
+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;
+    return session->ok;
+}