diff options
author | Ewan Mellor <ewan@xensource.com> | 2007-02-25 22:02:12 +0000 |
---|---|---|
committer | Ewan Mellor <ewan@xensource.com> | 2007-02-25 22:02:12 +0000 |
commit | 6bae08b49815fb00e5ded98494650ed1b7006345 (patch) | |
tree | 01d7a79b31a724a440ef4567d5775588e813193a /tools/libxen | |
parent | 0982a6eac00f0fe8a11c5ac0badf32c0deeb352c (diff) | |
download | xen-6bae08b49815fb00e5ded98494650ed1b7006345.tar.gz xen-6bae08b49815fb00e5ded98494650ed1b7006345.tar.bz2 xen-6bae08b49815fb00e5ded98494650ed1b7006345.zip |
Remove the bindings for VM.get_VCPUs_{number,utilisation} -- these have moved
onto the metrics class.
Signed-off-by: Ewan Mellor <ewan@xensource.com>
Diffstat (limited to 'tools/libxen')
-rw-r--r-- | tools/libxen/include/xen_vm.h | 19 | ||||
-rw-r--r-- | tools/libxen/src/xen_vm.c | 43 |
2 files changed, 2 insertions, 60 deletions
diff --git a/tools/libxen/include/xen_vm.h b/tools/libxen/include/xen_vm.h index 3c23784cf5..15abbb11c7 100644 --- a/tools/libxen/include/xen_vm.h +++ b/tools/libxen/include/xen_vm.h @@ -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 @@ -23,7 +23,6 @@ #include "xen_console_decl.h" #include "xen_crashdump_decl.h" #include "xen_host_decl.h" -#include "xen_int_float_map.h" #include "xen_on_crash_behaviour.h" #include "xen_on_normal_exit.h" #include "xen_string_string_map.h" @@ -124,8 +123,6 @@ typedef struct xen_vm_record xen_string_string_map *vcpus_params; int64_t vcpus_max; int64_t vcpus_at_startup; - int64_t vcpus_number; - xen_int_float_map *vcpus_utilisation; enum xen_on_normal_exit actions_after_shutdown; enum xen_on_normal_exit actions_after_reboot; enum xen_on_crash_behaviour actions_after_crash; @@ -389,20 +386,6 @@ xen_vm_get_vcpus_at_startup(xen_session *session, int64_t *result, xen_vm vm); /** - * Get the VCPUs/number field of the given VM. - */ -extern bool -xen_vm_get_vcpus_number(xen_session *session, int64_t *result, xen_vm vm); - - -/** - * Get the VCPUs/utilisation field of the given VM. - */ -extern bool -xen_vm_get_vcpus_utilisation(xen_session *session, xen_int_float_map **result, xen_vm vm); - - -/** * Get the actions/after_shutdown field of the given VM. */ extern bool diff --git a/tools/libxen/src/xen_vm.c b/tools/libxen/src/xen_vm.c index e3f82575bd..c712b71561 100644 --- a/tools/libxen/src/xen_vm.c +++ b/tools/libxen/src/xen_vm.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 @@ -24,7 +24,6 @@ #include "xen_console.h" #include "xen_crashdump.h" #include "xen_host.h" -#include "xen_int_float_map.h" #include "xen_internal.h" #include "xen_on_crash_behaviour_internal.h" #include "xen_on_normal_exit_internal.h" @@ -100,12 +99,6 @@ static const struct_member xen_vm_record_struct_members[] = { .key = "VCPUs_at_startup", .type = &abstract_type_int, .offset = offsetof(xen_vm_record, vcpus_at_startup) }, - { .key = "VCPUs_number", - .type = &abstract_type_int, - .offset = offsetof(xen_vm_record, vcpus_number) }, - { .key = "VCPUs_utilisation", - .type = &abstract_type_int_float_map, - .offset = offsetof(xen_vm_record, vcpus_utilisation) }, { .key = "actions_after_shutdown", .type = &xen_on_normal_exit_abstract_type_, .offset = offsetof(xen_vm_record, actions_after_shutdown) }, @@ -208,7 +201,6 @@ xen_vm_record_free(xen_vm_record *record) xen_host_record_opt_free(record->resident_on); free(record->vcpus_policy); xen_string_string_map_free(record->vcpus_params); - xen_int_float_map_free(record->vcpus_utilisation); xen_console_record_opt_set_free(record->consoles); xen_vif_record_opt_set_free(record->vifs); xen_vbd_record_opt_set_free(record->vbds); @@ -580,39 +572,6 @@ xen_vm_get_vcpus_at_startup(xen_session *session, int64_t *result, xen_vm vm) bool -xen_vm_get_vcpus_number(xen_session *session, int64_t *result, xen_vm vm) -{ - abstract_value param_values[] = - { - { .type = &abstract_type_string, - .u.string_val = vm } - }; - - abstract_type result_type = abstract_type_int; - - XEN_CALL_("VM.get_VCPUs_number"); - return session->ok; -} - - -bool -xen_vm_get_vcpus_utilisation(xen_session *session, xen_int_float_map **result, xen_vm vm) -{ - abstract_value param_values[] = - { - { .type = &abstract_type_string, - .u.string_val = vm } - }; - - abstract_type result_type = abstract_type_int_float_map; - - *result = NULL; - XEN_CALL_("VM.get_VCPUs_utilisation"); - return session->ok; -} - - -bool xen_vm_get_actions_after_shutdown(xen_session *session, enum xen_on_normal_exit *result, xen_vm vm) { abstract_value param_values[] = |