commit 8f1bdb0ea136c38cf963f5fafff103e1b6fb488d
author Peter Maydell <peter.maydell@linaro.org> Thu Aug 12 16:06:24 2021 +0100
committer Peter Maydell <peter.maydell@linaro.org> Thu Aug 26 17:02:00 2021 +0100
tree f6f91a9a038e62cd9c074305cd7abb2973b5848b
parent 312c496a95430dcabe0028e5a68d595c9411aa91

softmmu/physmem.c: Remove unneeded NULL check in qemu_ram_alloc_from_fd()

In the alignment check added to qemu_ram_alloc_from_fd() in commit
ce317be98db0dfdfa, the condition includes a check that 'mr' is not
NULL.  This check is unnecessary because we can assume that the
caller always passes us a valid MemoryRegion, and indeed later in the
function we assume mr is not NULL when we pass it to file_ram_alloc()
as new_block->mr.  Remove it.

Fixes: Coverity 1459867
Fixes: ce317be98d ("exec: fetch the alignment of Linux devdax pmem character device nodes")
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Jingqi Liu <jingqi.liu@intel.com>
Message-id: 20210812150624.29139-1-peter.maydell@linaro.org

softmmu/physmem.c

diff --git a/softmmu/physmem.c b/softmmu/physmem.c
index 2e18947..31baf3a 100644
--- a/softmmu/physmem.c
+++ b/softmmu/physmem.c
@@ -2075,7 +2075,7 @@
     }
 
     file_align = get_file_align(fd);
-    if (file_align > 0 && mr && file_align > mr->align) {
+    if (file_align > 0 && file_align > mr->align) {
         error_setg(errp, "backing store align 0x%" PRIx64
                    " is larger than 'align' option 0x%" PRIx64,
                    file_align, mr->align);