From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH 6/7] kvm tools: Improve 'kvm debug' parameters Date: Fri, 12 Aug 2011 18:20:59 +0300 Message-ID: <1313162460-14397-6-git-send-email-levinsasha928@gmail.com> References: <1313162460-14397-1-git-send-email-levinsasha928@gmail.com> Cc: kvm@vger.kernel.org, mingo@elte.hu, asias.hejun@gmail.com, gorcunov@gmail.com, Sasha Levin To: penberg@kernel.org Return-path: Received: from mail-ew0-f46.google.com ([209.85.215.46]:62835 "EHLO mail-ew0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751562Ab1HLPWU (ORCPT ); Fri, 12 Aug 2011 11:22:20 -0400 Received: by ewy4 with SMTP id 4so1265883ewy.19 for ; Fri, 12 Aug 2011 08:22:19 -0700 (PDT) In-Reply-To: <1313162460-14397-1-git-send-email-levinsasha928@gmail.com> Sender: kvm-owner@vger.kernel.org List-ID: kvm debug now uses the git option parser to parse parameters. Added option to debug instance by PID and debug all instances. Improved usage message. Signed-off-by: Sasha Levin --- tools/kvm/builtin-debug.c | 40 ++++++++++++++++++++++++++++++---------- 1 files changed, 30 insertions(+), 10 deletions(-) diff --git a/tools/kvm/builtin-debug.c b/tools/kvm/builtin-debug.c index 444ec51..4a59962 100644 --- a/tools/kvm/builtin-debug.c +++ b/tools/kvm/builtin-debug.c @@ -8,15 +8,33 @@ #include #include +static bool all; +static u64 instance_pid; +static const char *instance_name; + static const char * const debug_usage[] = { - "kvm debug ", + "kvm debug [--all] [-n name] [-p pid]", NULL }; static const struct option debug_options[] = { + OPT_GROUP("General options:"), + OPT_BOOLEAN('a', "all", &all, "Debug all instances"), + OPT_STRING('n', "name", &instance_name, "name", "Instance name"), + OPT_U64('p', "pid", &instance_pid, "Instance pid"), OPT_END() }; +static void parse_debug_options(int argc, const char **argv) +{ + while (argc != 0) { + argc = parse_options(argc, argv, debug_options, debug_usage, + PARSE_OPT_STOP_AT_NON_OPTION); + if (argc != 0) + kvm_debug_help(); + } +} + void kvm_debug_help(void) { usage_with_options(debug_usage, debug_options); @@ -29,18 +47,20 @@ static int do_debug(const char *name, int pid) int kvm_cmd_debug(int argc, const char **argv, const char *prefix) { - int pid; + parse_debug_options(argc, argv); - if (argc != 1) + if (all) + return kvm__enumerate_instances(do_debug); + + if (instance_name == NULL && + instance_pid == 0) kvm_debug_help(); - if (strcmp(argv[0], "all") == 0) { - return kvm__enumerate_instances(do_debug); - } + if (instance_name) + instance_pid = kvm__get_pid_by_instance(argv[0]); - pid = kvm__get_pid_by_instance(argv[0]); - if (pid < 0) - die("Failed locating instance name"); + if (instance_pid <= 0) + die("Failed locating instance"); - return kill(pid, SIGQUIT); + return kill(instance_pid, SIGQUIT); } -- 1.7.6