commit 9ee60e930d0b6026632977d0ece9031e1251b709
author Wedson Almeida Filho <wedsonaf@google.com> Mon Jul 23 18:56:56 2018 +0100
committer Wedson Almeida Filho <wedsonaf@google.com> Mon Jul 23 21:58:11 2018 +0100
tree 138b3c4063311279cdead2ef15e6cdaaedeba3ad
parent 8f6205f8d591c36af9ff7118e9995e15b1a8bcb8

Convert cpio to use memiter.

src/main.c

diff --git a/src/main.c b/src/main.c
index 7792c8a..8362a6d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -47,7 +47,7 @@
 	struct boot_params_update update;
 	uint64_t new_mem_end;
 	struct memiter primary_initrd;
-	struct cpio c;
+	struct memiter cpio;
 
 	dlog("Initialising hafnium\n");
 
@@ -73,13 +73,13 @@
 		panic("unable to map initrd in");
 	}
 
-	cpio_init(&c, (void *)params.initrd_begin,
-		  params.initrd_end - params.initrd_begin);
+	memiter_init(&cpio, (void *)params.initrd_begin,
+		     params.initrd_end - params.initrd_begin);
 
 	/* Load all VMs. */
 	new_mem_end = params.mem_end;
-	load_secondary(&c, params.mem_begin, &new_mem_end);
-	if (!load_primary(&c, params.kernel_arg, &primary_initrd)) {
+	load_secondary(&cpio, params.mem_begin, &new_mem_end);
+	if (!load_primary(&cpio, params.kernel_arg, &primary_initrd)) {
 		panic("unable to load primary VM");
 	}