* [PULL 0/7] QAPI patches patches for 2022-04-21
@ 2022-04-21 14:31 Markus Armbruster
2022-04-21 14:31 ` [PULL 1/7] qapi-schema: support alternates with array type Markus Armbruster
` (7 more replies)
0 siblings, 8 replies; 9+ messages in thread
From: Markus Armbruster @ 2022-04-21 14:31 UTC (permalink / raw)
To: qemu-devel; +Cc: richard.henderson
The following changes since commit 9c125d17e9402c232c46610802e5931b3639d77b:
Merge tag 'pull-tcg-20220420' of https://gitlab.com/rth7680/qemu into staging (2022-04-20 16:43:11 -0700)
are available in the Git repository at:
git://repo.or.cz/qemu/armbru.git tags/pull-qapi-2022-04-21
for you to fetch changes up to de7371bc7c39ccacb963acb5129b261087967070:
qapi: Fix version of cpu0-id field (2022-04-21 10:23:06 +0200)
----------------------------------------------------------------
QAPI patches patches for 2022-04-21
----------------------------------------------------------------
Andrea Bolognani (3):
docs: qapi: Remove outdated reference to simple unions
qapi: Fix documentation for query-xen-replication-status
qapi: Fix typo
Dov Murik (1):
qapi: Fix version of cpu0-id field
Paolo Bonzini (3):
qapi-schema: support alternates with array type
qapi-schema: test: add a qapi-schema-test for array alternates
qapi-schema: test: add a unit test for parsing array alternates
docs/devel/qapi-code-gen.rst | 4 +--
qapi/migration.json | 2 +-
qapi/misc-target.json | 2 +-
qapi/sockets.json | 2 +-
tests/unit/test-qobject-input-visitor.c | 40 +++++++++++++++++++++++++
scripts/qapi/expr.py | 2 +-
scripts/qapi/schema.py | 4 +++
tests/qapi-schema/alternate-array.err | 2 --
tests/qapi-schema/alternate-array.json | 2 --
tests/qapi-schema/alternate-array.out | 18 +++++++++++
tests/qapi-schema/alternate-conflict-lists.err | 2 ++
tests/qapi-schema/alternate-conflict-lists.json | 6 ++++
tests/qapi-schema/alternate-conflict-lists.out | 0
tests/qapi-schema/meson.build | 1 +
tests/qapi-schema/qapi-schema-test.json | 1 +
tests/qapi-schema/qapi-schema-test.out | 4 +++
16 files changed, 82 insertions(+), 10 deletions(-)
create mode 100644 tests/qapi-schema/alternate-conflict-lists.err
create mode 100644 tests/qapi-schema/alternate-conflict-lists.json
create mode 100644 tests/qapi-schema/alternate-conflict-lists.out
--
2.35.1
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PULL 1/7] qapi-schema: support alternates with array type
2022-04-21 14:31 [PULL 0/7] QAPI patches patches for 2022-04-21 Markus Armbruster
@ 2022-04-21 14:31 ` Markus Armbruster
2022-04-21 14:31 ` [PULL 2/7] qapi-schema: test: add a qapi-schema-test for array alternates Markus Armbruster
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Markus Armbruster @ 2022-04-21 14:31 UTC (permalink / raw)
To: qemu-devel; +Cc: Paolo Bonzini, richard.henderson
From: Paolo Bonzini <pbonzini@redhat.com>
Detect array types as alternate branches, and turn the JSON list into
a QAPISchemaArrayType. Array types in an alternate are represented with
QTYPE_QLIST in the type field.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20220321164243.200569-2-pbonzini@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
scripts/qapi/expr.py | 2 +-
scripts/qapi/schema.py | 4 ++++
tests/qapi-schema/alternate-array.err | 2 --
tests/qapi-schema/alternate-array.json | 2 --
tests/qapi-schema/alternate-array.out | 18 ++++++++++++++++++
5 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/scripts/qapi/expr.py b/scripts/qapi/expr.py
index 3cb389e875..48578e1698 100644
--- a/scripts/qapi/expr.py
+++ b/scripts/qapi/expr.py
@@ -554,7 +554,7 @@ def check_alternate(expr: _JSONObject, info: QAPISourceInfo) -> None:
check_name_lower(key, info, source)
check_keys(value, info, source, ['type'], ['if'])
check_if(value, info, source)
- check_type(value['type'], info, source)
+ check_type(value['type'], info, source, allow_array=True)
def check_command(expr: _JSONObject, info: QAPISourceInfo) -> None:
diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py
index b7b3fc0ce4..3728340c37 100644
--- a/scripts/qapi/schema.py
+++ b/scripts/qapi/schema.py
@@ -243,6 +243,7 @@ def alternate_qtype(self):
'number': 'QTYPE_QNUM',
'int': 'QTYPE_QNUM',
'boolean': 'QTYPE_QBOOL',
+ 'array': 'QTYPE_QLIST',
'object': 'QTYPE_QDICT'
}
return json2qtype.get(self.json_type())
@@ -1069,6 +1070,9 @@ def _def_struct_type(self, expr, info, doc):
None))
def _make_variant(self, case, typ, ifcond, info):
+ if isinstance(typ, list):
+ assert len(typ) == 1
+ typ = self._make_array_type(typ[0], info)
return QAPISchemaVariant(case, info, typ, ifcond)
def _def_union_type(self, expr, info, doc):
diff --git a/tests/qapi-schema/alternate-array.err b/tests/qapi-schema/alternate-array.err
index b1aa1f4e8d..e69de29bb2 100644
--- a/tests/qapi-schema/alternate-array.err
+++ b/tests/qapi-schema/alternate-array.err
@@ -1,2 +0,0 @@
-alternate-array.json: In alternate 'Alt':
-alternate-array.json:5: 'data' member 'two' cannot be an array
diff --git a/tests/qapi-schema/alternate-array.json b/tests/qapi-schema/alternate-array.json
index f241aac122..b878a2db77 100644
--- a/tests/qapi-schema/alternate-array.json
+++ b/tests/qapi-schema/alternate-array.json
@@ -1,5 +1,3 @@
-# we do not allow array branches in alternates
-# TODO: should we support this?
{ 'struct': 'One',
'data': { 'name': 'str' } }
{ 'alternate': 'Alt',
diff --git a/tests/qapi-schema/alternate-array.out b/tests/qapi-schema/alternate-array.out
index e69de29bb2..a657d85738 100644
--- a/tests/qapi-schema/alternate-array.out
+++ b/tests/qapi-schema/alternate-array.out
@@ -0,0 +1,18 @@
+module ./builtin
+object q_empty
+enum QType
+ prefix QTYPE
+ member none
+ member qnull
+ member qnum
+ member qstring
+ member qdict
+ member qlist
+ member qbool
+module alternate-array.json
+object One
+ member name: str optional=False
+alternate Alt
+ tag type
+ case one: One
+ case two: intList
--
2.35.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PULL 2/7] qapi-schema: test: add a qapi-schema-test for array alternates
2022-04-21 14:31 [PULL 0/7] QAPI patches patches for 2022-04-21 Markus Armbruster
2022-04-21 14:31 ` [PULL 1/7] qapi-schema: support alternates with array type Markus Armbruster
@ 2022-04-21 14:31 ` Markus Armbruster
2022-04-21 14:31 ` [PULL 3/7] qapi-schema: test: add a unit test for parsing " Markus Armbruster
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Markus Armbruster @ 2022-04-21 14:31 UTC (permalink / raw)
To: qemu-devel; +Cc: Paolo Bonzini, richard.henderson
From: Paolo Bonzini <pbonzini@redhat.com>
Check that conflicts among array alternates are detected correctly.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20220321164243.200569-3-pbonzini@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
[Expected test output alternate-conflict-lists.json corrected]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
tests/qapi-schema/alternate-conflict-lists.err | 2 ++
tests/qapi-schema/alternate-conflict-lists.json | 6 ++++++
tests/qapi-schema/alternate-conflict-lists.out | 0
tests/qapi-schema/meson.build | 1 +
4 files changed, 9 insertions(+)
create mode 100644 tests/qapi-schema/alternate-conflict-lists.err
create mode 100644 tests/qapi-schema/alternate-conflict-lists.json
create mode 100644 tests/qapi-schema/alternate-conflict-lists.out
diff --git a/tests/qapi-schema/alternate-conflict-lists.err b/tests/qapi-schema/alternate-conflict-lists.err
new file mode 100644
index 0000000000..f3374ec1e7
--- /dev/null
+++ b/tests/qapi-schema/alternate-conflict-lists.err
@@ -0,0 +1,2 @@
+alternate-conflict-lists.json: In alternate 'Alt':
+alternate-conflict-lists.json:4: branch 'two' can't be distinguished from 'one'
diff --git a/tests/qapi-schema/alternate-conflict-lists.json b/tests/qapi-schema/alternate-conflict-lists.json
new file mode 100644
index 0000000000..a3efd6c501
--- /dev/null
+++ b/tests/qapi-schema/alternate-conflict-lists.json
@@ -0,0 +1,6 @@
+# Two lists conflict even if their inner types would be compatible
+{ 'struct': 'One',
+ 'data': { 'name': 'str' } }
+{ 'alternate': 'Alt',
+ 'data': { 'one': [ 'int' ],
+ 'two': [ 'str' ] } }
diff --git a/tests/qapi-schema/alternate-conflict-lists.out b/tests/qapi-schema/alternate-conflict-lists.out
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/qapi-schema/meson.build b/tests/qapi-schema/meson.build
index caf0791ba8..c18dd7d02f 100644
--- a/tests/qapi-schema/meson.build
+++ b/tests/qapi-schema/meson.build
@@ -11,6 +11,7 @@ schemas = [
'alternate-conflict-dict.json',
'alternate-conflict-enum-bool.json',
'alternate-conflict-enum-int.json',
+ 'alternate-conflict-lists.json',
'alternate-conflict-string.json',
'alternate-conflict-bool-string.json',
'alternate-conflict-num-string.json',
--
2.35.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PULL 3/7] qapi-schema: test: add a unit test for parsing array alternates
2022-04-21 14:31 [PULL 0/7] QAPI patches patches for 2022-04-21 Markus Armbruster
2022-04-21 14:31 ` [PULL 1/7] qapi-schema: support alternates with array type Markus Armbruster
2022-04-21 14:31 ` [PULL 2/7] qapi-schema: test: add a qapi-schema-test for array alternates Markus Armbruster
@ 2022-04-21 14:31 ` Markus Armbruster
2022-04-21 14:31 ` [PULL 4/7] docs: qapi: Remove outdated reference to simple unions Markus Armbruster
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Markus Armbruster @ 2022-04-21 14:31 UTC (permalink / raw)
To: qemu-devel; +Cc: Paolo Bonzini, richard.henderson
From: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20220321164243.200569-4-pbonzini@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
[Dead code dropped in test_visitor_in_alternate_list()]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
tests/unit/test-qobject-input-visitor.c | 40 +++++++++++++++++++++++++
tests/qapi-schema/qapi-schema-test.json | 1 +
tests/qapi-schema/qapi-schema-test.out | 4 +++
3 files changed, 45 insertions(+)
diff --git a/tests/unit/test-qobject-input-visitor.c b/tests/unit/test-qobject-input-visitor.c
index aed08eaebc..14329dabcf 100644
--- a/tests/unit/test-qobject-input-visitor.c
+++ b/tests/unit/test-qobject-input-visitor.c
@@ -775,6 +775,7 @@ static void test_visitor_in_alternate_number(TestInputVisitorData *data,
AltEnumNum *aen;
AltNumEnum *ans;
AltEnumInt *asi;
+ AltListInt *ali;
/* Parsing an int */
@@ -801,6 +802,12 @@ static void test_visitor_in_alternate_number(TestInputVisitorData *data,
g_assert_cmpint(asi->u.i, ==, 42);
qapi_free_AltEnumInt(asi);
+ v = visitor_input_test_init(data, "42");
+ visit_type_AltListInt(v, NULL, &ali, &error_abort);
+ g_assert_cmpint(ali->type, ==, QTYPE_QNUM);
+ g_assert_cmpint(ali->u.i, ==, 42);
+ qapi_free_AltListInt(ali);
+
/* Parsing a double */
v = visitor_input_test_init(data, "42.5");
@@ -826,6 +833,37 @@ static void test_visitor_in_alternate_number(TestInputVisitorData *data,
qapi_free_AltEnumInt(asi);
}
+static void test_visitor_in_alternate_list(TestInputVisitorData *data,
+ const void *unused)
+{
+ intList *item;
+ Visitor *v;
+ AltListInt *ali;
+ int i;
+
+ v = visitor_input_test_init(data, "[ 42, 43, 44 ]");
+ visit_type_AltListInt(v, NULL, &ali, &error_abort);
+ g_assert(ali != NULL);
+
+ g_assert_cmpint(ali->type, ==, QTYPE_QLIST);
+ for (i = 0, item = ali->u.l; item; item = item->next, i++) {
+ g_assert_cmpint(item->value, ==, 42 + i);
+ }
+
+ qapi_free_AltListInt(ali);
+ ali = NULL;
+
+ /* An empty list is valid */
+ v = visitor_input_test_init(data, "[]");
+ visit_type_AltListInt(v, NULL, &ali, &error_abort);
+ g_assert(ali != NULL);
+
+ g_assert_cmpint(ali->type, ==, QTYPE_QLIST);
+ g_assert(!ali->u.l);
+ qapi_free_AltListInt(ali);
+ ali = NULL;
+}
+
static void input_visitor_test_add(const char *testpath,
const void *user_data,
void (*test_func)(TestInputVisitorData *data,
@@ -1187,6 +1225,8 @@ int main(int argc, char **argv)
NULL, test_visitor_in_wrong_type);
input_visitor_test_add("/visitor/input/alternate-number",
NULL, test_visitor_in_alternate_number);
+ input_visitor_test_add("/visitor/input/alternate-list",
+ NULL, test_visitor_in_alternate_list);
input_visitor_test_add("/visitor/input/fail/struct",
NULL, test_visitor_in_fail_struct);
input_visitor_test_add("/visitor/input/fail/struct-nested",
diff --git a/tests/qapi-schema/qapi-schema-test.json b/tests/qapi-schema/qapi-schema-test.json
index 43b8697002..ba7302f42b 100644
--- a/tests/qapi-schema/qapi-schema-test.json
+++ b/tests/qapi-schema/qapi-schema-test.json
@@ -119,6 +119,7 @@
{ 'alternate': 'AltEnumNum', 'data': { 'e': 'EnumOne', 'n': 'number' } }
{ 'alternate': 'AltNumEnum', 'data': { 'n': 'number', 'e': 'EnumOne' } }
{ 'alternate': 'AltEnumInt', 'data': { 'e': 'EnumOne', 'i': 'int' } }
+{ 'alternate': 'AltListInt', 'data': { 'l': ['int'], 'i': 'int' } }
# for testing use of 'str' within alternates
{ 'alternate': 'AltStrObj', 'data': { 's': 'str', 'o': 'TestStruct' } }
diff --git a/tests/qapi-schema/qapi-schema-test.out b/tests/qapi-schema/qapi-schema-test.out
index 1f9585fa9b..043d75c655 100644
--- a/tests/qapi-schema/qapi-schema-test.out
+++ b/tests/qapi-schema/qapi-schema-test.out
@@ -121,6 +121,10 @@ alternate AltEnumInt
tag type
case e: EnumOne
case i: int
+alternate AltListInt
+ tag type
+ case l: intList
+ case i: int
alternate AltStrObj
tag type
case s: str
--
2.35.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PULL 4/7] docs: qapi: Remove outdated reference to simple unions
2022-04-21 14:31 [PULL 0/7] QAPI patches patches for 2022-04-21 Markus Armbruster
` (2 preceding siblings ...)
2022-04-21 14:31 ` [PULL 3/7] qapi-schema: test: add a unit test for parsing " Markus Armbruster
@ 2022-04-21 14:31 ` Markus Armbruster
2022-04-21 14:31 ` [PULL 5/7] qapi: Fix documentation for query-xen-replication-status Markus Armbruster
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Markus Armbruster @ 2022-04-21 14:31 UTC (permalink / raw)
To: qemu-devel; +Cc: richard.henderson, Andrea Bolognani
From: Andrea Bolognani <abologna@redhat.com>
Commit 4e99f4b12c0e dropped simple unions and updated most
documentation accordingly, but in one case we still claim that
there are "two flavors of unions".
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Message-Id: <20220420153408.243584-2-abologna@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
docs/devel/qapi-code-gen.rst | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/devel/qapi-code-gen.rst b/docs/devel/qapi-code-gen.rst
index 246709ede8..7b968433a6 100644
--- a/docs/devel/qapi-code-gen.rst
+++ b/docs/devel/qapi-code-gen.rst
@@ -41,8 +41,8 @@ used internally.
There are several kinds of types: simple types (a number of built-in
types, such as ``int`` and ``str``; as well as enumerations), arrays,
-complex types (structs and two flavors of unions), and alternate types
-(a choice between other types).
+complex types (structs and unions), and alternate types (a choice
+between other types).
Schema syntax
--
2.35.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PULL 5/7] qapi: Fix documentation for query-xen-replication-status
2022-04-21 14:31 [PULL 0/7] QAPI patches patches for 2022-04-21 Markus Armbruster
` (3 preceding siblings ...)
2022-04-21 14:31 ` [PULL 4/7] docs: qapi: Remove outdated reference to simple unions Markus Armbruster
@ 2022-04-21 14:31 ` Markus Armbruster
2022-04-21 14:31 ` [PULL 6/7] qapi: Fix typo Markus Armbruster
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Markus Armbruster @ 2022-04-21 14:31 UTC (permalink / raw)
To: qemu-devel; +Cc: richard.henderson, Andrea Bolognani, Dr . David Alan Gilbert
From: Andrea Bolognani <abologna@redhat.com>
The correct return type is ReplicationStatus, not
ReplicationResult.
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Message-Id: <20220420153408.243584-3-abologna@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
qapi/migration.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/qapi/migration.json b/qapi/migration.json
index 27d7b28158..409eb086a2 100644
--- a/qapi/migration.json
+++ b/qapi/migration.json
@@ -1619,7 +1619,7 @@
#
# Query replication status while the vm is running.
#
-# Returns: A @ReplicationResult object showing the status.
+# Returns: A @ReplicationStatus object showing the status.
#
# Example:
#
--
2.35.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PULL 6/7] qapi: Fix typo
2022-04-21 14:31 [PULL 0/7] QAPI patches patches for 2022-04-21 Markus Armbruster
` (4 preceding siblings ...)
2022-04-21 14:31 ` [PULL 5/7] qapi: Fix documentation for query-xen-replication-status Markus Armbruster
@ 2022-04-21 14:31 ` Markus Armbruster
2022-04-21 14:31 ` [PULL 7/7] qapi: Fix version of cpu0-id field Markus Armbruster
2022-04-21 22:15 ` [PULL 0/7] QAPI patches patches for 2022-04-21 Richard Henderson
7 siblings, 0 replies; 9+ messages in thread
From: Markus Armbruster @ 2022-04-21 14:31 UTC (permalink / raw)
To: qemu-devel; +Cc: richard.henderson, Andrea Bolognani
From: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Message-Id: <20220420153408.243584-4-abologna@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
qapi/sockets.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/qapi/sockets.json b/qapi/sockets.json
index 5773d9fcc4..fccc38584b 100644
--- a/qapi/sockets.json
+++ b/qapi/sockets.json
@@ -149,7 +149,7 @@
#
# Note: This type is deprecated in favor of SocketAddress. The
# difference between SocketAddressLegacy and SocketAddress is that the
-# latter is has fewer {} on the wire.
+# latter has fewer {} on the wire.
#
# Since: 1.3
##
--
2.35.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PULL 7/7] qapi: Fix version of cpu0-id field
2022-04-21 14:31 [PULL 0/7] QAPI patches patches for 2022-04-21 Markus Armbruster
` (5 preceding siblings ...)
2022-04-21 14:31 ` [PULL 6/7] qapi: Fix typo Markus Armbruster
@ 2022-04-21 14:31 ` Markus Armbruster
2022-04-21 22:15 ` [PULL 0/7] QAPI patches patches for 2022-04-21 Richard Henderson
7 siblings, 0 replies; 9+ messages in thread
From: Markus Armbruster @ 2022-04-21 14:31 UTC (permalink / raw)
To: qemu-devel; +Cc: Dov Murik, richard.henderson
From: Dov Murik <dovmurik@linux.ibm.com>
Commit 811b4ec7f8eb ("qapi, target/i386/sev: Add cpu0-id to
query-sev-capabilities") wrongly stated that the new field is available
since version 7.0.
Fix the QAPI documentation to state that the cpu0-id field is included
since 7.1.
Signed-off-by: Dov Murik <dovmurik@linux.ibm.com>
Message-Id: <20220420190129.3532623-1-dovmurik@linux.ibm.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
qapi/misc-target.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/qapi/misc-target.json b/qapi/misc-target.json
index bc9355b595..ed4a468aab 100644
--- a/qapi/misc-target.json
+++ b/qapi/misc-target.json
@@ -144,7 +144,7 @@
#
# @cert-chain: PDH certificate chain (base64 encoded)
#
-# @cpu0-id: Unique ID of CPU0 (base64 encoded) (since 7.0)
+# @cpu0-id: Unique ID of CPU0 (base64 encoded) (since 7.1)
#
# @cbitpos: C-bit location in page table entry
#
--
2.35.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PULL 0/7] QAPI patches patches for 2022-04-21
2022-04-21 14:31 [PULL 0/7] QAPI patches patches for 2022-04-21 Markus Armbruster
` (6 preceding siblings ...)
2022-04-21 14:31 ` [PULL 7/7] qapi: Fix version of cpu0-id field Markus Armbruster
@ 2022-04-21 22:15 ` Richard Henderson
7 siblings, 0 replies; 9+ messages in thread
From: Richard Henderson @ 2022-04-21 22:15 UTC (permalink / raw)
To: Markus Armbruster, qemu-devel
On 4/21/22 07:31, Markus Armbruster wrote:
> The following changes since commit 9c125d17e9402c232c46610802e5931b3639d77b:
>
> Merge tag 'pull-tcg-20220420' of https://gitlab.com/rth7680/qemu into staging (2022-04-20 16:43:11 -0700)
>
> are available in the Git repository at:
>
> git://repo.or.cz/qemu/armbru.git tags/pull-qapi-2022-04-21
>
> for you to fetch changes up to de7371bc7c39ccacb963acb5129b261087967070:
>
> qapi: Fix version of cpu0-id field (2022-04-21 10:23:06 +0200)
>
> ----------------------------------------------------------------
> QAPI patches patches for 2022-04-21
Applied, thanks. Please update https://wiki.qemu.org/ChangeLog/7.1 as appropriate.
r~
>
> ----------------------------------------------------------------
> Andrea Bolognani (3):
> docs: qapi: Remove outdated reference to simple unions
> qapi: Fix documentation for query-xen-replication-status
> qapi: Fix typo
>
> Dov Murik (1):
> qapi: Fix version of cpu0-id field
>
> Paolo Bonzini (3):
> qapi-schema: support alternates with array type
> qapi-schema: test: add a qapi-schema-test for array alternates
> qapi-schema: test: add a unit test for parsing array alternates
>
> docs/devel/qapi-code-gen.rst | 4 +--
> qapi/migration.json | 2 +-
> qapi/misc-target.json | 2 +-
> qapi/sockets.json | 2 +-
> tests/unit/test-qobject-input-visitor.c | 40 +++++++++++++++++++++++++
> scripts/qapi/expr.py | 2 +-
> scripts/qapi/schema.py | 4 +++
> tests/qapi-schema/alternate-array.err | 2 --
> tests/qapi-schema/alternate-array.json | 2 --
> tests/qapi-schema/alternate-array.out | 18 +++++++++++
> tests/qapi-schema/alternate-conflict-lists.err | 2 ++
> tests/qapi-schema/alternate-conflict-lists.json | 6 ++++
> tests/qapi-schema/alternate-conflict-lists.out | 0
> tests/qapi-schema/meson.build | 1 +
> tests/qapi-schema/qapi-schema-test.json | 1 +
> tests/qapi-schema/qapi-schema-test.out | 4 +++
> 16 files changed, 82 insertions(+), 10 deletions(-)
> create mode 100644 tests/qapi-schema/alternate-conflict-lists.err
> create mode 100644 tests/qapi-schema/alternate-conflict-lists.json
> create mode 100644 tests/qapi-schema/alternate-conflict-lists.out
>
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2022-04-21 22:17 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-21 14:31 [PULL 0/7] QAPI patches patches for 2022-04-21 Markus Armbruster
2022-04-21 14:31 ` [PULL 1/7] qapi-schema: support alternates with array type Markus Armbruster
2022-04-21 14:31 ` [PULL 2/7] qapi-schema: test: add a qapi-schema-test for array alternates Markus Armbruster
2022-04-21 14:31 ` [PULL 3/7] qapi-schema: test: add a unit test for parsing " Markus Armbruster
2022-04-21 14:31 ` [PULL 4/7] docs: qapi: Remove outdated reference to simple unions Markus Armbruster
2022-04-21 14:31 ` [PULL 5/7] qapi: Fix documentation for query-xen-replication-status Markus Armbruster
2022-04-21 14:31 ` [PULL 6/7] qapi: Fix typo Markus Armbruster
2022-04-21 14:31 ` [PULL 7/7] qapi: Fix version of cpu0-id field Markus Armbruster
2022-04-21 22:15 ` [PULL 0/7] QAPI patches patches for 2022-04-21 Richard Henderson
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.