From patchwork Wed Jul 5 08:30:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 9826117 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2EF1360237 for ; Wed, 5 Jul 2017 08:31:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 250792621B for ; Wed, 5 Jul 2017 08:31:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 19D8E26E55; Wed, 5 Jul 2017 08:31:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D2A812621B for ; Wed, 5 Jul 2017 08:31:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752684AbdGEIbI (ORCPT ); Wed, 5 Jul 2017 04:31:08 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:36850 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752590AbdGEIbD (ORCPT ); Wed, 5 Jul 2017 04:31:03 -0400 Received: by mail-wm0-f68.google.com with SMTP id y5so30785257wmh.3; Wed, 05 Jul 2017 01:31:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=6+sWdGVTs+XpachgcebhqW8RiSgp+I7nOU4VdxZoG5o=; b=tTTfkUByZ07YBkd71cBE/OVl76XClILzVUfmYQMqF0Vt+PIV4riajGMUFTmm1MOEzv 9i5ty7MTaZDn50+PbqzZiQuLdQvZ9boYjSEA55dntY9l+TGopUNcJONGBwQJAxvHmQdy BG72yeUz5Cz6I5SKJMWGNx7eUbmcoGfOb0ySqU2gSTd0I1wC7sRd7QQc66D3QpzCeDLk ws4WBuVeU55KigDby+d9F8NSPebX8aiSeCNaYVMMYTaZCSP5APyA6Y4nDJfXvwUQeS8L oUVUh/QUcyuuMLDnIJXhOPS4DDwv4tXOJQAJloYf9x4kgPR0h24ob78ELrz0m0J6bHb7 ktyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=6+sWdGVTs+XpachgcebhqW8RiSgp+I7nOU4VdxZoG5o=; b=QdZNLp0DdXR8fAzBtbbx5ijeJW9w2lZVr+zkEoe02d4SywYtx/i7rzUGV444rHtFwy UGp8MFW6pEjnoWvN9u4M1obhRSOBAkj4ho2pNF9i22rDQ+3eT1CSeEsEy/PrID1HVREM A/E2ZzgHUFVZBwlfR3vGVaU7THpKGMIExaXcYhRo6v/Y7T/pVQNzvCCLYnyDApQ6uh74 CEgvk+neV0xraAaLqs5gN3FG1wlbc43ZT09Wabk8CVrn2cSvd9pGRmzEYLtoW6No8r+2 t/MAvqf3WrczzC12HoucbVLHlT/Uhqe1NhPtvWRNgyluILHW4wBrAaJ5CNkqa+qcIUoz M7Uw== X-Gm-Message-State: AKS2vOykWEjfOWCe39+uBDPUX/G72B2kaChxXQIgdQssMj2hNhp2Dzmf 5Vs1vs3WTTr2/ZBgE2U= X-Received: by 10.28.29.21 with SMTP id d21mr29493432wmd.37.1499243461438; Wed, 05 Jul 2017 01:31:01 -0700 (PDT) Received: from 640k.lan (94-39-191-51.adsl-ull.clienti.tiscali.it. [94.39.191.51]) by smtp.gmail.com with ESMTPSA id l46sm15130000wrl.15.2017.07.05.01.30.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Jul 2017 01:31:00 -0700 (PDT) From: Paolo Bonzini To: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: jejb@linux.vnet.ibm.com, martin.petersen@oracle.com, stefanha@redhat.com, famz@redhat.com, stable@vger.kernel.org, David Gibson Subject: [PATCH] virtio_scsi: always read VPD pages for multiqueue too Date: Wed, 5 Jul 2017 10:30:56 +0200 Message-Id: <1499243456-29978-1-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Multi-queue virtio-scsi uses a different scsi_host_template struct. Add the .device_alloc field there, too. Fixes: 25d1d50e23275e141e3a3fe06c25a99f4c4bf4e0 Cc: stable@vger.kernel.org Cc: David Gibson Signed-off-by: Paolo Bonzini Reviewed-by: Fam Zheng Reviewed-by: Stefan Hajnoczi --- drivers/scsi/virtio_scsi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c index f8dbfeee6c63..ad1e7f1aba4c 100644 --- a/drivers/scsi/virtio_scsi.c +++ b/drivers/scsi/virtio_scsi.c @@ -826,6 +826,7 @@ static int virtscsi_map_queues(struct Scsi_Host *shost) .change_queue_depth = virtscsi_change_queue_depth, .eh_abort_handler = virtscsi_abort, .eh_device_reset_handler = virtscsi_device_reset, + .slave_alloc = virtscsi_device_alloc, .can_queue = 1024, .dma_boundary = UINT_MAX,