From 9f14b0add1dcdbfa2ee61051d068211fb0a1fcc9 Mon Sep 17 00:00:00 2001 From: Ladi Prosek Date: Thu, 3 Mar 2016 09:37:17 +0100 Subject: rng: move request queue cleanup from RngEgd to RngBackend 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.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'backends/rng.c') diff --git a/backends/rng.c b/backends/rng.c index 2f2f3ee4eb..014cb9d0fe 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, -- cgit v1.2.1