[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 7/8] util: add iterators for QemuOpts values
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PATCH v2 7/8] util: add iterators for QemuOpts values |
Date: |
Tue, 24 Jan 2017 09:53:31 +0000 |
To iterate over all QemuOpts currently requires using a callback
function which is inconvenient for control flow. Add support for
using iterator functions more directly
QemuOptsIter iter;
QemuOpt *opt;
qemu_opts_iter_init(&iter, opts, "repeated-key");
while ((opt = qemu_opts_iter_next(&iter)) != NULL) {
....do something...
}
Signed-off-by: Daniel P. Berrange <address@hidden>
---
include/qemu/option.h | 9 +++++++++
util/qemu-option.c | 19 +++++++++++++++++++
2 files changed, 28 insertions(+)
diff --git a/include/qemu/option.h b/include/qemu/option.h
index 1f9e3f9..e786df0 100644
--- a/include/qemu/option.h
+++ b/include/qemu/option.h
@@ -100,6 +100,15 @@ typedef int (*qemu_opt_loopfunc)(void *opaque,
int qemu_opt_foreach(QemuOpts *opts, qemu_opt_loopfunc func, void *opaque,
Error **errp);
+typedef struct {
+ QemuOpts *opts;
+ QemuOpt *opt;
+ const char *name;
+} QemuOptsIter;
+
+void qemu_opt_iter_init(QemuOptsIter *iter, QemuOpts *opts, const char *name);
+const char *qemu_opt_iter_next(QemuOptsIter *iter);
+
QemuOpts *qemu_opts_find(QemuOptsList *list, const char *id);
QemuOpts *qemu_opts_create(QemuOptsList *list, const char *id,
int fail_if_exists, Error **errp);
diff --git a/util/qemu-option.c b/util/qemu-option.c
index 3467dc2..d611946 100644
--- a/util/qemu-option.c
+++ b/util/qemu-option.c
@@ -332,6 +332,25 @@ const char *qemu_opt_get(QemuOpts *opts, const char *name)
return opt ? opt->str : NULL;
}
+void qemu_opt_iter_init(QemuOptsIter *iter, QemuOpts *opts, const char *name)
+{
+ iter->opts = opts;
+ iter->opt = QTAILQ_FIRST(&opts->head);
+ iter->name = name;
+}
+
+const char *qemu_opt_iter_next(QemuOptsIter *iter)
+{
+ QemuOpt *ret = iter->opt;
+ if (iter->name) {
+ while (ret && !g_str_equal(iter->name, ret->name)) {
+ ret = QTAILQ_NEXT(ret, next);
+ }
+ }
+ iter->opt = ret ? QTAILQ_NEXT(ret, next) : NULL;
+ return ret ? ret->str : NULL;
+}
+
/* Get a known option (or its default) and remove it from the list
* all in one action. Return a malloced string of the option value.
* Result must be freed by caller with g_free().
--
2.9.3
- [Qemu-devel] [PATCH v2 0/8] Support multiple listening sockets per VNC server, Daniel P. Berrange, 2017/01/24
- [Qemu-devel] [PATCH v2 1/8] ui: fix regression handling bare 'websocket' option to -vnc, Daniel P. Berrange, 2017/01/24
- [Qemu-devel] [PATCH v2 2/8] ui: fix reporting of VNC auth in query-vnc-servers, Daniel P. Berrange, 2017/01/24
- [Qemu-devel] [PATCH v2 3/8] ui: refactor VncDisplay to allow multiple listening sockets, Daniel P. Berrange, 2017/01/24
- [Qemu-devel] [PATCH v2 6/8] ui: let VNC server listen on all resolved IP addresses, Daniel P. Berrange, 2017/01/24
- [Qemu-devel] [PATCH v2 4/8] ui: refactor code for populating SocketAddress from vnc_display_open, Daniel P. Berrange, 2017/01/24
- [Qemu-devel] [PATCH v2 5/8] ui: extract code to connect/listen from vnc_display_open, Daniel P. Berrange, 2017/01/24
- [Qemu-devel] [PATCH v2 7/8] util: add iterators for QemuOpts values,
Daniel P. Berrange <=
- [Qemu-devel] [PATCH v2 8/8] ui: add ability to specify multiple VNC listen addresses, Daniel P. Berrange, 2017/01/24