From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:60884) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TXucE-0006AX-1a for qemu-devel@nongnu.org; Mon, 12 Nov 2012 09:03:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TXucA-0006PO-Uz for qemu-devel@nongnu.org; Mon, 12 Nov 2012 09:03:53 -0500 Received: from mail-pa0-f45.google.com ([209.85.220.45]:64813) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TXucA-0006Mx-Oj for qemu-devel@nongnu.org; Mon, 12 Nov 2012 09:03:50 -0500 Received: by mail-pa0-f45.google.com with SMTP id fb10so4194200pad.4 for ; Mon, 12 Nov 2012 06:03:50 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 12 Nov 2012 15:03:28 +0100 Message-Id: <1352729011-27799-3-git-send-email-pbonzini@redhat.com> In-Reply-To: <1352729011-27799-1-git-send-email-pbonzini@redhat.com> References: <1352729011-27799-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 2/5] virtio-scsi: factor checks for VIRTIO_SCSI_S_DRIVER_OK when reporting events List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com Suggested by Laszlo Ersek. Signed-off-by: Paolo Bonzini --- hw/virtio-scsi.c | 8 +++++--- 1 file modificato, 5 inserzioni(+), 3 rimozioni(-) diff --git a/hw/virtio-scsi.c b/hw/virtio-scsi.c index b54c789..30d3f8a 100644 --- a/hw/virtio-scsi.c +++ b/hw/virtio-scsi.c @@ -596,6 +596,10 @@ static void virtio_scsi_push_event(VirtIOSCSI *s, SCSIDevice *dev, VirtIOSCSIEvent *evt; int in_size; + if (!(s->vdev.status & VIRTIO_CONFIG_S_DRIVER_OK)) { + return; + } + if (!req) { s->events_dropped = true; return; @@ -648,7 +652,6 @@ static void virtio_scsi_change(SCSIBus *bus, SCSIDevice *dev, SCSISense sense) VirtIOSCSI *s = container_of(bus, VirtIOSCSI, bus); if (((s->vdev.guest_features >> VIRTIO_SCSI_F_CHANGE) & 1) && - (s->vdev.status & VIRTIO_CONFIG_S_DRIVER_OK) && dev->type != TYPE_ROM) { virtio_scsi_push_event(s, dev, VIRTIO_SCSI_T_PARAM_CHANGE, sense.asc | (sense.ascq << 8)); @@ -659,8 +662,7 @@ static void virtio_scsi_hotplug(SCSIBus *bus, SCSIDevice *dev) { VirtIOSCSI *s = container_of(bus, VirtIOSCSI, bus); - if (((s->vdev.guest_features >> VIRTIO_SCSI_F_HOTPLUG) & 1) && - (s->vdev.status & VIRTIO_CONFIG_S_DRIVER_OK)) { + if ((s->vdev.guest_features >> VIRTIO_SCSI_F_HOTPLUG) & 1) { virtio_scsi_push_event(s, dev, VIRTIO_SCSI_T_TRANSPORT_RESET, VIRTIO_SCSI_EVT_RESET_RESCAN); } -- 1.7.12.1