diff options
author | royger <royger@FreeBSD.org> | 2014-06-16 08:48:42 +0000 |
---|---|---|
committer | royger <royger@FreeBSD.org> | 2014-06-16 08:48:42 +0000 |
commit | f013e4ff53da712d502ee27018f0a631f47b442c (patch) | |
tree | 4477500f87829c29d6037ef7592fe4503fb7878b /sys/dev/xen/xenpci/xenpcivar.h | |
parent | 8cb3293c2284670ddeecbac6a6a274b5cc9ad995 (diff) | |
download | FreeBSD-src-f013e4ff53da712d502ee27018f0a631f47b442c.zip FreeBSD-src-f013e4ff53da712d502ee27018f0a631f47b442c.tar.gz |
xen: unify gnttab initialization for PVHVM and PVH
Switch the initialization of gnttab to use an unused physical memory
range for both PVHVM and PVH.
In the past PVHVM was using the xenpci BAR, but there's no reason to
do that, and in fact FreeBSD was probably doing it because it was the
way it was done in Windows, were drivers cannot probably request for
unused physical memory ranges, but it was never enforced in the
hypervisor.
Sponsored by: Citrix Systems R&D
Approved by: gibbs
xen/gnttab.c:
- Allocate contiguous physical memory for grant table frames for both
PVHVM and PVH.
- Since gnttab is not a device, use the xenpv device in order to
request for this allocation.
dev/xen/xenpci/xenpcivar.h:
dev/xen/xenpci/xenpci.c:
- Remove the now unused xenpci_alloc_space and xenpci_alloc_space_int
functions.
xen/gnttab.h:
- Change the prototype of gnttab_init and gnttab_resume, that now
takes a device_t parameter.
dev/xen/control/control.c:
x86/xen/xenpv.c:
- Changes to accomodate the new prototype of gnttab_init and
gnttab_resume.
Diffstat (limited to 'sys/dev/xen/xenpci/xenpcivar.h')
-rw-r--r-- | sys/dev/xen/xenpci/xenpcivar.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sys/dev/xen/xenpci/xenpcivar.h b/sys/dev/xen/xenpci/xenpcivar.h index 527a291..45d1215 100644 --- a/sys/dev/xen/xenpci/xenpcivar.h +++ b/sys/dev/xen/xenpci/xenpcivar.h @@ -31,13 +31,7 @@ */ struct xenpci_softc { int rid_ioport; - int rid_memory; int rid_irq; - struct resource* res_memory; /* Resource for mem range. */ struct resource* res_irq; /* Resource for irq range. */ void *intr_cookie; - - vm_paddr_t phys_next; /* next page from mem range */ }; - -extern int xenpci_alloc_space(size_t sz, vm_paddr_t *pa); |