On Thu, Apr 03, 2014 at 05:54:23PM +0800, Chunyan Liu wrote:
> In later patch, qemu_opt_get_del functions will be added, they will
> first get the option value, then call qemu_opt_del to remove the option
> from opt list. To prepare for that purpose, move qemu_opt_del ahead first.
>
> Reviewed-by: Eric Blake <ebl...@redhat.com>
> Signed-off-by: Chunyan Liu <cy...@suse.com>
Reviewed-by: Leandro Dorileo <l...@dorileo.org>
> ---
> util/qemu-option.c | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/util/qemu-option.c b/util/qemu-option.c
> index eab5102..25abd65 100644
> --- a/util/qemu-option.c
> +++ b/util/qemu-option.c
> @@ -567,6 +567,14 @@ static QemuOpt *qemu_opt_find(QemuOpts *opts, const char
> *name)
> return NULL;
> }
>
> +static void qemu_opt_del(QemuOpt *opt)
> +{
> + QTAILQ_REMOVE(&opt->opts->head, opt, next);
> + g_free(opt->name);
> + g_free(opt->str);
> + g_free(opt);
> +}
> +
> const char *qemu_opt_get(QemuOpts *opts, const char *name)
> {
> QemuOpt *opt = qemu_opt_find(opts, name);
> @@ -661,14 +669,6 @@ static void qemu_opt_parse(QemuOpt *opt, Error **errp)
> }
> }
>
> -static void qemu_opt_del(QemuOpt *opt)
> -{
> - QTAILQ_REMOVE(&opt->opts->head, opt, next);
> - g_free(opt->name);
> - g_free(opt->str);
> - g_free(opt);
> -}
> -
> static bool opts_accepts_any(const QemuOpts *opts)
> {
> return opts->list->desc[0].name == NULL;
> --
> 1.7.12.4
>
--
Leandro Dorileo
