From patchwork Sun Jul 5 12:58:52 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: 34133 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 n65D0HMT032635 for ; Sun, 5 Jul 2009 13:00:17 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754768AbZGENAL (ORCPT ); Sun, 5 Jul 2009 09:00:11 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754735AbZGENAL (ORCPT ); Sun, 5 Jul 2009 09:00:11 -0400 Received: from mx2.redhat.com ([66.187.237.31]:53343 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754529AbZGENAK (ORCPT ); Sun, 5 Jul 2009 09:00:10 -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 n65D0AHk028758; Sun, 5 Jul 2009 09:00:10 -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 n65CxVwD017719; Sun, 5 Jul 2009 08:59:32 -0400 Received: from redhat.com (vpn-6-125.tlv.redhat.com [10.35.6.125]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n65CxSDV018159; Sun, 5 Jul 2009 08:59:28 -0400 Date: Sun, 5 Jul 2009 15:58:52 +0300 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org, avi@redhat.com, kvm@vger.kernel.org, aliguori@us.ibm.com, kwolf@redhat.com, glommer@redhat.com, blauwirbel@gmail.com Subject: [PATCHv5 4/5] qemu/msi: missing braces Message-ID: <20090705125852.GE5417@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 MSIX present bit is tested incorrectly, and only happens to work because the bit we are testing is 0x1. Add braces to fix this. Reported-by: Blue Swirl Signed-off-by: Michael S. Tsirkin --- hw/msix.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/msix.c b/hw/msix.c index 80038d3..4224d8f 100644 --- a/hw/msix.c +++ b/hw/msix.c @@ -298,9 +298,9 @@ void msix_load(PCIDevice *dev, QEMUFile *f) { unsigned n = dev->msix_entries_nr; - if (!dev->cap_present & QEMU_PCI_CAP_MSIX) + if (!(dev->cap_present & QEMU_PCI_CAP_MSIX)) { return; - + } msix_free_irq_entries(dev); qemu_get_buffer(f, dev->msix_table_page, n * MSIX_ENTRY_SIZE); qemu_get_buffer(f, dev->msix_table_page + MSIX_PAGE_PENDING, (n + 7) / 8);