diff options
| author | /var/mail/jack <none@none> | 2008-08-14 22:37:41 -0700 |
|---|---|---|
| committer | /var/mail/jack <none@none> | 2008-08-14 22:37:41 -0700 |
| commit | c0f8539da87f40c37da3e4f15edb0b3284d7c26d (patch) | |
| tree | 09e56329fd22b96494b71a35fcd8bc22926e963c /usr/src | |
| parent | b7c7b08d72216aa8a46ea5e487cf5163b6debacf (diff) | |
| download | illumos-joyent-c0f8539da87f40c37da3e4f15edb0b3284d7c26d.tar.gz | |
6713700 Dynamic blk dev support in kernel
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/uts/common/xen/io/xdb.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/usr/src/uts/common/xen/io/xdb.c b/usr/src/uts/common/xen/io/xdb.c index 06c99d6341..bf4e64bc40 100644 --- a/usr/src/uts/common/xen/io/xdb.c +++ b/usr/src/uts/common/xen/io/xdb.c @@ -48,8 +48,6 @@ * There is an on-going effort to make xvdi_* cover all xenbus_*. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/types.h> #include <sys/conf.h> #include <sys/ddi.h> @@ -814,7 +812,11 @@ xdb_setup_node(xdb_t *vdp, char *path) if (xsnode == NULL) return (DDI_FAILURE); - err = xenbus_read(XBT_NULL, xsnode, "params", (void **)&node, &len); + err = xenbus_read(XBT_NULL, xsnode, "dynamic-device-path", + (void **)&node, &len); + if (err == ENOENT) + err = xenbus_read(XBT_NULL, xsnode, "params", (void **)&node, + &len); if (err != 0) { xvdi_fatal_error(vdp->xs_dip, err, "reading 'params'"); return (DDI_FAILURE); @@ -875,7 +877,11 @@ xdb_teardown_node(xdb_t *vdp) if (xsnode == NULL) return; - err = xenbus_read(XBT_NULL, xsnode, "params", (void **)&node, &len); + err = xenbus_read(XBT_NULL, xsnode, "dynamic-device-path", + (void **)&node, &len); + if (err == ENOENT) + err = xenbus_read(XBT_NULL, xsnode, "params", (void **)&node, + &len); if (err != 0) { xvdi_fatal_error(vdp->xs_dip, err, "reading 'params'"); return; @@ -1522,7 +1528,7 @@ static struct dev_ops xdb_dev_ops = { */ static struct modldrv modldrv = { &mod_driverops, /* Type of module. */ - "vbd backend driver 1.4", /* Name of the module */ + "vbd backend driver 1.5", /* Name of the module */ &xdb_dev_ops /* driver ops */ }; |