diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-11-09 11:20:25 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-11-09 11:20:25 +0000 |
| commit | 2a190a7256a3e0563b29ffd67e0164097b4a6dac (patch) | |
| tree | 0d2ddffd789851e2c3c68a3a8630e80a8afa0ac9 | |
| parent | 193f51ddcf1d87d725f1dfd51b8a95351c910e8f (diff) | |
| parent | 60f6de8fbafa5dc57af63792e3ba1a910239d195 (diff) | |
| download | qemu-2a190a7256a3e0563b29ffd67e0164097b4a6dac.zip qemu-2a190a7256a3e0563b29ffd67e0164097b4a6dac.tar.gz qemu-2a190a7256a3e0563b29ffd67e0164097b4a6dac.tar.bz2 | |
Merge remote-tracking branch 'remotes/philmd-gitlab/tags/renesas-fixes-20201109' into staging
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
# gpg: Signature made Sun 08 Nov 2020 23:58:37 GMT
# gpg: using RSA key FAABE75E12917221DCFD6BB2E3E32C2CDEADC0DE
# gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <f4bug@amsat.org>" [full]
# Primary key fingerprint: FAAB E75E 1291 7221 DCFD 6BB2 E3E3 2C2C DEAD C0DE
* remotes/philmd-gitlab/tags/renesas-fixes-20201109:
hw/rx/rx-gdbsim: Fix memory leak (CID 1432307)
MAINTAINERS: Demote Renesas target & hardware to 'Odd Fixes'
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | MAINTAINERS | 10 | ||||
| -rw-r--r-- | hw/rx/rx-gdbsim.c | 3 |
2 files changed, 6 insertions, 7 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 16aace0..3f4b6e2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -293,7 +293,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 @@ -1338,7 +1338,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 @@ -1348,7 +1348,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 @@ -2081,7 +2081,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 @@ -2092,7 +2092,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 diff --git a/hw/rx/rx-gdbsim.c b/hw/rx/rx-gdbsim.c index 417ec05..285549c 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); |