From patchwork Wed May 5 19:19:20 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Glauber Costa X-Patchwork-Id: 97173 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 o45JLbhb032747 for ; Wed, 5 May 2010 19:21:43 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757289Ab0EETVg (ORCPT ); Wed, 5 May 2010 15:21:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:1026 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755146Ab0EETVg (ORCPT ); Wed, 5 May 2010 15:21:36 -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 o45JLZ1W019605 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 5 May 2010 15:21:35 -0400 Received: from localhost.localdomain (virtlab1.virt.bos.redhat.com [10.16.72.21]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o45JLWAJ028191; Wed, 5 May 2010 15:21:34 -0400 From: Glauber Costa To: kvm@vger.kernel.org Cc: avi@redhat.com, zamsden@redhat.com, mtosatti@redhat.com Subject: [PATCH v2 1/2] change header for kvm_get_msr_list Date: Wed, 5 May 2010 15:19:20 -0400 Message-Id: <1273087161-32428-2-git-send-email-glommer@redhat.com> In-Reply-To: <1273087161-32428-1-git-send-email-glommer@redhat.com> References: <1273087161-32428-1-git-send-email-glommer@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]); Wed, 05 May 2010 19:21:44 +0000 (UTC) diff --git a/qemu-kvm-x86.c b/qemu-kvm-x86.c index 439c31a..5a2b552 100644 --- a/qemu-kvm-x86.c +++ b/qemu-kvm-x86.c @@ -393,7 +393,7 @@ void kvm_show_code(CPUState *env) /* * Returns available msr list. User must free. */ -struct kvm_msr_list *kvm_get_msr_list(kvm_context_t kvm) +static struct kvm_msr_list *kvm_get_msr_list(void) { struct kvm_msr_list sizer, *msrs; int r; @@ -670,7 +670,7 @@ int kvm_arch_qemu_create_context(void) if (kvm_shadow_memory) kvm_set_shadow_pages(kvm_context, kvm_shadow_memory); - kvm_msr_list = kvm_get_msr_list(kvm_context); + kvm_msr_list = kvm_get_msr_list(); if (!kvm_msr_list) return -1; for (i = 0; i < kvm_msr_list->nmsrs; ++i) { diff --git a/qemu-kvm.h b/qemu-kvm.h index ba3808a..5eeed64 100644 --- a/qemu-kvm.h +++ b/qemu-kvm.h @@ -97,7 +97,6 @@ int handle_io_window(kvm_context_t kvm); int try_push_interrupts(kvm_context_t kvm); #if defined(__x86_64__) || defined(__i386__) -struct kvm_msr_list *kvm_get_msr_list(kvm_context_t); int kvm_get_msrs(CPUState *env, struct kvm_msr_entry *msrs, int n); int kvm_set_msrs(CPUState *env, struct kvm_msr_entry *msrs, int n); int kvm_get_mce_cap_supported(kvm_context_t, uint64_t *mce_cap,