From patchwork Fri Jun 3 14:38:40 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 847082 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 p53EdATZ018225 for ; Fri, 3 Jun 2011 14:39:10 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752313Ab1FCOis (ORCPT ); Fri, 3 Jun 2011 10:38:48 -0400 Received: from thoth.sbs.de ([192.35.17.2]:15345 "EHLO thoth.sbs.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751698Ab1FCOir (ORCPT ); Fri, 3 Jun 2011 10:38:47 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by thoth.sbs.de (8.13.6/8.13.6) with ESMTP id p53EcfG9007703; Fri, 3 Jun 2011 16:38:41 +0200 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id p53EceAe017643; Fri, 3 Jun 2011 16:38:40 +0200 Message-ID: <4DE8F1F0.9080703@siemens.com> Date: Fri, 03 Jun 2011 16:38:40 +0200 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: Avi Kivity , Marcelo Tosatti CC: kvm Subject: [PATCH] qemu-kvm: Fix kvm-disabled build 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]); Fri, 03 Jun 2011 14:39:10 +0000 (UTC) Minor fallout from recent refactorings. Signed-off-by: Jan Kiszka --- kvm-stub.c | 11 +++-------- qemu-kvm.h | 4 ++-- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/kvm-stub.c b/kvm-stub.c index 90fed66..aa2238f 100644 --- a/kvm-stub.c +++ b/kvm-stub.c @@ -156,22 +156,17 @@ int kvm_get_irq_route_gsi(void) return -ENOSYS; } -int kvm_add_msix(uint32_t gsi, uint32_t addr_lo, - uint32_t addr_hi, uint32_t data) +int kvm_msi_message_add(KVMMsiMessage *msg) { return -ENOSYS; } -int kvm_del_msix(uint32_t gsi, uint32_t addr_lo, - uint32_t addr_hi, uint32_t data) +int kvm_msi_message_del(KVMMsiMessage *msg) { return -ENOSYS; } -int kvm_update_msix(uint32_t old_gsi, uint32_t old_addr_lo, - uint32_t old_addr_hi, uint32_t old_data, - uint32_t new_gsi, uint32_t new_addr_lo, - uint32_t new_addr_hi, uint32_t new_data) +int kvm_msi_message_update(KVMMsiMessage *old, KVMMsiMessage *new) { return -ENOSYS; } diff --git a/qemu-kvm.h b/qemu-kvm.h index 0f833f1..942baf2 100644 --- a/qemu-kvm.h +++ b/qemu-kvm.h @@ -271,8 +271,6 @@ void kvm_load_lapic(CPUState *env); void kvm_hpet_enable_kpit(void); void kvm_hpet_disable_kpit(void); -int kvm_set_boot_cpu_id(KVMState *s, uint32_t id); - void kvm_tpr_access_report(CPUState *env, uint64_t rip, int is_write); int kvm_arch_init_irq_routing(void); @@ -293,6 +291,8 @@ extern unsigned int kvm_shadow_memory; int kvm_handle_tpr_access(CPUState *env); +int kvm_set_boot_cpu_id(KVMState *s, uint32_t id); + #else #define kvm_nested 0 #endif