From owner-svn-src-all@FreeBSD.ORG Fri Mar 21 08:07:44 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F1152D25; Fri, 21 Mar 2014 08:07:43 +0000 (UTC) Received: from mail-wg0-x22f.google.com (mail-wg0-x22f.google.com [IPv6:2a00:1450:400c:c00::22f]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1C52D88F; Fri, 21 Mar 2014 08:07:42 +0000 (UTC) Received: by mail-wg0-f47.google.com with SMTP id x12so1326795wgg.18 for ; Fri, 21 Mar 2014 01:07:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:message-id:date:from:user-agent:mime-version:to:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=NX0abAL6miggLHa6phu/LTQIWVtf+hTHajRbBHVxVPc=; b=jhnBnT124lpakmD/w8oAGoD1ugVqcRIy+Ptj8G/d26xf6OmpZQLzj9IrXxeJazmib0 /TJxm3aAms6Ne+ke3X9D9T7EQEu+P+LX9z4VbTS7wDjKQuEwP+jxtRT2Z7qWa9ItWuCc D75xd8d3MjerNgll6vkpJ936pSboNM6brsoVDXDdrIUI2n1fLbzU8zeVy3rCpTYPmdJa bX0qTx6L9SJqTI8YyvgKttt/pbfEO5vt6EHk2YksuA8BPm9Ydha2n1KkH7yRB6hRlWqz OOYj2aIy7HaXMwa0U+tzhX9qOBX+H+OAIHpokusT/DOHsMw8BvdzBQPV3iOfETpX19oX XC7Q== X-Received: by 10.194.2.70 with SMTP id 6mr37453353wjs.25.1395389261541; Fri, 21 Mar 2014 01:07:41 -0700 (PDT) Received: from [172.16.1.30] (39.Red-2-136-52.dynamicIP.rima-tde.net. [2.136.52.39]) by mx.google.com with ESMTPSA id fs8sm2608884wib.8.2014.03.21.01.07.40 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 21 Mar 2014 01:07:40 -0700 (PDT) Sender: =?UTF-8?Q?Roger_Pau_Monn=C3=A9?= Message-ID: <532BF348.8090503@FreeBSD.org> Date: Fri, 21 Mar 2014 09:07:36 +0100 From: =?UTF-8?B?Um9nZXIgUGF1IE1vbm7DqQ==?= User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:24.0) Gecko/20100101 Thunderbird/24.4.0 MIME-Version: 1.0 To: Warner Losh , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r263377 - head/sys/xen References: <201403192040.s2JKev1k027839@svn.freebsd.org> In-Reply-To: <201403192040.s2JKev1k027839@svn.freebsd.org> X-Enigmail-Version: 1.6 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit 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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Mar 2014 08:07:44 -0000 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 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 +#include #include #include #include @@ -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 #include +#include #include 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)