From patchwork Wed May 4 19:43:52 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 754642 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p44JiRna026489 for ; Wed, 4 May 2011 19:44:28 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755611Ab1EDToX (ORCPT ); Wed, 4 May 2011 15:44:23 -0400 Received: from fmmailgate02.web.de ([217.72.192.227]:51162 "EHLO fmmailgate02.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755566Ab1EDToS (ORCPT ); Wed, 4 May 2011 15:44:18 -0400 Received: from smtp04.web.de ( [172.20.0.225]) by fmmailgate02.web.de (Postfix) with ESMTP id D280719EAC6AB; Wed, 4 May 2011 21:44:17 +0200 (CEST) Received: from [88.64.22.120] (helo=localhost.localdomain) by smtp04.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.110 #2) id 1QHhzd-0006mo-02; Wed, 04 May 2011 21:44:17 +0200 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Cc: kvm@vger.kernel.org Subject: [PATCH 18/19] qemu-kvm: Fold kvm_init_coalesced_mmio into kvm_create_context Date: Wed, 4 May 2011 21:43:52 +0200 Message-Id: X-Mailer: git-send-email 1.7.1 In-Reply-To: References: In-Reply-To: References: X-Sender: jan.kiszka@web.de X-Provags-ID: V01U2FsdGVkX18uyHSKjfCVfL5UmDRy6X0LQchmJ2tH2onTbSAm jdLIzwHTSwmsovixkl4nWuuugh2Dj444qB1cHGigYu3oNP8cUO 0+kuu9N9o= 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.6 (demeter1.kernel.org [140.211.167.41]); Wed, 04 May 2011 19:44:28 +0000 (UTC) From: Jan Kiszka Aligns the initialization to upstream. Signed-off-by: Jan Kiszka --- qemu-kvm-x86.c | 5 ----- qemu-kvm.c | 20 ++++++-------------- qemu-kvm.h | 9 --------- 3 files changed, 6 insertions(+), 28 deletions(-) diff --git a/qemu-kvm-x86.c b/qemu-kvm-x86.c index df4f0b4..ece5a8e 100644 --- a/qemu-kvm-x86.c +++ b/qemu-kvm-x86.c @@ -152,11 +152,6 @@ int kvm_arch_create(kvm_context_t kvm) return r; } - r = kvm_init_coalesced_mmio(kvm); - if (r < 0) { - return r; - } - uname(&utsname); lm_capable_kernel = strcmp(utsname.machine, "x86_64") == 0; diff --git a/qemu-kvm.c b/qemu-kvm.c index 55de971..3001392 100644 --- a/qemu-kvm.c +++ b/qemu-kvm.c @@ -495,20 +495,6 @@ int kvm_inject_nmi(CPUState *env) #endif } -int kvm_init_coalesced_mmio(kvm_context_t kvm) -{ - int r = 0; - kvm_state->coalesced_mmio = 0; -#ifdef KVM_CAP_COALESCED_MMIO - r = kvm_ioctl(kvm_state, KVM_CHECK_EXTENSION, KVM_CAP_COALESCED_MMIO); - if (r > 0) { - kvm_state->coalesced_mmio = r; - return 0; - } -#endif - return r; -} - #ifdef KVM_CAP_DEVICE_ASSIGNMENT int kvm_assign_pci_device(kvm_context_t kvm, struct kvm_assigned_pci_dev *assigned_dev) @@ -1419,6 +1405,12 @@ static int kvm_create_context(void) return r; } + kvm_state->coalesced_mmio = 0; +#ifdef KVM_CAP_COALESCED_MMIO + kvm_state->coalesced_mmio = + kvm_check_extension(kvm_state, KVM_CAP_COALESCED_MMIO); +#endif + kvm_state->vcpu_events = 0; #ifdef KVM_CAP_VCPU_EVENTS kvm_state->vcpu_events = kvm_check_extension(kvm_state, KVM_CAP_VCPU_EVENTS); diff --git a/qemu-kvm.h b/qemu-kvm.h index 752aebd..1644582 100644 --- a/qemu-kvm.h +++ b/qemu-kvm.h @@ -200,15 +200,6 @@ int kvm_inject_nmi(CPUState *env); #endif -/*! - * \brief Initialize coalesced MMIO - * - * Check for coalesced MMIO capability and store in context - * - * \param kvm Pointer to the current kvm_context - */ -int kvm_init_coalesced_mmio(kvm_context_t kvm); - #ifdef KVM_CAP_PIT #if defined(__i386__) || defined(__x86_64__)