[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 11/18] QemuOpts: Add qemu_opt_unset()
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 11/18] QemuOpts: Add qemu_opt_unset() |
Date: |
Fri, 26 Jul 2013 22:20:25 +0200 |
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
include/qemu/option.h | 1 +
util/qemu-option.c | 14 ++++++++++++++
2 files changed, 15 insertions(+)
diff --git a/include/qemu/option.h b/include/qemu/option.h
index a83c700..13f5e72 100644
--- a/include/qemu/option.h
+++ b/include/qemu/option.h
@@ -120,6 +120,7 @@ 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);
+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,
Error **errp);
diff --git a/util/qemu-option.c b/util/qemu-option.c
index e0ef426..5d686c8 100644
--- a/util/qemu-option.c
+++ b/util/qemu-option.c
@@ -593,6 +593,20 @@ static const QemuOptDesc *find_desc_by_name(const
QemuOptDesc *desc,
return NULL;
}
+int qemu_opt_unset(QemuOpts *opts, const char *name)
+{
+ QemuOpt *opt = qemu_opt_find(opts, name);
+
+ assert(opts_accepts_any(opts));
+
+ if (opt == NULL) {
+ return -1;
+ } else {
+ qemu_opt_del(opt);
+ return 0;
+ }
+}
+
static void opt_set(QemuOpts *opts, const char *name, const char *value,
bool prepend, Error **errp)
{
--
1.8.1.4
- [Qemu-devel] [PULL 01/18] qapi-types.py: Implement 'base' for unions, (continued)
- [Qemu-devel] [PULL 01/18] qapi-types.py: Implement 'base' for unions, Kevin Wolf, 2013/07/26
- [Qemu-devel] [PULL 02/18] qapi-visit.py: Split off generate_visit_struct_fields(), Kevin Wolf, 2013/07/26
- [Qemu-devel] [PULL 03/18] qapi-visit.py: Implement 'base' for unions, Kevin Wolf, 2013/07/26
- [Qemu-devel] [PULL 04/18] docs: Document QAPI union types, Kevin Wolf, 2013/07/26
- [Qemu-devel] [PULL 05/18] qapi: Add visitor for implicit structs, Kevin Wolf, 2013/07/26
- [Qemu-devel] [PULL 06/18] qapi: Flat unions with arbitrary discriminator, Kevin Wolf, 2013/07/26
- [Qemu-devel] [PULL 07/18] qapi: Add consume argument to qmp_input_get_object(), Kevin Wolf, 2013/07/26
- [Qemu-devel] [PULL 08/18] qapi.py: Maintain a list of union types, Kevin Wolf, 2013/07/26
- [Qemu-devel] [PULL 09/18] qapi: Anonymous unions, Kevin Wolf, 2013/07/26
- [Qemu-devel] [PULL 10/18] block: Allow "driver" option on the top level, Kevin Wolf, 2013/07/26
- [Qemu-devel] [PULL 11/18] QemuOpts: Add qemu_opt_unset(),
Kevin Wolf <=
- [Qemu-devel] [PULL 12/18] blockdev: Rename I/O throttling options for QMP, Kevin Wolf, 2013/07/26
- [Qemu-devel] [PULL 13/18] qcow2: Use dashes instead of underscores in options, Kevin Wolf, 2013/07/26
- [Qemu-devel] [PULL 14/18] blockdev: Rename 'readonly' option to 'read-only', Kevin Wolf, 2013/07/26
- [Qemu-devel] [PULL 15/18] blockdev: Split up 'cache' option, Kevin Wolf, 2013/07/26
- [Qemu-devel] [PULL 16/18] Implement qdict_flatten(), Kevin Wolf, 2013/07/26
- [Qemu-devel] [PULL 17/18] Implement sync modes for drive-backup., Kevin Wolf, 2013/07/26
- [Qemu-devel] [PULL 18/18] Add tests for sync modes 'TOP' and 'NONE', Kevin Wolf, 2013/07/26