[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH 2/2] xen-detect: check for XEN_PV before XEN_HVM
At some stage, the cpuid instruction used to detect a xen hvm domain also started working in a pv domain so pv domains were being identified as hvm (dom0 excepted). Change the order so that pv is tested for first. Signed-off-by: John Haxby <john.haxby@xxxxxxxxxx> --- tools/misc/xen-detect.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/misc/xen-detect.c b/tools/misc/xen-detect.c index 19c66d1..c8fccf9 100644 --- a/tools/misc/xen-detect.c +++ b/tools/misc/xen-detect.c @@ -132,15 +132,10 @@ int main(int argc, char **argv) } } - /* Check for execution in HVM context. */ - detected = XEN_HVM; - if ( (version = check_for_xen(0)) != 0 ) - goto out; - /* * Set up a signal handler to test the paravirtualised CPUID instruction. * If executed outside Xen PV context, the extended opcode will fault, we - * will longjmp via the signal handler, and print "Not running on Xen". + * will longjmp via the signal handler, then check for HVM. */ detected = XEN_PV; if ( !setjmp(sigill_jmp) @@ -148,6 +143,11 @@ int main(int argc, char **argv) && ((version = check_for_xen(1)) != 0) ) goto out; + /* Check for execution in HVM context. */ + detected = XEN_HVM; + if ( (version = check_for_xen(0)) != 0 ) + goto out; + detected = XEN_NONE; out: -- 1.9.3 _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |