diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2009-12-08 20:37:59 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2009-12-08 20:37:59 +0000 |
| commit | 3c9dad37612752049d78fc21aa191381eeaf61c9 (patch) | |
| tree | e3f30e6a2967c0e351e3a63fa8dd1e23204ca5c2 /sys | |
| parent | 4cb6ee9ade6c6816176d4cdb11ac1dba7d4bdb93 (diff) | |
Base the revision string in the INQUIRY info on the version of the VIO protocol
used by the virtual disk server.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/sparc64/dev/vdsk.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/sys/arch/sparc64/dev/vdsk.c b/sys/arch/sparc64/dev/vdsk.c index 7847c6e6415..e23ccd3a4dc 100644 --- a/sys/arch/sparc64/dev/vdsk.c +++ b/sys/arch/sparc64/dev/vdsk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vdsk.c,v 1.12 2009/05/12 20:20:35 kettenis Exp $ */ +/* $OpenBSD: vdsk.c,v 1.13 2009/12/08 20:37:58 kettenis Exp $ */ /* * Copyright (c) 2009 Mark Kettenis * @@ -142,6 +142,9 @@ struct vdsk_softc { #define VIO_ACK_RDX 0x0080 #define VIO_ESTABLISHED 0x00ff + uint16_t sc_major; + uint16_t sc_minor; + uint32_t sc_local_sid; uint64_t sc_dring_ident; uint64_t sc_seq_no; @@ -530,6 +533,8 @@ vdsk_rx_vio_ver_info(struct vdsk_softc *sc, struct vio_msg_tag *tag) ldc_reset(&sc->sc_lc); break; } + sc->sc_major = vi->major; + sc->sc_minor = vi->minor; sc->sc_vio_state |= VIO_ACK_VER_INFO; break; @@ -1040,7 +1045,9 @@ vdsk_scsi_inq(struct scsi_xfer *xs) int vdsk_scsi_inquiry(struct scsi_xfer *xs) { + struct vdsk_softc *sc = xs->sc_link->adapter_softc; struct scsi_inquiry_data inq; + char buf[5]; bzero(&inq, sizeof(inq)); @@ -1050,7 +1057,8 @@ vdsk_scsi_inquiry(struct scsi_xfer *xs) inq.additional_length = 32; bcopy("SUN ", inq.vendor, sizeof(inq.vendor)); bcopy("Virtual Disk ", inq.product, sizeof(inq.product)); - bcopy("1.0 ", inq.revision, sizeof(inq.revision)); + snprintf(buf, sizeof(buf), "%u.%u ", sc->sc_major, sc->sc_minor); + bcopy(buf, inq.revision, sizeof(inq.revision)); bcopy(&inq, xs->data, MIN(sizeof(inq), xs->datalen)); |