From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A0B6AC433F5 for ; Wed, 3 Nov 2021 17:36:26 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4A9F4610EA for ; Wed, 3 Nov 2021 17:36:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 4A9F4610EA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:51072 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1miKBV-0003gZ-DK for qemu-devel@archiver.kernel.org; Wed, 03 Nov 2021 13:36:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42362) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miK6H-0001Q8-23 for qemu-devel@nongnu.org; Wed, 03 Nov 2021 13:31:01 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:59695) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miK6E-0001Yp-Ef for qemu-devel@nongnu.org; Wed, 03 Nov 2021 13:31:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635960657; 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=khb5l0Mm9/OtR+1VGLQk/CI1QG5XhE4pFLTNNFIE7xg=; b=ZHGmFyIqHSuUVSMcQUgv6+OIGwAKehm+wWuh5ep9aMK/PHSIOXbKSnxyCwaQUurN/lGZ/v uMOEp0Pj8qLkpDxIw4/Y8XWbG7st/gGcVwHWxGBoBuMk3Q4YUI8dgnOOvML6YGfLRsyWl5 mrCoW4YqytJ3mU7HoUhy6JX8Of/wVpw= 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-536-4dznlLn1MF2Ij9xbZ3-cIQ-1; Wed, 03 Nov 2021 13:30:56 -0400 X-MC-Unique: 4dznlLn1MF2Ij9xbZ3-cIQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4A3248EDBEE for ; Wed, 3 Nov 2021 17:30:31 +0000 (UTC) Received: from merkur.fritz.box (unknown [10.39.193.213]) by smtp.corp.redhat.com (Postfix) with ESMTP id CD5955C1C5; Wed, 3 Nov 2021 17:30:29 +0000 (UTC) From: Kevin Wolf To: qemu-devel@nongnu.org Subject: [RFC PATCH 10/12] qapi: Generate QOM config marshalling code Date: Wed, 3 Nov 2021 18:30:00 +0100 Message-Id: <20211103173002.209906-11-kwolf@redhat.com> In-Reply-To: <20211103173002.209906-1-kwolf@redhat.com> References: <20211103173002.209906-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kwolf@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Received-SPF: pass client-ip=170.10.133.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.717, 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_H2=-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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, berrange@redhat.com, ehabkost@redhat.com, armbru@redhat.com, pbonzini@redhat.com, eblake@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Kevin Wolf --- backends/rng-random.c | 17 ++------ backends/rng.c | 17 ++------ scripts/qapi/main.py | 2 + scripts/qapi/qom.py | 91 +++++++++++++++++++++++++++++++++++++++++++ qapi/meson.build | 3 ++ 5 files changed, 104 insertions(+), 26 deletions(-) create mode 100644 scripts/qapi/qom.py diff --git a/backends/rng-random.c b/backends/rng-random.c index b221308091..35738df3c6 100644 --- a/backends/rng-random.c +++ b/backends/rng-random.c @@ -14,6 +14,7 @@ #include "sysemu/rng-random.h" #include "sysemu/rng.h" #include "qapi/error.h" +#include "qapi/qapi-qom-qom.h" #include "qapi/visitor.h" #include "qapi/qmp/qerror.h" #include "qemu/main-loop.h" @@ -90,7 +91,8 @@ static char *rng_random_get_filename(Object *obj, Error **errp) return g_strdup(s->filename); } -static bool rng_random_config(Object *obj, const char *filename, Error **errp) +bool qom_rng_random_config(Object *obj, bool has_filename, + const char *filename, Error **errp) { RngRandom *s = RNG_RANDOM(obj); @@ -100,17 +102,6 @@ static bool rng_random_config(Object *obj, const char *filename, Error **errp) return true; } -static bool rng_random_marshal_config(Object *obj, Visitor *v, Error **errp) -{ - g_autofree char *filename = NULL; - - if (!visit_type_str(v, "filename", &filename, errp)) { - return false; - } - - return rng_random_config(obj, filename, errp); -} - static void rng_random_init(Object *obj) { RngRandom *s = RNG_RANDOM(obj); @@ -148,7 +139,7 @@ static const TypeInfo rng_random_info = { .instance_size = sizeof(RngRandom), .class_init = rng_random_class_init, .instance_init = rng_random_init, - .instance_config = rng_random_marshal_config, + .instance_config = qom_rng_random_marshal_config, .instance_finalize = rng_random_finalize, }; diff --git a/backends/rng.c b/backends/rng.c index 840daf0392..d560bd7b5d 100644 --- a/backends/rng.c +++ b/backends/rng.c @@ -13,6 +13,7 @@ #include "qemu/osdep.h" #include "sysemu/rng.h" #include "qapi/error.h" +#include "qapi/qapi-qom-qom.h" #include "qapi/qmp/qerror.h" #include "qemu/module.h" #include "qom/object_interfaces.h" @@ -77,24 +78,14 @@ static void rng_backend_complete(UserCreatable *uc, Error **errp) rng_backend_prop_set_opened(OBJECT(uc), true, errp); } -static bool rng_backend_config(Object *obj, bool opened, Error **errp) +bool qom_rng_backend_config(Object *obj, bool has_opened, bool opened, + Error **errp) { ERRP_GUARD(); rng_backend_prop_set_opened(obj, opened, errp); return *errp == NULL; } -static bool rng_backend_marshal_config(Object *obj, Visitor *v, Error **errp) -{ - bool opened; - - if (!visit_type_bool(v, "opened", &opened, errp)) { - return false; - } - - return rng_backend_config(obj, opened, errp); -} - static void rng_backend_free_request(RngRequest *req) { g_free(req->data); @@ -148,7 +139,7 @@ static const TypeInfo rng_backend_info = { .parent = TYPE_OBJECT, .instance_size = sizeof(RngBackend), .instance_init = rng_backend_init, - .instance_config = rng_backend_marshal_config, + .instance_config = qom_rng_backend_marshal_config, .instance_finalize = rng_backend_finalize, .class_size = sizeof(RngBackendClass), .class_init = rng_backend_class_init, diff --git a/scripts/qapi/main.py b/scripts/qapi/main.py index f2ea6e0ce4..b6b4a4a74d 100644 --- a/scripts/qapi/main.py +++ b/scripts/qapi/main.py @@ -16,6 +16,7 @@ from .error import QAPIError from .events import gen_events from .introspect import gen_introspect +from .qom import gen_qom from .schema import QAPISchema from .types import gen_types from .visit import gen_visit @@ -52,6 +53,7 @@ def generate(schema_file: str, gen_commands(schema, output_dir, prefix) gen_events(schema, output_dir, prefix) gen_introspect(schema, output_dir, prefix, unmask) + gen_qom(schema, output_dir, prefix) def main() -> int: diff --git a/scripts/qapi/qom.py b/scripts/qapi/qom.py new file mode 100644 index 0000000000..1cca94890f --- /dev/null +++ b/scripts/qapi/qom.py @@ -0,0 +1,91 @@ +""" +QAPI QOM boilerplate generator + +Copyright (c) 2021 Red Hat Inc. + +Authors: + Kevin Wolf + +This work is licensed under the terms of the GNU GPL, version 2. +See the COPYING file in the top-level directory. +""" + +from .common import c_name, mcgen +from .gen import ( + build_params, + QAPISchemaModularCVisitor, +) +from .schema import ( + QAPISchema, + QAPISchemaClass, +) + + +def gen_config_decl(c: QAPISchemaClass) -> str: + params = build_params(c.config_type, c.config_boxed, 'Error **errp') + return mcgen(''' +bool qom_%(name)s_marshal_config(Object *obj, Visitor *v, Error **errp); +bool qom_%(name)s_config(Object *obj, %(params)s); +''', name=c.c_name(), params=params) + + +def gen_config_call(c: QAPISchemaClass) -> str: + if c.config_boxed: + argstr = '&config, ' + else: + assert not c.config_type.variants + argstr = '' + for m in c.config_type.members: + if m.optional: + argstr += 'config.has_%s, ' % c_name(m.name) + argstr += 'config.%s, ' % c_name(m.name) + + return f'qom_{c.c_name()}_config(obj, {argstr}errp)' + +def gen_config(c: QAPISchemaClass) -> str: + return mcgen(''' +bool qom_%(qom_type)s_marshal_config(Object *obj, Visitor *v, Error **errp) +{ + %(config_name)s config = {0}; + + if (!visit_type_%(config_name)s_members(v, &config, errp)) { + return false; + } + + return %(call)s; +} + +''', qom_type=c.c_name(), config_name=c.config_type.c_name(), + call=gen_config_call(c)) + + +class QAPISchemaGenQOMVisitor(QAPISchemaModularCVisitor): + + def __init__(self, prefix: str): + super().__init__( + prefix, 'qapi-qom', ' * Schema-defined QOM types', + None, __doc__) + + def _begin_user_module(self, name: str) -> None: + qom = self._module_basename('qapi-qom', name) + types = self._module_basename('qapi-types', name) + visit = self._module_basename('qapi-visit', name) + self._genc.add(mcgen(''' +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "%(qom)s.h" +#include "%(types)s.h" +#include "%(visit)s.h" + +''', types=types, visit=visit, qom=qom)) + + def visit_class(self, c: QAPISchemaClass) -> None: + if c.config_type: + self._genh.add(gen_config_decl(c)) + self._genc.add(gen_config(c)) + + +def gen_qom(schema: QAPISchema, output_dir: str, prefix: str) -> None: + vis = QAPISchemaGenQOMVisitor(prefix) + schema.visit(vis) + vis.write(output_dir) diff --git a/qapi/meson.build b/qapi/meson.build index c356a385e3..10c412f1ad 100644 --- a/qapi/meson.build +++ b/qapi/meson.build @@ -87,6 +87,7 @@ qapi_nonmodule_outputs = [ 'qapi-init-commands.h', 'qapi-init-commands.c', 'qapi-events.h', 'qapi-events.c', 'qapi-emit-events.c', 'qapi-emit-events.h', + 'qapi-qom.h', 'qapi-qom.c', ] # First build all sources @@ -111,6 +112,8 @@ foreach module : qapi_all_modules 'qapi-events-@0@.h'.format(module), 'qapi-commands-@0@.c'.format(module), 'qapi-commands-@0@.h'.format(module), + 'qapi-qom-@0@.c'.format(module), + 'qapi-qom-@0@.h'.format(module), ] endif if module.endswith('-target') -- 2.31.1