diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-07-18 14:44:37 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-07-18 14:44:37 -0500 |
| commit | 513e6bde4fa551c293e7d346e27b618b57a4087a (patch) | |
| tree | 5425e8ea2ced8436d764b2e789e764cdd502570c /qmp-commands.hx | |
| parent | 052bb77a47ce2508538d0e4c9a2fb4b9787a2267 (diff) | |
| parent | 208c9d1b7c23e112d2fb83660fa23f2918c4c15b (diff) | |
| download | focaccia-qemu-513e6bde4fa551c293e7d346e27b618b57a4087a.tar.gz focaccia-qemu-513e6bde4fa551c293e7d346e27b618b57a4087a.zip | |
Merge remote-tracking branch 'qmp/queue/qmp' into staging
* qmp/queue/qmp: qapi: Convert getfd and closefd qapi: input_type_enum(): fix error message qmp: dump-guest-memory: improve schema doc
Diffstat (limited to 'qmp-commands.hx')
| -rw-r--r-- | qmp-commands.hx | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/qmp-commands.hx b/qmp-commands.hx index 2e1a38e695..e3cf3c5a1a 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -873,8 +873,7 @@ EQMP .args_type = "fdname:s", .params = "getfd name", .help = "receive a file descriptor via SCM rights and assign it a name", - .user_print = monitor_user_noop, - .mhandler.cmd_new = do_getfd, + .mhandler.cmd_new = qmp_marshal_input_getfd, }, SQMP @@ -892,6 +891,14 @@ Example: -> { "execute": "getfd", "arguments": { "fdname": "fd1" } } <- { "return": {} } +Notes: + +(1) If the name specified by the "fdname" argument already exists, + the file descriptor assigned to it will be closed and replaced + by the received file descriptor. +(2) The 'closefd' command can be used to explicitly close the file + descriptor when it is no longer needed. + EQMP { @@ -899,8 +906,7 @@ EQMP .args_type = "fdname:s", .params = "closefd name", .help = "close a file descriptor previously passed via SCM rights", - .user_print = monitor_user_noop, - .mhandler.cmd_new = do_closefd, + .mhandler.cmd_new = qmp_marshal_input_closefd, }, SQMP |