diff options
author | royger <royger@FreeBSD.org> | 2014-06-16 08:48:06 +0000 |
---|---|---|
committer | royger <royger@FreeBSD.org> | 2014-06-16 08:48:06 +0000 |
commit | 8cb3293c2284670ddeecbac6a6a274b5cc9ad995 (patch) | |
tree | 19ee63e3bdaa0cb3c1048780177cafee4dc8e8da /sys/xen | |
parent | aa6dff81f438b896594354d6779da67fe6b46379 (diff) | |
download | FreeBSD-src-8cb3293c2284670ddeecbac6a6a274b5cc9ad995.zip FreeBSD-src-8cb3293c2284670ddeecbac6a6a274b5cc9ad995.tar.gz |
xen: init gnttab from xenpv
Currently the grant table is initialized from xenstore, but a better
place to do this would be xenpv, so move grant table initialization
there.
Sponsored by: Citrix Systems R&D
Approved by: gibbs
x86/xen/xenpv.c:
- Add gnttab initialization.
xen/xenstore/xenstore.c:
- Remove gnttab initialization.
Diffstat (limited to 'sys/xen')
-rw-r--r-- | sys/xen/xenstore/xenstore.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/sys/xen/xenstore/xenstore.c b/sys/xen/xenstore/xenstore.c index f0b6617..f7425da 100644 --- a/sys/xen/xenstore/xenstore.c +++ b/sys/xen/xenstore/xenstore.c @@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$"); #include <machine/stdarg.h> #include <xen/xen-os.h> -#include <xen/gnttab.h> #include <xen/hypervisor.h> #include <xen/xen_intr.h> @@ -1128,20 +1127,6 @@ xs_attach(device_t dev) xs.xs_dev = dev; device_set_softc(dev, &xs); - /* - * This seems to be a layering violation. The XenStore is just - * one of many clients of the Grant Table facility. It happens - * to be the first and a gating consumer to all other devices, - * so this does work. A better place would be in the PV support - * code for fully PV kernels and the xenpci driver for HVM kernels. - */ - error = gnttab_init(); - if (error != 0) { - log(LOG_WARNING, - "XENSTORE: Error initializing grant tables: %d\n", error); - return (ENXIO); - } - /* Initialize the interface to xenstore. */ struct proc *p; |