OSDN Git Service

monitor: Convert do_closefd() to QObject
authorLuiz Capitulino <lcapitulino@redhat.com>
Fri, 16 Oct 2009 15:23:51 +0000 (12:23 -0300)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 27 Oct 2009 17:28:58 +0000 (12:28 -0500)
Note that errors are not being converted yet.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
monitor.c
qemu-monitor.hx

index eee4b80..109ff5c 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -1889,7 +1889,7 @@ static void do_getfd(Monitor *mon, const QDict *qdict, QObject **ret_data)
     QLIST_INSERT_HEAD(&mon->fds, monfd, next);
 }
 
-static void do_closefd(Monitor *mon, const QDict *qdict)
+static void do_closefd(Monitor *mon, const QDict *qdict, QObject **ret_data)
 {
     const char *fdname = qdict_get_str(qdict, "fdname");
     mon_fd_t *monfd;
index cc4487e..bb01c14 100644 (file)
@@ -1029,7 +1029,8 @@ ETEXI
         .args_type  = "fdname:s",
         .params     = "closefd name",
         .help       = "close a file descriptor previously passed via SCM rights",
-        .mhandler.cmd = do_closefd,
+        .user_print = monitor_user_noop,
+        .mhandler.cmd_new = do_closefd,
     },
 
 STEXI