Commit-ID: 80d342ebe7c68f2240e05e7698317ef7f7baeca2
Gitweb: http://git.kernel.org/tip/80d342ebe7c68f2240e05e7698317ef7f7baeca2
Author: Asias He <asias.hejun@xxxxxxxxx>
AuthorDate: Thu, 22 Dec 2011 10:10:42 +0800
Committer: Pekka Enberg <penberg@xxxxxxxxxx>
CommitDate: Thu, 22 Dec 2011 16:06:51 +0200
kvm tools: Handle multiple IPC cmd at a time
This is useful when client submiting multiple IPC cmd in one socket
connection.
Signed-off-by: Asias He <asias.hejun@xxxxxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx>
---
tools/kvm/kvm-ipc.c | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/tools/kvm/kvm-ipc.c b/tools/kvm/kvm-ipc.c
index 2036b91..dbe2363 100644
--- a/tools/kvm/kvm-ipc.c
+++ b/tools/kvm/kvm-ipc.c
@@ -102,7 +102,7 @@ static void kvm_ipc__close_conn(int fd)
close(fd);
}
-static void kvm_ipc__receive(int fd)
+static int kvm_ipc__receive(int fd)
{
struct kvm_ipc_head head;
u8 *msg = NULL;
@@ -122,8 +122,11 @@ static void kvm_ipc__receive(int fd)
kvm_ipc__handle(fd, head.type, head.len, msg);
+ return 0;
+
done:
free(msg);
+ return -1;
}
static void *kvm_ipc__thread(void *param)
@@ -140,10 +143,16 @@ static void *kvm_ipc__thread(void *param)
if (fd == stop_fd && event.events & EPOLLIN) {
break;
} else if (fd == server_fd) {
- int client;
+ int client, r;
client = kvm_ipc__new_conn(fd);
- kvm_ipc__receive(client);
+ /*
+ * Handle multiple IPC cmd at a time
+ */
+ do {
+ r = kvm_ipc__receive(client);
+ } while (r == 0);
+
} else if (event.events && (EPOLLERR | EPOLLRDHUP | EPOLLHUP)) {
kvm_ipc__close_conn(fd);
} else {
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|