From patchwork Thu Mar 3 12:37:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Shah X-Patchwork-Id: 8492401 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 294819F2F0 for ; Thu, 3 Mar 2016 12:39:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 69D4A202FF for ; Thu, 3 Mar 2016 12:39:53 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 95EED202E5 for ; Thu, 3 Mar 2016 12:39:52 +0000 (UTC) Received: from localhost ([::1]:34660 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1abSXn-0000t7-VE for patchwork-qemu-devel@patchwork.kernel.org; Thu, 03 Mar 2016 07:39:52 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39007) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1abSVh-0005ub-Op for qemu-devel@nongnu.org; Thu, 03 Mar 2016 07:37:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1abSVe-0004Rv-2Y for qemu-devel@nongnu.org; Thu, 03 Mar 2016 07:37:41 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41315) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1abSVd-0004Ro-Lh for qemu-devel@nongnu.org; Thu, 03 Mar 2016 07:37:38 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id 4FA52C00071A; Thu, 3 Mar 2016 12:37:37 +0000 (UTC) Received: from localhost (ovpn-113-82.phx2.redhat.com [10.3.113.82]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u23CbZKp006491; Thu, 3 Mar 2016 07:37:36 -0500 From: Amit Shah To: Peter Maydell Date: Thu, 3 Mar 2016 18:07:09 +0530 Message-Id: <9f14b0add1dcdbfa2ee61051d068211fb0a1fcc9.1457008497.git.amit.shah@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Amit Shah , thuth@redhat.com, lprosek@redhat.com, qemu list Subject: [Qemu-devel] [PULL 4/6] rng: move request queue cleanup from RngEgd to RngBackend X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Ladi Prosek RngBackend is now in charge of cleaning up the linked list on instance finalization. It also exposes a function to finalize individual RngRequest instances, called by its child classes. Signed-off-by: Ladi Prosek Reviewed-by: Amit Shah Message-Id: <1456994238-9585-4-git-send-email-lprosek@redhat.com> Signed-off-by: Amit Shah --- backends/rng-egd.c | 25 +------------------------ backends/rng.c | 32 ++++++++++++++++++++++++++++++++ include/sysemu/rng.h | 12 ++++++++++++ 3 files changed, 45 insertions(+), 24 deletions(-) diff --git a/backends/rng-egd.c b/backends/rng-egd.c index b061362..8f2bd16 100644 --- a/backends/rng-egd.c +++ b/backends/rng-egd.c @@ -58,12 +58,6 @@ static void rng_egd_request_entropy(RngBackend *b, size_t size, s->parent.requests = g_slist_append(s->parent.requests, req); } -static void rng_egd_free_request(RngRequest *req) -{ - g_free(req->data); - g_free(req); -} - static int rng_egd_chr_can_read(void *opaque) { RngEgd *s = RNG_EGD(opaque); @@ -93,28 +87,13 @@ static void rng_egd_chr_read(void *opaque, const uint8_t *buf, int size) size -= len; if (req->offset == req->size) { - s->parent.requests = g_slist_remove_link(s->parent.requests, - s->parent.requests); - req->receive_entropy(req->opaque, req->data, req->size); - rng_egd_free_request(req); + rng_backend_finalize_request(&s->parent, req); } } } -static void rng_egd_free_requests(RngEgd *s) -{ - GSList *i; - - for (i = s->parent.requests; i; i = i->next) { - rng_egd_free_request(i->data); - } - - g_slist_free(s->parent.requests); - s->parent.requests = NULL; -} - static void rng_egd_opened(RngBackend *b, Error **errp) { RngEgd *s = RNG_EGD(b); @@ -183,8 +162,6 @@ static void rng_egd_finalize(Object *obj) } g_free(s->chr_name); - - rng_egd_free_requests(s); } static void rng_egd_class_init(ObjectClass *klass, void *data) diff --git a/backends/rng.c b/backends/rng.c index 2f2f3ee..014cb9d 100644 --- a/backends/rng.c +++ b/backends/rng.c @@ -64,6 +64,30 @@ static void rng_backend_prop_set_opened(Object *obj, bool value, Error **errp) s->opened = true; } +static void rng_backend_free_request(RngRequest *req) +{ + g_free(req->data); + g_free(req); +} + +static void rng_backend_free_requests(RngBackend *s) +{ + GSList *i; + + for (i = s->requests; i; i = i->next) { + rng_backend_free_request(i->data); + } + + g_slist_free(s->requests); + s->requests = NULL; +} + +void rng_backend_finalize_request(RngBackend *s, RngRequest *req) +{ + s->requests = g_slist_remove(s->requests, req); + rng_backend_free_request(req); +} + static void rng_backend_init(Object *obj) { object_property_add_bool(obj, "opened", @@ -72,6 +96,13 @@ static void rng_backend_init(Object *obj) NULL); } +static void rng_backend_finalize(Object *obj) +{ + RngBackend *s = RNG_BACKEND(obj); + + rng_backend_free_requests(s); +} + static void rng_backend_class_init(ObjectClass *oc, void *data) { UserCreatableClass *ucc = USER_CREATABLE_CLASS(oc); @@ -84,6 +115,7 @@ static const TypeInfo rng_backend_info = { .parent = TYPE_OBJECT, .instance_size = sizeof(RngBackend), .instance_init = rng_backend_init, + .instance_finalize = rng_backend_finalize, .class_size = sizeof(RngBackendClass), .class_init = rng_backend_class_init, .abstract = true, diff --git a/include/sysemu/rng.h b/include/sysemu/rng.h index c744d82..08a2eda 100644 --- a/include/sysemu/rng.h +++ b/include/sysemu/rng.h @@ -60,6 +60,7 @@ struct RngBackend GSList *requests; }; + /** * rng_backend_request_entropy: * @s: the backend to request entropy from @@ -78,4 +79,15 @@ struct RngBackend void rng_backend_request_entropy(RngBackend *s, size_t size, EntropyReceiveFunc *receive_entropy, void *opaque); + +/** + * rng_backend_free_request: + * @s: the backend that created the request + * @req: the request to finalize + * + * Used by child rng backend classes to finalize requests once they've been + * processed. The request is removed from the list of active requests and + * deleted. + */ +void rng_backend_finalize_request(RngBackend *s, RngRequest *req); #endif