d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjust i386 Xen PV support for updated Xen interface files.

Browse Source 
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
This commit is contained in:
gibbs 2013-06-17 01:43:07 +00:00
parent fb29984476
commit 16fc3a3c4b
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/i386/include/xen/xenvar.h
View File

@ -93,7 +93,7 @@ extern xen_pfn_t *xen_machine_phys;
void xpq_init(void); void xpq_init(void);
#define BITS_PER_LONG 32 #define BITS_PER_LONG 32
#define NR_CPUS MAX_VIRT_CPUS #define NR_CPUS XEN_LEGACY_MAX_VCPUS
#define BITS_TO_LONGS(bits) \ #define BITS_TO_LONGS(bits) \
(((bits)+BITS_PER_LONG-1)/BITS_PER_LONG) (((bits)+BITS_PER_LONG-1)/BITS_PER_LONG)

6
sys/i386/xen/xen_machdep.c
View File

@ -203,11 +203,11 @@ struct mmu_log {
#ifdef SMP #ifdef SMP
/* per-cpu queues and indices */ /* per-cpu queues and indices */
#ifdef INVARIANTS #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 #endif
static int xpq_idx[MAX_VIRT_CPUS]; static int xpq_idx[XEN_LEGACY_MAX_VCPUS];
static mmu_update_t xpq_queue[MAX_VIRT_CPUS][XPQUEUE_SIZE]; static mmu_update_t xpq_queue[XEN_LEGACY_MAX_VCPUS][XPQUEUE_SIZE];
#define XPQ_QUEUE_LOG xpq_queue_log[vcpu] #define XPQ_QUEUE_LOG xpq_queue_log[vcpu]
#define XPQ_QUEUE xpq_queue[vcpu] #define XPQ_QUEUE xpq_queue[vcpu]

4
sys/xen/evtchn/evtchn.c
View File

@ -146,7 +146,7 @@ static int irq_bindcount[NR_IRQS];
#ifdef SMP #ifdef SMP
static uint8_t cpu_evtchn[NR_EVENT_CHANNELS]; 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) \ #define active_evtchns(cpu,sh,idx) \
((sh)->evtchn_pending[idx] & \ ((sh)->evtchn_pending[idx] & \
@ -998,7 +998,7 @@ void irq_resume(void)
} }
/* Secondary CPUs must have no VIRQ or IPI bindings. */ /* 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++) { for (virq = 0; virq < NR_VIRQS; virq++) {
KASSERT(pcpu_find(cpu)->pc_virq_to_irq[virq] == -1, KASSERT(pcpu_find(cpu)->pc_virq_to_irq[virq] == -1,
("virq_to_irq inconsistent")); ("virq_to_irq inconsistent"));

2
sys/xen/interface/foreign/structs.py
View File

@ -53,6 +53,6 @@
# all archs # all archs
"xen_pfn_to_cr3", "xen_pfn_to_cr3",
"MAX_VIRT_CPUS", "XEN_LEGACY_MAX_VCPUS",
"MAX_GUEST_CMDLINE" ]; "MAX_GUEST_CMDLINE" ];