diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-08-19 10:30:36 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-08-19 10:30:36 +0100 |
| commit | 8e6e2c2ae7a81f625cf1cb320891d5270e277548 (patch) | |
| tree | 7aeba6994e047857dbccb3d14f0e67e8015112f5 /include | |
| parent | 073fd73e566c711f5c0cdaa300fdd1a3c8e7faa0 (diff) | |
| parent | b3dd1b8c295636e64ceb14cdc4db6420d7319e38 (diff) | |
| download | qemu-8e6e2c2ae7a81f625cf1cb320891d5270e277548.tar.gz | |
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 'include')
| -rw-r--r-- | include/monitor/monitor.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h index 3d6929d6cd..78a5fc8197 100644 --- a/include/monitor/monitor.h +++ b/include/monitor/monitor.h @@ -64,7 +64,7 @@ AddfdInfo *monitor_fdset_add_fd(int fd, bool has_fdset_id, int64_t fdset_id, Error **errp); int monitor_fdset_get_fd(int64_t fdset_id, int flags); int monitor_fdset_dup_fd_add(int64_t fdset_id, int dup_fd); -int monitor_fdset_dup_fd_remove(int dup_fd); +void monitor_fdset_dup_fd_remove(int dup_fd); int monitor_fdset_dup_fd_find(int dup_fd); #endif /* !MONITOR_H */ |