34 lines
1.5 KiB
Diff
34 lines
1.5 KiB
Diff
From 7cf20aa8c7f9dd5d7e907b0f96b14f4c09bc8c6d Mon Sep 17 00:00:00 2001
|
|
From: Daniel Berrange <berrange@redhat.com>
|
|
Date: Wed, 19 Jul 2017 10:06:07 +0100
|
|
Subject: [PATCH] virt: enable detecting QEMU (TCG) via CPUID (#6399)
|
|
|
|
QEMU >= 2.10 will include a CPUID leaf with value "TCGTCGTCGTCG"
|
|
on x86 when running with the TCG CPU emulator:
|
|
|
|
https://lists.gnu.org/archive/html/qemu-devel/2017-07/msg05231.html
|
|
|
|
Existing methods of detecting QEMU are left unchanged for sake of
|
|
backcompatibility.
|
|
|
|
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
|
|
(cherry picked from commit 5588612e9e8828691f13141e3fcebe08a59201fe)
|
|
(cherry picked from commit ce0609bc26d33e47b23fbbe1aa7465283a10fb10)
|
|
(cherry picked from commit c21be74a657c56bfc4091428b54189682c354640)
|
|
---
|
|
src/basic/virt.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/src/basic/virt.c b/src/basic/virt.c
|
|
index dace1f4328..f1c49105ee 100644
|
|
--- a/src/basic/virt.c
|
|
+++ b/src/basic/virt.c
|
|
@@ -45,6 +45,7 @@ static int detect_vm_cpuid(void) {
|
|
} cpuid_vendor_table[] = {
|
|
{ "XenVMMXenVMM", VIRTUALIZATION_XEN },
|
|
{ "KVMKVMKVM", VIRTUALIZATION_KVM },
|
|
+ { "TCGTCGTCGTCG", VIRTUALIZATION_QEMU },
|
|
/* http://kb.vmware.com/selfservice/microsites/search.do?language=en_US&cmd=displayKC&externalId=1009458 */
|
|
{ "VMwareVMware", VIRTUALIZATION_VMWARE },
|
|
/* http://msdn.microsoft.com/en-us/library/ff542428.aspx */
|