From nobody Tue Feb 10 01:35:12 2026 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 ARC-Seal: i=1; a=rsa-sha256; t=1621353005; cv=none; d=zohomail.com; s=zohoarc; b=kenAdkKmMlt4pa7dvAkWHaxdjJlZKb/t71zdz8+xRM+QezwytXPbo5YxuWPfz5x3dDy1rjVp+WSSdPd11UwSrCqcGLJmH0H+Dx/3Dyy5NWKKqqW7+7O/XcnHDpnFbbeJj7co2eVgUbVp6xkHIsckgh8NsNGXAihZI3YGeTufUmQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621353005; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=43vNoQO6grH4MkSSW/tNt26aVpHvhL/3pAIxOBZf714=; b=EWom9jDrg9L5/hpJldAkmJZMLiiPGpOHHJBbNErBUqI1m68YDvr3oQzS5cM+429ObbZCZ4hdWE45NyhK/vKpnqJ1SzEdHNK6TG8/ORUkGdmeDsrDYcb58/1fYh8zBv2GtoWei6PF0mYL2fKi48T5fme+YB45TEENyJuUuvCEvvY= ARC-Authentication-Results: i=1; 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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1621353005914549.4579677453049; Tue, 18 May 2021 08:50:05 -0700 (PDT) Received: from localhost ([::1]:60662 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lj1yu-0003jy-O6 for importer@patchew.org; Tue, 18 May 2021 11:50:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40086) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lj1qh-000101-1Z for qemu-devel@nongnu.org; Tue, 18 May 2021 11:41:35 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:21445) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lj1qe-0007Oi-9b for qemu-devel@nongnu.org; Tue, 18 May 2021 11:41:34 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-203-Pd2lPYdHMHWDkO5i2mgx1g-1; Tue, 18 May 2021 11:41:29 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E6FAC1034B56; Tue, 18 May 2021 15:41:01 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6CC8434810; Tue, 18 May 2021 15:41:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621352491; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=43vNoQO6grH4MkSSW/tNt26aVpHvhL/3pAIxOBZf714=; b=LiHZ2NQW1suiS1nw6XG6k6y+87SRYZpWjM9uw6KUT5iTz0V+3hYGadjMe8FVX7yU58MzzG GT8jTWs0DtsDogvMuzJ2xj2hyKs2LZk8O8jk9mqVBmMwDfqN5SApBHXP9bv8kjJyGP3tQO RAEsYqjPx8zV6KmkFE/rKXvB5JmXZZs= X-MC-Unique: Pd2lPYdHMHWDkO5i2mgx1g-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 3/3] vl: plug -object back into -readconfig Date: Tue, 18 May 2021 11:40:59 -0400 Message-Id: <20210518154059.3002446-3-pbonzini@redhat.com> In-Reply-To: <20210518154014.2999326-1-pbonzini@redhat.com> References: <20210518154014.2999326-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=216.205.24.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.374, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: , Cc: kwolf@redhat.com, armbru@redhat.com, qemu-stable@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Commit bc2f4fcb1d ("qom: move user_creatable_add_opts logic to vl.c and QAPIfy it", 2021-03-19) switched the creation of objects from qemu_opts_foreach to a bespoke QTAILQ in preparation for supporting JSON syntax in -object. Unfortunately in doing so it lost support for [object] stanzas in configuration files and also for "-set object.ID.KEY=3DVAL". The latter is hard to re-establish and probably best solved by deprecating -set. This patch uses the infrastructure introduced by the previous two patches in order to parse QOM objects correctly from configuration files. Cc: Kevin Wolf Cc: Markus Armbruster Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini --- softmmu/vl.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/softmmu/vl.c b/softmmu/vl.c index 90e491cc0c..a8abf8e740 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -1708,9 +1708,15 @@ static void object_option_foreach_add(bool (*type_op= t_predicate)(const char *)) } } =20 +static void object_option_add_visitor(Visitor *v) +{ + ObjectOption *opt =3D g_new0(ObjectOption, 1); + visit_type_ObjectOptions(v, NULL, &opt->opts, &error_fatal); + QTAILQ_INSERT_TAIL(&object_opts, opt, next); +} + static void object_option_parse(const char *optarg) { - ObjectOption *opt; QemuOpts *opts; const char *type; Visitor *v; @@ -1738,11 +1744,8 @@ static void object_option_parse(const char *optarg) v =3D opts_visitor_new(opts); } =20 - opt =3D g_new0(ObjectOption, 1); - visit_type_ObjectOptions(v, NULL, &opt->opts, &error_fatal); + object_option_add_visitor(v); visit_free(v); - - QTAILQ_INSERT_TAIL(&object_opts, opt, next); } =20 /* @@ -2122,12 +2125,21 @@ 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")) { + return false; + } return true; } =20 static void qemu_record_config_group(const char *group, QDict *dict, bool = from_json, Error **errp) { - abort(); + if (g_str_equal(group, "object")) { + Visitor *v =3D qobject_input_visitor_new_keyval(QOBJECT(dict)); + object_option_add_visitor(v); + visit_free(v); + } else { + abort(); + } } =20 /* --=20 2.27.0