Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4c7aa03 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add libdm and dmctl support for dm-user targets" am: 3042f0ff am:... 

Merge "Add libdm and dmctl support for dm-user targets" am: 3042f0ff am: 784ab6ed am: 165a15d4 am: 8214e3e9

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1346622

Change-Id: I00ea4e3cb8d9151dc32181ae6856957461cb2f85
parents 19d3d190 8214e3e9

fs_mgr/libdm/dm_target.cpp

+7 −0
Original line number Original line Diff line number Diff line
@@ -280,5 +280,12 @@ std::string DmTargetDefaultKey::GetParameterString() const { 
    return android::base::Join(argv, " ");

    return android::base::Join(argv, " ");

}

}





std::string DmTargetUser::GetParameterString() const {

    std::vector<std::string> argv;

    argv.push_back(std::to_string(start()));

    argv.push_back(std::to_string(size()));

    return android::base::Join(argv, " ");

}



}  // namespace dm

}  // namespace dm

}  // namespace android
 
}  // namespace android

fs_mgr/libdm/include/libdm/dm_target.h

+8 −0
Original line number Original line Diff line number Diff line
@@ -309,6 +309,14 @@ class DmTargetDefaultKey final : public DmTarget { 
    bool is_hw_wrapped_ = false;

    bool is_hw_wrapped_ = false;

};

};





class DmTargetUser final : public DmTarget {

  public:

    DmTargetUser(uint64_t start, uint64_t length) : DmTarget(start, length) {}



    std::string name() const override { return "user"; }

    std::string GetParameterString() const override;

};



}  // namespace dm

}  // namespace dm

}  // namespace android

}  // namespace android

fs_mgr/tools/dmctl.cpp

+2 −0
Original line number Original line Diff line number Diff line
@@ -174,6 +174,8 @@ class TargetParser final { 
            }

            }

            return std::make_unique<DmTargetSnapshot>(start_sector, num_sectors, base_device,

            return std::make_unique<DmTargetSnapshot>(start_sector, num_sectors, base_device,

                                                      cow_device, mode, chunk_size);

                                                      cow_device, mode, chunk_size);

        } else if (target_type == "user") {

            return std::make_unique<DmTargetUser>(start_sector, num_sectors);

        } else {

        } else {

            std::cerr << "Unrecognized target type: " << target_type << std::endl;

            std::cerr << "Unrecognized target type: " << target_type << std::endl;

            return nullptr;

            return nullptr;