From a4fe0e8dfc7efe64ecc783de6d18660db10bab9d Mon Sep 17 00:00:00 2001

From: David Hildenbrand <david@redhat.com>

Date: Wed, 22 May 2019 08:03:54 +0100

Subject: [PATCH 02/12] linux headers: update against Linux 5.2-rc1

RH-Author: David Hildenbrand <david@redhat.com>

Message-id: <20190522080402.20173-3-david@redhat.com>

Patchwork-id: 88157

O-Subject: [RHEL8.1 qemu-kvm PATCH v2 02/10] linux headers: update against Linux 5.2-rc1

Bugzilla: 1660912

RH-Acked-by: Cornelia Huck <cohuck@redhat.com>

RH-Acked-by: Jens Freimann <jfreimann@redhat.com>

RH-Acked-by: Thomas Huth <thuth@redhat.com>

commit a188339ca5a396acc588e5851ed7e19f66b0ebd9

Signed-off-by: Cornelia Huck <cohuck@redhat.com>

(cherry picked from commit d9cb4336159a00bd0d9c81b93f02874ef3626057)

This patch is based on the upstream patch 19897fbee613

("linux headers: update against Linux 5.2-rc1"), however, due to the

many merge conflicts, this patch only includes the relevant s390x change

to support the new CPU model for HW gen15.

Signed-off-by: David Hildenbrand <david@redhat.com>

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>

---

 linux-headers/asm-s390/kvm.h | 5 ++++-

 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/linux-headers/asm-s390/kvm.h b/linux-headers/asm-s390/kvm.h

index 0265482..03ab596 100644

--- a/linux-headers/asm-s390/kvm.h

+++ b/linux-headers/asm-s390/kvm.h

@@ -152,7 +152,10 @@ struct kvm_s390_vm_cpu_subfunc {

 	__u8 pcc[16];		/* with MSA4 */

 	__u8 ppno[16];		/* with MSA5 */

 	__u8 kma[16];		/* with MSA8 */

-	__u8 reserved[1808];

+	__u8 kdsa[16];		/* with MSA9 */

+	__u8 sortl[32];		/* with STFLE.150 */

+	__u8 dfltcc[32];	/* with STFLE.151 */

+	__u8 reserved[1728];

 };

 /* kvm attributes for crypto */

-- 

1.8.3.1