[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 12/23] vl: fix 'name' option to work with -readconf
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 12/23] vl: fix 'name' option to work with -readconfig |
Date: |
Mon, 26 May 2014 11:20:00 +0400 |
From: "Dr. David Alan Gilbert" <address@hidden>
The 'name' option silently failed when used in config files
( http://lists.gnu.org/archive/html/qemu-devel/2014-04/msg00378.html )
-readconfig stores the configuration read in QemuOpts. Command line
option parsing should do the same, and no more. In particular it should
not act upon the option. That needs to be done separately, where both
command line and -readconfig settings are visible in QemuOpts.
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Reported-by: William Dauchy <address@hidden>
Tested-by: William Dauchy <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
(mjt: added commit message by ambru@ and subject prefix)
---
vl.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/vl.c b/vl.c
index 709d8cd..99b6fc0 100644
--- a/vl.c
+++ b/vl.c
@@ -965,7 +965,7 @@ static int parse_sandbox(QemuOpts *opts, void *opaque)
return 0;
}
-static void parse_name(QemuOpts *opts)
+static int parse_name(QemuOpts *opts, void *opaque)
{
const char *proc_name;
@@ -978,6 +978,8 @@ static void parse_name(QemuOpts *opts)
if (proc_name) {
os_set_proc_name(proc_name);
}
+
+ return 0;
}
bool usb_enabled(bool default_usb)
@@ -3796,7 +3798,6 @@ int main(int argc, char **argv, char **envp)
if (!opts) {
exit(1);
}
- parse_name(opts);
break;
case QEMU_OPTION_prom_env:
if (nb_prom_envs >= MAX_PROM_ENVS) {
@@ -3971,6 +3972,10 @@ int main(int argc, char **argv, char **envp)
exit(1);
}
+ if (qemu_opts_foreach(qemu_find_opts("name"), parse_name, NULL, 1)) {
+ exit(1);
+ }
+
#ifndef _WIN32
if (qemu_opts_foreach(qemu_find_opts("add-fd"), parse_add_fd, NULL, 1)) {
exit(1);
--
1.7.10.4
- [Qemu-trivial] [PULL 13/23] libcacard/vscclient: Bury some dead code, (continued)
- [Qemu-trivial] [PULL 13/23] libcacard/vscclient: Bury some dead code, Michael Tokarev, 2014/05/26
- [Qemu-trivial] [PULL 21/23] bsd-user: replace fprintf(stderr, ...) with error_report(), Michael Tokarev, 2014/05/26
- [Qemu-trivial] [PULL 20/23] audio: replace fprintf(stderr, ...) with error_report() in audio, Michael Tokarev, 2014/05/26
- [Qemu-trivial] [PULL 19/23] libcacard: fix wrong array expansion logic, Michael Tokarev, 2014/05/26
- [Qemu-trivial] [PULL 14/23] libcacard: Plug memory leaks around vreader_get_reader_list(), Michael Tokarev, 2014/05/26
- [Qemu-trivial] [PULL 09/23] arch_init: replace fprintf(stderr, ...) with error_report(), Michael Tokarev, 2014/05/26
- [Qemu-trivial] [PULL 15/23] libcacard/vreader: Drop broken recovery from failed assertion, Michael Tokarev, 2014/05/26
- [Qemu-trivial] [PULL 16/23] libcacard/vreader: Tighten assertion to clarify intent, Michael Tokarev, 2014/05/26
- [Qemu-trivial] [PULL 23/23] libcacard: remove useless initializers, Michael Tokarev, 2014/05/26
- [Qemu-trivial] [PULL 12/23] vl: fix 'name' option to work with -readconfig,
Michael Tokarev <=
- [Qemu-trivial] [PULL 06/23] bswap.h: Rename ldl_p, stl_p, etc to ldl_he_p, stl_he_p, etc, Michael Tokarev, 2014/05/26
- [Qemu-trivial] [PULL 17/23] libcacard: Convert two leftover realloc() to GLib, Michael Tokarev, 2014/05/26
- [Qemu-trivial] [PULL 22/23] net: cadence_gem: Fix top comment, Michael Tokarev, 2014/05/26
- [Qemu-trivial] [PULL 03/23] nbd: Close socket on negotiation failure., Michael Tokarev, 2014/05/26
- [Qemu-trivial] [PULL 18/23] libcacard/vcard_emul_nss: Drop a redundant conditional, Michael Tokarev, 2014/05/26
- [Qemu-trivial] [PULL 11/23] configure: Put tempfiles in a subdir of the build directory, Michael Tokarev, 2014/05/26
- Re: [Qemu-trivial] [Qemu-devel] [PULL 00/23] Trivial patches for 2014-05-26, Peter Maydell, 2014/05/27