svn commit: r237552 - stable/9/sys/dev/xen/balloon

[Fabien Thomas]

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");