Merge "ueventd: Fix creation of VFIO dev nodes" into main am: 998c3b4fbe
am: fcd6f0fb11
am: 1fae39537b
am: a87a4a1c73
am: b4e0fbcef1
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2664635 Change-Id: Ic2f51817a3f307b394e936f4cef7e702a076b042 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
58ce74c55d
2 changed files with 8 additions and 0 deletions
|
@ -568,6 +568,8 @@ void DeviceHandler::HandleUevent(const Uevent& uevent) {
|
|||
return;
|
||||
} else if (uevent.subsystem == "misc" && StartsWith(uevent.device_name, "dm-user/")) {
|
||||
devpath = "/dev/dm-user/" + uevent.device_name.substr(8);
|
||||
} else if (uevent.subsystem == "misc" && uevent.device_name == "vfio/vfio") {
|
||||
devpath = "/dev/" + uevent.device_name;
|
||||
} else {
|
||||
devpath = "/dev/" + Basename(uevent.path);
|
||||
}
|
||||
|
|
|
@ -23,6 +23,11 @@ subsystem sound
|
|||
subsystem dma_heap
|
||||
devname uevent_devpath
|
||||
dirname /dev/dma_heap
|
||||
|
||||
subsystem vfio
|
||||
devname uevent_devpath
|
||||
dirname /dev/vfio
|
||||
|
||||
# ueventd can only set permissions on device nodes and their associated
|
||||
# sysfs attributes, not on arbitrary paths.
|
||||
#
|
||||
|
@ -43,6 +48,7 @@ subsystem dma_heap
|
|||
/dev/binder 0666 root root
|
||||
/dev/hwbinder 0666 root root
|
||||
/dev/vndbinder 0666 root root
|
||||
/dev/vfio/* 0666 root root
|
||||
|
||||
/dev/pmsg0 0222 root log
|
||||
/dev/dma_heap/system 0444 system system
|
||||
|
|
Loading…
Reference in a new issue