[kvm-unit-tests 5/5] lib: s390x: Remove kvm s390 prefix from sie control block

[Janosch Frank <frankja@linux.ibm.com>]

We're not kvm.

Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
---
 lib/s390x/asm/sie-arch.h | 2 +-
 lib/s390x/interrupt.c    | 4 ++--
 lib/s390x/sie-icpt.c     | 2 +-
 lib/s390x/sie-icpt.h     | 2 +-
 lib/s390x/sie.h          | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/s390x/asm/sie-arch.h b/lib/s390x/asm/sie-arch.h
index 4911c988..d9d5af81 100644
--- a/lib/s390x/asm/sie-arch.h
+++ b/lib/s390x/asm/sie-arch.h
@@ -29,7 +29,7 @@
 #define CPUSTAT_J          0x00000002
 #define CPUSTAT_P          0x00000001
 
-struct kvm_s390_sie_block {
+struct sie_control_block {
 	uint32_t 	cpuflags;		/* 0x0000 */
 	uint32_t : 1;			/* 0x0004 */
 	uint32_t 	prefix : 18;
diff --git a/lib/s390x/interrupt.c b/lib/s390x/interrupt.c
index a75128b9..7e7371c1 100644
--- a/lib/s390x/interrupt.c
+++ b/lib/s390x/interrupt.c
@@ -227,7 +227,7 @@ static void print_storage_exception_information(void)
 
 static void print_int_regs(struct stack_frame_int *stack, bool sie)
 {
-	struct kvm_s390_sie_block *sblk;
+	struct sie_control_block *sblk;
 
 	printf("\n");
 	printf("%s\n", sie ? "Guest registers:" : "Host registers:");
@@ -240,7 +240,7 @@ static void print_int_regs(struct stack_frame_int *stack, bool sie)
 	       stack->grs0[6], stack->grs0[7], stack->grs0[8], stack->grs0[9]);
 
 	if (sie) {
-		sblk = (struct kvm_s390_sie_block *)stack->grs0[12];
+		sblk = (struct sie_control_block *)stack->grs0[12];
 		printf("%016lx %016lx %016lx %016lx\n",
 		       stack->grs0[10], stack->grs0[11], sblk->gg14, sblk->gg15);
 	} else {
diff --git a/lib/s390x/sie-icpt.c b/lib/s390x/sie-icpt.c
index 17064424..861dce02 100644
--- a/lib/s390x/sie-icpt.c
+++ b/lib/s390x/sie-icpt.c
@@ -7,7 +7,7 @@
 
 #include <sie-icpt.h>
 
-struct diag_itext sblk_ip_as_diag(struct kvm_s390_sie_block *sblk)
+struct diag_itext sblk_ip_as_diag(struct sie_control_block *sblk)
 {
 	union {
 		struct {
diff --git a/lib/s390x/sie-icpt.h b/lib/s390x/sie-icpt.h
index 604a7221..b1edf334 100644
--- a/lib/s390x/sie-icpt.h
+++ b/lib/s390x/sie-icpt.h
@@ -21,7 +21,7 @@ struct diag_itext {
 	uint64_t          : 16;
 };
 
-struct diag_itext sblk_ip_as_diag(struct kvm_s390_sie_block *sblk);
+struct diag_itext sblk_ip_as_diag(struct sie_control_block *sblk);
 
 /**
  * sie_is_diag_icpt() - Check if intercept is due to diagnose instruction
diff --git a/lib/s390x/sie.h b/lib/s390x/sie.h
index 3ec49ed0..b146e386 100644
--- a/lib/s390x/sie.h
+++ b/lib/s390x/sie.h
@@ -32,7 +32,7 @@ struct vm_save_area {
 };
 
 struct vm {
-	struct kvm_s390_sie_block *sblk;
+	struct sie_control_block *sblk;
 	struct vm_save_area save_area;
 	struct esca_block *sca;			/* System Control Area */
 	uint8_t *crycb;				/* Crypto Control Block */
@@ -46,7 +46,7 @@ extern void sie_entry(void);
 extern void sie_exit(void);
 extern void sie_entry_gregs(void);
 extern void sie_exit_gregs(void);
-extern void sie64a(struct kvm_s390_sie_block *sblk, struct vm_save_area *save_area);
+extern void sie64a(struct sie_control_block *sblk, struct vm_save_area *save_area);
 void sie(struct vm *vm);
 void sie_expect_validity(struct vm *vm);
 uint16_t sie_get_validity(struct vm *vm);
-- 
2.51.0