diff options
author | Hridya Valsaraju <hridya@google.com> | 2021-05-05 18:31:48 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-05 18:31:48 +0000 |
commit | 38fdfacee637fb180d1e671640d7afaddc8877c6 (patch) | |
tree | 9b5717374b72030f155715d382d9d792f3fea328 | |
parent | deefe400e08132fcbbb60fc6fbc055a03e8ee76b (diff) | |
parent | 72cd323bef19274f1926c90f99588ecd7ae800f9 (diff) | |
download | libufdt-android12-dev.tar.gz |
Throw an error on all overlay application errors am: f6b572a2f6 am: 01856f80fb am: 72cd323befandroid-vts-12.1_r4android-vts-12.1_r3android-vts-12.1_r2android-vts-12.0_r6android-vts-12.0_r5android-vts-12.0_r4android-vts-12.0_r3android-vts-12.0_r2android-cts-12.1_r4android-cts-12.1_r3android-cts-12.1_r2android-cts-12.0_r6android-cts-12.0_r5android-cts-12.0_r4android-cts-12.0_r3android-cts-12.0_r2android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-dev
Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/1696088
Change-Id: I34aef4dc3d2e4bce82974fa5ede196892be0cff3
-rw-r--r-- | ufdt_overlay.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/ufdt_overlay.c b/ufdt_overlay.c index 019545f..c432cd4 100644 --- a/ufdt_overlay.c +++ b/ufdt_overlay.c @@ -363,18 +363,18 @@ static enum overlay_result ufdt_apply_fragment(struct ufdt *tree, struct ufdt_node *target_node = NULL; struct ufdt_node *overlay_node = NULL; + overlay_node = ufdt_node_get_node_by_path(frag_node, "__overlay__"); + if (overlay_node == NULL) { + return OVERLAY_RESULT_MISSING_OVERLAY; + } + enum overlay_result result = ufdt_overlay_get_target(tree, frag_node, &target_node); if (target_node == NULL) { + dto_error("Unable to resolve target for %s\n", ufdt_node_name(frag_node)); return result; } - overlay_node = ufdt_node_get_node_by_path(frag_node, "__overlay__"); - if (overlay_node == NULL) { - dto_error("missing __overlay__ sub-node\n"); - return OVERLAY_RESULT_MISSING_OVERLAY; - } - int err = ufdt_overlay_node(target_node, overlay_node, pool); if (err < 0) { @@ -392,15 +392,17 @@ static enum overlay_result ufdt_apply_fragment(struct ufdt *tree, static int ufdt_overlay_apply_fragments(struct ufdt *main_tree, struct ufdt *overlay_tree, struct ufdt_node_pool *pool) { - enum overlay_result err; + enum overlay_result ret; struct ufdt_node **it; /* * This loop may iterate to subnodes that's not a fragment node. - * In such case, ufdt_apply_fragment would fail with return value = -1. + * We must fail for any other error. */ for_each_node(it, overlay_tree->root) { - err = ufdt_apply_fragment(main_tree, *it, pool); - if (err == OVERLAY_RESULT_MERGE_FAIL) { + ret = ufdt_apply_fragment(main_tree, *it, pool); + if ((ret != OVERLAY_RESULT_OK) && (ret != OVERLAY_RESULT_MISSING_OVERLAY)) { + dto_error("failed to apply overlay fragment %s ret: %d\n", + ufdt_node_name(*it), ret); return -1; } } |