Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 25 Jun 2012 07:29:14 +0000 (UTC)
From:      Fabien Thomas <fabient@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject:   svn commit: r237553 - stable/8/sys/dev/xen/balloon
Message-ID:  <201206250729.q5P7TE9p057759@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: fabient
Date: Mon Jun 25 07:29:14 2012
New Revision: 237553
URL: http://svn.freebsd.org/changeset/base/237553

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

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

Modified: stable/8/sys/dev/xen/balloon/balloon.c
==============================================================================
--- stable/8/sys/dev/xen/balloon/balloon.c	Mon Jun 25 07:27:31 2012	(r237552)
+++ stable/8/sys/dev/xen/balloon/balloon.c	Mon Jun 25 07:29:14 2012	(r237553)
@@ -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");



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206250729.q5P7TE9p057759>