From patchwork Fri Apr 29 11:24:59 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 740731 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 p3TBPAvL007136 for ; Fri, 29 Apr 2011 11:25:10 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756945Ab1D2LZG (ORCPT ); Fri, 29 Apr 2011 07:25:06 -0400 Received: from david.siemens.de ([192.35.17.14]:20408 "EHLO david.siemens.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753834Ab1D2LZF (ORCPT ); Fri, 29 Apr 2011 07:25:05 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by david.siemens.de (8.13.6/8.13.6) with ESMTP id p3TBOxwA026953; Fri, 29 Apr 2011 13:24:59 +0200 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id p3TBOx39003189; Fri, 29 Apr 2011 13:24:59 +0200 Message-ID: <4DBAA00B.2000309@siemens.com> Date: Fri, 29 Apr 2011 13:24:59 +0200 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: Avi Kivity , Marcelo Tosatti CC: kvm , "Michael S. Tsirkin" Subject: [PATCH] qemu-kvm: Limit MSI vector walk to actual array size 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]); Fri, 29 Apr 2011 11:25:10 +0000 (UTC) We only need to walk as many vectors on updates as the device supports. Signed-off-by: Jan Kiszka --- hw/msi.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/hw/msi.c b/hw/msi.c index ddcfedd..92773e5 100644 --- a/hw/msi.c +++ b/hw/msi.c @@ -134,13 +134,15 @@ static void kvm_msi_message_from_vector(PCIDevice *dev, unsigned vector, static void kvm_msi_update(PCIDevice *dev) { uint16_t flags = pci_get_word(dev->config + msi_flags_off(dev)); + unsigned int max_vectors = 1 << + ((flags & PCI_MSI_FLAGS_QMASK) >> (ffs(PCI_MSI_FLAGS_QMASK) - 1)); unsigned int nr_vectors = msi_nr_vectors(flags); KVMMsiMessage new_entry, *entry; bool changed = false; unsigned int vector; int r; - for (vector = 0; vector < 32; vector++) { + for (vector = 0; vector < max_vectors; vector++) { entry = dev->msi_irq_entries + vector; if (vector >= nr_vectors) {