diff options
| author | gibbs <gibbs@FreeBSD.org> | 2013-06-17 01:43:07 +0000 |
|---|---|---|
| committer | gibbs <gibbs@FreeBSD.org> | 2013-06-17 01:43:07 +0000 |
| commit | 16fc3a3c4b824ddbea8ec98084b5c4c061c0faba (patch) | |
| tree | 13f2c59a8ea0d3689e9f23a152821f4f8f30ce9f /sys/i386 | |
| parent | fb29984476cf1994b460892bdd3357a016c3fc81 (diff) | |
| download | FreeBSD-src-16fc3a3c4b824ddbea8ec98084b5c4c061c0faba.zip FreeBSD-src-16fc3a3c4b824ddbea8ec98084b5c4c061c0faba.tar.gz | |
Adjust i386 Xen PV support for updated Xen interface files.
sys/i386/include/xen/xenvar.h:
sys/i386/xen/xen_machdep.c:
sys/xen/interface/foreign/structs.py:
sys/xen/evtchn/evtchn.c:
MAX_VIRT_CPUS => XEN_LEGACY_MAX_VCPUS
Submitted by: Roger Pau Monné
Reviewed by: gibbs
Diffstat (limited to 'sys/i386')
| -rw-r--r-- | sys/i386/include/xen/xenvar.h | 2 | ||||
| -rw-r--r-- | sys/i386/xen/xen_machdep.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/i386/include/xen/xenvar.h b/sys/i386/include/xen/xenvar.h index 137984d..b1a0a4d 100644 --- a/sys/i386/include/xen/xenvar.h +++ b/sys/i386/include/xen/xenvar.h @@ -93,7 +93,7 @@ extern xen_pfn_t *xen_machine_phys; void xpq_init(void); #define BITS_PER_LONG 32 -#define NR_CPUS MAX_VIRT_CPUS +#define NR_CPUS XEN_LEGACY_MAX_VCPUS #define BITS_TO_LONGS(bits) \ (((bits)+BITS_PER_LONG-1)/BITS_PER_LONG) diff --git a/sys/i386/xen/xen_machdep.c b/sys/i386/xen/xen_machdep.c index 3b3da6f..9b5edd3 100644 --- a/sys/i386/xen/xen_machdep.c +++ b/sys/i386/xen/xen_machdep.c @@ -203,11 +203,11 @@ struct mmu_log { #ifdef SMP /* per-cpu queues and indices */ #ifdef INVARIANTS -static struct mmu_log xpq_queue_log[MAX_VIRT_CPUS][XPQUEUE_SIZE]; +static struct mmu_log xpq_queue_log[XEN_LEGACY_MAX_VCPUS][XPQUEUE_SIZE]; #endif -static int xpq_idx[MAX_VIRT_CPUS]; -static mmu_update_t xpq_queue[MAX_VIRT_CPUS][XPQUEUE_SIZE]; +static int xpq_idx[XEN_LEGACY_MAX_VCPUS]; +static mmu_update_t xpq_queue[XEN_LEGACY_MAX_VCPUS][XPQUEUE_SIZE]; #define XPQ_QUEUE_LOG xpq_queue_log[vcpu] #define XPQ_QUEUE xpq_queue[vcpu] |
