[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 32/39] ivshmem-server: use a uint16 for client ID
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH 32/39] ivshmem-server: use a uint16 for client ID |
Date: |
Fri, 26 Jun 2015 16:49:38 +0200 |
In practice, the number of VM is limited to MAXUINT16 in ivshmem, so use
the same limit on the server.
Signed-off-by: Marc-André Lureau <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 f85dcd2..47f715c 100644
--- a/contrib/ivshmem-server/ivshmem-server.h
+++ b/contrib/ivshmem-server/ivshmem-server.h
@@ -68,7 +68,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] [PATCH 22/39] ivshmem: migrate with VMStateDescription, (continued)
- [Qemu-devel] [PATCH 22/39] ivshmem: migrate with VMStateDescription, Marc-André Lureau, 2015/06/26
- [Qemu-devel] [PATCH 21/39] ivshmem: use common is_power_of_2(), Marc-André Lureau, 2015/06/26
- [Qemu-devel] [PATCH 24/39] ivshmem: check shm isn't already initialized, Marc-André Lureau, 2015/06/26
- [Qemu-devel] [PATCH 23/39] ivshmem: shmfd can be 0, Marc-André Lureau, 2015/06/26
- [Qemu-devel] [PATCH 25/39] ivshmem: add device description, Marc-André Lureau, 2015/06/26
- [Qemu-devel] [PATCH 26/39] ivshmem: fix pci_ivshmem_exit(), Marc-André Lureau, 2015/06/26
- [Qemu-devel] [PATCH 28/39] ivshmem: error on too many eventfd received, Marc-André Lureau, 2015/06/26
- [Qemu-devel] [PATCH 27/39] ivshmem: replace 'guest' for 'peer' appropriately, Marc-André Lureau, 2015/06/26
- [Qemu-devel] [PATCH 29/39] ivshmem: reset mask on device reset, Marc-André Lureau, 2015/06/26
- [Qemu-devel] [PATCH 31/39] ivshmem-client: check the number of vectors, Marc-André Lureau, 2015/06/26
- [Qemu-devel] [PATCH 32/39] ivshmem-server: use a uint16 for client ID,
Marc-André Lureau <=
- [Qemu-devel] [PATCH 33/39] ivshmem-server: include necessary headers, Marc-André Lureau, 2015/06/26
- [Qemu-devel] [PATCH 30/39] contrib: add ivshmem client and server, Marc-André Lureau, 2015/06/26
- [Qemu-devel] [PATCH 34/39] docs: update ivshmem device spec, Marc-André Lureau, 2015/06/26
- [Qemu-devel] [PATCH 36/39] contrib: remove unnecessary strdup(), Marc-André Lureau, 2015/06/26
- [Qemu-devel] [PATCH 35/39] ivshmem: add check on protocol version in QEMU, Marc-André Lureau, 2015/06/26
- [Qemu-devel] [PATCH 37/39] msix: implement read-only pba write, Marc-André Lureau, 2015/06/26
- [Qemu-devel] [PATCH 38/39] qtest: add qtest_add_abrt_handler(), Marc-André Lureau, 2015/06/26
- [Qemu-devel] [PATCH 39/39] tests: Add ivshmem qtest, Marc-André Lureau, 2015/06/26