From patchwork Fri Jan 4 15:37:37 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [2/9] target-i386: kvm: Enable all supported KVM features for -cpu host From: Eduardo Habkost X-Patchwork-Id: 209479 Message-Id: <1357313864-31026-3-git-send-email-ehabkost@redhat.com> To: qemu-devel@nongnu.org Cc: kvm@vger.kernel.org, Gleb Natapov , "Michael S. Tsirkin" , libvir-list@redhat.com, Marcelo Tosatti , Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 4 Jan 2013 13:37:37 -0200 When using -cpu host, we don't need to use the kvm_default_features variable, as the user is explicitly asking QEMU to enable all feature supported by the host. This changes the kvm_cpu_fill_host() code to use GET_SUPPORTED_CPUID to initialize the kvm_features field, so we get all host KVM features enabled. This will also allow use to properly check/enforce KVM features inside kvm_check_features_against_host() later. For example, we will be able to make this: $ qemu-system-x86_64 -cpu ...,+kvm_pv_eoi,enforce refuse to start if kvm_pv_eoi is not supported by the host (after we fix kvm_check_features_against_host() to check KVM flags as well). Signed-off-by: Eduardo Habkost --- Changes v2: - Coding style (indentation) fix Cc: Gleb Natapov Cc: Michael S. Tsirkin Cc: Marcelo Tosatti Cc: kvm@vger.kernel.org --- target-i386/cpu.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 649cfb2..4e26b11 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -909,6 +909,8 @@ static void kvm_cpu_fill_host(x86_def_t *x86_cpu_def) /* Other KVM-specific feature fields: */ x86_cpu_def->svm_features = kvm_arch_get_supported_cpuid(s, 0x8000000A, 0, R_EDX); + x86_cpu_def->kvm_features = + kvm_arch_get_supported_cpuid(s, KVM_CPUID_FEATURES, 0, R_EAX); #endif /* CONFIG_KVM */ }