Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

[fuchsia] zx::vmar::map migration #22003

Merged
merged 1 commit into from
Oct 20, 2020
Merged

[fuchsia] zx::vmar::map migration #22003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion shell/platform/fuchsia/flutter/component.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@ class FileInNamespaceBuffer final : public fml::Mapping {
}
uintptr_t addr;
zx_status_t status =
zx::vmar::root_self()->map(0, buffer.vmo, 0, buffer.size, flags, &addr);
zx::vmar::root_self()->map(flags, 0, buffer.vmo, 0, buffer.size, &addr);
if (status != ZX_OK) {
FML_LOG(FATAL) << "Failed to map " << path << ": "
<< zx_status_get_string(status);
Expand Down
6 changes: 3 additions & 3 deletions shell/platform/fuchsia/flutter/runner.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ uintptr_t GetICUData(const fuchsia::mem::Buffer& icu_data) {
return 0u;

uintptr_t data = 0u;
zx_status_t status = zx::vmar::root_self()->map(
0, icu_data.vmo, 0, static_cast<size_t>(data_size), ZX_VM_PERM_READ,
&data);
zx_status_t status =
zx::vmar::root_self()->map(ZX_VM_PERM_READ, 0, icu_data.vmo, 0,
static_cast<size_t>(data_size), &data);
if (status == ZX_OK) {
return data;
}
Expand Down
4 changes: 2 additions & 2 deletions shell/platform/fuchsia/runtime/dart/utils/mapped_resource.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ bool MappedResource::LoadFromVmo(const std::string& path,
flags |= ZX_VM_PERM_EXECUTE;
}
uintptr_t addr;
zx_status_t status = zx::vmar::root_self()->map(
0, resource_vmo.vmo, 0, resource_vmo.size, flags, &addr);
zx_status_t status = zx::vmar::root_self()->map(flags, 0, resource_vmo.vmo, 0,
resource_vmo.size, &addr);
if (status != ZX_OK) {
FX_LOGF(ERROR, LOG_TAG, "Failed to map: %s", zx_status_get_string(status));
return false;
Expand Down