From patchwork Thu Aug 4 11:40:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 9263541 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 337A36048B for ; Thu, 4 Aug 2016 12:06:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 25098277D9 for ; Thu, 4 Aug 2016 12:06:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 182B6283E1; Thu, 4 Aug 2016 12:06:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 539E8277D9 for ; Thu, 4 Aug 2016 12:06:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754470AbcHDMF6 (ORCPT ); Thu, 4 Aug 2016 08:05:58 -0400 Received: from mail-lf0-f43.google.com ([209.85.215.43]:34271 "EHLO mail-lf0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750862AbcHDMF5 (ORCPT ); Thu, 4 Aug 2016 08:05:57 -0400 Received: by mail-lf0-f43.google.com with SMTP id l69so180608513lfg.1 for ; Thu, 04 Aug 2016 05:05:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=oJhaqMG8lchoymYjQqpBRy+zjAX2A4GxfbTllfyQrbM=; b=K12gaMYmu2KjdiWiH3X2MgbJTtv1SnONgUNSvmgtqJvCE883xTRHh1jQOWqHRYUm3R /IC+iSl6cXJfEpO4iDeMbzbRl168iu0Ci1dVGgcBqVPh1cUCFZDftYMplgg2EK+ikhBQ mGheU6F168CJZ4o+v2jVS24P8Jy3W79fkpCJw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=oJhaqMG8lchoymYjQqpBRy+zjAX2A4GxfbTllfyQrbM=; b=YXe8r2HrZwFS5yc1n72GsV9IIbz6tZdf0fmAdDJl+O9C2qTKKPo2ogzfvZcY6aUNe8 6xeYIyOj17jWImt/nqeaUFMk8Xqbn7drCxqQiVg9WR51JZ5TwdTdGkFMWMLZXmgtkrHH la21Z+45gmdZDqTIsqQiWyMuhxHrfEnd0hcXpitqqKqkz/hPq8hXy25HCrusFqmd/cyy YiqPM+rO1fDlyI1SoGkOwYhqGRrv1VMooMl8u7R4q/NYe4xVRpWYDUbHWR7EUb7AHbWW Tl7gZtoapUlAqCpDMYmTocwXhfffVdPUFclNX2DyHAC3ZvO7wF5k8Jj45pyPM+K7RAdA 3Prg== X-Gm-Message-State: AEkoouvT308cHLbba65Rbd8RmmYCLah1AbshSgubLYUXx4rKHjMtdU+rUbummRXS9HdPYRMd X-Received: by 10.25.87.12 with SMTP id l12mr5605086lfb.153.1470310856069; Thu, 04 Aug 2016 04:40:56 -0700 (PDT) Received: from localhost.localdomain (109.59.220.90.mobile.3.dk. [109.59.220.90]) by smtp.gmail.com with ESMTPSA id h9sm2360706lfe.8.2016.08.04.04.40.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 04 Aug 2016 04:40:55 -0700 (PDT) From: Christoffer Dall To: Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= Cc: kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org, Marc Zyngier Subject: [PULL 7/8] KVM: arm: vgic-irqfd: Workaround changing kvm_set_routing_entry prototype Date: Thu, 4 Aug 2016 13:40:35 +0200 Message-Id: <1470310836-10371-8-git-send-email-christoffer.dall@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1470310836-10371-1-git-send-email-christoffer.dall@linaro.org> References: <1470310836-10371-1-git-send-email-christoffer.dall@linaro.org> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Marc Zyngier kvm_set_routing_entry is changing in -next, and causes things to explode. Add a temporary workaround that should be dropped when we hit 4.8-rc1 Signed-off-by: Marc Zyngier --- virt/kvm/arm/vgic/vgic-irqfd.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/virt/kvm/arm/vgic/vgic-irqfd.c b/virt/kvm/arm/vgic/vgic-irqfd.c index 683a589..b31a51a 100644 --- a/virt/kvm/arm/vgic/vgic-irqfd.c +++ b/virt/kvm/arm/vgic/vgic-irqfd.c @@ -41,12 +41,20 @@ static int vgic_irqfd_set_irq(struct kvm_kernel_irq_routing_entry *e, * kvm_set_routing_entry: populate a kvm routing entry * from a user routing entry * + * @kvm: the VM this entry is applied to * @e: kvm kernel routing entry handle * @ue: user api routing entry handle * return 0 on success, -EINVAL on errors. */ +#ifdef KVM_CAP_X2APIC_API +int kvm_set_routing_entry(struct kvm *kvm, + struct kvm_kernel_irq_routing_entry *e, + const struct kvm_irq_routing_entry *ue) +#else +/* Remove this version and the ifdefery once merged into 4.8 */ int kvm_set_routing_entry(struct kvm_kernel_irq_routing_entry *e, const struct kvm_irq_routing_entry *ue) +#endif { int r = -EINVAL;