mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-04 08:13:54 -06:00
Pull request
-----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEEhpWov9P5fNqsNXdanKSrs4Grc8gFAl4zTL4ACgkQnKSrs4Gr c8j38wf9EMliB2OwzQGqmKLa+yE5lTzZLe4ou7yOR5jAwt6VfpT10PxtE2WSF0no KSiT8fhlY+AKx0Y0v57Qis0B9iLolPLOW7iTu07dBn5eQ7+mQiKeZi5OA+FtSq6i cnOug0/PRRKNtCz+U0AwEOMjDmBUkWsGuQRUe4mO+Trkb/GKdBoF7NsSqNoHJpJZ sv2se9WImJMV1OLmtwQ94l5hzsEhz5wWZ3n4DPa7J1qYBWjzaPydjNkIyO8kgshb i2FcNsL9As3jhIzuCUX8zRKzTaTJVLF8e07iInWNswKBUbt7LxbqtOZWMoTavgpu gsbBG3Rk6l08IM0cL5/r1PDYgroIuQ== =/0ID -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging Pull request # gpg: Signature made Thu 30 Jan 2020 21:38:06 GMT # gpg: using RSA key 8695A8BFD3F97CDAAC35775A9CA4ABB381AB73C8 # gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" [full] # gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>" [full] # Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8 * remotes/stefanha/tags/tracing-pull-request: qemu_set_log_filename: filename argument may be NULL hw/display/qxl.c: Use trace_event_get_state_backends() memory.c: Use trace_event_get_state_backends() docs/devel/tracing.txt: Recommend only trace_event_get_state_backends() Makefile: Keep trace-events-subdirs ordered Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
28db64fce5
7 changed files with 30 additions and 33 deletions
28
util/log.c
28
util/log.c
|
@ -148,25 +148,29 @@ void qemu_log_needs_buffers(void)
|
|||
* Allow the user to include %d in their logfile which will be
|
||||
* substituted with the current PID. This is useful for debugging many
|
||||
* nested linux-user tasks but will result in lots of logs.
|
||||
*
|
||||
* filename may be NULL. In that case, log output is sent to stderr
|
||||
*/
|
||||
void qemu_set_log_filename(const char *filename, Error **errp)
|
||||
{
|
||||
char *pidstr;
|
||||
g_free(logfilename);
|
||||
logfilename = NULL;
|
||||
|
||||
pidstr = strstr(filename, "%");
|
||||
if (pidstr) {
|
||||
/* We only accept one %d, no other format strings */
|
||||
if (pidstr[1] != 'd' || strchr(pidstr + 2, '%')) {
|
||||
error_setg(errp, "Bad logfile format: %s", filename);
|
||||
return;
|
||||
} else {
|
||||
logfilename = g_strdup_printf(filename, getpid());
|
||||
}
|
||||
} else {
|
||||
logfilename = g_strdup(filename);
|
||||
if (filename) {
|
||||
char *pidstr = strstr(filename, "%");
|
||||
if (pidstr) {
|
||||
/* We only accept one %d, no other format strings */
|
||||
if (pidstr[1] != 'd' || strchr(pidstr + 2, '%')) {
|
||||
error_setg(errp, "Bad logfile format: %s", filename);
|
||||
return;
|
||||
} else {
|
||||
logfilename = g_strdup_printf(filename, getpid());
|
||||
}
|
||||
} else {
|
||||
logfilename = g_strdup(filename);
|
||||
}
|
||||
}
|
||||
|
||||
qemu_log_close();
|
||||
qemu_set_log(qemu_loglevel);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue