Browse Source

qapi: Tools for sets of special feature flags in generated code

New enum QapiSpecialFeature enumerates the special feature flags.

New helper gen_special_features() returns code to represent a
collection of special feature flags as a bitset.

The next few commits will put them to use.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Message-Id: <20211028102520.747396-5-armbru@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Markus Armbruster 3 năm trước cách đây
mục cha
commit
c67db1ed16

+ 4 - 0
include/qapi/util.h

@@ -11,6 +11,10 @@
 #ifndef QAPI_UTIL_H
 #ifndef QAPI_UTIL_H
 #define QAPI_UTIL_H
 #define QAPI_UTIL_H
 
 
+typedef enum {
+    QAPI_DEPRECATED,
+} QapiSpecialFeature;
+
 /* QEnumLookup flags */
 /* QEnumLookup flags */
 #define QAPI_ENUM_DEPRECATED 1
 #define QAPI_ENUM_DEPRECATED 1
 
 

+ 8 - 0
scripts/qapi/gen.py

@@ -18,6 +18,7 @@
     Dict,
     Dict,
     Iterator,
     Iterator,
     Optional,
     Optional,
+    Sequence,
     Tuple,
     Tuple,
 )
 )
 
 
@@ -29,6 +30,7 @@
     mcgen,
     mcgen,
 )
 )
 from .schema import (
 from .schema import (
+    QAPISchemaFeature,
     QAPISchemaIfCond,
     QAPISchemaIfCond,
     QAPISchemaModule,
     QAPISchemaModule,
     QAPISchemaObjectType,
     QAPISchemaObjectType,
@@ -37,6 +39,12 @@
 from .source import QAPISourceInfo
 from .source import QAPISourceInfo
 
 
 
 
+def gen_special_features(features: Sequence[QAPISchemaFeature]) -> str:
+    special_features = [f"1u << QAPI_{feat.name.upper()}"
+                        for feat in features if feat.is_special()]
+    return ' | '.join(special_features) or '0'
+
+
 class QAPIGen:
 class QAPIGen:
     def __init__(self, fname: str):
     def __init__(self, fname: str):
         self.fname = fname
         self.fname = fname

+ 3 - 0
scripts/qapi/schema.py

@@ -725,6 +725,9 @@ def connect_doc(self, doc):
 class QAPISchemaFeature(QAPISchemaMember):
 class QAPISchemaFeature(QAPISchemaMember):
     role = 'feature'
     role = 'feature'
 
 
+    def is_special(self):
+        return self.name in ('deprecated')
+
 
 
 class QAPISchemaObjectTypeMember(QAPISchemaMember):
 class QAPISchemaObjectTypeMember(QAPISchemaMember):
     def __init__(self, name, info, typ, optional, ifcond=None, features=None):
     def __init__(self, name, info, typ, optional, ifcond=None, features=None):