From: Kevin Wolf <kwolf@redhat.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, berrange@redhat.com, ehabkost@redhat.com,
armbru@redhat.com, pbonzini@redhat.com, eblake@redhat.com
Subject: [RFC PATCH 08/12] qapi: Create qom-config:... type for classes
Date: Wed, 3 Nov 2021 18:29:58 +0100 [thread overview]
Message-ID: <20211103173002.209906-9-kwolf@redhat.com> (raw)
In-Reply-To: <20211103173002.209906-1-kwolf@redhat.com>
For every class that has a 'config' definition, a corresponding
'qom-config:$QOM_TYPE' type is automatically created that contains the
configuration for the class and all of its parent classes.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
scripts/qapi/schema.py | 60 +++++++++++++++++++++++++++++++++++-------
1 file changed, 50 insertions(+), 10 deletions(-)
diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py
index ebf69341d7..79db42b810 100644
--- a/scripts/qapi/schema.py
+++ b/scripts/qapi/schema.py
@@ -761,6 +761,13 @@ def connect_doc(self, doc):
for f in self.features:
doc.connect_feature(f)
+ def clone(self):
+ features = [QAPISchemaFeature(f.name, f.info, f.ifcond)
+ for f in self.features]
+ return QAPISchemaObjectTypeMember(
+ self.name, self.info, self._type_name, self.optional,
+ self.ifcond, features)
+
class QAPISchemaVariant(QAPISchemaObjectTypeMember):
role = 'branch'
@@ -783,17 +790,11 @@ def __init__(self, name, info, doc, ifcond, features, parent,
self._config_type_name = config_type
self.config_type = None
self.config_boxed = config_boxed
+ self.full_config_type = None
- def check(self, schema):
- super().check(schema)
-
- if self._parent_name:
- self.parent = schema.lookup_entity(self._parent_name,
- QAPISchemaClass)
- if not self.parent:
- raise QAPISemError(
- self.info,
- "Unknown parent class '%s'" % self._parent_name)
+ def get_qom_config_type(self, schema):
+ if self.full_config_type:
+ return self.full_config_type
if self._config_type_name:
self.config_type = schema.resolve_type(
@@ -809,6 +810,40 @@ def check(self, schema):
"class 'config' can take %s only with 'boxed': true"
% self.config_type.describe())
+ # FIXME That's a bit ugly
+ self.config_type.check(schema)
+ members = [m.clone() for m in self.config_type.members]
+ else:
+ members = []
+
+ if self._parent_name:
+ self.parent = schema.lookup_entity(self._parent_name,
+ QAPISchemaClass)
+ if not self.parent:
+ raise QAPISemError(
+ self.info,
+ "Unknown parent class '%s'" % self._parent_name)
+
+ self.parent.get_qom_config_type(schema)
+ members += [m.clone() for m in self.parent.config_type.members]
+
+ self.full_config_type = QAPISchemaObjectType(
+ f"qom-config:{self.name}", self.info, None, self._ifcond,
+ self.features, None, members, None)
+
+ return self.full_config_type
+
+ def check(self, schema):
+ super().check(schema)
+ assert self.full_config_type
+
+ def connect_doc(self, doc=None):
+ super().connect_doc(doc)
+ doc = doc or self.doc
+ if doc:
+ if self.config_type and self.config_type.is_implicit():
+ self.config_type.connect_doc(doc)
+
def visit(self, visitor):
super().visit(visitor)
visitor.visit_class(self)
@@ -1236,6 +1271,11 @@ def _def_exprs(self, exprs):
else:
assert False
+ classes = [c for c in self._entity_list
+ if isinstance(c,QAPISchemaClass)]
+ for c in classes:
+ self._def_entity(c.get_qom_config_type(self))
+
def check(self):
for ent in self._entity_list:
ent.check(self)
--
2.31.1
next prev parent reply other threads:[~2021-11-03 17:45 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-03 17:29 [RFC PATCH 00/12] QOM/QAPI integration part 1 Kevin Wolf
2021-11-03 17:29 ` [RFC PATCH 01/12] qapi: Add visit_next_struct_member() Kevin Wolf
2021-11-03 17:29 ` [RFC PATCH 02/12] qom: Create object_configure() Kevin Wolf
2021-11-23 15:23 ` Markus Armbruster
2021-12-14 9:52 ` Kevin Wolf
2021-11-03 17:29 ` [RFC PATCH 03/12] qom: Make object_configure() public Kevin Wolf
2021-11-03 17:29 ` [RFC PATCH 04/12] qom: Add instance_config() to TypeInfo Kevin Wolf
2021-11-03 17:29 ` [RFC PATCH 05/12] rng-random: Implement .instance_config Kevin Wolf
2021-11-03 17:29 ` [RFC PATCH 06/12] rng-backend: " Kevin Wolf
2021-11-03 17:29 ` [RFC PATCH 07/12] qapi: Allow defining QOM classes Kevin Wolf
2021-11-23 10:02 ` Markus Armbruster
2021-12-10 17:53 ` Kevin Wolf
2021-11-03 17:29 ` Kevin Wolf [this message]
2021-11-23 13:00 ` [RFC PATCH 08/12] qapi: Create qom-config:... type for classes Markus Armbruster
2021-12-10 17:41 ` Kevin Wolf
2021-11-03 17:29 ` [RFC PATCH 09/12] qapi/qom: Convert rng-backend/random to class Kevin Wolf
2021-11-23 13:15 ` Markus Armbruster
2021-12-10 17:57 ` Kevin Wolf
2021-11-03 17:30 ` [RFC PATCH 10/12] qapi: Generate QOM config marshalling code Kevin Wolf
2021-11-23 14:16 ` Markus Armbruster
2021-12-10 16:50 ` Kevin Wolf
2021-11-03 17:30 ` [RFC PATCH 11/12] qapi/qom: Add class definition for rng-builtin Kevin Wolf
2021-11-03 17:30 ` [RFC PATCH 12/12] qapi/qom: Add class definition for rng-egd Kevin Wolf
2021-11-03 21:26 ` [RFC PATCH 00/12] QOM/QAPI integration part 1 Paolo Bonzini
2021-11-04 9:07 ` Kevin Wolf
2021-11-04 12:39 ` Paolo Bonzini
2021-11-04 14:26 ` Kevin Wolf
2021-11-04 14:49 ` Paolo Bonzini
2021-11-04 15:51 ` Kevin Wolf
2021-11-04 15:52 ` Damien Hedde
2021-11-05 13:55 ` Kevin Wolf
2021-11-23 16:05 ` Markus Armbruster
2021-12-14 10:23 ` Kevin Wolf
2021-12-14 10:40 ` Peter Maydell
2021-12-14 11:52 ` Kevin Wolf
2021-12-14 14:45 ` Markus Armbruster
2021-12-14 16:00 ` Kevin Wolf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211103173002.209906-9-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=eblake@redhat.com \
--cc=ehabkost@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.