[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 2/8] vl: stop recording -smp in QemuOpts
From: |
Paolo Bonzini |
Subject: |
[PULL 2/8] vl: stop recording -smp in QemuOpts |
Date: |
Mon, 2 Aug 2021 18:15:36 +0200 |
-readconfig is still recording SMP options in QemuOpts instead of
using machine_opts_dict. This means that SMP options from -readconfig
are ignored.
Just stop using QemuOpts for -smp, making it return false for
is_qemuopts_group. Configuration files will merge the values in
machine_opts_dict using the new function machine_merge_property.
At the same time, fix -mem-prealloc which looked at QemuOpts to find the
number of guest CPUs, which it used as the default number of preallocation
threads.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
softmmu/vl.c | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/softmmu/vl.c b/softmmu/vl.c
index 93aef8e747..5ca11e7469 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -31,6 +31,7 @@
#include "qapi/compat-policy.h"
#include "qapi/error.h"
#include "qapi/qmp/qdict.h"
+#include "qapi/qmp/qstring.h"
#include "qapi/qmp/qjson.h"
#include "qemu-version.h"
#include "qemu/cutils.h"
@@ -2166,7 +2167,8 @@ static int global_init_func(void *opaque, QemuOpts *opts,
Error **errp)
static bool is_qemuopts_group(const char *group)
{
if (g_str_equal(group, "object") ||
- g_str_equal(group, "machine")) {
+ g_str_equal(group, "machine") ||
+ g_str_equal(group, "smp-opts")) {
return false;
}
return true;
@@ -2186,6 +2188,8 @@ static void qemu_record_config_group(const char *group,
QDict *dict,
*/
assert(!from_json);
keyval_merge(machine_opts_dict, dict, errp);
+ } else if (g_str_equal(group, "smp-opts")) {
+ machine_merge_property("smp", dict, &error_fatal);
} else {
abort();
}
@@ -2452,13 +2456,15 @@ static void qemu_validate_options(const QDict
*machine_opts)
static void qemu_process_sugar_options(void)
{
if (mem_prealloc) {
- char *val;
-
- val = g_strdup_printf("%d",
- (uint32_t)
qemu_opt_get_number(qemu_find_opts_singleton("smp-opts"), "cpus", 1));
- object_register_sugar_prop("memory-backend", "prealloc-threads", val,
- false);
- g_free(val);
+ QObject *smp = qdict_get(machine_opts_dict, "smp");
+ if (smp && qobject_type(smp) == QTYPE_QDICT) {
+ QObject *cpus = qdict_get(qobject_to(QDict, smp), "cpus");
+ if (cpus && qobject_type(cpus) == QTYPE_QSTRING) {
+ const char *val = qstring_get_str(qobject_to(QString, cpus));
+ object_register_sugar_prop("memory-backend",
"prealloc-threads",
+ val, false);
+ }
+ }
object_register_sugar_prop("memory-backend", "prealloc", "on", false);
}
--
2.31.1
- [PULL 0/8] vl.c, coverity patches for QEMU 6.1-rc2, Paolo Bonzini, 2021/08/02
- [PULL 4/8] coverity-model: make g_free a synonym of free, Paolo Bonzini, 2021/08/02
- [PULL 3/8] coverity-model: update address_space_read/write models, Paolo Bonzini, 2021/08/02
- [PULL 5/8] coverity-model: remove model for more allocation functions, Paolo Bonzini, 2021/08/02
- [PULL 7/8] coverity-model: constrain g_malloc/g_malloc0/g_realloc as never returning NULL, Paolo Bonzini, 2021/08/02
- [PULL 6/8] coverity-model: clean up the models for array allocation functions, Paolo Bonzini, 2021/08/02
- [PULL 2/8] vl: stop recording -smp in QemuOpts,
Paolo Bonzini <=
- [PULL 1/8] vl: introduce machine_merge_property, Paolo Bonzini, 2021/08/02
- [PULL 8/8] coverity-model: write models fully for non-array allocation functions, Paolo Bonzini, 2021/08/02
- Re: [PULL 0/8] vl.c, coverity patches for QEMU 6.1-rc2, Peter Maydell, 2021/08/02