diff options
author | Ian Campbell <ian.campbell@citrix.com> | 2011-10-18 13:36:42 +0100 |
---|---|---|
committer | Ian Campbell <ian.campbell@citrix.com> | 2011-10-18 13:36:42 +0100 |
commit | c918c9d852268f6e4f6edd8ebcc125cf7b7cdb9d (patch) | |
tree | c8d6712dc05f3c624aece74e5559507adce163c3 /tools | |
parent | b9d5b3bbc62ce8f0269fae7340825d84e252945a (diff) | |
download | xen-c918c9d852268f6e4f6edd8ebcc125cf7b7cdb9d.tar.gz xen-c918c9d852268f6e4f6edd8ebcc125cf7b7cdb9d.tar.bz2 xen-c918c9d852268f6e4f6edd8ebcc125cf7b7cdb9d.zip |
libxl: libxl_devid_to_* should take an integer device id
Currently takes a string.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson.citrix.com>
Committed-by: Ian Jackson <ian.jackson.citrix.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/libxl/libxl.c | 8 | ||||
-rw-r--r-- | tools/libxl/libxl_utils.h | 8 | ||||
-rw-r--r-- | tools/libxl/xl_cmdimpl.c | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index c6b1a72061..c9a10b7025 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1333,7 +1333,7 @@ static void libxl__device_nic_from_xs_be(libxl__gc *gc, } int libxl_devid_to_device_nic(libxl_ctx *ctx, uint32_t domid, - const char *devid, libxl_device_nic *nic) + int devid, libxl_device_nic *nic) { libxl__gc gc = LIBXL_INIT_GC(ctx); char *dompath, *path; @@ -1345,7 +1345,7 @@ int libxl_devid_to_device_nic(libxl_ctx *ctx, uint32_t domid, goto out; path = libxl__xs_read(&gc, XBT_NULL, - libxl__sprintf(&gc, "%s/device/vif/%s/backend", + libxl__sprintf(&gc, "%s/device/vif/%d/backend", dompath, devid)); if (!path) goto out; @@ -1657,7 +1657,7 @@ static void libxl__device_disk_from_xs_be(libxl__gc *gc, } int libxl_devid_to_device_disk(libxl_ctx *ctx, uint32_t domid, - const char *devid, libxl_device_disk *disk) + int devid, libxl_device_disk *disk) { libxl__gc gc = LIBXL_INIT_GC(ctx); char *dompath, *path; @@ -1669,7 +1669,7 @@ int libxl_devid_to_device_disk(libxl_ctx *ctx, uint32_t domid, goto out; } path = libxl__xs_read(&gc, XBT_NULL, - libxl__sprintf(&gc, "%s/device/vbd/%s/backend", + libxl__sprintf(&gc, "%s/device/vbd/%d/backend", dompath, devid)); if (!path) goto out; diff --git a/tools/libxl/libxl_utils.h b/tools/libxl/libxl_utils.h index e6235797fe..0790fa0620 100644 --- a/tools/libxl/libxl_utils.h +++ b/tools/libxl/libxl_utils.h @@ -60,11 +60,11 @@ void libxl_report_child_exitstatus(libxl_ctx *ctx, xentoollog_level, int libxl_mac_to_device_nic(libxl_ctx *ctx, uint32_t domid, const char *mac, libxl_device_nic *nic); -int libxl_devid_to_device_nic(libxl_ctx *ctx, uint32_t domid, - const char *devid, libxl_device_nic *nic); +int libxl_devid_to_device_nic(libxl_ctx *ctx, uint32_t domid, int devid, + libxl_device_nic *nic); -int libxl_devid_to_device_disk(libxl_ctx *ctx, uint32_t domid, - const char *devid, libxl_device_disk *disk); +int libxl_devid_to_device_disk(libxl_ctx *ctx, uint32_t domid, int devid, + libxl_device_disk *disk); int libxl_cpumap_alloc(libxl_ctx *ctx, libxl_cpumap *cpumap); int libxl_cpumap_test(libxl_cpumap *cpumap, int cpu); diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 8424b66fc6..d000c2e09c 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -4077,7 +4077,7 @@ int main_networkdetach(int argc, char **argv) } if (!strchr(argv[optind+1], ':')) { - if (libxl_devid_to_device_nic(ctx, domid, argv[optind+1], &nic)) { + if (libxl_devid_to_device_nic(ctx, domid, atoi(argv[optind+1]), &nic)) { fprintf(stderr, "Unknown device %s.\n", argv[optind+1]); return 1; } @@ -4178,7 +4178,7 @@ int main_blockdetach(int argc, char **argv) fprintf(stderr, "%s is an invalid domain identifier\n", argv[optind]); return 1; } - if (libxl_devid_to_device_disk(ctx, domid, argv[optind+1], &disk)) { + if (libxl_devid_to_device_disk(ctx, domid, atoi(argv[optind+1]), &disk)) { fprintf(stderr, "Error: Device %s not connected.\n", argv[optind+1]); return 1; } |