From mboxrd@z Thu Jan 1 00:00:00 1970 From: Will Deacon Subject: [PATCH 1/2] kvm tools: init: fix usage of hlist iterators Date: Mon, 4 Mar 2013 06:27:30 +0000 Message-ID: <1362378451-15216-1-git-send-email-will.deacon@arm.com> Cc: kvm@vger.kernel.org, Marc Zyngier , Sasha Levin , Will Deacon To: penberg@kernel.org Return-path: Received: from cam-admin0.cambridge.arm.com ([217.140.96.50]:62393 "EHLO cam-admin0.cambridge.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754651Ab3CDG1s (ORCPT ); Mon, 4 Mar 2013 01:27:48 -0500 Sender: kvm-owner@vger.kernel.org List-ID: From: Marc Zyngier Commit b67bfe0d42ca ("hlist: drop the node parameter from iterators") incorrectly changed the way that hlist iterators are used. This patch fixes util/init.c so it passes parameters to the new iterators in the right manner. Cc: Sasha Levin Signed-off-by: Marc Zyngier Signed-off-by: Will Deacon --- tools/kvm/util/init.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/kvm/util/init.c b/tools/kvm/util/init.c index 33a5952..d4ce144 100644 --- a/tools/kvm/util/init.c +++ b/tools/kvm/util/init.c @@ -33,11 +33,10 @@ int init_list__init(struct kvm *kvm) { unsigned int i; int r = 0; - struct hlist_node *n; struct init_item *t; for (i = 0; i < ARRAY_SIZE(init_lists); i++) - hlist_for_each_entry(t, n, &init_lists[i], n) { + hlist_for_each_entry(t, &init_lists[i], n) { r = t->init(kvm); if (r < 0) { pr_warning("Failed init: %s\n", t->fn_name); @@ -53,11 +52,10 @@ int init_list__exit(struct kvm *kvm) { int i; int r = 0; - struct hlist_node *n; struct init_item *t; for (i = ARRAY_SIZE(exit_lists) - 1; i >= 0; i--) - hlist_for_each_entry(t, n, &exit_lists[i], n) { + hlist_for_each_entry(t, &exit_lists[i], n) { r = t->init(kvm); if (r < 0) { pr_warning("%s failed.\n", t->fn_name); -- 1.8.0