From patchwork Thu Aug 16 13:54:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 1332111 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 44DDB40210 for ; Thu, 16 Aug 2012 13:54:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757105Ab2HPNyl (ORCPT ); Thu, 16 Aug 2012 09:54:41 -0400 Received: from thoth.sbs.de ([192.35.17.2]:30048 "EHLO thoth.sbs.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755461Ab2HPNyj (ORCPT ); Thu, 16 Aug 2012 09:54:39 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by thoth.sbs.de (8.13.6/8.13.6) with ESMTP id q7GDsYcA008139; Thu, 16 Aug 2012 15:54:35 +0200 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id q7GDsYJI012893; Thu, 16 Aug 2012 15:54:34 +0200 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Cc: kvm@vger.kernel.org, Alex Williamson Subject: [PATCH 08/19] pci-assign: Factor out kvm_device_msix_supported Date: Thu, 16 Aug 2012 15:54:22 +0200 Message-Id: <9ee55d78edd5213391429becf7546120d31f560d.1345125266.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 1.7.3.4 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 Encapsulate the ugly check if MSI-X assignment is supported in a separate helper function. Signed-off-by: Jan Kiszka --- hw/device-assignment.c | 5 +---- target-i386/kvm.c | 7 +++++++ target-i386/kvm_i386.h | 1 + 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/hw/device-assignment.c b/hw/device-assignment.c index 1d0af34..80ac2fc 100644 --- a/hw/device-assignment.c +++ b/hw/device-assignment.c @@ -1283,10 +1283,7 @@ static int assigned_device_pci_cap_init(PCIDevice *pci_dev) } /* Expose MSI-X capability */ pos = pci_find_cap_offset(pci_dev, PCI_CAP_ID_MSIX, 0); - /* Would really like to test kvm_check_extension(, KVM_CAP_DEVICE_MSIX), - * but the kernel doesn't expose it. Instead do a dummy call to - * KVM_ASSIGN_SET_MSIX_NR to see if it exists. */ - if (pos != 0 && kvm_assign_set_msix_nr(kvm_state, NULL) == -EFAULT) { + if (pos != 0 && kvm_device_msix_supported(kvm_state)) { int bar_nr; uint32_t msix_table_entry; diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 04d1c7d..677a791 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -2154,6 +2154,13 @@ int kvm_device_msi_deassign(KVMState *s, uint32_t dev_id) KVM_DEV_IRQ_HOST_MSI); } +bool kvm_device_msix_supported(KVMState *s) +{ + /* The kernel lacks a corresponding KVM_CAP, so we probe by calling + * KVM_ASSIGN_SET_MSIX_NR with an invalid parameter. */ + return kvm_vm_ioctl(s, KVM_ASSIGN_SET_MSIX_NR, NULL) == -EFAULT; +} + int kvm_device_msix_deassign(KVMState *s, uint32_t dev_id) { return kvm_deassign_irq_internal(s, dev_id, KVM_DEV_IRQ_GUEST_MSIX | diff --git a/target-i386/kvm_i386.h b/target-i386/kvm_i386.h index e827f5b..6f66b6d 100644 --- a/target-i386/kvm_i386.h +++ b/target-i386/kvm_i386.h @@ -27,6 +27,7 @@ int kvm_device_intx_deassign(KVMState *s, uint32_t dev_id, bool use_host_msi); int kvm_device_msi_assign(KVMState *s, uint32_t dev_id, int virq); int kvm_device_msi_deassign(KVMState *s, uint32_t dev_id); +bool kvm_device_msix_supported(KVMState *s); int kvm_device_msix_deassign(KVMState *s, uint32_t dev_id); #endif