From owner-svn-src-all@FreeBSD.ORG  Sat Apr  5 22:43:19 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 06322997;
 Sat,  5 Apr 2014 22:43:19 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E6E777C2;
 Sat,  5 Apr 2014 22:43:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s35MhIdT027924;
 Sat, 5 Apr 2014 22:43:18 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s35MhIxv027921;
 Sat, 5 Apr 2014 22:43:18 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201404052243.s35MhIxv027921@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Sat, 5 Apr 2014 22:43:18 +0000 (UTC)
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
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 05 Apr 2014 22:43:19 -0000

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 {