From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52425) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W39Te-0005tp-SB for qemu-devel@nongnu.org; Tue, 14 Jan 2014 14:16:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W39TU-0000yM-UZ for qemu-devel@nongnu.org; Tue, 14 Jan 2014 14:16:42 -0500 Received: from e38.co.us.ibm.com ([32.97.110.159]:52962) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W39TU-0000yI-Oi for qemu-devel@nongnu.org; Tue, 14 Jan 2014 14:16:32 -0500 Received: from /spool/local by e38.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 14 Jan 2014 12:16:32 -0700 Received: from b03cxnp08025.gho.boulder.ibm.com (b03cxnp08025.gho.boulder.ibm.com [9.17.130.17]) by d03dlp03.boulder.ibm.com (Postfix) with ESMTP id AA0F819D8042 for ; Tue, 14 Jan 2014 12:16:20 -0700 (MST) Received: from d03av03.boulder.ibm.com (d03av03.boulder.ibm.com [9.17.195.169]) by b03cxnp08025.gho.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id s0EJGTU76488446 for ; Tue, 14 Jan 2014 20:16:29 +0100 Received: from d03av03.boulder.ibm.com (localhost [127.0.0.1]) by d03av03.boulder.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id s0EJGTaf013475 for ; Tue, 14 Jan 2014 12:16:29 -0700 From: Eric Farman Date: Tue, 14 Jan 2014 14:16:26 -0500 Message-Id: <1389726986-8600-4-git-send-email-farman@linux.vnet.ibm.com> In-Reply-To: <1389726986-8600-1-git-send-email-farman@linux.vnet.ibm.com> References: <1389726986-8600-1-git-send-email-farman@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v2 3/3] scsi/virtio-scsi: Prevent assertion on missed events List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini In some cases, an unplug can cause events to be dropped, which leads to an assertion failure when preparing to notify the guest kernel. Signed-off-by: Eric Farman --- hw/scsi/virtio-scsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c index 1da98cd..6610b3a 100644 --- a/hw/scsi/virtio-scsi.c +++ b/hw/scsi/virtio-scsi.c @@ -520,7 +520,7 @@ static void virtio_scsi_push_event(VirtIOSCSI *s, SCSIDevice *dev, evt->event = event; evt->reason = reason; if (!dev) { - assert(event == VIRTIO_SCSI_T_NO_EVENT); + assert(event == VIRTIO_SCSI_T_EVENTS_MISSED); } else { evt->lun[0] = 1; evt->lun[1] = dev->id; -- 1.7.9.5