OSDN Git Service

boot_control_copy: Track the the bootloader_message struct change.
authorTao Bao <tbao@google.com>
Fri, 10 Jun 2016 05:40:05 +0000 (22:40 -0700)
committerTao Bao <tbao@google.com>
Fri, 10 Jun 2016 05:40:05 +0000 (22:40 -0700)
Bug: 29193360
Change-Id: I518e786eb2d45b6a71c25dc4402e3bbebef20dc6

boot_control_copy/bootinfo.c

index 396dd81..82a134f 100644 (file)
@@ -116,12 +116,12 @@ int boot_info_open_partition(const char *name, uint64_t *out_size, int flags)
   return fd;
 }
 
-// As per struct bootloader_message which is defined in
+// As per struct bootloader_message_ab which is defined in
 // bootable/recovery/bootloader.h we can use the 32 bytes in the
 // bootctrl_suffix field provided that they start with the active slot
 // suffix terminated by NUL. It just so happens that BrilloBootInfo is
 // laid out this way.
-#define BOOTINFO_OFFSET offsetof(struct bootloader_message, slot_suffix)
+#define BOOTINFO_OFFSET offsetof(struct bootloader_message_ab, slot_suffix)
 
 bool boot_info_load(BrilloBootInfo *out_info)
 {