From: Dr. David Alan Gilbert <dgilbert@redhat.com>
Date: Wed, 14 Aug 2019 17:55:33 +0000 (+0100)
Subject: memory: Align MemoryRegionSections fields
X-Git-Tag: qemu-xen-4.13.1~2^2~5
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=c0aca9352d51c102c55fe29ce5c1bf8e74a5183e;p=qemu-xen.git

memory: Align MemoryRegionSections fields

MemoryRegionSection includes an Int128 'size' field;
on some platforms the compiler causes an alignment of this to
a 128bit boundary, leaving 8 bytes of dead space.
This deadspace can be filled with junk.

Move the size field to the top avoiding unnecessary alignment.

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190814175535.2023-2-dgilbert@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
(cherry picked from commit 44f85d3276397cfa2cfa379c61430405dad4e644)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---

diff --git a/include/exec/memory.h b/include/exec/memory.h
index bb0961ddb9..e28d79cc59 100644
--- a/include/exec/memory.h
+++ b/include/exec/memory.h
@@ -487,10 +487,10 @@ static inline FlatView *address_space_to_flatview(AddressSpace *as)
  * @nonvolatile: this section is non-volatile
  */
 struct MemoryRegionSection {
+    Int128 size;
     MemoryRegion *mr;
     FlatView *fv;
     hwaddr offset_within_region;
-    Int128 size;
     hwaddr offset_within_address_space;
     bool readonly;
     bool nonvolatile;