diff options
| author | Anthony Liguori | 2011-10-31 21:05:40 +0100 |
|---|---|---|
| committer | Anthony Liguori | 2011-10-31 21:05:40 +0100 |
| commit | ff74c5a9a91c6dbf1017195462aa4176f7381240 (patch) | |
| tree | 4d365c66901ceab92858755069e68d6d1fe86b3d /linux-user/vm86.c | |
| parent | Merge remote-tracking branch 'kwolf/for-anthony' into staging (diff) | |
| parent | ppc64-linux-user: Fix syscall return type. (diff) | |
| download | qemu-ff74c5a9a91c6dbf1017195462aa4176f7381240.tar.gz qemu-ff74c5a9a91c6dbf1017195462aa4176f7381240.tar.xz qemu-ff74c5a9a91c6dbf1017195462aa4176f7381240.zip | |
Merge remote-tracking branch 'riku/linux-user-for-upstream' into staging
Diffstat (limited to 'linux-user/vm86.c')
| -rw-r--r-- | linux-user/vm86.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux-user/vm86.c b/linux-user/vm86.c index 0b2439dfa3..2c4ffeb551 100644 --- a/linux-user/vm86.c +++ b/linux-user/vm86.c @@ -432,7 +432,7 @@ int do_vm86(CPUX86State *env, long subfunction, abi_ulong vm86_addr) env->eflags = (env->eflags & ~SAFE_MASK) | (tswap32(target_v86->regs.eflags) & SAFE_MASK) | VM_MASK; - ts->vm86plus.cpu_type = tswapl(target_v86->cpu_type); + ts->vm86plus.cpu_type = tswapal(target_v86->cpu_type); switch (ts->vm86plus.cpu_type) { case TARGET_CPU_286: ts->v86mask = 0; @@ -468,7 +468,7 @@ int do_vm86(CPUX86State *env, long subfunction, abi_ulong vm86_addr) &target_v86->int_revectored, 32); memcpy(&ts->vm86plus.int21_revectored, &target_v86->int21_revectored, 32); - ts->vm86plus.vm86plus.flags = tswapl(target_v86->vm86plus.flags); + ts->vm86plus.vm86plus.flags = tswapal(target_v86->vm86plus.flags); memcpy(&ts->vm86plus.vm86plus.vm86dbg_intxxtab, target_v86->vm86plus.vm86dbg_intxxtab, 32); unlock_user_struct(target_v86, vm86_addr, 0); |