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/xen | |
| 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/xen')
| -rw-r--r-- | sys/xen/evtchn/evtchn.c | 4 | ||||
| -rw-r--r-- | sys/xen/interface/foreign/structs.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/xen/evtchn/evtchn.c b/sys/xen/evtchn/evtchn.c index eb18b57..baff9aa 100644 --- a/sys/xen/evtchn/evtchn.c +++ b/sys/xen/evtchn/evtchn.c @@ -146,7 +146,7 @@ static int irq_bindcount[NR_IRQS]; #ifdef SMP static uint8_t cpu_evtchn[NR_EVENT_CHANNELS]; -static unsigned long cpu_evtchn_mask[MAX_VIRT_CPUS][NR_EVENT_CHANNELS/LONG_BIT]; +static unsigned long cpu_evtchn_mask[XEN_LEGACY_MAX_VCPUS][NR_EVENT_CHANNELS/LONG_BIT]; #define active_evtchns(cpu,sh,idx) \ ((sh)->evtchn_pending[idx] & \ @@ -998,7 +998,7 @@ void irq_resume(void) } /* Secondary CPUs must have no VIRQ or IPI bindings. */ - for (cpu = 1; cpu < MAX_VIRT_CPUS; cpu++) { + for (cpu = 1; cpu < XEN_LEGACY_MAX_VCPUS; cpu++) { for (virq = 0; virq < NR_VIRQS; virq++) { KASSERT(pcpu_find(cpu)->pc_virq_to_irq[virq] == -1, ("virq_to_irq inconsistent")); diff --git a/sys/xen/interface/foreign/structs.py b/sys/xen/interface/foreign/structs.py index 7d51ca8..a1bc055 100644 --- a/sys/xen/interface/foreign/structs.py +++ b/sys/xen/interface/foreign/structs.py @@ -53,6 +53,6 @@ defines = [ "__i386__", # all archs "xen_pfn_to_cr3", - "MAX_VIRT_CPUS", + "XEN_LEGACY_MAX_VCPUS", "MAX_GUEST_CMDLINE" ]; |
