From nobody Sun May 19 13:07:53 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1615483765; cv=none; d=zohomail.com; s=zohoarc; b=e4JDmrnqDpzSUA5nshLN93LzSwjCwI0/AUVGCb3ENxHZ9sexPaf7sLPw5FFt0cBnX2yXQ7E4YFhAKylH/G7qj9/7FkQcmkAZB6XmcsNzZLKlDMp5yGeFD5FWOOchne58TsPabilH7vnFVnomesAk8HpYt5oup8W2Cs7ht/Cn8+8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615483765; 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=LEZwvbfHEtLnGI9bIkYjKinbrzcrh0VBOs7JP2Anc6k=; b=nHeGzbUQ4pCdrF4ZGAdANNLZ7j4nd/9cyey3MVwdLM7nJ4WthwYQlF4HB3DixSpv+Jp7USd6KHeqxOun2jBgFXzYVdzz5E87dEThD0ijydxMbCuT9E7K7nTjI2grlndYjPGom97j4zZ5cTTYWz1BUnjDFHg+mtYDYORybdZLmK0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1615483765984482.5829560314455; Thu, 11 Mar 2021 09:29:25 -0800 (PST) Received: from localhost ([::1]:55560 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lKP7k-0006tE-J5 for importer@patchew.org; Thu, 11 Mar 2021 12:29:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36180) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lKP3s-0003eA-D4 for qemu-devel@nongnu.org; Thu, 11 Mar 2021 12:25:24 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:55690) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lKP3Z-0002DF-5n for qemu-devel@nongnu.org; Thu, 11 Mar 2021 12:25:19 -0500 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-383-mHxzGtXaPbuumM7WKyY78Q-1; Thu, 11 Mar 2021 12:25:01 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D45BD19067E6 for ; Thu, 11 Mar 2021 17:25:00 +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 63AD560615; Thu, 11 Mar 2021 17:25:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615483503; 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=LEZwvbfHEtLnGI9bIkYjKinbrzcrh0VBOs7JP2Anc6k=; b=B2DivmMA1LE6FLanLDR6V5xIpd09uVUNWR1Lq286aWim5r63QQRStWOSRhtyof9oRfMB3R 5Ip9ZbVxE4wHBDRVgHcO2W4eMOn80kqAIDloImOOf6Hdc9yiMpyJ5rYi4HqDhYtH8CYS9E ixBd8q0lwGTGy/ODYCmBU54QHabbv6M= X-MC-Unique: mHxzGtXaPbuumM7WKyY78Q-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 1/3] tests: convert check-qom-proplist to keyval Date: Thu, 11 Mar 2021 12:24:57 -0500 Message-Id: <20210311172459.990281-2-pbonzini@redhat.com> In-Reply-To: <20210311172459.990281-1-pbonzini@redhat.com> References: <20210311172459.990281-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.25, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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 Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The command-line creation test is using QemuOpts. Switch it to keyval, since the emulator has some special needs and thus the last user of user_creatable_add_opts will go away with the next patch. Signed-off-by: Paolo Bonzini Reviewed-by: Kevin Wolf --- tests/check-qom-proplist.c | 74 ++++++++++++++++++++++++++------------ 1 file changed, 52 insertions(+), 22 deletions(-) diff --git a/tests/check-qom-proplist.c b/tests/check-qom-proplist.c index 1b76581980..73472944a0 100644 --- a/tests/check-qom-proplist.c +++ b/tests/check-qom-proplist.c @@ -21,6 +21,9 @@ #include "qemu/osdep.h" =20 #include "qapi/error.h" +#include "qapi/qobject-input-visitor.h" +#include "qapi/qmp/qdict.h" +#include "qapi/qmp/qobject.h" #include "qom/object.h" #include "qemu/module.h" #include "qemu/option.h" @@ -398,44 +401,71 @@ static void test_dummy_createlist(void) object_unparent(OBJECT(dobj)); } =20 +static bool test_create_obj(QDict *qdict, Error **errp) +{ + Visitor *v =3D qobject_input_visitor_new_keyval(QOBJECT(qdict)); + Object *obj =3D user_creatable_add_type(TYPE_DUMMY, "dev0", qdict, v, = errp); + + visit_free(v); + object_unref(obj); + return !!obj; +} + static void test_dummy_createcmdl(void) { - QemuOpts *opts; + QDict *qdict; DummyObject *dobj; Error *err =3D NULL; - const char *params =3D TYPE_DUMMY \ - ",id=3Ddev0," \ - "bv=3Dyes,sv=3DHiss hiss hiss,av=3Dplatypus"; + bool help; + const char *params =3D "bv=3Dyes,sv=3DHiss hiss hiss,av=3Dplatypus"; =20 + /* Needed for user_creatable_del. */ qemu_add_opts(&qemu_object_opts); - opts =3D qemu_opts_parse(&qemu_object_opts, params, true, &err); + + qdict =3D keyval_parse(params, "qom-type", &help, &err); g_assert(err =3D=3D NULL); - g_assert(opts); + g_assert(qdict); + g_assert(!help); =20 - dobj =3D DUMMY_OBJECT(user_creatable_add_opts(opts, &err)); + g_assert(test_create_obj(qdict, &err)); g_assert(err =3D=3D NULL); + qobject_unref(qdict); + + dobj =3D DUMMY_OBJECT(object_resolve_path_component(object_get_objects= _root(), + "dev0")); g_assert(dobj); g_assert_cmpstr(dobj->sv, =3D=3D, "Hiss hiss hiss"); g_assert(dobj->bv =3D=3D true); g_assert(dobj->av =3D=3D DUMMY_PLATYPUS); =20 + qdict =3D keyval_parse(params, "qom-type", &help, &err); + g_assert(!test_create_obj(qdict, &err)); + g_assert(err); + g_assert(object_resolve_path_component(object_get_objects_root(), "dev= 0") + =3D=3D OBJECT(dobj)); + qobject_unref(qdict); + error_free(err); + err =3D NULL; + + qdict =3D keyval_parse(params, "qom-type", &help, &err); user_creatable_del("dev0", &error_abort); + g_assert(object_resolve_path_component(object_get_objects_root(), "dev= 0") + =3D=3D NULL); =20 - object_unref(OBJECT(dobj)); - - /* - * cmdline-parsing via qemu_opts_parse() results in a QemuOpts entry - * corresponding to the Object's ID to be added to the QemuOptsList - * for objects. To avoid having this entry conflict with future - * Objects using the same ID (which can happen in cases where - * qemu_opts_parse() is used to parse the object params, such as - * with hmp_object_add() at the time of this comment), we need to - * check for this in user_creatable_del() and remove the QemuOpts if - * it is present. - * - * The below check ensures this works as expected. - */ - g_assert_null(qemu_opts_find(&qemu_object_opts, "dev0")); + g_assert(test_create_obj(qdict, &err)); + g_assert(err =3D=3D NULL); + qobject_unref(qdict); + + dobj =3D DUMMY_OBJECT(object_resolve_path_component(object_get_objects= _root(), + "dev0")); + g_assert(dobj); + g_assert_cmpstr(dobj->sv, =3D=3D, "Hiss hiss hiss"); + g_assert(dobj->bv =3D=3D true); + g_assert(dobj->av =3D=3D DUMMY_PLATYPUS); + g_assert(object_resolve_path_component(object_get_objects_root(), "dev= 0") + =3D=3D OBJECT(dobj)); + + object_unparent(OBJECT(dobj)); } =20 static void test_dummy_badenum(void) --=20 2.26.2 From nobody Sun May 19 13:07:53 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1615483769; cv=none; d=zohomail.com; s=zohoarc; b=AVz69jHv0obYzHmHV8h24gOFm8LKOrp15rESVtOXFzVA1G7C+XTaBREBMcGPTm2pRdllsfHlAphWjg6NcjvWUmGzpiJSITBRIDTa2yn2xuZ/d1H597ryXlBYUfNJovG1A73ukMXGmTPS4nXC2CmRYauBp6/Z/icF5+GRCV/x48g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615483769; 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=wIwhESrCSbQC4TvcckLi2awNeh+BvzbxizMZr1FuE9E=; b=N7cZm2bi+oqAGMMn0lycGtklfkInsuIixK4fb6BIdAWQLy8gWu5AQ/oRRe0Gp2mm7NY39a9Ydt/xFWYKepUcFv8BhTgm3Q/aeY7gy2cE+uFBtP+sIKIN5/xg13srwnkSYwlNCg7p2y4V7JcbjM6DvZmVV8YhvUWRjTjnwDAiZBM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 16154837687661018.1185057713435; Thu, 11 Mar 2021 09:29:28 -0800 (PST) Received: from localhost ([::1]:55722 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lKP7m-0006xM-Es for importer@patchew.org; Thu, 11 Mar 2021 12:29:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36184) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lKP3s-0003eC-E2 for qemu-devel@nongnu.org; Thu, 11 Mar 2021 12:25:26 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:21492) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lKP3g-0002EL-Sv for qemu-devel@nongnu.org; Thu, 11 Mar 2021 12:25:23 -0500 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-164-PMOJ7_6eNbCl1jJjWmKe_g-1; Thu, 11 Mar 2021 12:25:02 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 77C2A81744F for ; Thu, 11 Mar 2021 17:25: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 06FC160C5D; Thu, 11 Mar 2021 17:25:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615483508; 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=wIwhESrCSbQC4TvcckLi2awNeh+BvzbxizMZr1FuE9E=; b=XtCZl0cI5HUM9Hd2gBUjuSaxxmSPOX7uPeyroBAkxeK75rajyzBnybCm36yWHqQHwttrSO YoW4zUROnCKPsx2dsVhxKUUp7AW1yqwLwAm8+DDaQqAqUiftP7HOsALwUQ/3huhz0CD46U qiQRtk50swnQfxG9YZ4906k2dpHzP3g= X-MC-Unique: PMOJ7_6eNbCl1jJjWmKe_g-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 2/3] qom: move user_creatable_add_opts logic to vl.c and QAPIfy it Date: Thu, 11 Mar 2021 12:24:58 -0500 Message-Id: <20210311172459.990281-3-pbonzini@redhat.com> In-Reply-To: <20210311172459.990281-1-pbonzini@redhat.com> References: <20210311172459.990281-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.25, 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 Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Emulators are currently using OptsVisitor (via user_creatable_add_opts) to parse the -object command line option. This has one extra feature, compared to keyval, which is automatic conversion of integers to lists as well as support for lists as repeated options: -object memory-backend-ram,id=3Dpc.ram,size=3D1048576000,host-nodes=3D0,p= olicy=3Dbind So we cannot replace OptsVisitor with keyval right now. Still, this patch moves the user_creatable_add_opts logic to vl.c since it is not needed anywhere else, and makes it go through user_creatable_add_qapi. In order to minimize code changes, the predicate still takes a string. This can be changed later to use the ObjectType QAPI enum directly. Signed-off-by: Paolo Bonzini Reviewed-by: Eric Blake Reviewed-by: Markus Armbruster --- include/qom/object_interfaces.h | 50 ++-------------------- qom/object_interfaces.c | 57 +------------------------ softmmu/vl.c | 73 +++++++++++++++++++++++++-------- 3 files changed, 60 insertions(+), 120 deletions(-) diff --git a/include/qom/object_interfaces.h b/include/qom/object_interface= s.h index fb32330901..454fe4435b 100644 --- a/include/qom/object_interfaces.h +++ b/include/qom/object_interfaces.h @@ -95,54 +95,10 @@ Object *user_creatable_add_type(const char *type, const= char *id, * Create an instance of the user creatable object according to the * options passed in @opts as described in the QAPI schema documentation. * - * Returns: the newly created object or NULL on error - */ -void user_creatable_add_qapi(ObjectOptions *options, Error **errp); - -/** - * user_creatable_add_opts: - * @opts: the object definition - * @errp: if an error occurs, a pointer to an area to store the error - * - * Create an instance of the user creatable object whose type - * is defined in @opts by the 'qom-type' option, placing it - * in the object composition tree with name provided by the - * 'id' field. The remaining options in @opts are used to - * initialize the object properties. - * - * Returns: the newly created object or NULL on error - */ -Object *user_creatable_add_opts(QemuOpts *opts, Error **errp); - - -/** - * user_creatable_add_opts_predicate: - * @type: the QOM type to be added - * - * A callback function to determine whether an object - * of type @type should be created. Instances of this - * callback should be passed to user_creatable_add_opts_foreach - */ -typedef bool (*user_creatable_add_opts_predicate)(const char *type); - -/** - * user_creatable_add_opts_foreach: - * @opaque: a user_creatable_add_opts_predicate callback or NULL - * @opts: options to create - * @errp: unused - * - * An iterator callback to be used in conjunction with - * the qemu_opts_foreach() method for creating a list of - * objects from a set of QemuOpts - * - * The @opaque parameter can be passed a user_creatable_add_opts_predicate - * callback to filter which types of object are created during iteration. - * When it fails, report the error. - * - * Returns: 0 on success, -1 when an error was reported. + * Returns: true when an object was successfully created, false when an er= ror + * occurred */ -int user_creatable_add_opts_foreach(void *opaque, - QemuOpts *opts, Error **errp); +bool user_creatable_add_qapi(ObjectOptions *options, Error **errp); =20 /** * user_creatable_parse_str: diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c index 62d7db7629..2e50698075 100644 --- a/qom/object_interfaces.c +++ b/qom/object_interfaces.c @@ -117,7 +117,7 @@ out: return obj; } =20 -void user_creatable_add_qapi(ObjectOptions *options, Error **errp) +bool user_creatable_add_qapi(ObjectOptions *options, Error **errp) { Visitor *v; QObject *qobj; @@ -138,60 +138,7 @@ void user_creatable_add_qapi(ObjectOptions *options, E= rror **errp) options->id, props, v, errp); object_unref(obj); visit_free(v); -} - -Object *user_creatable_add_opts(QemuOpts *opts, Error **errp) -{ - Visitor *v; - QDict *pdict; - Object *obj; - const char *id =3D qemu_opts_id(opts); - char *type =3D qemu_opt_get_del(opts, "qom-type"); - - if (!type) { - error_setg(errp, QERR_MISSING_PARAMETER, "qom-type"); - return NULL; - } - if (!id) { - error_setg(errp, QERR_MISSING_PARAMETER, "id"); - qemu_opt_set(opts, "qom-type", type, &error_abort); - g_free(type); - return NULL; - } - - qemu_opts_set_id(opts, NULL); - pdict =3D qemu_opts_to_qdict(opts, NULL); - - v =3D opts_visitor_new(opts); - obj =3D user_creatable_add_type(type, id, pdict, v, errp); - visit_free(v); - - qemu_opts_set_id(opts, (char *) id); - qemu_opt_set(opts, "qom-type", type, &error_abort); - g_free(type); - qobject_unref(pdict); - return obj; -} - - -int user_creatable_add_opts_foreach(void *opaque, QemuOpts *opts, Error **= errp) -{ - bool (*type_opt_predicate)(const char *, QemuOpts *) =3D opaque; - Object *obj =3D NULL; - const char *type; - - type =3D qemu_opt_get(opts, "qom-type"); - if (type && type_opt_predicate && - !type_opt_predicate(type, opts)) { - return 0; - } - - obj =3D user_creatable_add_opts(opts, errp); - if (!obj) { - return -1; - } - object_unref(obj); - return 0; + return obj !=3D NULL; } =20 char *object_property_help(const char *name, const char *type, diff --git a/softmmu/vl.c b/softmmu/vl.c index ff488ea3e7..b245e912e5 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -117,6 +117,7 @@ #include "qapi/qapi-commands-block-core.h" #include "qapi/qapi-commands-migration.h" #include "qapi/qapi-commands-misc.h" +#include "qapi/qapi-visit-qom.h" #include "qapi/qapi-commands-ui.h" #include "qapi/qmp/qerror.h" #include "sysemu/iothread.h" @@ -132,10 +133,16 @@ typedef struct BlockdevOptionsQueueEntry { =20 typedef QSIMPLEQ_HEAD(, BlockdevOptionsQueueEntry) BlockdevOptionsQueue; =20 +typedef struct ObjectOption { + ObjectOptions *opts; + QTAILQ_ENTRY(ObjectOption) next; +} ObjectOption; + static const char *cpu_option; static const char *mem_path; static const char *incoming; static const char *loadvm; +static QTAILQ_HEAD(, ObjectOption) object_opts =3D QTAILQ_HEAD_INITIALIZER= (object_opts); static ram_addr_t maxram_size; static uint64_t ram_slots; static int display_remote; @@ -1684,6 +1691,48 @@ static int machine_set_property(void *opaque, return object_parse_property_opt(opaque, name, value, "type", errp); } =20 +static void object_option_foreach_add(bool (*type_opt_predicate)(const cha= r *), Error **errp) +{ + ObjectOption *opt, *next; + + QTAILQ_FOREACH_SAFE(opt, &object_opts, next, next) { + const char *type =3D ObjectType_str(opt->opts->qom_type); + if (type_opt_predicate(type)) { + if (!user_creatable_add_qapi(opt->opts, errp)) { + return; + } + qapi_free_ObjectOptions(opt->opts); + QTAILQ_REMOVE(&object_opts, opt, next); + } + } +} + +static void object_option_parse(const char *optarg) +{ + ObjectOption *opt; + QemuOpts *opts; + const char *type; + Visitor *v; + + opts =3D qemu_opts_parse_noisily(qemu_find_opts("object"), + optarg, true); + if (!opts) { + exit(1); + } + + type =3D qemu_opt_get(opts, "qom-type"); + if (user_creatable_print_help(type, opts)) { + exit(0); + } + + opt =3D g_new0(ObjectOption, 1); + v =3D opts_visitor_new(opts); + visit_type_ObjectOptions(v, NULL, &opt->opts, &error_fatal); + visit_free(v); + + QTAILQ_INSERT_TAIL(&object_opts, opt, next); +} + /* * Initial object creation happens before all other * QEMU data types are created. The majority of objects @@ -1691,12 +1740,8 @@ static int machine_set_property(void *opaque, * cannot be created here, as it depends on the chardev * already existing. */ -static bool object_create_early(const char *type, QemuOpts *opts) +static bool object_create_early(const char *type) { - if (user_creatable_print_help(type, opts)) { - exit(0); - } - /* * Objects should not be made "delayed" without a reason. If you * add one, state the reason in a comment! @@ -1815,9 +1860,7 @@ static void qemu_create_early_backends(void) exit(1); } =20 - qemu_opts_foreach(qemu_find_opts("object"), - user_creatable_add_opts_foreach, - object_create_early, &error_fatal); + object_option_foreach_add(object_create_early, &error_fatal); =20 /* spice needs the timers to be initialized by this point */ /* spice must initialize before audio as it changes the default auiode= v */ @@ -1846,9 +1889,9 @@ static void qemu_create_early_backends(void) * The remainder of object creation happens after the * creation of chardev, fsdev, net clients and device data types. */ -static bool object_create_late(const char *type, QemuOpts *opts) +static bool object_create_late(const char *type) { - return !object_create_early(type, opts); + return !object_create_early(type); } =20 static void qemu_create_late_backends(void) @@ -1859,9 +1902,7 @@ static void qemu_create_late_backends(void) =20 net_init_clients(&error_fatal); =20 - qemu_opts_foreach(qemu_find_opts("object"), - user_creatable_add_opts_foreach, - object_create_late, &error_fatal); + object_option_foreach_add(object_create_late, &error_fatal); =20 if (tpm_init() < 0) { exit(1); @@ -3398,11 +3439,7 @@ void qemu_init(int argc, char **argv, char **envp) #endif break; case QEMU_OPTION_object: - opts =3D qemu_opts_parse_noisily(qemu_find_opts("object"), - optarg, true); - if (!opts) { - exit(1); - } + object_option_parse(optarg); break; case QEMU_OPTION_overcommit: opts =3D qemu_opts_parse_noisily(qemu_find_opts("overcommi= t"), --=20 2.26.2 From nobody Sun May 19 13:07:53 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1615483931; cv=none; d=zohomail.com; s=zohoarc; b=De9jlkh/WmKiGscv+YMDrhtet4y30Z3laebyFH/GtZXiGMZccgUa73ErYObjYCNEksFvLc4fFhYLbFua/WnoGX/i5xSxzT+dLxAejqNHfAOmByKYdoabu8GgN+HP8tLDMff7O2yGWfl50TF5WSdLjHPZAGabYohQ7ETVhvI9TFo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615483931; 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=oRbaAZthWg1dN3E3X0ovX1GdpwLF5C5T3YTXkV6npr0=; b=f4/p81IUV5eHjRaHpgTjgae0x1DXDg/Pw6nSUwKzGItUKKjHJLy+7MOAVX32d2BIfSAptRQLjgDeM8X+GiDSTWwLxOIkrRj7EZOW88xLU5h5nQU0cj0kljtDD2iZq37QL4e+XMQIHym3PlrofWhn18aGVoAYMqX3bD8oWVtMlTY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 161548393181159.18957089817923; Thu, 11 Mar 2021 09:32:11 -0800 (PST) Received: from localhost ([::1]:32784 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lKPAD-0000r0-Ns for importer@patchew.org; Thu, 11 Mar 2021 12:32:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36142) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lKP3n-0003ba-BP for qemu-devel@nongnu.org; Thu, 11 Mar 2021 12:25:23 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:30918) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lKP3a-0002Dc-S3 for qemu-devel@nongnu.org; Thu, 11 Mar 2021 12:25:19 -0500 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-194-61-75tyZNz-vNRC77Rzt5Q-1; Thu, 11 Mar 2021 12:25:03 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1BD4B81746B for ; Thu, 11 Mar 2021 17:25:02 +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 9F03C60615; Thu, 11 Mar 2021 17:25:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615483505; 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=oRbaAZthWg1dN3E3X0ovX1GdpwLF5C5T3YTXkV6npr0=; b=YyinHzWYGlgLeXvpIKlpgqj0+1UYjZ5xKkKUxcvZXIl9KHqyfmTLbAfONFXjX/vFwoMjpr +2EGiQExwShsRiURkbcJGeXpnr5fJhpi/o/cUyZ1Yr1KyMBn+KCub6gmYHS+p8jbX7+2dd ScB0oTVSsMm50z5OHamzkZrPVWXX//E= X-MC-Unique: 61-75tyZNz-vNRC77Rzt5Q-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 3/3] vl: allow passing JSON to -object Date: Thu, 11 Mar 2021 12:24:59 -0500 Message-Id: <20210311172459.990281-4-pbonzini@redhat.com> In-Reply-To: <20210311172459.990281-1-pbonzini@redhat.com> References: <20210311172459.990281-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.25, 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 Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Extend the ObjectOption code that was added in the previous patch to enable passing JSON to -object. Even though we cannot yet add non-scalar properties with the human-friendly comma-separated syntax, they can now be added as JSON. Signed-off-by: Paolo Bonzini Reviewed-by: Eric Blake Reviewed-by: Kevin Wolf Reviewed-by: Markus Armbruster --- softmmu/vl.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/softmmu/vl.c b/softmmu/vl.c index b245e912e5..7b07f19de7 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -31,6 +31,7 @@ #include "hw/qdev-properties.h" #include "qapi/error.h" #include "qapi/qmp/qdict.h" +#include "qapi/qmp/qjson.h" #include "qemu-version.h" #include "qemu/cutils.h" #include "qemu/help_option.h" @@ -1714,19 +1715,27 @@ static void object_option_parse(const char *optarg) const char *type; Visitor *v; =20 - opts =3D qemu_opts_parse_noisily(qemu_find_opts("object"), - optarg, true); - if (!opts) { - exit(1); - } + if (optarg[0] =3D=3D '{') { + QObject *obj =3D qobject_from_json(optarg, &error_fatal); =20 - type =3D qemu_opt_get(opts, "qom-type"); - if (user_creatable_print_help(type, opts)) { - exit(0); + v =3D qobject_input_visitor_new(obj); + qobject_unref(obj); + } else { + opts =3D qemu_opts_parse_noisily(qemu_find_opts("object"), + optarg, true); + if (!opts) { + exit(1); + } + + type =3D qemu_opt_get(opts, "qom-type"); + if (user_creatable_print_help(type, opts)) { + exit(0); + } + + v =3D opts_visitor_new(opts); } =20 opt =3D g_new0(ObjectOption, 1); - v =3D opts_visitor_new(opts); visit_type_ObjectOptions(v, NULL, &opt->opts, &error_fatal); visit_free(v); =20 --=20 2.26.2