73 lines
2.2 KiB
Diff
73 lines
2.2 KiB
Diff
From f3d0b355f946ab87b281ef75ebfb52f7b7592f2a Mon Sep 17 00:00:00 2001
|
|
From: Thomas Huth <thuth@redhat.com>
|
|
Date: Thu, 9 Aug 2018 10:15:08 +0000
|
|
Subject: linux-headers: asm-s390/kvm.h header sync
|
|
|
|
RH-Author: Thomas Huth <thuth@redhat.com>
|
|
Message-id: <1533813309-9643-2-git-send-email-thuth@redhat.com>
|
|
Patchwork-id: 81688
|
|
O-Subject: [RHEL-8.0 qemu-kvm PATCH 1/2] linux-headers: asm-s390/kvm.h header sync
|
|
Bugzilla: 1612938
|
|
RH-Acked-by: David Hildenbrand <david@redhat.com>
|
|
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
|
RH-Acked-by: Jens Freimann <jfreiman@redhat.com>
|
|
|
|
This is a header sync with the linux uapi header. The corresponding
|
|
kernel commit id is a3da7b4a3be51f37f434f14e11e60491f098b6ea (in
|
|
the kvm/next branch)
|
|
|
|
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
|
|
|
Merged patches (3.0.0):
|
|
- 57332f1 linux-headers: Update to include KVM_CAP_S390_HPAGE_1M
|
|
---
|
|
linux-headers/asm-s390/kvm.h | 5 ++++-
|
|
linux-headers/linux/kvm.h | 1 +
|
|
2 files changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/linux-headers/asm-s390/kvm.h b/linux-headers/asm-s390/kvm.h
|
|
index 11def14..1ab9901 100644
|
|
--- a/linux-headers/asm-s390/kvm.h
|
|
+++ b/linux-headers/asm-s390/kvm.h
|
|
@@ -4,7 +4,7 @@
|
|
/*
|
|
* KVM s390 specific structures and definitions
|
|
*
|
|
- * Copyright IBM Corp. 2008
|
|
+ * Copyright IBM Corp. 2008, 2018
|
|
*
|
|
* Author(s): Carsten Otte <cotte@de.ibm.com>
|
|
* Christian Borntraeger <borntraeger@de.ibm.com>
|
|
@@ -225,6 +225,7 @@ struct kvm_guest_debug_arch {
|
|
#define KVM_SYNC_FPRS (1UL << 8)
|
|
#define KVM_SYNC_GSCB (1UL << 9)
|
|
#define KVM_SYNC_BPBC (1UL << 10)
|
|
+#define KVM_SYNC_ETOKEN (1UL << 11)
|
|
/* length and alignment of the sdnx as a power of two */
|
|
#define SDNXC 8
|
|
#define SDNXL (1UL << SDNXC)
|
|
@@ -258,6 +259,8 @@ struct kvm_sync_regs {
|
|
struct {
|
|
__u64 reserved1[2];
|
|
__u64 gscb[4];
|
|
+ __u64 etoken;
|
|
+ __u64 etoken_extension;
|
|
};
|
|
};
|
|
};
|
|
diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h
|
|
index 98f389a..2aae948 100644
|
|
--- a/linux-headers/linux/kvm.h
|
|
+++ b/linux-headers/linux/kvm.h
|
|
@@ -949,6 +949,7 @@ struct kvm_ppc_resize_hpt {
|
|
#define KVM_CAP_GET_MSR_FEATURES 153
|
|
#define KVM_CAP_HYPERV_EVENTFD 154
|
|
#define KVM_CAP_HYPERV_TLBFLUSH 155
|
|
+#define KVM_CAP_S390_HPAGE_1M 156
|
|
|
|
#ifdef KVM_CAP_IRQ_ROUTING
|
|
|
|
--
|
|
1.8.3.1
|
|
|