From patchwork Fri May 21 00:25:41 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wright X-Patchwork-Id: 101275 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4L0Pl4A013319 for ; Fri, 21 May 2010 00:25:47 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755287Ab0EUAZp (ORCPT ); Thu, 20 May 2010 20:25:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37923 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755263Ab0EUAZo (ORCPT ); Thu, 20 May 2010 20:25:44 -0400 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o4L0PiSZ009830 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 20 May 2010 20:25:44 -0400 Received: from x200.localdomain (vpn-226-24.phx2.redhat.com [10.3.226.24]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id o4L0PfGG025331; Thu, 20 May 2010 20:25:42 -0400 Date: Thu, 20 May 2010 17:25:41 -0700 From: Chris Wright To: kvm@vger.kernel.org Cc: Alex Williamson , Chris Wright Subject: [PATCH qemu-kvm 1/2] device-assignment: use stdint types Message-ID: <20100521002541.GA13880@x200.localdomain> References: <20100520135537.18663.70947.stgit@virtlab9.virt.bos.redhat.com> <20100520220608.GX13880@x200.localdomain> <20100521002323.GZ13880@x200.localdomain> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20100521002323.GZ13880@x200.localdomain> User-Agent: Mutt/1.5.20 (2009-08-17) X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 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.3 (demeter.kernel.org [140.211.167.41]); Fri, 21 May 2010 00:25:48 +0000 (UTC) diff --git a/hw/device-assignment.c b/hw/device-assignment.c index eb31c78..fd09ec3 100644 --- a/hw/device-assignment.c +++ b/hw/device-assignment.c @@ -1024,9 +1024,9 @@ static void assigned_dev_update_msi(PCIDevice *pci_dev, unsigned int ctrl_pos) static int assigned_dev_update_msix_mmio(PCIDevice *pci_dev) { AssignedDevice *adev = container_of(pci_dev, AssignedDevice, dev); - u16 entries_nr = 0, entries_max_nr; + uint16_t entries_nr = 0, entries_max_nr; int pos = 0, i, r = 0; - u32 msg_addr, msg_upper_addr, msg_data, msg_ctrl; + uint32_t msg_addr, msg_upper_addr, msg_data, msg_ctrl; struct kvm_assigned_msix_nr msix_nr; struct kvm_assigned_msix_entry msix_entry; void *va = adev->msix_table_page; @@ -1210,7 +1210,7 @@ static int assigned_device_pci_cap_init(PCIDevice *pci_dev) /* Expose MSI-X capability */ if (pci_find_cap_offset(dev->pdev, PCI_CAP_ID_MSIX)) { int pos, entry_nr, bar_nr; - u32 msix_table_entry; + uint32_t msix_table_entry; dev->cap.available |= ASSIGNED_DEVICE_CAP_MSIX; memset(&pci_dev->config[pci_dev->cap.start + pci_dev->cap.length], 0, PCI_CAPABILITY_CONFIG_MSIX_LENGTH);