Merge remote-tracking branch 'kiszka/master'

[jailhouse.git] / tools / jailhouse.c

diff --git a/tools/jailhouse.c b/tools/jailhouse.c
index 6142b1dce400ce067fd5ad96167301020be91edb..ba2af66a666338b4b96da88cee58dc597ebe5062 100644 (file)
--- a/tools/jailhouse.c
+++ b/tools/jailhouse.c
@@ -43,6 +43,7 @@ static const struct extension extensions[] = {
          "[--mem-inmates MEM_INMATES]\n"
          "                 [--mem-hv MEM_HV] FILE" },
        { "config", "collect", "FILE.TAR" },
+       { "hardware", "check", "SYSCONFIG" },
        { NULL }
 };
 
@@ -250,12 +251,12 @@ static bool match_opt(const char *argv, const char *short_opt,
 static int cell_shutdown_load(int argc, char *argv[],
                              enum shutdown_load_mode mode)
 {
-       unsigned int images, id_args, arg_num, n;
        struct jailhouse_preload_image *image;
        struct jailhouse_cell_load *cell_load;
        struct jailhouse_cell_id cell_id;
+       int err, fd, id_args, arg_num;
+       unsigned int images, n;
        size_t size;
-       int err, fd;
        char *endp;
 
        id_args = parse_cell_id(&cell_id, argc - 3, &argv[3]);
@@ -399,7 +400,8 @@ int main(int argc, char *argv[])
                close(fd);
        } else if (strcmp(argv[1], "cell") == 0) {
                err = cell_management(argc, argv);
-       } else if (strcmp(argv[1], "config") == 0) {
+       } else if (strcmp(argv[1], "config") == 0 ||
+                  strcmp(argv[1], "hardware") == 0) {
                call_extension_script(argv[1], argc, argv);
                help(argv[0], 1);
        } else if (strcmp(argv[1], "--version") == 0) {