diff options
| author | Eric Engestrom <[email protected]> | 2019-06-19 12:47:19 +0100 |
|---|---|---|
| committer | Eric Engestrom <[email protected]> | 2019-07-31 09:41:05 +0100 |
| commit | abc226cf41574454c79477c217e60e8ff1fddfad (patch) | |
| tree | 4c01a31ebe12a2a03bef6c7902a4d0ca400110ce /src/intel/tools | |
| parent | ab9c76769ad070490434aa7104d11958e1fc49d4 (diff) | |
tree-wide: replace MAYBE_UNUSED with ASSERTED
Suggested-by: Jason Ekstrand <[email protected]>
Signed-off-by: Eric Engestrom <[email protected]>
Reviewed-by: Matt Turner <[email protected]>
Diffstat (limited to 'src/intel/tools')
| -rw-r--r-- | src/intel/tools/aub_mem.c | 6 | ||||
| -rw-r--r-- | src/intel/tools/aub_read.c | 2 | ||||
| -rw-r--r-- | src/intel/tools/aubinator_error_decode.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/intel/tools/aub_mem.c b/src/intel/tools/aub_mem.c index 98e14219c59..1b217e130ca 100644 --- a/src/intel/tools/aub_mem.c +++ b/src/intel/tools/aub_mem.c @@ -155,7 +155,7 @@ ensure_phys_mem(struct aub_mem *mem, uint64_t phys_addr) new_mem->phys_addr = phys_addr; new_mem->fd_offset = mem->mem_fd_len; - MAYBE_UNUSED int ftruncate_res = ftruncate(mem->mem_fd, mem->mem_fd_len += 4096); + ASSERTED int ftruncate_res = ftruncate(mem->mem_fd, mem->mem_fd_len += 4096); assert(ftruncate_res == 0); new_mem->data = mmap(NULL, 4096, PROT_READ | PROT_WRITE, MAP_SHARED, @@ -289,7 +289,7 @@ aub_mem_get_ggtt_bo(void *_mem, uint64_t address) continue; uint32_t map_offset = i->virt_addr - address; - MAYBE_UNUSED void *res = + ASSERTED void *res = mmap((uint8_t *)bo.map + map_offset, 4096, PROT_READ, MAP_SHARED | MAP_FIXED, mem->mem_fd, phys_mem->fd_offset); assert(res != MAP_FAILED); @@ -355,7 +355,7 @@ aub_mem_get_ppgtt_bo(void *_mem, uint64_t address) for (uint64_t page = address; page < end; page += 4096) { struct phys_mem *phys_mem = ppgtt_walk(mem, mem->pml4, page); - MAYBE_UNUSED void *res = + ASSERTED void *res = mmap((uint8_t *)bo.map + (page - bo.addr), 4096, PROT_READ, MAP_SHARED | MAP_FIXED, mem->mem_fd, phys_mem->fd_offset); assert(res != MAP_FAILED); diff --git a/src/intel/tools/aub_read.c b/src/intel/tools/aub_read.c index 07cee073f53..de1057b7fe4 100644 --- a/src/intel/tools/aub_read.c +++ b/src/intel/tools/aub_read.c @@ -290,7 +290,7 @@ int aub_read_command(struct aub_read *read, const void *data, uint32_t data_len) { const uint32_t *p = data, *next; - MAYBE_UNUSED const uint32_t *end = data + data_len; + ASSERTED const uint32_t *end = data + data_len; uint32_t h, header_length, bias; assert(data_len >= 4); diff --git a/src/intel/tools/aubinator_error_decode.c b/src/intel/tools/aubinator_error_decode.c index 049823ca463..147b580de3b 100644 --- a/src/intel/tools/aubinator_error_decode.c +++ b/src/intel/tools/aubinator_error_decode.c @@ -757,7 +757,7 @@ main(int argc, char *argv[]) setup_pager(); if (S_ISDIR(st.st_mode)) { - MAYBE_UNUSED int ret; + ASSERTED int ret; char *filename; ret = asprintf(&filename, "%s/i915_error_state", path); |