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

qapi/qom.json: Do not use CONFIG_VIRTIO_CRYPTO in common code

Browse Source 
The ObjectType enum and ObjectOptions are included from qapi-types-qom.h
into common code. We should not use target-specific config switches like
CONFIG_VIRTIO_CRYPTO here, since this is not defined in common code and
thus the enum will look differently between common and target specific
code. For this case, it's hopefully enough to check for CONFIG_VHOST_CRYPTO
only (which is a host specific config switch, i.e. it's the same on all
targets).

Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20210412160710.639800-1-thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Thomas Huth 2021-04-12 18:07:09 +02:00 committed by Peter Maydell
parent 3ddb05dbf2
commit 438c61e086
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qapi/qom.json
View File

@ -752,7 +752,7 @@
'cryptodev-backend', 'cryptodev-backend',
'cryptodev-backend-builtin', 'cryptodev-backend-builtin',
{ 'name': 'cryptodev-vhost-user', { 'name': 'cryptodev-vhost-user',
'if': 'defined(CONFIG_VIRTIO_CRYPTO) && defined(CONFIG_VHOST_CRYPTO)' }, 'if': 'defined(CONFIG_VHOST_CRYPTO)' },
'dbus-vmstate', 'dbus-vmstate',
'filter-buffer', 'filter-buffer',
'filter-dump', 'filter-dump',
@ -809,7 +809,7 @@
'cryptodev-backend': 'CryptodevBackendProperties', 'cryptodev-backend': 'CryptodevBackendProperties',
'cryptodev-backend-builtin': 'CryptodevBackendProperties', 'cryptodev-backend-builtin': 'CryptodevBackendProperties',
'cryptodev-vhost-user': { 'type': 'CryptodevVhostUserProperties', 'cryptodev-vhost-user': { 'type': 'CryptodevVhostUserProperties',
'if': 'defined(CONFIG_VIRTIO_CRYPTO) && defined(CONFIG_VHOST_CRYPTO)' }, 'if': 'defined(CONFIG_VHOST_CRYPTO)' },
'dbus-vmstate': 'DBusVMStateProperties', 'dbus-vmstate': 'DBusVMStateProperties',
'filter-buffer': 'FilterBufferProperties', 'filter-buffer': 'FilterBufferProperties',
'filter-dump': 'FilterDumpProperties', 'filter-dump': 'FilterDumpProperties',