Fix missing bits of the docs from cset 14020, and match that change by removing

the similar fields on host_metrics, PIF_metrics, and VM_guest_metrics.

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

3 files changed, 2 insertions, 28 deletions

diff --git a/tools/libxen/include/xen_host_metrics.h b/tools/libxen/include/xen_host_metrics.h
index 37a6469e10..31f3123364 100644
--- a/tools/libxen/include/xen_host_metrics.h
+++ b/tools/libxen/include/xen_host_metrics.h
@@ -20,7 +20,6 @@
 #define XEN_HOST_METRICS_H
 
 #include "xen_common.h"
-#include "xen_host_decl.h"
 #include "xen_host_metrics_decl.h"
 
 
@@ -63,7 +62,6 @@ typedef struct xen_host_metrics_record
 {
     xen_host_metrics handle;
     char *uuid;
-    struct xen_host_record_opt *host;
     int64_t memory_total;
     int64_t memory_free;
 } xen_host_metrics_record;
@@ -170,13 +168,6 @@ xen_host_metrics_get_uuid(xen_session *session, char **result, xen_host_metrics
 
 
 /**
- * Get the host field of the given host_metrics.
- */
-extern bool
-xen_host_metrics_get_host(xen_session *session, xen_host *result, xen_host_metrics host_metrics);
-
-
-/**
  * Get the memory/total field of the given host_metrics.
  */
 extern bool
diff --git a/tools/libxen/include/xen_pif_metrics.h b/tools/libxen/include/xen_pif_metrics.h
index 9d49bc8c1d..b8dad22afa 100644
--- a/tools/libxen/include/xen_pif_metrics.h
+++ b/tools/libxen/include/xen_pif_metrics.h
@@ -20,7 +20,6 @@
 #define XEN_PIF_METRICS_H
 
 #include "xen_common.h"
-#include "xen_pif_decl.h"
 #include "xen_pif_metrics_decl.h"
 
 
@@ -63,7 +62,6 @@ typedef struct xen_pif_metrics_record
 {
     xen_pif_metrics handle;
     char *uuid;
-    struct xen_pif_record_opt *pif;
     double io_read_kbs;
     double io_write_kbs;
 } xen_pif_metrics_record;
@@ -169,13 +167,6 @@ xen_pif_metrics_get_uuid(xen_session *session, char **result, xen_pif_metrics pi
 
 
 /**
- * Get the PIF field of the given PIF_metrics.
- */
-extern bool
-xen_pif_metrics_get_pif(xen_session *session, xen_pif *result, xen_pif_metrics pif_metrics);
-
-
-/**
  * Get the io/read_kbs field of the given PIF_metrics.
  */
 extern bool
diff --git a/tools/libxen/include/xen_vm_guest_metrics.h b/tools/libxen/include/xen_vm_guest_metrics.h
index fd328594df..61b8b5b2b7 100644
--- a/tools/libxen/include/xen_vm_guest_metrics.h
+++ b/tools/libxen/include/xen_vm_guest_metrics.h
@@ -21,7 +21,6 @@
 
 #include "xen_common.h"
 #include "xen_string_string_map.h"
-#include "xen_vm_decl.h"
 #include "xen_vm_guest_metrics_decl.h"
 
 
@@ -64,7 +63,6 @@ typedef struct xen_vm_guest_metrics_record
 {
     xen_vm_guest_metrics handle;
     char *uuid;
-    struct xen_vm_record_opt *vm;
     xen_string_string_map *os_version;
     xen_string_string_map *pv_drivers_version;
     xen_string_string_map *memory;
@@ -176,13 +174,6 @@ xen_vm_guest_metrics_get_uuid(xen_session *session, char **result, xen_vm_guest_
 
 
 /**
- * Get the VM field of the given VM_guest_metrics.
- */
-extern bool
-xen_vm_guest_metrics_get_vm(xen_session *session, xen_vm *result, xen_vm_guest_metrics vm_guest_metrics);
-
-
-/**
  * Get the os_version field of the given VM_guest_metrics.
  */
 extern bool
@@ -225,7 +216,8 @@ xen_vm_guest_metrics_get_other(xen_session *session, xen_string_string_map **res
 
 
 /**
- * Return a list of all the VM_guest_metrics instances known to the system.
+ * Return a list of all the VM_guest_metrics instances known to the
+ * system.
  */
 extern bool
 xen_vm_guest_metrics_get_all(xen_session *session, struct xen_vm_guest_metrics_set **result);