summaryrefslogtreecommitdiffstats
path: root/target-i386/helper.c
diff options
context:
space:
mode:
authorAnthony Liguori2013-09-23 18:52:55 +0200
committerAnthony Liguori2013-09-23 18:52:55 +0200
commit2e6ae666c8ccaa7fd26d7102c5c9bed24dc02b1d (patch)
tree506ea140053974266577f7563998d7173cd5905d /target-i386/helper.c
parentMerge remote-tracking branch 'qemu-kvm/uq/master' into staging (diff)
parenttests/.gitignore: ignore test-throttle (diff)
downloadqemu-2e6ae666c8ccaa7fd26d7102c5c9bed24dc02b1d.tar.gz
qemu-2e6ae666c8ccaa7fd26d7102c5c9bed24dc02b1d.tar.xz
qemu-2e6ae666c8ccaa7fd26d7102c5c9bed24dc02b1d.zip
Merge remote-tracking branch 'mjt/trivial-patches' into staging
# By Stefan Weil (8) and others # Via Michael Tokarev * mjt/trivial-patches: tests/.gitignore: ignore test-throttle exec: Fix broken build for MinGW (regression) kvm: Fix compiler warning (clang) tcg-sparc: Fix parenthesis warning Makefile: Remove some more files when cleaning target-i386: Fix segment cache dump iov: avoid "orig_len may be used unitialized" warning vscclient: remove unnecessary use of uninitialized variable trace-events: Clean up with scripts/cleanup-trace-events.pl again tci: Fix qemu-alpha on 32 bit hosts (wrong assertions) *-user: Improve documentation for lock_user function MAINTAINERS: Add missing entry to filelist for TCI target translate-all: Fix formatting of dump output *-user: Fix typo in comment (ulocking -> unlocking) docs: Fix IO port number for CPU present bitmap. q35: Fix typo in constant DEFUALT -> DEFAULT. configure: Undefine _FORTIFY_SOURCE prior using it Message-id: 1379696296-32105-1-git-send-email-mjt@msgid.tls.msk.ru
Diffstat (limited to 'target-i386/helper.c')
-rw-r--r--target-i386/helper.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/target-i386/helper.c b/target-i386/helper.c
index 678503a7cc..7c196ffc42 100644
--- a/target-i386/helper.c
+++ b/target-i386/helper.c
@@ -147,7 +147,9 @@ cpu_x86_dump_seg_cache(CPUX86State *env, FILE *f, fprintf_function cpu_fprintf,
cpu_fprintf(f, " [%c%c", (sc->flags & DESC_C_MASK) ? 'C' : '-',
(sc->flags & DESC_R_MASK) ? 'R' : '-');
} else {
- cpu_fprintf(f, (sc->flags & DESC_B_MASK) ? "DS " : "DS16");
+ cpu_fprintf(f,
+ (sc->flags & DESC_B_MASK || env->hflags & HF_LMA_MASK)
+ ? "DS " : "DS16");
cpu_fprintf(f, " [%c%c", (sc->flags & DESC_E_MASK) ? 'E' : '-',
(sc->flags & DESC_W_MASK) ? 'W' : '-');
}