From patchwork Tue Jun 1 12:33:43 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avi Kivity X-Patchwork-Id: 103527 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o51CXrah008520 for ; Tue, 1 Jun 2010 12:33:54 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756308Ab0FAMdv (ORCPT ); Tue, 1 Jun 2010 08:33:51 -0400 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 Received: from file.tlv.redhat.com (file.tlv.redhat.com [10.35.255.8]) by cleopatra.tlv.redhat.com (Postfix) with ESMTP id E0D3F2500C5; Tue, 1 Jun 2010 15:33:47 +0300 (IDT) From: Avi Kivity To: Marcelo Tosatti , Glauber Costa Cc: kvm@vger.kernel.org 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> In-Reply-To: <1275395627-2321-1-git-send-email-avi@redhat.com> References: <1275395627-2321-1-git-send-email-avi@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 01 Jun 2010 12:33:54 +0000 (UTC) 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,