Use SDEV_NO_ADAPTER_TARGET instead of the value of adapter_buswidth to

indicate the adapter is not a target on the bus.

ok dlg@ as part of a larger diff.

5 files changed, 10 insertions, 10 deletions

diff --git a/sys/arch/sparc64/dev/vdsk.c b/sys/arch/sparc64/dev/vdsk.c
index 7ff85292b99..6140fdeb3a3 100644
--- a/sys/arch/sparc64/dev/vdsk.c
+++ b/sys/arch/sparc64/dev/vdsk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vdsk.c,v 1.54 2020/06/24 01:36:18 krw Exp $	*/
+/*	$OpenBSD: vdsk.c,v 1.55 2020/06/24 18:47:56 krw Exp $	*/
 /*
  * Copyright (c) 2009, 2011 Mark Kettenis
  *
@@ -350,7 +350,7 @@ vdsk_attach(struct device *parent, struct device *self, void *aux)
 	/* Only valid target/lun is 0/0. */
 	sc->sc_link.adapter_buswidth = 1;
 	sc->sc_link.luns = 1;
-	sc->sc_link.adapter_target = sc->sc_link.adapter_buswidth;
+	sc->sc_link.adapter_target = SDEV_NO_ADAPTER_TARGET;
 	sc->sc_link.openings = sc->sc_vd->vd_nentries - 1;
 	sc->sc_link.pool = &sc->sc_iopool;
 
diff --git a/sys/dev/ic/gdt_common.c b/sys/dev/ic/gdt_common.c
index c0a6d62d483..95ea7744d44 100644
--- a/sys/dev/ic/gdt_common.c
+++ b/sys/dev/ic/gdt_common.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gdt_common.c,v 1.68 2020/02/15 01:58:01 krw Exp $	*/
+/*	$OpenBSD: gdt_common.c,v 1.69 2020/06/24 18:47:57 krw Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000, 2003 Niklas Hallqvist.  All rights reserved.
@@ -156,7 +156,7 @@ gdt_attach(struct gdt_softc *sc)
 	/* openings will be filled in later. */
 	sc->sc_link.adapter_buswidth =
 	    (sc->sc_class & GDT_FC) ? GDT_MAXID : GDT_MAX_HDRIVES;
-	sc->sc_link.adapter_target = sc->sc_link.adapter_buswidth;
+	sc->sc_link.adapter_target = SDEV_NO_ADAPTER_TARGET;
 	sc->sc_link.pool = &sc->sc_iopool;
 
 	if (!gdt_internal_cmd(sc, GDT_SCREENSERVICE, GDT_INIT, 0, 0, 0)) {
diff --git a/sys/dev/ic/qla.c b/sys/dev/ic/qla.c
index b11e6c1cace..7bb67394893 100644
--- a/sys/dev/ic/qla.c
+++ b/sys/dev/ic/qla.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qla.c,v 1.60 2020/02/05 16:29:29 krw Exp $ */
+/*	$OpenBSD: qla.c,v 1.61 2020/06/24 18:47:57 krw Exp $ */
 
 /*
  * Copyright (c) 2011 David Gwynne <dlg@openbsd.org>
@@ -680,7 +680,7 @@ qla_attach(struct qla_softc *sc)
 	} else {
 		sc->sc_link.adapter_buswidth = QLA_BUSWIDTH;
 	}
-	sc->sc_link.adapter_target = sc->sc_link.adapter_buswidth;
+	sc->sc_link.adapter_target = SDEV_NO_ADAPTER_TARGET;
 	sc->sc_link.openings = sc->sc_maxcmds;
 	sc->sc_link.pool = &sc->sc_iopool;
 	sc->sc_link.port_wwn = sc->sc_port_name;
diff --git a/sys/dev/pv/vioblk.c b/sys/dev/pv/vioblk.c
index f2bb518e95f..8566a15a7c6 100644
--- a/sys/dev/pv/vioblk.c
+++ b/sys/dev/pv/vioblk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vioblk.c,v 1.18 2020/06/21 16:46:34 krw Exp $	*/
+/*	$OpenBSD: vioblk.c,v 1.19 2020/06/24 18:47:57 krw Exp $	*/
 
 /*
  * Copyright (c) 2012 Stefan Fritsch.
@@ -241,7 +241,7 @@ vioblk_attach(struct device *parent, struct device *self, void *aux)
 	/* Only valid target/lun is 0/0. */
 	sc->sc_link.adapter_buswidth = 1;
 	sc->sc_link.luns = 1;
-	sc->sc_link.adapter_target = sc->sc_link.adapter_buswidth;;
+	sc->sc_link.adapter_target = SDEV_NO_ADAPTER_TARGET;
 	DNPRINTF(1, "%s: qsize: %d\n", __func__, qsize);
 	if (virtio_has_feature(vsc, VIRTIO_BLK_F_RO))
 		sc->sc_link.flags |= SDEV_READONLY;
diff --git a/sys/dev/pv/xbf.c b/sys/dev/pv/xbf.c
index 34965f404fa..cdae4a5a6f4 100644
--- a/sys/dev/pv/xbf.c
+++ b/sys/dev/pv/xbf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xbf.c,v 1.37 2020/06/24 01:35:29 krw Exp $	*/
+/*	$OpenBSD: xbf.c,v 1.38 2020/06/24 18:47:57 krw Exp $	*/
 
 /*
  * Copyright (c) 2016, 2017 Mike Belopuhov
@@ -305,7 +305,7 @@ xbf_attach(struct device *parent, struct device *self, void *aux)
 	/* Only valid target/lun is 0/0. */
 	sc->sc_link.adapter_buswidth = 1;
 	sc->sc_link.luns = 1;
-	sc->sc_link.adapter_target = sc->sc_link.adapter_buswidth;
+	sc->sc_link.adapter_target = SDEV_NO_ADAPTER_TARGET;
 	sc->sc_link.openings = sc->sc_nccb;
 	sc->sc_link.pool = &sc->sc_iopool;