From 668fbded84ff31d548ae5e84419b2acab88600e2 Mon Sep 17 00:00:00 2001 From: Ewan Mellor Date: Mon, 9 Apr 2007 12:20:35 +0100 Subject: Make host.sched_policy read-only. Added docs, bindings, and a test for host.cpu_configuration and host.sched_policy. Signed-off-by: Ewan Mellor --- tools/libxen/include/xen_host.h | 16 ++++++++++++++ tools/libxen/src/xen_host.c | 42 ++++++++++++++++++++++++++++++++++++ tools/libxen/test/test_bindings.c | 45 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 103 insertions(+) (limited to 'tools/libxen') diff --git a/tools/libxen/include/xen_host.h b/tools/libxen/include/xen_host.h index f380f989d0..181aa5e22d 100644 --- a/tools/libxen/include/xen_host.h +++ b/tools/libxen/include/xen_host.h @@ -79,6 +79,8 @@ typedef struct xen_host_record xen_string_string_map *software_version; xen_string_string_map *other_config; struct xen_string_set *capabilities; + xen_string_string_map *cpu_configuration; + char *sched_policy; struct xen_string_set *supported_bootloaders; struct xen_vm_record_opt_set *resident_vms; xen_string_string_map *logging; @@ -260,6 +262,20 @@ extern bool xen_host_get_capabilities(xen_session *session, struct xen_string_set **result, xen_host host); +/** + * Get the cpu_configuration field of the given host. + */ +extern bool +xen_host_get_cpu_configuration(xen_session *session, xen_string_string_map **result, xen_host host); + + +/** + * Get the sched_policy field of the given host. + */ +extern bool +xen_host_get_sched_policy(xen_session *session, char **result, xen_host host); + + /** * Get the supported_bootloaders field of the given host. */ diff --git a/tools/libxen/src/xen_host.c b/tools/libxen/src/xen_host.c index a55b91e0af..bc2b1f0e8b 100644 --- a/tools/libxen/src/xen_host.c +++ b/tools/libxen/src/xen_host.c @@ -73,6 +73,12 @@ static const struct_member xen_host_record_struct_members[] = { .key = "capabilities", .type = &abstract_type_string_set, .offset = offsetof(xen_host_record, capabilities) }, + { .key = "cpu_configuration", + .type = &abstract_type_string_string_map, + .offset = offsetof(xen_host_record, cpu_configuration) }, + { .key = "sched_policy", + .type = &abstract_type_string, + .offset = offsetof(xen_host_record, sched_policy) }, { .key = "supported_bootloaders", .type = &abstract_type_string_set, .offset = offsetof(xen_host_record, supported_bootloaders) }, @@ -128,6 +134,8 @@ xen_host_record_free(xen_host_record *record) xen_string_string_map_free(record->software_version); xen_string_string_map_free(record->other_config); xen_string_set_free(record->capabilities); + xen_string_string_map_free(record->cpu_configuration); + free(record->sched_policy); xen_string_set_free(record->supported_bootloaders); xen_vm_record_opt_set_free(record->resident_vms); xen_string_string_map_free(record->logging); @@ -349,6 +357,40 @@ xen_host_get_capabilities(xen_session *session, struct xen_string_set **result, } +bool +xen_host_get_cpu_configuration(xen_session *session, xen_string_string_map **result, xen_host host) +{ + abstract_value param_values[] = + { + { .type = &abstract_type_string, + .u.string_val = host } + }; + + abstract_type result_type = abstract_type_string_string_map; + + *result = NULL; + XEN_CALL_("host.get_cpu_configuration"); + return session->ok; +} + + +bool +xen_host_get_sched_policy(xen_session *session, char **result, xen_host host) +{ + 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_sched_policy"); + return session->ok; +} + + bool xen_host_get_supported_bootloaders(xen_session *session, struct xen_string_set **result, xen_host host) { diff --git a/tools/libxen/test/test_bindings.c b/tools/libxen/test/test_bindings.c index 6da442d539..df067aa438 100644 --- a/tools/libxen/test/test_bindings.c +++ b/tools/libxen/test/test_bindings.c @@ -285,6 +285,40 @@ int main(int argc, char **argv) return 1; } + xen_string_string_map *cpu_configuration; + if (!xen_host_get_cpu_configuration(session, &cpu_configuration, host)) + { + print_error(session); + free(dmesg); + xen_string_set_free(capabilities); + xen_string_set_free(supported_bootloaders); + xen_string_string_map_free(versions); + xen_host_free(host); + xen_vm_record_free(vm_record); + xen_uuid_bytes_free(vm_uuid_bytes); + xen_uuid_free(vm_uuid); + xen_vm_free(vm); + CLEANUP; + return 1; + } + + char *sched_policy; + if (!xen_host_get_sched_policy(session, &sched_policy, host)) + { + print_error(session); + xen_string_string_map_free(cpu_configuration); + xen_string_set_free(capabilities); + xen_string_set_free(supported_bootloaders); + xen_string_string_map_free(versions); + xen_host_free(host); + xen_vm_record_free(vm_record); + xen_uuid_bytes_free(vm_uuid_bytes); + xen_uuid_free(vm_uuid); + xen_vm_free(vm); + CLEANUP; + return 1; + } + printf("%s.\n", vm_uuid); printf("In bytes, the VM UUID is "); @@ -318,6 +352,15 @@ int main(int argc, char **argv) } printf("\n"); + printf("Host has the following CPU configuration:\n"); + for (size_t i = 0; i < cpu_configuration->size; i++) + { + printf(" %s -> %s.\n", cpu_configuration->contents[i].key, + cpu_configuration->contents[i].val); + } + + printf("Current scheduler policy: %s.\n\n", sched_policy); + printf("%s.\n", vm_record->uuid); printf("Resident on %s.\n", (char *)vm_record->resident_on->u.handle); @@ -334,6 +377,8 @@ int main(int argc, char **argv) free(dmesg); xen_string_set_free(supported_bootloaders); xen_string_set_free(capabilities); + xen_string_string_map_free(cpu_configuration); + free(sched_policy); print_vm_metrics(session, vm); if (!session->ok) -- cgit v1.2.3