From owner-svn-src-stable@FreeBSD.ORG  Mon Jun 25 07:27:32 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 3EBF61065673;
	Mon, 25 Jun 2012 07:27:32 +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 292DC8FC12;
	Mon, 25 Jun 2012 07:27:32 +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 q5P7RVTV057646;
	Mon, 25 Jun 2012 07:27:31 GMT (envelope-from fabient@svn.freebsd.org)
Received: (from fabient@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5P7RVRp057644;
	Mon, 25 Jun 2012 07:27:31 GMT (envelope-from fabient@svn.freebsd.org)
Message-Id: <201206250727.q5P7RVRp057644@svn.freebsd.org>
From: Fabien Thomas <fabient@FreeBSD.org>
Date: Mon, 25 Jun 2012 07:27:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237552 - stable/9/sys/dev/xen/balloon
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Jun 2012 07:27:32 -0000

Author: fabient
Date: Mon Jun 25 07:27:31 2012
New Revision: 237552
URL: http://svn.freebsd.org/changeset/base/237552

Log:
  MFC r237322:
  Allow booting XENHVM kernel without Xen hypervisor.

Modified:
  stable/9/sys/dev/xen/balloon/balloon.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/xen/balloon/balloon.c
==============================================================================
--- stable/9/sys/dev/xen/balloon/balloon.c	Mon Jun 25 07:13:25 2012	(r237551)
+++ stable/9/sys/dev/xen/balloon/balloon.c	Mon Jun 25 07:27:31 2012	(r237552)
@@ -437,6 +437,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");