virt: detect qemu/kvm as 'kvm'

In commit 050e65a we swapped order of detect_vm_{cpuid,dmi}(). That fixed Virtualbox but broke qemu with kvm, which is expected to return 'kvm'. So check for qemu/kvm first, then DMI, CPUID last. This fixes #5318. Signed-off-by: Christian Hesse <mail@eworm.de>
2017-02-14 15:52:53 +01:00
parent 4ec426b975
commit 5f1c788ca9
2 changed files with 15 additions and 9 deletions
@@ -91,12 +91,12 @@
          <row>
            <entry valign="top" morerows="10">VM</entry>
            <entry><varname>qemu</varname></entry>
-            <entry>QEMU software virtualization</entry>
+            <entry>QEMU software virtualization, without KVM</entry>
          </row>

          <row>
            <entry><varname>kvm</varname></entry>
-            <entry>Linux KVM kernel virtual machine</entry>
+            <entry>Linux KVM kernel virtual machine, from within QEMU</entry>
          </row>

          <row>