Mailing List Archive

# HG changeset patch
# User Keir Fraser <keir.fraser@citrix.com>
# Date 1273737054 -3600
# Node ID 68d4e8b220fa024ea08dd15041beac6a3f276659
# Parent dcacf3300a0b26d7d76300c5269c73713ab15a1c
xl: Implement block-attach command

Signed-off-by: Eric Chanudet <eric.chanudet@citrix.com>
---
tools/libxl/xl_cmdimpl.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++
tools/libxl/xl_cmdimpl.h | 1
tools/libxl/xl_cmdtable.c | 5 +++
3 files changed, 78 insertions(+)

diff -r dcacf3300a0b -r 68d4e8b220fa tools/libxl/xl_cmdimpl.c
--- a/tools/libxl/xl_cmdimpl.c Thu May 13 08:49:41 2010 +0100
+++ b/tools/libxl/xl_cmdimpl.c Thu May 13 08:50:54 2010 +0100
@@ -3344,3 +3344,75 @@ int main_networkdetach(int argc, char **
}
exit(0);
}
+
+int main_blockattach(int argc, char **argv)
+{
+ int opt;
+ char *tok;
+ uint32_t fe_domid, be_domid = 0;
+ libxl_device_disk disk = { 0 };
+
+ if ((argc < 3) || (argc > 6)) {
+ help("block-attach");
+ exit(0);
+ }
+ while ((opt = getopt(argc, argv, "h")) != -1) {
+ switch (opt) {
+ case 'h':
+ help("block-attach");
+ exit(0);
+ default:
+ fprintf(stderr, "option `%c' not supported.\n", opt);
+ break;
+ }
+ }
+
+ tok = strtok(argv[2], ":");
+ if (!strcmp(tok, "phy")) {
+ disk.phystype = PHYSTYPE_PHY;
+ } else if (!strcmp(tok, "file")) {
+ disk.phystype = PHYSTYPE_FILE;
+ } else if (!strcmp(tok, "tap")) {
+ tok = strtok(NULL, ":");
+ if (!strcmp(tok, "aio")) {
+ disk.phystype = PHYSTYPE_AIO;
+ } else if (!strcmp(tok, "vhd")) {
+ disk.phystype = PHYSTYPE_VHD;
+ } else if (!strcmp(tok, "qcow")) {
+ disk.phystype = PHYSTYPE_QCOW;
+ } else if (!strcmp(tok, "qcow2")) {
+ disk.phystype = PHYSTYPE_QCOW2;
+ } else {
+ fprintf(stderr, "Error: `%s' is not a valid disk image.\n", tok);
+ exit(1);
+ }
+ } else {
+ fprintf(stderr, "Error: `%s' is not a valid block device.\n", tok);
+ exit(1);
+ }
+ disk.physpath = strtok(NULL, "\0");
+ if (!disk.physpath) {
+ fprintf(stderr, "Error: missing path to disk image.\n");
+ exit(1);
+ }
+ disk.virtpath = argv[3];
+ disk.unpluggable = 1;
+ disk.readwrite = (argv[4][0] == 'w') ? 1 : 0;
+
+ if (domain_qualifier_to_domid(argv[1], &fe_domid, 0) < 0) {
+ fprintf(stderr, "%s is an invalid domain identifier\n", argv[1]);
+ exit(1);
+ }
+ if (argc == 6) {
+ if (domain_qualifier_to_domid(argv[5], &be_domid, 0) < 0) {
+ fprintf(stderr, "%s is an invalid domain identifier\n", argv[5]);
+ exit(1);
+ }
+ }
+ disk.domid = fe_domid;
+ disk.backend_domid = be_domid;
+ if (libxl_device_disk_add(&ctx, fe_domid, &disk)) {
+ fprintf(stderr, "libxl_device_disk_add failed.\n");
+ }
+ exit(0);
+}
diff -r dcacf3300a0b -r 68d4e8b220fa tools/libxl/xl_cmdimpl.h
--- a/tools/libxl/xl_cmdimpl.h Thu May 13 08:49:41 2010 +0100
+++ b/tools/libxl/xl_cmdimpl.h Thu May 13 08:50:54 2010 +0100
@@ -45,5 +45,6 @@ int main_networkattach(int argc, char **
int main_networkattach(int argc, char **argv);
int main_networklist(int argc, char **argv);
int main_networkdetach(int argc, char **argv);
+int main_blockattach(int argc, char **argv);

void help(char *command);
diff -r dcacf3300a0b -r 68d4e8b220fa tools/libxl/xl_cmdtable.c
--- a/tools/libxl/xl_cmdtable.c Thu May 13 08:49:41 2010 +0100
+++ b/tools/libxl/xl_cmdtable.c Thu May 13 08:50:54 2010 +0100
@@ -204,6 +204,11 @@ struct cmd_spec cmd_table[] = {
"Destroy a domain's virtual network device",
"<Domain> <DevId|mac>",
},
+ { "block-attach",
+ &main_blockattach,
+ "Create a new virtual block device",
+ "<Domain> <BackDev> <FrontDev> <Mode> [BackDomain]",
+ },
};

int cmdtable_len = sizeof(cmd_table)/sizeof(struct cmd_spec);

_______________________________________________
Xen-changelog mailing list
Xen-changelog@lists.xensource.com
http://lists.xensource.com/xen-changelog