From 4fa74203f9c9e6e1489ffc2c940c67c6f1200561 Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Thu, 9 Jun 2016 22:40:05 -0700 Subject: [PATCH] boot_control_copy: Track the the bootloader_message struct change. Bug: 29193360 Change-Id: I518e786eb2d45b6a71c25dc4402e3bbebef20dc6 --- boot_control_copy/bootinfo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boot_control_copy/bootinfo.c b/boot_control_copy/bootinfo.c index 396dd815..82a134fa 100644 --- a/boot_control_copy/bootinfo.c +++ b/boot_control_copy/bootinfo.c @@ -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) { -- 2.11.0