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: 14740 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id C085023E33 for ; Mon, 11 Feb 2013 16:41:37 +0000 (UTC) Received: from mail-ve0-f174.google.com (mail-ve0-f174.google.com [209.85.128.174]) by fiordland.canonical.com (Postfix) with ESMTP id 5ABC4A18157 for ; Mon, 11 Feb 2013 16:41:37 +0000 (UTC) Received: by mail-ve0-f174.google.com with SMTP id pb11so5162110veb.19 for ; Mon, 11 Feb 2013 08:41:36 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=vePbjcM90E/0NGBxBy/gWAQ+UhgT1hCjiJK9fZBWMso=; b=pRhzF+/LFL8eVLQ3H9OmJdh2knY8ZQWJKbGHr1PPGaTKIvV8PCVDrXmvXYnyV4uJOs A96bTAK02G10LcnlkLiSIcMRuSOn+GPvsD4A2fHlRJTaAP5a8TpFZKPb3koda1eVJox3 x880FClUvuCBxeVRS6igGHVq8ygjNCGY0bT1h7htn7EgsvCYtnXpvuZts45o8LOrTNcD /7dMXti3AGLUWk0fQlAqy+sD/VauJ9hj0jX9nA+p8Ad7emKFcTdRnc5cbVEhCmxqKYla iYaCTPZ4bTgmY9Y/3bcgYEqOSUA5TAPS0+kI15U5ObKqwuMmB8EgLlz+73jrZc2PfqC6 W81A== X-Received: by 10.220.151.141 with SMTP id c13mr19959726vcw.64.1360600896883; Mon, 11 Feb 2013 08:41:36 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.58.252.8 with SMTP id zo8csp106487vec; Mon, 11 Feb 2013 08:41:36 -0800 (PST) X-Received: by 10.152.144.202 with SMTP id so10mr13777290lab.9.1360600891228; Mon, 11 Feb 2013 08:41:31 -0800 (PST) Received: from mnementh.archaic.org.uk (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]) by mx.google.com with ESMTPS id ot5si19156852lab.168.2013.02.11.08.41.30 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 11 Feb 2013 08:41:31 -0800 (PST) Received-SPF: neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) client-ip=2001:8b0:1d0::1; Authentication-Results: mx.google.com; spf=neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) smtp.mail=pm215@archaic.org.uk 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 Cc: patches@linaro.org, Blue Swirl , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Stefan Hajnoczi Subject: [PATCH 3/6] qemu-log: Rename cpu_str_to_log_mask to qemu_str_to_log_mask 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-Gm-Message-State: ALoCoQnaaSN4q27NlmeId5PFNHu2Zf0a0P17pehzZJqUgV9lMQ69QD+mdhPM65CnqFm9KDALQZu6 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;