Date: Sat, 5 Apr 2014 22:43:18 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r264178 - in head/sys: i386/xen x86/xen xen Message-ID: <201404052243.s35MhIxv027921@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Sat Apr 5 22:43:18 2014 New Revision: 264178 URL: http://svnweb.freebsd.org/changeset/base/264178 Log: Make this compile with gcc. Submitted by: royger@ Modified: head/sys/i386/xen/xen_machdep.c head/sys/x86/xen/pv.c head/sys/xen/xen-os.h Modified: head/sys/i386/xen/xen_machdep.c ============================================================================== --- head/sys/i386/xen/xen_machdep.c Sat Apr 5 22:42:00 2014 (r264177) +++ head/sys/i386/xen/xen_machdep.c Sat Apr 5 22:43:18 2014 (r264178) @@ -64,6 +64,7 @@ __FBSDID("$FreeBSD$"); #include <xen/hypervisor.h> +#include <xen/xenstore/xenstorevar.h> #include <machine/xen/xenvar.h> #include <machine/xen/xenfunc.h> #include <machine/xen/xenpmap.h> @@ -710,9 +711,6 @@ char *bootmem_start, *bootmem_current, * pteinfo_t *pteinfo_list; void initvalues(start_info_t *startinfo); -struct xenstore_domain_interface; -extern struct xenstore_domain_interface *xen_store; - void * bootmem_alloc(unsigned int size) { Modified: head/sys/x86/xen/pv.c ============================================================================== --- head/sys/x86/xen/pv.c Sat Apr 5 22:42:00 2014 (r264177) +++ head/sys/x86/xen/pv.c Sat Apr 5 22:43:18 2014 (r264178) @@ -57,6 +57,7 @@ __FBSDID("$FreeBSD$"); #include <xen/xen-os.h> #include <xen/hypervisor.h> +#include <xen/xenstore/xenstorevar.h> #include <xen/interface/vcpu.h> Modified: head/sys/xen/xen-os.h ============================================================================== --- head/sys/xen/xen-os.h Sat Apr 5 22:42:00 2014 (r264177) +++ head/sys/xen/xen-os.h Sat Apr 5 22:43:18 2014 (r264178) @@ -54,7 +54,6 @@ extern shared_info_t *HYPERVISOR_shared_ extern start_info_t *HYPERVISOR_start_info; /* XXX: we need to get rid of this and use HYPERVISOR_start_info directly */ -extern struct xenstore_domain_interface *xen_store; extern char *console_page; enum xen_domain_type {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404052243.s35MhIxv027921>