diff options
| author | royger <royger@FreeBSD.org> | 2015-11-24 08:41:27 +0000 |
|---|---|---|
| committer | royger <royger@FreeBSD.org> | 2015-11-24 08:41:27 +0000 |
| commit | 4b6a65d9c084e4d5381e5bccbe02d1fb30290b90 (patch) | |
| tree | 4e9fffdd271e2c28376fd60d0193b905ce6c39c3 /sys/dev | |
| parent | 0fd4030a5329faac256e6ede78ab445c412e8a67 (diff) | |
| download | FreeBSD-src-4b6a65d9c084e4d5381e5bccbe02d1fb30290b90.zip FreeBSD-src-4b6a65d9c084e4d5381e5bccbe02d1fb30290b90.tar.gz | |
MFC r286999:
xen: allow disabling PV disks and nics
Sponsored by: Citrix Systems R&D
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/xen/blkfront/blkfront.c | 5 | ||||
| -rw-r--r-- | sys/dev/xen/netfront/netfront.c | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/sys/dev/xen/blkfront/blkfront.c b/sys/dev/xen/blkfront/blkfront.c index 312a077..e9650f0 100644 --- a/sys/dev/xen/blkfront/blkfront.c +++ b/sys/dev/xen/blkfront/blkfront.c @@ -1367,6 +1367,11 @@ xbd_probe(device_t dev) if (strcmp(xenbus_get_type(dev), "vbd") != 0) return (ENXIO); +#ifdef XENHVM + if (xen_disable_pv_disks != 0) + return (ENXIO); +#endif + if (xen_hvm_domain()) { int error; char *type; diff --git a/sys/dev/xen/netfront/netfront.c b/sys/dev/xen/netfront/netfront.c index d89c0e0..71965ac 100644 --- a/sys/dev/xen/netfront/netfront.c +++ b/sys/dev/xen/netfront/netfront.c @@ -451,6 +451,11 @@ static int netfront_probe(device_t dev) { +#ifdef XENHVM + if (xen_disable_pv_nics != 0) + return (ENXIO); +#endif + if (!strcmp(xenbus_get_type(dev), "vif")) { device_set_desc(dev, "Virtual Network Interface"); return (0); |
