Reapply patch from http://codereview.chromium.org/6594092/

utility/load_kernel_test.c

 /* Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 /* Routines for verifying a file's signature. Useful in testing the core
  * RSA verification implementation.
  */
 
 #include <inttypes.h>  /* For PRIu64 macro */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
 #include <unistd.h>
 
 #include "load_kernel_fw.h"
 #include "boot_device.h"
 #include "host_common.h"
 #include "rollback_index.h"
 #include "utility.h"
 #include "vboot_kernel.h"
 
 #define LBA_BYTES 512
 #define KERNEL_BUFFER_SIZE 0xA00000
 
 /* Global variables for stub functions */
 static LoadKernelParams lkp;
+static VbNvContext vnc;
 static FILE *image_file = NULL;
 
 
 /* Boot device stub implementations to read from the image file */
 int BootDeviceReadLBA(uint64_t lba_start, uint64_t lba_count, void *buffer) {
   printf("Read(%" PRIu64 ", %" PRIu64 ")\n", lba_start, lba_count);
 
   if (lba_start > lkp.ending_lba ||
       lba_start + lba_count - 1 > lkp.ending_lba) {
     fprintf(stderr, "Read overrun: %" PRIu64 " + %" PRIu64 " > %" PRIu64 "\n",
@@ skipping 37 matching lines @@
 int main(int argc, char* argv[]) {
 
   const char* image_name;
   int rv, c, argsleft;
   int errorcnt = 0;
   char *e = 0;
 
   Memset(&lkp, 0, sizeof(LoadKernelParams));
   lkp.bytes_per_lba = LBA_BYTES;
   lkp.boot_flags = BOOT_FLAG_RECOVERY;
+  Memset(&vnc, 0, sizeof(VbNvContext));
+  lkp.nv_context = &vnc;
 
   /* Parse options */
   opterr = 0;
   while ((c=getopt(argc, argv, ":b:")) != -1)
   {
     switch (c)
     {
     case 'b':
       lkp.boot_flags = strtoull(optarg, &e, 0);
       if (!*optarg || (e && *e))
@@ skipping 105 matching lines @@
            lkp.partition_guid[12],
            lkp.partition_guid[13],
            lkp.partition_guid[14],
            lkp.partition_guid[15]);
   }
 
   fclose(image_file);
   Free(lkp.kernel_buffer);
   return rv != LOAD_KERNEL_SUCCESS;
 }