From patchwork Thu Jun 18 13:14:09 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 31132 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 n5IDHdjl008060 for ; Thu, 18 Jun 2009 13:17:41 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759063AbZFRNRL (ORCPT ); Thu, 18 Jun 2009 09:17:11 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757464AbZFRNRL (ORCPT ); Thu, 18 Jun 2009 09:17:11 -0400 Received: from mx2.redhat.com ([66.187.237.31]:35252 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757213AbZFRNRJ (ORCPT ); Thu, 18 Jun 2009 09:17:09 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n5IDEW9h022061; Thu, 18 Jun 2009 09:14:32 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n5IDEVPv024810; Thu, 18 Jun 2009 09:14:31 -0400 Received: from redhat.com (vpn-6-65.tlv.redhat.com [10.35.6.65]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n5IDERmO026194; Thu, 18 Jun 2009 09:14:28 -0400 Date: Thu, 18 Jun 2009 16:14:09 +0300 From: "Michael S. Tsirkin" To: Paul Brook , Avi Kivity , qemu-devel@nongnu.org, Carsten Otte , kvm@vger.kernel.org, Rusty Russell , virtualization@lists.linux-foundation.org, Christian Borntraeger , Blue Swirl , Anthony Liguori , Glauber Costa Subject: [PATCHv5 06/13] qemu: add flag to disable MSI-X by default Message-ID: <20090618131409.GG19092@redhat.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.19 (2009-01-05) X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Add global flag to disable MSI-X by default. This is useful primarily to make images loadable by older qemu (without msix). Even when MSI-X is disabled by flag, you can still load images that have MSI-X enabled. Signed-off-by: Michael S. Tsirkin --- hw/msix.c | 5 ++++- qemu-options.hx | 2 ++ vl.c | 3 +++ 3 files changed, 9 insertions(+), 1 deletions(-) diff --git a/hw/msix.c b/hw/msix.c index a448eab..cc62a83 100644 --- a/hw/msix.c +++ b/hw/msix.c @@ -122,6 +122,9 @@ void msix_write_config(PCIDevice *dev, uint32_t addr, uint32_t val, int len) { unsigned enable_pos = dev->msix_cap + MSIX_ENABLE_OFFSET; + if (!(dev->cap_present & QEMU_PCI_CAP_MSIX)) + return; + if (addr + len <= enable_pos || addr > enable_pos) return; @@ -242,7 +245,7 @@ int msix_init(struct PCIDevice *dev, unsigned short nentries, dev->msix_table_page = qemu_mallocz(MSIX_PAGE_SIZE); - dev->msix_mmio_index = cpu_register_io_memory(0, msix_mmio_read, + dev->msix_mmio_index = cpu_register_io_memory(msix_mmio_read, msix_mmio_write, dev); if (dev->msix_mmio_index == -1) { ret = -EBUSY; diff --git a/qemu-options.hx b/qemu-options.hx index 9d5e05a..aa02615 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1584,3 +1584,5 @@ DEF("semihosting", 0, QEMU_OPTION_semihosting, DEF("old-param", 0, QEMU_OPTION_old_param, "-old-param old param mode\n") #endif +DEF("disable-msix", 0, QEMU_OPTION_disable_msix, + "-disable-msix disable msix support for PCI devices (enabled by default)\n") diff --git a/vl.c b/vl.c index 3242c23..f7c67bb 100644 --- a/vl.c +++ b/vl.c @@ -135,6 +135,7 @@ int main(int argc, char **argv) #include "hw/usb.h" #include "hw/pcmcia.h" #include "hw/pc.h" +#include "hw/msix.h" #include "hw/audiodev.h" #include "hw/isa.h" #include "hw/baum.h" @@ -5699,6 +5700,8 @@ int main(int argc, char **argv, char **envp) xen_mode = XEN_ATTACH; break; #endif + case QEMU_OPTION_disable_msix: + msix_disable = 1; } } }