Date: Fri, 21 Mar 2014 09:07:36 +0100 From: =?UTF-8?B?Um9nZXIgUGF1IE1vbm7DqQ==?= <royger@FreeBSD.org> To: Warner Losh <imp@FreeBSD.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r263377 - head/sys/xen Message-ID: <532BF348.8090503@FreeBSD.org> In-Reply-To: <201403192040.s2JKev1k027839@svn.freebsd.org> References: <201403192040.s2JKev1k027839@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 19/03/14 21:40, Warner Losh wrote: > Author: imp > Date: Wed Mar 19 20:40:57 2014 > New Revision: 263377 > URL: http://svnweb.freebsd.org/changeset/base/263377 > > Log: > Revert last change, it breaks other things. Could you try the following patch instead: >From 3f66e884bef1ba16ee31897016b2ef9158202eb1 Mon Sep 17 00:00:00 2001 From: Roger Pau Monne <roger.pau@citrix.com> Date: Thu, 20 Mar 2014 09:40:25 +0100 Subject: [PATCH] xen: fix duplicate declaration of xen_store Sponsored by: Citrix Systems R&D --- sys/i386/xen/xen_machdep.c | 4 +--- sys/x86/xen/pv.c | 1 + sys/xen/xen-os.h | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/i386/xen/xen_machdep.c b/sys/i386/xen/xen_machdep.c index d67406d..46409a5 100644 --- a/sys/i386/xen/xen_machdep.c +++ b/sys/i386/xen/xen_machdep.c @@ -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, *bootmem_end; 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) { diff --git a/sys/x86/xen/pv.c b/sys/x86/xen/pv.c index 96420e3..fa36f3a 100644 --- a/sys/x86/xen/pv.c +++ b/sys/x86/xen/pv.c @@ -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> diff --git a/sys/xen/xen-os.h b/sys/xen/xen-os.h index 7dd9c7e..c982d55 100644 --- a/sys/xen/xen-os.h +++ b/sys/xen/xen-os.h @@ -54,7 +54,6 @@ extern shared_info_t *HYPERVISOR_shared_info; 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 { -- 1.7.7.5 (Apple Git-26)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?532BF348.8090503>