[PATCH] hw/mips/malta: Fix minor dead code issue

[PATCH] hw/mips/malta: Fix minor dead code issue

[Peter Maydell]

Coverity points out (in CID 1508390) that write_bootloader has
some dead code, where we assign to 'p' and then in the following
line assign to it again. This happened as a result of the
refactoring in commit cd5066f8618b.

Fix the dead code by removing the 'void *v' variable entirely and
instead adding a cast when calling bl_setup_gt64120_jump_kernel(), as
we do at its other callsite in write_bootloader_nanomips().

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 hw/mips/malta.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/hw/mips/malta.c b/hw/mips/malta.c
index af9021316de..e3be2eea563 100644
--- a/hw/mips/malta.c
+++ b/hw/mips/malta.c
@@ -748,7 +748,6 @@ static void write_bootloader(uint8_t *base, uint64_t run_addr,
                              uint64_t kernel_entry)
 {
     uint32_t *p;
-    void *v;
 
     /* Small bootloader */
     p = (uint32_t *)base;
@@ -785,9 +784,7 @@ static void write_bootloader(uint8_t *base, uint64_t run_addr,
      *
      */
 
-    v = p;
-    bl_setup_gt64120_jump_kernel(&v, run_addr, kernel_entry);
-    p = v;
+    bl_setup_gt64120_jump_kernel((void **)&p, run_addr, kernel_entry);
 
     /* YAMON subroutines */
     p = (uint32_t *) (base + 0x800);
-- 
2.34.1

Re: [PATCH] hw/mips/malta: Fix minor dead code issue

[Philippe Mathieu-Daudé]

On 6/4/23 17:37, Peter Maydell wrote:
> Coverity points out (in CID 1508390) that write_bootloader has
> some dead code, where we assign to 'p' and then in the following
> line assign to it again. This happened as a result of the
> refactoring in commit cd5066f8618b.
> 
> Fix the dead code by removing the 'void *v' variable entirely and
> instead adding a cast when calling bl_setup_gt64120_jump_kernel(), as
> we do at its other callsite in write_bootloader_nanomips().
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
>   hw/mips/malta.c | 5 +----
>   1 file changed, 1 insertion(+), 4 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

Thank you!

Re: [PATCH] hw/mips/malta: Fix minor dead code issue

[Peter Maydell]

On Thu, 6 Apr 2023 at 16:54, Philippe Mathieu-Daudé <philmd@linaro.org> wrote:
>
> On 6/4/23 17:37, Peter Maydell wrote:
> > Coverity points out (in CID 1508390) that write_bootloader has
> > some dead code, where we assign to 'p' and then in the following
> > line assign to it again. This happened as a result of the
> > refactoring in commit cd5066f8618b.
> >
> > Fix the dead code by removing the 'void *v' variable entirely and
> > instead adding a cast when calling bl_setup_gt64120_jump_kernel(), as
> > we do at its other callsite in write_bootloader_nanomips().
> >
> > Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> > ---
> >   hw/mips/malta.c | 5 +----
> >   1 file changed, 1 insertion(+), 4 deletions(-)
>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

Are you planning to take this into a mips pullreq?
If not, I can throw it into my next target-arm series.

thanks
-- PMM

Re: [PATCH] hw/mips/malta: Fix minor dead code issue

[Philippe Mathieu-Daudé]

On 9/5/23 15:07, Peter Maydell wrote:
> On Thu, 6 Apr 2023 at 16:54, Philippe Mathieu-Daudé <philmd@linaro.org> wrote:
>>
>> On 6/4/23 17:37, Peter Maydell wrote:
>>> Coverity points out (in CID 1508390) that write_bootloader has
>>> some dead code, where we assign to 'p' and then in the following
>>> line assign to it again. This happened as a result of the
>>> refactoring in commit cd5066f8618b.
>>>
>>> Fix the dead code by removing the 'void *v' variable entirely and
>>> instead adding a cast when calling bl_setup_gt64120_jump_kernel(), as
>>> we do at its other callsite in write_bootloader_nanomips().
>>>
>>> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
>>> ---
>>>    hw/mips/malta.c | 5 +----
>>>    1 file changed, 1 insertion(+), 4 deletions(-)
>>
>> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> 
> Are you planning to take this into a mips pullreq?
> If not, I can throw it into my next target-arm series.

I'll appreciate if you can take this single patch via your
arm tree. Thanks!