qemu-log: Unify {cpu_set,set_cpu}_log_filename as qemu_set_log_filename

The qemu_log() functionality is no longer specific to TCG CPU debug logs.
Rename cpu_set_log_filename() to qemu_set_log_filename() and drop the
pointless wrapper set_cpu_log_filename().

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>

diff --git a/bsd-user/main.c b/bsd-user/main.c
index ae24723710acea5c2568e0b358f52a5757e5a947..76ab35909c26e2f527ae8a0fbeb9038ec21a72d2 100644 (file)
--- a/bsd-user/main.c
+++ b/bsd-user/main.c
@@ -861,7 +861,7 @@ int main(int argc, char **argv)
     }
 
     /* init debug */
-    cpu_set_log_filename(log_file);
+    qemu_set_log_filename(log_file);
     if (log_mask) {
         int mask;
         const CPULogItem *item;

diff --git a/cpus.c b/cpus.c
index 41779eb02e7c5b90ad94a5066be2f931721bdb2f..2155441b35c8c30e84f95e00679ecfd80435131a 100644 (file)
--- a/cpus.c
+++ b/cpus.c
@@ -1191,11 +1191,6 @@ void set_cpu_log(const char *optarg)
     cpu_set_log(mask);
 }
 
-void set_cpu_log_filename(const char *optarg)
-{
-    cpu_set_log_filename(optarg);
-}
-
 void list_cpus(FILE *f, fprintf_function cpu_fprintf, const char *optarg)
 {
     /* XXX: implement xxx_cpu_list for targets that still miss it */

diff --git a/include/qemu/log.h b/include/qemu/log.h
index 58f69cb494d4b2c1ce83976b0d5ec4b83f989c97..4760e04c5e0b342ab68fc9f6d70c664a4c5c041e 100644 (file)
--- a/include/qemu/log.h
+++ b/include/qemu/log.h
@@ -154,7 +154,7 @@ static inline void cpu_set_log(int log_flags)
 #endif
 }
 
-void cpu_set_log_filename(const char *filename);
+void qemu_set_log_filename(const char *filename);
 int cpu_str_to_log_mask(const char *str);
 
 #endif

diff --git a/include/sysemu/cpus.h b/include/sysemu/cpus.h
index f7f68542596fa7c6e5a9efff4ccce866f9a0409a..60e44bb70ca5a62657203f04b66236b3214d9e99 100644 (file)
--- a/include/sysemu/cpus.h
+++ b/include/sysemu/cpus.h
@@ -25,7 +25,6 @@ extern int smp_threads;
 
 void set_numa_modes(void);
 void set_cpu_log(const char *optarg);
-void set_cpu_log_filename(const char *optarg);
 void list_cpus(FILE *f, fprintf_function cpu_fprintf, const char *optarg);
 
 #endif

diff --git a/linux-user/main.c b/linux-user/main.c
index 7902f3beb2af34bf60dfb3e8c7449e9b17b58d57..4beb5c9ae53fa2f2e2bcd4c5a43afa1ba0fc633b 100644 (file)
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -3113,7 +3113,7 @@ static void handle_arg_log(const char *arg)
 
 static void handle_arg_log_filename(const char *arg)
 {
-    cpu_set_log_filename(arg);
+    qemu_set_log_filename(arg);
 }
 
 static void handle_arg_set_env(const char *arg)
@@ -3480,7 +3480,7 @@ int main(int argc, char **argv, char **envp)
 #endif
 
     /* init debug */
-    cpu_set_log_filename(log_file);
+    qemu_set_log_filename(log_file);
     optind = parse_args(argc, argv);
 
     /* Zero out regs */

diff --git a/monitor.c b/monitor.c
index 20bd19b05fdc03300bb215ace1ae97ae2d5df585..578a31803fdb8e942773f2b709d5609d19fbe658 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -964,7 +964,7 @@ static int client_migrate_info(Monitor *mon, const QDict *qdict,
 
 static void do_logfile(Monitor *mon, const QDict *qdict)
 {
-    cpu_set_log_filename(qdict_get_str(qdict, "filename"));
+    qemu_set_log_filename(qdict_get_str(qdict, "filename"));
 }
 
 static void do_log(Monitor *mon, const QDict *qdict)

diff --git a/qemu-log.c b/qemu-log.c
index 30c9ab01bd49d7dd41ce5d55e0e2e0dc1a665c16..9a7e5675a14b843b9f0fe4844cced09c3aa65cb0 100644 (file)
--- a/qemu-log.c
+++ b/qemu-log.c
@@ -86,7 +86,7 @@ void qemu_set_log(int log_flags, bool use_own_buffers)
     }
 }
 
-void cpu_set_log_filename(const char *filename)
+void qemu_set_log_filename(const char *filename)
 {
     g_free(logfilename);
     logfilename = g_strdup(filename);

diff --git a/vl.c b/vl.c
index 1355f6959eaf0b8190db50d20e00b2bdc2386b18..f9f4dda2d787ed7863567e31d81e2910f5af8c33 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -3865,7 +3865,7 @@ int main(int argc, char **argv, char **envp)
      */
     if (log_mask) {
         if (log_file) {
-            set_cpu_log_filename(log_file);
+            qemu_set_log_filename(log_file);
         }
         set_cpu_log(log_mask);
     }