[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 02/25] qapi: convert NumaOptions into a flat union
From: |
Kővágó, Zoltán |
Subject: |
[Qemu-devel] [PATCH 02/25] qapi: convert NumaOptions into a flat union |
Date: |
Thu, 6 Aug 2015 20:28:14 +0200 |
Signed-off-by: Kővágó, Zoltán <address@hidden>
---
numa.c | 2 +-
qapi-schema.json | 47 ++++++++++++++++++++++++++++++++++++-----------
2 files changed, 37 insertions(+), 12 deletions(-)
diff --git a/numa.c b/numa.c
index 402804b..376f990 100644
--- a/numa.c
+++ b/numa.c
@@ -227,7 +227,7 @@ static int parse_numa(void *opaque, QemuOpts *opts, Error
**errp)
}
switch (object->kind) {
- case NUMA_OPTIONS_KIND_NODE:
+ case NUMA_DRIVER_NODE:
numa_node_parse(object->node, opts, &err);
if (err) {
goto error;
diff --git a/qapi-schema.json b/qapi-schema.json
index 4342a08..999faa3 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -3536,17 +3536,6 @@
'data': { '*console':'int', 'events': [ 'InputEvent' ] } }
##
-# @NumaOptions
-#
-# A discriminated record of NUMA options. (for OptsVisitor)
-#
-# Since 2.1
-##
-{ 'union': 'NumaOptions',
- 'data': {
- 'node': 'NumaNodeOptions' }}
-
-##
# @NumaNodeOptions
#
# Create a guest NUMA node. (for OptsVisitor)
@@ -3573,6 +3562,42 @@
'*memdev': 'str' }}
##
+# @NumaDriver
+#
+# List of possible numa drivers.
+#
+# Since: 2.5
+##
+{ 'enum': 'NumaDriver',
+ 'data': [ 'node' ] }
+
+##
+# @NumaCommonOptions
+#
+# Common set of numa options.
+#
+# @type: the numa driver to use
+#
+# Since: 2.5
+##
+{ 'struct': 'NumaCommonOptions',
+ 'data': {
+ 'type': 'NumaDriver' } }
+
+##
+# @NumaOptions
+#
+# A discriminated record of NUMA options. (for OptsVisitor)
+#
+# Since 2.1
+##
+{ 'union': 'NumaOptions',
+ 'base': 'NumaCommonOptions',
+ 'discriminator': 'type',
+ 'data': {
+ 'node': 'NumaNodeOptions' }}
+
+##
# @HostMemPolicy
#
# Host memory policy types
--
2.4.5
- [Qemu-devel] [PATCH 00/25] audio: -audiodev option, multiple options, Kővágó, Zoltán, 2015/08/06
- [Qemu-devel] [PATCH 02/25] qapi: convert NumaOptions into a flat union,
Kővágó, Zoltán <=
- [Qemu-devel] [PATCH 01/25] qapi: support implicit structs in OptsVisitor, Kővágó, Zoltán, 2015/08/06
- [Qemu-devel] [PATCH 04/25] net: use Netdev instead of NetClientOptions in client init, Kővágó, Zoltán, 2015/08/06
- [Qemu-devel] [PATCH 03/25] net: remove NetLegacy struct, Kővágó, Zoltán, 2015/08/06
- [Qemu-devel] [PATCH 20/25] audio: remove mixeng specific code from backends, Kővágó, Zoltán, 2015/08/06
- [Qemu-devel] [PATCH 10/25] audio: -audiodev command line option, Kővágó, Zoltán, 2015/08/06
- [Qemu-devel] [PATCH 16/25] paaudio: properly disconnect streams in fini_*, Kővágó, Zoltán, 2015/08/06