From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Jan Beulich" Subject: [PATCH v2 3/3] xl: new "loglvl" command Date: Fri, 04 Mar 2016 09:48:16 -0700 Message-ID: <56D9CA6002000078000D9935@prv-mh.provo.novell.com> References: <56D9C80702000078000D9910@prv-mh.provo.novell.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=__Part1B2C9940.2__=" Return-path: Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.84) (envelope-from ) id 1abstn-0003Bl-Dc for xen-devel@lists.xenproject.org; Fri, 04 Mar 2016 16:48:19 +0000 In-Reply-To: <56D9C80702000078000D9910@prv-mh.provo.novell.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: xen-devel Cc: Ian Jackson , Wei Liu , Stefano Stabellini List-Id: xen-devel@lists.xenproject.org This is a MIME message. If you are reading this text, you may want to consider changing to a mail reader or gateway that understands how to properly handle MIME multipart messages. --=__Part1B2C9940.2__= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline This is pretty simplistic for now, but I'd rather have someone better friends with the tools improve it (if desired). Signed-off-by: Jan Beulich --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -5958,6 +5958,26 @@ int libxl_send_debug_keys(libxl_ctx *ctx return 0; } =20 +int libxl_log_level(libxl_ctx *ctx, bool set, bool guest, + int *lower_thresh, int *upper_thresh) +{ + int ret; + GC_INIT(ctx); + if (set) { + ret =3D xc_set_log_level(ctx->xch, guest, *lower_thresh, = *upper_thresh); + } else { + ret =3D xc_get_log_level(ctx->xch, guest, lower_thresh, upper_thre= sh); + } + if ( ret < 0 ) { + LOGE(ERROR, "%s %slog level", + set ? "setting" : "getting", guest ? "guest " : ""); + GC_FREE; + return ERROR_FAIL; + } + GC_FREE; + return 0; +} + libxl_xen_console_reader * libxl_xen_console_read_start(libxl_ctx *ctx, int clear) { --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -1765,6 +1765,8 @@ int libxl_send_trigger(libxl_ctx *ctx, u libxl_trigger trigger, uint32_t vcpuid); int libxl_send_sysrq(libxl_ctx *ctx, uint32_t domid, char sysrq); int libxl_send_debug_keys(libxl_ctx *ctx, char *keys); +int libxl_log_level(libxl_ctx *ctx, bool set, bool guest, + int *lower_thresh, int *upper_thresh); =20 typedef struct libxl__xen_console_reader libxl_xen_console_reader; =20 --- a/tools/libxl/xl.h +++ b/tools/libxl/xl.h @@ -81,6 +81,7 @@ int main_trigger(int argc, char **argv); int main_sysrq(int argc, char **argv); int main_debug_keys(int argc, char **argv); int main_dmesg(int argc, char **argv); +int main_loglvl(int argc, char **argv); int main_top(int argc, char **argv); int main_networkattach(int argc, char **argv); int main_networklist(int argc, char **argv); @@ -209,6 +210,8 @@ extern void printf_info_sexp(int domid, #define XL_GLOBAL_CONFIG XEN_CONFIG_DIR "/xl.conf" #define XL_LOCK_FILE XEN_LOCK_DIR "/xl" =20 +#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) + #endif /* XL_H */ =20 /* --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -6469,6 +6469,84 @@ int main_debug_keys(int argc, char **arg return 0; } =20 +static const struct { + int level; + char string[8]; +} loglvls[] =3D { + { 0, "none" }, + { 1, "error" }, + { 2, "warning" }, + { 3, "info" }, + { 4, "all" }, + { 4, "debug" }, +}; + +static int parse_loglvl(char **parg) +{ + unsigned int i; + + for (i =3D 0; i < ARRAY_SIZE(loglvls); ++i) { + size_t l =3D strlen(loglvls[i].string); + + if (!strncmp(*parg, loglvls[i].string, l)) { + *parg +=3D l; + return loglvls[i].level; + } + } + + return -1; +} + +static const char *format_loglvl(int loglvl) +{ + unsigned int i; + + for (i =3D 0; i < ARRAY_SIZE(loglvls); ++i) { + if (loglvl =3D=3D loglvls[i].level) + return loglvls[i].string; + } + + return ""; +} + +int main_loglvl(int argc, char **argv) +{ + static const struct option opts[] =3D { + {"guest", 0, 0, 'g'}, + {"set", 0, 0, 's'}, + COMMON_LONG_OPTS + }; + int opt, lower_thresh =3D -1, upper_thresh =3D -1; + bool guest =3D false, set =3D false; + + SWITCH_FOREACH_OPT(opt, "gs:", opts, "loglvl", 0) { + case 'g': + guest =3D true; + break; + case 's': + if (*optarg !=3D '/') + lower_thresh =3D parse_loglvl(&optarg); + if (*optarg =3D=3D '/') { + ++optarg; + upper_thresh =3D parse_loglvl(&optarg); + } + set =3D true; + break; + } + + if (libxl_log_level(ctx, set, guest, &lower_thresh, &upper_thresh)) { + fprintf(stderr, "cannot %s %s log level\n", + set ? "set" : "get", guest ? "guest" : "host"); + return 1; + } + + if (!set) + printf("%s log levels: %s/%s\n", guest ? "guest" : "host", + format_loglvl(lower_thresh), format_loglvl(upper_thresh)); + + return 0; +} + int main_dmesg(int argc, char **argv) { unsigned int clear =3D 0; --- a/tools/libxl/xl_cmdtable.c +++ b/tools/libxl/xl_cmdtable.c @@ -309,6 +309,13 @@ struct cmd_spec cmd_table[] =3D { "[-c]", " -c Clear dmesg buffer as well as printing = it", }, + { "loglvl", + &main_loglvl, 0, 1, + "Manage Xen log levels", + "[-g] [-s=3D[LOWER][/UPPER]]", + "-g, --guest act on guest log = level\n" + "-s [LOWER][/UPPER], --set=3D[LOWER][/UPPER] set new log level\n" + }, { "top", &main_top, 0, 0, "Monitor a host and the domains in real time", --=__Part1B2C9940.2__= Content-Type: text/plain; name="loglvl-adjust-xl.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="loglvl-adjust-xl.patch" xl: new "loglvl" command=0A=0AThis is pretty simplistic for now, but I'd = rather have someone better=0Afriends with the tools improve it (if = desired).=0A=0ASigned-off-by: Jan Beulich =0A=0A--- = a/tools/libxl/libxl.c=0A+++ b/tools/libxl/libxl.c=0A@@ -5958,6 +5958,26 @@ = int libxl_send_debug_keys(libxl_ctx *ctx=0A return 0;=0A }=0A =0A+int = libxl_log_level(libxl_ctx *ctx, bool set, bool guest,=0A+ = int *lower_thresh, int *upper_thresh)=0A+{=0A+ int ret;=0A+ = GC_INIT(ctx);=0A+ if (set) {=0A+ ret =3D xc_set_log_level(ctx->xc= h, guest, *lower_thresh, *upper_thresh);=0A+ } else {=0A+ ret = =3D xc_get_log_level(ctx->xch, guest, lower_thresh, upper_thresh);=0A+ = }=0A+ if ( ret < 0 ) {=0A+ LOGE(ERROR, "%s %slog level",=0A+ = set ? "setting" : "getting", guest ? "guest " : "");=0A+ = GC_FREE;=0A+ return ERROR_FAIL;=0A+ }=0A+ GC_FREE;=0A+ = return 0;=0A+}=0A+=0A libxl_xen_console_reader *=0A libxl_xen_console_r= ead_start(libxl_ctx *ctx, int clear)=0A {=0A--- a/tools/libxl/libxl.h=0A+++= b/tools/libxl/libxl.h=0A@@ -1765,6 +1765,8 @@ int libxl_send_trigger(libxl= _ctx *ctx, u=0A libxl_trigger trigger, uint32_t = vcpuid);=0A int libxl_send_sysrq(libxl_ctx *ctx, uint32_t domid, char = sysrq);=0A int libxl_send_debug_keys(libxl_ctx *ctx, char *keys);=0A+int = libxl_log_level(libxl_ctx *ctx, bool set, bool guest,=0A+ = int *lower_thresh, int *upper_thresh);=0A =0A typedef struct libxl__xen_c= onsole_reader libxl_xen_console_reader;=0A =0A--- a/tools/libxl/xl.h=0A+++ = b/tools/libxl/xl.h=0A@@ -81,6 +81,7 @@ int main_trigger(int argc, char = **argv);=0A int main_sysrq(int argc, char **argv);=0A int main_debug_keys(i= nt argc, char **argv);=0A int main_dmesg(int argc, char **argv);=0A+int = main_loglvl(int argc, char **argv);=0A int main_top(int argc, char = **argv);=0A int main_networkattach(int argc, char **argv);=0A int = main_networklist(int argc, char **argv);=0A@@ -209,6 +210,8 @@ extern void = printf_info_sexp(int domid,=0A #define XL_GLOBAL_CONFIG XEN_CONFIG_DIR = "/xl.conf"=0A #define XL_LOCK_FILE XEN_LOCK_DIR "/xl"=0A =0A+#define = ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))=0A+=0A #endif /* XL_H */=0A =0A = /*=0A--- a/tools/libxl/xl_cmdimpl.c=0A+++ b/tools/libxl/xl_cmdimpl.c=0A@@ = -6469,6 +6469,84 @@ int main_debug_keys(int argc, char **arg=0A return = 0;=0A }=0A =0A+static const struct {=0A+ int level;=0A+ char = string[8];=0A+} loglvls[] =3D {=0A+ { 0, "none" },=0A+ { 1, "error" = },=0A+ { 2, "warning" },=0A+ { 3, "info" },=0A+ { 4, "all" },=0A+ = { 4, "debug" },=0A+};=0A+=0A+static int parse_loglvl(char **parg)=0A+{= =0A+ unsigned int i;=0A+=0A+ for (i =3D 0; i < ARRAY_SIZE(loglvls); = ++i) {=0A+ size_t l =3D strlen(loglvls[i].string);=0A+=0A+ = if (!strncmp(*parg, loglvls[i].string, l)) {=0A+ *parg +=3D = l;=0A+ return loglvls[i].level;=0A+ }=0A+ }=0A+=0A+ = return -1;=0A+}=0A+=0A+static const char *format_loglvl(int loglvl)=0A+{= =0A+ unsigned int i;=0A+=0A+ for (i =3D 0; i < ARRAY_SIZE(loglvls); = ++i) {=0A+ if (loglvl =3D=3D loglvls[i].level)=0A+ = return loglvls[i].string;=0A+ }=0A+=0A+ return "";=0A+}=0A+= =0A+int main_loglvl(int argc, char **argv)=0A+{=0A+ static const struct = option opts[] =3D {=0A+ {"guest", 0, 0, 'g'},=0A+ {"set", 0, = 0, 's'},=0A+ COMMON_LONG_OPTS=0A+ };=0A+ int opt, lower_thresh= =3D -1, upper_thresh =3D -1;=0A+ bool guest =3D false, set =3D = false;=0A+=0A+ SWITCH_FOREACH_OPT(opt, "gs:", opts, "loglvl", 0) {=0A+ = case 'g':=0A+ guest =3D true;=0A+ break;=0A+ case = 's':=0A+ if (*optarg !=3D '/')=0A+ lower_thresh =3D = parse_loglvl(&optarg);=0A+ if (*optarg =3D=3D '/') {=0A+ = ++optarg;=0A+ upper_thresh =3D parse_loglvl(&optarg);=0A+ = }=0A+ set =3D true;=0A+ break;=0A+ }=0A+=0A+ if = (libxl_log_level(ctx, set, guest, &lower_thresh, &upper_thresh)) {=0A+ = fprintf(stderr, "cannot %s %s log level\n",=0A+ set ? = "set" : "get", guest ? "guest" : "host");=0A+ return 1;=0A+ = }=0A+=0A+ if (!set)=0A+ printf("%s log levels: %s/%s\n", guest ? = "guest" : "host",=0A+ format_loglvl(lower_thresh), format_log= lvl(upper_thresh));=0A+=0A+ return 0;=0A+}=0A+=0A int main_dmesg(int = argc, char **argv)=0A {=0A unsigned int clear =3D 0;=0A--- a/tools/libx= l/xl_cmdtable.c=0A+++ b/tools/libxl/xl_cmdtable.c=0A@@ -309,6 +309,13 @@ = struct cmd_spec cmd_table[] =3D {=0A "[-c]",=0A " -c = Clear dmesg buffer as well as printing it",=0A },=0A+ = { "loglvl",=0A+ &main_loglvl, 0, 1,=0A+ "Manage Xen log = levels",=0A+ "[-g] [-s=3D[LOWER][/UPPER]]",=0A+ "-g, = --guest act on guest log level\n"=0A+ "-s = [LOWER][/UPPER], --set=3D[LOWER][/UPPER] set new log level\n"=0A+ = },=0A { "top",=0A &main_top, 0, 0,=0A "Monitor a host and = the domains in real time",=0A --=__Part1B2C9940.2__= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVs IG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVuLm9yZwpodHRwOi8vbGlzdHMueGVuLm9y Zy94ZW4tZGV2ZWwK --=__Part1B2C9940.2__=--