summary refs log tree commit diff stats
path: root/hw/spapr_pci.c
diff options
context:
space:
mode:
authorAlexey Kardashevskiy <aik@ozlabs.ru>2012-07-18 18:22:51 +1000
committerStefan Hajnoczi <stefanha@linux.vnet.ibm.com>2012-07-21 10:54:40 +0100
commitc4889f54237aec5195d42de2c87292d6e41dd704 (patch)
tree4965065ee7eeca176718da4fff1c3b812d6088c2 /hw/spapr_pci.c
parent61dc008f3529fa74a63aad1907438dad857e255a (diff)
downloadfocaccia-qemu-c4889f54237aec5195d42de2c87292d6e41dd704.tar.gz
focaccia-qemu-c4889f54237aec5195d42de2c87292d6e41dd704.zip
powerpc pci: fixed packing of ranges[]
By default mingw-gcc is trying to pack structures the way to
preserve binary compatibility with MS Visual C what leads to
incorrect and unexpected padding in the PCI bus ranges property of
the sPAPR PHB.

The patch replaces __attribute__((packed)) with more strict QEMU_PACKED
which actually is __attribute__((gcc_struct, packed)) on Windows.

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Tested-by: Stefan Weil <sw@weilnetz.de>
Reviewed-by: Stefan Weil <sw@weilnetz.de>
Acked-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Diffstat (limited to 'hw/spapr_pci.c')
-rw-r--r--hw/spapr_pci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/spapr_pci.c b/hw/spapr_pci.c
index 47ba5ff770..b2e4f785ea 100644
--- a/hw/spapr_pci.c
+++ b/hw/spapr_pci.c
@@ -418,7 +418,7 @@ int spapr_populate_pci_devices(sPAPRPHBState *phb,
         uint64_t child;
         uint64_t parent;
         uint64_t size;
-    } __attribute__((packed)) ranges[] = {
+    } QEMU_PACKED ranges[] = {
         {
             cpu_to_be32(b_ss(1)), cpu_to_be64(0),
             cpu_to_be64(phb->io_win_addr),