| Message ID | 1402012613-29891-2-git-send-email-namit@cs.technion.ac.il (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Il 06/06/2014 01:56, Nadav Amit ha scritto: > An additional test case for the emulator was added to test smsw which is > trapped by the emulator. The other existing test-cases occur in the guest (at > least on VMX), since the values are read directly from the CR0 read shadow. > > Signed-off-by: Nadav Amit <namit@cs.technion.ac.il> > --- > x86/emulator.c | 10 ++++++++-- > 1 file changed, 8 insertions(+), 2 deletions(-) > > diff --git a/x86/emulator.c b/x86/emulator.c > index 20e3a45..033f246 100644 > --- a/x86/emulator.c > +++ b/x86/emulator.c > @@ -336,7 +336,7 @@ void test_incdecnotneg(void *mem) > report("lock notb", *mb == vb); > } > > -void test_smsw(void) > +void test_smsw(uint64_t *h_mem) > { > char mem[16]; > unsigned short msw, msw_orig, *pmsw; > @@ -355,6 +355,12 @@ void test_smsw(void) > if (i != 4 && pmsw[i]) > zero = 0; > report("smsw (2)", msw == pmsw[4] && zero); > + > + /* Trigger exit on smsw */ > + *h_mem = 0x12345678abcdeful; > + asm volatile("smsw %0" : "=m"(*h_mem)); > + report("smsw (3)", msw == (unsigned short)*h_mem && > + (*h_mem & ~0xfffful) == 0x12345678ab0000ul); > } > > void test_lmsw(void) > @@ -998,7 +1004,7 @@ int main() > > test_cr8(); > > - test_smsw(); > + test_smsw(mem); > test_lmsw(); > test_ljmp(mem); > test_stringio(); > Thanks, applying all after the end of the merge window. Paolo -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/x86/emulator.c b/x86/emulator.c index 20e3a45..033f246 100644 --- a/x86/emulator.c +++ b/x86/emulator.c @@ -336,7 +336,7 @@ void test_incdecnotneg(void *mem) report("lock notb", *mb == vb); } -void test_smsw(void) +void test_smsw(uint64_t *h_mem) { char mem[16]; unsigned short msw, msw_orig, *pmsw; @@ -355,6 +355,12 @@ void test_smsw(void) if (i != 4 && pmsw[i]) zero = 0; report("smsw (2)", msw == pmsw[4] && zero); + + /* Trigger exit on smsw */ + *h_mem = 0x12345678abcdeful; + asm volatile("smsw %0" : "=m"(*h_mem)); + report("smsw (3)", msw == (unsigned short)*h_mem && + (*h_mem & ~0xfffful) == 0x12345678ab0000ul); } void test_lmsw(void) @@ -998,7 +1004,7 @@ int main() test_cr8(); - test_smsw(); + test_smsw(mem); test_lmsw(); test_ljmp(mem); test_stringio();
An additional test case for the emulator was added to test smsw which is trapped by the emulator. The other existing test-cases occur in the guest (at least on VMX), since the values are read directly from the CR0 read shadow. Signed-off-by: Nadav Amit <namit@cs.technion.ac.il> --- x86/emulator.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)