Re: [Qemu-devel] [PATCH] Add QEMU_NORETURN to some functions

[Stefan Weil <weil@mail.berlios.de>]

[-- Attachment #1: Type: text/plain, Size: 322 bytes --]

Anthony Liguori schrieb:
> Stefan Weil wrote:
>> Would a patch which only adds noreturn to header files be accepted? 
>
> Yup.
>
> Regards,
>
> Anthony Liguori



Here is an extract of my previous patch.

This new patch adds the noreturn attribute only to global functions
declared in header files.

Regards

Stefan Weil


[-- Attachment #2: noreturn.patch --]
[-- Type: text/x-diff, Size: 3069 bytes --]

Add missing QEMU_NORETURN attribute to several global functions.

Signed-off-by: Stefan Weil <weil@mail.berlios.de>

Index: trunk/bsd-user/qemu.h
===================================================================
--- trunk.orig/bsd-user/qemu.h	2009-03-01 11:04:00.000000000 +0100
+++ trunk/bsd-user/qemu.h	2009-03-02 15:48:59.000000000 +0100
@@ -136,7 +136,7 @@
                             abi_long arg5, abi_long arg6);
 void gemu_log(const char *fmt, ...) __attribute__((format(printf,1,2)));
 extern THREAD CPUState *thread_env;
-void cpu_loop(CPUState *env, enum BSDType bsd_type);
+void QEMU_NORETURN cpu_loop(CPUState *env, enum BSDType bsd_type);
 void init_paths(const char *prefix);
 const char *path(const char *pathname);
 char *target_strerror(int err);
Index: trunk/darwin-user/qemu.h
===================================================================
--- trunk.orig/darwin-user/qemu.h	2009-03-01 11:04:01.000000000 +0100
+++ trunk/darwin-user/qemu.h	2009-03-02 15:48:59.000000000 +0100
@@ -105,7 +105,7 @@
 void write_dt(void *ptr, unsigned long addr, unsigned long limit, int flags);
 
 extern CPUState *global_env;
-void cpu_loop(CPUState *env);
+void QEMU_NORETURN cpu_loop(CPUState *env);
 void init_paths(const char *prefix);
 const char *path(const char *pathname);
 
Index: trunk/exec-all.h
===================================================================
--- trunk.orig/exec-all.h	2009-03-01 11:04:00.000000000 +0100
+++ trunk/exec-all.h	2009-03-02 15:48:59.000000000 +0100
@@ -74,8 +74,8 @@
 int cpu_restore_state_copy(struct TranslationBlock *tb,
                            CPUState *env, unsigned long searched_pc,
                            void *puc);
-void cpu_resume_from_signal(CPUState *env1, void *puc);
-void cpu_io_recompile(CPUState *env, void *retaddr);
+void QEMU_NORETURN cpu_resume_from_signal(CPUState *env1, void *puc);
+void QEMU_NORETURN cpu_io_recompile(CPUState *env, void *retaddr);
 TranslationBlock *tb_gen_code(CPUState *env, 
                               target_ulong pc, target_ulong cs_base, int flags,
                               int cflags);
Index: trunk/linux-user/qemu.h
===================================================================
--- trunk.orig/linux-user/qemu.h	2009-03-01 11:04:01.000000000 +0100
+++ trunk/linux-user/qemu.h	2009-03-02 15:48:59.000000000 +0100
@@ -174,7 +174,7 @@
                     abi_long arg5, abi_long arg6);
 void gemu_log(const char *fmt, ...) __attribute__((format(printf,1,2)));
 extern THREAD CPUState *thread_env;
-void cpu_loop(CPUState *env);
+void QEMU_NORETURN cpu_loop(CPUState *env);
 void init_paths(const char *prefix);
 const char *path(const char *pathname);
 char *target_strerror(int err);
Index: trunk/target-arm/exec.h
===================================================================
--- trunk.orig/target-arm/exec.h	2009-03-01 11:04:00.000000000 +0100
+++ trunk/target-arm/exec.h	2009-03-02 15:48:59.000000000 +0100
@@ -55,4 +55,4 @@
 #include "softmmu_exec.h"
 #endif
 
-void raise_exception(int);
+void QEMU_NORETURN raise_exception(int);