mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cryptodev: Remove 'name' & 'model' fields

Browse Source 
We have already used qapi to generate crypto device types, this allows
to convert type to a string 'model', so the 'model' field is not
needed.

And the 'name' field is not used by any backend driver, drop it.

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>
Message-Id: <20230301105847.253084-3-pizhenwei@bytedance.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
zhenwei pi 2023-03-01 18:58:37 +08:00 committed by Michael S. Tsirkin
parent 14c9fd1673
commit 3f478371fd
5 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backends/cryptodev-builtin.c
View File

@ -72,8 +72,7 @@ static void cryptodev_builtin_init(
return; return;
} }
cc = cryptodev_backend_new_client( cc = cryptodev_backend_new_client();
"cryptodev-builtin", NULL);
cc->info_str = g_strdup_printf("cryptodev-builtin0"); cc->info_str = g_strdup_printf("cryptodev-builtin0");
cc->queue_index = 0; cc->queue_index = 0;
cc->type = QCRYPTODEV_BACKEND_TYPE_BUILTIN; cc->type = QCRYPTODEV_BACKEND_TYPE_BUILTIN;

2
backends/cryptodev-lkcf.c
View File

@ -223,7 +223,7 @@ static void cryptodev_lkcf_init(CryptoDevBackend *backend, Error **errp)
return; return;
} }
cc = cryptodev_backend_new_client("cryptodev-lkcf", NULL); cc = cryptodev_backend_new_client();
cc->info_str = g_strdup_printf("cryptodev-lkcf0"); cc->info_str = g_strdup_printf("cryptodev-lkcf0");
cc->queue_index = 0; cc->queue_index = 0;
cc->type = QCRYPTODEV_BACKEND_TYPE_LKCF; cc->type = QCRYPTODEV_BACKEND_TYPE_LKCF;

3
backends/cryptodev-vhost-user.c
View File

@ -198,8 +198,7 @@ static void cryptodev_vhost_user_init(
s->opened = true; s->opened = true;
for (i = 0; i < queues; i++) { for (i = 0; i < queues; i++) {
cc = cryptodev_backend_new_client( cc = cryptodev_backend_new_client();
"cryptodev-vhost-user", NULL);
cc->info_str = g_strdup_printf("cryptodev-vhost-user%zu to %s ", cc->info_str = g_strdup_printf("cryptodev-vhost-user%zu to %s ",
i, chr->label); i, chr->label);
cc->queue_index = i; cc->queue_index = i;

11
backends/cryptodev.c
View File

@ -34,18 +34,11 @@
static QTAILQ_HEAD(, CryptoDevBackendClient) crypto_clients; static QTAILQ_HEAD(, CryptoDevBackendClient) crypto_clients;
CryptoDevBackendClient * CryptoDevBackendClient *cryptodev_backend_new_client(void)
cryptodev_backend_new_client(const char *model,
const char *name)
{ {
CryptoDevBackendClient *cc; CryptoDevBackendClient *cc;
cc = g_new0(CryptoDevBackendClient, 1); cc = g_new0(CryptoDevBackendClient, 1);
cc->model = g_strdup(model);
if (name) {
cc->name = g_strdup(name);
}
QTAILQ_INSERT_TAIL(&crypto_clients, cc, next); QTAILQ_INSERT_TAIL(&crypto_clients, cc, next);
return cc; return cc;
@ -55,8 +48,6 @@ void cryptodev_backend_free_client(
CryptoDevBackendClient *cc) CryptoDevBackendClient *cc)
{ {
QTAILQ_REMOVE(&crypto_clients, cc, next); QTAILQ_REMOVE(&crypto_clients, cc, next);
g_free(cc->name);
g_free(cc->model);
g_free(cc->info_str); g_free(cc->info_str);
g_free(cc); g_free(cc);
} }

12
include/sysemu/cryptodev.h
View File

@ -218,8 +218,6 @@ struct CryptoDevBackendClass {
struct CryptoDevBackendClient { struct CryptoDevBackendClient {
QCryptodevBackendType type; QCryptodevBackendType type;
char *model;
char *name;
char *info_str; char *info_str;
unsigned int queue_index; unsigned int queue_index;
int vring_enable; int vring_enable;
@ -264,11 +262,8 @@ struct CryptoDevBackend {
/** /**
* cryptodev_backend_new_client: * cryptodev_backend_new_client:
* @model: the cryptodev backend model
* @name: the cryptodev backend name, can be NULL
* *
* Creates a new cryptodev backend client object * Creates a new cryptodev backend client object.
* with the @name in the model @model.
* *
* The returned object must be released with * The returned object must be released with
* cryptodev_backend_free_client() when no * cryptodev_backend_free_client() when no
@ -276,9 +271,8 @@ struct CryptoDevBackend {
* *
* Returns: a new cryptodev backend client object * Returns: a new cryptodev backend client object
*/ */
CryptoDevBackendClient * CryptoDevBackendClient *cryptodev_backend_new_client(void);
cryptodev_backend_new_client(const char *model,
const char *name);
/** /**
* cryptodev_backend_free_client: * cryptodev_backend_free_client:
* @cc: the cryptodev backend client object * @cc: the cryptodev backend client object