[PULL 0/2] Renesas patches for 5.2-rc1

[PULL 0/2] Renesas patches for 5.2-rc1

[Philippe Mathieu-Daudé]

The following changes since commit 3493c36f0371777c62d1d72b205b0eb6117e2156:

  Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20201106' into staging (2020-11-06 13:43:28 +0000)

are available in the Git repository at:

  https://gitlab.com/philmd/qemu.git tags/renesas-fixes-20201109

for you to fetch changes up to 60f6de8fbafa5dc57af63792e3ba1a910239d195:

  hw/rx/rx-gdbsim: Fix memory leak (CID 1432307) (2020-11-09 00:53:07 +0100)

----------------------------------------------------------------
Renesas patches queue

- Demote target & hardware sections to 'Odd Fixes'
- Fix memory leak (CID 1432307)

CI jobs results:
. https://cirrus-ci.com/build/5340929353580544
. https://gitlab.com/philmd/qemu/-/pipelines/213407241
. https://travis-ci.org/github/philmd/qemu/builds/742315021
----------------------------------------------------------------

Philippe Mathieu-Daudé (2):
  MAINTAINERS: Demote Renesas target & hardware to 'Odd Fixes'
  hw/rx/rx-gdbsim: Fix memory leak (CID 1432307)

 hw/rx/rx-gdbsim.c |  3 +--
 MAINTAINERS       | 10 +++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

-- 
2.26.2

[PULL 1/2] MAINTAINERS: Demote Renesas target & hardware to 'Odd Fixes'

[Philippe Mathieu-Daudé]

To be fair with other subsystems listed as 'Odd Fixes' but having
maintainers more present, demote the Renesas sections from being
'Maintained' to 'Odd Fixes' (has a maintainer but they don't have
time to do much other than throw the odd patch in.)

This matches Magnus's possibilities so far:
https://www.mail-archive.com/qemu-devel@nongnu.org/msg710319.html

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20201102104001.2062572-1-f4bug@amsat.org>
---
 MAINTAINERS | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 63223e1183d..f6da5990aa9 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -289,7 +289,7 @@ F: linux-user/host/riscv64/
 
 RENESAS RX CPUs
 M: Yoshinori Sato <ysato@users.sourceforge.jp>
-S: Maintained
+S: Odd Fixes
 F: target/rx/
 
 S390 TCG CPUs
@@ -1334,7 +1334,7 @@ RX Machines
 -----------
 rx-gdbsim
 M: Yoshinori Sato <ysato@users.sourceforge.jp>
-S: Maintained
+S: Odd Fixes
 F: docs/system/target-rx.rst
 F: hw/rx/rx-gdbsim.c
 F: tests/acceptance/machine_rx_gdbsim.py
@@ -1344,7 +1344,7 @@ SH4 Machines
 R2D
 M: Yoshinori Sato <ysato@users.sourceforge.jp>
 R: Magnus Damm <magnus.damm@gmail.com>
-S: Maintained
+S: Odd Fixes
 F: hw/sh4/r2d.c
 F: hw/intc/sh_intc.c
 F: include/hw/sh4/sh_intc.h
@@ -2077,7 +2077,7 @@ F: docs/*/*xive*
 Renesas peripherals
 M: Yoshinori Sato <ysato@users.sourceforge.jp>
 R: Magnus Damm <magnus.damm@gmail.com>
-S: Maintained
+S: Odd Fixes
 F: hw/char/renesas_sci.c
 F: hw/char/sh_serial.c
 F: hw/timer/renesas_*.c
@@ -2088,7 +2088,7 @@ F: include/hw/timer/renesas_*.h
 
 Renesas RX peripherals
 M: Yoshinori Sato <ysato@users.sourceforge.jp>
-S: Maintained
+S: Odd Fixes
 F: hw/intc/rx_icu.c
 F: hw/rx/
 F: include/hw/intc/rx_icu.h
-- 
2.26.2

[PULL 2/2] hw/rx/rx-gdbsim: Fix memory leak (CID 1432307)

[Philippe Mathieu-Daudé]

As load_device_tree() returns allocated memory,
we need to free it.

Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Fixes: bda19d7bb56 ("hw/rx: Add RX GDB simulator")
Reported-by: Coverity (CID 1432307: RESOURCE_LEAK)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20201102104542.2064745-1-f4bug@amsat.org>
---
 hw/rx/rx-gdbsim.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/hw/rx/rx-gdbsim.c b/hw/rx/rx-gdbsim.c
index 417ec0564b3..285549c79b5 100644
--- a/hw/rx/rx-gdbsim.c
+++ b/hw/rx/rx-gdbsim.c
@@ -122,9 +122,8 @@ static void rx_gdbsim_init(MachineState *machine)
         if (dtb_filename) {
             ram_addr_t dtb_offset;
             int dtb_size;
-            void *dtb;
+            g_autofree void *dtb = load_device_tree(dtb_filename, &dtb_size);
 
-            dtb = load_device_tree(dtb_filename, &dtb_size);
             if (dtb == NULL) {
                 error_report("Couldn't open dtb file %s", dtb_filename);
                 exit(1);
-- 
2.26.2

Re: [PULL 0/2] Renesas patches for 5.2-rc1

[Peter Maydell]

On Mon, 9 Nov 2020 at 00:01, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
>
> The following changes since commit 3493c36f0371777c62d1d72b205b0eb6117e2156:
>
>   Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20201106' into staging (2020-11-06 13:43:28 +0000)
>
> are available in the Git repository at:
>
>   https://gitlab.com/philmd/qemu.git tags/renesas-fixes-20201109
>
> for you to fetch changes up to 60f6de8fbafa5dc57af63792e3ba1a910239d195:
>
>   hw/rx/rx-gdbsim: Fix memory leak (CID 1432307) (2020-11-09 00:53:07 +0100)
>
> ----------------------------------------------------------------
> Renesas patches queue
>
> - Demote target & hardware sections to 'Odd Fixes'
> - Fix memory leak (CID 1432307)
>
> CI jobs results:
> . https://cirrus-ci.com/build/5340929353580544
> . https://gitlab.com/philmd/qemu/-/pipelines/213407241
> . https://travis-ci.org/github/philmd/qemu/builds/742315021
> ----------------------------------------------------------------


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/5.2
for any user-visible changes.

-- PMM