From owner-svn-src-head@FreeBSD.ORG  Wed Jun 20 15:45:51 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3845C106566B;
	Wed, 20 Jun 2012 15:45:51 +0000 (UTC)
	(envelope-from fabient@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 196DF8FC0A;
	Wed, 20 Jun 2012 15:45:51 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5KFjoYB051503;
	Wed, 20 Jun 2012 15:45:50 GMT (envelope-from fabient@svn.freebsd.org)
Received: (from fabient@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5KFjoxb051501;
	Wed, 20 Jun 2012 15:45:50 GMT (envelope-from fabient@svn.freebsd.org)
Message-Id: <201206201545.q5KFjoxb051501@svn.freebsd.org>
From: Fabien Thomas <fabient@FreeBSD.org>
Date: Wed, 20 Jun 2012 15:45:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237322 - head/sys/dev/xen/balloon
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 20 Jun 2012 15:45:51 -0000

Author: fabient
Date: Wed Jun 20 15:45:50 2012
New Revision: 237322
URL: http://svn.freebsd.org/changeset/base/237322

Log:
  Allow booting XENHVM kernel without Xen hypervisor.
  
  MFC after:	3 days

Modified:
  head/sys/dev/xen/balloon/balloon.c

Modified: head/sys/dev/xen/balloon/balloon.c
==============================================================================
--- head/sys/dev/xen/balloon/balloon.c	Wed Jun 20 15:12:31 2012	(r237321)
+++ head/sys/dev/xen/balloon/balloon.c	Wed Jun 20 15:45:50 2012	(r237322)
@@ -436,6 +436,9 @@ balloon_init_watcher(void *arg)
 {
 	int err;
 
+	if (!is_running_on_xen())
+		return;
+
 	err = xs_register_watch(&target_watch);
 	if (err)
 		printf("Failed to set balloon watcher\n");