diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-10-04 19:52:09 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-10-04 19:52:09 -0500 |
| commit | 97f3461555b1f5d8d4e6cfc839efe215098d786d (patch) | |
| tree | 409d93f93ab150099dd07f4b2a4d7ca1ae327576 /monitor.h | |
| parent | 6929cf11bb8ec5ff9f9e76c870c513204854a1eb (diff) | |
| parent | 8bde9b6f8892c15e46e1f37a37ac038313be4d58 (diff) | |
Merge remote-tracking branch 'qmp/queue/qmp' into staging
* qmp/queue/qmp:
block: live snapshot documentation tweaks
input: index_from_key(): drop unused code
qmp: qmp_send_key(): accept key codes in hex
input: qmp_send_key(): simplify
hmp: dump-guest-memory: hardcode protocol argument to "file:"
qmp: dump-guest-memory: don't spin if non-blocking fd would block
qmp: dump-guest-memory: improve schema doc (again)
qapi: convert add_client
monitor: add Error * argument to monitor_get_fd
pci-assign: use monitor_handle_fd_param
qapi: add "unix" to the set of reserved words
qapi: do not protect enum values from namespace pollution
Add qemu-ga-client script
Support settimeout in QEMUMonitorProtocol
Make negotiation optional in QEMUMonitorProtocol
Diffstat (limited to 'monitor.h')
| -rw-r--r-- | monitor.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -66,7 +66,7 @@ int monitor_read_block_device_key(Monitor *mon, const char *device, BlockDriverCompletionFunc *completion_cb, void *opaque); -int monitor_get_fd(Monitor *mon, const char *fdname); +int monitor_get_fd(Monitor *mon, const char *fdname, Error **errp); int monitor_handle_fd_param(Monitor *mon, const char *fdname); void monitor_vprintf(Monitor *mon, const char *fmt, va_list ap) |