Module Name: src
Committed By: snj
Date: Sun Oct 4 00:02:00 UTC 2009
Modified Files:
src/sys/arch/xen/xen [netbsd-5]: hypervisor.c
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1054):
sys/arch/xen/xen/hypervisor.c: revision 1.45
Make sure xenkernfs_init() is called for XEN2 too.
To generate a diff of this commit:
cvs rdiff -u -r1.42.4.2 -r1.42.4.3 src/sys/arch/xen/xen/hypervisor.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/xen/xen/hypervisor.c
diff -u src/sys/arch/xen/xen/hypervisor.c:1.42.4.2 src/sys/arch/xen/xen/hypervisor.c:1.42.4.3
--- src/sys/arch/xen/xen/hypervisor.c:1.42.4.2 Sat Oct 3 23:54:05 2009
+++ src/sys/arch/xen/xen/hypervisor.c Sun Oct 4 00:02:00 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: hypervisor.c,v 1.42.4.2 2009/10/03 23:54:05 snj Exp $ */
+/* $NetBSD: hypervisor.c,v 1.42.4.3 2009/10/04 00:02:00 snj Exp $ */
/*
* Copyright (c) 2005 Manuel Bouyer.
@@ -63,7 +63,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hypervisor.c,v 1.42.4.2 2009/10/03 23:54:05 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hypervisor.c,v 1.42.4.3 2009/10/04 00:02:00 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -240,17 +240,17 @@
#endif /* NPCI */
union hypervisor_attach_cookie hac;
+#ifdef DOM0OPS
+ if (xendomain_is_privileged()) {
+ xenkernfs_init();
+ }
+#endif
#ifdef XEN3
xen_version = HYPERVISOR_xen_version(XENVER_version, NULL);
aprint_normal(": Xen version %d.%d\n", (xen_version & 0xffff0000) >> 16,
xen_version & 0x0000ffff);
xengnt_init();
-#ifdef DOM0OPS
- if (xendomain_is_privileged()) {
- xenkernfs_init();
- }
-#endif
memset(&hac.hac_vcaa, 0, sizeof(hac.hac_vcaa));
hac.hac_vcaa.vcaa_name = "vcpu";
