From: Andrew Cooper Date: Mon, 10 Jul 2017 13:09:38 +0000 (+0100) Subject: cleanup to nmi-taskswitch-priv X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=bffadd0f3ae9924ef611588e3f9b2a3bdd056683;p=people%2Fandrewcoop%2Fxen-test-framework.git cleanup to nmi-taskswitch-priv Signed-off-by: Andrew Cooper --- diff --git a/tests/nmi-taskswitch-priv/main.c b/tests/nmi-taskswitch-priv/main.c index 3ea0f9e..cbb6f09 100644 --- a/tests/nmi-taskswitch-priv/main.c +++ b/tests/nmi-taskswitch-priv/main.c @@ -143,7 +143,7 @@ void test_main(void) */ xtf_unhandled_exception_hook = unhandled_exception; gdt[GDTE_AVAIL0] = (user_desc)INIT_GDTE(_u(&nmi_tss), 0x67, 0x89); - pack_gate(&idt[X86_EXC_NMI], 5, GDTE_AVAIL0 * 8, 0, 0, 0); + pack_task_gate(&idt[X86_EXC_NMI], GDTE_AVAIL0 * 8); barrier(); /* @@ -154,7 +154,7 @@ void test_main(void) apic_mmio_icr_write(APIC_DEST_SELF | APIC_DM_NMI); if ( (curr_ts = str()) != (GDTE_TSS * 8) ) - xtf_failure("Fail: Running NMI handler with unexpected %%tr\n" + xtf_failure("Fail: Running main task with unexpected %%tr\n" " Expected %04x, got %04x\n", (GDTE_TSS * 8), curr_ts); /* @@ -165,7 +165,7 @@ void test_main(void) exec_user_void(user_inject_nmi); if ( (curr_ts = str()) != (GDTE_TSS * 8) ) - xtf_failure("Fail: Running NMI handler with unexpected %%tr\n" + xtf_failure("Fail: Running main task with unexpected %%tr\n" " Expected %04x, got %04x\n", (GDTE_TSS * 8), curr_ts); /*