diff options
author | Peter Maydell | 2014-08-19 11:30:36 +0200 |
---|---|---|
committer | Peter Maydell | 2014-08-19 11:30:36 +0200 |
commit | 8e6e2c2ae7a81f625cf1cb320891d5270e277548 (patch) | |
tree | 7aeba6994e047857dbccb3d14f0e67e8015112f5 /hw/ide/isa.c | |
parent | Merge remote-tracking branch 'remotes/amit/for-2.2' into staging (diff) | |
parent | monitor: fix use after free (diff) | |
download | qemu-8e6e2c2ae7a81f625cf1cb320891d5270e277548.tar.gz qemu-8e6e2c2ae7a81f625cf1cb320891d5270e277548.tar.xz qemu-8e6e2c2ae7a81f625cf1cb320891d5270e277548.zip |
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 <peter.maydell@linaro.org>
Diffstat (limited to 'hw/ide/isa.c')
0 files changed, 0 insertions, 0 deletions