From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:46309) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TELJe-000890-MR for qemu-devel@nongnu.org; Wed, 19 Sep 2012 10:32:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TELJd-0005G6-IT for qemu-devel@nongnu.org; Wed, 19 Sep 2012 10:31:50 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:38427) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TELJd-0005Fw-Cn for qemu-devel@nongnu.org; Wed, 19 Sep 2012 10:31:49 -0400 Received: by padfb10 with SMTP id fb10so31777pad.4 for ; Wed, 19 Sep 2012 07:31:48 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 19 Sep 2012 16:31:04 +0200 Message-Id: <1348065078-5139-2-git-send-email-pbonzini@redhat.com> In-Reply-To: <1348065078-5139-1-git-send-email-pbonzini@redhat.com> References: <1348065078-5139-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 01/12] monitor: use monitor_handle_fd_param for non-Error-friendly users of named fds List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: lcapitulino@redhat.com monitor_handle_fd_param and monitor_get_fd are mostly the same, except that monitor_handle_fd_param does error reporting wrong. Use it in all other places that do it wrong, instead of reinventing it. Signed-off-by: Paolo Bonzini --- hw/kvm/pci-assign.c | 4 +--- migration-fd.c | 3 +-- monitor.c | 6 +++--- 3 file modificati, 5 inserzioni(+), 8 rimozioni(-) diff --git a/hw/kvm/pci-assign.c b/hw/kvm/pci-assign.c index 05b93d9..8b96a57 100644 --- a/hw/kvm/pci-assign.c +++ b/hw/kvm/pci-assign.c @@ -582,10 +582,8 @@ static int get_real_device(AssignedDevice *pci_dev, uint16_t r_seg, if (qemu_isdigit(pci_dev->configfd_name[0])) { dev->config_fd = strtol(pci_dev->configfd_name, NULL, 0); } else { - dev->config_fd = monitor_get_fd(cur_mon, pci_dev->configfd_name); + dev->config_fd = monitor_handle_fd_param(cur_mon, pci_dev->configfd_name); if (dev->config_fd < 0) { - error_report("%s: (%s) unkown", __func__, - pci_dev->configfd_name); return 1; } } diff --git a/migration-fd.c b/migration-fd.c index 50138ed..3eb53d9 100644 --- a/migration-fd.c +++ b/migration-fd.c @@ -75,9 +75,8 @@ 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_handle_fd_param(cur_mon, fdname); 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..4901600 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_handle_fd_param(mon, fdname); 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_handle_fd_param(mon, fdname); 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_handle_fd_param(mon, fdname); if (qemu_chr_add_client(s, fd) < 0) { qerror_report(QERR_ADD_CLIENT_FAILED); return -1; -- 1.7.12