aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFarhan Ali <alifm@linux.vnet.ibm.com>2017-08-25 09:24:46 -0400
committerMichael Roth <mdroth@linux.vnet.ibm.com>2017-08-31 12:01:54 -0500
commite22e199b2bb1df99ec66a801f89669f0683f32c5 (patch)
treed11620dee147c0bbd046dd5ba4604535276ba0e7
parent503518416597cff41d4439555e5fceecdcc43400 (diff)
downloadqemu-e22e199b2bb1df99ec66a801f89669f0683f32c5.zip
qemu-e22e199b2bb1df99ec66a801f89669f0683f32c5.tar.gz
qemu-e22e199b2bb1df99ec66a801f89669f0683f32c5.tar.bz2
s390-ccw: Fix alignment for CCW1
The commit 198c0d1f9df8c4 s390x/css: check ccw address validity exposes an alignment issue in ccw bios. According to PoP the CCW must be doubleword aligned. Let's fix this in the bios. Cc: qemu-stable@nongnu.org Signed-off-by: Farhan Ali <alifm@linux.vnet.ibm.com> Reviewed-by: Halil Pasic <pasic@linux.vnet.ibm.com> Reviewed-by: Eric Farman <farman@linux.vnet.ibm.com> Acked-by: Christian Borntraeger <borntraeger@de.ibm.com> Message-Id: <3ed8b810b6592daee6a775037ce21f850e40647d.1503667215.git.alifm@linux.vnet.ibm.com> Signed-off-by: Cornelia Huck <cohuck@redhat.com> (cherry picked from commit 3a1e4561ad63b303b092387ae006bd41468ece63) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
-rw-r--r--pc-bios/s390-ccw/cio.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/pc-bios/s390-ccw/cio.h b/pc-bios/s390-ccw/cio.h
index f5b4549..55eaeee 100644
--- a/pc-bios/s390-ccw/cio.h
+++ b/pc-bios/s390-ccw/cio.h
@@ -133,7 +133,7 @@ struct ccw1 {
__u8 flags;
__u16 count;
__u32 cda;
-} __attribute__ ((packed));
+} __attribute__ ((packed, aligned(8)));
#define CCW_FLAG_DC 0x80
#define CCW_FLAG_CC 0x40