From nobody Fri May 10 04:57:38 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1627567921602467.51301424259475; Thu, 29 Jul 2021 07:12:01 -0700 (PDT) Received: from localhost ([::1]:44962 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m96lU-0001fE-8Y for importer@patchew.org; Thu, 29 Jul 2021 10:12:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60050) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m96ka-0000Ad-4N for qemu-devel@nongnu.org; Thu, 29 Jul 2021 10:11:04 -0400 Received: from mail-ej1-x62e.google.com ([2a00:1450:4864:20::62e]:39671) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m96kY-0006Nc-57 for qemu-devel@nongnu.org; Thu, 29 Jul 2021 10:11:03 -0400 Received: by mail-ej1-x62e.google.com with SMTP id go31so10930785ejc.6 for ; Thu, 29 Jul 2021 07:11:01 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id mf1sm1024132ejb.51.2021.07.29.07.10.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Jul 2021 07:11:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uKkyh3OYQ0mfw6Y9gyrWs6boJPfL3KQaIy+v+IFJpNM=; b=t/iOHOTpTHrab11MN/WHq83V6RA9Fg08YO7LGfKQaAFTuQMRBXXB6M4SFza7wx0seh bXYBp5eH6tjtmNAJDKZ9E1EC4eLdslsTQ3oVwv/WeZRUxmTAJHw0ffIyzftHxyWltz0u gqzB7svb4Z8xyhBAk6c96ym82aSxn/tXqwg44Y22XaiHidY1yb1cvp4yxjmGbmpD9nK2 VNH1AXUZtWbDSU7ZjVJ4GuzINgTbEdZ4u7tkum0+4sdxChyxt07X/ERqERO6Am7jt27z wpMRm1pFTTTzWS/LNMzvDdv1ANOPK4FDY1/4XLaWWDlMWPG02yZ2QLTo2SJu3Rv8uhrf LFEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=uKkyh3OYQ0mfw6Y9gyrWs6boJPfL3KQaIy+v+IFJpNM=; b=bWGMPmQJqO4g+Y7OryItMEIihazaDtb9J7S5zDjx8VD7eIVW6AZRZ1vDGnt8ttb52y Zq51u14+AR+DcxqulKFE4hxjlS6EycUJb73lT1rzMhepc6p3w2cCvmoYxew/HtiN1F+e 61vW/0/LXZ0RSSwxkvZnV8ASuEruiNxKeqxRpvpOJjYbClsOSSdslUaX1EAtzxobQIND ohYUG3q51st1469I+2wMDYi8Dx6ef9p4HzyxwRDWYwsYFJNXZjnxfl04n8rgeIcdeubU s85lCTYwBCk2T3cz/8u0bCSoV974WdsXLSO+pz9VjKczAjuhpxQSNpJqVsr/BIORpBF0 JPZw== X-Gm-Message-State: AOAM531NCTHV05l9CBY9VmBG3lf4LRfRtoeGwBrahqXyiElAKvhApwea skGqPVTf6RgAubPaavawjMQz8YSYme/LBg== X-Google-Smtp-Source: ABdhPJwixTjf714DwiEMDZ279T1Q0xpAo4HsOcdJBF+NodKmCcZpGlQ24N25uPhlnd56/sl+cTRAvw== X-Received: by 2002:a17:906:948f:: with SMTP id t15mr4843007ejx.85.1627567860860; Thu, 29 Jul 2021 07:11:00 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 1/2] vl: introduce machine_merge_property Date: Thu, 29 Jul 2021 16:10:57 +0200 Message-Id: <20210729141058.228405-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210729141058.228405-1-pbonzini@redhat.com> References: <20210729141058.228405-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::62e; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x62e.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1627567923191100003 Content-Type: text/plain; charset="utf-8" It will be used to parse smp-opts config groups from configuration files. The point to note is that it does not steal a reference from the caller. This is better because this function will be called from qemu_config_foreach's callback; qemu_config_foreach does not cede its reference to the qdict to the callback, and wants to free it. To balance that extra reference, machine_parse_property_opt now needs a qobject_unref. Signed-off-by: Paolo Bonzini --- softmmu/vl.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/softmmu/vl.c b/softmmu/vl.c index 4dee472c79..93aef8e747 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -1534,23 +1534,36 @@ static void machine_help_func(const QDict *qdict) } } =20 +static void +machine_merge_property(const char *propname, QDict *prop, Error **errp) +{ + QDict *opts; + + opts =3D qdict_new(); + /* Preserve the caller's reference to prop. */ + qobject_ref(prop); + qdict_put(opts, propname, prop); + keyval_merge(machine_opts_dict, opts, errp); + qobject_unref(opts); +} + static void machine_parse_property_opt(QemuOptsList *opts_list, const char *propname, const char *arg, Error **errp) { - QDict *opts, *prop; + QDict *prop =3D NULL; bool help =3D false; - ERRP_GUARD(); =20 prop =3D keyval_parse(arg, opts_list->implied_opt_name, &help, errp); if (help) { qemu_opts_print_help(opts_list, true); exit(0); } - opts =3D qdict_new(); - qdict_put(opts, propname, prop); - keyval_merge(machine_opts_dict, opts, errp); - qobject_unref(opts); + if (!prop) { + return; + } + machine_merge_property(propname, prop, errp); + qobject_unref(prop); } =20 static const char *pid_file; --=20 2.31.1 From nobody Fri May 10 04:57:38 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1627568029572143.43704135221208; Thu, 29 Jul 2021 07:13:49 -0700 (PDT) Received: from localhost ([::1]:48710 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m96nB-0004At-MI for importer@patchew.org; Thu, 29 Jul 2021 10:13:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60074) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m96kb-0000CD-B6 for qemu-devel@nongnu.org; Thu, 29 Jul 2021 10:11:05 -0400 Received: from mail-ej1-x62c.google.com ([2a00:1450:4864:20::62c]:42898) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m96kZ-0006Oq-4A for qemu-devel@nongnu.org; Thu, 29 Jul 2021 10:11:05 -0400 Received: by mail-ej1-x62c.google.com with SMTP id e19so10924081ejs.9 for ; Thu, 29 Jul 2021 07:11:02 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id mf1sm1024132ejb.51.2021.07.29.07.11.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Jul 2021 07:11:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2fwd9objZBu7/3yhUZG7id8W9kbZ76Fri7jal/zJS04=; b=SP7Clxm2BTWtiq1cbA2zw+tHu0XNi94z9w2bx3Cu2dnQYjNm+0lmEz/08QcaMSkkKP 28sMMjo0FkzyddDq+NRkkcwiM6mngv1wczQcVYLdIoN7aOQzpif7fiOFcrGPNoK0vENS Od41w63uGUD3D+cR2IuipextTM1h2oChvN9BSwc92ziVB/OGu7d1PtMvAJ73ZnWxdRTM TUMLNaa0fHbOHqiC0iAAC+UjsnzW+gafX9yMnis3M3EV6xzrjpfpWMnXoM3716Ju0uQ0 LGwD1+rYoEYmog4qxlOL5BYRShy+r133+prCeK1M5pft+zbZWzHK8byiCE6Zo1pCSg66 siaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=2fwd9objZBu7/3yhUZG7id8W9kbZ76Fri7jal/zJS04=; b=mtZ/1Ijig1CUaFQei0Qvcaz+ucNZYsO8J+xDhBfwOwQY55NZd++RQM9QPXi1tr09Pq HoB8sDCAagM3qXNL9uyKzTJUvWrk6H9c53uyuVW5Ve1dTitemu3ZmUG6UvOvJZEO0HlY /LfQOwcv002IFqcNaQEb4rQQTBpFecuHP7An5isg5TL5TGTH24KExgXMHRUD9MXZEwn/ 7XpjCdIterBbyavsLHwjXIBssfWAjYaglqvYwQxK51t/zv1jwfNGdpC4xJVv6hIFW1hY ZPR89W03hm7lyQMYqg6woOzTVp3g/7YeXELpqpej8GXEAqdPymDusuQTgRk1ygV3s77I 08OQ== X-Gm-Message-State: AOAM532QcumKo+Mhm3ZWufM9qrEbSEj4L2b82I2qO6EO9mCvc6x8w+o5 isNwo/lRYTU7tqpIpTK29wZV6ivQ2O9GyA== X-Google-Smtp-Source: ABdhPJzXGIGQ32eAVh8CVaLEmmvcMnE+EfdjfkDVDoq9OCPNq2Pq/H/mqgUlVHzXugSgjbAqDPiFaw== X-Received: by 2002:a17:906:4116:: with SMTP id j22mr4699417ejk.423.1627567861522; Thu, 29 Jul 2021 07:11:01 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 2/2] vl: stop recording -smp in QemuOpts Date: Thu, 29 Jul 2021 16:10:58 +0200 Message-Id: <20210729141058.228405-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210729141058.228405-1-pbonzini@redhat.com> References: <20210729141058.228405-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::62c; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x62c.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1627568031962100001 Content-Type: text/plain; charset="utf-8" -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 --- 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 *o= pts, 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 *grou= p, 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 *mach= ine_opts) static void qemu_process_sugar_options(void) { if (mem_prealloc) { - char *val; - - val =3D 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", v= al, - false); - g_free(val); + QObject *smp =3D qdict_get(machine_opts_dict, "smp"); + if (smp && qobject_type(smp) =3D=3D QTYPE_QDICT) { + QObject *cpus =3D qdict_get(qobject_to(QDict, smp), "cpus"); + if (cpus && qobject_type(cpus) =3D=3D QTYPE_QSTRING) { + const char *val =3D qstring_get_str(qobject_to(QString, cp= us)); + object_register_sugar_prop("memory-backend", "prealloc-thr= eads", + val, false); + } + } object_register_sugar_prop("memory-backend", "prealloc", "on", fal= se); } =20 --=20 2.31.1