From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46851) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XOO0R-0006su-Nh for qemu-devel@nongnu.org; Mon, 01 Sep 2014 05:34:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XOO0M-0007NH-9y for qemu-devel@nongnu.org; Mon, 01 Sep 2014 05:34:35 -0400 Received: from szxga01-in.huawei.com ([119.145.14.64]:59241) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XOO0L-0007MG-D8 for qemu-devel@nongnu.org; Mon, 01 Sep 2014 05:34:30 -0400 From: Zhang Min Date: Mon, 1 Sep 2014 17:33:15 +0800 Message-ID: <1409563995-9792-1-git-send-email-rudy.zhangmin@huawei.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [Patch] block:qemu will crash when vhost-scsi disk vm reboot List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: subo7@huawei.com, mst@redhat.com, peter.huangpeng@huawei.com, boby.chen@huawei.com, pbonzini@redhat.com, Zhang Min , wu.wubin@huawei.com From: subo When the vm reboot, it will call virtio_scsi_handle_event(), for vhost-scsi device,vdev is VIRTIO_SCSI_COMMON, not VIRTIO_SCSI, if vdev convert to the VIRTIO_SCSI, it will cause qemu crash. Signed-off-by: Zhang Min Signed-off-by: subo --- hw/scsi/virtio-scsi.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c index 86aba88..7d3bc49 100644 --- a/hw/scsi/virtio-scsi.c +++ b/hw/scsi/virtio-scsi.c @@ -630,7 +630,11 @@ static void virtio_scsi_push_event(VirtIOSCSI *s, SCSIDevice *dev, static void virtio_scsi_handle_event(VirtIODevice *vdev, VirtQueue *vq) { - VirtIOSCSI *s = VIRTIO_SCSI(vdev); + VirtIOSCSI *s; + + s = (VirtIOSCSI *)object_dynamic_cast((Object *)vdev, TYPE_VIRTIO_SCSI); + if (!s) + return; if (s->events_dropped) { virtio_scsi_push_event(s, NULL, VIRTIO_SCSI_T_NO_EVENT, 0); -- 1.8.5