Date: Sun, 16 Jun 2013 17:30:32 -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: <20130616213032.GW1692@glenbarber.us> In-Reply-To: <201306142343.r5ENhjC0025604@svn.freebsd.org> References: <201306142343.r5ENhjC0025604@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--q5iovQLtJQXc0+Hs Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 [...] > 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 (r251766) > +++ head/sys/xen/interface/arch-ia64.h Fri Jun 14 23:43:44 2013 (r251767) > @@ -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; } whil= e (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 page = */ > -#define MAX_VIRT_CPUS 64 > +#define XEN_LEGACY_MAX_VCPUS 64 > =20 I think this is breaking the i386 XEN build: cc -c -O -pipe -std=3Dc99 -g -Wall -Wredundant-decls -Wnested-externs -Ws= trict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -Wundef -Wno-poi= nter-sign -fformat-extensions -Wmissing-include-dirs -fdiagnostics-show-option -Wno-error-tautological-compare -Wno-error-empty-body -Wno-error-parenthese= s-equality -nostdinc -I. -I/src/sys -I/src/sys/contrib/altq -I/src/sys/contrib/libfdt= -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/evtchn/e= vtchn.c /src/sys/xen/evtchn/evtchn.c:149:38: error: use of undeclared identifier 'M= AX_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 Glen --q5iovQLtJQXc0+Hs Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (FreeBSD) iQEcBAEBCAAGBQJRvi54AAoJEFJPDDeguUajUMIIAKfgrfbNfPknIdmIzVByAC9R aZSRwQKJzt6vfENEsVsCbBp6roH0CY0s46nxBzS0CZPhrK55qNsE72nXOsQ4yvaE 4fCgbOReWnJYladeDTA1+9qbkdf7+ooHT1s2n0GwusOeLGUS23NFqjzFIPGRJPIO 91z1BoqbKmQZMDPW/udYSVED0WVzP95CX6l5h4eUry03K3A4ZkUSBjiDD8tozqHj rH8Xt2Yfovr9mcUyudwQvqVX3LPcW6oakrZvMzYITqACBiSOQnURWyrK5myCbRcy S2A5yGge7JV3/lN5inwUwgOjkNXioHmJHtl6R0Yqs+UTnOgx79lUBWLPxlh+alk= =TGrC -----END PGP SIGNATURE----- --q5iovQLtJQXc0+Hs--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130616213032.GW1692>