From 5ddb3b822086c04493be468cc27e356cf174307d Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Wed, 22 Nov 2017 10:43:30 +0100 Subject: [PATCH 13/15] s390-ccw: Fix alignment for CCW1 RH-Author: Thomas Huth Message-id: <1511347411-16226-3-git-send-email-thuth@redhat.com> Patchwork-id: 77775 O-Subject: [RHEL-7.5 qemu-kvm-ma PATCH 2/3] s390-ccw: Fix alignment for CCW1 Bugzilla: 1514352 RH-Acked-by: David Hildenbrand RH-Acked-by: Cornelia Huck RH-Acked-by: Miroslav Rezanina From: Farhan Ali 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 Reviewed-by: Halil Pasic Reviewed-by: Eric Farman Acked-by: Christian Borntraeger Message-Id: <3ed8b810b6592daee6a775037ce21f850e40647d.1503667215.git.alifm@linux.vnet.ibm.com> Signed-off-by: Cornelia Huck (cherry picked from commit 3a1e4561ad63b303b092387ae006bd41468ece63) Signed-off-by: Miroslav Rezanina --- pc-bios/s390-ccw/cio.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- 1.8.3.1