From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:42642) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Szq5h-0003X5-Oa for qemu-devel@nongnu.org; Fri, 10 Aug 2012 10:21:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Szq5c-0003fR-BR for qemu-devel@nongnu.org; Fri, 10 Aug 2012 10:21:29 -0400 Received: from e5.ny.us.ibm.com ([32.97.182.145]:52042) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Szq5c-0003f2-7r for qemu-devel@nongnu.org; Fri, 10 Aug 2012 10:21:24 -0400 Received: from /spool/local by e5.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 10 Aug 2012 10:21:23 -0400 Received: from d01relay01.pok.ibm.com (d01relay01.pok.ibm.com [9.56.227.233]) by d01dlp03.pok.ibm.com (Postfix) with ESMTP id 80ABAC9004A for ; Fri, 10 Aug 2012 10:21:20 -0400 (EDT) Received: from d01av02.pok.ibm.com (d01av02.pok.ibm.com [9.56.224.216]) by d01relay01.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q7AELKig142930 for ; Fri, 10 Aug 2012 10:21:20 -0400 Received: from d01av02.pok.ibm.com (loopback [127.0.0.1]) by d01av02.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q7AELJ9p004461 for ; Fri, 10 Aug 2012 11:21:19 -0300 Message-ID: <502518DD.6030302@linux.vnet.ibm.com> Date: Fri, 10 Aug 2012 10:21:17 -0400 From: Corey Bryant MIME-Version: 1.0 References: <1344564649-6272-1-git-send-email-coreyb@linux.vnet.ibm.com> <1344564649-6272-3-git-send-email-coreyb@linux.vnet.ibm.com> <20120810072016.GA2464@stefanha-thinkpad.localdomain> In-Reply-To: <20120810072016.GA2464@stefanha-thinkpad.localdomain> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v8 2/7] qapi: Introduce add-fd, remove-fd, query-fdsets List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefan Hajnoczi Cc: kwolf@redhat.com, aliguori@us.ibm.com, libvir-list@redhat.com, qemu-devel@nongnu.org, lcapitulino@redhat.com, pbonzini@redhat.com, eblake@redhat.com On 08/10/2012 03:20 AM, Stefan Hajnoczi wrote: > On Thu, Aug 09, 2012 at 10:10:44PM -0400, Corey Bryant wrote: >> +void qmp_remove_fd(int64_t fdset_id, bool has_fd, int64_t fd, Error **errp) >> +{ >> + MonFdset *mon_fdset; >> + MonFdsetFd *mon_fdset_fd; >> + char fd_str[20]; >> + >> + QLIST_FOREACH(mon_fdset, &mon_fdsets, next) { >> + if (mon_fdset->id != fdset_id) { >> + continue; >> + } >> + QLIST_FOREACH(mon_fdset_fd, &mon_fdset->fds, next) { >> + if (has_fd && mon_fdset_fd->fd != fd) { >> + continue; >> + } >> + mon_fdset_fd->removed = true; >> + if (has_fd) { >> + break; >> + } >> + } >> + monitor_fdset_cleanup(mon_fdset); >> + return; >> + } >> + snprintf(fd_str, sizeof(fd_str), "%" PRId64, fd); >> + error_set(errp, QERR_FD_NOT_FOUND, fd_str); > > fd is optional and may be uninitialized. I think the human-readable > string should be: > > if has_fd: > fd_str = '%s:%s' % (fdset_id, fd) > else: > fd_str = '%s' % fdset_id > > Otherwise, looks good. > Good point, thanks. I'll fix this. -- Regards, Corey