From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60705) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZlgET-0003Qz-T9 for qemu-devel@nongnu.org; Mon, 12 Oct 2015 12:45:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZlgEP-0001wA-Uw for qemu-devel@nongnu.org; Mon, 12 Oct 2015 12:45:53 -0400 Received: from mail-pa0-x22c.google.com ([2607:f8b0:400e:c03::22c]:34138) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZlgEP-0001w6-L5 for qemu-devel@nongnu.org; Mon, 12 Oct 2015 12:45:49 -0400 Received: by padhy16 with SMTP id hy16so158246572pad.1 for ; Mon, 12 Oct 2015 09:45:49 -0700 (PDT) Sender: =?UTF-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= From: marcandre.lureau@redhat.com Date: Mon, 12 Oct 2015 18:41:10 +0200 Message-Id: <1444668104-22955-17-git-send-email-marcandre.lureau@redhat.com> In-Reply-To: <1444668104-22955-1-git-send-email-marcandre.lureau@redhat.com> References: <1444668104-22955-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PULL v2 16/50] ivshmem: initialize max_peer to -1 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, drjones@redhat.com, claudio.fontana@huawei.com, stefanha@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , pbonzini@redhat.com, cam@cs.ualberta.ca From: Marc-André Lureau There is no peer when device is initialized, do not let doorbell for inexisting peer 0. Signed-off-by: Marc-André Lureau Reviewed-by: Claudio Fontana --- hw/misc/ivshmem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c index 374ecff..0716deb 100644 --- a/hw/misc/ivshmem.c +++ b/hw/misc/ivshmem.c @@ -532,8 +532,6 @@ static void ivshmem_read(void *opaque, const uint8_t *buf, int size) if (incoming_posn == -1) { void * map_ptr; - s->max_peer = 0; - if (check_shm_size(s, incoming_fd, &err) == -1) { error_report_err(err); close(incoming_fd); @@ -723,6 +721,8 @@ static void pci_ivshmem_realize(PCIDevice *dev, Error **errp) PCI_BASE_ADDRESS_MEM_PREFETCH; Error *local_err = NULL; + s->max_peer = -1; + if (s->sizearg == NULL) { s->ivshmem_size = 4 << 20; /* 4 MB default */ } else { -- 2.4.3