summaryrefslogtreecommitdiffstats
path: root/target-mips
diff options
context:
space:
mode:
authorLeon Alrae2015-07-22 15:59:23 +0200
committerLeon Alrae2015-07-28 09:57:50 +0200
commit8bcbb834a015432bfb4d09a883c21f017eadd978 (patch)
tree463eb1302dbb46a78139b51eca3b0e2093d60e5a /target-mips
parentMerge remote-tracking branch 'remotes/rth/tags/pull-tcg-20150727' into staging (diff)
downloadqemu-8bcbb834a015432bfb4d09a883c21f017eadd978.tar.gz
qemu-8bcbb834a015432bfb4d09a883c21f017eadd978.tar.xz
qemu-8bcbb834a015432bfb4d09a883c21f017eadd978.zip
target-mips: fix passing incompatible pointer type in machine.c
Reported-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Leon Alrae <leon.alrae@imgtec.com>
Diffstat (limited to 'target-mips')
-rw-r--r--target-mips/machine.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/target-mips/machine.c b/target-mips/machine.c
index 8fa755cd39..b15c43a107 100644
--- a/target-mips/machine.c
+++ b/target-mips/machine.c
@@ -153,6 +153,7 @@ static void put_tlb(QEMUFile *f, void *pv, size_t size)
{
r4k_tlb_t *v = pv;
+ uint8_t asid = v->ASID;
uint16_t flags = ((v->EHINV << 15) |
(v->RI1 << 14) |
(v->RI0 << 13) |
@@ -168,7 +169,7 @@ static void put_tlb(QEMUFile *f, void *pv, size_t size)
qemu_put_betls(f, &v->VPN);
qemu_put_be32s(f, &v->PageMask);
- qemu_put_8s(f, &v->ASID);
+ qemu_put_8s(f, &asid);
qemu_put_be16s(f, &flags);
qemu_put_be64s(f, &v->PFN[0]);
qemu_put_be64s(f, &v->PFN[1]);