diff options
| author | David 'Digit' Turner <digit@android.com> | 2010-05-10 23:26:01 -0700 |
|---|---|---|
| committer | David 'Digit' Turner <digit@android.com> | 2010-05-11 17:56:30 -0700 |
| commit | 9251866320b5f8329a043bb56b3a794f78d12849 (patch) | |
| tree | ca005574fbc5833f93d55ce72881780aa7e78aaf /qemu-option.c | |
| parent | 1da50d3beb2a75f619fa56278cb195703361e261 (diff) | |
| download | external_qemu-9251866320b5f8329a043bb56b3a794f78d12849.zip external_qemu-9251866320b5f8329a043bb56b3a794f78d12849.tar.gz external_qemu-9251866320b5f8329a043bb56b3a794f78d12849.tar.bz2 | |
Upstream: integrate various misc. minor changes
Change-Id: I7d3eca1350f980d93f9f3198fa5250fb776de729
Diffstat (limited to 'qemu-option.c')
| -rw-r--r-- | qemu-option.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/qemu-option.c b/qemu-option.c index 738e5b6..6a5d2ef 100644 --- a/qemu-option.c +++ b/qemu-option.c @@ -470,7 +470,7 @@ struct QemuOpt { const char *name; const char *str; - QemuOptDesc *desc; + const QemuOptDesc *desc; union { int boolean; uint64_t uint; @@ -565,7 +565,7 @@ static void qemu_opt_del(QemuOpt *opt) int qemu_opt_set(QemuOpts *opts, const char *name, const char *value) { QemuOpt *opt; - QemuOptDesc *desc = opts->list->desc; + const QemuOptDesc *desc = opts->list->desc; int i; for (i = 0; desc[i].name != NULL; i++) { @@ -777,7 +777,7 @@ QemuOpts *qemu_opts_parse(QemuOptsList *list, const char *params, const char *fi /* Validate parsed opts against descriptions where no * descriptions were provided in the QemuOptsList. */ -int qemu_opts_validate(QemuOpts *opts, QemuOptDesc *desc) +int qemu_opts_validate(QemuOpts *opts, const QemuOptDesc *desc) { QemuOpt *opt; @@ -814,7 +814,7 @@ int qemu_opts_foreach(QemuOptsList *list, qemu_opts_loopfunc func, void *opaque, int rc = 0; QTAILQ_FOREACH(opts, &list->head, next) { - rc = func(opts, opaque); + rc |= func(opts, opaque); if (abort_on_failure && rc != 0) break; } |