[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/10] option: Drop unused get_param_value(), get_nex
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 10/10] option: Drop unused get_param_value(), get_next_param_value() |
Date: |
Mon, 18 Dec 2017 18:30:23 +0100 |
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 <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
include/qemu/option.h | 5 -----
util/qemu-option.c | 34 ----------------------------------
2 files changed, 39 deletions(-)
diff --git a/include/qemu/option.h b/include/qemu/option.h
index f7338dbe80..a88c5f02b1 100644
--- a/include/qemu/option.h
+++ b/include/qemu/option.h
@@ -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);
diff --git a/util/qemu-option.c b/util/qemu-option.c
index 877c5b4d67..553d3dc552 100644
--- a/util/qemu-option.c
+++ b/util/qemu-option.c
@@ -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)
{
--
2.13.6
- [Qemu-devel] [PULL 00/10] Command line patches for 2017-12-18, Markus Armbruster, 2017/12/18
- [Qemu-devel] [PULL 08/10] qemu-options: Belatedly document --watchdog-action inject-nmi, Markus Armbruster, 2017/12/18
- [Qemu-devel] [PULL 02/10] qemu-options: Fix markup of -netdev l2tpv3, Markus Armbruster, 2017/12/18
- [Qemu-devel] [PULL 01/10] qemu-options: Remove stray colons from output of --help, Markus Armbruster, 2017/12/18
- [Qemu-devel] [PULL 10/10] option: Drop unused get_param_value(), get_next_param_value(),
Markus Armbruster <=
- [Qemu-devel] [PULL 06/10] qemu-options: Polish section "TPM device options", Markus Armbruster, 2017/12/18
- [Qemu-devel] [PULL 09/10] option: Remove shadowing opt decl from qemu_opt_print(), Markus Armbruster, 2017/12/18
- [Qemu-devel] [PULL 05/10] qemu-options: Add missing -iscsi Texinfo documentation, Markus Armbruster, 2017/12/18
- [Qemu-devel] [PULL 04/10] qemu-options: Move -iscsi under "Block device options", Markus Armbruster, 2017/12/18
- [Qemu-devel] [PULL 03/10] qemu-options qemu-doc: Move "Device URL Syntax" to qemu-doc, Markus Armbruster, 2017/12/18
- [Qemu-devel] [PULL 07/10] qemu-options: Polish section "Character device options", Markus Armbruster, 2017/12/18
- Re: [Qemu-devel] [PULL 00/10] Command line patches for 2017-12-18, Peter Maydell, 2017/12/19