From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55510) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aQaJ5-0004yi-QI for qemu-devel@nongnu.org; Tue, 02 Feb 2016 07:43:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aQaJ3-0001y9-Ll for qemu-devel@nongnu.org; Tue, 02 Feb 2016 07:43:43 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53390) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aQaJ3-0001xs-GI for qemu-devel@nongnu.org; Tue, 02 Feb 2016 07:43:41 -0500 From: marcandre.lureau@redhat.com Date: Tue, 2 Feb 2016 13:43:30 +0100 Message-Id: <1454417016-3913-3-git-send-email-marcandre.lureau@redhat.com> In-Reply-To: <1454417016-3913-1-git-send-email-marcandre.lureau@redhat.com> References: <1454417016-3913-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 2/8] ivshmem: remove redundant assignment, fix crash with msi=off List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: claudio.fontana@huawei.com, armbru@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= From: Marc-Andr=C3=A9 Lureau Fix crash when msi=3Dfalse introduced in 660c97ee (msi_vectors is NULL in this case) Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Markus Armbruster --- hw/misc/ivshmem.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c index 358df24..5029789 100644 --- a/hw/misc/ivshmem.c +++ b/hw/misc/ivshmem.c @@ -355,12 +355,9 @@ static CharDriverState* create_eventfd_chr_device(IV= ShmemState *s, int vector) { /* create a event character device based on the passed eventfd */ - PCIDevice *pdev =3D PCI_DEVICE(s); int eventfd =3D event_notifier_get_fd(n); CharDriverState *chr; =20 - s->msi_vectors[vector].pdev =3D pdev; - chr =3D qemu_chr_open_eventfd(eventfd); =20 if (chr =3D=3D NULL) { --=20 2.5.0