mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-08 02:03:56 -06:00
Merge remote-tracking branch 'mjt/trivial-patches' into staging
* mjt/trivial-patches:
acpi unit-test: Remove temporary disk after test
mainstone: Fix duplicate array values for key 'space'
pxa27x: Add 'const' attribute to keyboard maps
pxa27x: Reduce size of keyboard matrix mapping
doc: Mention chardev:id in available devices for -serial
configure: Python tests must be done before help message
configure: Rewrite code for help message
fix -boot strict regressed in commit 6ef4716
vl: make boot_strict variable static (not used outside vl.c)
x86: only allow real mode to access 32bit without LMA
linux-user: Use macro TARGET_NSIG_WORDS where possible
exynos4210: Use macro ARRAY_SIZE where possible
ui/cocoa: Use macro ARRAY_SIZE where possible
misc: Use macro ARRAY_SIZE where possible
openrisc: Fix spelling in comment (transaltion -> translation)
hw/arm/highbank: Simplify code (memory region in device state)
Message-id: 1388182050-10270-1-git-send-email-mjt@msgid.tls.msk.ru
Signed-off-by: Anthony Liguori <aliguori@amazon.com>
This commit is contained in:
commit
666eb032d3
18 changed files with 233 additions and 218 deletions
|
@ -2543,9 +2543,9 @@ void sparc64_set_context(CPUSPARCState *env)
|
|||
abi_ulong *src, *dst;
|
||||
src = ucp->tuc_sigmask.sig;
|
||||
dst = target_set.sig;
|
||||
for (i = 0; i < sizeof(target_sigset_t) / sizeof(abi_ulong);
|
||||
i++, dst++, src++)
|
||||
for (i = 0; i < TARGET_NSIG_WORDS; i++, dst++, src++) {
|
||||
err |= __get_user(*dst, src);
|
||||
}
|
||||
if (err)
|
||||
goto do_sigsegv;
|
||||
}
|
||||
|
@ -2648,9 +2648,9 @@ void sparc64_get_context(CPUSPARCState *env)
|
|||
abi_ulong *src, *dst;
|
||||
src = target_set.sig;
|
||||
dst = ucp->tuc_sigmask.sig;
|
||||
for (i = 0; i < sizeof(target_sigset_t) / sizeof(abi_ulong);
|
||||
i++, dst++, src++)
|
||||
for (i = 0; i < TARGET_NSIG_WORDS; i++, dst++, src++) {
|
||||
err |= __put_user(*src, dst);
|
||||
}
|
||||
if (err)
|
||||
goto do_sigsegv;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue