From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58357) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZjXnf-0000xc-1Y for qemu-devel@nongnu.org; Tue, 06 Oct 2015 15:21:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZjXn7-00049e-PQ for qemu-devel@nongnu.org; Tue, 06 Oct 2015 15:21:22 -0400 Received: from mail-qg0-x232.google.com ([2607:f8b0:400d:c04::232]:33334) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZjXn6-00046g-Vw for qemu-devel@nongnu.org; Tue, 06 Oct 2015 15:20:49 -0400 Received: by qgev79 with SMTP id v79so183471351qge.0 for ; Tue, 06 Oct 2015 12:20:46 -0700 (PDT) Sender: =?UTF-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= From: marcandre.lureau@redhat.com Date: Tue, 6 Oct 2015 21:19:11 +0200 Message-Id: <1444159184-18153-16-git-send-email-marcandre.lureau@redhat.com> In-Reply-To: <1444159184-18153-1-git-send-email-marcandre.lureau@redhat.com> References: <1444159184-18153-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 15/48] ivshmem: initialize max_peer to -1 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: peter.maydell@linaro.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-devel@nongnu.org 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