Re: [PATCH 04/34] qapi: rename SysEmuTarget to EmuTarget

[Markus Armbruster <armbru@redhat.com>]

Yonggang Luo <luoyonggang@gmail.com> writes:

> As now it's also expressing user-mode targets.
>
> This changes the type name exposed by query-qmp-schema; enum values and
> serialized target values remain unchanged.

Are you sure?  query-qmp-schema masks the type names.

> Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>

[...]

> diff --git a/qapi/machine.json b/qapi/machine.json
> index 9b145c635ba..07fac4f0764 100644
> --- a/qapi/machine.json
> +++ b/qapi/machine.json
> @@ -14,7 +14,7 @@
>  { 'include': 'machine-common.json' }
>  
>  ##
> -# @SysEmuTarget:
> +# @EmuTarget:
>  #     The comprehensive enumeration of QEMU system emulation
>  #     ("softmmu") targets.  Run "./configure --help" in the project
>  #     root directory, and look for the \*-softmmu targets near the
   #     "--target-list" option.  The individual target constants are not
   #     documented here, for the time being.

Is this still correct?

> @@ -35,7 +35,7 @@
>  #
>  # Since: 3.0
>  ##
> -{ 'enum' : 'SysEmuTarget',
> +{ 'enum' : 'EmuTarget',
>    'data' : [ 'aarch64', 'alpha', 'arm', 'avr', 'hexagon', 'hppa', 'i386',
>               'loongarch64', 'm68k', 'microblaze', 'mips', 'mips64',
>               'mips64el', 'mipsel', 'or1k', 'ppc',
> @@ -95,7 +95,7 @@
>                        'qom-path'     : 'str',
>                        'thread-id'    : 'int',
>                        '*props'       : 'CpuInstanceProperties',
> -                      'target'       : 'SysEmuTarget' },
> +                      'target'       : 'EmuTarget' },
>    'discriminator' : 'target',
>    'data'          : { 's390x'        : 'CpuInfoS390' } }
>  
> @@ -281,7 +281,7 @@
>  # Since: 1.2
>  ##
>  { 'struct': 'QemuTargetInfo',
> -  'data': { 'arch': 'SysEmuTarget' } }
> +  'data': { 'arch': 'EmuTarget' } }
>  
>  ##
>  # @query-target:
> diff --git a/qapi/pragma.json b/qapi/pragma.json
> index 342cedc42e7..93a710ee937 100644
> --- a/qapi/pragma.json
> +++ b/qapi/pragma.json
> @@ -72,7 +72,7 @@
>          'SsidSizeMode',
>          'String',
>          'StringWrapper',
> -        'SysEmuTarget',
> +        'EmuTarget',
>          'ThrottleGroupProperties',
>          'VncPrimaryAuth',
>          'VncVencryptSubAuth',
> @@ -109,7 +109,7 @@
>          'QKeyCode',                 # send-key, input-sent-event
>          'QapiErrorClass',           # QMP error replies
>          'SshHostKeyCheckMode',      # blockdev-add, -blockdev
> -        'SysEmuTarget',             # query-cpu-fast, query-target
> +        'EmuTarget',                # query-cpu-fast, query-target
>          'UuidInfo',                 # query-uuid
>          'VncClientInfo',            # query-vnc, query-vnc-servers, ...
>          'X86CPURegister32'          # qom-get of x86 CPU properties

[...]