From patchwork Fri Nov 16 19:10:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: rng-egd: don't use gslist_free_full Date: Fri, 16 Nov 2012 09:10:31 -0000 From: Anthony Liguori X-Patchwork-Id: 199717 Message-Id: <1353093031-23535-1-git-send-email-aliguori@us.ibm.com> To: qemu-devel@nongnu.org Cc: Anthony Liguori This function was only introduced in glib 2.28.0. Signed-off-by: Anthony Liguori --- backends/rng-egd.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/backends/rng-egd.c b/backends/rng-egd.c index ec58358..ad84737 100644 --- a/backends/rng-egd.c +++ b/backends/rng-egd.c @@ -110,6 +110,18 @@ static void rng_egd_chr_read(void *opaque, const uint8_t *buf, int size) } } +static void rng_egd_free_requests(RngEgd *s) +{ + GSList *i; + + for (i = s->requests; i; i = i->next) { + rng_egd_free_request(i->data); + } + + g_slist_free(s->requests); + s->requests = NULL; +} + static void rng_egd_cancel_requests(RngBackend *b) { RngEgd *s = RNG_EGD(b); @@ -118,9 +130,7 @@ static void rng_egd_cancel_requests(RngBackend *b) * queue waiting to be read, this is okay, because there will always be * more data than we requested originally */ - g_slist_free_full(s->requests, - (GDestroyNotify)rng_egd_free_request); - s->requests = NULL; + rng_egd_free_requests(s); } static void rng_egd_opened(RngBackend *b, Error **errp) @@ -185,8 +195,7 @@ static void rng_egd_finalize(Object *obj) g_free(s->chr_name); - g_slist_free_full(s->requests, (GDestroyNotify)rng_egd_free_request); - s->requests = NULL; + rng_egd_free_requests(s); } static void rng_egd_class_init(ObjectClass *klass, void *data)