summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2013-07-17 14:40:37 +0200
committerKevin Wolf <kwolf@redhat.com>2013-07-26 21:10:11 +0200
commit0dd6c5266313c861cf36476da86599d368ec41fc (patch)
treef716f86306481026737aa3591174d4df85ae6ed6
parent74fe54f2a1b5c4f4498a8fe521e1dfc936656cd4 (diff)
downloadqemu-0dd6c5266313c861cf36476da86599d368ec41fc.tar.gz
qemu-0dd6c5266313c861cf36476da86599d368ec41fc.tar.bz2
qemu-0dd6c5266313c861cf36476da86599d368ec41fc.zip
QemuOpts: Add qemu_opt_unset()
Signed-off-by: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com>
-rw-r--r--include/qemu/option.h1
-rw-r--r--util/qemu-option.c14
2 files changed, 15 insertions, 0 deletions
diff --git a/include/qemu/option.h b/include/qemu/option.h
index a83c700323..13f5e72a8e 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 e0ef426daa..5d686c805f 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)
{