From patchwork Fri May 13 12:14:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 782822 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 p4DCEoC7032533 for ; Fri, 13 May 2011 12:14:50 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932793Ab1EMMOr (ORCPT ); Fri, 13 May 2011 08:14:47 -0400 Received: from goliath.siemens.de ([192.35.17.28]:30167 "EHLO goliath.siemens.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758592Ab1EMMOP (ORCPT ); Fri, 13 May 2011 08:14:15 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by goliath.siemens.de (8.13.6/8.13.6) with ESMTP id p4DCEB2r028882; Fri, 13 May 2011 14:14:11 +0200 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id p4DCEAvF019933; Fri, 13 May 2011 14:14:11 +0200 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Cc: kvm@vger.kernel.org Subject: [PATCH 10/16] qemu-kvm: Fold kvm_set_irq_level into kvm_set_irq Date: Fri, 13 May 2011 14:14:04 +0200 Message-Id: <3e2041008192f98bd6a47ab2057ba110bec7441a.1305288845.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: References: In-Reply-To: References: 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, 13 May 2011 12:14:50 +0000 (UTC) Signed-off-by: Jan Kiszka --- qemu-kvm.c | 19 ++++++------------- qemu-kvm.h | 2 -- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/qemu-kvm.c b/qemu-kvm.c index 98bb765..4aa6b0f 100644 --- a/qemu-kvm.c +++ b/qemu-kvm.c @@ -278,7 +278,7 @@ int kvm_create_irqchip(kvm_context_t kvm) #ifdef KVM_CAP_IRQCHIP -int kvm_set_irq_level(kvm_context_t kvm, int irq, int level, int *status) +int kvm_set_irq(int irq, int level, int *status) { struct kvm_irq_level event; int r; @@ -288,15 +288,17 @@ int kvm_set_irq_level(kvm_context_t kvm, int irq, int level, int *status) } event.level = level; event.irq = irq; - r = kvm_vm_ioctl(kvm_state, kvm->irqchip_inject_ioctl, &event); + r = kvm_vm_ioctl(kvm_state, kvm_state->kvm_context.irqchip_inject_ioctl, + &event); if (r < 0) { - perror("kvm_set_irq_level"); + perror("kvm_set_irq"); } if (status) { #ifdef KVM_CAP_IRQ_INJECT_STATUS *status = - (kvm->irqchip_inject_ioctl == KVM_IRQ_LINE) ? 1 : event.status; + (kvm_state->kvm_context.irqchip_inject_ioctl == KVM_IRQ_LINE) ? + 1 : event.status; #else *status = 1; #endif @@ -1438,15 +1440,6 @@ static int kvm_create_context(void) return 0; } -#ifdef KVM_CAP_IRQCHIP - -int kvm_set_irq(int irq, int level, int *status) -{ - return kvm_set_irq_level(kvm_context, irq, level, status); -} - -#endif - static void kvm_mutex_unlock(void) { assert(!cpu_single_env); diff --git a/qemu-kvm.h b/qemu-kvm.h index b101c03..dd11e32 100644 --- a/qemu-kvm.h +++ b/qemu-kvm.h @@ -93,8 +93,6 @@ int kvm_is_ready_for_interrupt_injection(CPUState *env); int kvm_inject_irq(CPUState *env, unsigned irq); #endif -int kvm_set_irq_level(kvm_context_t kvm, int irq, int level, int *status); - #ifdef KVM_CAP_IRQCHIP /*! * \brief Dump in kernel IRQCHIP contents