mirror of https://github.com/proxmox/mirror_qemu
qemu-log: Plug trivial memory leak in cpu_set_log_filename()
Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>master
parent
636e0f27c6
commit
40a50b0a73
13
qemu-log.c
13
qemu-log.c
|
@ -21,10 +21,12 @@
|
||||||
#include "qemu/log.h"
|
#include "qemu/log.h"
|
||||||
|
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
static const char *logfilename = "qemu.log";
|
#define DEFAULT_LOGFILENAME "qemu.log"
|
||||||
#else
|
#else
|
||||||
static const char *logfilename = "/tmp/qemu.log";
|
#define DEFAULT_LOGFILENAME "/tmp/qemu.log"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
static char *logfilename;
|
||||||
FILE *qemu_logfile;
|
FILE *qemu_logfile;
|
||||||
int qemu_loglevel;
|
int qemu_loglevel;
|
||||||
static int log_append = 0;
|
static int log_append = 0;
|
||||||
|
@ -54,11 +56,13 @@ void qemu_log_mask(int mask, const char *fmt, ...)
|
||||||
/* enable or disable low levels log */
|
/* enable or disable low levels log */
|
||||||
void qemu_set_log(int log_flags, bool use_own_buffers)
|
void qemu_set_log(int log_flags, bool use_own_buffers)
|
||||||
{
|
{
|
||||||
|
const char *fname = logfilename ?: DEFAULT_LOGFILENAME;
|
||||||
|
|
||||||
qemu_loglevel = log_flags;
|
qemu_loglevel = log_flags;
|
||||||
if (qemu_loglevel && !qemu_logfile) {
|
if (qemu_loglevel && !qemu_logfile) {
|
||||||
qemu_logfile = fopen(logfilename, log_append ? "a" : "w");
|
qemu_logfile = fopen(fname, log_append ? "a" : "w");
|
||||||
if (!qemu_logfile) {
|
if (!qemu_logfile) {
|
||||||
perror(logfilename);
|
perror(fname);
|
||||||
_exit(1);
|
_exit(1);
|
||||||
}
|
}
|
||||||
/* must avoid mmap() usage of glibc by setting a buffer "by hand" */
|
/* must avoid mmap() usage of glibc by setting a buffer "by hand" */
|
||||||
|
@ -84,6 +88,7 @@ void qemu_set_log(int log_flags, bool use_own_buffers)
|
||||||
|
|
||||||
void cpu_set_log_filename(const char *filename)
|
void cpu_set_log_filename(const char *filename)
|
||||||
{
|
{
|
||||||
|
g_free(logfilename);
|
||||||
logfilename = g_strdup(filename);
|
logfilename = g_strdup(filename);
|
||||||
if (qemu_logfile) {
|
if (qemu_logfile) {
|
||||||
fclose(qemu_logfile);
|
fclose(qemu_logfile);
|
||||||
|
|
Loading…
Reference in New Issue