diff options
author | Keir Fraser <keir.fraser@citrix.com> | 2010-05-13 08:52:47 +0100 |
---|---|---|
committer | Keir Fraser <keir.fraser@citrix.com> | 2010-05-13 08:52:47 +0100 |
commit | f4de8d0315ec9ae49686c04a8be3125dea913e3a (patch) | |
tree | 30f59f9ecb884afaa0f78da8c14f91efcf7ce863 /tools/libxl | |
parent | a9733d50ff1df3af0cedb1638f7d92202da7298d (diff) | |
download | xen-f4de8d0315ec9ae49686c04a8be3125dea913e3a.tar.gz xen-f4de8d0315ec9ae49686c04a8be3125dea913e3a.tar.bz2 xen-f4de8d0315ec9ae49686c04a8be3125dea913e3a.zip |
xl: Implement block-detach command
Signed-off-by: Eric Chanudet <eric.chanudet@citrix.com>
Diffstat (limited to 'tools/libxl')
-rw-r--r-- | tools/libxl/libxl_utils.c | 35 | ||||
-rw-r--r-- | tools/libxl/libxl_utils.h | 3 | ||||
-rw-r--r-- | tools/libxl/xl_cmdimpl.c | 34 | ||||
-rw-r--r-- | tools/libxl/xl_cmdimpl.h | 1 | ||||
-rw-r--r-- | tools/libxl/xl_cmdtable.c | 5 |
5 files changed, 78 insertions, 0 deletions
diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c index 71b5766277..620c254daf 100644 --- a/tools/libxl/libxl_utils.c +++ b/tools/libxl/libxl_utils.c @@ -430,3 +430,38 @@ int libxl_devid_to_device_nic(struct libxl_ctx *ctx, uint32_t domid, libxl_free(ctx, nic_path_be); return 0; } + +int libxl_devid_to_device_disk(struct libxl_ctx *ctx, uint32_t domid, + const char *devid, libxl_device_disk *disk) +{ + char *endptr, *val; + char *dompath, *diskpath, *be_path; + unsigned int devid_n; + + devid_n = strtoul(devid, &endptr, 10); + if (devid == endptr) { + return ERROR_INVAL; + } + dompath = libxl_xs_get_dompath(ctx, domid); + diskpath = libxl_sprintf(ctx, "%s/device/vbd/%s", dompath, devid); + if (!diskpath) { + return ERROR_FAIL; + } + + val = libxl_xs_read(ctx, XBT_NULL, libxl_sprintf(ctx, "%s/backend-id", diskpath)); + disk->backend_domid = strtoul(val, NULL, 10); + disk->domid = domid; + be_path = libxl_xs_read(ctx, XBT_NULL, libxl_sprintf(ctx, "%s/backend", diskpath)); + disk->physpath = libxl_xs_read(ctx, XBT_NULL, libxl_sprintf(ctx, "%s/params", be_path)); + val = libxl_xs_read(ctx, XBT_NULL, libxl_sprintf(ctx, "%s/type", be_path)); + libxl_string_to_phystype(ctx, val, &(disk->phystype)); + disk->virtpath = libxl_xs_read(ctx, XBT_NULL, libxl_sprintf(ctx, "%s/dev", be_path)); + val = libxl_xs_read(ctx, XBT_NULL, libxl_sprintf(ctx, "%s/removable", be_path)); + disk->unpluggable = !strcmp(val, "1"); + val = libxl_xs_read(ctx, XBT_NULL, libxl_sprintf(ctx, "%s/mode", be_path)); + disk->readwrite = !!strcmp(val, "w"); + val = libxl_xs_read(ctx, XBT_NULL, libxl_sprintf(ctx, "%s/device-type", diskpath)); + disk->is_cdrom = !strcmp(val, "cdrom"); + + return 0; +} diff --git a/tools/libxl/libxl_utils.h b/tools/libxl/libxl_utils.h index 06df2b84a8..bd3debf0b0 100644 --- a/tools/libxl/libxl_utils.h +++ b/tools/libxl/libxl_utils.h @@ -61,6 +61,9 @@ int libxl_mac_to_device_nic(struct libxl_ctx *ctx, uint32_t domid, int libxl_devid_to_device_nic(struct libxl_ctx *ctx, uint32_t domid, const char *devid, libxl_device_nic *nic); +int libxl_devid_to_device_disk(struct libxl_ctx *ctx, uint32_t domid, + const char *devid, libxl_device_disk *disk); + /* log levels: */ #define XL_LOG_DEBUG 3 #define XL_LOG_INFO 2 diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 41b3db834c..4efd114aed 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -3461,3 +3461,37 @@ int main_blocklist(int argc, char **argv) } exit(0); } + +int main_blockdetach(int argc, char **argv) +{ + int opt; + libxl_device_disk disk; + + if (argc != 3) { + help("block-detach"); + exit(0); + } + while ((opt = getopt(argc, argv, "h")) != -1) { + switch (opt) { + case 'h': + help("block-detach"); + exit(0); + default: + fprintf(stderr, "option `%c' not supported.\n", opt); + break; + } + } + + if (domain_qualifier_to_domid(argv[1], &domid, 0) < 0) { + fprintf(stderr, "%s is an invalid domain identifier\n", argv[1]); + exit(1); + } + if (libxl_devid_to_device_disk(&ctx, domid, argv[2], &disk)) { + fprintf(stderr, "Error: Device %s not connected.\n", argv[2]); + exit(1); + } + if (libxl_device_disk_del(&ctx, &disk, 1)) { + fprintf(stderr, "libxl_device_del failed.\n"); + } + exit(0); +} diff --git a/tools/libxl/xl_cmdimpl.h b/tools/libxl/xl_cmdimpl.h index 5701b4c7a0..4d8d4be915 100644 --- a/tools/libxl/xl_cmdimpl.h +++ b/tools/libxl/xl_cmdimpl.h @@ -47,5 +47,6 @@ int main_networklist(int argc, char **argv); int main_networkdetach(int argc, char **argv); int main_blockattach(int argc, char **argv); int main_blocklist(int argc, char **argv); +int main_blockdetach(int argc, char **argv); void help(char *command); diff --git a/tools/libxl/xl_cmdtable.c b/tools/libxl/xl_cmdtable.c index 1539c2047f..bbf11677f6 100644 --- a/tools/libxl/xl_cmdtable.c +++ b/tools/libxl/xl_cmdtable.c @@ -214,6 +214,11 @@ struct cmd_spec cmd_table[] = { "List virtual block devices for a domain", "<Domain(s)>", }, + { "block-detach", + &main_blockdetach, + "Destroy a domain's virtual block device", + "<Domain> <DevId>", + }, }; int cmdtable_len = sizeof(cmd_table)/sizeof(struct cmd_spec); |