[Qemu-commits] [qemu/qemu] 4bb08a: monitor: Remove hardcoded watchdog event names

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 4bb08af34e8961e912855d00b946654500799385
      
https://github.com/qemu/qemu/commit/4bb08af34e8961e912855d00b946654500799385
  Author: Hani Benhabiles <address@hidden>
  Date:   2014-08-18 (Mon, 18 Aug 2014)

  Changed paths:
    M monitor.c

  Log Message:
  -----------
  monitor: Remove hardcoded watchdog event names

Signed-off-by: Hani Benhabiles <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: 2928207ac1bb2751a1554ea0f9a9641179f51488
      
https://github.com/qemu/qemu/commit/2928207ac1bb2751a1554ea0f9a9641179f51488
  Author: Chen Gang <address@hidden>
  Date:   2014-08-18 (Mon, 18 Aug 2014)

  Changed paths:
    M dump.c

  Log Message:
  -----------
  dump.c: Fix memory leak issue in cleanup processing for dump_init()

In dump_init(), when failure occurs, need notice about 'fd' and memory
mapping. So call dump_cleanup() for it (need let all initializations at
front).

Also simplify dump_cleanup(): remove redundant 'ret' and redundant 'fd'
checking.

Signed-off-by: Chen Gang <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: b3dd1b8c295636e64ceb14cdc4db6420d7319e38
      
https://github.com/qemu/qemu/commit/b3dd1b8c295636e64ceb14cdc4db6420d7319e38
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2014-08-18 (Mon, 18 Aug 2014)

  Changed paths:
    M include/monitor/monitor.h
    M monitor.c
    M stubs/fdset-remove-fd.c

  Log Message:
  -----------
  monitor: fix use after free

The function monitor_fdset_dup_fd_find_remove() references member of
'mon_fdset' which - when remove flag is set - may be freed in function
monitor_fdset_cleanup().
remove is set by monitor_fdset_dup_fd_remove which in practice
does not need the returned value, so make it void,
and return -1 from monitor_fdset_dup_fd_find_remove.

Reported-by: zhanghailiang <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: 8e6e2c2ae7a81f625cf1cb320891d5270e277548
      
https://github.com/qemu/qemu/commit/8e6e2c2ae7a81f625cf1cb320891d5270e277548
  Author: Peter Maydell <address@hidden>
  Date:   2014-08-19 (Tue, 19 Aug 2014)

  Changed paths:
    M dump.c
    M include/monitor/monitor.h
    M monitor.c
    M stubs/fdset-remove-fd.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging

* remotes/qmp-unstable/queue/qmp:
  monitor: fix use after free
  dump.c: Fix memory leak issue in cleanup processing for dump_init()
  monitor: Remove hardcoded watchdog event names

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/073fd73e566c...8e6e2c2ae7a8