[kvm-unit-tests PATCH v2 1/3] s390x: Add custom pgm cleanup function

Janosch Frank
2020-07-27T09:54:30Z

Sometimes we need to do cleanup which we don't necessarily want to add
to interrupt.c, so lets add a way to register a cleanup function.

Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
Reviewed-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
lib/s390x/asm/interrupt.h | 1 +
lib/s390x/interrupt.c | 10 ++++++++++
2 files changed, 11 insertions(+)

diff --git a/lib/s390x/asm/interrupt.h b/lib/s390x/asm/interrupt.h
index 4cfade9..b2a7c83 100644
--- a/lib/s390x/asm/interrupt.h
+++ b/lib/s390x/asm/interrupt.h
@@ -15,6 +15,7 @@
#define EXT_IRQ_EXTERNAL_CALL 0x1202
#define EXT_IRQ_SERVICE_SIG 0x2401

+void register_pgm_int_func(void (*f)(void));
void handle_pgm_int(void);
void handle_ext_int(void);
void handle_mcck_int(void);
diff --git a/lib/s390x/interrupt.c b/lib/s390x/interrupt.c
index 243b9c2..51cc733 100644
--- a/lib/s390x/interrupt.c
+++ b/lib/s390x/interrupt.c
@@ -16,6 +16,7 @@

static bool pgm_int_expected;
static bool ext_int_expected;
+static void (*pgm_int_func)(void);
static struct lowcore *lc;

void expect_pgm_int(void)
@@ -51,6 +52,11 @@ void check_pgm_int_code(uint16_t code)
lc->pgm_int_code);
}

+void register_pgm_int_func(void (*f)(void))
+{
+ pgm_int_func = f;
+}
+
static void fixup_pgm_int(void)
{
switch (lc->pgm_int_code) {
@@ -115,6 +121,10 @@ void handle_pgm_int(void)
}

pgm_int_expected = false;
+
+ if (pgm_int_func)
+ return (*pgm_int_func)();
+
fixup_pgm_int();
}

--
2.25.1