diff options
| author | Thomas Huth <thuth@redhat.com> | 2021-04-12 18:07:09 +0200 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-04-14 19:20:40 +0100 |
| commit | 438c61e0866366db340a6aac96874a66b4e37dcb (patch) | |
| tree | 52b2b0a328bac9c8f95d3cfe3d7c45d15cad65cf /qapi/qom.json | |
| parent | 3ddb05dbf21e9dc9b37e3d1cd7ae3d694565e998 (diff) | |
| download | qemu-438c61e0866366db340a6aac96874a66b4e37dcb.zip qemu-438c61e0866366db340a6aac96874a66b4e37dcb.tar.gz qemu-438c61e0866366db340a6aac96874a66b4e37dcb.tar.bz2 | |
qapi/qom.json: Do not use CONFIG_VIRTIO_CRYPTO in common code
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>
Diffstat (limited to 'qapi/qom.json')
| -rw-r--r-- | qapi/qom.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qapi/qom.json b/qapi/qom.json index db5ac41..cd0e76d 100644 --- a/qapi/qom.json +++ b/qapi/qom.json @@ -752,7 +752,7 @@ 'cryptodev-backend', 'cryptodev-backend-builtin', { 'name': 'cryptodev-vhost-user', - 'if': 'defined(CONFIG_VIRTIO_CRYPTO) && defined(CONFIG_VHOST_CRYPTO)' }, + 'if': 'defined(CONFIG_VHOST_CRYPTO)' }, 'dbus-vmstate', 'filter-buffer', 'filter-dump', @@ -809,7 +809,7 @@ 'cryptodev-backend': 'CryptodevBackendProperties', 'cryptodev-backend-builtin': 'CryptodevBackendProperties', 'cryptodev-vhost-user': { 'type': 'CryptodevVhostUserProperties', - 'if': 'defined(CONFIG_VIRTIO_CRYPTO) && defined(CONFIG_VHOST_CRYPTO)' }, + 'if': 'defined(CONFIG_VHOST_CRYPTO)' }, 'dbus-vmstate': 'DBusVMStateProperties', 'filter-buffer': 'FilterBufferProperties', 'filter-dump': 'FilterDumpProperties', |