diff options
| -rw-r--r-- | sys/i386/include/xen/xenvar.h | 2 | ||||
| -rw-r--r-- | sys/i386/xen/xen_machdep.c | 6 | ||||
| -rw-r--r-- | sys/xen/evtchn/evtchn.c | 4 | ||||
| -rw-r--r-- | sys/xen/interface/foreign/structs.py | 2 |
4 files changed, 7 insertions, 7 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] 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" ]; |
