Skip to contentSkip to conversation

libxenlight: add console command

PATCH In review Tomasz Wroblewski 3 participants 5 messages Nov 27, 2009 – Dec 1, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libxenlight: add console command

Hello all,

This patch adds "xl console" command similar to "xm console".

---

tools/libxl/libxl.c +0 -0
diff -r d7d77bace286 tools/libxl/libxl.c
@@ -468,6 +468,24 @@
     if (rc < 0) {
         XL_LOG_ERRNOVAL(ctx, XL_LOG_ERROR, rc, "xc_domain_destroy
failed for %d", domid);
         return -1;

+ }
+ return 0;
+}
+
+int libxl_console_attach(struct libxl_ctx *ctx, uint32_t domid, int cons_num)
+{

+    struct stat st;
+    const char *XENCONSOLE = "/usr/lib/xen/bin/xenconsole";
+    char *cmd = NULL;

+
+ if (stat(XENCONSOLE, &st) != 0) {
+ XL_LOG(ctx, XL_LOG_ERROR, "could not access %s", XENCONSOLE);
+ return ERROR_FAIL;
+ }
+
+ cmd = libxl_sprintf(ctx, "%s %d --num %d", XENCONSOLE, domid,
cons_num);
+ if (system(cmd) != 0) {

+        return ERROR_FAIL;
     }
     return 0;

}

tools/libxl/libxl.h +1 -0
diff -r d7d77bace286 tools/libxl/libxl.h
@@ -266,6 +266,8 @@
 int libxl_domain_pause(struct libxl_ctx *ctx, uint32_t domid);
 int libxl_domain_unpause(struct libxl_ctx *ctx, uint32_t domid);
 
+int libxl_console_attach(struct libxl_ctx *ctx, uint32_t domid, int

cons_num);
+
struct libxl_dominfo * libxl_domain_list(struct libxl_ctx *ctx, int
*nb_domain);
xc_dominfo_t * libxl_domain_infolist(struct libxl_ctx *ctx, int
*nb_domain);

tools/libxl/xl.c +0 -0
diff -r d7d77bace286 tools/libxl/xl.c
@@ -715,6 +715,7 @@
         printf(" pci-list                      list pass-through pci

devices for a domain\n\n");
printf(" pause pause execution of a
domain\n\n");
printf(" unpause unpause a paused domain
\n\n");
+ printf(" console attach to domain's

console\n\n");
     } else if(!strcmp(command, "create")) {
         printf("Usage: xl create <ConfigFile> [options] [vars]\n\n");
         printf("Create a domain based on <ConfigFile>.\n\n");
@@ -742,7 +743,56 @@
     } else if(!strcmp(command, "destroy")) {
         printf("Usage: xl destroy <Domain>\n\n");
         printf("Terminate a domain immediately.\n\n");
+    } else if (!strcmp(command, "console")) {
+        printf("Usage: xl console <Domain>\n\n");
+        printf("Attach to domain's console.\n\n");
     }

+}
+
+void console(char *p, int cons_num)
+{
+ struct libxl_ctx ctx;
+ uint32_t domid;
+
+ libxl_ctx_init(&ctx);
+ libxl_ctx_set_log(&ctx, log_callback, NULL);
+
+ if (libxl_param_to_domid(&ctx, p, &domid) < 0) {
+ fprintf(stderr, "%s is an invalid domain identifier\n", p);
+ exit(2);
+ }
+ libxl_console_attach(&ctx, domid, cons_num);
+}
+
+int main_console(int argc, char **argv)
+{
+ int opt = 0, cons_num = 0;
+ char *p = NULL;
+
+ while ((opt = getopt(argc, argv, "hn:")) != -1) {
+ switch (opt) {
+ case 'h':
+ help("console");
+ exit(0);
+ case 'n':
+ if (optarg) {
+ cons_num = strtol(optarg, NULL, 10);
+ }
+ break;
+ default:
+ fprintf(stderr, "option not supported\n");
+ break;
+ }
+ }
+ if (optind >= argc) {
+ help("console");
+ exit(2);
+ }
+
+ p = argv[optind];
+
+ console(p, cons_num);
+ exit(0);
}

void pcilist(char *dom)
@@ -1121,6 +1171,8 @@

         main_pause(argc - 1, argv + 1);
     } else if (!strcmp(argv[1], "unpause")) {
         main_unpause(argc - 1, argv + 1);
+    } else if (!strcmp(argv[1], "console")) {
+        main_console(argc - 1, argv + 1);
     } else if (!strcmp(argv[1], "help")) {
         if (argc > 2)
             help(argv[2]);
#2 lore raw
In reply to Tomasz Wroblewski

The patch is malformed, could you please send it again as an attachment?

Quoted 136 lines · Tomasz Wroblewski

Hello all,

This patch adds "xl console" command similar to "xm console".

---

diff -r d7d77bace286 tools/libxl/libxl.c

tools/libxl/libxl.c +18 -0
@@ -468,6 +468,24 @@
     if (rc < 0) {
         XL_LOG_ERRNOVAL(ctx, XL_LOG_ERROR, rc, "xc_domain_destroy
 failed for %d", domid);
         return -1;
+    }
+    return 0;
+}
+
+int libxl_console_attach(struct libxl_ctx *ctx, uint32_t domid, int
 cons_num)
+{
+    struct stat st;
+    const char *XENCONSOLE = "/usr/lib/xen/bin/xenconsole";
+    char *cmd = NULL;
+
+    if (stat(XENCONSOLE, &st) != 0) {
+        XL_LOG(ctx, XL_LOG_ERROR, "could not access %s", XENCONSOLE);
+        return ERROR_FAIL;
+    }
+
+    cmd = libxl_sprintf(ctx, "%s %d --num %d", XENCONSOLE, domid,
 cons_num);
+    if (system(cmd) != 0) {
+        return ERROR_FAIL;
     }
     return 0;

}
diff -r d7d77bace286 tools/libxl/libxl.h

tools/libxl/libxl.h +2 -0
@@ -266,6 +266,8 @@
 int libxl_domain_pause(struct libxl_ctx *ctx, uint32_t domid);
 int libxl_domain_unpause(struct libxl_ctx *ctx, uint32_t domid);
 
+int libxl_console_attach(struct libxl_ctx *ctx, uint32_t domid, int
 cons_num);
+
 struct libxl_dominfo * libxl_domain_list(struct libxl_ctx *ctx, int
 *nb_domain);

xc_dominfo_t * libxl_domain_infolist(struct libxl_ctx *ctx, int
*nb_domain);

diff -r d7d77bace286 tools/libxl/xl.c

tools/libxl/xl.c +1 -0
@@ -715,6 +715,7 @@
         printf(" pci-list                      list pass-through pci
 devices for a domain\n\n");
         printf(" pause                         pause execution of a
 domain\n\n");
         printf(" unpause                       unpause a paused domain
 \n\n");
+        printf(" console                       attach to domain's
console\n\n");
     } else if(!strcmp(command, "create")) {
         printf("Usage: xl create <ConfigFile> [options] [vars]\n\n");
         printf("Create a domain based on <ConfigFile>.\n\n");
tools/libxl/xl.c +51 -0
@@ -742,7 +743,56 @@
     } else if(!strcmp(command, "destroy")) {
         printf("Usage: xl destroy <Domain>\n\n");
         printf("Terminate a domain immediately.\n\n");
+    } else if (!strcmp(command, "console")) {
+        printf("Usage: xl console <Domain>\n\n");
+        printf("Attach to domain's console.\n\n");
     }
+}
+
+void console(char *p, int cons_num)
+{
+    struct libxl_ctx ctx;
+    uint32_t domid;
+
+    libxl_ctx_init(&ctx);
+    libxl_ctx_set_log(&ctx, log_callback, NULL);
+
+    if (libxl_param_to_domid(&ctx, p, &domid) < 0) {
+        fprintf(stderr, "%s is an invalid domain identifier\n", p);
+        exit(2);
+    }
+    libxl_console_attach(&ctx, domid, cons_num);
+}
+
+int main_console(int argc, char **argv)
+{
+    int opt = 0, cons_num = 0;
+    char *p = NULL;
+
+    while ((opt = getopt(argc, argv, "hn:")) != -1) {
+        switch (opt) {
+        case 'h':
+            help("console");
+            exit(0);
+        case 'n':
+            if (optarg) {
+                cons_num = strtol(optarg, NULL, 10);
+            }
+            break;
+        default:
+            fprintf(stderr, "option not supported\n");
+            break;
+        }
+    }
+    if (optind >= argc) {
+        help("console");
+        exit(2);
+    }
+
+    p = argv[optind];
+
+    console(p, cons_num);
+    exit(0);
 }
 
 void pcilist(char *dom)
@@ -1121,6 +1171,8 @@
         main_pause(argc - 1, argv + 1);
     } else if (!strcmp(argv[1], "unpause")) {
         main_unpause(argc - 1, argv + 1);
+    } else if (!strcmp(argv[1], "console")) {
+        main_console(argc - 1, argv + 1);
     } else if (!strcmp(argv[1], "help")) {
         if (argc > 2)
             help(argv[2]);
#3 lore raw
In reply to Tomasz Wroblewski
Quoted 37 lines · Tomasz Wroblewski

Hello all,

This patch adds "xl console" command similar to "xm console".

---

diff -r d7d77bace286 tools/libxl/libxl.c

tools/libxl/libxl.c +18 -0
@@ -468,6 +468,24 @@
     if (rc < 0) {
         XL_LOG_ERRNOVAL(ctx, XL_LOG_ERROR, rc, "xc_domain_destroy
 failed for %d", domid);
         return -1;
+    }
+    return 0;
+}
+
+int libxl_console_attach(struct libxl_ctx *ctx, uint32_t domid, int
 cons_num)
+{
+    struct stat st;
+    const char *XENCONSOLE = "/usr/lib/xen/bin/xenconsole";
+    char *cmd = NULL;
+
+    if (stat(XENCONSOLE, &st) != 0) {
+        XL_LOG(ctx, XL_LOG_ERROR, "could not access %s", XENCONSOLE);
+        return ERROR_FAIL;
+    }
+
+    cmd = libxl_sprintf(ctx, "%s %d --num %d", XENCONSOLE, domid,
 cons_num);
+    if (system(cmd) != 0) {
+        return ERROR_FAIL;
     }
     return 0;
Quoted 1 line

}

I don't think that should be a API call of the libxenlight library. I find hard to think that anyone except a command line tool would use such a call. please move it to xl.c completly.

Signature · 1 line
Vincent
#4 lore raw
Quoted 35 lines · Vincent Hanquez
Quoted 34 lines · Tomasz Wroblewski

Hello all,

This patch adds "xl console" command similar to "xm console".

---

diff -r d7d77bace286 tools/libxl/libxl.c

tools/libxl/libxl.c +17 -0
@@ -468,6 +468,24 @@
     if (rc < 0) {
         XL_LOG_ERRNOVAL(ctx, XL_LOG_ERROR, rc, "xc_domain_destroy
 failed for %d", domid);
         return -1;
+    }
+    return 0;
+}
+
+int libxl_console_attach(struct libxl_ctx *ctx, uint32_t domid, int
 cons_num)
+{
+    struct stat st;
+    const char *XENCONSOLE = "/usr/lib/xen/bin/xenconsole";
+    char *cmd = NULL;
+
+    if (stat(XENCONSOLE, &st) != 0) {
+        XL_LOG(ctx, XL_LOG_ERROR, "could not access %s", XENCONSOLE);
+        return ERROR_FAIL;
+    }
+
+    cmd = libxl_sprintf(ctx, "%s %d --num %d", XENCONSOLE, domid,
 cons_num);
+    if (system(cmd) != 0) {
Quoted 9 lines
Quoted 4 lines
tools/libxl/libxl.c +1 -0
+        return ERROR_FAIL;
     }
     return 0;

}

I don't think that should be a API call of the libxenlight library. I find hard to think that anyone except a command line tool would use such a call. please move it to xl.c completly.

I think there should be an API call for this, but let this issue aside for a moment: this is needed at the very least to get logging information from stubdoms.