diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-04-30 15:18:30 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-04-30 15:18:30 +0100 |
| commit | f90f5b9a9aa41e5ea47dc7a0f3e1f99196f485c3 (patch) | |
| tree | f0420a3eb6f094bb9c988867e8f428b84980d52a /target-s390x/mmu_helper.c | |
| parent | 498147529d1f8e902e6528a0115143b53475791e (diff) | |
| parent | 553029351bac9f5b4f9ea72793e55f02e7677ec2 (diff) | |
| download | hqemu-f90f5b9a9aa41e5ea47dc7a0f3e1f99196f485c3.zip hqemu-f90f5b9a9aa41e5ea47dc7a0f3e1f99196f485c3.tar.gz | |
Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2015-04-30' into staging
trivial patches for 2015-04-30
# gpg: Signature made Thu Apr 30 14:07:50 2015 BST using RSA key ID A4C3D7DB
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg: aka "Michael Tokarev <mjt@corpit.ru>"
# gpg: aka "Michael Tokarev <mjt@debian.org>"
* remotes/mjt/tags/pull-trivial-patches-2015-04-30: (42 commits)
openrisc: cpu: Remove unused cpu_get_pc
microblaze: fix memory leak
tcg: Delete unused cpu_pc_from_tb()
kvm: Silence warning from valgrind
vhost-user: remove superfluous '\n' around error_report()
target-mips: fix memory leak
qmp-commands: Fix typo
linux-user/elfload: use QTAILQ_FOREACH instead of open-coding it
coroutine: remove unnecessary parentheses in qemu_co_queue_empty
qemu-char: remove unused list node from FDCharDriver
input: remove unused mouse_handlers list
cpus: use first_cpu macro instead of QTAILQ_FIRST(&cpus)
microblaze: cpu: delete unused cpu_interrupts_enabled
microblaze: cpu: Renumber EXCP_* constants to close gap
microblaze: cpu: Delete EXCP_NMI
microblaze: cpu: Remove unused CC_OP enum
microblaze: cpu: Remote unused cpu_get_pc
microblaze: mmu: Delete flip_um fn prototype
defconfigs: Piggyback microblazeel on microblaze
libcacard: do not use full paths for include files in the same dir
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target-s390x/mmu_helper.c')
| -rw-r--r-- | target-s390x/mmu_helper.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target-s390x/mmu_helper.c b/target-s390x/mmu_helper.c index 30a38ec..e8dcd0c 100644 --- a/target-s390x/mmu_helper.c +++ b/target-s390x/mmu_helper.c @@ -303,8 +303,8 @@ static int mmu_translate_asce(CPUS390XState *env, target_ulong vaddr, * @param asc address space control (one of the PSW_ASC_* modes) * @param raddr the translated address is stored to this pointer * @param flags the PAGE_READ/WRITE/EXEC flags are stored to this pointer - * @param exc true = inject a program check if a fault occured - * @return 0 if the translation was successfull, -1 if a fault occured + * @param exc true = inject a program check if a fault occurred + * @return 0 if the translation was successful, -1 if a fault occurred */ int mmu_translate(CPUS390XState *env, target_ulong vaddr, int rw, uint64_t asc, target_ulong *raddr, int *flags, bool exc) @@ -437,9 +437,9 @@ static int translate_pages(S390CPU *cpu, vaddr addr, int nr_pages, * @laddr: the logical start address * @ar: the access register number * @hostbuf: buffer in host memory. NULL = do only checks w/o copying - * @len: length that should be transfered + * @len: length that should be transferred * @is_write: true = write, false = read - * Returns: 0 on success, non-zero if an exception occured + * Returns: 0 on success, non-zero if an exception occurred * * Copy from/to guest memory using logical addresses. Note that we inject a * program interrupt in case there is an error while accessing the memory. |
