From patchwork Sat Apr 23 10:23:38 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 729061 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 p3NAOo0N020685 for ; Sat, 23 Apr 2011 10:24:52 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753239Ab1DWKYp (ORCPT ); Sat, 23 Apr 2011 06:24:45 -0400 Received: from fmmailgate01.web.de ([217.72.192.221]:49584 "EHLO fmmailgate01.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753223Ab1DWKYo (ORCPT ); Sat, 23 Apr 2011 06:24:44 -0400 Received: from smtp08.web.de ( [172.20.5.216]) by fmmailgate01.web.de (Postfix) with ESMTP id 4E48918C825C3; Sat, 23 Apr 2011 12:23:45 +0200 (CEST) Received: from [88.64.17.9] (helo=localhost.localdomain) by smtp08.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.110 #2) id 1QDa09-0001ah-00; Sat, 23 Apr 2011 12:23:45 +0200 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Cc: kvm@vger.kernel.org, "Michael S. Tsirkin" Subject: [PATCH 5/7] qemu-kvm: Move gsi bits from kvm_msix_vector_add to kvm_msi_add_message Date: Sat, 23 Apr 2011 12:23:38 +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: V01U2FsdGVkX1+zYix4suv7GDOCGcPW2Qy7RNgR45jrFczV5G7z oQQI95kNXbhZbIiQ0oumHqXNJrWCr77NCV+5VrTzhkew+wX4vg bEHCAykUw= 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]); Sat, 23 Apr 2011 10:25:00 +0000 (UTC) From: Jan Kiszka Testing support and allocating a GSI for an MSI message is required both for MSI and MSI-X. At this chance, drop the aging version warning. Signed-off-by: Jan Kiszka --- hw/msix.c | 13 ------------- qemu-kvm.c | 11 +++++++++++ 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/hw/msix.c b/hw/msix.c index 1bdffb6..8c8bc18 100644 --- a/hw/msix.c +++ b/hw/msix.c @@ -113,19 +113,6 @@ static int kvm_msix_vector_add(PCIDevice *dev, unsigned vector) KVMMsiMessage *kmm = dev->msix_irq_entries + vector; int r; - if (!kvm_has_gsi_routing()) { - fprintf(stderr, "Warning: no MSI-X support found. " - "At least kernel 2.6.30 is required for MSI-X support.\n" - ); - return -EOPNOTSUPP; - } - - r = kvm_get_irq_route_gsi(); - if (r < 0) { - fprintf(stderr, "%s: kvm_get_irq_route_gsi failed: %s\n", __func__, strerror(-r)); - return r; - } - kmm->gsi = r; kvm_msix_message_from_vector(dev, vector, kmm); r = kvm_msi_message_add(kmm); if (r < 0) { diff --git a/qemu-kvm.c b/qemu-kvm.c index 9cbc109..7317f87 100644 --- a/qemu-kvm.c +++ b/qemu-kvm.c @@ -984,6 +984,17 @@ static void kvm_msi_routing_entry(struct kvm_irq_routing_entry *e, 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; + } + msg->gsi = ret; kvm_msi_routing_entry(&e, msg); return kvm_add_routing_entry(&e);