From owner-svn-src-head@FreeBSD.ORG Mon Jun 17 01:43:08 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 82B00880; Mon, 17 Jun 2013 01:43:08 +0000 (UTC) (envelope-from gibbs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 645281285; Mon, 17 Jun 2013 01:43:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5H1h8Hn067308; Mon, 17 Jun 2013 01:43:08 GMT (envelope-from gibbs@svn.freebsd.org) Received: (from gibbs@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5H1h74v067301; Mon, 17 Jun 2013 01:43:07 GMT (envelope-from gibbs@svn.freebsd.org) Message-Id: <201306170143.r5H1h74v067301@svn.freebsd.org> From: "Justin T. Gibbs" Date: Mon, 17 Jun 2013 01:43:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r251824 - in head/sys: i386/include/xen i386/xen xen/evtchn xen/interface/foreign X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Jun 2013 01:43:08 -0000 Author: gibbs Date: Mon Jun 17 01:43:07 2013 New Revision: 251824 URL: http://svnweb.freebsd.org/changeset/base/251824 Log: 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 Modified: head/sys/i386/include/xen/xenvar.h head/sys/i386/xen/xen_machdep.c head/sys/xen/evtchn/evtchn.c head/sys/xen/interface/foreign/structs.py Modified: head/sys/i386/include/xen/xenvar.h ============================================================================== --- head/sys/i386/include/xen/xenvar.h Mon Jun 17 00:39:23 2013 (r251823) +++ head/sys/i386/include/xen/xenvar.h Mon Jun 17 01:43:07 2013 (r251824) @@ -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) Modified: head/sys/i386/xen/xen_machdep.c ============================================================================== --- head/sys/i386/xen/xen_machdep.c Mon Jun 17 00:39:23 2013 (r251823) +++ head/sys/i386/xen/xen_machdep.c Mon Jun 17 01:43:07 2013 (r251824) @@ -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] Modified: head/sys/xen/evtchn/evtchn.c ============================================================================== --- head/sys/xen/evtchn/evtchn.c Mon Jun 17 00:39:23 2013 (r251823) +++ head/sys/xen/evtchn/evtchn.c Mon Jun 17 01:43:07 2013 (r251824) @@ -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")); Modified: head/sys/xen/interface/foreign/structs.py ============================================================================== --- head/sys/xen/interface/foreign/structs.py Mon Jun 17 00:39:23 2013 (r251823) +++ head/sys/xen/interface/foreign/structs.py Mon Jun 17 01:43:07 2013 (r251824) @@ -53,6 +53,6 @@ defines = [ "__i386__", # all archs "xen_pfn_to_cr3", - "MAX_VIRT_CPUS", + "XEN_LEGACY_MAX_VCPUS", "MAX_GUEST_CMDLINE" ];