diff options
| author |   krw <krw@openbsd.org> | 2020-09-03 13:11:49 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2020-09-03 13:11:49 +0000 |
| commit | a1f207244cebffa045bf20706d2ad00bdb962308 (patch) | |
| tree | 8a07fd2d8a0ca5ece0d3b5a2c6ef419bd5de2227 | |
| parent | Do not free old session working directory until after expanding the new (diff) | |
| download | wireguard-openbsd-a1f207244cebffa045bf20706d2ad00bdb962308.tar.xz wireguard-openbsd-a1f207244cebffa045bf20706d2ad00bdb962308.zip | |
No need for a private #define for the INQUIRY response_format value '2'. Just
use the new SID_SCSI2_RESPONSE.
| -rw-r--r-- | usr.sbin/vmd/vioscsi.c | 4 | ||||
| -rw-r--r-- | usr.sbin/vmd/vioscsi.h | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/usr.sbin/vmd/vioscsi.c b/usr.sbin/vmd/vioscsi.c index 628e162c14e..814ecc8b5ec 100644 --- a/usr.sbin/vmd/vioscsi.c +++ b/usr.sbin/vmd/vioscsi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vioscsi.c,v 1.13 2020/09/01 12:17:54 krw Exp $ */ +/* $OpenBSD: vioscsi.c,v 1.14 2020/09/03 13:11:49 krw Exp $ */ /* * Copyright (c) 2017 Carlos Cardenas <ccardenas@openbsd.org> @@ -281,7 +281,7 @@ vioscsi_handle_inquiry(struct vioscsi_dev *dev, inq_data->device = T_CDROM; inq_data->dev_qual2 = SID_REMOVABLE; /* Leave version zero to say we don't comply */ - inq_data->response_format = INQUIRY_RESPONSE_FORMAT; + inq_data->response_format = SID_SCSI2_RESPONSE; inq_data->additional_length = SID_SCSI2_ALEN; memcpy(inq_data->vendor, INQUIRY_VENDOR, INQUIRY_VENDOR_LEN); memcpy(inq_data->product, INQUIRY_PRODUCT, INQUIRY_PRODUCT_LEN); diff --git a/usr.sbin/vmd/vioscsi.h b/usr.sbin/vmd/vioscsi.h index 16aed6f5e01..29f7104a230 100644 --- a/usr.sbin/vmd/vioscsi.h +++ b/usr.sbin/vmd/vioscsi.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vioscsi.h,v 1.2 2018/01/16 06:10:45 ccardenas Exp $ */ +/* $OpenBSD: vioscsi.h,v 1.3 2020/09/03 13:11:49 krw Exp $ */ /* * Copyright (c) 2017 Carlos Cardenas <ccardenas@openbsd.org> @@ -38,7 +38,6 @@ #define SENSE_ILLEGAL_CDB_FIELD 0x24 #define SENSE_MEDIUM_NOT_PRESENT 0x3a -#define INQUIRY_RESPONSE_FORMAT 0x02 #define INQUIRY_VENDOR "OpenBSD " #define INQUIRY_VENDOR_LEN 8 #define INQUIRY_PRODUCT "VMM CD-ROM " |