Skip to contentSkip to conversation

backends/cryptodev: drop local_err from cryptodev_backend_complete()

PATCH In review Vladimir Sementsov-Ogievskiy 3 participants 5 messages Nov 27, 2019 – Nov 29, 2019

lore
Share & tools
lore
#0 lore raw

PATCH v6 1/1 backends/cryptodev: drop local_err from cryptodev_backend_complete()

No reason for local_err here, use errp directly instead.

---

v6: add r-b by Philippe and Marc-André

 backends/cryptodev.c | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)
backends/cryptodev.c +1 -10
index 3c071eab95..5a9735684e 100644
@@ -176,19 +176,10 @@ cryptodev_backend_complete(UserCreatable *uc, Error **errp)
 {
     CryptoDevBackend *backend = CRYPTODEV_BACKEND(uc);
     CryptoDevBackendClass *bc = CRYPTODEV_BACKEND_GET_CLASS(uc);
-    Error *local_err = NULL;
 
     if (bc->init) {
-        bc->init(backend, &local_err);
-        if (local_err) {
-            goto out;
-        }
+        bc->init(backend, errp);
     }
-
-    return;
-
-out:
-    error_propagate(errp, local_err);
 }
 
 void cryptodev_backend_set_used(CryptoDevBackend *backend, bool used)
Signature · 1 line
2.21.0
Reviewed-by on v6 1/1
#1 lore raw

CCing [email protected]

Regards,
-Gonglei

Quoted 48 lines

-----Original Message-----
From: Vladimir Sementsov-Ogievskiy [mailto:[email protected]]
Sent: Thursday, November 28, 2019 3:46 AM
To: [email protected]
Cc: Gonglei (Arei) <[email protected]>; [email protected]; [email protected]; [email protected]
Subject: [PATCH v6] backends/cryptodev: drop local_err from cryptodev_backend_complete()

No reason for local_err here, use errp directly instead.

---

v6: add r-b by Philippe and Marc-André

 backends/cryptodev.c | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)
backends/cryptodev.c index renamed from backends/cryptodev.c +0 -0

3c071eab95..5a9735684e 100644

backends/cryptodev.c +1 -11
@@ -176,19 +176,10 @@ cryptodev_backend_complete(UserCreatable *uc,
 Error **errp)  {
     CryptoDevBackend *backend = CRYPTODEV_BACKEND(uc);
     CryptoDevBackendClass *bc = CRYPTODEV_BACKEND_GET_CLASS(uc);
-    Error *local_err = NULL;
 
     if (bc->init) {
-        bc->init(backend, &local_err);
-        if (local_err) {
-            goto out;
-        }
+        bc->init(backend, errp);
     }
-
-    return;
-
-out:
-    error_propagate(errp, local_err);
 }
 
 void cryptodev_backend_set_used(CryptoDevBackend *backend, bool used)
--

2.21.0

Reviewed-by on v6 1/1
#2 lore raw
In reply to Vladimir Sementsov-Ogievskiy
Quoted 1 line · Vladimir Sementsov-Ogievskiy

No reason for local_err here, use errp directly instead.

Related: "[PATCH v6] hw/vfio/ap: drop local_err from vfio_ap_realize". I'm surprised it's just two. Did you search for the anti-pattern systematically?

Quoted 25 lines

---

v6: add r-b by Philippe and Marc-André

 backends/cryptodev.c | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)
backends/cryptodev.c +0 -5
index 3c071eab95..5a9735684e 100644
@@ -176,19 +176,10 @@ cryptodev_backend_complete(UserCreatable *uc, Error **errp)
 {
     CryptoDevBackend *backend = CRYPTODEV_BACKEND(uc);
     CryptoDevBackendClass *bc = CRYPTODEV_BACKEND_GET_CLASS(uc);
-    Error *local_err = NULL;
 
     if (bc->init) {
-        bc->init(backend, &local_err);
-        if (local_err) {
-            goto out;
-        }

backends/cryptodev.c cryptodev_backend_complete(UserCreatable *uc, Error **errp) · line 185

Quoted 10 lines
backends/cryptodev.c +1 -5
+        bc->init(backend, errp);
     }
-
-    return;
-
-out:
-    error_propagate(errp, local_err);
 }
 
 void cryptodev_backend_set_used(CryptoDevBackend *backend, bool used)
#3 lore raw
Quoted 7 lines · Markus Armbruster
Quoted 1 line · Vladimir Sementsov-Ogievskiy

No reason for local_err here, use errp directly instead.

Related: "[PATCH v6] hw/vfio/ap: drop local_err from vfio_ap_realize". I'm surprised it's just two. Did you search for the anti-pattern systematically?

As I remember - no, only where it breaks automation. Here empty "out: }" label will break compilation, if not fixed before or after coccinelle run. So, here I fixed it before.

Quoted 39 lines
Quoted 26 lines

---

v6: add r-b by Philippe and Marc-André

  backends/cryptodev.c | 11 +----------
  1 file changed, 1 insertion(+), 10 deletions(-)
backends/cryptodev.c +0 -5
index 3c071eab95..5a9735684e 100644
@@ -176,19 +176,10 @@ cryptodev_backend_complete(UserCreatable *uc, Error **errp)
  {
      CryptoDevBackend *backend = CRYPTODEV_BACKEND(uc);
      CryptoDevBackendClass *bc = CRYPTODEV_BACKEND_GET_CLASS(uc);
-    Error *local_err = NULL;
 
      if (bc->init) {
-        bc->init(backend, &local_err);
-        if (local_err) {
-            goto out;
-        }

backends/cryptodev.c cryptodev_backend_complete(UserCreatable *uc, Error **errp) · line 185

Quoted 10 lines
backends/cryptodev.c +1 -5
+        bc->init(backend, errp);
      }
-
-    return;
-
-out:
-    error_propagate(errp, local_err);
  }
 
  void cryptodev_backend_set_used(CryptoDevBackend *backend, bool used)
Signature · 2 lines
Best regards,
Vladimir
#4 lore raw
Quoted 5 lines · Vladimir Sementsov-Ogievskiy
Quoted 4 lines · Markus Armbruster
Quoted 1 line · Vladimir Sementsov-Ogievskiy

No reason for local_err here, use errp directly instead.

Quoted 7 lines
Quoted 3 lines

Related: "[PATCH v6] hw/vfio/ap: drop local_err from vfio_ap_realize". I'm surprised it's just two. Did you search for the anti-pattern systematically?

As I remember - no, only where it breaks automation. Here empty "out: }" label will break compilation, if not fixed before or after coccinelle run. So, here I fixed it before.

Got it.

A through sweep would be nice, but the goal you're pursuing here involves more than enough churn already. Don't worry about it now.

[...]