kvm tools: mark usages functions as NORETURN

It will help for simplifying codes like this:

{
	if (cond == NULL)
		NORETURN_func();

	/* use cond safely, it is not NULL and don't need to check it again */
}

It also helps for readability.

Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>

diff --git a/tools/kvm/include/kvm/builtin-balloon.h b/tools/kvm/include/kvm/builtin-balloon.h
index 85055ebf715dfdddb30bc4d73a6a35b1c94915c8..77ee65605070c8eb5db7a33ada09088d21bbcf0a 100644 (file)
--- a/tools/kvm/include/kvm/builtin-balloon.h
+++ b/tools/kvm/include/kvm/builtin-balloon.h
@@ -1,7 +1,9 @@
 #ifndef KVM__BALLOON_H
 #define KVM__BALLOON_H
 
+#include <kvm/util.h>
+
 int kvm_cmd_balloon(int argc, const char **argv, const char *prefix);
-void kvm_balloon_help(void);
+void kvm_balloon_help(void) NORETURN;
 
 #endif

diff --git a/tools/kvm/include/kvm/builtin-debug.h b/tools/kvm/include/kvm/builtin-debug.h
index 0aafef97464e6c4a8a8ef3514f918147f43e59be..97df0d97bdc95fe4de5be81f02d1c4527fe747aa 100644 (file)
--- a/tools/kvm/include/kvm/builtin-debug.h
+++ b/tools/kvm/include/kvm/builtin-debug.h
@@ -1,6 +1,7 @@
 #ifndef KVM__DEBUG_H
 #define KVM__DEBUG_H
 
+#include <kvm/util.h>
 #include <linux/types.h>
 
 #define KVM_DEBUG_CMD_TYPE_DUMP        (1 << 0)
@@ -18,6 +19,6 @@ struct debug_cmd {
 };
 
 int kvm_cmd_debug(int argc, const char **argv, const char *prefix);
-void kvm_debug_help(void);
+void kvm_debug_help(void) NORETURN;
 
 #endif

diff --git a/tools/kvm/include/kvm/builtin-list.h b/tools/kvm/include/kvm/builtin-list.h
index 04fca22eeab0dbaef215226440f669bedacd1301..7b697f69ee243b4a9ddcfacf478d1841514eb7ad 100644 (file)
--- a/tools/kvm/include/kvm/builtin-list.h
+++ b/tools/kvm/include/kvm/builtin-list.h
@@ -1,7 +1,9 @@
 #ifndef KVM__LIST_H
 #define KVM__LIST_H
 
+#include <kvm/util.h>
+
 int kvm_cmd_list(int argc, const char **argv, const char *prefix);
-void kvm_list_help(void);
+void kvm_list_help(void) NORETURN;
 
 #endif

diff --git a/tools/kvm/include/kvm/builtin-pause.h b/tools/kvm/include/kvm/builtin-pause.h
index 540cc8e7bf623c34d02606af1d1bd7ef804669b8..84aaee320fbccc8eb9e55600c9db95f8d1156e7b 100644 (file)
--- a/tools/kvm/include/kvm/builtin-pause.h
+++ b/tools/kvm/include/kvm/builtin-pause.h
@@ -1,7 +1,9 @@
 #ifndef KVM__PAUSE_H
 #define KVM__PAUSE_H
 
+#include <kvm/util.h>
+
 int kvm_cmd_pause(int argc, const char **argv, const char *prefix);
-void kvm_pause_help(void);
+void kvm_pause_help(void) NORETURN;
 
 #endif

diff --git a/tools/kvm/include/kvm/builtin-resume.h b/tools/kvm/include/kvm/builtin-resume.h
index 9e6e8d7837cee09f96149a03ee75e341679a3bbe..7de999b2c30481aa5412f800fe266af7d140930b 100644 (file)
--- a/tools/kvm/include/kvm/builtin-resume.h
+++ b/tools/kvm/include/kvm/builtin-resume.h
@@ -1,7 +1,9 @@
 #ifndef KVM__RESUME_H
 #define KVM__RESUME_H
 
+#include <kvm/util.h>
+
 int kvm_cmd_resume(int argc, const char **argv, const char *prefix);
-void kvm_resume_help(void);
+void kvm_resume_help(void) NORETURN;
 
 #endif

diff --git a/tools/kvm/include/kvm/builtin-run.h b/tools/kvm/include/kvm/builtin-run.h
index c4b8ccb62cbb44e22f7fbb581937e7690f38ddf5..91521a58a59c7ef1ed8bb93688153b32ebab923e 100644 (file)
--- a/tools/kvm/include/kvm/builtin-run.h
+++ b/tools/kvm/include/kvm/builtin-run.h
@@ -1,8 +1,10 @@
 #ifndef __KVM_RUN_H__
 #define __KVM_RUN_H__
 
+#include <kvm/util.h>
+
 int kvm_cmd_run(int argc, const char **argv, const char *prefix);
-void kvm_run_help(void);
+void kvm_run_help(void) NORETURN;
 
 void kvm_run_set_wrapper_sandbox(void);
 

diff --git a/tools/kvm/include/kvm/builtin-setup.h b/tools/kvm/include/kvm/builtin-setup.h
index f70ae78190223e9658a017168360ca133847e67f..4a8d7ee3942593f856a499a6e0d0ef6deadd03b2 100644 (file)
--- a/tools/kvm/include/kvm/builtin-setup.h
+++ b/tools/kvm/include/kvm/builtin-setup.h
@@ -1,8 +1,10 @@
 #ifndef KVM__SETUP_H
 #define KVM__SETUP_H
 
+#include <kvm/util.h>
+
 int kvm_cmd_setup(int argc, const char **argv, const char *prefix);
-void kvm_setup_help(void);
+void kvm_setup_help(void) NORETURN;
 int kvm_setup_create_new(const char *guestfs_name);
 void kvm_setup_resolv(const char *guestfs_name);
 

diff --git a/tools/kvm/include/kvm/builtin-stat.h b/tools/kvm/include/kvm/builtin-stat.h
index e3ce2921fac05100e8e862663d1451e321da8b60..4fecb37901dd2a765a04b5a399e319adb856bcb4 100644 (file)
--- a/tools/kvm/include/kvm/builtin-stat.h
+++ b/tools/kvm/include/kvm/builtin-stat.h
@@ -1,7 +1,9 @@
 #ifndef KVM__STAT_H
 #define KVM__STAT_H
 
+#include <kvm/util.h>
+
 int kvm_cmd_stat(int argc, const char **argv, const char *prefix);
-void kvm_stat_help(void);
+void kvm_stat_help(void) NORETURN;
 
 #endif

diff --git a/tools/kvm/include/kvm/builtin-stop.h b/tools/kvm/include/kvm/builtin-stop.h
index 75706953586013a36912f8707b3a11dd670ebcff..b26b2750a0ca4d50600e3d33ab71760e5c8957e1 100644 (file)
--- a/tools/kvm/include/kvm/builtin-stop.h
+++ b/tools/kvm/include/kvm/builtin-stop.h
@@ -1,7 +1,9 @@
 #ifndef KVM__STOP_H
 #define KVM__STOP_H
 
+#include <kvm/util.h>
+
 int kvm_cmd_stop(int argc, const char **argv, const char *prefix);
-void kvm_stop_help(void);
+void kvm_stop_help(void) NORETURN;
 
 #endif

diff --git a/tools/kvm/include/kvm/parse-options.h b/tools/kvm/include/kvm/parse-options.h
index b65820d3a5d83e480b73cd1c937546ec4c25515f..7886ff70d3b3bbb17f4b0b491a1a9321446f9b99 100644 (file)
--- a/tools/kvm/include/kvm/parse-options.h
+++ b/tools/kvm/include/kvm/parse-options.h
@@ -2,6 +2,7 @@
 #define __PARSE_OPTIONS_H__
 
 #include <inttypes.h>
+#include <kvm/util.h>
 
 enum parse_opt_type {
        /* special types */
@@ -207,7 +208,7 @@ struct parse_opt_ctx_t {
 
 /* global functions */
 void usage_with_options(const char * const *usagestr,
-               const struct option *opts);
+               const struct option *opts) NORETURN;
 int parse_options(int argc, const char **argv, const struct option *options,
                const char * const usagestr[], int flags);
 #endif