From owner-freebsd-xen@FreeBSD.ORG Wed Apr 1 16:08:23 2009 Return-Path: Delivered-To: freebsd-xen@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 49132106566C; Wed, 1 Apr 2009 16:08:23 +0000 (UTC) (envelope-from bzeeb-lists@lists.zabbadoz.net) Received: from mail.cksoft.de (mail.cksoft.de [195.88.108.3]) by mx1.freebsd.org (Postfix) with ESMTP id CA2B38FC1E; Wed, 1 Apr 2009 16:08:22 +0000 (UTC) (envelope-from bzeeb-lists@lists.zabbadoz.net) Received: from localhost (amavis.fra.cksoft.de [192.168.74.71]) by mail.cksoft.de (Postfix) with ESMTP id 5E80A41C712; Wed, 1 Apr 2009 17:50:06 +0200 (CEST) X-Virus-Scanned: amavisd-new at cksoft.de Received: from mail.cksoft.de ([195.88.108.3]) by localhost (amavis.fra.cksoft.de [192.168.74.71]) (amavisd-new, port 10024) with ESMTP id m2dky0aNyzVG; Wed, 1 Apr 2009 17:50:05 +0200 (CEST) Received: by mail.cksoft.de (Postfix, from userid 66) id 8B8ED41C735; Wed, 1 Apr 2009 17:50:05 +0200 (CEST) Received: from maildrop.int.zabbadoz.net (maildrop.int.zabbadoz.net [10.111.66.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.int.zabbadoz.net (Postfix) with ESMTP id C0C244448EC; Wed, 1 Apr 2009 15:47:18 +0000 (UTC) Date: Wed, 1 Apr 2009 15:47:18 +0000 (UTC) From: "Bjoern A. Zeeb" X-X-Sender: bz@maildrop.int.zabbadoz.net To: =?iso-8859-1?Q?Bj=F6rn?= JACKE In-Reply-To: Message-ID: <20090401154457.K15361@maildrop.int.zabbadoz.net> References: <1238162602.24399.29.camel@phoenix.blechhirn.net> X-OpenPGP-Key: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 MIME-Version: 1.0 Content-Type: MULTIPART/MIXED; BOUNDARY="0-2014893890-1238600777=:15361" Content-ID: <20090401154626.R15361@maildrop.int.zabbadoz.net> Cc: freebsd-xen@freebsd.org, Doug Rabson , freebsd-current@freebsd.org, Mister Olli Subject: Re: Compiling CURRENT with XEN config fails X-BeenThere: freebsd-xen@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussion of the freebsd port to xen - implementation and usage List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Apr 2009 16:08:23 -0000 This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --0-2014893890-1238600777=:15361 Content-Type: TEXT/PLAIN; CHARSET=ISO-8859-1; FORMAT=flowed Content-Transfer-Encoding: QUOTED-PRINTABLE Content-ID: <20090401154626.O15361@maildrop.int.zabbadoz.net> On Wed, 1 Apr 2009, Bj=F6rn JACKE wrote: > On 2009-03-27 at 15:03 +0100 Mister Olli sent off: >> /usr/src/sys/xen/evtchn/evtchn.c:516: error: conflicting types for 'bind= _virq_to_irqhandler' >> /usr/src/sys/xen/xen_intr.h:61: error: previous declaration of 'bind_vir= q_to_irqhandler' was here >> /usr/src/sys/xen/evtchn/evtchn.c: In function 'bind_virq_to_irqhandler': >> /usr/src/sys/xen/evtchn/evtchn.c:523: error: 'arg' undeclared (first use= in this function) >> /usr/src/sys/xen/evtchn/evtchn.c:523: error: (Each undeclared identifier= is reported only once >> /usr/src/sys/xen/evtchn/evtchn.c:523: error: for each function it appear= s in.) >> *** Error code 1 > > the attached patch should fix this one. Can someone review that please? I had those since last weekend but there are even more ... Not entirely sure about the second hunk of the console.c patch though. I gave up as the universe I built worked for what I tested. Index: sys/dev/xen/console/console.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- sys/dev/xen/console/console.c (revision 190619) +++ sys/dev/xen/console/console.c (working copy) @@ -225,7 +225,6 @@ xc_attach(device_t dev) { int error; - struct xc_softc *sc =3D (struct xc_softc *)device_get_softc(dev); if (xen_start_info->flags & SIF_INITDOMAIN) { xc_consdev.cn_putc =3D xccnputc_dom0; @@ -248,6 +247,7 @@ "console", NULL, xencons_priv_interrupt, + NULL, INTR_TYPE_TTY, NULL); KASSERT(error >=3D 0, ("can't register con= sole interrupt")); Index: sys/xen/evtchn/evtchn.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- sys/xen/evtchn/evtchn.c (revision 190619) +++ sys/xen/evtchn/evtchn.c (working copy) @@ -512,7 +512,7 @@ int bind_virq_to_irqhandler(unsigned int virq, unsigned int cpu, const char *devname, driver_filter_t filter, driver_intr_t handler, - unsigned long irqflags, unsigned int *irqp) + void *arg, unsigned long irqflags, unsigned int *irqp) { unsigned int irq; int error; Index: sys/xen/reboot.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- sys/xen/reboot.c (revision 190619) +++ sys/xen/reboot.c (working copy) @@ -176,9 +176,9 @@ /* * Bind us to CPU 0 and stop any other VCPUs. */ - mtx_lock_spin(&sched_lock); + thread_lock(curthread); sched_bind(curthread, 0); - mtx_unlock_spin(&sched_lock); + thread_unlock(curthread); KASSERT(PCPU_GET(cpuid) =3D=3D 0, ("xen_suspend: not running on cp= u 0")); map =3D PCPU_GET(other_cpus) & ~stopped_cpus; --=20 Bjoern A. Zeeb The greatest risk is not taking one. --0-2014893890-1238600777=:15361--