aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2009-12-07 21:37:15 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2009-12-07 16:36:50 -0600
commit13a2ccc46f66ffb0a6434e3b1319bf0ebd81ac54 (patch)
tree1687f403bf95d87df4522b8235db4eb6a2db6d8f /monitor.c
parentQError: New QERR_TOO_MANY_FILES (diff)
downloadqemu-kvm-13a2ccc46f66ffb0a6434e3b1319bf0ebd81ac54.tar.gz
qemu-kvm-13a2ccc46f66ffb0a6434e3b1319bf0ebd81ac54.tar.bz2
qemu-kvm-13a2ccc46f66ffb0a6434e3b1319bf0ebd81ac54.zip
monitor: convert do_getfd() to QError
Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 7cdfcfe18f0a9e8603e4a14770a84eb5649521c5)
Diffstat (limited to 'monitor.c')
-rw-r--r--monitor.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/monitor.c b/monitor.c
index 91cb2ce35..16d611e5a 100644
--- a/monitor.c
+++ b/monitor.c
@@ -2071,19 +2071,21 @@ static void do_getfd(Monitor *mon, const QDict *qdict, QObject **ret_data)
fd = qemu_chr_get_msgfd(mon->chr);
if (fd == -1) {
- monitor_printf(mon, "getfd: no file descriptor supplied via SCM_RIGHTS\n");
+ qemu_error_new(QERR_FD_NOT_SUPPLIED);
return;
}
if (qemu_isdigit(fdname[0])) {
- monitor_printf(mon, "getfd: monitor names may not begin with a number\n");
+ qemu_error_new(QERR_INVALID_PARAMETER, "fdname");
return;
}
fd = dup(fd);
if (fd == -1) {
- monitor_printf(mon, "Failed to dup() file descriptor: %s\n",
- strerror(errno));
+ if (errno == EMFILE)
+ qemu_error_new(QERR_TOO_MANY_FILES);
+ else
+ qemu_error_new(QERR_UNDEFINED_ERROR);
return;
}