From patchwork Mon Feb 11 16:41:22 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 219636 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 486B32C02CC for ; Tue, 12 Feb 2013 03:41:52 +1100 (EST) Received: from localhost ([::1]:49736 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U4wRy-0005HS-Ho for incoming@patchwork.ozlabs.org; Mon, 11 Feb 2013 11:41:50 -0500 Received: from eggs.gnu.org ([208.118.235.92]:53276) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U4wRp-0005H9-0i for qemu-devel@nongnu.org; Mon, 11 Feb 2013 11:41:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U4wRk-0006TR-EO for qemu-devel@nongnu.org; Mon, 11 Feb 2013 11:41:40 -0500 Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa ([2001:8b0:1d0::1]:60324 helo=mnementh.archaic.org.uk) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U4wRk-0006Qv-5J for qemu-devel@nongnu.org; Mon, 11 Feb 2013 11:41:36 -0500 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1U4wRa-0001o6-0O; Mon, 11 Feb 2013 16:41:26 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 11 Feb 2013 16:41:22 +0000 Message-Id: <1360600885-6917-4-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1360600885-6917-1-git-send-email-peter.maydell@linaro.org> References: <1360600885-6917-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:8b0:1d0::1 Cc: Blue Swirl , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Stefan Hajnoczi , patches@linaro.org Subject: [Qemu-devel] [PATCH 3/6] qemu-log: Rename cpu_str_to_log_mask to qemu_str_to_log_mask 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 Rename cpu_str_to_log_mask() to qemu_str_to_log_mask(), since the qemu_log functionality is no longer restricted to TCG CPU debug logging. Signed-off-by: Peter Maydell Reviewed-by: Andreas Färber --- bsd-user/main.c | 2 +- cpus.c | 2 +- include/qemu/log.h | 2 +- linux-user/main.c | 2 +- monitor.c | 2 +- qemu-log.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bsd-user/main.c b/bsd-user/main.c index 26604b4..4b12e65 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -865,7 +865,7 @@ int main(int argc, char **argv) if (log_mask) { int mask; - mask = cpu_str_to_log_mask(log_mask); + mask = qemu_str_to_log_mask(log_mask); if (!mask) { qemu_print_log_usage(stdout); exit(1); diff --git a/cpus.c b/cpus.c index 0fdc48c..63cfb73 100644 --- a/cpus.c +++ b/cpus.c @@ -1179,7 +1179,7 @@ void set_cpu_log(const char *optarg) { int mask; - mask = cpu_str_to_log_mask(optarg); + mask = qemu_str_to_log_mask(optarg); if (!mask) { qemu_print_log_usage(stdout); exit(1); diff --git a/include/qemu/log.h b/include/qemu/log.h index 59511a3..10792ce 100644 --- a/include/qemu/log.h +++ b/include/qemu/log.h @@ -155,7 +155,7 @@ static inline void cpu_set_log(int log_flags) } void qemu_set_log_filename(const char *filename); -int cpu_str_to_log_mask(const char *str); +int qemu_str_to_log_mask(const char *str); /* Print a usage message listing all the valid logging categories * to the specified FILE*. diff --git a/linux-user/main.c b/linux-user/main.c index 81eb126..5257552 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -3099,7 +3099,7 @@ static void handle_arg_log(const char *arg) { int mask; - mask = cpu_str_to_log_mask(arg); + mask = qemu_str_to_log_mask(arg); if (!mask) { qemu_print_log_usage(stdout); exit(1); diff --git a/monitor.c b/monitor.c index 578a318..2a55d56 100644 --- a/monitor.c +++ b/monitor.c @@ -975,7 +975,7 @@ static void do_log(Monitor *mon, const QDict *qdict) if (!strcmp(items, "none")) { mask = 0; } else { - mask = cpu_str_to_log_mask(items); + mask = qemu_str_to_log_mask(items); if (!mask) { help_cmd(mon, "log"); return; diff --git a/qemu-log.c b/qemu-log.c index 786d335..10a8581 100644 --- a/qemu-log.c +++ b/qemu-log.c @@ -136,7 +136,7 @@ static int cmp1(const char *s1, int n, const char *s2) } /* takes a comma separated list of log masks. Return 0 if error. */ -int cpu_str_to_log_mask(const char *str) +int qemu_str_to_log_mask(const char *str) { const CPULogItem *item; int mask;