From patchwork Thu Mar 12 13:36:53 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sheng Yang X-Patchwork-Id: 11362 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n2CDc9Au026123 for ; Thu, 12 Mar 2009 13:38:09 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756168AbZCLNhI (ORCPT ); Thu, 12 Mar 2009 09:37:08 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755741AbZCLNhH (ORCPT ); Thu, 12 Mar 2009 09:37:07 -0400 Received: from mga11.intel.com ([192.55.52.93]:26037 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756150AbZCLNhE (ORCPT ); Thu, 12 Mar 2009 09:37:04 -0400 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 12 Mar 2009 06:34:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.38,350,1233561600"; d="scan'208";a="438356200" Received: from syang10-desktop.sh.intel.com (HELO syang10-desktop) ([10.239.13.189]) by fmsmga002.fm.intel.com with ESMTP; 12 Mar 2009 06:32:38 -0700 Received: from yasker by syang10-desktop with local (Exim 4.69) (envelope-from ) id 1Lhl5o-0007tr-DI; Thu, 12 Mar 2009 21:37:00 +0800 From: Sheng Yang To: Avi Kivity , Marcelo Tosatti , Anthony Liguori Cc: kvm@vger.kernel.org, Sheng Yang Subject: [PATCH 10/16] kvm: Support MSI convert to INTx in device assignment Date: Thu, 12 Mar 2009 21:36:53 +0800 Message-Id: <1236865019-30321-11-git-send-email-sheng@linux.intel.com> X-Mailer: git-send-email 1.5.6.3 In-Reply-To: <1236865019-30321-1-git-send-email-sheng@linux.intel.com> References: <1236865019-30321-1-git-send-email-sheng@linux.intel.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Signed-off-by: Sheng Yang --- qemu/hw/device-assignment.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/qemu/hw/device-assignment.c b/qemu/hw/device-assignment.c index bda0e95..01485d7 100644 --- a/qemu/hw/device-assignment.c +++ b/qemu/hw/device-assignment.c @@ -588,7 +588,11 @@ static int assign_irq(AssignedDevInfo *adev) assigned_irq_data.guest_irq = irq; assigned_irq_data.host_irq = dev->real_device.irq; #ifdef KVM_CAP_ASSIGN_DEV_IRQ - assigned_irq_data.flags = KVM_DEV_IRQ_HOST_INTX | KVM_DEV_IRQ_GUEST_INTX; + if (dev->cap.available & ASSIGNED_DEVICE_CAP_MSI) + assigned_irq_data.flags = KVM_DEV_IRQ_HOST_MSI | KVM_DEV_IRQ_GUEST_INTX; + else + assigned_irq_data.flags = KVM_DEV_IRQ_HOST_INTX | KVM_DEV_IRQ_GUEST_INTX; + r = kvm_deassign_irq(kvm_context, &assigned_irq_data); /* -ENXIO means no assigned irq */ if (r && r != -ENXIO)