[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 12/39] QemuOpts: move qemu_opt_del ahead for later ca
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 12/39] QemuOpts: move qemu_opt_del ahead for later calling |
Date: |
Mon, 16 Jun 2014 19:23:36 +0800 |
From: Chunyan Liu <address@hidden>
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 <address@hidden>
Reviewed-by: Leandro Dorileo <address@hidden>
Signed-off-by: Chunyan Liu <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
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 d4fd7b5..7124483 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.9.3
- [Qemu-devel] [PULL 02/39] block: Drop superfluous conditionals around g_free(), (continued)
- [Qemu-devel] [PULL 02/39] block: Drop superfluous conditionals around g_free(), Stefan Hajnoczi, 2014/06/16
- [Qemu-devel] [PULL 03/39] blockdev: Move 'serial' option to drive_init(), Stefan Hajnoczi, 2014/06/16
- [Qemu-devel] [PULL 04/39] blockdev: Rename drive_init(), drive_uninit() to drive_new(), drive_del(), Stefan Hajnoczi, 2014/06/16
- [Qemu-devel] [PULL 05/39] blockdev: Remove unused DriveInfo reference count, Stefan Hajnoczi, 2014/06/16
- [Qemu-devel] [PULL 07/39] QemuOpts: move find_desc_by_name ahead for later calling, Stefan Hajnoczi, 2014/06/16
- [Qemu-devel] [PULL 06/39] block/nfs: fix potential segfault on early callback, Stefan Hajnoczi, 2014/06/16
- [Qemu-devel] [PULL 08/39] QemuOpts: repurpose qemu_opts_print to replace print_option_parameters, Stefan Hajnoczi, 2014/06/16
- [Qemu-devel] [PULL 09/39] QemuOpts: add def_value_str to QemuOptDesc, Stefan Hajnoczi, 2014/06/16
- [Qemu-devel] [PULL 10/39] qapi: output def_value_str when query command line options, Stefan Hajnoczi, 2014/06/16
- [Qemu-devel] [PULL 11/39] QemuOpts: change opt->name|str from (const char *) to (char *), Stefan Hajnoczi, 2014/06/16
- [Qemu-devel] [PULL 12/39] QemuOpts: move qemu_opt_del ahead for later calling,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 13/39] QemuOpts: add qemu_opt_get_*_del functions for replace work, Stefan Hajnoczi, 2014/06/16
- [Qemu-devel] [PULL 14/39] QemuOpts: add qemu_opts_print_help to replace print_option_help, Stefan Hajnoczi, 2014/06/16
- [Qemu-devel] [PULL 15/39] QemuOpts: add conversion between QEMUOptionParameter to QemuOpts, Stefan Hajnoczi, 2014/06/16
- [Qemu-devel] [PULL 16/39] QemuOpts: add qemu_opts_append to replace append_option_parameters, Stefan Hajnoczi, 2014/06/16
- [Qemu-devel] [PULL 17/39] QemuOpts: check NULL input for qemu_opts_del, Stefan Hajnoczi, 2014/06/16
- [Qemu-devel] [PULL 18/39] change block layer to support both QemuOpts and QEMUOptionParamter, Stefan Hajnoczi, 2014/06/16
- [Qemu-devel] [PULL 19/39] vvfat.c: handle cross_driver's create_options and create_opts, Stefan Hajnoczi, 2014/06/16
- [Qemu-devel] [PULL 20/39] cow.c: replace QEMUOptionParameter with QemuOpts, Stefan Hajnoczi, 2014/06/16
- [Qemu-devel] [PULL 21/39] gluster.c: replace QEMUOptionParameter with QemuOpts, Stefan Hajnoczi, 2014/06/16