diff options
| author | Jeremy Jones <jeremy@delphix.com> | 2014-05-16 17:36:29 +0000 |
|---|---|---|
| committer | Dan McDonald <danmcd@omniti.com> | 2017-04-28 10:04:40 -0400 |
| commit | 3599414c808350f34f7facca641b720233836743 (patch) | |
| tree | 05cf7fea174a98161ffa2e59b04595951cb4605d | |
| parent | d5d6353541d0c5d8ba33ebcfead758697fbc1e49 (diff) | |
| download | illumos-joyent-3599414c808350f34f7facca641b720233836743.tar.gz | |
8019 Some PV devices should not be configured in HVM mode
Reviewed by: Paul Dagnelie <pcd@delphix.com>
Reviewed by: Basil Crow <basil.crow@delphix.com>
Approved by: Dan McDonald <danmcd@omniti.com>
| -rw-r--r-- | usr/src/uts/common/xen/os/xvdi.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/usr/src/uts/common/xen/os/xvdi.c b/usr/src/uts/common/xen/os/xvdi.c index 85dd5d7d81..3fbdb3b95f 100644 --- a/usr/src/uts/common/xen/os/xvdi.c +++ b/usr/src/uts/common/xen/os/xvdi.c @@ -25,6 +25,10 @@ */ /* + * Copyright (c) 2014 by Delphix. All rights reserved. + */ + +/* * Xen virtual device driver interfaces */ @@ -146,8 +150,10 @@ typedef struct xd_cfg { #define XD_DOM_ALL (XD_DOM_ZERO | XD_DOM_GUEST) static i_xd_cfg_t xdci[] = { +#ifndef XPV_HVM_DRIVER { XEN_CONSOLE, NULL, NULL, NULL, "xencons", NULL, "console", IPL_CONS, XD_DOM_ALL, }, +#endif { XEN_VNET, "vif", "device/vif", "backend/vif", "xnf", "xnb", "network", IPL_VIF, XD_DOM_ALL, }, @@ -158,6 +164,7 @@ static i_xd_cfg_t xdci[] = { { XEN_BLKTAP, "tap", NULL, "backend/tap", NULL, "xpvtap", "block", IPL_VBD, XD_DOM_ALL, }, +#ifndef XPV_HVM_DRIVER { XEN_XENBUS, NULL, NULL, NULL, "xenbus", NULL, NULL, 0, XD_DOM_ALL, }, @@ -166,6 +173,7 @@ static i_xd_cfg_t xdci[] = { { XEN_BALLOON, NULL, NULL, NULL, "balloon", NULL, NULL, 0, XD_DOM_ALL, }, +#endif { XEN_EVTCHN, NULL, NULL, NULL, "evtchn", NULL, NULL, 0, XD_DOM_ZERO, }, |