From patchwork Fri Jun 5 10:23:40 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: 28177 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 n55AQlgE004076 for ; Fri, 5 Jun 2009 10:26:47 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752348AbZFEK0n (ORCPT ); Fri, 5 Jun 2009 06:26:43 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752311AbZFEK0n (ORCPT ); Fri, 5 Jun 2009 06:26:43 -0400 Received: from mx2.redhat.com ([66.187.237.31]:42525 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752256AbZFEK0m (ORCPT ); Fri, 5 Jun 2009 06:26:42 -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 n55AOais010994; Fri, 5 Jun 2009 06:24:36 -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 n55AOZC3014333; Fri, 5 Jun 2009 06:24:35 -0400 Received: from redhat.com (vpn-6-22.tlv.redhat.com [10.35.6.22]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n55AOVKP007433; Fri, 5 Jun 2009 06:24:32 -0400 Date: Fri, 5 Jun 2009 13:23:40 +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 Subject: [PATCHv3 06/13] qemu: add flag to disable MSI-X by default Message-ID: <20090605102340.GG26770@redhat.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.18 (2008-05-17) 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 | 3 +++ qemu-options.hx | 2 ++ vl.c | 3 +++ 3 files changed, 8 insertions(+), 0 deletions(-) diff --git a/hw/msix.c b/hw/msix.c index 1b5aec8..ada81d8 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; diff --git a/qemu-options.hx b/qemu-options.hx index 87af798..fd041a4 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1575,3 +1575,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 2c1f0e0..2757d4f 100644 --- a/vl.c +++ b/vl.c @@ -134,6 +134,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" @@ -5557,6 +5558,8 @@ int main(int argc, char **argv, char **envp) xen_mode = XEN_ATTACH; break; #endif + case QEMU_OPTION_disable_msix: + msix_disable = 1; } } }