[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/2] qapi: avoid empty CpuInfoOther type
From: |
Anton Nefedov |
Subject: |
[Qemu-devel] [PATCH 2/2] qapi: avoid empty CpuInfoOther type |
Date: |
Fri, 11 May 2018 12:05:34 +0300 |
the patch provides an example of a previously introduced data-partial
qapi union tag
Signed-off-by: Anton Nefedov <address@hidden>
---
qapi/misc.json | 48 ++++--------------------------------------------
cpus.c | 2 --
2 files changed, 4 insertions(+), 46 deletions(-)
diff --git a/qapi/misc.json b/qapi/misc.json
index f5988cc..2059852 100644
--- a/qapi/misc.json
+++ b/qapi/misc.json
@@ -387,14 +387,14 @@
'qom_path': 'str', 'thread_id': 'int',
'*props': 'CpuInstanceProperties', 'arch': 'CpuInfoArch' },
'discriminator': 'arch',
+ 'data-partial': true,
'data': { 'x86': 'CpuInfoX86',
'sparc': 'CpuInfoSPARC',
'ppc': 'CpuInfoPPC',
'mips': 'CpuInfoMIPS',
'tricore': 'CpuInfoTricore',
's390': 'CpuInfoS390',
- 'riscv': 'CpuInfoRISCV',
- 'other': 'CpuInfoOther' } }
+ 'riscv': 'CpuInfoRISCV' } }
##
# @CpuInfoX86:
@@ -465,16 +465,6 @@
{ 'struct': 'CpuInfoRISCV', 'data': { 'pc': 'int' } }
##
-# @CpuInfoOther:
-#
-# No additional information is available about the virtual CPU
-#
-# Since: 2.6
-#
-##
-{ 'struct': 'CpuInfoOther', 'data': { } }
-
-##
# @CpuS390State:
#
# An enumeration of cpu states that can be assumed by a virtual
@@ -575,38 +565,8 @@
'arch' : 'CpuInfoArch',
'target' : 'SysEmuTarget' },
'discriminator' : 'target',
- 'data' : { 'aarch64' : 'CpuInfoOther',
- 'alpha' : 'CpuInfoOther',
- 'arm' : 'CpuInfoOther',
- 'cris' : 'CpuInfoOther',
- 'hppa' : 'CpuInfoOther',
- 'i386' : 'CpuInfoOther',
- 'lm32' : 'CpuInfoOther',
- 'm68k' : 'CpuInfoOther',
- 'microblaze' : 'CpuInfoOther',
- 'microblazeel' : 'CpuInfoOther',
- 'mips' : 'CpuInfoOther',
- 'mips64' : 'CpuInfoOther',
- 'mips64el' : 'CpuInfoOther',
- 'mipsel' : 'CpuInfoOther',
- 'moxie' : 'CpuInfoOther',
- 'nios2' : 'CpuInfoOther',
- 'or1k' : 'CpuInfoOther',
- 'ppc' : 'CpuInfoOther',
- 'ppc64' : 'CpuInfoOther',
- 'ppcemb' : 'CpuInfoOther',
- 'riscv32' : 'CpuInfoOther',
- 'riscv64' : 'CpuInfoOther',
- 's390x' : 'CpuInfoS390',
- 'sh4' : 'CpuInfoOther',
- 'sh4eb' : 'CpuInfoOther',
- 'sparc' : 'CpuInfoOther',
- 'sparc64' : 'CpuInfoOther',
- 'tricore' : 'CpuInfoOther',
- 'unicore32' : 'CpuInfoOther',
- 'x86_64' : 'CpuInfoOther',
- 'xtensa' : 'CpuInfoOther',
- 'xtensaeb' : 'CpuInfoOther' } }
+ 'data-partial' : true,
+ 'data' : { 's390x' : 'CpuInfoS390' } }
##
# @query-cpus-fast:
diff --git a/cpus.c b/cpus.c
index 5bcd3ec..bd0de44 100644
--- a/cpus.c
+++ b/cpus.c
@@ -2273,8 +2273,6 @@ CpuInfoFastList *qmp_query_cpus_fast(Error **errp)
info->value->target = target;
if (target == SYS_EMU_TARGET_S390X) {
cpustate_to_cpuinfo_s390(&info->value->u.s390x, cpu);
- } else {
- /* do nothing for @CpuInfoOther */
}
if (!cur_item) {
--
2.7.4
- [Qemu-devel] [PATCH 0/2] qapi: allow flat unions with empty branches, Anton Nefedov, 2018/05/11
- [Qemu-devel] [PATCH 2/2] qapi: avoid empty CpuInfoOther type,
Anton Nefedov <=
- [Qemu-devel] [PATCH 1/2] qapi: allow flat unions with empty branches, Anton Nefedov, 2018/05/11
- Re: [Qemu-devel] [PATCH 1/2] qapi: allow flat unions with empty branches, Markus Armbruster, 2018/05/14
- Re: [Qemu-devel] [PATCH 1/2] qapi: allow flat unions with empty branches, Eric Blake, 2018/05/14
- Re: [Qemu-devel] [PATCH 1/2] qapi: allow flat unions with empty branches, Markus Armbruster, 2018/05/15
- Re: [Qemu-devel] [PATCH 1/2] qapi: allow flat unions with empty branches, Eric Blake, 2018/05/15
- Re: [Qemu-devel] [PATCH 1/2] qapi: allow flat unions with empty branches, Markus Armbruster, 2018/05/15
- Re: [Qemu-devel] [PATCH 1/2] qapi: allow flat unions with empty branches, Anton Nefedov, 2018/05/16
- Re: [Qemu-devel] [PATCH 1/2] qapi: allow flat unions with empty branches, Markus Armbruster, 2018/05/17
- Re: [Qemu-devel] [PATCH 1/2] qapi: allow flat unions with empty branches, Eric Blake, 2018/05/17
- Re: [Qemu-devel] [PATCH 1/2] qapi: allow flat unions with empty branches, Markus Armbruster, 2018/05/18