From nobody Wed Nov 5 08:24:42 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1504278345101523.2570763380472; Fri, 1 Sep 2017 08:05:45 -0700 (PDT) Received: from localhost ([::1]:44993 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dnnVu-00018C-VZ for importer@patchew.org; Fri, 01 Sep 2017 11:05:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40648) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dnnTi-0007m1-Mj for qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:03:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dnnTg-0002rr-VI for qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:03:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48896) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dnnTg-0002rO-N6 for qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:03:24 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id ADF3913AB3; Fri, 1 Sep 2017 15:03:23 +0000 (UTC) Received: from localhost (ovpn-116-66.gru2.redhat.com [10.97.116.66]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4977E66D4D; Fri, 1 Sep 2017 15:03:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com ADF3913AB3 Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=ehabkost@redhat.com From: Eduardo Habkost To: Peter Maydell Date: Fri, 1 Sep 2017 12:02:49 -0300 Message-Id: <20170901150317.10380-2-ehabkost@redhat.com> In-Reply-To: <20170901150317.10380-1-ehabkost@redhat.com> References: <20170901150317.10380-1-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Fri, 01 Sep 2017 15:03:23 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 01/29] qom: Remove unused errp parameter from can_be_deleted() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The errp argument is ignored by all implementations of the method, and user_creatable_del() would break if any implementation set an error (because it calls error_setg(errp) if the function returns false). Remove the unused parameter. Signed-off-by: Eduardo Habkost Message-Id: <20170829220337.23427-1-ehabkost@redhat.com> Reviewed-by: Gonglei Reviewed-by: Igor Mammedov Signed-off-by: Eduardo Habkost --- include/qom/object_interfaces.h | 5 ++--- backends/cryptodev.c | 2 +- backends/hostmem.c | 2 +- qom/object_interfaces.c | 6 +++--- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/include/qom/object_interfaces.h b/include/qom/object_interface= s.h index fdd7603c84..d63c1c28f8 100644 --- a/include/qom/object_interfaces.h +++ b/include/qom/object_interfaces.h @@ -51,7 +51,7 @@ typedef struct UserCreatableClass { =20 /* */ void (*complete)(UserCreatable *uc, Error **errp); - bool (*can_be_deleted)(UserCreatable *uc, Error **errp); + bool (*can_be_deleted)(UserCreatable *uc); } UserCreatableClass; =20 /** @@ -68,12 +68,11 @@ void user_creatable_complete(Object *obj, Error **errp); /** * user_creatable_can_be_deleted: * @uc: the object whose can_be_deleted() method is called if implemented - * @errp: if an error occurs, a pointer to an area to store the error * * Wrapper to call can_be_deleted() method if one of types it's inherited * from implements USER_CREATABLE interface. */ -bool user_creatable_can_be_deleted(UserCreatable *uc, Error **errp); +bool user_creatable_can_be_deleted(UserCreatable *uc); =20 /** * user_creatable_add_type: diff --git a/backends/cryptodev.c b/backends/cryptodev.c index 1764c179fe..67edfa5328 100644 --- a/backends/cryptodev.c +++ b/backends/cryptodev.c @@ -215,7 +215,7 @@ bool cryptodev_backend_is_ready(CryptoDevBackend *backe= nd) } =20 static bool -cryptodev_backend_can_be_deleted(UserCreatable *uc, Error **errp) +cryptodev_backend_can_be_deleted(UserCreatable *uc) { return !cryptodev_backend_is_used(CRYPTODEV_BACKEND(uc)); } diff --git a/backends/hostmem.c b/backends/hostmem.c index 4606b73849..34550b9067 100644 --- a/backends/hostmem.c +++ b/backends/hostmem.c @@ -342,7 +342,7 @@ out: } =20 static bool -host_memory_backend_can_be_deleted(UserCreatable *uc, Error **errp) +host_memory_backend_can_be_deleted(UserCreatable *uc) { if (host_memory_backend_is_mapped(MEMORY_BACKEND(uc))) { return false; diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c index ff27e0669e..3bb8959f09 100644 --- a/qom/object_interfaces.c +++ b/qom/object_interfaces.c @@ -23,13 +23,13 @@ void user_creatable_complete(Object *obj, Error **errp) } } =20 -bool user_creatable_can_be_deleted(UserCreatable *uc, Error **errp) +bool user_creatable_can_be_deleted(UserCreatable *uc) { =20 UserCreatableClass *ucc =3D USER_CREATABLE_GET_CLASS(uc); =20 if (ucc->can_be_deleted) { - return ucc->can_be_deleted(uc, errp); + return ucc->can_be_deleted(uc); } else { return true; } @@ -178,7 +178,7 @@ void user_creatable_del(const char *id, Error **errp) return; } =20 - if (!user_creatable_can_be_deleted(USER_CREATABLE(obj), errp)) { + if (!user_creatable_can_be_deleted(USER_CREATABLE(obj))) { error_setg(errp, "object '%s' is in use, can not be deleted", id); return; } --=20 2.13.5