yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
ae23c9
From 694b95dcb7fc97118fc05c885a7561b0702bf6bd Mon Sep 17 00:00:00 2001
ae23c9
From: Thomas Huth <thuth@redhat.com>
ae23c9
Date: Thu, 9 Aug 2018 10:15:08 +0000
ae23c9
Subject: [PATCH 20/21] linux-headers: asm-s390/kvm.h header sync
ae23c9
ae23c9
RH-Author: Thomas Huth <thuth@redhat.com>
ae23c9
Message-id: <1533813309-9643-2-git-send-email-thuth@redhat.com>
ae23c9
Patchwork-id: 81688
ae23c9
O-Subject: [RHEL-8.0 qemu-kvm PATCH 1/2] linux-headers: asm-s390/kvm.h header sync
ae23c9
Bugzilla: 1612938
ae23c9
RH-Acked-by: David Hildenbrand <david@redhat.com>
ae23c9
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
ae23c9
RH-Acked-by: Jens Freimann <jfreiman@redhat.com>
ae23c9
ae23c9
This is a header sync with the linux uapi header. The corresponding
ae23c9
kernel commit id is a3da7b4a3be51f37f434f14e11e60491f098b6ea (in
ae23c9
the kvm/next branch)
ae23c9
ae23c9
Signed-off-by: Thomas Huth <thuth@redhat.com>
ae23c9
---
ae23c9
 linux-headers/asm-s390/kvm.h | 5 ++++-
ae23c9
 1 file changed, 4 insertions(+), 1 deletion(-)
ae23c9
ae23c9
diff --git a/linux-headers/asm-s390/kvm.h b/linux-headers/asm-s390/kvm.h
ae23c9
index 11def14..1ab9901 100644
ae23c9
--- a/linux-headers/asm-s390/kvm.h
ae23c9
+++ b/linux-headers/asm-s390/kvm.h
ae23c9
@@ -4,7 +4,7 @@
ae23c9
 /*
ae23c9
  * KVM s390 specific structures and definitions
ae23c9
  *
ae23c9
- * Copyright IBM Corp. 2008
ae23c9
+ * Copyright IBM Corp. 2008, 2018
ae23c9
  *
ae23c9
  *    Author(s): Carsten Otte <cotte@de.ibm.com>
ae23c9
  *               Christian Borntraeger <borntraeger@de.ibm.com>
ae23c9
@@ -225,6 +225,7 @@ struct kvm_guest_debug_arch {
ae23c9
 #define KVM_SYNC_FPRS   (1UL << 8)
ae23c9
 #define KVM_SYNC_GSCB   (1UL << 9)
ae23c9
 #define KVM_SYNC_BPBC   (1UL << 10)
ae23c9
+#define KVM_SYNC_ETOKEN (1UL << 11)
ae23c9
 /* length and alignment of the sdnx as a power of two */
ae23c9
 #define SDNXC 8
ae23c9
 #define SDNXL (1UL << SDNXC)
ae23c9
@@ -258,6 +259,8 @@ struct kvm_sync_regs {
ae23c9
 		struct {
ae23c9
 			__u64 reserved1[2];
ae23c9
 			__u64 gscb[4];
ae23c9
+			__u64 etoken;
ae23c9
+			__u64 etoken_extension;
ae23c9
 		};
ae23c9
 	};
ae23c9
 };
ae23c9
-- 
ae23c9
1.8.3.1
ae23c9