From 76dbb3eb6ba111989b09905c5d914a28fe908c55 Mon Sep 17 00:00:00 2001 From: Daniel De Graaf Date: Thu, 16 Aug 2012 16:40:26 -0400 Subject: [PATCH] --- yaml --- r: 329139 b: refs/heads/master c: 5c13f8067745efc15f6ad0158b58d57c44104c25 h: refs/heads/master i: 329137: d432c0370d5870d10aebbb09ab8840f29c033849 329135: f3ba09ad329391cd9055e7e3a9a431c11ee416fd v: v3 --- [refs] | 2 +- trunk/drivers/xen/sys-hypervisor.c | 13 ++++++++++++- trunk/include/xen/interface/version.h | 3 +++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c9888d1487fe..388472b67168 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b8b0f559c7b1dcf5503817e518c81c9a18ee45e0 +refs/heads/master: 5c13f8067745efc15f6ad0158b58d57c44104c25 diff --git a/trunk/drivers/xen/sys-hypervisor.c b/trunk/drivers/xen/sys-hypervisor.c index fdb6d229c9bb..5e5ad7e28858 100644 --- a/trunk/drivers/xen/sys-hypervisor.c +++ b/trunk/drivers/xen/sys-hypervisor.c @@ -114,7 +114,7 @@ static void xen_sysfs_version_destroy(void) /* UUID */ -static ssize_t uuid_show(struct hyp_sysfs_attr *attr, char *buffer) +static ssize_t uuid_show_fallback(struct hyp_sysfs_attr *attr, char *buffer) { char *vm, *val; int ret; @@ -135,6 +135,17 @@ static ssize_t uuid_show(struct hyp_sysfs_attr *attr, char *buffer) return ret; } +static ssize_t uuid_show(struct hyp_sysfs_attr *attr, char *buffer) +{ + xen_domain_handle_t uuid; + int ret; + ret = HYPERVISOR_xen_version(XENVER_guest_handle, uuid); + if (ret) + return uuid_show_fallback(attr, buffer); + ret = sprintf(buffer, "%pU\n", uuid); + return ret; +} + HYPERVISOR_ATTR_RO(uuid); static int __init xen_sysfs_uuid_init(void) diff --git a/trunk/include/xen/interface/version.h b/trunk/include/xen/interface/version.h index e8b6519d47e9..dd58cf5ea3e4 100644 --- a/trunk/include/xen/interface/version.h +++ b/trunk/include/xen/interface/version.h @@ -60,4 +60,7 @@ struct xen_feature_info { /* arg == NULL; returns host memory page size. */ #define XENVER_pagesize 7 +/* arg == xen_domain_handle_t. */ +#define XENVER_guest_handle 8 + #endif /* __XEN_PUBLIC_VERSION_H__ */