From: marcandre.lureau@redhat.com
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, drjones@redhat.com,
claudio.fontana@huawei.com, stefanha@redhat.com,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
pbonzini@redhat.com, cam@cs.ualberta.ca
Subject: [Qemu-devel] [PULL v2 14/50] ivshmem: allocate eventfds in resize_peers()
Date: Mon, 12 Oct 2015 18:41:08 +0200 [thread overview]
Message-ID: <1444668104-22955-15-git-send-email-marcandre.lureau@redhat.com> (raw)
In-Reply-To: <1444668104-22955-1-git-send-email-marcandre.lureau@redhat.com>
From: Marc-André Lureau <marcandre.lureau@redhat.com>
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>
---
hw/misc/ivshmem.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c
index 6f41960..19640bb 100644
--- a/hw/misc/ivshmem.c
+++ b/hw/misc/ivshmem.c
@@ -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));
- /* zero out new pointers */
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;
}
@@ -517,8 +516,7 @@ static void ivshmem_read(void *opaque, const uint8_t *buf, int size)
if (incoming_fd == -1) {
/* if posn is positive and unseen before then this is our posn*/
- if ((incoming_posn >= 0) &&
- (s->peers[incoming_posn].eventfds == NULL)) {
+ if (incoming_posn >= 0 && s->vm_id == -1) {
/* receive our posn */
s->vm_id = incoming_posn;
return;
@@ -569,11 +567,6 @@ static void ivshmem_read(void *opaque, const uint8_t *buf, int size)
* guests for each VM */
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 */
IVSHMEM_DPRINTF("eventfds[%ld][%d] = %d\n", incoming_posn,
guest_max_eventfd, incoming_fd);
--
2.4.3
next prev parent reply other threads:[~2015-10-12 16:45 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-12 16:40 [Qemu-devel] [PULL v2 00/50] Ivshmem patches marcandre.lureau
2015-10-12 16:40 ` [Qemu-devel] [PULL v2 01/50] tests: Add ivshmem qtest marcandre.lureau
2015-10-12 18:00 ` Andreas Färber
2015-10-12 16:40 ` [Qemu-devel] [PULL v2 02/50] char: add qemu_chr_free() marcandre.lureau
2015-10-12 16:40 ` [Qemu-devel] [PULL v2 03/50] msix: add VMSTATE_MSIX_TEST marcandre.lureau
2015-10-12 16:40 ` [Qemu-devel] [PULL v2 04/50] ivhsmem: read do not accept more than sizeof(long) marcandre.lureau
2015-10-12 16:40 ` [Qemu-devel] [PULL v2 05/50] ivshmem: fix number of bytes to push to fifo marcandre.lureau
2015-10-12 16:41 ` [Qemu-devel] [PULL v2 06/50] ivshmem: factor out the incoming fifo handling marcandre.lureau
2015-10-12 16:41 ` [Qemu-devel] [PULL v2 07/50] ivshmem: remove unnecessary dup() marcandre.lureau
2015-10-12 16:41 ` [Qemu-devel] [PULL v2 08/50] ivshmem: remove superflous ivshmem_attr field marcandre.lureau
2015-10-12 16:41 ` [Qemu-devel] [PULL v2 09/50] ivshmem: remove useless doorbell field marcandre.lureau
2015-10-12 16:41 ` [Qemu-devel] [PULL v2 10/50] ivshmem: more qdev conversion marcandre.lureau
2015-10-12 16:41 ` [Qemu-devel] [PULL v2 11/50] ivshmem: remove last exit(1) marcandre.lureau
2015-10-12 16:41 ` [Qemu-devel] [PULL v2 12/50] ivshmem: limit maximum number of peers to G_MAXUINT16 marcandre.lureau
2015-10-12 16:41 ` [Qemu-devel] [PULL v2 13/50] ivshmem: simplify around increase_dynamic_storage() marcandre.lureau
2015-10-12 16:41 ` marcandre.lureau [this message]
2015-10-12 16:41 ` [Qemu-devel] [PULL v2 15/50] ivshmem: remove useless ivshmem_update_irq() val argument marcandre.lureau
2015-10-12 16:41 ` [Qemu-devel] [PULL v2 16/50] ivshmem: initialize max_peer to -1 marcandre.lureau
2015-10-12 16:41 ` [Qemu-devel] [PULL v2 17/50] ivshmem: remove max_peer field marcandre.lureau
2015-10-12 16:41 ` [Qemu-devel] [PULL v2 18/50] ivshmem: improve debug messages marcandre.lureau
2015-10-12 16:41 ` [Qemu-devel] [PULL v2 19/50] ivshmem: improve error handling marcandre.lureau
2015-10-12 16:41 ` [Qemu-devel] [PULL v2 20/50] ivshmem: print error on invalid peer id marcandre.lureau
2015-10-12 16:41 ` [Qemu-devel] [PULL v2 21/50] ivshmem: simplify a bit the code marcandre.lureau
2015-10-12 16:41 ` [Qemu-devel] [PULL v2 22/50] ivshmem: use common return marcandre.lureau
2015-10-12 16:41 ` [Qemu-devel] [PULL v2 23/50] ivshmem: use common is_power_of_2() marcandre.lureau
2015-10-12 16:41 ` [Qemu-devel] [PULL v2 24/50] ivshmem: migrate with VMStateDescription marcandre.lureau
2015-10-12 16:41 ` [Qemu-devel] [PULL v2 25/50] ivshmem: shmfd can be 0 marcandre.lureau
2015-10-12 16:41 ` [Qemu-devel] [PULL v2 26/50] ivshmem: check shm isn't already initialized marcandre.lureau
2015-10-12 16:41 ` [Qemu-devel] [PULL v2 27/50] ivshmem: add device description marcandre.lureau
2015-10-12 16:41 ` [Qemu-devel] [PULL v2 28/50] ivshmem: fix pci_ivshmem_exit() marcandre.lureau
2015-10-12 16:41 ` [Qemu-devel] [PULL v2 29/50] ivshmem: replace 'guest' for 'peer' appropriately marcandre.lureau
2015-10-12 16:41 ` [Qemu-devel] [PULL v2 30/50] ivshmem: error on too many eventfd received marcandre.lureau
2015-10-12 16:41 ` [Qemu-devel] [PULL v2 31/50] ivshmem: reset mask on device reset marcandre.lureau
2015-10-12 16:41 ` [Qemu-devel] [PULL v2 32/50] contrib: add ivshmem client and server marcandre.lureau
2015-10-12 16:41 ` [Qemu-devel] [PULL v2 33/50] ivshmem-client: check the number of vectors marcandre.lureau
2015-10-12 16:41 ` [Qemu-devel] [PULL v2 34/50] ivshmem-server: use a uint16 for client ID marcandre.lureau
2015-10-12 16:41 ` [Qemu-devel] [PULL v2 35/50] ivshmem-server: fix hugetlbfs support marcandre.lureau
2015-10-12 16:41 ` [Qemu-devel] [PULL v2 36/50] docs: update ivshmem device spec marcandre.lureau
2015-10-12 16:41 ` [Qemu-devel] [PULL v2 37/50] ivshmem: add check on protocol version in QEMU marcandre.lureau
2015-10-12 16:41 ` [Qemu-devel] [PULL v2 38/50] contrib: remove unnecessary strdup() marcandre.lureau
2015-10-12 16:41 ` [Qemu-devel] [PULL v2 39/50] msix: implement pba write (but read-only) marcandre.lureau
2015-10-12 16:41 ` [Qemu-devel] [PULL v2 40/50] qtest: add qtest_add_abrt_handler() marcandre.lureau
2015-10-12 16:41 ` [Qemu-devel] [PULL v2 41/50] glib-compat: add 2.38/2.40/2.46 asserts marcandre.lureau
2015-10-12 16:41 ` [Qemu-devel] [PULL v2 42/50] tests: add ivshmem qtest marcandre.lureau
2015-10-12 16:41 ` [Qemu-devel] [PULL v2 43/50] ivshmem: do not keep shm_fd open marcandre.lureau
2015-10-12 16:41 ` [Qemu-devel] [PULL v2 44/50] ivshmem: use qemu_strtosz() marcandre.lureau
2015-10-12 16:41 ` [Qemu-devel] [PULL v2 45/50] ivshmem: add hostmem backend marcandre.lureau
2015-10-12 16:41 ` [Qemu-devel] [PULL v2 46/50] ivshmem: remove EventfdEntry.vector marcandre.lureau
2015-10-12 16:41 ` [Qemu-devel] [PULL v2 47/50] ivshmem: rename MSI eventfd_table marcandre.lureau
2015-10-12 16:41 ` [Qemu-devel] [PULL v2 48/50] ivshmem: use kvm irqfd for msi notifications marcandre.lureau
2015-10-12 16:41 ` [Qemu-devel] [PULL v2 49/50] ivshmem: use little-endian int64_t for the protocol marcandre.lureau
2015-10-12 16:41 ` [Qemu-devel] [PULL v2 50/50] doc: document ivshmem & hugepages marcandre.lureau
2015-10-13 9:29 ` [Qemu-devel] [PULL v2 00/50] Ivshmem patches Peter Maydell
2015-10-13 13:01 ` Paolo Bonzini
2015-10-13 13:04 ` Marc-André Lureau
2015-10-13 15:29 ` Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1444668104-22955-15-git-send-email-marcandre.lureau@redhat.com \
--to=marcandre.lureau@redhat.com \
--cc=cam@cs.ualberta.ca \
--cc=claudio.fontana@huawei.com \
--cc=drjones@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).