[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 01/14] Add new data type for fprintf like functi
From: |
Aurelien Jarno |
Subject: |
Re: [Qemu-devel] [PATCH 01/14] Add new data type for fprintf like function pointers |
Date: |
Thu, 8 Apr 2010 21:29:02 +0200 |
User-agent: |
Mutt/1.5.20 (2009-06-14) |
On Mon, Mar 29, 2010 at 09:16:52PM +0200, Stefan Weil wrote:
> The compiler should check the arguments for these functions.
>
> gcc can do this, but only if the function pointer's prototype
> includes the __attribute__ flag.
>
> As the necessary declaration is a bit lengthy, we use a new
> data type 'fprintf_function'.
>
> It is not easy to find a single header file which is included
> everywhere, so fprint_function had to be declared in several
> header files.
I don't really think it is a good idea to duplicate that. It will only
causes problem in the future. Are you sure there is no header for that?
Worst case scenario it's probably better to create a new header.
> Signed-off-by: Stefan Weil <address@hidden>
> ---
> cpu-all.h | 13 +++++++++----
> cpu-defs.h | 6 ++++++
> qemu-common.h | 6 ++++++
> 3 files changed, 21 insertions(+), 4 deletions(-)
>
> diff --git a/cpu-all.h b/cpu-all.h
> index f281a91..d5c1380 100644
> --- a/cpu-all.h
> +++ b/cpu-all.h
> @@ -760,11 +760,17 @@ void cpu_exec_init_all(unsigned long tb_size);
> CPUState *cpu_copy(CPUState *env);
> CPUState *qemu_get_cpu(int cpu);
>
> +#if !defined(FPRINTF_FUNCTION_DEFINED)
> +#define FPRINTF_FUNCTION_DEFINED
> +typedef int (*fprintf_function)(FILE *f, const char *fmt, ...)
> + __attribute__ ((format(printf, 2, 3)));
> +#endif
> +
> void cpu_dump_state(CPUState *env, FILE *f,
> - int (*cpu_fprintf)(FILE *f, const char *fmt, ...),
> + fprintf_function cpu_fprintf,
> int flags);
> void cpu_dump_statistics (CPUState *env, FILE *f,
> - int (*cpu_fprintf)(FILE *f, const char *fmt, ...),
> + fprintf_function cpu_fprintf,
> int flags);
>
> void QEMU_NORETURN cpu_abort(CPUState *env, const char *fmt, ...)
> @@ -915,8 +921,7 @@ int cpu_physical_memory_get_dirty_tracking(void);
> int cpu_physical_sync_dirty_bitmap(target_phys_addr_t start_addr,
> target_phys_addr_t end_addr);
>
> -void dump_exec_info(FILE *f,
> - int (*cpu_fprintf)(FILE *f, const char *fmt, ...));
> +void dump_exec_info(FILE *f, fprintf_function cpu_fprintf);
> #endif /* !CONFIG_USER_ONLY */
>
> int cpu_memory_rw_debug(CPUState *env, target_ulong addr,
> diff --git a/cpu-defs.h b/cpu-defs.h
> index 2e94585..81edf87 100644
> --- a/cpu-defs.h
> +++ b/cpu-defs.h
> @@ -72,6 +72,12 @@ typedef uint64_t target_ulong;
> #define TB_JMP_ADDR_MASK (TB_JMP_PAGE_SIZE - 1)
> #define TB_JMP_PAGE_MASK (TB_JMP_CACHE_SIZE - TB_JMP_PAGE_SIZE)
>
> +#if !defined(FPRINTF_FUNCTION_DEFINED)
> +#define FPRINTF_FUNCTION_DEFINED
> +typedef int (*fprintf_function)(FILE *f, const char *fmt, ...)
> + __attribute__ ((format(printf, 2, 3)));
> +#endif
> +
> #if !defined(CONFIG_USER_ONLY)
> #define CPU_TLB_BITS 8
> #define CPU_TLB_SIZE (1 << CPU_TLB_BITS)
> diff --git a/qemu-common.h b/qemu-common.h
> index 087c034..3658bfe 100644
> --- a/qemu-common.h
> +++ b/qemu-common.h
> @@ -91,6 +91,12 @@ static inline char *realpath(const char *path, char
> *resolved_path)
>
> #else
>
> +#if !defined(FPRINTF_FUNCTION_DEFINED)
> +#define FPRINTF_FUNCTION_DEFINED
> +typedef int (*fprintf_function)(FILE *f, const char *fmt, ...)
> + __attribute__ ((format(printf, 2, 3)));
> +#endif
> +
> #include "cpu.h"
>
> #endif /* !defined(NEED_CPU_H) */
> --
> 1.7.0
>
>
>
>
--
Aurelien Jarno GPG: 1024D/F1BCDB73
address@hidden http://www.aurel32.net
- Re: [Qemu-devel] [PATCH 01/14] Add new data type for fprintf like function pointers,
Aurelien Jarno <=