linux-kernel - linux-next: build failure after merge of the vhost tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20140610141217.50d98cd6@canb.auug.org.au>
Date:	Tue, 10 Jun 2014 14:12:17 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	"Michael S. Tsirkin" <mst@...hat.com>,
	Nicholas Bellinger <nab@...ux-iscsi.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-next: build failure after merge of the vhost tree

Hi Michael,

After merging the vhost tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/vhost/scsi.c: In function 'vhost_scsi_handle_vq':
drivers/vhost/scsi.c:1043:14: error: 'struct vhost_dev' has no member named 'acked_features'
   if (vs->dev.acked_features & VIRTIO_SCSI_F_T10_PI) {
              ^

Commit 95e7c4341b8e ("vhost/scsi: Enable T10 PI IOV -> SGL memory
mapping") from the target-updates tree interacting with commit
10350a292160 ("vhost: move acked_features to VQs") from the vhost tree.

I applied the following patch which seems right, but may not be.

From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Tue, 10 Jun 2014 14:08:21 +1000
Subject: [PATCH] vhost/scsi: fixup for acked_features move

Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
---
 drivers/vhost/scsi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c
index 78ff1f64d759..6d7dd85365fe 100644
--- a/drivers/vhost/scsi.c
+++ b/drivers/vhost/scsi.c
@@ -1040,7 +1040,7 @@ vhost_scsi_handle_vq(struct vhost_scsi *vs, struct vhost_virtqueue *vq)
 			break;
 		}
 
-		if (vs->dev.acked_features & VIRTIO_SCSI_F_T10_PI) {
+		if (vhost_has_feature(vq, VIRTIO_SCSI_F_T10_PI)) {
 			req = &v_req_pi;
 			lunp = &v_req_pi.lun[0];
 			target = &v_req_pi.lun[1];
-- 
2.0.0

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Download attachment "signature.asc" of type "application/pgp-signature" (837 bytes)