From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:55231) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TLxBa-0004dO-1f for qemu-devel@nongnu.org; Wed, 10 Oct 2012 10:23:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TLxBV-0000ld-3p for qemu-devel@nongnu.org; Wed, 10 Oct 2012 10:22:57 -0400 Received: from e2.ny.us.ibm.com ([32.97.182.142]:41522) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TLxBU-0000lX-Vg for qemu-devel@nongnu.org; Wed, 10 Oct 2012 10:22:53 -0400 Received: from /spool/local by e2.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 10 Oct 2012 10:22:52 -0400 Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d01relay04.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q9AEKNkM032202 for ; Wed, 10 Oct 2012 10:20:23 -0400 Received: from d03av02.boulder.ibm.com (loopback [127.0.0.1]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q9AEKCal024385 for ; Wed, 10 Oct 2012 08:20:12 -0600 From: Corey Bryant Date: Wed, 10 Oct 2012 10:20:03 -0400 Message-Id: <1349878805-16352-2-git-send-email-coreyb@linux.vnet.ibm.com> In-Reply-To: <1349878805-16352-1-git-send-email-coreyb@linux.vnet.ibm.com> References: <1349878805-16352-1-git-send-email-coreyb@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v2 1/3] monitor: Allow add-fd to any specified fd set List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, libvir-list@redhat.com, Corey Bryant The first call to add an fd to an fd set was previously not allowed to choose the fd set ID. The ID was generated as the first available and ensuing calls could add more fds by specifying the fd set ID. This change allows users to choose the fd set ID on the first call. Signed-off-by: Corey Bryant --- v2: -This patch is new in v2 monitor.c | 41 ++++++++++++++++++++++++++--------------- qapi-schema.json | 1 - 2 files changed, 26 insertions(+), 16 deletions(-) diff --git a/monitor.c b/monitor.c index a0e3ffb..e53e733 100644 --- a/monitor.c +++ b/monitor.c @@ -2141,7 +2141,7 @@ AddfdInfo *qmp_add_fd(bool has_fdset_id, int64_t fdset_id, bool has_opaque, { int fd; Monitor *mon = cur_mon; - MonFdset *mon_fdset; + MonFdset *mon_fdset = NULL; MonFdsetFd *mon_fdset_fd; AddfdInfo *fdinfo; @@ -2157,27 +2157,38 @@ AddfdInfo *qmp_add_fd(bool has_fdset_id, int64_t fdset_id, bool has_opaque, break; } } - if (mon_fdset == NULL) { - error_set(errp, QERR_INVALID_PARAMETER_VALUE, "fdset-id", - "an existing fdset-id"); - goto error; - } - } else { + } + + if (mon_fdset == NULL) { int64_t fdset_id_prev = -1; MonFdset *mon_fdset_cur = QLIST_FIRST(&mon_fdsets); - /* Use first available fdset ID */ - QLIST_FOREACH(mon_fdset, &mon_fdsets, next) { - mon_fdset_cur = mon_fdset; - if (fdset_id_prev == mon_fdset_cur->id - 1) { - fdset_id_prev = mon_fdset_cur->id; - continue; + if (has_fdset_id) { + /* Use specified fdset ID */ + QLIST_FOREACH(mon_fdset, &mon_fdsets, next) { + mon_fdset_cur = mon_fdset; + if (fdset_id < mon_fdset_cur->id) { + break; + } + } + } else { + /* Use first available fdset ID */ + QLIST_FOREACH(mon_fdset, &mon_fdsets, next) { + mon_fdset_cur = mon_fdset; + if (fdset_id_prev == mon_fdset_cur->id - 1) { + fdset_id_prev = mon_fdset_cur->id; + continue; + } + break; } - break; } mon_fdset = g_malloc0(sizeof(*mon_fdset)); - mon_fdset->id = fdset_id_prev + 1; + if (has_fdset_id) { + mon_fdset->id = fdset_id; + } else { + mon_fdset->id = fdset_id_prev + 1; + } /* The fdset list is ordered by fdset ID */ if (mon_fdset->id == 0) { diff --git a/qapi-schema.json b/qapi-schema.json index f9dbdae..06a7aa2 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -2611,7 +2611,6 @@ # # Returns: @AddfdInfo on success # If file descriptor was not received, FdNotSupplied -# If @fdset-id does not exist, InvalidParameterValue # # Notes: The list of fd sets is shared by all monitor connections. # -- 1.7.11.4