diff options
| author | Christian Hesse <mail@eworm.de> | 2017-02-14 14:51:12 +0100 |
|---|---|---|
| committer | Christian Hesse <mail@eworm.de> | 2017-02-14 15:52:53 +0100 |
| commit | 5f1c788ca963dbacbf09b165acd7b8563ddd34d9 (patch) | |
| tree | 4a82076543b06c181cd356d012ec07810c7980eb /man | |
| parent | 4ec426b9750350e06e52ff8f67aedb6c1514f8b9 (diff) | |
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>
Diffstat (limited to 'man')
| -rw-r--r-- | man/systemd-detect-virt.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/man/systemd-detect-virt.xml b/man/systemd-detect-virt.xml index 996c2fa256..dc10b4dd43 100644 --- a/man/systemd-detect-virt.xml +++ b/man/systemd-detect-virt.xml @@ -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> |