Xen project Mailing List

Re: [Xen-devel] [PATCH] new commands "xl reboot" & "xl shutdown"

To: Keir Fraser <keir.fraser@xxxxxxxxxxxxx>

From: Gihan Munasinghe <GMunasinghe@xxxxxxxxxxxx>

Date: Mon, 31 May 2010 20:03:55 +0100

Cc: Xen Devel <xen-devel@xxxxxxxxxxxxxxxxxxx>, Vincent Hanquez <Vincent.Hanquez@xxxxxxxxxxxxx>

Delivery-date: Mon, 31 May 2010 12:04:50 -0700

List-id: Xen developer discussion <xen-devel.lists.xensource.com>

Keir Fraser wrote:

On 12/05/2010 18:09, "Gihan Munasinghe" <GMunasinghe@xxxxxxxxxxxx> wrote:

the if (/* hvm */ 0) is because the function never properly tested if
the domain is hvm or not. nowadays you have is_hvm(domid) function
that can handily replace the hardcoded value.

Yes having is_hvm is much better than the hard coded values I have
changed that bit of code see attached patch.


Please port your patch to the tip of xen-unstable and re-post with changeset
comment and signed-off-by-line.

 Thanks,
 Keir

Sorry for the very long delay see updated patch xl: adds shutdown and reboot commands libxl : remote shutdown to work for pure hvm domains Signed-off-by: Gihan Munasinghe <GMunasinghe@xxxxxxxxxxxx>

diff -Naur xen-unstable.hg/tools/libxl/libxl.c xen-unstable.hg.p/tools/libxl/libxl.c --- xen-unstable.hg/tools/libxl/libxl.c 2010-05-11 09:37:50.000000000 +0100 +++ xen-unstable.hg.p/tools/libxl/libxl.c 2010-05-31 19:31:02.000000000 +0100 @@ -538,12 +538,12 @@ shutdown_path = libxl_sprintf(ctx, "%s/control/shutdown", dom_path); xs_write(ctx->xsh, XBT_NULL, shutdown_path, req_table[req], strlen(req_table[req])); - if (/* hvm */ 0) { + if (is_hvm(ctx,domid)) { unsigned long acpi_s_state = 0; unsigned long pvdriver = 0; xc_get_hvm_param(ctx->xch, domid, HVM_PARAM_ACPI_S_STATE, &acpi_s_state); xc_get_hvm_param(ctx->xch, domid, HVM_PARAM_CALLBACK_IRQ, &pvdriver); - if (!pvdriver && acpi_s_state != 0) + if (!pvdriver || acpi_s_state != 0) xc_domain_shutdown(ctx->xch, domid, req); } return 0; diff -Naur xen-unstable.hg/tools/libxl/xl_cmdimpl.c xen-unstable.hg.p/tools/libxl/xl_cmdimpl.c --- xen-unstable.hg/tools/libxl/xl_cmdimpl.c 2010-05-11 09:37:50.000000000 +0100 +++ xen-unstable.hg.p/tools/libxl/xl_cmdimpl.c 2010-05-31 19:31:02.000000000 +0100 @@ -1129,6 +1129,7 @@ free(w1); free(w2); LOG("Done. Rebooting now"); + sleep(2);/*Fix Me: If this sleep is not there the domain creation failes sometimes*/ goto start; } LOG("Done. Exiting now"); @@ -1226,6 +1227,12 @@ } else if(!strcmp(command, "destroy")) { printf("Usage: xl destroy <Domain>\n\n"); printf("Terminate a domain immediately.\n\n"); + } else if(!strcmp(command, "shutdown")) { + printf("Usage: xl shutdown <Domain>\n\n"); + printf("issue a shutdown signal to a domain.\n\n"); + } else if(!strcmp(command, "reboot")) { + printf("Usage: xl reboot <Domain>\n\n"); + printf("issue a reboot signal to a domain.\n\n"); } else if (!strcmp(command, "console")) { printf("Usage: xl console <Domain>\n\n"); printf("Attach to domain's console.\n\n"); @@ -1591,6 +1598,23 @@ if (rc) { fprintf(stderr,"destroy failed (rc=%d)\n.",rc); exit(-1); } } +void shutdown_domain(char *p) +{ + int rc; + find_domain(p); + rc=libxl_domain_shutdown(&ctx, domid, 0); + if (rc) { fprintf(stderr,"shutdown failed (rc=%d)\n.",rc);exit(-1); } +} + +void reboot_domain(char *p) +{ + int rc; + find_domain(p); + rc=libxl_domain_shutdown(&ctx, domid, 1); + if (rc) { fprintf(stderr,"reboot failed (rc=%d)\n.",rc);exit(-1); } +} + + void list_domains(int verbose) { struct libxl_dominfo *info; @@ -2340,6 +2364,59 @@ exit(0); } +int main_shutdown(int argc, char **argv) +{ + int opt; + char *p; + + while ((opt = getopt(argc, argv, "h")) != -1) { + switch (opt) { + case 'h': + help("shutdown"); + exit(0); + default: + fprintf(stderr, "option not supported\n"); + break; + } + } + if (optind >= argc) { + help("shutdown"); + exit(2); + } + + p = argv[optind]; + + shutdown_domain(p); + exit(0); +} + +int main_reboot(int argc, char **argv) +{ + int opt; + char *p; + + while ((opt = getopt(argc, argv, "h")) != -1) { + switch (opt) { + case 'h': + help("reboot"); + exit(0); + default: + fprintf(stderr, "option not supported\n"); + break; + } + } + if (optind >= argc) { + help("reboot"); + exit(2); + } + + p = argv[optind]; + + reboot_domain(p); + exit(0); +} + + int main_list(int argc, char **argv) { int opt, verbose = 0; diff -Naur xen-unstable.hg/tools/libxl/xl_cmdimpl.h xen-unstable.hg.p/tools/libxl/xl_cmdimpl.h --- xen-unstable.hg/tools/libxl/xl_cmdimpl.h 2010-05-11 09:37:50.000000000 +0100 +++ xen-unstable.hg.p/tools/libxl/xl_cmdimpl.h 2010-05-31 19:31:02.000000000 +0100 @@ -27,6 +27,8 @@ int main_pause(int argc, char **argv); int main_unpause(int argc, char **argv); int main_destroy(int argc, char **argv); +int main_shutdown(int argc, char **argv); +int main_reboot(int argc, char **argv); int main_list(int argc, char **argv); int main_list_vm(int argc, char **argv); int main_create(int argc, char **argv); diff -Naur xen-unstable.hg/tools/libxl/xl_cmdtable.c xen-unstable.hg.p/tools/libxl/xl_cmdtable.c --- xen-unstable.hg/tools/libxl/xl_cmdtable.c 2010-05-11 09:37:50.000000000 +0100 +++ xen-unstable.hg.p/tools/libxl/xl_cmdtable.c 2010-05-31 19:31:02.000000000 +0100 @@ -18,6 +18,8 @@ { "create", &main_create, "create a domain from config file <filename>" }, { "list", &main_list, "list information about all domains" }, { "destroy", &main_destroy, "terminate a domain immediately" }, + { "shutdown", &main_shutdown, "issue a shutdown signal to a domain" }, + { "reboot", &main_reboot, "issue a reboot signal to a domain " }, { "pci-attach", &main_pciattach, "insert a new pass-through pci device" }, { "pci-detach", &main_pcidetach, "remove a domain's pass-through pci device" }, { "pci-list", &main_pcilist, "list pass-through pci devices for a domain" },

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

©2013 Xen Project, A Linux Foundation Collaborative Project. All Rights Reserved.
Linux Foundation is a registered trademark of The Linux Foundation.
Xen Project is a trademark of The Linux Foundation.