From patchwork Fri Nov 16 19:10:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 199717 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5F6512C008E for ; Sat, 17 Nov 2012 06:10:57 +1100 (EST) Received: from localhost ([::1]:34871 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TZRJX-0005pO-Tj for incoming@patchwork.ozlabs.org; Fri, 16 Nov 2012 14:10:55 -0500 Received: from eggs.gnu.org ([208.118.235.92]:38212) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TZRJO-0005p6-Kc for qemu-devel@nongnu.org; Fri, 16 Nov 2012 14:10:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TZRJL-00067e-Em for qemu-devel@nongnu.org; Fri, 16 Nov 2012 14:10:46 -0500 Received: from e28smtp08.in.ibm.com ([122.248.162.8]:50009) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TZRJK-00067K-M5 for qemu-devel@nongnu.org; Fri, 16 Nov 2012 14:10:43 -0500 Received: from /spool/local by e28smtp08.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Sat, 17 Nov 2012 00:40:37 +0530 Received: from d28relay01.in.ibm.com (9.184.220.58) by e28smtp08.in.ibm.com (192.168.1.138) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Sat, 17 Nov 2012 00:40:35 +0530 Received: from d28av04.in.ibm.com (d28av04.in.ibm.com [9.184.220.66]) by d28relay01.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id qAGJAYYY22741116 for ; Sat, 17 Nov 2012 00:40:34 +0530 Received: from d28av04.in.ibm.com (loopback [127.0.0.1]) by d28av04.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id qAH0ePrG017610 for ; Sat, 17 Nov 2012 11:40:25 +1100 Received: from titi.austin.rr.com ([9.76.55.234]) by d28av04.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id qAH0eNoT017506; Sat, 17 Nov 2012 11:40:24 +1100 From: Anthony Liguori To: qemu-devel@nongnu.org Date: Fri, 16 Nov 2012 13:10:31 -0600 Message-Id: <1353093031-23535-1-git-send-email-aliguori@us.ibm.com> X-Mailer: git-send-email 1.8.0 x-cbid: 12111619-2000-0000-0000-000009E75F61 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 122.248.162.8 Cc: Anthony Liguori Subject: [Qemu-devel] [PATCH] rng-egd: don't use gslist_free_full 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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)