[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 2/3] monitor: add Error * argument to monitor_ge
From: |
Markus Armbruster |
Subject: |
Re: [Qemu-devel] [PATCH 2/3] monitor: add Error * argument to monitor_get_fd |
Date: |
Tue, 25 Sep 2012 13:06:43 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.1 (gnu/linux) |
Luiz Capitulino <address@hidden> writes:
> From: Paolo Bonzini <address@hidden>
>
> Signed-off-by: Paolo Bonzini <address@hidden>
> Signed-off-by: Luiz Capitulino <address@hidden>
> ---
> dump.c | 3 +--
> migration-fd.c | 2 +-
> monitor.c | 15 +++++++++------
> monitor.h | 2 +-
> 4 files changed, 12 insertions(+), 10 deletions(-)
>
> diff --git a/dump.c b/dump.c
> index 2bf8d8d..1a3c716 100644
> --- a/dump.c
> +++ b/dump.c
> @@ -836,9 +836,8 @@ void qmp_dump_guest_memory(bool paging, const char *file,
> bool has_begin,
>
> #if !defined(WIN32)
> if (strstart(file, "fd:", &p)) {
> - fd = monitor_get_fd(cur_mon, p);
> + fd = monitor_get_fd(cur_mon, p, errp);
> if (fd == -1) {
> - error_set(errp, QERR_FD_NOT_FOUND, p);
> return;
> }
> }
> diff --git a/migration-fd.c b/migration-fd.c
> index 50138ed..7335167 100644
> --- a/migration-fd.c
> +++ b/migration-fd.c
> @@ -75,7 +75,7 @@ static int fd_close(MigrationState *s)
>
> int fd_start_outgoing_migration(MigrationState *s, const char *fdname)
> {
> - s->fd = monitor_get_fd(cur_mon, fdname);
> + s->fd = monitor_get_fd(cur_mon, fdname, NULL);
> if (s->fd == -1) {
> DPRINTF("fd_migration: invalid file descriptor identifier\n");
> goto err_after_get_fd;
> diff --git a/monitor.c b/monitor.c
> index 67064e2..645f8f4 100644
> --- a/monitor.c
> +++ b/monitor.c
> @@ -951,7 +951,7 @@ static int add_graphics_client(Monitor *mon, const QDict
> *qdict, QObject **ret_d
> CharDriverState *s;
>
> if (strcmp(protocol, "spice") == 0) {
> - int fd = monitor_get_fd(mon, fdname);
> + int fd = monitor_get_fd(mon, fdname, NULL);
> int skipauth = qdict_get_try_bool(qdict, "skipauth", 0);
> int tls = qdict_get_try_bool(qdict, "tls", 0);
> if (!using_spice) {
> @@ -965,13 +965,13 @@ static int add_graphics_client(Monitor *mon, const
> QDict *qdict, QObject **ret_d
> return 0;
> #ifdef CONFIG_VNC
> } else if (strcmp(protocol, "vnc") == 0) {
> - int fd = monitor_get_fd(mon, fdname);
> + int fd = monitor_get_fd(mon, fdname, NULL);
> int skipauth = qdict_get_try_bool(qdict, "skipauth", 0);
> vnc_display_add_client(NULL, fd, skipauth);
> return 0;
> #endif
> } else if ((s = qemu_chr_find(protocol)) != NULL) {
> - int fd = monitor_get_fd(mon, fdname);
> + int fd = monitor_get_fd(mon, fdname, NULL);
> if (qemu_chr_add_client(s, fd) < 0) {
> qerror_report(QERR_ADD_CLIENT_FAILED);
> return -1;
> @@ -2118,7 +2118,7 @@ static void do_loadvm(Monitor *mon, const QDict *qdict)
> }
> }
>
> -int monitor_get_fd(Monitor *mon, const char *fdname)
> +int monitor_get_fd(Monitor *mon, const char *fdname, Error **errp)
> {
> mon_fd_t *monfd;
>
> @@ -2139,6 +2139,7 @@ int monitor_get_fd(Monitor *mon, const char *fdname)
> return fd;
> }
>
> + error_setg(errp, "File description named '%s' has not been found",
> fdname);
"File descriptor", please.
I'd also s/has not been found/not found/, but that's a matter of taste.
> return -1;
> }
>
> @@ -2410,12 +2411,14 @@ int monitor_fdset_dup_fd_remove(int dup_fd)
[...]