yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-07-09 00:30:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

log: move qemu_log_close/qemu_log_flush from header to log.c

Browse source 
There is no particular reason to keep these functions in the header.
Suggested by Paolo.

Backports commit 99affd1d5bd4e396ecda50e53dfbc5147fa1313d from qemu
This commit is contained in:
Denis V. Lunev 2018-02-22 11:11:31 -05:00 committed by Lioncash
parent 6602163087
commit eb29ff04ca
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
16 changed files with 22 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
qemu/aarch64.h
View file

@ -2433,9 +2433,7 @@
#define qemu_host_page_size qemu_host_page_size_aarch64 #define qemu_host_page_size qemu_host_page_size_aarch64
#define qemu_init_vcpu qemu_init_vcpu_aarch64 #define qemu_init_vcpu qemu_init_vcpu_aarch64
#define qemu_ld_helpers qemu_ld_helpers_aarch64 #define qemu_ld_helpers qemu_ld_helpers_aarch64
#define qemu_log_close qemu_log_close_aarch64
#define qemu_log_enabled qemu_log_enabled_aarch64 #define qemu_log_enabled qemu_log_enabled_aarch64
#define qemu_log_flush qemu_log_flush_aarch64
#define qemu_loglevel_mask qemu_loglevel_mask_aarch64 #define qemu_loglevel_mask qemu_loglevel_mask_aarch64
#define qemu_log_vprintf qemu_log_vprintf_aarch64 #define qemu_log_vprintf qemu_log_vprintf_aarch64
#define qemu_oom_check qemu_oom_check_aarch64 #define qemu_oom_check qemu_oom_check_aarch64

2
qemu/aarch64eb.h
View file

@ -2433,9 +2433,7 @@
#define qemu_host_page_size qemu_host_page_size_aarch64eb #define qemu_host_page_size qemu_host_page_size_aarch64eb
#define qemu_init_vcpu qemu_init_vcpu_aarch64eb #define qemu_init_vcpu qemu_init_vcpu_aarch64eb
#define qemu_ld_helpers qemu_ld_helpers_aarch64eb #define qemu_ld_helpers qemu_ld_helpers_aarch64eb
#define qemu_log_close qemu_log_close_aarch64eb
#define qemu_log_enabled qemu_log_enabled_aarch64eb #define qemu_log_enabled qemu_log_enabled_aarch64eb
#define qemu_log_flush qemu_log_flush_aarch64eb
#define qemu_loglevel_mask qemu_loglevel_mask_aarch64eb #define qemu_loglevel_mask qemu_loglevel_mask_aarch64eb
#define qemu_log_vprintf qemu_log_vprintf_aarch64eb #define qemu_log_vprintf qemu_log_vprintf_aarch64eb
#define qemu_oom_check qemu_oom_check_aarch64eb #define qemu_oom_check qemu_oom_check_aarch64eb

2
qemu/arm.h
View file

@ -2433,9 +2433,7 @@
#define qemu_host_page_size qemu_host_page_size_arm #define qemu_host_page_size qemu_host_page_size_arm
#define qemu_init_vcpu qemu_init_vcpu_arm #define qemu_init_vcpu qemu_init_vcpu_arm
#define qemu_ld_helpers qemu_ld_helpers_arm #define qemu_ld_helpers qemu_ld_helpers_arm
#define qemu_log_close qemu_log_close_arm
#define qemu_log_enabled qemu_log_enabled_arm #define qemu_log_enabled qemu_log_enabled_arm
#define qemu_log_flush qemu_log_flush_arm
#define qemu_loglevel_mask qemu_loglevel_mask_arm #define qemu_loglevel_mask qemu_loglevel_mask_arm
#define qemu_log_vprintf qemu_log_vprintf_arm #define qemu_log_vprintf qemu_log_vprintf_arm
#define qemu_oom_check qemu_oom_check_arm #define qemu_oom_check qemu_oom_check_arm

2
qemu/armeb.h
View file

@ -2433,9 +2433,7 @@
#define qemu_host_page_size qemu_host_page_size_armeb #define qemu_host_page_size qemu_host_page_size_armeb
#define qemu_init_vcpu qemu_init_vcpu_armeb #define qemu_init_vcpu qemu_init_vcpu_armeb
#define qemu_ld_helpers qemu_ld_helpers_armeb #define qemu_ld_helpers qemu_ld_helpers_armeb
#define qemu_log_close qemu_log_close_armeb
#define qemu_log_enabled qemu_log_enabled_armeb #define qemu_log_enabled qemu_log_enabled_armeb
#define qemu_log_flush qemu_log_flush_armeb
#define qemu_loglevel_mask qemu_loglevel_mask_armeb #define qemu_loglevel_mask qemu_loglevel_mask_armeb
#define qemu_log_vprintf qemu_log_vprintf_armeb #define qemu_log_vprintf qemu_log_vprintf_armeb
#define qemu_oom_check qemu_oom_check_armeb #define qemu_oom_check qemu_oom_check_armeb

2
qemu/header_gen.py
View file

@ -2439,9 +2439,7 @@ symbols = (
'qemu_host_page_size', 'qemu_host_page_size',
'qemu_init_vcpu', 'qemu_init_vcpu',
'qemu_ld_helpers', 'qemu_ld_helpers',
'qemu_log_close',
'qemu_log_enabled', 'qemu_log_enabled',
'qemu_log_flush',
'qemu_loglevel_mask', 'qemu_loglevel_mask',
'qemu_log_vprintf', 'qemu_log_vprintf',
'qemu_oom_check', 'qemu_oom_check',

22
qemu/include/qemu/log.h
View file

@ -121,24 +121,12 @@ static inline void log_cpu_state_mask(int mask, CPUState *cpu, int flags)
} }
} }
/* fflush() the log file */
static inline void qemu_log_flush(void)
{
fflush(qemu_logfile);
}
/* Close the log file */
static inline void qemu_log_close(void)
{
if (qemu_logfile) {
if (qemu_logfile != stderr) {
fclose(qemu_logfile);
}
qemu_logfile = NULL;
}
}
void qemu_set_dfilter_ranges(const char *ranges); void qemu_set_dfilter_ranges(const char *ranges);
bool qemu_log_in_addr_range(uint64_t addr); bool qemu_log_in_addr_range(uint64_t addr);
/* fflush() the log file */
void qemu_log_flush(void);
/* Close the log file */
void qemu_log_close(void);
#endif #endif

2
qemu/m68k.h
View file

@ -2433,9 +2433,7 @@
#define qemu_host_page_size qemu_host_page_size_m68k #define qemu_host_page_size qemu_host_page_size_m68k
#define qemu_init_vcpu qemu_init_vcpu_m68k #define qemu_init_vcpu qemu_init_vcpu_m68k
#define qemu_ld_helpers qemu_ld_helpers_m68k #define qemu_ld_helpers qemu_ld_helpers_m68k
#define qemu_log_close qemu_log_close_m68k
#define qemu_log_enabled qemu_log_enabled_m68k #define qemu_log_enabled qemu_log_enabled_m68k
#define qemu_log_flush qemu_log_flush_m68k
#define qemu_loglevel_mask qemu_loglevel_mask_m68k #define qemu_loglevel_mask qemu_loglevel_mask_m68k
#define qemu_log_vprintf qemu_log_vprintf_m68k #define qemu_log_vprintf qemu_log_vprintf_m68k
#define qemu_oom_check qemu_oom_check_m68k #define qemu_oom_check qemu_oom_check_m68k

2
qemu/mips.h
View file

@ -2433,9 +2433,7 @@
#define qemu_host_page_size qemu_host_page_size_mips #define qemu_host_page_size qemu_host_page_size_mips
#define qemu_init_vcpu qemu_init_vcpu_mips #define qemu_init_vcpu qemu_init_vcpu_mips
#define qemu_ld_helpers qemu_ld_helpers_mips #define qemu_ld_helpers qemu_ld_helpers_mips
#define qemu_log_close qemu_log_close_mips
#define qemu_log_enabled qemu_log_enabled_mips #define qemu_log_enabled qemu_log_enabled_mips
#define qemu_log_flush qemu_log_flush_mips
#define qemu_loglevel_mask qemu_loglevel_mask_mips #define qemu_loglevel_mask qemu_loglevel_mask_mips
#define qemu_log_vprintf qemu_log_vprintf_mips #define qemu_log_vprintf qemu_log_vprintf_mips
#define qemu_oom_check qemu_oom_check_mips #define qemu_oom_check qemu_oom_check_mips

2
qemu/mips64.h
View file

@ -2433,9 +2433,7 @@
#define qemu_host_page_size qemu_host_page_size_mips64 #define qemu_host_page_size qemu_host_page_size_mips64
#define qemu_init_vcpu qemu_init_vcpu_mips64 #define qemu_init_vcpu qemu_init_vcpu_mips64
#define qemu_ld_helpers qemu_ld_helpers_mips64 #define qemu_ld_helpers qemu_ld_helpers_mips64
#define qemu_log_close qemu_log_close_mips64
#define qemu_log_enabled qemu_log_enabled_mips64 #define qemu_log_enabled qemu_log_enabled_mips64
#define qemu_log_flush qemu_log_flush_mips64
#define qemu_loglevel_mask qemu_loglevel_mask_mips64 #define qemu_loglevel_mask qemu_loglevel_mask_mips64
#define qemu_log_vprintf qemu_log_vprintf_mips64 #define qemu_log_vprintf qemu_log_vprintf_mips64
#define qemu_oom_check qemu_oom_check_mips64 #define qemu_oom_check qemu_oom_check_mips64

2
qemu/mips64el.h
View file

@ -2433,9 +2433,7 @@
#define qemu_host_page_size qemu_host_page_size_mips64el #define qemu_host_page_size qemu_host_page_size_mips64el
#define qemu_init_vcpu qemu_init_vcpu_mips64el #define qemu_init_vcpu qemu_init_vcpu_mips64el
#define qemu_ld_helpers qemu_ld_helpers_mips64el #define qemu_ld_helpers qemu_ld_helpers_mips64el
#define qemu_log_close qemu_log_close_mips64el
#define qemu_log_enabled qemu_log_enabled_mips64el #define qemu_log_enabled qemu_log_enabled_mips64el
#define qemu_log_flush qemu_log_flush_mips64el
#define qemu_loglevel_mask qemu_loglevel_mask_mips64el #define qemu_loglevel_mask qemu_loglevel_mask_mips64el
#define qemu_log_vprintf qemu_log_vprintf_mips64el #define qemu_log_vprintf qemu_log_vprintf_mips64el
#define qemu_oom_check qemu_oom_check_mips64el #define qemu_oom_check qemu_oom_check_mips64el

2
qemu/mipsel.h
View file

@ -2433,9 +2433,7 @@
#define qemu_host_page_size qemu_host_page_size_mipsel #define qemu_host_page_size qemu_host_page_size_mipsel
#define qemu_init_vcpu qemu_init_vcpu_mipsel #define qemu_init_vcpu qemu_init_vcpu_mipsel
#define qemu_ld_helpers qemu_ld_helpers_mipsel #define qemu_ld_helpers qemu_ld_helpers_mipsel
#define qemu_log_close qemu_log_close_mipsel
#define qemu_log_enabled qemu_log_enabled_mipsel #define qemu_log_enabled qemu_log_enabled_mipsel
#define qemu_log_flush qemu_log_flush_mipsel
#define qemu_loglevel_mask qemu_loglevel_mask_mipsel #define qemu_loglevel_mask qemu_loglevel_mask_mipsel
#define qemu_log_vprintf qemu_log_vprintf_mipsel #define qemu_log_vprintf qemu_log_vprintf_mipsel
#define qemu_oom_check qemu_oom_check_mipsel #define qemu_oom_check qemu_oom_check_mipsel

2
qemu/powerpc.h
View file

@ -2433,9 +2433,7 @@
#define qemu_host_page_size qemu_host_page_size_powerpc #define qemu_host_page_size qemu_host_page_size_powerpc
#define qemu_init_vcpu qemu_init_vcpu_powerpc #define qemu_init_vcpu qemu_init_vcpu_powerpc
#define qemu_ld_helpers qemu_ld_helpers_powerpc #define qemu_ld_helpers qemu_ld_helpers_powerpc
#define qemu_log_close qemu_log_close_powerpc
#define qemu_log_enabled qemu_log_enabled_powerpc #define qemu_log_enabled qemu_log_enabled_powerpc
#define qemu_log_flush qemu_log_flush_powerpc
#define qemu_loglevel_mask qemu_loglevel_mask_powerpc #define qemu_loglevel_mask qemu_loglevel_mask_powerpc
#define qemu_log_vprintf qemu_log_vprintf_powerpc #define qemu_log_vprintf qemu_log_vprintf_powerpc
#define qemu_oom_check qemu_oom_check_powerpc #define qemu_oom_check qemu_oom_check_powerpc

17
qemu/qemu-log.c
View file

@ -35,6 +35,23 @@ void qemu_log(const char *fmt, ...)
va_end(ap); va_end(ap);
} }
/* fflush() the log file */
void qemu_log_flush(void)
{
fflush(qemu_logfile);
}
/* Close the log file */
void qemu_log_close(void)
{
if (qemu_logfile) {
if (qemu_logfile != stderr) {
fclose(qemu_logfile);
}
qemu_logfile = NULL;
}
}
/* Returns true if addr is in our debug filter or no filter defined /* Returns true if addr is in our debug filter or no filter defined
*/ */
bool qemu_log_in_addr_range(uint64_t addr) bool qemu_log_in_addr_range(uint64_t addr)

2
qemu/sparc.h
View file

@ -2433,9 +2433,7 @@
#define qemu_host_page_size qemu_host_page_size_sparc #define qemu_host_page_size qemu_host_page_size_sparc
#define qemu_init_vcpu qemu_init_vcpu_sparc #define qemu_init_vcpu qemu_init_vcpu_sparc
#define qemu_ld_helpers qemu_ld_helpers_sparc #define qemu_ld_helpers qemu_ld_helpers_sparc
#define qemu_log_close qemu_log_close_sparc
#define qemu_log_enabled qemu_log_enabled_sparc #define qemu_log_enabled qemu_log_enabled_sparc
#define qemu_log_flush qemu_log_flush_sparc
#define qemu_loglevel_mask qemu_loglevel_mask_sparc #define qemu_loglevel_mask qemu_loglevel_mask_sparc
#define qemu_log_vprintf qemu_log_vprintf_sparc #define qemu_log_vprintf qemu_log_vprintf_sparc
#define qemu_oom_check qemu_oom_check_sparc #define qemu_oom_check qemu_oom_check_sparc

2
qemu/sparc64.h
View file

@ -2433,9 +2433,7 @@
#define qemu_host_page_size qemu_host_page_size_sparc64 #define qemu_host_page_size qemu_host_page_size_sparc64
#define qemu_init_vcpu qemu_init_vcpu_sparc64 #define qemu_init_vcpu qemu_init_vcpu_sparc64
#define qemu_ld_helpers qemu_ld_helpers_sparc64 #define qemu_ld_helpers qemu_ld_helpers_sparc64
#define qemu_log_close qemu_log_close_sparc64
#define qemu_log_enabled qemu_log_enabled_sparc64 #define qemu_log_enabled qemu_log_enabled_sparc64
#define qemu_log_flush qemu_log_flush_sparc64
#define qemu_loglevel_mask qemu_loglevel_mask_sparc64 #define qemu_loglevel_mask qemu_loglevel_mask_sparc64
#define qemu_log_vprintf qemu_log_vprintf_sparc64 #define qemu_log_vprintf qemu_log_vprintf_sparc64
#define qemu_oom_check qemu_oom_check_sparc64 #define qemu_oom_check qemu_oom_check_sparc64

2
qemu/x86_64.h
View file

@ -2433,9 +2433,7 @@
#define qemu_host_page_size qemu_host_page_size_x86_64 #define qemu_host_page_size qemu_host_page_size_x86_64
#define qemu_init_vcpu qemu_init_vcpu_x86_64 #define qemu_init_vcpu qemu_init_vcpu_x86_64
#define qemu_ld_helpers qemu_ld_helpers_x86_64 #define qemu_ld_helpers qemu_ld_helpers_x86_64
#define qemu_log_close qemu_log_close_x86_64
#define qemu_log_enabled qemu_log_enabled_x86_64 #define qemu_log_enabled qemu_log_enabled_x86_64
#define qemu_log_flush qemu_log_flush_x86_64
#define qemu_loglevel_mask qemu_loglevel_mask_x86_64 #define qemu_loglevel_mask qemu_loglevel_mask_x86_64
#define qemu_log_vprintf qemu_log_vprintf_x86_64 #define qemu_log_vprintf qemu_log_vprintf_x86_64
#define qemu_oom_check qemu_oom_check_x86_64 #define qemu_oom_check qemu_oom_check_x86_64