From patchwork Fri Apr 29 11:24:49 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 740721 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 p3TBOxoN007013 for ; Fri, 29 Apr 2011 11:24:59 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755197Ab1D2LY5 (ORCPT ); Fri, 29 Apr 2011 07:24:57 -0400 Received: from goliath.siemens.de ([192.35.17.28]:27970 "EHLO goliath.siemens.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753710Ab1D2LY4 (ORCPT ); Fri, 29 Apr 2011 07:24:56 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by goliath.siemens.de (8.13.6/8.13.6) with ESMTP id p3TBOoZE025830; Fri, 29 Apr 2011 13:24:50 +0200 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id p3TBOngl003020; Fri, 29 Apr 2011 13:24:50 +0200 Message-ID: <4DBAA001.3000905@siemens.com> Date: Fri, 29 Apr 2011 13:24:49 +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 , "Michael S. Tsirkin" Subject: [PATCH] qemu-kvm: Do not advertise MSI caps on lacking KVM support 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, 29 Apr 2011 11:24:59 +0000 (UTC) As suggested by Michael Tsirkin: Move the check for GSI routing from kvm_msi_message_add to the MSI/MSI-X initalization. If it fails (and KVM is in in-kernel irqchip mode), do not advertise MSI at all. Signed-off-by: Jan Kiszka --- hw/msi.c | 4 ++++ hw/msix.c | 4 +++- qemu-kvm.c | 4 ---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/hw/msi.c b/hw/msi.c index 725b2b7..ddcfedd 100644 --- a/hw/msi.c +++ b/hw/msi.c @@ -208,6 +208,10 @@ int msi_init(struct PCIDevice *dev, uint8_t offset, " 64bit %d mask %d\n", offset, nr_vectors, msi64bit, msi_per_vector_mask); + if (kvm_enabled() && kvm_irqchip_in_kernel() && !kvm_has_gsi_routing()) { + return -ENOTSUP; + } + assert(!(nr_vectors & (nr_vectors - 1))); /* power of 2 */ assert(nr_vectors > 0); assert(nr_vectors <= PCI_MSI_VECTORS_MAX); diff --git a/hw/msix.c b/hw/msix.c index 9cee086..d371940 100644 --- a/hw/msix.c +++ b/hw/msix.c @@ -350,8 +350,10 @@ int msix_init(struct PCIDevice *dev, unsigned short nentries, { int ret; /* Nothing to do if MSI is not supported by interrupt controller */ - if (!msix_supported) + if (!msix_supported || + (kvm_enabled() && kvm_irqchip_in_kernel() && !kvm_has_gsi_routing())) { return -ENOTSUP; + } if (nentries > MSIX_MAX_ENTRIES) return -EINVAL; diff --git a/qemu-kvm.c b/qemu-kvm.c index e8c2009..b951146 100644 --- a/qemu-kvm.c +++ b/qemu-kvm.c @@ -986,10 +986,6 @@ int kvm_msi_message_add(KVMMsiMessage *msg) struct kvm_irq_routing_entry e; int ret; - if (!kvm_has_gsi_routing()) { - return -EOPNOTSUPP; - } - ret = kvm_get_irq_route_gsi(); if (ret < 0) { return ret;