Date: Sun, 16 Jun 2013 19:21:20 -0400 From: Glen Barber <gjb@FreeBSD.org> To: "Justin T. Gibbs" <gibbs@FreeBSD.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r251767 - in head/sys: amd64/include/xen i386/include/xen xen xen/interface xen/interface/arch-arm/hvm xen/interface/arch-ia64 xen/interface/arch-ia64/hvm xen/interface/arch-x86 xen/int... Message-ID: <20130616232120.GZ1692@glenbarber.us> In-Reply-To: <E0B58EBC-3F86-4E9E-B2D0-EC57FEDE5F1A@FreeBSD.org> References: <201306142343.r5ENhjC0025604@svn.freebsd.org> <20130616213032.GW1692@glenbarber.us> <E0B58EBC-3F86-4E9E-B2D0-EC57FEDE5F1A@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--SHFFXbs3XlGSDX14 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Jun 16, 2013 at 05:14:46PM -0600, Justin T. Gibbs wrote: > On Jun 16, 2013, at 3:30 PM, Glen Barber <gjb@freebsd.org> wrote: >=20 > > On Fri, Jun 14, 2013 at 11:43:45PM +0000, Justin T. Gibbs wrote: > >> Author: gibbs > >> Date: Fri Jun 14 23:43:44 2013 > >> New Revision: 251767 > >> URL: http://svnweb.freebsd.org/changeset/base/251767 > >>=20 > >> Log: > >> Upgrade Xen interface headers to Xen 4.2.1. > >>=20 > >> Move FreeBSD from interface version 0x00030204 to 0x00030208. > >> Updates are required to our grant table implementation before we > >> can bump this further. > >>=20 > >> sys/xen/hvm.h: > >> Replace the implementation of hvm_get_parameter(), formerly located > >> in sys/xen/interface/hvm/params.h. Linux has a similar file which > >> primarily stores this function. > >>=20 > >> sys/xen/xenstore/xenstore.c: > >> Include new xen/hvm.h header file to get hvm_get_parameter(). > >>=20 > >> sys/amd64/include/xen/xen-os.h: > >> sys/i386/include/xen/xen-os.h: > >> Correctly protect function definition and variables from being > >> included into assembly files in xen-os.h > >>=20 > >> Xen memory barriers are now prefixed with "xen_" to avoid conflicts > >> with OS native primatives. Define Xen memory barriers in terms of > >> the native FreeBSD primatives. > >>=20 > >=20 > > [...] > >=20 > >> Modified: head/sys/xen/interface/arch-ia64.h > >> =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=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > >> --- head/sys/xen/interface/arch-ia64.h Fri Jun 14 23:04:31 2013 (r2517= 66) > >> +++ head/sys/xen/interface/arch-ia64.h Fri Jun 14 23:43:44 2013 (r2517= 67) > >> @@ -49,10 +49,11 @@ > >> #define XEN_GUEST_HANDLE(name) __guest_handle_ ## name > >> #define XEN_GUEST_HANDLE_64(name) XEN_GUEST_HANDLE(name) > >> #define uint64_aligned_t uint64_t > >> -#define set_xen_guest_handle(hnd, val) do { (hnd).p =3D val; } while= (0) > >> +#define set_xen_guest_handle_raw(hnd, val) do { (hnd).p =3D val; } w= hile (0) > >> #ifdef __XEN_TOOLS__ > >> #define get_xen_guest_handle(val, hnd) do { val =3D (hnd).p; } while = (0) > >> #endif > >> +#define set_xen_guest_handle(hnd, val) set_xen_guest_handle_raw(hnd, = val) > >>=20 > >> #ifndef __ASSEMBLY__ > >> typedef unsigned long xen_pfn_t; > >> @@ -66,7 +67,7 @@ typedef unsigned long xen_pfn_t; > >>=20 > >> /* Maximum number of virtual CPUs in multi-processor guests. */ > >> /* WARNING: before changing this, check that shared_info fits on a pag= e */ > >> -#define MAX_VIRT_CPUS 64 > >> +#define XEN_LEGACY_MAX_VCPUS 64 > >>=20 > >=20 > > I think this is breaking the i386 XEN build: > >=20 > > cc -c -O -pipe -std=3Dc99 -g -Wall -Wredundant-decls -Wnested-externs= -Wstrict-prototypes > > -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -Wundef -Wno= -pointer-sign > > -fformat-extensions -Wmissing-include-dirs -fdiagnostics-show-option > > -Wno-error-tautological-compare -Wno-error-empty-body -Wno-error-parent= heses-equality > > -nostdinc -I. -I/src/sys -I/src/sys/contrib/altq -I/src/sys/contrib/li= bfdt -D_KERNEL > > -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h -mno-aes -mno-avx -= mno-mmx -mno-sse > > -msoft-float -ffreestanding -fstack-protector -Werror /src/sys/xen/evtc= hn/evtchn.c > > /src/sys/xen/evtchn/evtchn.c:149:38: error: use of undeclared identifie= r 'MAX_VIRT_CPUS' > > static unsigned long > > cpu_evtchn_mask[MAX_VIRT_CPUS][NR_EVENT_CHANNELS/LONG_BIT]; > > ^ > > /src/sys/xen/evtchn/evtchn.c:1001:22: error: use of undeclared > > identifier 'MAX_VIRT_CPUS' > > for (cpu =3D 1; cpu < MAX_VIRT_CPUS; cpu++) { > > ^ > > 2 errors generated. > > *** Error code 1 > >=20 > > Stop. > > make: stopped in /obj/i386.i386/src/sys/XEN > > *** Error code 1 > >=20 > >=20 > > Glen >=20 > Yup, because of the change to the x86 version of the header you reference= =2E I have a patch > ready and am just waiting on a build. >=20 Great, thanks! If I can do anything to build-test, please let me know. Glen --SHFFXbs3XlGSDX14 Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (FreeBSD) iQEcBAEBCAAGBQJRvkhwAAoJEFJPDDeguUajH3gH/jpDsKghjNw4GICD/7txyiKd WCNuTamTlVfmGV3k/iw/+KZnKxLon/ESR9xcGkHI3K12CTLnOjnscNAAJ/l/e2aq hYFPTleHA8T6PLRfnA5rCeL38JKZT/19rvxNM4M412klPG77E4wa3JXdKzL8zQKK G4PpIsBhrZbQJHWK4HfBCYfA0gWJtwH90RSiYG19Sz3EqGOqAOJ4OKd+mdHsm3SZ cGBiOnwLZxEWSpbUIe0Hm4jsYzYN/jMu+q0+L6yDlvFPqZBVH2rfNVKABBtM27kA 58gkn194kCLXymsuQkTaamh3gybi755oxDX1Rj8sohUPu83DCvcIrNZ/iV6FPyk= =OTG8 -----END PGP SIGNATURE----- --SHFFXbs3XlGSDX14--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130616232120.GZ1692>