[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 33/48] ivshmem-server: use a uint16 for client ID
From: |
marcandre . lureau |
Subject: |
[Qemu-devel] [PULL 33/48] ivshmem-server: use a uint16 for client ID |
Date: |
Tue, 6 Oct 2015 21:19:29 +0200 |
From: Marc-André Lureau <address@hidden>
In practice, the number of VM is limited to MAXUINT16 in ivshmem, so use
the same limit on the server (removes a theorical infinite loop)
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Claudio Fontana <address@hidden>
---
contrib/ivshmem-server/ivshmem-server.c | 11 ++++++++++-
contrib/ivshmem-server/ivshmem-server.h | 2 +-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/contrib/ivshmem-server/ivshmem-server.c
b/contrib/ivshmem-server/ivshmem-server.c
index 16ee583..972fda2 100644
--- a/contrib/ivshmem-server/ivshmem-server.c
+++ b/contrib/ivshmem-server/ivshmem-server.c
@@ -145,9 +145,18 @@ ivshmem_server_handle_new_conn(IvshmemServer *server)
peer->sock_fd = newfd;
/* get an unused peer id */
- while (ivshmem_server_search_peer(server, server->cur_id) != NULL) {
+ /* XXX: this could use id allocation such as Linux IDA, or simply
+ * a free-list */
+ for (i = 0; i < G_MAXUINT16; i++) {
+ if (ivshmem_server_search_peer(server, server->cur_id) == NULL) {
+ break;
+ }
server->cur_id++;
}
+ if (i == G_MAXUINT16) {
+ IVSHMEM_SERVER_DEBUG(server, "cannot allocate new client id\n");
+ goto fail;
+ }
peer->id = server->cur_id++;
/* create eventfd, one per vector */
diff --git a/contrib/ivshmem-server/ivshmem-server.h
b/contrib/ivshmem-server/ivshmem-server.h
index cd584fc..2176d5e 100644
--- a/contrib/ivshmem-server/ivshmem-server.h
+++ b/contrib/ivshmem-server/ivshmem-server.h
@@ -70,7 +70,7 @@ typedef struct IvshmemServer {
size_t shm_size; /**< size of shm */
int shm_fd; /**< shm file descriptor */
unsigned n_vectors; /**< number of vectors */
- long cur_id; /**< id to be given to next client */
+ uint16_t cur_id; /**< id to be given to next client */
bool verbose; /**< true in verbose mode */
IvshmemServerPeerList peer_list; /**< list of peers */
} IvshmemServer;
--
2.4.3
- [Qemu-devel] [PULL 43/48] ivshmem: use qemu_strtosz(), (continued)
- [Qemu-devel] [PULL 43/48] ivshmem: use qemu_strtosz(), marcandre . lureau, 2015/10/08
- [Qemu-devel] [PULL 19/48] ivshmem: print error on invalid peer id, marcandre . lureau, 2015/10/08
- [Qemu-devel] [PULL 34/48] ivshmem-server: fix hugetlbfs support, marcandre . lureau, 2015/10/08
- [Qemu-devel] [PULL 11/48] ivshmem: limit maximum number of peers to G_MAXUINT16, marcandre . lureau, 2015/10/08
- [Qemu-devel] [PULL 32/48] ivshmem-client: check the number of vectors, marcandre . lureau, 2015/10/08
- [Qemu-devel] [PULL 13/48] ivshmem: allocate eventfds in resize_peers(), marcandre . lureau, 2015/10/08
- [Qemu-devel] [PULL 05/48] ivshmem: factor out the incoming fifo handling, marcandre . lureau, 2015/10/08
- [Qemu-devel] [PULL 08/48] ivshmem: remove useless doorbell field, marcandre . lureau, 2015/10/08
- [Qemu-devel] [PULL 14/48] ivshmem: remove useless ivshmem_update_irq() val argument, marcandre . lureau, 2015/10/08
- [Qemu-devel] [PULL 28/48] ivshmem: replace 'guest' for 'peer' appropriately, marcandre . lureau, 2015/10/08
- [Qemu-devel] [PULL 33/48] ivshmem-server: use a uint16 for client ID,
marcandre . lureau <=
- [Qemu-devel] [PULL 07/48] ivshmem: remove superflous ivshmem_attr field, marcandre . lureau, 2015/10/08
- [Qemu-devel] [PULL 17/48] ivshmem: improve debug messages, marcandre . lureau, 2015/10/08
- [Qemu-devel] [PULL 21/48] ivshmem: use common return, marcandre . lureau, 2015/10/08
- [Qemu-devel] [PULL 09/48] ivshmem: more qdev conversion, marcandre . lureau, 2015/10/08
- [Qemu-devel] [PULL 48/48] ivshmem: use little-endian int64_t for the protocol, marcandre . lureau, 2015/10/08
- [Qemu-devel] [PULL 06/48] ivshmem: remove unnecessary dup(), marcandre . lureau, 2015/10/08
- [Qemu-devel] [PULL 02/48] msix: add VMSTATE_MSIX_TEST, marcandre . lureau, 2015/10/08
- [Qemu-devel] [PULL 15/48] ivshmem: initialize max_peer to -1, marcandre . lureau, 2015/10/08
- [Qemu-devel] [PULL 18/48] ivshmem: improve error handling, marcandre . lureau, 2015/10/08
- [Qemu-devel] [PULL 25/48] ivshmem: check shm isn't already initialized, marcandre . lureau, 2015/10/08