OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qapi: Move @String out of common.json to discourage reuse

Browse Source 
Use of String is problematic, because it results in awkward interface
documentation.  The previous commit cleaned up one instance.

Move String out of common.json next to its remaining users in net.json
to discourage reuse elsewhere.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-ID: <20240205074709.3613229-15-armbru@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Markus Armbruster 2024-02-05 08:47:08 +01:00
parent 4edb196e20
commit 8bf69544b5
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/filter.h
View File

@ -9,7 +9,7 @@
#ifndef QEMU_NET_FILTER_H #ifndef QEMU_NET_FILTER_H
#define QEMU_NET_FILTER_H #define QEMU_NET_FILTER_H
#include "qapi/qapi-types-net.h" #include "qapi/qapi-types-common.h"
#include "qemu/queue.h" #include "qemu/queue.h"
#include "qom/object.h" #include "qom/object.h"
#include "net/queue.h" #include "net/queue.h"

11
qapi/common.json
View File

@ -51,17 +51,6 @@
{ 'enum': 'OnOffSplit', { 'enum': 'OnOffSplit',
'data': [ 'on', 'off', 'split' ] } 'data': [ 'on', 'off', 'split' ] }
##
# @String:
#
# A fat type wrapping 'str', to be embedded in lists.
#
# Since: 1.2
##
{ 'struct': 'String',
'data': {
'str': 'str' } }
## ##
# @StrOrNull: # @StrOrNull:
# #

12
qapi/net.json
View File

@ -6,7 +6,6 @@
# = Net devices # = Net devices
## ##
{ 'include': 'common.json' }
{ 'include': 'sockets.json' } { 'include': 'sockets.json' }
## ##
@ -105,6 +104,17 @@
'*addr': 'str', '*addr': 'str',
'*vectors': 'uint32' } } '*vectors': 'uint32' } }
##
# @String:
#
# A fat type wrapping 'str', to be embedded in lists.
#
# Since: 1.2
##
{ 'struct': 'String',
'data': {
'str': 'str' } }
## ##
# @NetdevUserOptions: # @NetdevUserOptions:
# #