--- wikisrc/ports/xen/howto.mdwn	2015/01/17 13:04:01	1.80
+++ wikisrc/ports/xen/howto.mdwn	2015/01/17 13:18:50	1.84
@@ -389,21 +389,21 @@ available resources, and running domains
         Domain-0           0       64    0  r----     58.1
 
 With xl, the commands are the same, and the output may be slightly
-different.  TODO: add example output for xl, after confirming on 4.2
-and resolving the TODO about rc.conf.
+different.  TODO: add example output for xl before the xm example,
+after confirming on 4.2 and resolving the TODO about rc.conf.
 
 anita (for testing NetBSD)
 --------------------------
 
-With the setup so far, one should be able to run anita (see
-pkgsrc/misc/py-anita) to test NetBSD releases, by doing (as root,
-because anita must create a domU):
-
-        anita --vmm=xm test file:///usr/obj/i386/
-
-Alternatively, one can use --vmm=xl to use xl-based domU creation instead.
-TODO: check this, and make the example use xl when confirmed.
-
+With the setup so far (assuming 4.2/xl), one should be able to run
+anita (see pkgsrc/misc/py-anita) to test NetBSD releases, by doing (as
+root, because anita must create a domU):
+
+        anita --vmm=xl test file:///usr/obj/i386/
+
+Alternatively, one can use --vmm=xm to use xm-based domU creation
+instead (and must, on Xen <= 4.1).   TODO: confirm that anita xl really works.
+    
 Xen-specific NetBSD issues
 --------------------------
 
@@ -477,6 +477,24 @@ correct set of daemons.  Ensure that the
 for the new version.
 
 
+Running Xen under qemu
+----------------------
+
+The astute reader will note that this section is somewhat twisted.
+However, it can be useful to run Xen under qemu either because the
+version of NetBSD as a dom0 does not run on the hardware in use, or to
+generate automated test cases involving Xen.
+
+In 2015-01, the following combination was reported to mostly work:
+
+        host OS: NetBSD/amd64 6.1.4
+        qemu: 2.2.0 from pkgsrc
+        Xen kernel: xenkernel42-4.2.5nb1 from pkgsrc
+        dom0 kernel: NetBSD/amd64 6.1.5
+        Xen tools: xentools42-4.2.5 from pkgsrc
+
+See http://gnats.netbsd.org/47720 for a problem with dom0 shutdown.
+
 Unprivileged domains (domU)
 ===========================
 
@@ -946,7 +964,7 @@ TODO: add link to NetBSD amazon howto.
 Using npf
 ---------
 
-In standard kernels, npf is a module, and thus cannot be loadeed in a
+In standard kernels, npf is a module, and thus cannot be loaded in a
 DOMU kernel.
 
 TODO: explain how to compile npf into a custom kernel, answering (but