From: xiliang <xiliang@redhat.com>
Date: Sat, 17 Jun 2017 16:33:28 +0000 (+0800)
Subject: As xen pv guest can access cpuid from Intel CPUs started IvyBridge onwards have CPUID... 
X-Git-Tag: v1.19~10
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=a821dc9961d457c086fffcc16a911cb6f9f8659a;p=virt-what.git

As xen pv guest can access cpuid from Intel CPUs started IvyBridge onwards have CPUID Faulting, added one more check in virt-what.
---

diff --git a/virt-what.in b/virt-what.in
index a05e0db..247348e 100644
--- a/virt-what.in
+++ b/virt-what.in
@@ -1,6 +1,6 @@
 #!/bin/sh -
 # @configure_input@
-# Copyright (C) 2008-2015 Red Hat Inc.
+# Copyright (C) 2008-2017 Red Hat Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -223,7 +223,8 @@ fi
 
 # Check for Xen.
 
-if [ "$cpuid" = "XenVMMXenVMM" ]; then
+if [ "$cpuid" = "XenVMMXenVMM" ] &&
+    ! echo "$dmi" | grep -q 'No SMBIOS nor DMI entry point found, sorry'; then
     echo xen; echo xen-hvm
     # Check for AWS
     if echo "$dmi" | grep -q 'Version: [0-9]\.[0-9]\.amazon'; then