summary refs log tree commit diff stats
path: root/hw/spapr_pci.c
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2012-07-23 13:15:34 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2012-07-23 13:15:34 -0500
commitef6bbdf9e5eb6da5cbdea1bf55e08709c6e181d5 (patch)
treef3ac512465cc261cb6a3a70fba2da99b12231412 /hw/spapr_pci.c
parent400006c27622d54ef588e1a9bd5a005d5fc9be5b (diff)
parent43ffe61f9cc22f9ad4d05a18a304b1095fa1f2b3 (diff)
downloadfocaccia-qemu-ef6bbdf9e5eb6da5cbdea1bf55e08709c6e181d5.tar.gz
focaccia-qemu-ef6bbdf9e5eb6da5cbdea1bf55e08709c6e181d5.zip
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
* stefanha/trivial-patches:
  Fix some more Qemus in documentation and help text
  qdev: Fix Open Firmware comment
  cpus.c: Make all_cpu_threads_idle() static
  Use macro QEMU_PACKED for new packed structures
  Recognize PCID feature
  powerpc pci: fixed packing of ranges[]
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),