Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 20 Jun 2012 15:45:50 +0000 (UTC)
From:      Fabien Thomas <fabient@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r237322 - head/sys/dev/xen/balloon
Message-ID:  <201206201545.q5KFjoxb051501@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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");



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