kvm tools: pci: ensure BARs are naturally aligned

BARs must be naturally aligned, so enforce this in the PCI IO space
allocator.

Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>

1 files changed, 5 insertions, 3 deletions

diff --git a/pci.c b/pci.c
index e735352e..c4442c85 100644
--- a/pci.c
+++ b/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;
 }