From patchwork Mon Mar 14 11:21:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Denis V. Lunev" X-Patchwork-Id: 597012 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3qNwPn0Ktwz9sdQ for ; Mon, 14 Mar 2016 22:24:29 +1100 (AEDT) Received: from localhost ([::1]:40194 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afQbr-0005Lj-3A for incoming@patchwork.ozlabs.org; Mon, 14 Mar 2016 07:24:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39552) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afQZd-0001CI-6Z for qemu-devel@nongnu.org; Mon, 14 Mar 2016 07:22:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1afQZc-0003SJ-BB for qemu-devel@nongnu.org; Mon, 14 Mar 2016 07:22:09 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:21120 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afQZb-0003Qu-UY for qemu-devel@nongnu.org; Mon, 14 Mar 2016 07:22:08 -0400 Received: from hades.sw.ru ([10.30.8.132]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id u2EBLf98003660; Mon, 14 Mar 2016 14:21:55 +0300 (MSK) From: "Denis V. Lunev" To: Date: Mon, 14 Mar 2016 14:21:39 +0300 Message-Id: <1457954501-26528-8-git-send-email-den@openvz.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1457954501-26528-1-git-send-email-den@openvz.org> References: <1457954501-26528-1-git-send-email-den@openvz.org> X-detected-operating-system: by eggs.gnu.org: OpenBSD 3.x X-Received-From: 195.214.232.25 Cc: Pavel Butsykin , Markus Armbruster , qemu-devel@nongnu.org, Luiz Capitulino , Stefan Hajnoczi , Paolo Bonzini , "Denis V. Lunev" Subject: [Qemu-devel] [PATCH 7/9] log: report HMP command and event X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Pavel Butsykin Signed-off-by: Pavel Butsykin Signed-off-by: Denis V. Lunev CC: Stefan Hajnoczi CC: Paolo Bonzini CC: Luiz Capitulino CC: Markus Armbruster CC: Eric Blake --- include/qemu/log.h | 1 + monitor.c | 4 ++++ util/log.c | 2 ++ 3 files changed, 7 insertions(+) diff --git a/include/qemu/log.h b/include/qemu/log.h index 55bceae..9264bbf 100644 --- a/include/qemu/log.h +++ b/include/qemu/log.h @@ -43,6 +43,7 @@ static inline bool qemu_log_separate(void) #define CPU_LOG_PAGE (1 << 14) #define LOG_TRACE (1 << 15) #define LOG_QMP (1 << 16) +#define LOG_HMP (1 << 17) /* Returns true if a bit is set in the current loglevel mask */ diff --git a/monitor.c b/monitor.c index eec4e58..4bf4f31 100644 --- a/monitor.c +++ b/monitor.c @@ -2893,6 +2893,8 @@ static void handle_hmp_command(Monitor *mon, const char *cmdline) QDict *qdict; const mon_cmd_t *cmd; + qemu_log_mask(LOG_HMP, "HMP command: %s\n", cmdline); + cmd = monitor_parse_command(mon, &cmdline, mon->cmd_table); if (!cmd) { return; @@ -4053,11 +4055,13 @@ static void monitor_event(void *opaque, int event) } mon->reset_seen = 1; mon_refcount++; + qemu_log_mask(LOG_HMP, "HMP: new connection established\n"); break; case CHR_EVENT_CLOSED: mon_refcount--; monitor_fdsets_cleanup(); + qemu_log_mask(LOG_HMP, "HMP: connection closed\n"); break; } } diff --git a/util/log.c b/util/log.c index 5fc517b..795aaea 100644 --- a/util/log.c +++ b/util/log.c @@ -133,6 +133,8 @@ const QEMULogItem qemu_log_items[] = { "complete traces" }, { LOG_QMP, "qmp", "log the QMP commands and events" }, + { LOG_HMP, "hmp", + "log the HMP commands and events" }, { 0, NULL, NULL }, };