cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-virtio-scsi-Prevent-assertion-on-missed-events.patch

34b321
From 3fdd5ce3ece26d5fd0d7702e08167bf5e513f620 Mon Sep 17 00:00:00 2001
34b321
From: Fam Zheng <famz@redhat.com>
34b321
Date: Mon, 18 Apr 2016 02:50:12 +0200
34b321
Subject: [PATCH 01/10] virtio-scsi: Prevent assertion on missed events
34b321
34b321
RH-Author: Fam Zheng <famz@redhat.com>
34b321
Message-id: <1460947812-5704-1-git-send-email-famz@redhat.com>
34b321
Patchwork-id: 70202
34b321
O-Subject: [RHEL-7.3 qemu-kvm PATCH] virtio-scsi: Prevent assertion on missed events
34b321
Bugzilla: 1312289
34b321
RH-Acked-by: Thomas Huth <thuth@redhat.com>
34b321
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
34b321
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
34b321
34b321
From: Eric Farman <farman@linux.vnet.ibm.com>
34b321
34b321
In some cases, an unplug can cause events to be dropped, which
34b321
leads to an assertion failure when preparing to notify the guest
34b321
kernel.
34b321
34b321
Signed-off-by: Eric Farman <farman@linux.vnet.ibm.com>
34b321
Cc: qemu-stable@nongnu.org
34b321
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
34b321
(cherry picked from commit 49fb65c7f985baa56d2964e0a85c1f098e3e2a9d)
34b321
Signed-off-by: Fam Zheng <famz@redhat.com>
34b321
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
34b321
---
34b321
 hw/scsi/virtio-scsi.c | 2 +-
34b321
 1 file changed, 1 insertion(+), 1 deletion(-)
34b321
34b321
diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c
34b321
index 8232fc9..808eb54 100644
34b321
--- a/hw/scsi/virtio-scsi.c
34b321
+++ b/hw/scsi/virtio-scsi.c
34b321
@@ -530,7 +530,7 @@ static void virtio_scsi_push_event(VirtIOSCSI *s, SCSIDevice *dev,
34b321
     evt->event = event;
34b321
     evt->reason = reason;
34b321
     if (!dev) {
34b321
-        assert(event == VIRTIO_SCSI_T_NO_EVENT);
34b321
+        assert(event == VIRTIO_SCSI_T_EVENTS_MISSED);
34b321
     } else {
34b321
         evt->lun[0] = 1;
34b321
         evt->lun[1] = dev->id;
34b321
-- 
34b321
1.8.3.1
34b321