From mboxrd@z Thu Jan 1 00:00:00 1970 From: Avi Kivity Subject: [PATCH 1/5] Make get_para_features() similar to upstream Date: Tue, 1 Jun 2010 15:33:43 +0300 Message-ID: <1275395627-2321-2-git-send-email-avi@redhat.com> References: <1275395627-2321-1-git-send-email-avi@redhat.com> Cc: kvm@vger.kernel.org To: Marcelo Tosatti , Glauber Costa Return-path: Received: from mx1.redhat.com ([209.132.183.28]:24540 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755995Ab0FAMdt (ORCPT ); Tue, 1 Jun 2010 08:33:49 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o51CXn8g013951 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 1 Jun 2010 08:33:49 -0400 Received: from cleopatra.tlv.redhat.com (cleopatra.tlv.redhat.com [10.35.255.11]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o51CXm1r014643 for ; Tue, 1 Jun 2010 08:33:48 -0400 In-Reply-To: <1275395627-2321-1-git-send-email-avi@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: Accept a CPUState parameter instead of a kvm_context_t. Signed-off-by: Avi Kivity --- qemu-kvm-x86.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qemu-kvm-x86.c b/qemu-kvm-x86.c index 95b7aa5..0eb4060 100644 --- a/qemu-kvm-x86.c +++ b/qemu-kvm-x86.c @@ -1132,7 +1132,7 @@ struct kvm_para_features { { -1, -1 } }; -static int get_para_features(kvm_context_t kvm_context) +static int get_para_features(CPUState *env) { int i, features = 0; @@ -1184,7 +1184,7 @@ int kvm_arch_init_vcpu(CPUState *cenv) pv_ent = &cpuid_ent[cpuid_nent++]; memset(pv_ent, 0, sizeof(*pv_ent)); pv_ent->function = KVM_CPUID_FEATURES; - pv_ent->eax = get_para_features(kvm_context); + pv_ent->eax = get_para_features(cenv); #endif kvm_trim_features(&cenv->cpuid_features, -- 1.7.1