diff options
| author | Andreas Färber <afaerber@suse.de> | 2013-09-04 01:29:02 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2014-03-13 19:52:47 +0100 |
| commit | 31b030d4abc5bea89c2b33b39d3b302836f6b6ee (patch) | |
| tree | b2f19b80c2e6b0d8b4cb155f5ae62fb1c04462dd /target-s390x | |
| parent | 0063ebd6ac5ce0a17896d05f117757a6ebf3ca96 (diff) | |
| download | qemu-31b030d4abc5bea89c2b33b39d3b302836f6b6ee.zip qemu-31b030d4abc5bea89c2b33b39d3b302836f6b6ee.tar.gz qemu-31b030d4abc5bea89c2b33b39d3b302836f6b6ee.tar.bz2 | |
cputlb: Change tlb_flush_page() argument to CPUState
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'target-s390x')
| -rw-r--r-- | target-s390x/mem_helper.c | 6 | ||||
| -rw-r--r-- | target-s390x/misc_helper.c | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/target-s390x/mem_helper.c b/target-s390x/mem_helper.c index 2163284..6075018 100644 --- a/target-s390x/mem_helper.c +++ b/target-s390x/mem_helper.c @@ -1027,13 +1027,13 @@ void HELPER(ipte)(CPUS390XState *env, uint64_t pte_addr, uint64_t vaddr) /* XXX we exploit the fact that Linux passes the exact virtual address here - it's not obliged to! */ - tlb_flush_page(env, page); + tlb_flush_page(cs, page); /* XXX 31-bit hack */ if (page & 0x80000000) { - tlb_flush_page(env, page & ~0x80000000); + tlb_flush_page(cs, page & ~0x80000000); } else { - tlb_flush_page(env, page | 0x80000000); + tlb_flush_page(cs, page | 0x80000000); } } diff --git a/target-s390x/misc_helper.c b/target-s390x/misc_helper.c index 942b5f7..294b3ed 100644 --- a/target-s390x/misc_helper.c +++ b/target-s390x/misc_helper.c @@ -237,11 +237,13 @@ uint64_t HELPER(diag)(CPUS390XState *env, uint32_t num, uint64_t mem, /* Set Prefix */ void HELPER(spx)(CPUS390XState *env, uint64_t a1) { + CPUState *cs = CPU(s390_env_get_cpu(env)); uint32_t prefix = a1 & 0x7fffe000; + env->psa = prefix; qemu_log("prefix: %#x\n", prefix); - tlb_flush_page(env, 0); - tlb_flush_page(env, TARGET_PAGE_SIZE); + tlb_flush_page(cs, 0); + tlb_flush_page(cs, TARGET_PAGE_SIZE); } static inline uint64_t clock_value(CPUS390XState *env) |