Am 20.01.2014 um 15:19 hat Chunyan Liu geschrieben:
> Add some qemu_opt functions to replace the same functionality of
> QEMUOptionParameter handling.
>
> Signed-off-by: Dong Xu Wang <wdon...@linux.vnet.ibm.com>
> Signed-off-by: Chunyan Liu <cy...@suse.com>
> ---
> include/qemu/option.h | 7 +++
> util/qemu-option.c | 131
> +++++++++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 138 insertions(+), 0 deletions(-)
>
> diff --git a/include/qemu/option.h b/include/qemu/option.h
> index 2c5b03f..8d77e2e 100644
> --- a/include/qemu/option.h
> +++ b/include/qemu/option.h
> @@ -109,6 +109,7 @@ struct QemuOptsList {
> };
>
> const char *qemu_opt_get(QemuOpts *opts, const char *name);
> +const char *qemu_opt_get_del(QemuOpts *opts, const char *name);
> /**
> * qemu_opt_has_help_opt:
> * @opts: options to search for a help request
> @@ -124,6 +125,9 @@ bool qemu_opt_has_help_opt(QemuOpts *opts);
> bool qemu_opt_get_bool(QemuOpts *opts, const char *name, bool defval);
> uint64_t qemu_opt_get_number(QemuOpts *opts, const char *name, uint64_t
> defval);
> uint64_t qemu_opt_get_size(QemuOpts *opts, const char *name, uint64_t
> defval);
> +bool qemu_opt_get_bool_del(QemuOpts *opts, const char *name, bool defval);
> +uint64_t qemu_opt_get_number_del(QemuOpts *opts, const char *name, uint64_t
> defval);
> +uint64_t qemu_opt_get_size_del(QemuOpts *opts, const char *name, uint64_t
> defval);
> int qemu_opt_unset(QemuOpts *opts, const char *name);
> int qemu_opt_set(QemuOpts *opts, const char *name, const char *value);
> void qemu_opt_set_err(QemuOpts *opts, const char *name, const char *value,
> @@ -159,4 +163,7 @@ void qemu_opts_print(QemuOpts *opts);
> int qemu_opts_foreach(QemuOptsList *list, qemu_opts_loopfunc func, void
> *opaque,
> int abort_on_failure);
>
> +QemuOptsList *qemu_opts_append(QemuOptsList *dst, QemuOptsList *list);
> +void qemu_opts_free(QemuOptsList *list);
> +void qemu_opts_print_help(QemuOptsList *list);
> #endif
> diff --git a/util/qemu-option.c b/util/qemu-option.c
> index 8944b62..6bd5154 100644
> --- a/util/qemu-option.c
> +++ b/util/qemu-option.c
> @@ -379,6 +379,72 @@ QEMUOptionParameter
> *append_option_parameters(QEMUOptionParameter *dest,
> return dest;
> }
>
> +static size_t count_opts_list(QemuOptsList *list)
> +{
> + QemuOptDesc *desc = NULL;
> + size_t num_opts = 0;
> +
> + if (!list)
> + return 0;
Braces.
> +
> + desc = list->desc;
> + while (desc && desc->name) {
> + num_opts ++;
> + desc ++;
> + }
> +
> + return num_opts;
> +}
> +
> +/* Create a new QemuOptsList with a desc of the merge of the first
> + * and second. It will allocate space for one new QemuOptsList plus
> + * enough space for QemuOptDesc in first and second QemuOptsList.
> + * First argument's QemuOptDesc members take precedence over second's.
> + * The result's name and implied_opt_name are not copied from them.
> + * Both merge_lists should not be set. Both lists can be NULL.
> + */
> +QemuOptsList *qemu_opts_append(QemuOptsList *dst,
> + QemuOptsList *list)
You changed this function compared the qemu QEMUOptionParameter one in
that it creates a new list instead of modifying dst. I'm not objecting
to this change, but perhaps call it qemu_opts_concat() then.
> +{
> + size_t num_opts, num_dst_opts;
> + QemuOptsList *tmp;
> + QemuOptDesc *desc;
> +
> + if (!dst && !list)
> + return NULL;
Braces. Also, why is it allowed to pass NULL for list?
> +
> + num_opts = count_opts_list(dst);
> + num_opts += count_opts_list(list);
> +
> + tmp = g_malloc0(sizeof(QemuOptsList) + (num_opts + 1) *
> sizeof(QemuOptDesc));
This is longer than 80 characters.
> + QTAILQ_INIT(&tmp->head);
> + num_dst_opts = 0;
> +
> + /* copy dst->desc to new list */
> + if (dst) {
> + desc = dst->desc;
> + while (desc && desc->name) {
for (desc = dst->desc; desc && desc->name; desc++)
> + tmp->desc[num_dst_opts++] = *desc;
> + tmp->desc[num_dst_opts].name = NULL;
Not strictly necessary as you're using g_malloc0.
> + desc++;
> + }
> + }
> +
> + /* add list->desc to new list */
> + if (list) {
> + desc = list->desc;
> + while (desc && desc->name) {
> + if (find_desc_by_name(tmp->desc, desc->name) == NULL) {
> + tmp->desc[num_dst_opts++] = *desc;
> + tmp->desc[num_dst_opts].name = NULL;
> + }
> + desc++;
> + }
> + }
> +
> + return tmp;
> +}
> +
> /*
> * Parses a parameter string (param) into an option list (dest).
> *
> @@ -528,6 +594,18 @@ const char *qemu_opt_get(QemuOpts *opts, const char
> *name)
> return opt ? opt->str : NULL;
> }
>
> +static void qemu_opt_del(QemuOpt *opt);
> +
> +const char *qemu_opt_get_del(QemuOpts *opts, const char *name)
> +{
> + const char *str = qemu_opt_get(opts, name);
> + QemuOpt *opt = qemu_opt_find(opts, name);
Somewhat inefficient to search the options list twice.
> + if (opt) {
> + qemu_opt_del(opt);
> + }
> + return str;
> +}
> +
> bool qemu_opt_has_help_opt(QemuOpts *opts)
> {
> QemuOpt *opt;
> @@ -563,6 +641,16 @@ bool qemu_opt_get_bool(QemuOpts *opts, const char *name,
> bool defval)
> return opt->value.boolean;
> }
>
> +bool qemu_opt_get_bool_del(QemuOpts *opts, const char *name, bool defval)
> +{
> + bool ret = qemu_opt_get_bool(opts, name, defval);
> + QemuOpt *opt = qemu_opt_find(opts, name);
> + if (opt) {
> + qemu_opt_del(opt);
> + }
> + return ret;
> +}
> +
> uint64_t qemu_opt_get_number(QemuOpts *opts, const char *name, uint64_t
> defval)
> {
> QemuOpt *opt;
> @@ -586,6 +674,18 @@ uint64_t qemu_opt_get_number(QemuOpts *opts, const char
> *name, uint64_t defval)
> return opt->value.uint;
> }
>
> +uint64_t qemu_opt_get_number_del(QemuOpts *opts,
> + const char *name,
> + uint64_t defval)
> +{
> + uint64_t ret = qemu_opt_get_number(opts, name, defval);
> + QemuOpt *opt = qemu_opt_find(opts, name);
> + if (opt) {
> + qemu_opt_del(opt);
> + }
> + return ret;
> +}
> +
> uint64_t qemu_opt_get_size(QemuOpts *opts, const char *name, uint64_t defval)
> {
> QemuOpt *opt;
> @@ -608,6 +708,17 @@ uint64_t qemu_opt_get_size(QemuOpts *opts, const char
> *name, uint64_t defval)
> return opt->value.uint;
> }
>
> +uint64_t qemu_opt_get_size_del(QemuOpts *opts, const char *name,
> + uint64_t defval)
> +{
> + uint64_t ret = qemu_opt_get_size(opts, name, defval);
> + QemuOpt *opt = qemu_opt_find(opts, name);
> + if (opt) {
> + qemu_opt_del(opt);
> + }
> + return ret;
> +}
> +
> static void qemu_opt_parse(QemuOpt *opt, Error **errp)
> {
> if (opt->desc == NULL)
> @@ -1261,3 +1372,23 @@ int qemu_opts_foreach(QemuOptsList *list,
> qemu_opts_loopfunc func, void *opaque,
> loc_pop(&loc);
> return rc;
> }
> +
> +/* free a QemuOptsList, can accept NULL as arguments */
> +void qemu_opts_free(QemuOptsList *list)
> +{
> + if (!list)
> + return;
Is allowing to pass NULL useful? Also braces.
> +
> + g_free(list);
> +}
> +
> +void qemu_opts_print_help(QemuOptsList *list)
> +{
> + int i;
> + printf("Supported options:\n");
> + for (i = 0; list && list->desc[i].name; i++) {
> + printf("%-16s %s\n", list->desc[i].name,
> + list->desc[i].help ?
> + list->desc[i].help : "");
> + }
> +}
Kevin
