diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2021-05-24 06:57:50 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2021-06-04 13:50:01 +0200 |
| commit | 37701411397c7b7d709ae92abd347cc593940ee5 (patch) | |
| tree | ad45f77b74441f22488143ba90236e207ed70c38 /softmmu | |
| parent | 4db4385a7ab6512e9af08305f5725b26c8a980ee (diff) | |
| download | qemu-37701411397c7b7d709ae92abd347cc593940ee5.zip qemu-37701411397c7b7d709ae92abd347cc593940ee5.tar.gz qemu-37701411397c7b7d709ae92abd347cc593940ee5.tar.bz2 | |
qemu-config: parse configuration files to a QDict
Change the parser to put the values into a QDict and pass them
to a callback. qemu_config_parse's QemuOpts creation is
itself turned into a callback function.
This is useful for -readconfig to support keyval-based options;
getting a QDict from the parser removes a roundtrip from
QDict to QemuOpts and then back to QDict.
Unfortunately there is a disadvantage in that semantic errors will
point to the last line of the group, because the entries of the QDict
do not have a location attached.
Cc: Kevin Wolf <kwolf@redhat.com>
Cc: Markus Armbruster <armbru@redhat.com>
Cc: qemu-stable@nongnu.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20210524105752.3318299-2-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'softmmu')
| -rw-r--r-- | softmmu/vl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/softmmu/vl.c b/softmmu/vl.c index 6054f6f..47dfdd7 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -2133,7 +2133,7 @@ static void qemu_read_default_config_file(Error **errp) int ret; g_autofree char *file = get_relocated_path(CONFIG_QEMU_CONFDIR "/qemu.conf"); - ret = qemu_read_config_file(file, errp); + ret = qemu_read_config_file(file, qemu_config_do_parse, errp); if (ret < 0) { if (ret == -ENOENT) { error_free(*errp); @@ -3399,7 +3399,7 @@ void qemu_init(int argc, char **argv, char **envp) qemu_plugin_opt_parse(optarg, &plugin_list); break; case QEMU_OPTION_readconfig: - qemu_read_config_file(optarg, &error_fatal); + qemu_read_config_file(optarg, qemu_config_do_parse, &error_fatal); break; case QEMU_OPTION_spice: olist = qemu_find_opts_err("spice", NULL); |