diff mbox

[1/2] kvm tools: init: fix usage of hlist iterators

Message ID 1362378451-15216-1-git-send-email-will.deacon@arm.com (mailing list archive)
State New, archived
Headers show

Commit Message

Will Deacon March 4, 2013, 6:27 a.m. UTC 
From: Marc Zyngier <marc.zyngier@arm.com>

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 <levinsasha928@gmail.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
---
 tools/kvm/util/init.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Comments

Will Deacon March 4, 2013, 3:33 p.m. UTC | #1 
Hi Pekka,

On Mon, Mar 04, 2013 at 06:27:30AM +0000, Will Deacon wrote:
> From: Marc Zyngier <marc.zyngier@arm.com>
> 
> 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.

Actually, the offending commit was only introduced during the recent merge
window, so it's best to avoid this patch until you update kvmtool to a
3.9-based kernel tree (which will pull in the kernel-side ARM kvm bits too).

I just saw Sasha as the author and assumed it was a kvmtool regression :)

Cheers,

Will
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

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);