diff options
author | Chunyan Liu <cyliu@suse.com> | 2014-06-05 17:21:11 +0800 |
---|---|---|
committer | Stefan Hajnoczi <stefanha@redhat.com> | 2014-06-16 17:23:21 +0800 |
commit | c282e1fdf7ec9659c7f320123be397477a359d01 (patch) | |
tree | 4e76122536c52b1093da8647839039627d1f596c /include/qemu | |
parent | fec9921f0a331716c898d1f823682de2ecfa3d2a (diff) | |
download | hqemu-c282e1fdf7ec9659c7f320123be397477a359d01.zip hqemu-c282e1fdf7ec9659c7f320123be397477a359d01.tar.gz |
cleanup QEMUOptionParameter
Now that all backend drivers are using QemuOpts, remove all
QEMUOptionParameter related codes.
Signed-off-by: Dong Xu Wang <wdongxu@linux.vnet.ibm.com>
Signed-off-by: Chunyan Liu <cyliu@suse.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'include/qemu')
-rw-r--r-- | include/qemu/option.h | 48 |
1 files changed, 1 insertions, 47 deletions
diff --git a/include/qemu/option.h b/include/qemu/option.h index 3455267..921eccd 100644 --- a/include/qemu/option.h +++ b/include/qemu/option.h @@ -31,25 +31,6 @@ #include "qapi/error.h" #include "qapi/qmp/qdict.h" -enum QEMUOptionParType { - OPT_FLAG, - OPT_NUMBER, - OPT_SIZE, - OPT_STRING, -}; - -typedef struct QEMUOptionParameter { - const char *name; - enum QEMUOptionParType type; - union { - uint64_t n; - char* s; - } value; - const char *help; - bool assigned; -} QEMUOptionParameter; - - 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, @@ -58,32 +39,11 @@ int get_param_value(char *buf, int buf_size, const char *tag, const char *str); -/* - * The following functions take a parameter list as input. This is a pointer to - * the first element of a QEMUOptionParameter array which is terminated by an - * entry with entry->name == NULL. - */ - -QEMUOptionParameter *get_option_parameter(QEMUOptionParameter *list, - const char *name); -int set_option_parameter(QEMUOptionParameter *list, const char *name, - const char *value); -int set_option_parameter_int(QEMUOptionParameter *list, const char *name, - uint64_t value); -QEMUOptionParameter *append_option_parameters(QEMUOptionParameter *dest, - QEMUOptionParameter *list); -QEMUOptionParameter *parse_option_parameters(const char *param, - QEMUOptionParameter *list, QEMUOptionParameter *dest); void parse_option_size(const char *name, const char *value, uint64_t *ret, Error **errp); -void free_option_parameters(QEMUOptionParameter *list); -void print_option_parameters(QEMUOptionParameter *list); -void print_option_help(QEMUOptionParameter *list); bool has_help_option(const char *param); bool is_valid_option_list(const char *param); -/* ------------------------------------------------------------------ */ - typedef struct QemuOpt QemuOpt; typedef struct QemuOpts QemuOpts; typedef struct QemuOptsList QemuOptsList; @@ -175,12 +135,6 @@ int qemu_opts_foreach(QemuOptsList *list, qemu_opts_loopfunc func, void *opaque, int abort_on_failure); void qemu_opts_print_help(QemuOptsList *list); void qemu_opts_free(QemuOptsList *list); -QEMUOptionParameter *opts_to_params(QemuOpts *opts); -QemuOptsList *params_to_opts(QEMUOptionParameter *list); -/* FIXME: will remove QEMUOptionParameter after all drivers switch to QemuOpts. - */ -QemuOptsList *qemu_opts_append(QemuOptsList *dst, - QemuOptsList *list, - QEMUOptionParameter *param); +QemuOptsList *qemu_opts_append(QemuOptsList *dst, QemuOptsList *list); #endif |