From patchwork Mon Nov 12 14:03:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 198392 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 41BFF2C0089 for ; Tue, 13 Nov 2012 01:04:18 +1100 (EST) Received: from localhost ([::1]:50515 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TXucX-0006PS-6u for incoming@patchwork.ozlabs.org; Mon, 12 Nov 2012 09:04:13 -0500 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=Yr1Mn6Pz72ZY6mgP6RQ+cI8jdOwdy+W98L8Efx3NeRY=; b=ImcUemCtefi/6kVmVffMFArnwvQBVxqMw3QCZtHpGP9Yo4XmJTc785sFQ8q5mi9VJH NI921ohq1POcETuQ/DA0qE+KMxNiN+sRPJ6qvqrsLcPSwDY2Kn0JNcQIH6HFvCATNz+C ArkGFg/VjHTf3+7c9C0hBBI/6QWYsm0rObx9wIulnHut1Psh6IwMt8vDI36H7gokqrG6 itkIc1baQSJ+2JYQW4XWg7vEDSZtSEG6KYRZ1YEe7Uy3a5W0n8Lc9I//MgFrKZbeexEY HTZSnWoGiEZPSy0292eKaP6xKDNPmHaplfBLt7G+eOjZlNIJVyCITvyiPHRVKFO8t0Aa Faxg== Received: by 10.68.239.198 with SMTP id vu6mr51829985pbc.109.1352729030344; Mon, 12 Nov 2012 06:03:50 -0800 (PST) Received: from yakj.usersys.redhat.com (93-34-169-1.ip50.fastwebnet.it. [93.34.169.1]) by mx.google.com with ESMTPS id a4sm4366188pax.12.2012.11.12.06.03.47 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 12 Nov 2012 06:03:49 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 12 Nov 2012 15:03:28 +0100 Message-Id: <1352729011-27799-3-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.12.1 In-Reply-To: <1352729011-27799-1-git-send-email-pbonzini@redhat.com> References: <1352729011-27799-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.220.45 Cc: aliguori@us.ibm.com Subject: [Qemu-devel] [PATCH 2/5] virtio-scsi: factor checks for VIRTIO_SCSI_S_DRIVER_OK when reporting events X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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); }