ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ivshmem: allocate eventfds in resize_peers() 

It simplifies a bit the code to allocate the array when setting the
number of peers instead of lazily when receiving the first vector.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Claudio Fontana <claudio.fontana@huawei.com>
This commit is contained in:
Marc-André Lureau 2015-09-15 17:23:07 +02:00
parent 1300b2733a
commit 81e507f0bc
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/misc/ivshmem.c
View File

@ -437,9 +437,8 @@ static int resize_peers(IVShmemState *s, int new_min_size)
s->peers = g_realloc(s->peers, s->nb_peers * sizeof(Peer)); s->peers = g_realloc(s->peers, s->nb_peers * sizeof(Peer));
/* zero out new pointers */
for (j = old_size; j < s->nb_peers; j++) { for (j = old_size; j < s->nb_peers; j++) {
s->peers[j].eventfds = NULL; s->peers[j].eventfds = g_new0(EventNotifier, s->vectors);
s->peers[j].nb_eventfds = 0; s->peers[j].nb_eventfds = 0;
} }
@ -517,8 +516,7 @@ static void ivshmem_read(void *opaque, const uint8_t *buf, int size)
if (incoming_fd == -1) { if (incoming_fd == -1) {
/* if posn is positive and unseen before then this is our posn*/ /* if posn is positive and unseen before then this is our posn*/
if ((incoming_posn >= 0) && if (incoming_posn >= 0 && s->vm_id == -1) {
(s->peers[incoming_posn].eventfds == NULL)) {
/* receive our posn */ /* receive our posn */
s->vm_id = incoming_posn; s->vm_id = incoming_posn;
return; return;
@ -569,11 +567,6 @@ static void ivshmem_read(void *opaque, const uint8_t *buf, int size)
* guests for each VM */ * guests for each VM */
guest_max_eventfd = s->peers[incoming_posn].nb_eventfds; guest_max_eventfd = s->peers[incoming_posn].nb_eventfds;
if (guest_max_eventfd == 0) {
/* one eventfd per MSI vector */
s->peers[incoming_posn].eventfds = g_new(EventNotifier, s->vectors);
}
/* this is an eventfd for a particular guest VM */ /* this is an eventfd for a particular guest VM */
IVSHMEM_DPRINTF("eventfds[%ld][%d] = %d\n", incoming_posn, IVSHMEM_DPRINTF("eventfds[%ld][%d] = %d\n", incoming_posn,
guest_max_eventfd, incoming_fd); guest_max_eventfd, incoming_fd);