From: Will Deacon Subject: [PATCH 06/17] kvm tools: pci: ensure BARs are naturally aligned Date: Tue, 4 Feb 2014 16:53:21 +0000 Message-ID: <1391532812-2043-7-git-send-email-will.deacon@arm.com> References: <1391532812-2043-1-git-send-email-will.deacon@arm.com> Cc: kvmarm@lists.cs.columbia.edu, penberg@kernel.org, marc.zyngier@arm.com, arnd@arndb.de To: kvm@vger.kernel.org Return-path: Received: from cam-admin0.cambridge.arm.com ([217.140.96.50]:49541 "EHLO cam-admin0.cambridge.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932104AbaBDQxy (ORCPT ); Tue, 4 Feb 2014 11:53:54 -0500 In-Reply-To: <1391532812-2043-1-git-send-email-will.deacon@arm.com> Sender: kvm-owner@vger.kernel.org List-ID: BARs must be naturally aligned, so enforce this in the PCI IO space allocator. Signed-off-by: Will Deacon --- tools/kvm/pci.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/kvm/pci.c b/tools/kvm/pci.c index e735352eb042..c4442c85b5cf 100644 --- a/tools/kvm/pci.c +++ b/tools/kvm/pci.c @@ -18,11 +18,13 @@ static union pci_config_address pci_config_address; */ static u32 io_space_blocks = KVM_PCI_MMIO_AREA; +/* + * BARs must be naturally aligned, so enforce this in the allocator. + */ u32 pci_get_io_space_block(u32 size) { - u32 block = io_space_blocks; - io_space_blocks += size; - + u32 block = ALIGN(io_space_blocks, size); + io_space_blocks = block + size; return block; } -- 1.8.2.2