Patchwork [2/2] remove unused check_params()

login
register
mail settings
Submitter Michael Tokarev
Date June 19, 2013, 5:16 p.m.
Message ID <1371662183-29138-2-git-send-email-mjt@msgid.tls.msk.ru>
Download mbox | patch
Permalink /patch/252625/
State New
Headers show

Comments

Michael Tokarev - June 19, 2013, 5:16 p.m.
last user was in -boot options processing

Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 include/qemu/option.h |    2 --
 util/qemu-option.c    |   30 ------------------------------
 2 files changed, 32 deletions(-)
Markus Armbruster - June 19, 2013, 5:39 p.m.
Michael Tokarev <mjt@tls.msk.ru> writes:

> last user was in -boot options processing

Series conflicts with my "[PATCH v3 00/16] -boot and -no-fd-bootchk
fixes".

My series comes with fairly thorough tests.

Patch

diff --git a/include/qemu/option.h b/include/qemu/option.h
index bdb6d21..a83c700 100644
--- a/include/qemu/option.h
+++ b/include/qemu/option.h
@@ -55,8 +55,6 @@  int get_next_param_value(char *buf, int buf_size,
                          const char *tag, const char **pstr);
 int get_param_value(char *buf, int buf_size,
                     const char *tag, const char *str);
-int check_params(char *buf, int buf_size,
-                 const char * const *params, const char *str);
 
 
 /*
diff --git a/util/qemu-option.c b/util/qemu-option.c
index 8b74bf1..412c425 100644
--- a/util/qemu-option.c
+++ b/util/qemu-option.c
@@ -123,36 +123,6 @@  int get_param_value(char *buf, int buf_size,
     return get_next_param_value(buf, buf_size, tag, &str);
 }
 
-int check_params(char *buf, int buf_size,
-                 const char * const *params, const char *str)
-{
-    const char *p;
-    int i;
-
-    p = str;
-    while (*p != '\0') {
-        p = get_opt_name(buf, buf_size, p, '=');
-        if (*p != '=') {
-            return -1;
-        }
-        p++;
-        for (i = 0; params[i] != NULL; i++) {
-            if (!strcmp(params[i], buf)) {
-                break;
-            }
-        }
-        if (params[i] == NULL) {
-            return -1;
-        }
-        p = get_opt_value(NULL, 0, p);
-        if (*p != ',') {
-            break;
-        }
-        p++;
-    }
-    return 0;
-}
-
 /*
  * Searches an option list for an option with the given name
  */