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

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

Merge "init: Support for initializing virtio-console devices" into main am: c36f4f05 

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



Change-Id: Ic0a690f2703ab3f21d5c9388d23e4995a7584226
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fb2d8c0d c36f4f05

init/block_dev_initializer.cpp

+4 −0
Original line number Diff line number Diff line
@@ -139,6 +139,10 @@ bool BlockDevInitializer::InitPlatformDevice(const std::string& dev_name) { 
    return InitDevice("/sys/devices/platform", dev_name);

}



bool BlockDevInitializer::InitHvcDevice(const std::string& dev_name) {

    return InitDevice("/sys/devices/virtual/tty", dev_name);

}



bool BlockDevInitializer::InitDevice(const std::string& syspath, const std::string& device_name) {

    bool found = false;

init/block_dev_initializer.h

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ class BlockDevInitializer final { 
    bool InitDevices(std::set<std::string> devices);

    bool InitDmDevice(const std::string& device);

    bool InitPlatformDevice(const std::string& device);

    bool InitHvcDevice(const std::string& device);



  private:

    ListenerAction HandleUevent(const Uevent& uevent, std::set<std::string>* devices);