diff options
| author | Ian Campbell <ian.campbell@citrix.com> | 2012-07-25 17:57:22 +0100 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2012-07-25 17:57:22 +0100 |
| commit | b1ec741ea12eb599ce055e408b5d15fa7c7c8ea1 (patch) | |
| tree | e8c1b646937377bc307dad4667097d3ee9f722f9 | |
| parent | bd1c6cec55afc265a019886f57dfc5bf4c2e1623 (diff) | |
| download | xen-b1ec741ea12eb599ce055e408b5d15fa7c7c8ea1.tar.gz xen-b1ec741ea12eb599ce055e408b5d15fa7c7c8ea1.tar.bz2 xen-b1ec741ea12eb599ce055e408b5d15fa7c7c8ea1.zip | |
libxl: libxl__device_model_version_running should return an int
On error it returns -1 and therefore it needs to return int and not
libxl_device_model_enum. Otherwise gcc 4.6.2 complains:
libxl.c: In function ‘libxl_domain_suspend’:
libxl.c:778:9: error: case value ‘4294967295’ not in enumerated type ‘libxl_device_model_version’ [-Werror=switch]
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Committed-by: Ian Campbell <ian.campbell@citrix.com>
| -rw-r--r-- | tools/libxl/libxl_internal.c | 3 | ||||
| -rw-r--r-- | tools/libxl/libxl_internal.h | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/tools/libxl/libxl_internal.c b/tools/libxl/libxl_internal.c index fbff7d06d9..24099f59f6 100644 --- a/tools/libxl/libxl_internal.c +++ b/tools/libxl/libxl_internal.c @@ -330,8 +330,7 @@ out: return rc; } -libxl_device_model_version libxl__device_model_version_running(libxl__gc *gc, - uint32_t domid) +int libxl__device_model_version_running(libxl__gc *gc, uint32_t domid) { char *path = NULL; char *dm_version = NULL; diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 9ffb9d4dbf..1b9b417664 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1515,8 +1515,7 @@ _hidden libxl__json_object *libxl__json_parse(libxl__gc *gc, const char *s); /* Based on /local/domain/$domid/dm-version xenstore key * default is qemu xen traditional */ -_hidden libxl_device_model_version -libxl__device_model_version_running(libxl__gc *gc, uint32_t domid); +_hidden int libxl__device_model_version_running(libxl__gc *gc, uint32_t domid); /* |