summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJerry Jelinek <jerry.jelinek@joyent.com>2018-05-01 11:37:39 +0000
committerJerry Jelinek <jerry.jelinek@joyent.com>2018-05-01 11:37:39 +0000
commitba1cf7661f591559209cec564525475276b2474c (patch)
tree77d5c5daefe1df93615bcc1e4a9dca60da6b9ff5
parent3416ecda28031d334306967dcced78e7d41eff8b (diff)
parent6d1e6c904bd5a457b056df2ae360a7354081558d (diff)
downloadillumos-joyent-ba1cf7661f591559209cec564525475276b2474c.tar.gz
[illumos-gate merge]
commit 6d1e6c904bd5a457b056df2ae360a7354081558d 9203 xvdi_init_dev() truncates the unit address to 7 characters
-rw-r--r--usr/src/uts/common/xen/os/xvdi.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/usr/src/uts/common/xen/os/xvdi.c b/usr/src/uts/common/xen/os/xvdi.c
index 3fbdb3b95f..d9013868be 100644
--- a/usr/src/uts/common/xen/os/xvdi.c
+++ b/usr/src/uts/common/xen/os/xvdi.c
@@ -26,6 +26,7 @@
/*
* Copyright (c) 2014 by Delphix. All rights reserved.
+ * Copyright 2018 Nexenta Systems, Inc.
*/
/*
@@ -252,7 +253,7 @@ xvdi_init_dev(dev_info_t *dip)
char *xsname;
void *prop_str;
unsigned int prop_len;
- char unitaddr[8];
+ char unitaddr[16];
devcls = ddi_prop_get_int(DDI_DEV_T_ANY, dip,
DDI_PROP_DONTPASS, "devclass", XEN_INVAL);
@@ -333,7 +334,7 @@ xvdi_init_dev(dev_info_t *dip)
* of the xenstore node containing the device configuration
* and is contained in the 'vdev' property.
* VIF devices are named using an incrementing integer.
- * VBD devices are either named using the 16-bit dev_t value
+ * VBD devices are either named using the 32-bit dev_t value
* for linux 'hd' and 'xvd' devices, or a simple integer value
* in the range 0..767. 768 is the base value of the linux
* dev_t namespace, the dev_t value for 'hda'.