option: Drop unused get_param_value(), get_next_param_value()

PATCH In review Markus Armbruster 2 participants 2 messages Oct 6, 2017

Share & tools

Markus Armbruster

author

2017-10-06 13:17 UTC #0 lore raw

PATCH 1/1 option: Drop unused get_param_value(), get_next_param_value()

Their last user went away in commit f51074cdc6, "pci-hotplug-old: Has been dead for five major releases, bury", v2.3.0. Remove them, as new code should use QemuOpts or maybe keyval_parse() instead.

Signed-off-by Markus Armbruster <[email protected]>

---
 include/qemu/option.h |  5 -----
 util/qemu-option.c    | 34 ----------------------------------
 2 files changed, 39 deletions(-)

include/qemu/option.h +0 -5

index f7338dbe80..a88c5f02b1 100644
@@ -31,11 +31,6 @@
 
 const char *get_opt_name(char *buf, int buf_size, const char *p, char delim);
 const char *get_opt_value(char *buf, int buf_size, const char *p);
-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);
-
 
 void parse_option_size(const char *name, const char *value,
                        uint64_t *ret, Error **errp);

util/qemu-option.c +0 ~~-34~~

index 9b1dc8093b..9723a0b34d 100644
@@ -91,40 +91,6 @@ const char *get_opt_value(char *buf, int buf_size, const char *p)
     return p;
 }
 
-int get_next_param_value(char *buf, int buf_size,
-                         const char *tag, const char **pstr)
-{
-    const char *p;
-    char option[128];
-
-    p = *pstr;
-    for(;;) {
-        p = get_opt_name(option, sizeof(option), p, '=');
-        if (*p != '=')
-            break;
-        p++;
-        if (!strcmp(tag, option)) {
-            *pstr = get_opt_value(buf, buf_size, p);
-            if (**pstr == ',') {
-                (*pstr)++;
-            }
-            return strlen(buf);
-        } else {
-            p = get_opt_value(NULL, 0, p);
-        }
-        if (*p != ',')
-            break;
-        p++;
-    }
-    return 0;
-}
-
-int get_param_value(char *buf, int buf_size,
-                    const char *tag, const char *str)
-{
-    return get_next_param_value(buf, buf_size, tag, &str);
-}
-
 static void parse_option_bool(const char *name, const char *value, bool *ret,
                               Error **errp)
 {

Signature · 1 line

2.13.6

Eric Blake

Reviewed-by on v1 1/1

2017-10-06 14:01 UTC #1 lore raw

Quoted 9 lines · Markus Armbruster

Their last user went away in commit f51074cdc6, "pci-hotplug-old: Has been dead for five major releases, bury", v2.3.0. Remove them, as new code should use QemuOpts or maybe keyval_parse() instead.
Signed-off-by Markus Armbruster <[email protected]>
---
 include/qemu/option.h |  5 -----
 util/qemu-option.c    | 34 ----------------------------------
 2 files changed, 39 deletions(-)

Always fun to kill dead code ;-)

Reviewed-by Eric Blake <[email protected]>

Signature · 3 lines

Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3266
Virtualization:  qemu.org | libvirt.org