[PATCH 04/45] s390: KVM preparation: address of the 64bit extint parm in lowcore

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Avi Kivity
Date: Thursday, April 17, 2008 - 2:10 am

From: Christian Borntraeger <borntraeger@de.ibm.com>

The address 0x11b8 is used by z/VM for pfault and diag 250 I/O to
provide a 64 bit extint parameter. virtio uses the same address, so
its time to update the lowcore structure.

Acked-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Carsten Otte <cotte@de.ibm.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
---
 include/asm-s390/lowcore.h |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/include/asm-s390/lowcore.h b/include/asm-s390/lowcore.h
index 801a6fd..e0857c5 100644
--- a/include/asm-s390/lowcore.h
+++ b/include/asm-s390/lowcore.h
@@ -380,27 +380,32 @@ struct _lowcore
         /* whether the kernel died with panic() or not */
         __u32        panic_magic;              /* 0xe00 */
 
-	__u8         pad13[0x1200-0xe04];      /* 0xe04 */
+	__u8         pad13[0x11b8-0xe04];      /* 0xe04 */
+
+	/* 64 bit extparam used for pfault, diag 250 etc  */
+	__u64        ext_params2;               /* 0x11B8 */
+
+	__u8         pad14[0x1200-0x11C0];      /* 0x11C0 */
 
         /* System info area */ 
 
 	__u64        floating_pt_save_area[16]; /* 0x1200 */
 	__u64        gpregs_save_area[16];      /* 0x1280 */
 	__u32        st_status_fixed_logout[4]; /* 0x1300 */
-	__u8         pad14[0x1318-0x1310];      /* 0x1310 */
+	__u8         pad15[0x1318-0x1310];      /* 0x1310 */
 	__u32        prefixreg_save_area;       /* 0x1318 */
 	__u32        fpt_creg_save_area;        /* 0x131c */
-	__u8         pad15[0x1324-0x1320];      /* 0x1320 */
+	__u8         pad16[0x1324-0x1320];      /* 0x1320 */
 	__u32        tod_progreg_save_area;     /* 0x1324 */
 	__u32        cpu_timer_save_area[2];    /* 0x1328 */
 	__u32        clock_comp_save_area[2];   /* 0x1330 */
-	__u8         pad16[0x1340-0x1338];      /* 0x1338 */ 
+	__u8         pad17[0x1340-0x1338];      /* 0x1338 */
 	__u32        access_regs_save_area[16]; /* 0x1340 */ 
 	__u64        cregs_save_area[16];       /* 0x1380 */
 
 	/* align to the top of the prefix area */
 
-	__u8         pad17[0x2000-0x1400];      /* 0x1400 */
+	__u8         pad18[0x2000-0x1400];      /* 0x1400 */
 #endif /* !__s390x__ */
 } __attribute__((packed)); /* End structure*/
 
-- 
1.5.5

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 01/45] s390: fixup for kvm, Avi Kivity, (Thu Apr 17, 2:10 am)
[PATCH 04/45] s390: KVM preparation: address of the 64bit ..., Avi Kivity, (Thu Apr 17, 2:10 am)
[PATCH 07/45] KVM: s390: sie intercept handling, Avi Kivity, (Thu Apr 17, 2:10 am)
[PATCH 12/45] KVM: s390: add kvm to kconfig on s390, Avi Kivity, (Thu Apr 17, 2:10 am)
[PATCH 13/45] KVM: s390: API documentation, Avi Kivity, (Thu Apr 17, 2:10 am)
[PATCH 14/45] KVM: s390: update maintainers, Avi Kivity, (Thu Apr 17, 2:10 am)
[PATCH 17/45] KVM: VMX: Enable MSR Bitmap feature, Avi Kivity, (Thu Apr 17, 2:10 am)
[PATCH 18/45] KVM: MMU: unify slots_lock usage, Avi Kivity, (Thu Apr 17, 2:10 am)
[PATCH 22/45] KVM: add vm refcounting, Avi Kivity, (Thu Apr 17, 2:10 am)
[PATCH 25/45] KVM: s390: Fix incorrect return value, Avi Kivity, (Thu Apr 17, 2:10 am)
[PATCH 26/45] KVM: s390: rename stfl to kvm_stfl, Avi Kivity, (Thu Apr 17, 2:10 am)
[PATCH 27/45] KVM: s390: Improve pgste accesses, Avi Kivity, (Thu Apr 17, 2:10 am)
[PATCH 34/45] KVM: ia64: VMM module interfaces, Avi Kivity, (Thu Apr 17, 2:10 am)
[PATCH 44/45] KVM: ia64: Enable kvm build for ia64, Avi Kivity, (Thu Apr 17, 2:10 am)
Re: [PATCH 13/45] KVM: s390: API documentation, Randy Dunlap, (Thu Apr 17, 8:11 am)
Re: [PATCH 13/45] KVM: s390: API documentation, Carsten Otte, (Thu Apr 17, 8:42 am)