[illumos-gate merge]

commit 374973c21804baf7ee038f3b1c3ee81a3613e0b3
    15065 vmm: variable set but not used
commit 1261b05561db859f9c9c1418718a0a9a2930e0cb
    15069 dladm_str2bw() does not reset errno which is checked after string conversion
commit 670f080b72593a4a43a509cd4a020ffe8a6484a6
    14690 nvmeadm should refer to namespaces by their nsid
commit 2841912edb2f7c5e77ae94d2ff7fe17ad82f2fcd
    15051 SMB2 signature mismatch gets wrong error
commit 11fb28bc14a13f8ca7aa0e0e8dd0c259dcb79049
    15042 AD join fails if hostname longer than 14 characters
commit ad1760fe5da149d8b902bd879789686794f383ce
    15058 vmm: comparison is always true
commit 7b0b8123e6101089b9e44e31f6b14b0762845fbb
    15041 smbadm join reports clock skew as bad password
commit 3cc2454804c6ebaa0b2a607ad425214c1e51c4ee
    15037 cp_subr.s: Invalid instruction argument

15 files changed, 152 insertions, 66 deletions

diff --git a/usr/src/cmd/nvmeadm/nvmeadm.c b/usr/src/cmd/nvmeadm/nvmeadm.c
index 74803baacb..6a80867ddd 100644
--- a/usr/src/cmd/nvmeadm/nvmeadm.c
+++ b/usr/src/cmd/nvmeadm/nvmeadm.c
@@ -109,7 +109,8 @@ struct nvmeadm_cmd {
 
 static void usage(const nvmeadm_cmd_t *);
 static void nvme_walk(nvme_process_arg_t *, di_node_t);
-static boolean_t nvme_match(nvme_process_arg_t *);
+static boolean_t nvme_match_ctrl(nvme_process_arg_t *);
+static boolean_t nvme_match_ns(nvme_process_arg_t *);
 
 static int nvme_process(di_node_t, di_minor_t, void *);
 
@@ -526,10 +527,9 @@ usage(const nvmeadm_cmd_t *cmd)
 }
 
 static boolean_t
-nvme_match(nvme_process_arg_t *npa)
+nvme_match_ctrl(nvme_process_arg_t *npa)
 {
 	char *name;
-	char *nsid = NULL;
 
 	if (npa->npa_name == NULL)
 		return (B_TRUE);
@@ -545,17 +545,66 @@ nvme_match(nvme_process_arg_t *npa)
 
 	free(name);
 
-	if (npa->npa_isns) {
-		if (npa->npa_nsid == NULL)
-			return (B_TRUE);
+	return (B_TRUE);
+}
 
-		nsid = di_minor_name(npa->npa_minor);
+static boolean_t
+nvme_match_ns(nvme_process_arg_t *npa)
+{
+	if (npa->npa_nsid == NULL)
+		return (B_TRUE);
 
-		if (nsid == NULL || strcmp(npa->npa_nsid, nsid) != 0)
-			return (B_FALSE);
+	if (strcasecmp(npa->npa_nsid, di_minor_name(npa->npa_minor)) ==
+	    0)
+		return (B_TRUE);
+
+	if (npa->npa_eui64 != NULL &&
+	    strcasecmp(npa->npa_nsid, npa->npa_eui64) == 0)
+		return (B_TRUE);
+
+	if (npa->npa_nguid != NULL &&
+	    strcasecmp(npa->npa_nsid, npa->npa_nguid) == 0)
+		return (B_TRUE);
+
+	return (B_FALSE);
+}
+
+char *
+nvme_nguid(const nvme_process_arg_t *npa)
+{
+	char *ret = NULL;
+
+	if (*(uint64_t *)npa->npa_idns->id_nguid != 0 ||
+	    *((uint64_t *)npa->npa_idns->id_nguid + 1) != 0) {
+		uint8_t *guid = npa->npa_idns->id_nguid;
+
+		(void) asprintf(&ret,
+		    "%0.2X%0.2X%0.2X%0.2X%0.2X%0.2X%0.2X%0.2X"
+		    "%0.2X%0.2X%0.2X%0.2X%0.2X%0.2X%0.2X%0.2X",
+		    guid[0], guid[1], guid[2], guid[3],
+		    guid[4], guid[5], guid[6], guid[7],
+		    guid[8], guid[9], guid[10], guid[11],
+		    guid[12], guid[13], guid[14], guid[15]);
 	}
 
-	return (B_TRUE);
+	return (ret);
+}
+
+char *
+nvme_eui64(const nvme_process_arg_t *npa)
+{
+	char *ret = NULL;
+
+	if (*(uint64_t *)npa->npa_idns->id_eui64 != 0) {
+		uint8_t *eui64 = npa->npa_idns->id_eui64;
+
+		(void) asprintf(&ret,
+		    "%0.2X%0.2X%0.2X%0.2X%0.2X%0.2X%0.2X%0.2X",
+		    eui64[0], eui64[1], eui64[2], eui64[3],
+		    eui64[4], eui64[5], eui64[6], eui64[7]);
+	}
+
+	return (ret);
 }
 
 char *
@@ -577,13 +626,30 @@ nvme_dskname(const nvme_process_arg_t *npa)
 		if (addr == NULL)
 			continue;
 
+		addr = strdup(addr);
+		if (addr == NULL)
+			goto fail;
+
 		if (addr[0] == 'w')
 			addr++;
 
-		if (strncasecmp(addr, di_minor_name(npa->npa_minor),
-		    strchrnul(addr, ',') - addr) != 0)
+		/* Chop off ,... from the bus address. */
+		*(strchrnul(addr, ',')) = '\0';
+
+		/*
+		 * If there's a EUI64, that's what was used for the bus address.
+		 * Otherwise it's just the numeric namespace id.
+		 */
+		if (npa->npa_eui64 != NULL &&
+		    strcasecmp(addr, npa->npa_eui64) == 0)
+			goto found;
+
+		if (strcasecmp(addr, di_minor_name(npa->npa_minor)) != 0) {
+			free(addr);
 			continue;
+		}
 
+found:
 		path = di_dim_path_dev(dim, di_driver_name(child),
 		    di_instance(child), "c");
 
@@ -604,6 +670,7 @@ nvme_dskname(const nvme_process_arg_t *npa)
 			goto fail;
 
 		free(path);
+		free(addr);
 		break;
 	}
 
@@ -613,6 +680,7 @@ nvme_dskname(const nvme_process_arg_t *npa)
 
 fail:
 	free(path);
+	free(addr);
 	err(-1, "nvme_dskname");
 }
 
@@ -625,18 +693,12 @@ nvme_process(di_node_t node, di_minor_t minor, void *arg)
 	npa->npa_node = node;
 	npa->npa_minor = minor;
 
-	if (!nvme_match(npa))
+	if (!nvme_match_ctrl(npa))
 		return (DI_WALK_CONTINUE);
 
 	if ((fd = nvme_open(minor, npa->npa_excl)) < 0)
 		return (DI_WALK_CONTINUE);
 
-	npa->npa_found++;
-
-	npa->npa_path = di_devfs_path(node);
-	if (npa->npa_path == NULL)
-		goto out;
-
 	npa->npa_version = nvme_version(fd);
 	if (npa->npa_version == NULL)
 		goto out;
@@ -660,27 +722,44 @@ nvme_process(di_node_t node, di_minor_t minor, void *arg)
 	if (npa->npa_idns == NULL)
 		goto out;
 
+	npa->npa_eui64 = NULL;
+	npa->npa_nguid = NULL;
 	npa->npa_dsk = NULL;
+
 	if (npa->npa_isns) {
 		npa->npa_ns_state = nvme_namespace_state(fd);
-		if ((npa->npa_ns_state & NVME_NS_STATE_ATTACHED) != 0)
+
+		if ((npa->npa_ns_state & NVME_NS_STATE_ACTIVE) != 0) {
+			npa->npa_eui64 = nvme_eui64(npa);
+			npa->npa_nguid = nvme_nguid(npa);
+		}
+
+		if ((npa->npa_ns_state & NVME_NS_STATE_ATTACHED) != 0) {
 			npa->npa_dsk = nvme_dskname(npa);
+		}
+
+		if (!nvme_match_ns(npa))
+			goto out;
 	}
 
+	npa->npa_found++;
 
 	exitcode += npa->npa_cmd->c_func(fd, npa);
 
 out:
-	di_devfs_path_free(npa->npa_path);
 	free(npa->npa_version);
 	free(npa->npa_idctl);
 	free(npa->npa_idns);
 	free(npa->npa_dsk);
+	free(npa->npa_eui64);
+	free(npa->npa_nguid);
 
 	npa->npa_version = NULL;
 	npa->npa_idctl = NULL;
 	npa->npa_idns = NULL;
 	npa->npa_dsk = NULL;
+	npa->npa_eui64 = NULL;
+	npa->npa_nguid = NULL;
 
 	nvme_close(fd);
 
diff --git a/usr/src/cmd/nvmeadm/nvmeadm.h b/usr/src/cmd/nvmeadm/nvmeadm.h
index 97f3e6a677..400c685ef7 100644
--- a/usr/src/cmd/nvmeadm/nvmeadm.h
+++ b/usr/src/cmd/nvmeadm/nvmeadm.h
@@ -40,6 +40,8 @@ struct nvme_process_arg {
 	char **npa_argv;
 	char *npa_name;
 	char *npa_nsid;
+	char *npa_eui64;
+	char *npa_nguid;
 	int npa_found;
 	boolean_t npa_excl;
 	boolean_t npa_isns;
@@ -48,7 +50,6 @@ struct nvme_process_arg {
 	const nvmeadm_cmd_t *npa_cmd;
 	di_node_t npa_node;
 	di_minor_t npa_minor;
-	char *npa_path;
 	char *npa_dsk;
 	uint32_t npa_ns_state;
 	nvme_identify_ctrl_t *npa_idctl;
diff --git a/usr/src/lib/commpage/amd64/cp_subr.s b/usr/src/lib/commpage/amd64/cp_subr.s
index ebae0ed307..36664578ff 100644
--- a/usr/src/lib/commpage/amd64/cp_subr.s
+++ b/usr/src/lib/commpage/amd64/cp_subr.s
@@ -107,7 +107,7 @@
 
 	/* Query the CPU ID and stash it in r10 for later comparison */
 	movl	$GETCPU_GDT_OFFSET, %edx
-	lsl	%dx, %edx
+	lsl	%edx, %edx
 	movl	%edx, %r10d
 
 3:
@@ -163,7 +163,7 @@
 
 8:
 	movl	$GETCPU_GDT_OFFSET, %edx
-	lsl	%dx, %edx
+	lsl	%edx, %edx
 	cmpl	%edx, %r10d
 	jne	9f
 	movq	(%r9, %rdx, 8), %rdx
@@ -209,7 +209,7 @@
 	ret
 1:
 	mov	$GETCPU_GDT_OFFSET, %eax
-	lsl	%ax, %eax
+	lsl	%eax, %eax
 	ret
 	SET_SIZE(__cp_getcpu)
 
diff --git a/usr/src/lib/commpage/i386/cp_subr.s b/usr/src/lib/commpage/i386/cp_subr.s
index 83b7dcff56..4028a0874a 100644
--- a/usr/src/lib/commpage/i386/cp_subr.s
+++ b/usr/src/lib/commpage/i386/cp_subr.s
@@ -84,7 +84,7 @@
 
 	movl	$0, (%esp)
 	mov	$GETCPU_GDT_OFFSET, %eax
-	lsl	%ax, %eax
+	lsl	%eax, %eax
 	movl	%eax, 0x4(%esp)
 	movl	CP_TSC_TYPE(%edi), %eax
 
@@ -131,7 +131,7 @@
 	 * since the cpu_id was first checked.
 	 */
 	movl	$GETCPU_GDT_OFFSET, %ecx
-	lsl	%cx, %ecx
+	lsl	%ecx, %ecx
 	movl	0x4(%esp), %esi
 	cmpl	%ecx, %esi
 	jne	9f
@@ -196,6 +196,6 @@
 	ret
 1:
 	mov	$GETCPU_GDT_OFFSET, %eax
-	lsl	%ax, %eax
+	lsl	%eax, %eax
 	ret
 	SET_SIZE(__cp_getcpu)
diff --git a/usr/src/lib/libdladm/common/libdladm.c b/usr/src/lib/libdladm/common/libdladm.c
index fc79a32c02..eec92e09ba 100644
--- a/usr/src/lib/libdladm/common/libdladm.c
+++ b/usr/src/lib/libdladm/common/libdladm.c
@@ -539,6 +539,7 @@ dladm_str2bw(char *oarg, uint64_t *bw)
 	int64_t		n;
 	int		mult = 1;
 
+	errno = 0;
 	n = strtoull(oarg, &endp, 10);
 
 	if ((errno != 0) || (strlen(endp) > 1))
diff --git a/usr/src/lib/smbsrv/libsmbns/common/libsmbns.h b/usr/src/lib/smbsrv/libsmbns/common/libsmbns.h
index 7cde269335..5ccd894b6f 100644
--- a/usr/src/lib/smbsrv/libsmbns/common/libsmbns.h
+++ b/usr/src/lib/smbsrv/libsmbns/common/libsmbns.h
@@ -64,7 +64,9 @@ typedef enum smb_ads_status {
 	SMB_ADS_KRB5_INIT_CTX,
 	SMB_ADS_KRB5_CC_DEFAULT,
 	SMB_ADS_KRB5_PARSE_PRINCIPAL,
+	SMB_ADS_KRB5_GET_INIT_CREDS_OTHER,
 	SMB_ADS_KRB5_GET_INIT_CREDS_PW,
+	SMB_ADS_KRB5_GET_INIT_CREDS_SKEW,
 	SMB_ADS_KRB5_CC_INITIALIZE,
 	SMB_ADS_KRB5_CC_STORE_CRED,
 	SMB_ADS_CANT_LOCATE_DC,
diff --git a/usr/src/lib/smbsrv/libsmbns/common/smbns_ads.c b/usr/src/lib/smbsrv/libsmbns/common/smbns_ads.c
index 8bbe0e8afb..0a07771985 100644
--- a/usr/src/lib/smbsrv/libsmbns/common/smbns_ads.c
+++ b/usr/src/lib/smbsrv/libsmbns/common/smbns_ads.c
@@ -1599,7 +1599,8 @@ smb_ads_lookup_computer_n_attr(smb_ads_handle_t *ah, smb_ads_avpair_t *avpair,
 {
 	char *attrs[3], filter[SMB_ADS_MAXBUFLEN];
 	LDAPMessage *res;
-	char sam_acct[SMB_SAMACCT_MAXLEN], sam_acct2[SMB_SAMACCT_MAXLEN];
+	char sam_acct[SMB_SAMACCT_MAXLEN];
+	char tmpbuf[SMB_ADS_MAXBUFLEN];
 	smb_ads_qstat_t rc;
 	int err;
 
@@ -1618,12 +1619,12 @@ smb_ads_lookup_computer_n_attr(smb_ads_handle_t *ah, smb_ads_avpair_t *avpair,
 		attrs[1] = avpair->avp_attr;
 	}
 
-	if (smb_ads_escape_search_filter_chars(sam_acct, sam_acct2) != 0)
+	if (smb_ads_escape_search_filter_chars(sam_acct, tmpbuf) != 0)
 		return (SMB_ADS_STAT_ERR);
 
 	(void) snprintf(filter, sizeof (filter),
-	    "(&(objectClass=computer)(%s=%s))", SMB_ADS_ATTR_SAMACCT,
-	    sam_acct2);
+	    "(&(objectClass=computer)(%s=%s))",
+	    SMB_ADS_ATTR_SAMACCT, tmpbuf);
 
 	syslog(LOG_DEBUG, "smbns: lookup_computer, "
 	    "dn=%s, scope=%d", dn, scope);
@@ -1947,8 +1948,12 @@ adjoin_table[] = {
 	    "Failed to resolve default credential cache." },
 	{ SMB_ADS_KRB5_PARSE_PRINCIPAL,
 	    "Failed parsing the user principal name." },
+	{ SMB_ADS_KRB5_GET_INIT_CREDS_OTHER,
+	    "Failed getting initial credentials.  (See svc. log)" },
 	{ SMB_ADS_KRB5_GET_INIT_CREDS_PW,
 	    "Failed getting initial credentials.  (Wrong password?)" },
+	{ SMB_ADS_KRB5_GET_INIT_CREDS_SKEW,
+	    "Failed getting initial credentials.  (Clock skew too great)" },
 	{ SMB_ADS_KRB5_CC_INITIALIZE,
 	    "Failed initializing the credential cache." },
 	{ SMB_ADS_KRB5_CC_STORE_CRED,
diff --git a/usr/src/lib/smbsrv/libsmbns/common/smbns_krb.c b/usr/src/lib/smbsrv/libsmbns/common/smbns_krb.c
index aebc6f8c06..b29963f0e9 100644
--- a/usr/src/lib/smbsrv/libsmbns/common/smbns_krb.c
+++ b/usr/src/lib/smbsrv/libsmbns/common/smbns_krb.c
@@ -68,7 +68,6 @@ smb_kinit(char *domain_name, char *principal_name, char *principal_passwd)
 	krb5_principal me = NULL;
 	krb5_creds my_creds;
 	krb5_error_code code;
-	const char *errmsg = NULL;
 	const char *doing = NULL;
 	smb_ads_status_t err;
 
@@ -115,11 +114,20 @@ smb_kinit(char *domain_name, char *principal_name, char *principal_passwd)
 	    principal_passwd, NULL, 0, (krb5_deltat)0,
 	    NULL, NULL);
 	if (code != 0) {
-		err = SMB_ADS_KRB5_GET_INIT_CREDS_PW;
 		doing = "smbns_krb: getting initial credentials";
+		switch (code) {
 
-		if (code == KRB5KRB_AP_ERR_BAD_INTEGRITY) {
-			errmsg = "smbns_krb: Password incorrect";
+		case KRB5KRB_AP_ERR_BAD_INTEGRITY:
+			err = SMB_ADS_KRB5_GET_INIT_CREDS_PW;
+			break;
+
+		case KRB5KRB_AP_ERR_SKEW:
+			err = SMB_ADS_KRB5_GET_INIT_CREDS_SKEW;
+			break;
+
+		default:
+			err = SMB_ADS_KRB5_GET_INIT_CREDS_OTHER;
+			break;
 		}
 
 		goto cleanup;
@@ -144,10 +152,7 @@ smb_kinit(char *domain_name, char *principal_name, char *principal_passwd)
 
 cleanup:
 	if (code != 0) {
-		if (errmsg == NULL)
-			smb_krb5_log_errmsg(ctx, doing, code);
-		else
-			syslog(LOG_ERR, "%s (%s)", doing, errmsg);
+		smb_krb5_log_errmsg(ctx, doing, code);
 	}
 
 	if (my_creds.client == me) {
diff --git a/usr/src/man/man8/nvmeadm.8 b/usr/src/man/man8/nvmeadm.8
index 04508b2c22..90ac4251ac 100644
--- a/usr/src/man/man8/nvmeadm.8
+++ b/usr/src/man/man8/nvmeadm.8
@@ -139,9 +139,11 @@ The controller name consists of the driver name
 followed by an instance number.
 A namespace is specified by appending a single
 .Qq /
-followed by the namespace ID to the controller name.
-The namespace ID is the EUI64 of the namespace, or a positive non-zero
-decimal number if the namespace doesn't have an EUI64.
+to the controller name, followed by either the namespace ID or the namespace
+EUI64 or NGUID as reported by the
+.Cm identify
+command.
+The namespace ID is a positive non-zero decimal number.
 For commands that don't change the device state multiple controllers
 and namespaces can be specified as a comma-separated list.
 .Pp
diff --git a/usr/src/uts/common/fs/smbsrv/smb2_dispatch.c b/usr/src/uts/common/fs/smbsrv/smb2_dispatch.c
index 164b54e685..f01f019dec 100644
--- a/usr/src/uts/common/fs/smbsrv/smb2_dispatch.c
+++ b/usr/src/uts/common/fs/smbsrv/smb2_dispatch.c
@@ -834,11 +834,10 @@ cmd_start:
 		 * Otherwise, if signing is required, deny access.
 		 */
 		if ((sr->smb2_hdr_flags & SMB2_FLAGS_SIGNED) != 0) {
-			rc = smb2_sign_check_request(sr);
-			if (rc != 0) {
+			if (smb2_sign_check_request(sr) != 0) {
+				smb2sr_put_error(sr, NT_STATUS_ACCESS_DENIED);
 				DTRACE_PROBE1(smb2__sign__check,
 				    smb_request_t *, sr);
-				smb2sr_put_error(sr, NT_STATUS_ACCESS_DENIED);
 				goto cmd_done;
 			}
 		} else if (
diff --git a/usr/src/uts/common/io/nvme/nvme.c b/usr/src/uts/common/io/nvme/nvme.c
index d76fa48d1b..2aa87600f4 100644
--- a/usr/src/uts/common/io/nvme/nvme.c
+++ b/usr/src/uts/common/io/nvme/nvme.c
@@ -2013,8 +2013,9 @@ nvme_async_event_task(void *arg)
 					break;
 
 				dev_err(nvme->n_dip, CE_NOTE,
-				    "!namespace %u (%s) has changed.", nsid,
-				    NVME_NSID2NS(nvme, nsid)->ns_name);
+				    "!namespace nvme%d/%u has changed.",
+				    ddi_get_instance(nvme->n_dip), nsid);
+
 
 				if (nvme_init_ns(nvme, nsid) != DDI_SUCCESS)
 					continue;
@@ -3016,19 +3017,10 @@ nvme_init_ns(nvme_t *nvme, int nsid)
 		bcopy(idns->id_nguid, ns->ns_nguid, sizeof (ns->ns_nguid));
 
 	/*LINTED: E_BAD_PTR_CAST_ALIGN*/
-	if (*(uint64_t *)ns->ns_eui64 != 0) {
-		uint8_t *eui64 = ns->ns_eui64;
-
-		(void) snprintf(ns->ns_name, sizeof (ns->ns_name),
-		    "%02x%02x%02x%02x%02x%02x%02x%02x",
-		    eui64[0], eui64[1], eui64[2], eui64[3],
-		    eui64[4], eui64[5], eui64[6], eui64[7]);
-	} else {
-		(void) snprintf(ns->ns_name, sizeof (ns->ns_name), "%d",
-		    ns->ns_id);
-
+	if (*(uint64_t *)ns->ns_eui64 == 0)
 		nvme_prepare_devid(nvme, ns->ns_id);
-	}
+
+	(void) snprintf(ns->ns_name, sizeof (ns->ns_name), "%u", ns->ns_id);
 
 	/*
 	 * Find the LBA format with no metadata and the best relative
diff --git a/usr/src/uts/common/io/nvme/nvme_var.h b/usr/src/uts/common/io/nvme/nvme_var.h
index dde0af58fb..ca3e7ef1a4 100644
--- a/usr/src/uts/common/io/nvme/nvme_var.h
+++ b/usr/src/uts/common/io/nvme/nvme_var.h
@@ -279,7 +279,7 @@ struct nvme_namespace {
 	nvme_t *ns_nvme;
 	uint8_t ns_eui64[8];
 	uint8_t	ns_nguid[16];
-	char	ns_name[17];
+	char	ns_name[11];
 
 	bd_handle_t ns_bd_hdl;
 
diff --git a/usr/src/uts/intel/io/vmm/amd/svm.c b/usr/src/uts/intel/io/vmm/amd/svm.c
index 5c2943f4f9..3492ebd7e1 100644
--- a/usr/src/uts/intel/io/vmm/amd/svm.c
+++ b/usr/src/uts/intel/io/vmm/amd/svm.c
@@ -833,7 +833,7 @@ static void
 svm_handle_cr0_read(struct svm_softc *svm_sc, int vcpu, enum vm_reg_name reg)
 {
 	uint64_t val;
-	int err;
+	int err __maybe_unused;
 
 	svm_get_cr0(svm_sc, vcpu, &val);
 	err = svm_setreg(svm_sc, vcpu, reg, val);
@@ -845,7 +845,7 @@ svm_handle_cr0_write(struct svm_softc *svm_sc, int vcpu, enum vm_reg_name reg)
 {
 	struct vmcb_state *state;
 	uint64_t val;
-	int err;
+	int err __maybe_unused;
 
 	state = svm_get_vmcb_state(svm_sc, vcpu);
 
diff --git a/usr/src/uts/intel/io/vmm/intel/vmx.c b/usr/src/uts/intel/io/vmm/intel/vmx.c
index 3f67f0138f..ccf506d608 100644
--- a/usr/src/uts/intel/io/vmm/intel/vmx.c
+++ b/usr/src/uts/intel/io/vmm/intel/vmx.c
@@ -2904,7 +2904,7 @@ vmx_run(void *arg, int vcpu, uint64_t rip)
 	vmcs_clear(vmcs_pa);
 	vmx_msr_guest_exit(vmx, vcpu);
 
-	VERIFY(vmx->vmcs_state != VS_NONE && curthread->t_preempt != 0);
+	VERIFY(vmx->vmcs_state[vcpu] != VS_NONE && curthread->t_preempt != 0);
 	vmx->vmcs_state[vcpu] = VS_NONE;
 
 	return (0);
diff --git a/usr/src/uts/intel/io/vmm/vmm_instruction_emul.c b/usr/src/uts/intel/io/vmm/vmm_instruction_emul.c
index 6f2380d170..14c78f411d 100644
--- a/usr/src/uts/intel/io/vmm/vmm_instruction_emul.c
+++ b/usr/src/uts/intel/io/vmm/vmm_instruction_emul.c
@@ -2075,7 +2075,7 @@ static int
 vie_emulate_clts(struct vie *vie, struct vm *vm, int vcpuid)
 {
 	uint64_t val;
-	int error;
+	int error __maybe_unused;
 
 	if (vie->paging.cpl != 0) {
 		vm_inject_gp(vm, vcpuid);
@@ -2588,7 +2588,7 @@ vie_cs_info(const struct vie *vie, struct vm *vm, int vcpuid, uint64_t *cs_base,
     int *cs_d)
 {
 	struct seg_desc cs_desc;
-	int error;
+	int error __maybe_unused;
 
 	error = vm_get_seg_desc(vm, vcpuid, VM_REG_GUEST_CS, &cs_desc);
 	ASSERT(error == 0);