From: Sergei Heifetz <[email protected]> It is useless to assert that block is not NULL because it is already dereferenced in the first line of the function.
The assertion is also unnecessary because the function is called in only two places, and `block` can't be NULL in either of them: - In `migration/ram.c`, we have already dereferenced `block` in the code just before the call. - In `system/memory.c`, we assert `mr->ram_block` before passing it to the function. (We could split the declaration and initialization of oldsize, but then we would need to remove the const qualifier. As the assertion is useless anyway, removing the const qualifier seems worse.) Signed-off-by: Sergei Heifetz <[email protected]> Reviewed-by: Peter Maydell <[email protected]> Reviewed-by: Peter Xu <[email protected]> Reviewed-by: Michael Tokarev <[email protected]> Signed-off-by: Michael Tokarev <[email protected]> --- system/physmem.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/system/physmem.c b/system/physmem.c index 4a9e076004..4e26f1a1d4 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -2028,8 +2028,6 @@ int qemu_ram_resize(RAMBlock *block, ram_addr_t newsize, Error **errp) const ram_addr_t oldsize = block->used_length; const ram_addr_t unaligned_size = newsize; - assert(block); - newsize = TARGET_PAGE_ALIGN(newsize); newsize = REAL_HOST_PAGE_ALIGN(newsize); -- 2.47.3
